Completed
Push — master ( f07e36...51c87a )
by Yannick
72:48 queued 44:14
created
install/index.php 1 patch
Spacing   +248 added lines, -248 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 require_once(dirname(__FILE__).'/class.create_db.php');
12 12
 require_once(dirname(__FILE__).'/class.update_schema.php');
13 13
 require_once(dirname(__FILE__).'/class.settings.php');
14
-$title="Install";
14
+$title = "Install";
15 15
 require(dirname(__FILE__).'/../require/settings.php');
16 16
 require_once(dirname(__FILE__).'/../require/class.Common.php');
17 17
 require(dirname(__FILE__).'/header.php');
@@ -80,8 +80,8 @@  discard block
 block discarded – undo
80 80
 	if (!extension_loaded('curl')) {
81 81
 		$error[] = "Curl is not loaded.";
82 82
 	}
83
-	if(function_exists('apache_get_modules') ){
84
-		if(!in_array('mod_rewrite',apache_get_modules())) {
83
+	if (function_exists('apache_get_modules')) {
84
+		if (!in_array('mod_rewrite', apache_get_modules())) {
85 85
 			$error[] = "mod_rewrite is not available.";
86 86
 		}
87 87
 	/*
@@ -97,8 +97,8 @@  discard block
 block discarded – undo
97 97
 	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>';
98 98
 	if (isset($_SERVER['REQUEST_SCHEME']) && isset($_SERVER['SERVER_NAME']) && isset($_SERVER['SERVER_PORT']) && isset($_SERVER['REQUEST_URI'])) {
99 99
 		if (function_exists('get_headers')) {
100
-			$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace('install/','search',str_replace('index.php',$_SERVER["REQUEST_URI"])));
101
-			if (isset($check_header[0]) && !stripos($check_header[0],"200 OK")) {
100
+			$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace('install/', 'search', str_replace('index.php', $_SERVER["REQUEST_URI"])));
101
+			if (isset($check_header[0]) && !stripos($check_header[0], "200 OK")) {
102 102
 				print '<div class="info column"><p><strong>Check your configuration, rewrite don\'t seems to work.</strong></p></div>';
103 103
 			}
104 104
 		}
@@ -469,13 +469,13 @@  discard block
 block discarded – undo
469 469
 ?>
470 470
 							<tr>
471 471
 								<?php
472
-								    if (filter_var($source['host'],FILTER_VALIDATE_URL)) {
472
+								    if (filter_var($source['host'], FILTER_VALIDATE_URL)) {
473 473
 								?>
474 474
 								<td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td>
475 475
 								<td><input type="text" name="port[]" class="col-xs-2" id="port" value="<?php if (isset($source['port'])) print $source['port']; ?>" /></td>
476 476
 								<?php
477 477
 								    } else {
478
-									$hostport = explode(':',$source['host']);
478
+									$hostport = explode(':', $source['host']);
479 479
 									if (isset($hostport[1])) {
480 480
 										$host = $hostport[0];
481 481
 										$port = $hostport[1];
@@ -522,7 +522,7 @@  discard block
 block discarded – undo
522 522
 									<select name="timezones[]" id="timezones">
523 523
 								<?php
524 524
 									$timezonelist = DateTimeZone::listIdentifiers(DateTimeZone::ALL);
525
-									foreach($timezonelist as $timezones){
525
+									foreach ($timezonelist as $timezones) {
526 526
 										if (isset($source['timezone']) && $source['timezone'] == $timezones) {
527 527
 											print '<option selected>'.$timezones.'</option>';
528 528
 										} elseif (!isset($source['timezone']) && $timezones == 'UTC') {
@@ -574,7 +574,7 @@  discard block
 block discarded – undo
574 574
 									<select name="timezones[]" id="timezones">
575 575
 								<?php
576 576
 									$timezonelist = DateTimeZone::listIdentifiers(DateTimeZone::ALL);
577
-									foreach($timezonelist as $timezones){
577
+									foreach ($timezonelist as $timezones) {
578 578
 										if ($timezones == 'UTC') {
579 579
 											print '<option selected>'.$timezones.'</option>';
580 580
 										} else print '<option>'.$timezones.'</option>';
@@ -896,7 +896,7 @@  discard block
 block discarded – undo
896 896
 			<br />
897 897
 			<p>
898 898
 				<label for="aircraftsize">Size of aircraft icon on map (default to 30px if zoom > 7 else 15px), empty to default</label>
899
-				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize;?>" />
899
+				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize; ?>" />
900 900
 			</p>
901 901
 			<br />
902 902
 			<p>
@@ -952,14 +952,14 @@  discard block
 block discarded – undo
952 952
 $error = '';
953 953
 
954 954
 if (isset($_POST['dbtype'])) {
955
-	$dbtype = filter_input(INPUT_POST,'dbtype',FILTER_SANITIZE_STRING);
956
-	$dbroot = filter_input(INPUT_POST,'dbroot',FILTER_SANITIZE_STRING);
957
-	$dbrootpass = filter_input(INPUT_POST,'dbrootpass',FILTER_SANITIZE_STRING);
958
-	$dbname = filter_input(INPUT_POST,'dbname',FILTER_SANITIZE_STRING);
959
-	$dbuser = filter_input(INPUT_POST,'dbuser',FILTER_SANITIZE_STRING);
960
-	$dbuserpass = filter_input(INPUT_POST,'dbuserpass',FILTER_SANITIZE_STRING);
961
-	$dbhost = filter_input(INPUT_POST,'dbhost',FILTER_SANITIZE_STRING);
962
-	$dbport = filter_input(INPUT_POST,'dbport',FILTER_SANITIZE_STRING);
955
+	$dbtype = filter_input(INPUT_POST, 'dbtype', FILTER_SANITIZE_STRING);
956
+	$dbroot = filter_input(INPUT_POST, 'dbroot', FILTER_SANITIZE_STRING);
957
+	$dbrootpass = filter_input(INPUT_POST, 'dbrootpass', FILTER_SANITIZE_STRING);
958
+	$dbname = filter_input(INPUT_POST, 'dbname', FILTER_SANITIZE_STRING);
959
+	$dbuser = filter_input(INPUT_POST, 'dbuser', FILTER_SANITIZE_STRING);
960
+	$dbuserpass = filter_input(INPUT_POST, 'dbuserpass', FILTER_SANITIZE_STRING);
961
+	$dbhost = filter_input(INPUT_POST, 'dbhost', FILTER_SANITIZE_STRING);
962
+	$dbport = filter_input(INPUT_POST, 'dbport', FILTER_SANITIZE_STRING);
963 963
 
964 964
 	if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) $error .= 'Mysql driver for PDO must be loaded';
965 965
 	if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) $error .= 'PosgreSQL driver for PDO must be loaded';
@@ -979,49 +979,49 @@  discard block
 block discarded – undo
979 979
 	} else $settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname));
980 980
 	*/
981 981
 	
982
-	$settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname));
982
+	$settings = array_merge($settings, array('globalDBdriver' => $dbtype, 'globalDBhost' => $dbhost, 'globalDBuser' => $dbuser, 'globalDBport' => $dbport, 'globalDBpass' => $dbuserpass, 'globalDBname' => $dbname));
983 983
 
984
-	$sitename = filter_input(INPUT_POST,'sitename',FILTER_SANITIZE_STRING);
985
-	$siteurl = filter_input(INPUT_POST,'siteurl',FILTER_SANITIZE_STRING);
986
-	$timezone = filter_input(INPUT_POST,'timezone',FILTER_SANITIZE_STRING);
987
-	$language = filter_input(INPUT_POST,'language',FILTER_SANITIZE_STRING);
988
-	$settings = array_merge($settings,array('globalName' => $sitename,'globalURL' => $siteurl, 'globalTimezone' => $timezone,'globalLanguage' => $language));
984
+	$sitename = filter_input(INPUT_POST, 'sitename', FILTER_SANITIZE_STRING);
985
+	$siteurl = filter_input(INPUT_POST, 'siteurl', FILTER_SANITIZE_STRING);
986
+	$timezone = filter_input(INPUT_POST, 'timezone', FILTER_SANITIZE_STRING);
987
+	$language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_STRING);
988
+	$settings = array_merge($settings, array('globalName' => $sitename, 'globalURL' => $siteurl, 'globalTimezone' => $timezone, 'globalLanguage' => $language));
989 989
 
990
-	$mapprovider = filter_input(INPUT_POST,'mapprovider',FILTER_SANITIZE_STRING);
991
-	$mapboxid = filter_input(INPUT_POST,'mapboxid',FILTER_SANITIZE_STRING);
992
-	$mapboxtoken = filter_input(INPUT_POST,'mapboxtoken',FILTER_SANITIZE_STRING);
993
-	$googlekey = filter_input(INPUT_POST,'googlekey',FILTER_SANITIZE_STRING);
994
-	$bingkey = filter_input(INPUT_POST,'bingkey',FILTER_SANITIZE_STRING);
995
-	$openweathermapkey = filter_input(INPUT_POST,'openweathermapkey',FILTER_SANITIZE_STRING);
996
-	$mapquestkey = filter_input(INPUT_POST,'mapquestkey',FILTER_SANITIZE_STRING);
997
-	$hereappid = filter_input(INPUT_POST,'hereappid',FILTER_SANITIZE_STRING);
998
-	$hereappcode = filter_input(INPUT_POST,'hereappcode',FILTER_SANITIZE_STRING);
999
-	$settings = array_merge($settings,array('globalMapProvider' => $mapprovider,'globalMapboxId' => $mapboxid,'globalMapboxToken' => $mapboxtoken,'globalGoogleAPIKey' => $googlekey,'globalBingMapKey' => $bingkey,'globalHereappID' => $hereappid,'globalHereappCode' => $hereappcode,'globalMapQuestKey' => $mapquestkey,'globalOpenWeatherMapKey' => $openweathermapkey));
990
+	$mapprovider = filter_input(INPUT_POST, 'mapprovider', FILTER_SANITIZE_STRING);
991
+	$mapboxid = filter_input(INPUT_POST, 'mapboxid', FILTER_SANITIZE_STRING);
992
+	$mapboxtoken = filter_input(INPUT_POST, 'mapboxtoken', FILTER_SANITIZE_STRING);
993
+	$googlekey = filter_input(INPUT_POST, 'googlekey', FILTER_SANITIZE_STRING);
994
+	$bingkey = filter_input(INPUT_POST, 'bingkey', FILTER_SANITIZE_STRING);
995
+	$openweathermapkey = filter_input(INPUT_POST, 'openweathermapkey', FILTER_SANITIZE_STRING);
996
+	$mapquestkey = filter_input(INPUT_POST, 'mapquestkey', FILTER_SANITIZE_STRING);
997
+	$hereappid = filter_input(INPUT_POST, 'hereappid', FILTER_SANITIZE_STRING);
998
+	$hereappcode = filter_input(INPUT_POST, 'hereappcode', FILTER_SANITIZE_STRING);
999
+	$settings = array_merge($settings, array('globalMapProvider' => $mapprovider, 'globalMapboxId' => $mapboxid, 'globalMapboxToken' => $mapboxtoken, 'globalGoogleAPIKey' => $googlekey, 'globalBingMapKey' => $bingkey, 'globalHereappID' => $hereappid, 'globalHereappCode' => $hereappcode, 'globalMapQuestKey' => $mapquestkey, 'globalOpenWeatherMapKey' => $openweathermapkey));
1000 1000
 	
1001
-	$latitudemax = filter_input(INPUT_POST,'latitudemax',FILTER_SANITIZE_STRING);
1002
-	$latitudemin = filter_input(INPUT_POST,'latitudemin',FILTER_SANITIZE_STRING);
1003
-	$longitudemax = filter_input(INPUT_POST,'longitudemax',FILTER_SANITIZE_STRING);
1004
-	$longitudemin = filter_input(INPUT_POST,'longitudemin',FILTER_SANITIZE_STRING);
1005
-	$livezoom = filter_input(INPUT_POST,'livezoom',FILTER_SANITIZE_NUMBER_INT);
1006
-	$settings = array_merge($settings,array('globalLatitudeMax' => $latitudemax,'globalLatitudeMin' => $latitudemin,'globalLongitudeMax' => $longitudemax,'globalLongitudeMin' => $longitudemin,'globalLiveZoom' => $livezoom));
1001
+	$latitudemax = filter_input(INPUT_POST, 'latitudemax', FILTER_SANITIZE_STRING);
1002
+	$latitudemin = filter_input(INPUT_POST, 'latitudemin', FILTER_SANITIZE_STRING);
1003
+	$longitudemax = filter_input(INPUT_POST, 'longitudemax', FILTER_SANITIZE_STRING);
1004
+	$longitudemin = filter_input(INPUT_POST, 'longitudemin', FILTER_SANITIZE_STRING);
1005
+	$livezoom = filter_input(INPUT_POST, 'livezoom', FILTER_SANITIZE_NUMBER_INT);
1006
+	$settings = array_merge($settings, array('globalLatitudeMax' => $latitudemax, 'globalLatitudeMin' => $latitudemin, 'globalLongitudeMax' => $longitudemax, 'globalLongitudeMin' => $longitudemin, 'globalLiveZoom' => $livezoom));
1007 1007
 
1008
-	$squawk_country = filter_input(INPUT_POST,'squawk_country',FILTER_SANITIZE_STRING);
1009
-	$settings = array_merge($settings,array('globalSquawkCountry' => $squawk_country));
1008
+	$squawk_country = filter_input(INPUT_POST, 'squawk_country', FILTER_SANITIZE_STRING);
1009
+	$settings = array_merge($settings, array('globalSquawkCountry' => $squawk_country));
1010 1010
 
1011
-	$latitudecenter = filter_input(INPUT_POST,'latitudecenter',FILTER_SANITIZE_STRING);
1012
-	$longitudecenter = filter_input(INPUT_POST,'longitudecenter',FILTER_SANITIZE_STRING);
1013
-	$settings = array_merge($settings,array('globalCenterLatitude' => $latitudecenter,'globalCenterLongitude' => $longitudecenter));
1011
+	$latitudecenter = filter_input(INPUT_POST, 'latitudecenter', FILTER_SANITIZE_STRING);
1012
+	$longitudecenter = filter_input(INPUT_POST, 'longitudecenter', FILTER_SANITIZE_STRING);
1013
+	$settings = array_merge($settings, array('globalCenterLatitude' => $latitudecenter, 'globalCenterLongitude' => $longitudecenter));
1014 1014
 
1015
-	$acars = filter_input(INPUT_POST,'acars',FILTER_SANITIZE_STRING);
1015
+	$acars = filter_input(INPUT_POST, 'acars', FILTER_SANITIZE_STRING);
1016 1016
 	if ($acars == 'acars') {
1017
-		$settings = array_merge($settings,array('globalACARS' => 'TRUE'));
1017
+		$settings = array_merge($settings, array('globalACARS' => 'TRUE'));
1018 1018
 	} else {
1019
-		$settings = array_merge($settings,array('globalACARS' => 'FALSE'));
1019
+		$settings = array_merge($settings, array('globalACARS' => 'FALSE'));
1020 1020
 	}
1021 1021
 
1022
-	$flightawareusername = filter_input(INPUT_POST,'flightawareusername',FILTER_SANITIZE_STRING);
1023
-	$flightawarepassword = filter_input(INPUT_POST,'flightawarepassword',FILTER_SANITIZE_STRING);
1024
-	$settings = array_merge($settings,array('globalFlightAwareUsername' => $flightawareusername,'globalFlightAwarePassword' => $flightawarepassword));
1022
+	$flightawareusername = filter_input(INPUT_POST, 'flightawareusername', FILTER_SANITIZE_STRING);
1023
+	$flightawarepassword = filter_input(INPUT_POST, 'flightawarepassword', FILTER_SANITIZE_STRING);
1024
+	$settings = array_merge($settings, array('globalFlightAwareUsername' => $flightawareusername, 'globalFlightAwarePassword' => $flightawarepassword));
1025 1025
 	
1026 1026
 	$source_name = $_POST['source_name'];
1027 1027
 	$source_latitude = $_POST['source_latitude'];
@@ -1035,8 +1035,8 @@  discard block
 block discarded – undo
1035 1035
 	
1036 1036
 	$sources = array();
1037 1037
 	foreach ($source_name as $keys => $name) {
1038
-	    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]);
1039
-	    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]);
1038
+	    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]);
1039
+	    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]);
1040 1040
 	}
1041 1041
 	if (count($sources) > 0) $_SESSION['sources'] = $sources;
1042 1042
 
@@ -1049,27 +1049,27 @@  discard block
 block discarded – undo
1049 1049
 	$sbsurl = $_POST['sbsurl'];
1050 1050
 	*/
1051 1051
 
1052
-	$globalvatsim = filter_input(INPUT_POST,'globalvatsim',FILTER_SANITIZE_STRING);
1053
-	$globalva = filter_input(INPUT_POST,'globalva',FILTER_SANITIZE_STRING);
1054
-	$globalivao = filter_input(INPUT_POST,'globalivao',FILTER_SANITIZE_STRING);
1055
-	$globalphpvms = filter_input(INPUT_POST,'globalphpvms',FILTER_SANITIZE_STRING);
1056
-	$globalvam = filter_input(INPUT_POST,'globalvam',FILTER_SANITIZE_STRING);
1057
-	$globalsbs = filter_input(INPUT_POST,'globalsbs',FILTER_SANITIZE_STRING);
1058
-	$globalaprs = filter_input(INPUT_POST,'globalaprs',FILTER_SANITIZE_STRING);
1059
-	$datasource = filter_input(INPUT_POST,'datasource',FILTER_SANITIZE_STRING);
1052
+	$globalvatsim = filter_input(INPUT_POST, 'globalvatsim', FILTER_SANITIZE_STRING);
1053
+	$globalva = filter_input(INPUT_POST, 'globalva', FILTER_SANITIZE_STRING);
1054
+	$globalivao = filter_input(INPUT_POST, 'globalivao', FILTER_SANITIZE_STRING);
1055
+	$globalphpvms = filter_input(INPUT_POST, 'globalphpvms', FILTER_SANITIZE_STRING);
1056
+	$globalvam = filter_input(INPUT_POST, 'globalvam', FILTER_SANITIZE_STRING);
1057
+	$globalsbs = filter_input(INPUT_POST, 'globalsbs', FILTER_SANITIZE_STRING);
1058
+	$globalaprs = filter_input(INPUT_POST, 'globalaprs', FILTER_SANITIZE_STRING);
1059
+	$datasource = filter_input(INPUT_POST, 'datasource', FILTER_SANITIZE_STRING);
1060 1060
 
1061
-	$globalaircraft = filter_input(INPUT_POST,'globalaircraft',FILTER_SANITIZE_STRING);
1062
-	if ($globalaircraft == 'aircraft') $settings = array_merge($settings,array('globalAircraft' => 'TRUE'));
1063
-	else $settings = array_merge($settings,array('globalAircraft' => 'FALSE'));
1064
-	$globaltracker = filter_input(INPUT_POST,'globaltracker',FILTER_SANITIZE_STRING);
1065
-	if ($globaltracker == 'tracker') $settings = array_merge($settings,array('globalTracker' => 'TRUE'));
1066
-	else $settings = array_merge($settings,array('globalTracker' => 'FALSE'));
1067
-	$globalmarine = filter_input(INPUT_POST,'globalmarine',FILTER_SANITIZE_STRING);
1068
-	if ($globalmarine == 'marine') $settings = array_merge($settings,array('globalMarine' => 'TRUE'));
1069
-	else $settings = array_merge($settings,array('globalMarine' => 'FALSE'));
1070
-	$globalsatellite = filter_input(INPUT_POST,'globalsatellite',FILTER_SANITIZE_STRING);
1071
-	if ($globalsatellite == 'satellite') $settings = array_merge($settings,array('globalSatellite' => 'TRUE'));
1072
-	else $settings = array_merge($settings,array('globalSatellite' => 'FALSE'));
1061
+	$globalaircraft = filter_input(INPUT_POST, 'globalaircraft', FILTER_SANITIZE_STRING);
1062
+	if ($globalaircraft == 'aircraft') $settings = array_merge($settings, array('globalAircraft' => 'TRUE'));
1063
+	else $settings = array_merge($settings, array('globalAircraft' => 'FALSE'));
1064
+	$globaltracker = filter_input(INPUT_POST, 'globaltracker', FILTER_SANITIZE_STRING);
1065
+	if ($globaltracker == 'tracker') $settings = array_merge($settings, array('globalTracker' => 'TRUE'));
1066
+	else $settings = array_merge($settings, array('globalTracker' => 'FALSE'));
1067
+	$globalmarine = filter_input(INPUT_POST, 'globalmarine', FILTER_SANITIZE_STRING);
1068
+	if ($globalmarine == 'marine') $settings = array_merge($settings, array('globalMarine' => 'TRUE'));
1069
+	else $settings = array_merge($settings, array('globalMarine' => 'FALSE'));
1070
+	$globalsatellite = filter_input(INPUT_POST, 'globalsatellite', FILTER_SANITIZE_STRING);
1071
+	if ($globalsatellite == 'satellite') $settings = array_merge($settings, array('globalSatellite' => 'TRUE'));
1072
+	else $settings = array_merge($settings, array('globalSatellite' => 'FALSE'));
1073 1073
 
1074 1074
 /*	
1075 1075
 	$globalSBS1Hosts = array();
@@ -1085,7 +1085,7 @@  discard block
 block discarded – undo
1085 1085
 	}
1086 1086
 	$settings = array_merge($settings,array('globalSBS1Hosts' => $globalSBS1Hosts));
1087 1087
 */
1088
-	$settings_comment = array_merge($settings_comment,array('globalSBS1Hosts'));
1088
+	$settings_comment = array_merge($settings_comment, array('globalSBS1Hosts'));
1089 1089
 	$host = $_POST['host'];
1090 1090
 	$port = $_POST['port'];
1091 1091
 	$name = $_POST['name'];
@@ -1102,107 +1102,107 @@  discard block
 block discarded – undo
1102 1102
 		else $cov = 'FALSE';
1103 1103
 		if (isset($noarchive[$key]) && $noarchive[$key] == 1) $arch = 'TRUE';
1104 1104
 		else $arch = 'FALSE';
1105
-		if (strpos($format[$key],'_callback')) {
1106
-			$gSources[] = array('host' => $h, 'pass' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'TRUE');
1105
+		if (strpos($format[$key], '_callback')) {
1106
+			$gSources[] = array('host' => $h, 'pass' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov, 'noarchive' => $arch, 'timezone' => $timezones[$key], 'callback' => 'TRUE');
1107 1107
 		} elseif ($h != '' || $name[$key] != '') {
1108
-			$gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'FALSE');
1108
+			$gSources[] = array('host' => $h, 'port' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov, 'noarchive' => $arch, 'timezone' => $timezones[$key], 'callback' => 'FALSE');
1109 1109
 		}
1110 1110
 		if ($format[$key] == 'airwhere') $forcepilots = true;
1111 1111
 	}
1112
-	$settings = array_merge($settings,array('globalSources' => $gSources));
1112
+	$settings = array_merge($settings, array('globalSources' => $gSources));
1113 1113
 
1114 1114
 /*
1115 1115
 	$sbstimeout = filter_input(INPUT_POST,'sbstimeout',FILTER_SANITIZE_NUMBER_INT);
1116 1116
 	$settings = array_merge($settings,array('globalSourcesTimeOut' => $sbstimeout));
1117 1117
 */
1118
-	$acarshost = filter_input(INPUT_POST,'acarshost',FILTER_SANITIZE_STRING);
1119
-	$acarsport = filter_input(INPUT_POST,'acarsport',FILTER_SANITIZE_NUMBER_INT);
1120
-	$settings = array_merge($settings,array('globalACARSHost' => $acarshost,'globalACARSPort' => $acarsport));
1118
+	$acarshost = filter_input(INPUT_POST, 'acarshost', FILTER_SANITIZE_STRING);
1119
+	$acarsport = filter_input(INPUT_POST, 'acarsport', FILTER_SANITIZE_NUMBER_INT);
1120
+	$settings = array_merge($settings, array('globalACARSHost' => $acarshost, 'globalACARSPort' => $acarsport));
1121 1121
 
1122
-	$bitly = filter_input(INPUT_POST,'bitly',FILTER_SANITIZE_STRING);
1123
-	$settings = array_merge($settings,array('globalBitlyAccessToken' => $bitly));
1122
+	$bitly = filter_input(INPUT_POST, 'bitly', FILTER_SANITIZE_STRING);
1123
+	$settings = array_merge($settings, array('globalBitlyAccessToken' => $bitly));
1124 1124
 
1125
-	$customcss = filter_input(INPUT_POST,'customcss',FILTER_SANITIZE_STRING);
1126
-	$settings = array_merge($settings,array('globalCustomCSS' => $customcss));
1125
+	$customcss = filter_input(INPUT_POST, 'customcss', FILTER_SANITIZE_STRING);
1126
+	$settings = array_merge($settings, array('globalCustomCSS' => $customcss));
1127 1127
 
1128
-	$map3dtile = filter_input(INPUT_POST,'map3dtileset',FILTER_SANITIZE_STRING);
1129
-	$settings = array_merge($settings,array('globalMap3DTiles' => $map3dtile));
1128
+	$map3dtile = filter_input(INPUT_POST, 'map3dtileset', FILTER_SANITIZE_STRING);
1129
+	$settings = array_merge($settings, array('globalMap3DTiles' => $map3dtile));
1130 1130
 
1131
-	$notamsource = filter_input(INPUT_POST,'notamsource',FILTER_SANITIZE_STRING);
1132
-	$settings = array_merge($settings,array('globalNOTAMSource' => $notamsource));
1133
-	$metarsource = filter_input(INPUT_POST,'metarsource',FILTER_SANITIZE_STRING);
1134
-	$settings = array_merge($settings,array('globalMETARurl' => $metarsource));
1131
+	$notamsource = filter_input(INPUT_POST, 'notamsource', FILTER_SANITIZE_STRING);
1132
+	$settings = array_merge($settings, array('globalNOTAMSource' => $notamsource));
1133
+	$metarsource = filter_input(INPUT_POST, 'metarsource', FILTER_SANITIZE_STRING);
1134
+	$settings = array_merge($settings, array('globalMETARurl' => $metarsource));
1135 1135
 
1136
-	$zoilatitude = filter_input(INPUT_POST,'zoilatitude',FILTER_SANITIZE_STRING);
1137
-	$zoilongitude = filter_input(INPUT_POST,'zoilongitude',FILTER_SANITIZE_STRING);
1138
-	$zoidistance = filter_input(INPUT_POST,'zoidistance',FILTER_SANITIZE_NUMBER_INT);
1136
+	$zoilatitude = filter_input(INPUT_POST, 'zoilatitude', FILTER_SANITIZE_STRING);
1137
+	$zoilongitude = filter_input(INPUT_POST, 'zoilongitude', FILTER_SANITIZE_STRING);
1138
+	$zoidistance = filter_input(INPUT_POST, 'zoidistance', FILTER_SANITIZE_NUMBER_INT);
1139 1139
 	if ($zoilatitude != '' && $zoilongitude != '' && $zoidistance != '') {
1140
-		$settings = array_merge($settings,array('globalDistanceIgnore' => array('latitude' => $zoilatitude,'longitude' => $zoilongitude,'distance' => $zoidistance)));
1141
-	} else $settings = array_merge($settings,array('globalDistanceIgnore' => array()));
1140
+		$settings = array_merge($settings, array('globalDistanceIgnore' => array('latitude' => $zoilatitude, 'longitude' => $zoilongitude, 'distance' => $zoidistance)));
1141
+	} else $settings = array_merge($settings, array('globalDistanceIgnore' => array()));
1142 1142
 
1143
-	$refresh = filter_input(INPUT_POST,'refresh',FILTER_SANITIZE_NUMBER_INT);
1144
-	$settings = array_merge($settings,array('globalLiveInterval' => $refresh));
1145
-	$maprefresh = filter_input(INPUT_POST,'maprefresh',FILTER_SANITIZE_NUMBER_INT);
1146
-	$settings = array_merge($settings,array('globalMapRefresh' => $maprefresh));
1147
-	$mapidle = filter_input(INPUT_POST,'mapidle',FILTER_SANITIZE_NUMBER_INT);
1148
-	$settings = array_merge($settings,array('globalMapIdleTimeout' => $mapidle));
1149
-	$closestmindist = filter_input(INPUT_POST,'closestmindist',FILTER_SANITIZE_NUMBER_INT);
1150
-	$settings = array_merge($settings,array('globalClosestMinDist' => $closestmindist));
1143
+	$refresh = filter_input(INPUT_POST, 'refresh', FILTER_SANITIZE_NUMBER_INT);
1144
+	$settings = array_merge($settings, array('globalLiveInterval' => $refresh));
1145
+	$maprefresh = filter_input(INPUT_POST, 'maprefresh', FILTER_SANITIZE_NUMBER_INT);
1146
+	$settings = array_merge($settings, array('globalMapRefresh' => $maprefresh));
1147
+	$mapidle = filter_input(INPUT_POST, 'mapidle', FILTER_SANITIZE_NUMBER_INT);
1148
+	$settings = array_merge($settings, array('globalMapIdleTimeout' => $mapidle));
1149
+	$closestmindist = filter_input(INPUT_POST, 'closestmindist', FILTER_SANITIZE_NUMBER_INT);
1150
+	$settings = array_merge($settings, array('globalClosestMinDist' => $closestmindist));
1151 1151
 
1152
-	$aircraftsize = filter_input(INPUT_POST,'aircraftsize',FILTER_SANITIZE_NUMBER_INT);
1153
-	$settings = array_merge($settings,array('globalAircraftSize' => $aircraftsize));
1152
+	$aircraftsize = filter_input(INPUT_POST, 'aircraftsize', FILTER_SANITIZE_NUMBER_INT);
1153
+	$settings = array_merge($settings, array('globalAircraftSize' => $aircraftsize));
1154 1154
 
1155
-	$archivemonths = filter_input(INPUT_POST,'archivemonths',FILTER_SANITIZE_NUMBER_INT);
1156
-	$settings = array_merge($settings,array('globalArchiveMonths' => $archivemonths));
1155
+	$archivemonths = filter_input(INPUT_POST, 'archivemonths', FILTER_SANITIZE_NUMBER_INT);
1156
+	$settings = array_merge($settings, array('globalArchiveMonths' => $archivemonths));
1157 1157
 	
1158
-	$archiveyear = filter_input(INPUT_POST,'archiveyear',FILTER_SANITIZE_STRING);
1158
+	$archiveyear = filter_input(INPUT_POST, 'archiveyear', FILTER_SANITIZE_STRING);
1159 1159
 	if ($archiveyear == "archiveyear") {
1160
-		$settings = array_merge($settings,array('globalArchiveYear' => 'TRUE'));
1160
+		$settings = array_merge($settings, array('globalArchiveYear' => 'TRUE'));
1161 1161
 	} else {
1162
-		$settings = array_merge($settings,array('globalArchiveYear' => 'FALSE'));
1162
+		$settings = array_merge($settings, array('globalArchiveYear' => 'FALSE'));
1163 1163
 	}
1164
-	$archivekeepmonths = filter_input(INPUT_POST,'archivekeepmonths',FILTER_SANITIZE_NUMBER_INT);
1165
-	$settings = array_merge($settings,array('globalArchiveKeepMonths' => $archivekeepmonths));
1166
-	$archivekeeptrackmonths = filter_input(INPUT_POST,'archivekeeptrackmonths',FILTER_SANITIZE_NUMBER_INT);
1167
-	$settings = array_merge($settings,array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths));
1164
+	$archivekeepmonths = filter_input(INPUT_POST, 'archivekeepmonths', FILTER_SANITIZE_NUMBER_INT);
1165
+	$settings = array_merge($settings, array('globalArchiveKeepMonths' => $archivekeepmonths));
1166
+	$archivekeeptrackmonths = filter_input(INPUT_POST, 'archivekeeptrackmonths', FILTER_SANITIZE_NUMBER_INT);
1167
+	$settings = array_merge($settings, array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths));
1168 1168
 
1169
-	$britishairways = filter_input(INPUT_POST,'britishairways',FILTER_SANITIZE_STRING);
1170
-	$settings = array_merge($settings,array('globalBritishAirwaysKey' => $britishairways));
1171
-	$transavia = filter_input(INPUT_POST,'transavia',FILTER_SANITIZE_STRING);
1172
-	$settings = array_merge($settings,array('globalTransaviaKey' => $transavia));
1169
+	$britishairways = filter_input(INPUT_POST, 'britishairways', FILTER_SANITIZE_STRING);
1170
+	$settings = array_merge($settings, array('globalBritishAirwaysKey' => $britishairways));
1171
+	$transavia = filter_input(INPUT_POST, 'transavia', FILTER_SANITIZE_STRING);
1172
+	$settings = array_merge($settings, array('globalTransaviaKey' => $transavia));
1173 1173
 
1174
-	$lufthansakey = filter_input(INPUT_POST,'lufthansakey',FILTER_SANITIZE_STRING);
1175
-	$lufthansasecret = filter_input(INPUT_POST,'lufthansasecret',FILTER_SANITIZE_STRING);
1176
-	$settings = array_merge($settings,array('globalLufthansaKey' => array('key' => $lufthansakey,'secret' => $lufthansasecret)));
1174
+	$lufthansakey = filter_input(INPUT_POST, 'lufthansakey', FILTER_SANITIZE_STRING);
1175
+	$lufthansasecret = filter_input(INPUT_POST, 'lufthansasecret', FILTER_SANITIZE_STRING);
1176
+	$settings = array_merge($settings, array('globalLufthansaKey' => array('key' => $lufthansakey, 'secret' => $lufthansasecret)));
1177 1177
 
1178 1178
 	// Create in settings.php keys not yet configurable if not already here
1179 1179
 	//if (!isset($globalImageBingKey)) $settings = array_merge($settings,array('globalImageBingKey' => ''));
1180
-	if (!isset($globalDebug)) $settings = array_merge($settings,array('globalDebug' => 'TRUE'));
1180
+	if (!isset($globalDebug)) $settings = array_merge($settings, array('globalDebug' => 'TRUE'));
1181 1181
 
1182
-	$resetyearstats = filter_input(INPUT_POST,'resetyearstats',FILTER_SANITIZE_STRING);
1182
+	$resetyearstats = filter_input(INPUT_POST, 'resetyearstats', FILTER_SANITIZE_STRING);
1183 1183
 	if ($resetyearstats == 'resetyearstats') {
1184
-		$settings = array_merge($settings,array('globalDeleteLastYearStats' => 'TRUE'));
1184
+		$settings = array_merge($settings, array('globalDeleteLastYearStats' => 'TRUE'));
1185 1185
 	} else {
1186
-		$settings = array_merge($settings,array('globalDeleteLastYearStats' => 'FALSE'));
1186
+		$settings = array_merge($settings, array('globalDeleteLastYearStats' => 'FALSE'));
1187 1187
 	}
1188 1188
 
1189
-	$archive = filter_input(INPUT_POST,'archive',FILTER_SANITIZE_STRING);
1189
+	$archive = filter_input(INPUT_POST, 'archive', FILTER_SANITIZE_STRING);
1190 1190
 	if ($archive == 'archive') {
1191
-		$settings = array_merge($settings,array('globalArchive' => 'TRUE'));
1191
+		$settings = array_merge($settings, array('globalArchive' => 'TRUE'));
1192 1192
 	} else {
1193
-		$settings = array_merge($settings,array('globalArchive' => 'FALSE'));
1193
+		$settings = array_merge($settings, array('globalArchive' => 'FALSE'));
1194 1194
 	}
1195
-	$daemon = filter_input(INPUT_POST,'daemon',FILTER_SANITIZE_STRING);
1195
+	$daemon = filter_input(INPUT_POST, 'daemon', FILTER_SANITIZE_STRING);
1196 1196
 	if ($daemon == 'daemon') {
1197
-		$settings = array_merge($settings,array('globalDaemon' => 'TRUE'));
1197
+		$settings = array_merge($settings, array('globalDaemon' => 'TRUE'));
1198 1198
 	} else {
1199
-		$settings = array_merge($settings,array('globalDaemon' => 'FALSE'));
1199
+		$settings = array_merge($settings, array('globalDaemon' => 'FALSE'));
1200 1200
 	}
1201
-	$schedules = filter_input(INPUT_POST,'schedules',FILTER_SANITIZE_STRING);
1201
+	$schedules = filter_input(INPUT_POST, 'schedules', FILTER_SANITIZE_STRING);
1202 1202
 	if ($schedules == 'schedules') {
1203
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE'));
1203
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE'));
1204 1204
 	} else {
1205
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE'));
1205
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE'));
1206 1206
 	}
1207 1207
 
1208 1208
 /*
@@ -1213,227 +1213,227 @@  discard block
 block discarded – undo
1213 1213
 		$settings = array_merge($settings,array('globalFlightAware' => 'FALSE','globalSBS1' => 'TRUE'));
1214 1214
 	}
1215 1215
 */
1216
-	$settings = array_merge($settings,array('globalFlightAware' => 'FALSE'));
1217
-	if ($globalsbs == 'sbs') $settings = array_merge($settings,array('globalSBS1' => 'TRUE'));
1218
-	else $settings = array_merge($settings,array('globalSBS1' => 'FALSE'));
1219
-	if ($globalaprs == 'aprs') $settings = array_merge($settings,array('globalAPRS' => 'TRUE'));
1220
-	else $settings = array_merge($settings,array('globalAPRS' => 'FALSE'));
1216
+	$settings = array_merge($settings, array('globalFlightAware' => 'FALSE'));
1217
+	if ($globalsbs == 'sbs') $settings = array_merge($settings, array('globalSBS1' => 'TRUE'));
1218
+	else $settings = array_merge($settings, array('globalSBS1' => 'FALSE'));
1219
+	if ($globalaprs == 'aprs') $settings = array_merge($settings, array('globalAPRS' => 'TRUE'));
1220
+	else $settings = array_merge($settings, array('globalAPRS' => 'FALSE'));
1221 1221
 	$va = false;
1222 1222
 	if ($globalivao == 'ivao') {
1223
-		$settings = array_merge($settings,array('globalIVAO' => 'TRUE'));
1223
+		$settings = array_merge($settings, array('globalIVAO' => 'TRUE'));
1224 1224
 		$va = true;
1225
-	} else $settings = array_merge($settings,array('globalIVAO' => 'FALSE'));
1225
+	} else $settings = array_merge($settings, array('globalIVAO' => 'FALSE'));
1226 1226
 	if ($globalvatsim == 'vatsim') {
1227
-		$settings = array_merge($settings,array('globalVATSIM' => 'TRUE'));
1227
+		$settings = array_merge($settings, array('globalVATSIM' => 'TRUE'));
1228 1228
 		$va = true;
1229
-	} else $settings = array_merge($settings,array('globalVATSIM' => 'FALSE'));
1229
+	} else $settings = array_merge($settings, array('globalVATSIM' => 'FALSE'));
1230 1230
 	if ($globalphpvms == 'phpvms') {
1231
-		$settings = array_merge($settings,array('globalphpVMS' => 'TRUE'));
1231
+		$settings = array_merge($settings, array('globalphpVMS' => 'TRUE'));
1232 1232
 		$va = true;
1233
-	} else $settings = array_merge($settings,array('globalphpVMS' => 'FALSE'));
1233
+	} else $settings = array_merge($settings, array('globalphpVMS' => 'FALSE'));
1234 1234
 	if ($globalvam == 'vam') {
1235
-		$settings = array_merge($settings,array('globalVAM' => 'TRUE'));
1235
+		$settings = array_merge($settings, array('globalVAM' => 'TRUE'));
1236 1236
 		$va = true;
1237
-	} else $settings = array_merge($settings,array('globalVAM' => 'FALSE'));
1237
+	} else $settings = array_merge($settings, array('globalVAM' => 'FALSE'));
1238 1238
 	if ($va) {
1239
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE','globalTranslationFetch' => 'FALSE'));
1240
-	} else $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE'));
1239
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE', 'globalTranslationFetch' => 'FALSE'));
1240
+	} else $settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE', 'globalTranslationFetch' => 'TRUE'));
1241 1241
 	if ($globalva == 'va' || $va) {
1242
-		$settings = array_merge($settings,array('globalVA' => 'TRUE'));
1243
-		$settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE'));
1242
+		$settings = array_merge($settings, array('globalVA' => 'TRUE'));
1243
+		$settings = array_merge($settings, array('globalUsePilot' => 'TRUE', 'globalUseOwner' => 'FALSE'));
1244 1244
 	} else {
1245
-		$settings = array_merge($settings,array('globalVA' => 'FALSE'));
1246
-		if ($forcepilots) $settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE'));
1247
-		else $settings = array_merge($settings,array('globalUsePilot' => 'FALSE','globalUseOwner' => 'TRUE'));
1245
+		$settings = array_merge($settings, array('globalVA' => 'FALSE'));
1246
+		if ($forcepilots) $settings = array_merge($settings, array('globalUsePilot' => 'TRUE', 'globalUseOwner' => 'FALSE'));
1247
+		else $settings = array_merge($settings, array('globalUsePilot' => 'FALSE', 'globalUseOwner' => 'TRUE'));
1248 1248
 	}
1249 1249
 	
1250 1250
 	
1251 1251
 
1252
-	$notam = filter_input(INPUT_POST,'notam',FILTER_SANITIZE_STRING);
1252
+	$notam = filter_input(INPUT_POST, 'notam', FILTER_SANITIZE_STRING);
1253 1253
 	if ($notam == 'notam') {
1254
-		$settings = array_merge($settings,array('globalNOTAM' => 'TRUE'));
1254
+		$settings = array_merge($settings, array('globalNOTAM' => 'TRUE'));
1255 1255
 	} else {
1256
-		$settings = array_merge($settings,array('globalNOTAM' => 'FALSE'));
1256
+		$settings = array_merge($settings, array('globalNOTAM' => 'FALSE'));
1257 1257
 	}
1258
-	$owner = filter_input(INPUT_POST,'owner',FILTER_SANITIZE_STRING);
1258
+	$owner = filter_input(INPUT_POST, 'owner', FILTER_SANITIZE_STRING);
1259 1259
 	if ($owner == 'owner') {
1260
-		$settings = array_merge($settings,array('globalOwner' => 'TRUE'));
1260
+		$settings = array_merge($settings, array('globalOwner' => 'TRUE'));
1261 1261
 	} else {
1262
-		$settings = array_merge($settings,array('globalOwner' => 'FALSE'));
1262
+		$settings = array_merge($settings, array('globalOwner' => 'FALSE'));
1263 1263
 	}
1264
-	$map3d = filter_input(INPUT_POST,'map3d',FILTER_SANITIZE_STRING);
1264
+	$map3d = filter_input(INPUT_POST, 'map3d', FILTER_SANITIZE_STRING);
1265 1265
 	if ($map3d == 'map3d') {
1266
-		$settings = array_merge($settings,array('globalMap3D' => 'TRUE'));
1266
+		$settings = array_merge($settings, array('globalMap3D' => 'TRUE'));
1267 1267
 	} else {
1268
-		$settings = array_merge($settings,array('globalMap3D' => 'FALSE'));
1268
+		$settings = array_merge($settings, array('globalMap3D' => 'FALSE'));
1269 1269
 	}
1270
-	$crash = filter_input(INPUT_POST,'crash',FILTER_SANITIZE_STRING);
1270
+	$crash = filter_input(INPUT_POST, 'crash', FILTER_SANITIZE_STRING);
1271 1271
 	if ($crash == 'crash') {
1272
-		$settings = array_merge($settings,array('globalAccidents' => 'TRUE'));
1272
+		$settings = array_merge($settings, array('globalAccidents' => 'TRUE'));
1273 1273
 	} else {
1274
-		$settings = array_merge($settings,array('globalAccidents' => 'FALSE'));
1274
+		$settings = array_merge($settings, array('globalAccidents' => 'FALSE'));
1275 1275
 	}
1276
-	$mapsatellites = filter_input(INPUT_POST,'mapsatellites',FILTER_SANITIZE_STRING);
1276
+	$mapsatellites = filter_input(INPUT_POST, 'mapsatellites', FILTER_SANITIZE_STRING);
1277 1277
 	if ($mapsatellites == 'mapsatellites') {
1278
-		$settings = array_merge($settings,array('globalMapSatellites' => 'TRUE'));
1278
+		$settings = array_merge($settings, array('globalMapSatellites' => 'TRUE'));
1279 1279
 	} else {
1280
-		$settings = array_merge($settings,array('globalMapSatellites' => 'FALSE'));
1280
+		$settings = array_merge($settings, array('globalMapSatellites' => 'FALSE'));
1281 1281
 	}
1282
-	$map3ddefault = filter_input(INPUT_POST,'map3ddefault',FILTER_SANITIZE_STRING);
1282
+	$map3ddefault = filter_input(INPUT_POST, 'map3ddefault', FILTER_SANITIZE_STRING);
1283 1283
 	if ($map3ddefault == 'map3ddefault') {
1284
-		$settings = array_merge($settings,array('globalMap3Ddefault' => 'TRUE'));
1284
+		$settings = array_merge($settings, array('globalMap3Ddefault' => 'TRUE'));
1285 1285
 	} else {
1286
-		$settings = array_merge($settings,array('globalMap3Ddefault' => 'FALSE'));
1286
+		$settings = array_merge($settings, array('globalMap3Ddefault' => 'FALSE'));
1287 1287
 	}
1288
-	$translate = filter_input(INPUT_POST,'translate',FILTER_SANITIZE_STRING);
1288
+	$translate = filter_input(INPUT_POST, 'translate', FILTER_SANITIZE_STRING);
1289 1289
 	if ($translate == 'translate') {
1290
-		$settings = array_merge($settings,array('globalTranslate' => 'TRUE'));
1290
+		$settings = array_merge($settings, array('globalTranslate' => 'TRUE'));
1291 1291
 	} else {
1292
-		$settings = array_merge($settings,array('globalTranslate' => 'FALSE'));
1292
+		$settings = array_merge($settings, array('globalTranslate' => 'FALSE'));
1293 1293
 	}
1294
-	$realairlines = filter_input(INPUT_POST,'realairlines',FILTER_SANITIZE_STRING);
1294
+	$realairlines = filter_input(INPUT_POST, 'realairlines', FILTER_SANITIZE_STRING);
1295 1295
 	if ($realairlines == 'realairlines') {
1296
-		$settings = array_merge($settings,array('globalUseRealAirlines' => 'TRUE'));
1296
+		$settings = array_merge($settings, array('globalUseRealAirlines' => 'TRUE'));
1297 1297
 	} else {
1298
-		$settings = array_merge($settings,array('globalUseRealAirlines' => 'FALSE'));
1298
+		$settings = array_merge($settings, array('globalUseRealAirlines' => 'FALSE'));
1299 1299
 	}
1300
-	$estimation = filter_input(INPUT_POST,'estimation',FILTER_SANITIZE_STRING);
1300
+	$estimation = filter_input(INPUT_POST, 'estimation', FILTER_SANITIZE_STRING);
1301 1301
 	if ($estimation == 'estimation') {
1302
-		$settings = array_merge($settings,array('globalMapEstimation' => 'TRUE'));
1302
+		$settings = array_merge($settings, array('globalMapEstimation' => 'TRUE'));
1303 1303
 	} else {
1304
-		$settings = array_merge($settings,array('globalMapEstimation' => 'FALSE'));
1304
+		$settings = array_merge($settings, array('globalMapEstimation' => 'FALSE'));
1305 1305
 	}
1306
-	$metar = filter_input(INPUT_POST,'metar',FILTER_SANITIZE_STRING);
1306
+	$metar = filter_input(INPUT_POST, 'metar', FILTER_SANITIZE_STRING);
1307 1307
 	if ($metar == 'metar') {
1308
-		$settings = array_merge($settings,array('globalMETAR' => 'TRUE'));
1308
+		$settings = array_merge($settings, array('globalMETAR' => 'TRUE'));
1309 1309
 	} else {
1310
-		$settings = array_merge($settings,array('globalMETAR' => 'FALSE'));
1310
+		$settings = array_merge($settings, array('globalMETAR' => 'FALSE'));
1311 1311
 	}
1312
-	$metarcycle = filter_input(INPUT_POST,'metarcycle',FILTER_SANITIZE_STRING);
1312
+	$metarcycle = filter_input(INPUT_POST, 'metarcycle', FILTER_SANITIZE_STRING);
1313 1313
 	if ($metarcycle == 'metarcycle') {
1314
-		$settings = array_merge($settings,array('globalMETARcycle' => 'TRUE'));
1314
+		$settings = array_merge($settings, array('globalMETARcycle' => 'TRUE'));
1315 1315
 	} else {
1316
-		$settings = array_merge($settings,array('globalMETARcycle' => 'FALSE'));
1316
+		$settings = array_merge($settings, array('globalMETARcycle' => 'FALSE'));
1317 1317
 	}
1318
-	$fork = filter_input(INPUT_POST,'fork',FILTER_SANITIZE_STRING);
1318
+	$fork = filter_input(INPUT_POST, 'fork', FILTER_SANITIZE_STRING);
1319 1319
 	if ($fork == 'fork') {
1320
-		$settings = array_merge($settings,array('globalFork' => 'TRUE'));
1320
+		$settings = array_merge($settings, array('globalFork' => 'TRUE'));
1321 1321
 	} else {
1322
-		$settings = array_merge($settings,array('globalFork' => 'FALSE'));
1322
+		$settings = array_merge($settings, array('globalFork' => 'FALSE'));
1323 1323
 	}
1324 1324
 
1325
-	$colormap = filter_input(INPUT_POST,'colormap',FILTER_SANITIZE_STRING);
1325
+	$colormap = filter_input(INPUT_POST, 'colormap', FILTER_SANITIZE_STRING);
1326 1326
 	if ($colormap == 'colormap') {
1327
-		$settings = array_merge($settings,array('globalMapAltitudeColor' => 'TRUE'));
1327
+		$settings = array_merge($settings, array('globalMapAltitudeColor' => 'TRUE'));
1328 1328
 	} else {
1329
-		$settings = array_merge($settings,array('globalMapAltitudeColor' => 'FALSE'));
1329
+		$settings = array_merge($settings, array('globalMapAltitudeColor' => 'FALSE'));
1330 1330
 	}
1331 1331
 	
1332 1332
 	if (isset($_POST['aircrafticoncolor'])) {
1333
-		$aircrafticoncolor = filter_input(INPUT_POST,'aircrafticoncolor',FILTER_SANITIZE_STRING);
1334
-		$settings = array_merge($settings,array('globalAircraftIconColor' => substr($aircrafticoncolor,1)));
1333
+		$aircrafticoncolor = filter_input(INPUT_POST, 'aircrafticoncolor', FILTER_SANITIZE_STRING);
1334
+		$settings = array_merge($settings, array('globalAircraftIconColor' => substr($aircrafticoncolor, 1)));
1335 1335
 	}
1336 1336
 
1337
-	$airportzoom = filter_input(INPUT_POST,'airportzoom',FILTER_SANITIZE_NUMBER_INT);
1338
-	$settings = array_merge($settings,array('globalAirportZoom' => $airportzoom));
1337
+	$airportzoom = filter_input(INPUT_POST, 'airportzoom', FILTER_SANITIZE_NUMBER_INT);
1338
+	$settings = array_merge($settings, array('globalAirportZoom' => $airportzoom));
1339 1339
 
1340
-	$unitdistance = filter_input(INPUT_POST,'unitdistance',FILTER_SANITIZE_STRING);
1341
-	$settings = array_merge($settings,array('globalUnitDistance' => $unitdistance));
1342
-	$unitaltitude = filter_input(INPUT_POST,'unitaltitude',FILTER_SANITIZE_STRING);
1343
-	$settings = array_merge($settings,array('globalUnitAltitude' => $unitaltitude));
1344
-	$unitspeed = filter_input(INPUT_POST,'unitspeed',FILTER_SANITIZE_STRING);
1345
-	$settings = array_merge($settings,array('globalUnitSpeed' => $unitspeed));
1340
+	$unitdistance = filter_input(INPUT_POST, 'unitdistance', FILTER_SANITIZE_STRING);
1341
+	$settings = array_merge($settings, array('globalUnitDistance' => $unitdistance));
1342
+	$unitaltitude = filter_input(INPUT_POST, 'unitaltitude', FILTER_SANITIZE_STRING);
1343
+	$settings = array_merge($settings, array('globalUnitAltitude' => $unitaltitude));
1344
+	$unitspeed = filter_input(INPUT_POST, 'unitspeed', FILTER_SANITIZE_STRING);
1345
+	$settings = array_merge($settings, array('globalUnitSpeed' => $unitspeed));
1346 1346
 
1347
-	$mappopup = filter_input(INPUT_POST,'mappopup',FILTER_SANITIZE_STRING);
1347
+	$mappopup = filter_input(INPUT_POST, 'mappopup', FILTER_SANITIZE_STRING);
1348 1348
 	if ($mappopup == 'mappopup') {
1349
-		$settings = array_merge($settings,array('globalMapPopup' => 'TRUE'));
1349
+		$settings = array_merge($settings, array('globalMapPopup' => 'TRUE'));
1350 1350
 	} else {
1351
-		$settings = array_merge($settings,array('globalMapPopup' => 'FALSE'));
1351
+		$settings = array_merge($settings, array('globalMapPopup' => 'FALSE'));
1352 1352
 	}
1353
-	$airportpopup = filter_input(INPUT_POST,'airportpopup',FILTER_SANITIZE_STRING);
1353
+	$airportpopup = filter_input(INPUT_POST, 'airportpopup', FILTER_SANITIZE_STRING);
1354 1354
 	if ($airportpopup == 'airportpopup') {
1355
-		$settings = array_merge($settings,array('globalAirportPopup' => 'TRUE'));
1355
+		$settings = array_merge($settings, array('globalAirportPopup' => 'TRUE'));
1356 1356
 	} else {
1357
-		$settings = array_merge($settings,array('globalAirportPopup' => 'FALSE'));
1357
+		$settings = array_merge($settings, array('globalAirportPopup' => 'FALSE'));
1358 1358
 	}
1359
-	$maphistory = filter_input(INPUT_POST,'maphistory',FILTER_SANITIZE_STRING);
1359
+	$maphistory = filter_input(INPUT_POST, 'maphistory', FILTER_SANITIZE_STRING);
1360 1360
 	if ($maphistory == 'maphistory') {
1361
-		$settings = array_merge($settings,array('globalMapHistory' => 'TRUE'));
1361
+		$settings = array_merge($settings, array('globalMapHistory' => 'TRUE'));
1362 1362
 	} else {
1363
-		$settings = array_merge($settings,array('globalMapHistory' => 'FALSE'));
1363
+		$settings = array_merge($settings, array('globalMapHistory' => 'FALSE'));
1364 1364
 	}
1365
-	$maptooltip = filter_input(INPUT_POST,'maptooltip',FILTER_SANITIZE_STRING);
1365
+	$maptooltip = filter_input(INPUT_POST, 'maptooltip', FILTER_SANITIZE_STRING);
1366 1366
 	if ($maptooltip == 'maptooltip') {
1367
-		$settings = array_merge($settings,array('globalMapTooltip' => 'TRUE'));
1367
+		$settings = array_merge($settings, array('globalMapTooltip' => 'TRUE'));
1368 1368
 	} else {
1369
-		$settings = array_merge($settings,array('globalMapTooltip' => 'FALSE'));
1369
+		$settings = array_merge($settings, array('globalMapTooltip' => 'FALSE'));
1370 1370
 	}
1371
-	$flightroute = filter_input(INPUT_POST,'flightroute',FILTER_SANITIZE_STRING);
1371
+	$flightroute = filter_input(INPUT_POST, 'flightroute', FILTER_SANITIZE_STRING);
1372 1372
 	if ($flightroute == 'flightroute') {
1373
-		$settings = array_merge($settings,array('globalMapRoute' => 'TRUE'));
1373
+		$settings = array_merge($settings, array('globalMapRoute' => 'TRUE'));
1374 1374
 	} else {
1375
-		$settings = array_merge($settings,array('globalMapRoute' => 'FALSE'));
1375
+		$settings = array_merge($settings, array('globalMapRoute' => 'FALSE'));
1376 1376
 	}
1377
-	$flightremainingroute = filter_input(INPUT_POST,'flightremainingroute',FILTER_SANITIZE_STRING);
1377
+	$flightremainingroute = filter_input(INPUT_POST, 'flightremainingroute', FILTER_SANITIZE_STRING);
1378 1378
 	if ($flightremainingroute == 'flightremainingroute') {
1379
-		$settings = array_merge($settings,array('globalMapRemainingRoute' => 'TRUE'));
1379
+		$settings = array_merge($settings, array('globalMapRemainingRoute' => 'TRUE'));
1380 1380
 	} else {
1381
-		$settings = array_merge($settings,array('globalMapRemainingRoute' => 'FALSE'));
1381
+		$settings = array_merge($settings, array('globalMapRemainingRoute' => 'FALSE'));
1382 1382
 	}
1383
-	$allflights = filter_input(INPUT_POST,'allflights',FILTER_SANITIZE_STRING);
1383
+	$allflights = filter_input(INPUT_POST, 'allflights', FILTER_SANITIZE_STRING);
1384 1384
 	if ($allflights == 'allflights') {
1385
-		$settings = array_merge($settings,array('globalAllFlights' => 'TRUE'));
1385
+		$settings = array_merge($settings, array('globalAllFlights' => 'TRUE'));
1386 1386
 	} else {
1387
-		$settings = array_merge($settings,array('globalAllFlights' => 'FALSE'));
1387
+		$settings = array_merge($settings, array('globalAllFlights' => 'FALSE'));
1388 1388
 	}
1389
-	$bbox = filter_input(INPUT_POST,'bbox',FILTER_SANITIZE_STRING);
1389
+	$bbox = filter_input(INPUT_POST, 'bbox', FILTER_SANITIZE_STRING);
1390 1390
 	if ($bbox == 'bbox') {
1391
-		$settings = array_merge($settings,array('globalMapUseBbox' => 'TRUE'));
1391
+		$settings = array_merge($settings, array('globalMapUseBbox' => 'TRUE'));
1392 1392
 	} else {
1393
-		$settings = array_merge($settings,array('globalMapUseBbox' => 'FALSE'));
1393
+		$settings = array_merge($settings, array('globalMapUseBbox' => 'FALSE'));
1394 1394
 	}
1395
-	$groundaltitude = filter_input(INPUT_POST,'groundaltitude',FILTER_SANITIZE_STRING);
1395
+	$groundaltitude = filter_input(INPUT_POST, 'groundaltitude', FILTER_SANITIZE_STRING);
1396 1396
 	if ($groundaltitude == 'groundaltitude') {
1397
-		$settings = array_merge($settings,array('globalGroundAltitude' => 'TRUE'));
1397
+		$settings = array_merge($settings, array('globalGroundAltitude' => 'TRUE'));
1398 1398
 	} else {
1399
-		$settings = array_merge($settings,array('globalGroundAltitude' => 'FALSE'));
1399
+		$settings = array_merge($settings, array('globalGroundAltitude' => 'FALSE'));
1400 1400
 	}
1401
-	$waypoints = filter_input(INPUT_POST,'waypoints',FILTER_SANITIZE_STRING);
1401
+	$waypoints = filter_input(INPUT_POST, 'waypoints', FILTER_SANITIZE_STRING);
1402 1402
 	if ($waypoints == 'waypoints') {
1403
-		$settings = array_merge($settings,array('globalWaypoints' => 'TRUE'));
1403
+		$settings = array_merge($settings, array('globalWaypoints' => 'TRUE'));
1404 1404
 	} else {
1405
-		$settings = array_merge($settings,array('globalWaypoints' => 'FALSE'));
1405
+		$settings = array_merge($settings, array('globalWaypoints' => 'FALSE'));
1406 1406
 	}
1407
-	$geoid = filter_input(INPUT_POST,'geoid',FILTER_SANITIZE_STRING);
1407
+	$geoid = filter_input(INPUT_POST, 'geoid', FILTER_SANITIZE_STRING);
1408 1408
 	if ($geoid == 'geoid') {
1409
-		$settings = array_merge($settings,array('globalGeoid' => 'TRUE'));
1409
+		$settings = array_merge($settings, array('globalGeoid' => 'TRUE'));
1410 1410
 	} else {
1411
-		$settings = array_merge($settings,array('globalGeoid' => 'FALSE'));
1411
+		$settings = array_merge($settings, array('globalGeoid' => 'FALSE'));
1412 1412
 	}
1413
-	$geoid_source = filter_input(INPUT_POST,'geoid_source',FILTER_SANITIZE_STRING);
1414
-	$settings = array_merge($settings,array('globalGeoidSource' => $geoid_source));
1413
+	$geoid_source = filter_input(INPUT_POST, 'geoid_source', FILTER_SANITIZE_STRING);
1414
+	$settings = array_merge($settings, array('globalGeoidSource' => $geoid_source));
1415 1415
 
1416
-	$noairlines = filter_input(INPUT_POST,'noairlines',FILTER_SANITIZE_STRING);
1416
+	$noairlines = filter_input(INPUT_POST, 'noairlines', FILTER_SANITIZE_STRING);
1417 1417
 	if ($noairlines == 'noairlines') {
1418
-		$settings = array_merge($settings,array('globalNoAirlines' => 'TRUE'));
1418
+		$settings = array_merge($settings, array('globalNoAirlines' => 'TRUE'));
1419 1419
 	} else {
1420
-		$settings = array_merge($settings,array('globalNoAirlines' => 'FALSE'));
1420
+		$settings = array_merge($settings, array('globalNoAirlines' => 'FALSE'));
1421 1421
 	}
1422 1422
 
1423
-	if (!isset($globalTransaction)) $settings = array_merge($settings,array('globalTransaction' => 'TRUE'));
1423
+	if (!isset($globalTransaction)) $settings = array_merge($settings, array('globalTransaction' => 'TRUE'));
1424 1424
 
1425 1425
 	// Set some defaults values...
1426 1426
 	if (!isset($globalAircraftImageSources)) {
1427
-	    $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
1428
-	    $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources));
1427
+	    $globalAircraftImageSources = array('ivaomtl', 'wikimedia', 'airportdata', 'deviantart', 'flickr', 'bing', 'jetphotos', 'planepictures', 'planespotters');
1428
+	    $settings = array_merge($settings, array('globalAircraftImageSources' => $globalAircraftImageSources));
1429 1429
 	}
1430 1430
 
1431 1431
 	if (!isset($globalSchedulesSources)) {
1432
-	    $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
1433
-    	    $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources));
1432
+	    $globalSchedulesSources = array('flightmapper', 'costtotravel', 'flightradar24', 'flightaware');
1433
+    	    $settings = array_merge($settings, array('globalSchedulesSources' => $globalSchedulesSources));
1434 1434
     	}
1435 1435
 
1436
-	$settings = array_merge($settings,array('globalInstalled' => 'TRUE'));
1436
+	$settings = array_merge($settings, array('globalInstalled' => 'TRUE'));
1437 1437
 
1438 1438
 	if ($error == '') settings::modify_settings($settings);
1439 1439
 	if ($error == '') settings::comment_settings($settings_comment);
Please login to merge, or discard this patch.