Completed
Push — master ( 2874a1...1a51fc )
by Yannick
09:22
created
install/index.php 1 patch
Spacing   +227 added lines, -227 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 require_once(dirname(__FILE__).'/class.create_db.php');
11 11
 require_once(dirname(__FILE__).'/class.update_schema.php');
12 12
 require_once(dirname(__FILE__).'/class.settings.php');
13
-$title="Install";
13
+$title = "Install";
14 14
 require(dirname(__FILE__).'/../require/settings.php');
15 15
 require(dirname(__FILE__).'/header.php');
16 16
 
@@ -69,8 +69,8 @@  discard block
 block discarded – undo
69 69
 if (!extension_loaded('curl')) {
70 70
 	$error[] = "Curl is not loaded.";
71 71
 }
72
-if(function_exists('apache_get_modules') ){
73
-	if(!in_array('mod_rewrite',apache_get_modules())) {
72
+if (function_exists('apache_get_modules')) {
73
+	if (!in_array('mod_rewrite', apache_get_modules())) {
74 74
 		$error[] = "mod_rewrite is not available.";
75 75
 	}
76 76
 /*
@@ -86,8 +86,8 @@  discard block
 block discarded – undo
86 86
 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>';
87 87
 if (isset($_SERVER['REQUEST_SCHEME']) && isset($_SERVER['SERVER_NAME']) && isset($_SERVER['SERVER_PORT']) && isset($_SERVER['REQUEST_URI'])) {
88 88
 	if (function_exists('get_headers')) {
89
-		$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace('install/','search',str_replace('index.php',$_SERVER["REQUEST_URI"])));
90
-		if (isset($check_header[0]) && !stripos($check_header[0],"200 OK")) {
89
+		$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace('install/', 'search', str_replace('index.php', $_SERVER["REQUEST_URI"])));
90
+		if (isset($check_header[0]) && !stripos($check_header[0], "200 OK")) {
91 91
 			print '<div class="info column"><p><strong>Check your configuration, rewrite don\'t seems to work.</strong></p></div>';
92 92
 		}
93 93
 	}
@@ -441,13 +441,13 @@  discard block
 block discarded – undo
441 441
 ?>
442 442
 							<tr>
443 443
 								<?php
444
-								    if (filter_var($source['host'],FILTER_VALIDATE_URL)) {
444
+								    if (filter_var($source['host'], FILTER_VALIDATE_URL)) {
445 445
 								?>
446 446
 								<td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td>
447 447
 								<td><input type="number" name="port[]" id="port" value="<?php print $source['port']; ?>" /></td>
448 448
 								<?php
449 449
 								    } else {
450
-									$hostport = explode(':',$source['host']);
450
+									$hostport = explode(':', $source['host']);
451 451
 									if (isset($hostport[1])) {
452 452
 										$host = $hostport[0];
453 453
 										$port = $hostport[1];
@@ -799,7 +799,7 @@  discard block
 block discarded – undo
799 799
 			<br />
800 800
 			<p>
801 801
 				<label for="aircraftsize">Size of aircraft icon on map (default to 30px if zoom > 7 else 15px), empty to default</label>
802
-				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize;?>" />
802
+				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize; ?>" />
803 803
 			</p>
804 804
 			<br />
805 805
 			<p>
@@ -855,14 +855,14 @@  discard block
 block discarded – undo
855 855
 $error = '';
856 856
 
857 857
 if (isset($_POST['dbtype'])) {
858
-	$dbtype = filter_input(INPUT_POST,'dbtype',FILTER_SANITIZE_STRING);
859
-	$dbroot = filter_input(INPUT_POST,'dbroot',FILTER_SANITIZE_STRING);
860
-	$dbrootpass = filter_input(INPUT_POST,'dbrootpass',FILTER_SANITIZE_STRING);
861
-	$dbname = filter_input(INPUT_POST,'dbname',FILTER_SANITIZE_STRING);
862
-	$dbuser = filter_input(INPUT_POST,'dbuser',FILTER_SANITIZE_STRING);
863
-	$dbuserpass = filter_input(INPUT_POST,'dbuserpass',FILTER_SANITIZE_STRING);
864
-	$dbhost = filter_input(INPUT_POST,'dbhost',FILTER_SANITIZE_STRING);
865
-	$dbport = filter_input(INPUT_POST,'dbport',FILTER_SANITIZE_STRING);
858
+	$dbtype = filter_input(INPUT_POST, 'dbtype', FILTER_SANITIZE_STRING);
859
+	$dbroot = filter_input(INPUT_POST, 'dbroot', FILTER_SANITIZE_STRING);
860
+	$dbrootpass = filter_input(INPUT_POST, 'dbrootpass', FILTER_SANITIZE_STRING);
861
+	$dbname = filter_input(INPUT_POST, 'dbname', FILTER_SANITIZE_STRING);
862
+	$dbuser = filter_input(INPUT_POST, 'dbuser', FILTER_SANITIZE_STRING);
863
+	$dbuserpass = filter_input(INPUT_POST, 'dbuserpass', FILTER_SANITIZE_STRING);
864
+	$dbhost = filter_input(INPUT_POST, 'dbhost', FILTER_SANITIZE_STRING);
865
+	$dbport = filter_input(INPUT_POST, 'dbport', FILTER_SANITIZE_STRING);
866 866
 
867 867
 	if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) $error .= 'Mysql driver for PDO must be loaded';
868 868
 	if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) $error .= 'PosgreSQL driver for PDO must be loaded';
@@ -882,48 +882,48 @@  discard block
 block discarded – undo
882 882
 	} else $settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname));
883 883
 	*/
884 884
 	
885
-	$settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname));
885
+	$settings = array_merge($settings, array('globalDBdriver' => $dbtype, 'globalDBhost' => $dbhost, 'globalDBuser' => $dbuser, 'globalDBport' => $dbport, 'globalDBpass' => $dbuserpass, 'globalDBname' => $dbname));
886 886
 
887
-	$sitename = filter_input(INPUT_POST,'sitename',FILTER_SANITIZE_STRING);
888
-	$siteurl = filter_input(INPUT_POST,'siteurl',FILTER_SANITIZE_STRING);
889
-	$timezone = filter_input(INPUT_POST,'timezone',FILTER_SANITIZE_STRING);
890
-	$language = filter_input(INPUT_POST,'language',FILTER_SANITIZE_STRING);
891
-	$settings = array_merge($settings,array('globalName' => $sitename,'globalURL' => $siteurl, 'globalTimezone' => $timezone,'globalLanguage' => $language));
887
+	$sitename = filter_input(INPUT_POST, 'sitename', FILTER_SANITIZE_STRING);
888
+	$siteurl = filter_input(INPUT_POST, 'siteurl', FILTER_SANITIZE_STRING);
889
+	$timezone = filter_input(INPUT_POST, 'timezone', FILTER_SANITIZE_STRING);
890
+	$language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_STRING);
891
+	$settings = array_merge($settings, array('globalName' => $sitename, 'globalURL' => $siteurl, 'globalTimezone' => $timezone, 'globalLanguage' => $language));
892 892
 
893
-	$mapprovider = filter_input(INPUT_POST,'mapprovider',FILTER_SANITIZE_STRING);
894
-	$mapboxid = filter_input(INPUT_POST,'mapboxid',FILTER_SANITIZE_STRING);
895
-	$mapboxtoken = filter_input(INPUT_POST,'mapboxtoken',FILTER_SANITIZE_STRING);
896
-	$googlekey = filter_input(INPUT_POST,'googlekey',FILTER_SANITIZE_STRING);
897
-	$bingkey = filter_input(INPUT_POST,'bingkey',FILTER_SANITIZE_STRING);
898
-	$mapquestkey = filter_input(INPUT_POST,'mapquestkey',FILTER_SANITIZE_STRING);
899
-	$hereappid = filter_input(INPUT_POST,'hereappid',FILTER_SANITIZE_STRING);
900
-	$hereappcode = filter_input(INPUT_POST,'hereappcode',FILTER_SANITIZE_STRING);
901
-	$settings = array_merge($settings,array('globalMapProvider' => $mapprovider,'globalMapboxId' => $mapboxid,'globalMapboxToken' => $mapboxtoken,'globalGoogleAPIKey' => $googlekey,'globalBingMapKey' => $bingkey,'globalHereappID' => $hereappid,'globalHereappCode' => $hereappcode,'globalMapQuestKey' => $mapquestkey));
893
+	$mapprovider = filter_input(INPUT_POST, 'mapprovider', FILTER_SANITIZE_STRING);
894
+	$mapboxid = filter_input(INPUT_POST, 'mapboxid', FILTER_SANITIZE_STRING);
895
+	$mapboxtoken = filter_input(INPUT_POST, 'mapboxtoken', FILTER_SANITIZE_STRING);
896
+	$googlekey = filter_input(INPUT_POST, 'googlekey', FILTER_SANITIZE_STRING);
897
+	$bingkey = filter_input(INPUT_POST, 'bingkey', FILTER_SANITIZE_STRING);
898
+	$mapquestkey = filter_input(INPUT_POST, 'mapquestkey', FILTER_SANITIZE_STRING);
899
+	$hereappid = filter_input(INPUT_POST, 'hereappid', FILTER_SANITIZE_STRING);
900
+	$hereappcode = filter_input(INPUT_POST, 'hereappcode', FILTER_SANITIZE_STRING);
901
+	$settings = array_merge($settings, array('globalMapProvider' => $mapprovider, 'globalMapboxId' => $mapboxid, 'globalMapboxToken' => $mapboxtoken, 'globalGoogleAPIKey' => $googlekey, 'globalBingMapKey' => $bingkey, 'globalHereappID' => $hereappid, 'globalHereappCode' => $hereappcode, 'globalMapQuestKey' => $mapquestkey));
902 902
 	
903
-	$latitudemax = filter_input(INPUT_POST,'latitudemax',FILTER_SANITIZE_STRING);
904
-	$latitudemin = filter_input(INPUT_POST,'latitudemin',FILTER_SANITIZE_STRING);
905
-	$longitudemax = filter_input(INPUT_POST,'longitudemax',FILTER_SANITIZE_STRING);
906
-	$longitudemin = filter_input(INPUT_POST,'longitudemin',FILTER_SANITIZE_STRING);
907
-	$livezoom = filter_input(INPUT_POST,'livezoom',FILTER_SANITIZE_NUMBER_INT);
908
-	$settings = array_merge($settings,array('globalLatitudeMax' => $latitudemax,'globalLatitudeMin' => $latitudemin,'globalLongitudeMax' => $longitudemax,'globalLongitudeMin' => $longitudemin,'globalLiveZoom' => $livezoom));
903
+	$latitudemax = filter_input(INPUT_POST, 'latitudemax', FILTER_SANITIZE_STRING);
904
+	$latitudemin = filter_input(INPUT_POST, 'latitudemin', FILTER_SANITIZE_STRING);
905
+	$longitudemax = filter_input(INPUT_POST, 'longitudemax', FILTER_SANITIZE_STRING);
906
+	$longitudemin = filter_input(INPUT_POST, 'longitudemin', FILTER_SANITIZE_STRING);
907
+	$livezoom = filter_input(INPUT_POST, 'livezoom', FILTER_SANITIZE_NUMBER_INT);
908
+	$settings = array_merge($settings, array('globalLatitudeMax' => $latitudemax, 'globalLatitudeMin' => $latitudemin, 'globalLongitudeMax' => $longitudemax, 'globalLongitudeMin' => $longitudemin, 'globalLiveZoom' => $livezoom));
909 909
 
910
-	$squawk_country = filter_input(INPUT_POST,'squawk_country',FILTER_SANITIZE_STRING);
911
-	$settings = array_merge($settings,array('globalSquawkCountry' => $squawk_country));
910
+	$squawk_country = filter_input(INPUT_POST, 'squawk_country', FILTER_SANITIZE_STRING);
911
+	$settings = array_merge($settings, array('globalSquawkCountry' => $squawk_country));
912 912
 
913
-	$latitudecenter = filter_input(INPUT_POST,'latitudecenter',FILTER_SANITIZE_STRING);
914
-	$longitudecenter = filter_input(INPUT_POST,'longitudecenter',FILTER_SANITIZE_STRING);
915
-	$settings = array_merge($settings,array('globalCenterLatitude' => $latitudecenter,'globalCenterLongitude' => $longitudecenter));
913
+	$latitudecenter = filter_input(INPUT_POST, 'latitudecenter', FILTER_SANITIZE_STRING);
914
+	$longitudecenter = filter_input(INPUT_POST, 'longitudecenter', FILTER_SANITIZE_STRING);
915
+	$settings = array_merge($settings, array('globalCenterLatitude' => $latitudecenter, 'globalCenterLongitude' => $longitudecenter));
916 916
 
917
-	$acars = filter_input(INPUT_POST,'acars',FILTER_SANITIZE_STRING);
917
+	$acars = filter_input(INPUT_POST, 'acars', FILTER_SANITIZE_STRING);
918 918
 	if ($acars == 'acars') {
919
-		$settings = array_merge($settings,array('globalACARS' => 'TRUE'));
919
+		$settings = array_merge($settings, array('globalACARS' => 'TRUE'));
920 920
 	} else {
921
-		$settings = array_merge($settings,array('globalACARS' => 'FALSE'));
921
+		$settings = array_merge($settings, array('globalACARS' => 'FALSE'));
922 922
 	}
923 923
 
924
-	$flightawareusername = filter_input(INPUT_POST,'flightawareusername',FILTER_SANITIZE_STRING);
925
-	$flightawarepassword = filter_input(INPUT_POST,'flightawarepassword',FILTER_SANITIZE_STRING);
926
-	$settings = array_merge($settings,array('globalFlightAwareUsername' => $flightawareusername,'globalFlightAwarePassword' => $flightawarepassword));
924
+	$flightawareusername = filter_input(INPUT_POST, 'flightawareusername', FILTER_SANITIZE_STRING);
925
+	$flightawarepassword = filter_input(INPUT_POST, 'flightawarepassword', FILTER_SANITIZE_STRING);
926
+	$settings = array_merge($settings, array('globalFlightAwareUsername' => $flightawareusername, 'globalFlightAwarePassword' => $flightawarepassword));
927 927
 	
928 928
 	$source_name = $_POST['source_name'];
929 929
 	$source_latitude = $_POST['source_latitude'];
@@ -937,8 +937,8 @@  discard block
 block discarded – undo
937 937
 	
938 938
 	$sources = array();
939 939
 	foreach ($source_name as $keys => $name) {
940
-	    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]);
941
-	    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]);
940
+	    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]);
941
+	    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]);
942 942
 	}
943 943
 	if (count($sources) > 0) $_SESSION['sources'] = $sources;
944 944
 
@@ -951,24 +951,24 @@  discard block
 block discarded – undo
951 951
 	$sbsurl = $_POST['sbsurl'];
952 952
 	*/
953 953
 
954
-	$globalvatsim = filter_input(INPUT_POST,'globalvatsim',FILTER_SANITIZE_STRING);
955
-	$globalva = filter_input(INPUT_POST,'globalva',FILTER_SANITIZE_STRING);
956
-	$globalivao = filter_input(INPUT_POST,'globalivao',FILTER_SANITIZE_STRING);
957
-	$globalphpvms = filter_input(INPUT_POST,'globalphpvms',FILTER_SANITIZE_STRING);
958
-	$globalvam = filter_input(INPUT_POST,'globalvam',FILTER_SANITIZE_STRING);
959
-	$globalsbs = filter_input(INPUT_POST,'globalsbs',FILTER_SANITIZE_STRING);
960
-	$globalaprs = filter_input(INPUT_POST,'globalaprs',FILTER_SANITIZE_STRING);
961
-	$datasource = filter_input(INPUT_POST,'datasource',FILTER_SANITIZE_STRING);
954
+	$globalvatsim = filter_input(INPUT_POST, 'globalvatsim', FILTER_SANITIZE_STRING);
955
+	$globalva = filter_input(INPUT_POST, 'globalva', FILTER_SANITIZE_STRING);
956
+	$globalivao = filter_input(INPUT_POST, 'globalivao', FILTER_SANITIZE_STRING);
957
+	$globalphpvms = filter_input(INPUT_POST, 'globalphpvms', FILTER_SANITIZE_STRING);
958
+	$globalvam = filter_input(INPUT_POST, 'globalvam', FILTER_SANITIZE_STRING);
959
+	$globalsbs = filter_input(INPUT_POST, 'globalsbs', FILTER_SANITIZE_STRING);
960
+	$globalaprs = filter_input(INPUT_POST, 'globalaprs', FILTER_SANITIZE_STRING);
961
+	$datasource = filter_input(INPUT_POST, 'datasource', FILTER_SANITIZE_STRING);
962 962
 
963
-	$globalaircraft = filter_input(INPUT_POST,'globalaircraft',FILTER_SANITIZE_STRING);
964
-	if ($globalaircraft == 'aircraft') $settings = array_merge($settings,array('globalAircraft' => 'TRUE'));
965
-	else $settings = array_merge($settings,array('globalAircraft' => 'FALSE'));
966
-	$globaltracker = filter_input(INPUT_POST,'globaltracker',FILTER_SANITIZE_STRING);
967
-	if ($globaltracker == 'tracker') $settings = array_merge($settings,array('globalTracker' => 'TRUE'));
968
-	else $settings = array_merge($settings,array('globalTracker' => 'FALSE'));
969
-	$globalmarine = filter_input(INPUT_POST,'globalmarine',FILTER_SANITIZE_STRING);
970
-	if ($globalmarine == 'marine') $settings = array_merge($settings,array('globalMarine' => 'TRUE'));
971
-	else $settings = array_merge($settings,array('globalMarine' => 'FALSE'));
963
+	$globalaircraft = filter_input(INPUT_POST, 'globalaircraft', FILTER_SANITIZE_STRING);
964
+	if ($globalaircraft == 'aircraft') $settings = array_merge($settings, array('globalAircraft' => 'TRUE'));
965
+	else $settings = array_merge($settings, array('globalAircraft' => 'FALSE'));
966
+	$globaltracker = filter_input(INPUT_POST, 'globaltracker', FILTER_SANITIZE_STRING);
967
+	if ($globaltracker == 'tracker') $settings = array_merge($settings, array('globalTracker' => 'TRUE'));
968
+	else $settings = array_merge($settings, array('globalTracker' => 'FALSE'));
969
+	$globalmarine = filter_input(INPUT_POST, 'globalmarine', FILTER_SANITIZE_STRING);
970
+	if ($globalmarine == 'marine') $settings = array_merge($settings, array('globalMarine' => 'TRUE'));
971
+	else $settings = array_merge($settings, array('globalMarine' => 'FALSE'));
972 972
 
973 973
 /*	
974 974
 	$globalSBS1Hosts = array();
@@ -984,7 +984,7 @@  discard block
 block discarded – undo
984 984
 	}
985 985
 	$settings = array_merge($settings,array('globalSBS1Hosts' => $globalSBS1Hosts));
986 986
 */
987
-	$settings_comment = array_merge($settings_comment,array('globalSBS1Hosts'));
987
+	$settings_comment = array_merge($settings_comment, array('globalSBS1Hosts'));
988 988
 	$host = $_POST['host'];
989 989
 	$port = $_POST['port'];
990 990
 	$name = $_POST['name'];
@@ -999,99 +999,99 @@  discard block
 block discarded – undo
999 999
 		else $cov = 'FALSE';
1000 1000
 		if (isset($noarchive[$key]) && $noarchive[$key] == 1) $arch = 'TRUE';
1001 1001
 		else $arch = 'FALSE';
1002
-		if ($h != '') $gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch);
1002
+		if ($h != '') $gSources[] = array('host' => $h, 'port' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov, 'noarchive' => $arch);
1003 1003
 	}
1004
-	$settings = array_merge($settings,array('globalSources' => $gSources));
1004
+	$settings = array_merge($settings, array('globalSources' => $gSources));
1005 1005
 
1006 1006
 /*
1007 1007
 	$sbstimeout = filter_input(INPUT_POST,'sbstimeout',FILTER_SANITIZE_NUMBER_INT);
1008 1008
 	$settings = array_merge($settings,array('globalSourcesTimeOut' => $sbstimeout));
1009 1009
 */
1010
-	$acarshost = filter_input(INPUT_POST,'acarshost',FILTER_SANITIZE_STRING);
1011
-	$acarsport = filter_input(INPUT_POST,'acarsport',FILTER_SANITIZE_NUMBER_INT);
1012
-	$settings = array_merge($settings,array('globalACARSHost' => $acarshost,'globalACARSPort' => $acarsport));
1010
+	$acarshost = filter_input(INPUT_POST, 'acarshost', FILTER_SANITIZE_STRING);
1011
+	$acarsport = filter_input(INPUT_POST, 'acarsport', FILTER_SANITIZE_NUMBER_INT);
1012
+	$settings = array_merge($settings, array('globalACARSHost' => $acarshost, 'globalACARSPort' => $acarsport));
1013 1013
 
1014
-	$bitly = filter_input(INPUT_POST,'bitly',FILTER_SANITIZE_STRING);
1015
-	$settings = array_merge($settings,array('globalBitlyAccessToken' => $bitly));
1014
+	$bitly = filter_input(INPUT_POST, 'bitly', FILTER_SANITIZE_STRING);
1015
+	$settings = array_merge($settings, array('globalBitlyAccessToken' => $bitly));
1016 1016
 
1017
-	$customcss = filter_input(INPUT_POST,'customcss',FILTER_SANITIZE_STRING);
1018
-	$settings = array_merge($settings,array('globalCustomCSS' => $customcss));
1017
+	$customcss = filter_input(INPUT_POST, 'customcss', FILTER_SANITIZE_STRING);
1018
+	$settings = array_merge($settings, array('globalCustomCSS' => $customcss));
1019 1019
 
1020
-	$notamsource = filter_input(INPUT_POST,'notamsource',FILTER_SANITIZE_STRING);
1021
-	$settings = array_merge($settings,array('globalNOTAMSource' => $notamsource));
1022
-	$metarsource = filter_input(INPUT_POST,'metarsource',FILTER_SANITIZE_STRING);
1023
-	$settings = array_merge($settings,array('globalMETARurl' => $metarsource));
1020
+	$notamsource = filter_input(INPUT_POST, 'notamsource', FILTER_SANITIZE_STRING);
1021
+	$settings = array_merge($settings, array('globalNOTAMSource' => $notamsource));
1022
+	$metarsource = filter_input(INPUT_POST, 'metarsource', FILTER_SANITIZE_STRING);
1023
+	$settings = array_merge($settings, array('globalMETARurl' => $metarsource));
1024 1024
 
1025
-	$zoilatitude = filter_input(INPUT_POST,'zoilatitude',FILTER_SANITIZE_STRING);
1026
-	$zoilongitude = filter_input(INPUT_POST,'zoilongitude',FILTER_SANITIZE_STRING);
1027
-	$zoidistance = filter_input(INPUT_POST,'zoidistance',FILTER_SANITIZE_NUMBER_INT);
1025
+	$zoilatitude = filter_input(INPUT_POST, 'zoilatitude', FILTER_SANITIZE_STRING);
1026
+	$zoilongitude = filter_input(INPUT_POST, 'zoilongitude', FILTER_SANITIZE_STRING);
1027
+	$zoidistance = filter_input(INPUT_POST, 'zoidistance', FILTER_SANITIZE_NUMBER_INT);
1028 1028
 	if ($zoilatitude != '' && $zoilongitude != '' && $zoidistance != '') {
1029
-		$settings = array_merge($settings,array('globalDistanceIgnore' => array('latitude' => $zoilatitude,'longitude' => $zoilongitude,'distance' => $zoidistance)));
1030
-	} else $settings = array_merge($settings,array('globalDistanceIgnore' => array()));
1029
+		$settings = array_merge($settings, array('globalDistanceIgnore' => array('latitude' => $zoilatitude, 'longitude' => $zoilongitude, 'distance' => $zoidistance)));
1030
+	} else $settings = array_merge($settings, array('globalDistanceIgnore' => array()));
1031 1031
 
1032
-	$refresh = filter_input(INPUT_POST,'refresh',FILTER_SANITIZE_NUMBER_INT);
1033
-	$settings = array_merge($settings,array('globalLiveInterval' => $refresh));
1034
-	$maprefresh = filter_input(INPUT_POST,'maprefresh',FILTER_SANITIZE_NUMBER_INT);
1035
-	$settings = array_merge($settings,array('globalMapRefresh' => $maprefresh));
1036
-	$mapidle = filter_input(INPUT_POST,'mapidle',FILTER_SANITIZE_NUMBER_INT);
1037
-	$settings = array_merge($settings,array('globalMapIdleTimeout' => $mapidle));
1038
-	$closestmindist = filter_input(INPUT_POST,'closestmindist',FILTER_SANITIZE_NUMBER_INT);
1039
-	$settings = array_merge($settings,array('globalClosestMinDist' => $closestmindist));
1032
+	$refresh = filter_input(INPUT_POST, 'refresh', FILTER_SANITIZE_NUMBER_INT);
1033
+	$settings = array_merge($settings, array('globalLiveInterval' => $refresh));
1034
+	$maprefresh = filter_input(INPUT_POST, 'maprefresh', FILTER_SANITIZE_NUMBER_INT);
1035
+	$settings = array_merge($settings, array('globalMapRefresh' => $maprefresh));
1036
+	$mapidle = filter_input(INPUT_POST, 'mapidle', FILTER_SANITIZE_NUMBER_INT);
1037
+	$settings = array_merge($settings, array('globalMapIdleTimeout' => $mapidle));
1038
+	$closestmindist = filter_input(INPUT_POST, 'closestmindist', FILTER_SANITIZE_NUMBER_INT);
1039
+	$settings = array_merge($settings, array('globalClosestMinDist' => $closestmindist));
1040 1040
 
1041
-	$aircraftsize = filter_input(INPUT_POST,'aircraftsize',FILTER_SANITIZE_NUMBER_INT);
1042
-	$settings = array_merge($settings,array('globalAircraftSize' => $aircraftsize));
1041
+	$aircraftsize = filter_input(INPUT_POST, 'aircraftsize', FILTER_SANITIZE_NUMBER_INT);
1042
+	$settings = array_merge($settings, array('globalAircraftSize' => $aircraftsize));
1043 1043
 
1044
-	$archivemonths = filter_input(INPUT_POST,'archivemonths',FILTER_SANITIZE_NUMBER_INT);
1045
-	$settings = array_merge($settings,array('globalArchiveMonths' => $archivemonths));
1044
+	$archivemonths = filter_input(INPUT_POST, 'archivemonths', FILTER_SANITIZE_NUMBER_INT);
1045
+	$settings = array_merge($settings, array('globalArchiveMonths' => $archivemonths));
1046 1046
 	
1047
-	$archiveyear = filter_input(INPUT_POST,'archiveyear',FILTER_SANITIZE_STRING);
1047
+	$archiveyear = filter_input(INPUT_POST, 'archiveyear', FILTER_SANITIZE_STRING);
1048 1048
 	if ($archiveyear == "archiveyear") {
1049
-		$settings = array_merge($settings,array('globalArchiveYear' => 'TRUE'));
1049
+		$settings = array_merge($settings, array('globalArchiveYear' => 'TRUE'));
1050 1050
 	} else {
1051
-		$settings = array_merge($settings,array('globalArchiveYear' => 'FALSE'));
1051
+		$settings = array_merge($settings, array('globalArchiveYear' => 'FALSE'));
1052 1052
 	}
1053
-	$archivekeepmonths = filter_input(INPUT_POST,'archivekeepmonths',FILTER_SANITIZE_NUMBER_INT);
1054
-	$settings = array_merge($settings,array('globalArchiveKeepMonths' => $archivekeepmonths));
1055
-	$archivekeeptrackmonths = filter_input(INPUT_POST,'archivekeeptrackmonths',FILTER_SANITIZE_NUMBER_INT);
1056
-	$settings = array_merge($settings,array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths));
1053
+	$archivekeepmonths = filter_input(INPUT_POST, 'archivekeepmonths', FILTER_SANITIZE_NUMBER_INT);
1054
+	$settings = array_merge($settings, array('globalArchiveKeepMonths' => $archivekeepmonths));
1055
+	$archivekeeptrackmonths = filter_input(INPUT_POST, 'archivekeeptrackmonths', FILTER_SANITIZE_NUMBER_INT);
1056
+	$settings = array_merge($settings, array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths));
1057 1057
 
1058
-	$britishairways = filter_input(INPUT_POST,'britishairways',FILTER_SANITIZE_STRING);
1059
-	$settings = array_merge($settings,array('globalBritishAirwaysKey' => $britishairways));
1060
-	$transavia = filter_input(INPUT_POST,'transavia',FILTER_SANITIZE_STRING);
1061
-	$settings = array_merge($settings,array('globalTransaviaKey' => $transavia));
1058
+	$britishairways = filter_input(INPUT_POST, 'britishairways', FILTER_SANITIZE_STRING);
1059
+	$settings = array_merge($settings, array('globalBritishAirwaysKey' => $britishairways));
1060
+	$transavia = filter_input(INPUT_POST, 'transavia', FILTER_SANITIZE_STRING);
1061
+	$settings = array_merge($settings, array('globalTransaviaKey' => $transavia));
1062 1062
 
1063
-	$lufthansakey = filter_input(INPUT_POST,'lufthansakey',FILTER_SANITIZE_STRING);
1064
-	$lufthansasecret = filter_input(INPUT_POST,'lufthansasecret',FILTER_SANITIZE_STRING);
1065
-	$settings = array_merge($settings,array('globalLufthansaKey' => array('key' => $lufthansakey,'secret' => $lufthansasecret)));
1063
+	$lufthansakey = filter_input(INPUT_POST, 'lufthansakey', FILTER_SANITIZE_STRING);
1064
+	$lufthansasecret = filter_input(INPUT_POST, 'lufthansasecret', FILTER_SANITIZE_STRING);
1065
+	$settings = array_merge($settings, array('globalLufthansaKey' => array('key' => $lufthansakey, 'secret' => $lufthansasecret)));
1066 1066
 
1067 1067
 	// Create in settings.php keys not yet configurable if not already here
1068 1068
 	//if (!isset($globalImageBingKey)) $settings = array_merge($settings,array('globalImageBingKey' => ''));
1069
-	if (!isset($globalDebug)) $settings = array_merge($settings,array('globalDebug' => 'TRUE'));
1069
+	if (!isset($globalDebug)) $settings = array_merge($settings, array('globalDebug' => 'TRUE'));
1070 1070
 
1071
-	$resetyearstats = filter_input(INPUT_POST,'resetyearstats',FILTER_SANITIZE_STRING);
1071
+	$resetyearstats = filter_input(INPUT_POST, 'resetyearstats', FILTER_SANITIZE_STRING);
1072 1072
 	if ($resetyearstats == 'resetyearstats') {
1073
-		$settings = array_merge($settings,array('globalDeleteLastYearStats' => 'TRUE'));
1073
+		$settings = array_merge($settings, array('globalDeleteLastYearStats' => 'TRUE'));
1074 1074
 	} else {
1075
-		$settings = array_merge($settings,array('globalDeleteLastYearStats' => 'FALSE'));
1075
+		$settings = array_merge($settings, array('globalDeleteLastYearStats' => 'FALSE'));
1076 1076
 	}
1077 1077
 
1078
-	$archive = filter_input(INPUT_POST,'archive',FILTER_SANITIZE_STRING);
1078
+	$archive = filter_input(INPUT_POST, 'archive', FILTER_SANITIZE_STRING);
1079 1079
 	if ($archive == 'archive') {
1080
-		$settings = array_merge($settings,array('globalArchive' => 'TRUE'));
1080
+		$settings = array_merge($settings, array('globalArchive' => 'TRUE'));
1081 1081
 	} else {
1082
-		$settings = array_merge($settings,array('globalArchive' => 'FALSE'));
1082
+		$settings = array_merge($settings, array('globalArchive' => 'FALSE'));
1083 1083
 	}
1084
-	$daemon = filter_input(INPUT_POST,'daemon',FILTER_SANITIZE_STRING);
1084
+	$daemon = filter_input(INPUT_POST, 'daemon', FILTER_SANITIZE_STRING);
1085 1085
 	if ($daemon == 'daemon') {
1086
-		$settings = array_merge($settings,array('globalDaemon' => 'TRUE'));
1086
+		$settings = array_merge($settings, array('globalDaemon' => 'TRUE'));
1087 1087
 	} else {
1088
-		$settings = array_merge($settings,array('globalDaemon' => 'FALSE'));
1088
+		$settings = array_merge($settings, array('globalDaemon' => 'FALSE'));
1089 1089
 	}
1090
-	$schedules = filter_input(INPUT_POST,'schedules',FILTER_SANITIZE_STRING);
1090
+	$schedules = filter_input(INPUT_POST, 'schedules', FILTER_SANITIZE_STRING);
1091 1091
 	if ($schedules == 'schedules') {
1092
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE'));
1092
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE'));
1093 1093
 	} else {
1094
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE'));
1094
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE'));
1095 1095
 	}
1096 1096
 
1097 1097
 /*
@@ -1102,207 +1102,207 @@  discard block
 block discarded – undo
1102 1102
 		$settings = array_merge($settings,array('globalFlightAware' => 'FALSE','globalSBS1' => 'TRUE'));
1103 1103
 	}
1104 1104
 */
1105
-	$settings = array_merge($settings,array('globalFlightAware' => 'FALSE'));
1106
-	if ($globalsbs == 'sbs') $settings = array_merge($settings,array('globalSBS1' => 'TRUE'));
1107
-	else $settings = array_merge($settings,array('globalSBS1' => 'FALSE'));
1108
-	if ($globalaprs == 'aprs') $settings = array_merge($settings,array('globalAPRS' => 'TRUE'));
1109
-	else $settings = array_merge($settings,array('globalAPRS' => 'FALSE'));
1105
+	$settings = array_merge($settings, array('globalFlightAware' => 'FALSE'));
1106
+	if ($globalsbs == 'sbs') $settings = array_merge($settings, array('globalSBS1' => 'TRUE'));
1107
+	else $settings = array_merge($settings, array('globalSBS1' => 'FALSE'));
1108
+	if ($globalaprs == 'aprs') $settings = array_merge($settings, array('globalAPRS' => 'TRUE'));
1109
+	else $settings = array_merge($settings, array('globalAPRS' => 'FALSE'));
1110 1110
 	$va = false;
1111 1111
 	if ($globalivao == 'ivao') {
1112
-		$settings = array_merge($settings,array('globalIVAO' => 'TRUE'));
1112
+		$settings = array_merge($settings, array('globalIVAO' => 'TRUE'));
1113 1113
 		$va = true;
1114
-	} else $settings = array_merge($settings,array('globalIVAO' => 'FALSE'));
1114
+	} else $settings = array_merge($settings, array('globalIVAO' => 'FALSE'));
1115 1115
 	if ($globalvatsim == 'vatsim') {
1116
-		$settings = array_merge($settings,array('globalVATSIM' => 'TRUE'));
1116
+		$settings = array_merge($settings, array('globalVATSIM' => 'TRUE'));
1117 1117
 		$va = true;
1118
-	} else $settings = array_merge($settings,array('globalVATSIM' => 'FALSE'));
1118
+	} else $settings = array_merge($settings, array('globalVATSIM' => 'FALSE'));
1119 1119
 	if ($globalphpvms == 'phpvms') {
1120
-		$settings = array_merge($settings,array('globalphpVMS' => 'TRUE'));
1120
+		$settings = array_merge($settings, array('globalphpVMS' => 'TRUE'));
1121 1121
 		$va = true;
1122
-	} else $settings = array_merge($settings,array('globalphpVMS' => 'FALSE'));
1122
+	} else $settings = array_merge($settings, array('globalphpVMS' => 'FALSE'));
1123 1123
 	if ($globalvam == 'vam') {
1124
-		$settings = array_merge($settings,array('globalVAM' => 'TRUE'));
1124
+		$settings = array_merge($settings, array('globalVAM' => 'TRUE'));
1125 1125
 		$va = true;
1126
-	} else $settings = array_merge($settings,array('globalVAM' => 'FALSE'));
1126
+	} else $settings = array_merge($settings, array('globalVAM' => 'FALSE'));
1127 1127
 	if ($va) {
1128
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE','globalTranslationFetch' => 'FALSE'));
1129
-	} else $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE'));
1128
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE', 'globalTranslationFetch' => 'FALSE'));
1129
+	} else $settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE', 'globalTranslationFetch' => 'TRUE'));
1130 1130
 	if ($globalva == 'va' || $va) {
1131
-		$settings = array_merge($settings,array('globalVA' => 'TRUE'));
1132
-	} else $settings = array_merge($settings,array('globalVA' => 'FALSE'));
1131
+		$settings = array_merge($settings, array('globalVA' => 'TRUE'));
1132
+	} else $settings = array_merge($settings, array('globalVA' => 'FALSE'));
1133 1133
 	
1134 1134
 
1135 1135
 
1136
-	$notam = filter_input(INPUT_POST,'notam',FILTER_SANITIZE_STRING);
1136
+	$notam = filter_input(INPUT_POST, 'notam', FILTER_SANITIZE_STRING);
1137 1137
 	if ($notam == 'notam') {
1138
-		$settings = array_merge($settings,array('globalNOTAM' => 'TRUE'));
1138
+		$settings = array_merge($settings, array('globalNOTAM' => 'TRUE'));
1139 1139
 	} else {
1140
-		$settings = array_merge($settings,array('globalNOTAM' => 'FALSE'));
1140
+		$settings = array_merge($settings, array('globalNOTAM' => 'FALSE'));
1141 1141
 	}
1142
-	$owner = filter_input(INPUT_POST,'owner',FILTER_SANITIZE_STRING);
1142
+	$owner = filter_input(INPUT_POST, 'owner', FILTER_SANITIZE_STRING);
1143 1143
 	if ($owner == 'owner') {
1144
-		$settings = array_merge($settings,array('globalOwner' => 'TRUE'));
1144
+		$settings = array_merge($settings, array('globalOwner' => 'TRUE'));
1145 1145
 	} else {
1146
-		$settings = array_merge($settings,array('globalOwner' => 'FALSE'));
1146
+		$settings = array_merge($settings, array('globalOwner' => 'FALSE'));
1147 1147
 	}
1148
-	$map3d = filter_input(INPUT_POST,'map3d',FILTER_SANITIZE_STRING);
1148
+	$map3d = filter_input(INPUT_POST, 'map3d', FILTER_SANITIZE_STRING);
1149 1149
 	if ($map3d == 'map3d') {
1150
-		$settings = array_merge($settings,array('globalMap3D' => 'TRUE'));
1150
+		$settings = array_merge($settings, array('globalMap3D' => 'TRUE'));
1151 1151
 	} else {
1152
-		$settings = array_merge($settings,array('globalMap3D' => 'FALSE'));
1152
+		$settings = array_merge($settings, array('globalMap3D' => 'FALSE'));
1153 1153
 	}
1154
-	$crash = filter_input(INPUT_POST,'crash',FILTER_SANITIZE_STRING);
1154
+	$crash = filter_input(INPUT_POST, 'crash', FILTER_SANITIZE_STRING);
1155 1155
 	if ($crash == 'crash') {
1156
-		$settings = array_merge($settings,array('globalAccidents' => 'TRUE'));
1156
+		$settings = array_merge($settings, array('globalAccidents' => 'TRUE'));
1157 1157
 	} else {
1158
-		$settings = array_merge($settings,array('globalAccidents' => 'FALSE'));
1158
+		$settings = array_merge($settings, array('globalAccidents' => 'FALSE'));
1159 1159
 	}
1160
-	$mapsatellites = filter_input(INPUT_POST,'mapsatellites',FILTER_SANITIZE_STRING);
1160
+	$mapsatellites = filter_input(INPUT_POST, 'mapsatellites', FILTER_SANITIZE_STRING);
1161 1161
 	if ($mapsatellites == 'mapsatellites') {
1162
-		$settings = array_merge($settings,array('globalMapSatellites' => 'TRUE'));
1162
+		$settings = array_merge($settings, array('globalMapSatellites' => 'TRUE'));
1163 1163
 	} else {
1164
-		$settings = array_merge($settings,array('globalMapSatellites' => 'FALSE'));
1164
+		$settings = array_merge($settings, array('globalMapSatellites' => 'FALSE'));
1165 1165
 	}
1166
-	$map3ddefault = filter_input(INPUT_POST,'map3ddefault',FILTER_SANITIZE_STRING);
1166
+	$map3ddefault = filter_input(INPUT_POST, 'map3ddefault', FILTER_SANITIZE_STRING);
1167 1167
 	if ($map3ddefault == 'map3ddefault') {
1168
-		$settings = array_merge($settings,array('globalMap3Ddefault' => 'TRUE'));
1168
+		$settings = array_merge($settings, array('globalMap3Ddefault' => 'TRUE'));
1169 1169
 	} else {
1170
-		$settings = array_merge($settings,array('globalMap3Ddefault' => 'FALSE'));
1170
+		$settings = array_merge($settings, array('globalMap3Ddefault' => 'FALSE'));
1171 1171
 	}
1172
-	$translate = filter_input(INPUT_POST,'translate',FILTER_SANITIZE_STRING);
1172
+	$translate = filter_input(INPUT_POST, 'translate', FILTER_SANITIZE_STRING);
1173 1173
 	if ($translate == 'translate') {
1174
-		$settings = array_merge($settings,array('globalTranslate' => 'TRUE'));
1174
+		$settings = array_merge($settings, array('globalTranslate' => 'TRUE'));
1175 1175
 	} else {
1176
-		$settings = array_merge($settings,array('globalTranslate' => 'FALSE'));
1176
+		$settings = array_merge($settings, array('globalTranslate' => 'FALSE'));
1177 1177
 	}
1178
-	$realairlines = filter_input(INPUT_POST,'realairlines',FILTER_SANITIZE_STRING);
1178
+	$realairlines = filter_input(INPUT_POST, 'realairlines', FILTER_SANITIZE_STRING);
1179 1179
 	if ($realairlines == 'realairlines') {
1180
-		$settings = array_merge($settings,array('globalUseRealAirlines' => 'TRUE'));
1180
+		$settings = array_merge($settings, array('globalUseRealAirlines' => 'TRUE'));
1181 1181
 	} else {
1182
-		$settings = array_merge($settings,array('globalUseRealAirlines' => 'FALSE'));
1182
+		$settings = array_merge($settings, array('globalUseRealAirlines' => 'FALSE'));
1183 1183
 	}
1184
-	$estimation = filter_input(INPUT_POST,'estimation',FILTER_SANITIZE_STRING);
1184
+	$estimation = filter_input(INPUT_POST, 'estimation', FILTER_SANITIZE_STRING);
1185 1185
 	if ($estimation == 'estimation') {
1186
-		$settings = array_merge($settings,array('globalMapEstimation' => 'TRUE'));
1186
+		$settings = array_merge($settings, array('globalMapEstimation' => 'TRUE'));
1187 1187
 	} else {
1188
-		$settings = array_merge($settings,array('globalMapEstimation' => 'FALSE'));
1188
+		$settings = array_merge($settings, array('globalMapEstimation' => 'FALSE'));
1189 1189
 	}
1190
-	$metar = filter_input(INPUT_POST,'metar',FILTER_SANITIZE_STRING);
1190
+	$metar = filter_input(INPUT_POST, 'metar', FILTER_SANITIZE_STRING);
1191 1191
 	if ($metar == 'metar') {
1192
-		$settings = array_merge($settings,array('globalMETAR' => 'TRUE'));
1192
+		$settings = array_merge($settings, array('globalMETAR' => 'TRUE'));
1193 1193
 	} else {
1194
-		$settings = array_merge($settings,array('globalMETAR' => 'FALSE'));
1194
+		$settings = array_merge($settings, array('globalMETAR' => 'FALSE'));
1195 1195
 	}
1196
-	$metarcycle = filter_input(INPUT_POST,'metarcycle',FILTER_SANITIZE_STRING);
1196
+	$metarcycle = filter_input(INPUT_POST, 'metarcycle', FILTER_SANITIZE_STRING);
1197 1197
 	if ($metarcycle == 'metarcycle') {
1198
-		$settings = array_merge($settings,array('globalMETARcycle' => 'TRUE'));
1198
+		$settings = array_merge($settings, array('globalMETARcycle' => 'TRUE'));
1199 1199
 	} else {
1200
-		$settings = array_merge($settings,array('globalMETARcycle' => 'FALSE'));
1200
+		$settings = array_merge($settings, array('globalMETARcycle' => 'FALSE'));
1201 1201
 	}
1202
-	$fork = filter_input(INPUT_POST,'fork',FILTER_SANITIZE_STRING);
1202
+	$fork = filter_input(INPUT_POST, 'fork', FILTER_SANITIZE_STRING);
1203 1203
 	if ($fork == 'fork') {
1204
-		$settings = array_merge($settings,array('globalFork' => 'TRUE'));
1204
+		$settings = array_merge($settings, array('globalFork' => 'TRUE'));
1205 1205
 	} else {
1206
-		$settings = array_merge($settings,array('globalFork' => 'FALSE'));
1206
+		$settings = array_merge($settings, array('globalFork' => 'FALSE'));
1207 1207
 	}
1208 1208
 
1209
-	$colormap = filter_input(INPUT_POST,'colormap',FILTER_SANITIZE_STRING);
1209
+	$colormap = filter_input(INPUT_POST, 'colormap', FILTER_SANITIZE_STRING);
1210 1210
 	if ($colormap == 'colormap') {
1211
-		$settings = array_merge($settings,array('globalMapAltitudeColor' => 'TRUE'));
1211
+		$settings = array_merge($settings, array('globalMapAltitudeColor' => 'TRUE'));
1212 1212
 	} else {
1213
-		$settings = array_merge($settings,array('globalMapAltitudeColor' => 'FALSE'));
1213
+		$settings = array_merge($settings, array('globalMapAltitudeColor' => 'FALSE'));
1214 1214
 	}
1215 1215
 	
1216 1216
 	if (isset($_POST['aircrafticoncolor'])) {
1217
-		$aircrafticoncolor = filter_input(INPUT_POST,'aircrafticoncolor',FILTER_SANITIZE_STRING);
1218
-		$settings = array_merge($settings,array('globalAircraftIconColor' => substr($aircrafticoncolor,1)));
1217
+		$aircrafticoncolor = filter_input(INPUT_POST, 'aircrafticoncolor', FILTER_SANITIZE_STRING);
1218
+		$settings = array_merge($settings, array('globalAircraftIconColor' => substr($aircrafticoncolor, 1)));
1219 1219
 	}
1220 1220
 
1221
-	$airportzoom = filter_input(INPUT_POST,'airportzoom',FILTER_SANITIZE_NUMBER_INT);
1222
-	$settings = array_merge($settings,array('globalAirportZoom' => $airportzoom));
1221
+	$airportzoom = filter_input(INPUT_POST, 'airportzoom', FILTER_SANITIZE_NUMBER_INT);
1222
+	$settings = array_merge($settings, array('globalAirportZoom' => $airportzoom));
1223 1223
 
1224
-	$unitdistance = filter_input(INPUT_POST,'unitdistance',FILTER_SANITIZE_STRING);
1225
-	$settings = array_merge($settings,array('globalUnitDistance' => $unitdistance));
1226
-	$unitaltitude = filter_input(INPUT_POST,'unitaltitude',FILTER_SANITIZE_STRING);
1227
-	$settings = array_merge($settings,array('globalUnitAltitude' => $unitaltitude));
1228
-	$unitspeed = filter_input(INPUT_POST,'unitspeed',FILTER_SANITIZE_STRING);
1229
-	$settings = array_merge($settings,array('globalUnitSpeed' => $unitspeed));
1224
+	$unitdistance = filter_input(INPUT_POST, 'unitdistance', FILTER_SANITIZE_STRING);
1225
+	$settings = array_merge($settings, array('globalUnitDistance' => $unitdistance));
1226
+	$unitaltitude = filter_input(INPUT_POST, 'unitaltitude', FILTER_SANITIZE_STRING);
1227
+	$settings = array_merge($settings, array('globalUnitAltitude' => $unitaltitude));
1228
+	$unitspeed = filter_input(INPUT_POST, 'unitspeed', FILTER_SANITIZE_STRING);
1229
+	$settings = array_merge($settings, array('globalUnitSpeed' => $unitspeed));
1230 1230
 
1231
-	$mappopup = filter_input(INPUT_POST,'mappopup',FILTER_SANITIZE_STRING);
1231
+	$mappopup = filter_input(INPUT_POST, 'mappopup', FILTER_SANITIZE_STRING);
1232 1232
 	if ($mappopup == 'mappopup') {
1233
-		$settings = array_merge($settings,array('globalMapPopup' => 'TRUE'));
1233
+		$settings = array_merge($settings, array('globalMapPopup' => 'TRUE'));
1234 1234
 	} else {
1235
-		$settings = array_merge($settings,array('globalMapPopup' => 'FALSE'));
1235
+		$settings = array_merge($settings, array('globalMapPopup' => 'FALSE'));
1236 1236
 	}
1237
-	$airportpopup = filter_input(INPUT_POST,'airportpopup',FILTER_SANITIZE_STRING);
1237
+	$airportpopup = filter_input(INPUT_POST, 'airportpopup', FILTER_SANITIZE_STRING);
1238 1238
 	if ($airportpopup == 'airportpopup') {
1239
-		$settings = array_merge($settings,array('globalAirportPopup' => 'TRUE'));
1239
+		$settings = array_merge($settings, array('globalAirportPopup' => 'TRUE'));
1240 1240
 	} else {
1241
-		$settings = array_merge($settings,array('globalAirportPopup' => 'FALSE'));
1241
+		$settings = array_merge($settings, array('globalAirportPopup' => 'FALSE'));
1242 1242
 	}
1243
-	$maphistory = filter_input(INPUT_POST,'maphistory',FILTER_SANITIZE_STRING);
1243
+	$maphistory = filter_input(INPUT_POST, 'maphistory', FILTER_SANITIZE_STRING);
1244 1244
 	if ($maphistory == 'maphistory') {
1245
-		$settings = array_merge($settings,array('globalMapHistory' => 'TRUE'));
1245
+		$settings = array_merge($settings, array('globalMapHistory' => 'TRUE'));
1246 1246
 	} else {
1247
-		$settings = array_merge($settings,array('globalMapHistory' => 'FALSE'));
1247
+		$settings = array_merge($settings, array('globalMapHistory' => 'FALSE'));
1248 1248
 	}
1249
-	$maptooltip = filter_input(INPUT_POST,'maptooltip',FILTER_SANITIZE_STRING);
1249
+	$maptooltip = filter_input(INPUT_POST, 'maptooltip', FILTER_SANITIZE_STRING);
1250 1250
 	if ($maptooltip == 'maptooltip') {
1251
-		$settings = array_merge($settings,array('globalMapTooltip' => 'TRUE'));
1251
+		$settings = array_merge($settings, array('globalMapTooltip' => 'TRUE'));
1252 1252
 	} else {
1253
-		$settings = array_merge($settings,array('globalMapTooltip' => 'FALSE'));
1253
+		$settings = array_merge($settings, array('globalMapTooltip' => 'FALSE'));
1254 1254
 	}
1255
-	$flightroute = filter_input(INPUT_POST,'flightroute',FILTER_SANITIZE_STRING);
1255
+	$flightroute = filter_input(INPUT_POST, 'flightroute', FILTER_SANITIZE_STRING);
1256 1256
 	if ($flightroute == 'flightroute') {
1257
-		$settings = array_merge($settings,array('globalMapRoute' => 'TRUE'));
1257
+		$settings = array_merge($settings, array('globalMapRoute' => 'TRUE'));
1258 1258
 	} else {
1259
-		$settings = array_merge($settings,array('globalMapRoute' => 'FALSE'));
1259
+		$settings = array_merge($settings, array('globalMapRoute' => 'FALSE'));
1260 1260
 	}
1261
-	$flightremainingroute = filter_input(INPUT_POST,'flightremainingroute',FILTER_SANITIZE_STRING);
1261
+	$flightremainingroute = filter_input(INPUT_POST, 'flightremainingroute', FILTER_SANITIZE_STRING);
1262 1262
 	if ($flightremainingroute == 'flightremainingroute') {
1263
-		$settings = array_merge($settings,array('globalMapRemainingRoute' => 'TRUE'));
1263
+		$settings = array_merge($settings, array('globalMapRemainingRoute' => 'TRUE'));
1264 1264
 	} else {
1265
-		$settings = array_merge($settings,array('globalMapRemainingRoute' => 'FALSE'));
1265
+		$settings = array_merge($settings, array('globalMapRemainingRoute' => 'FALSE'));
1266 1266
 	}
1267
-	$allflights = filter_input(INPUT_POST,'allflights',FILTER_SANITIZE_STRING);
1267
+	$allflights = filter_input(INPUT_POST, 'allflights', FILTER_SANITIZE_STRING);
1268 1268
 	if ($allflights == 'allflights') {
1269
-		$settings = array_merge($settings,array('globalAllFlights' => 'TRUE'));
1269
+		$settings = array_merge($settings, array('globalAllFlights' => 'TRUE'));
1270 1270
 	} else {
1271
-		$settings = array_merge($settings,array('globalAllFlights' => 'FALSE'));
1271
+		$settings = array_merge($settings, array('globalAllFlights' => 'FALSE'));
1272 1272
 	}
1273
-	$bbox = filter_input(INPUT_POST,'bbox',FILTER_SANITIZE_STRING);
1273
+	$bbox = filter_input(INPUT_POST, 'bbox', FILTER_SANITIZE_STRING);
1274 1274
 	if ($bbox == 'bbox') {
1275
-		$settings = array_merge($settings,array('globalMapUseBbox' => 'TRUE'));
1275
+		$settings = array_merge($settings, array('globalMapUseBbox' => 'TRUE'));
1276 1276
 	} else {
1277
-		$settings = array_merge($settings,array('globalMapUseBbox' => 'FALSE'));
1277
+		$settings = array_merge($settings, array('globalMapUseBbox' => 'FALSE'));
1278 1278
 	}
1279
-	$waypoints = filter_input(INPUT_POST,'waypoints',FILTER_SANITIZE_STRING);
1279
+	$waypoints = filter_input(INPUT_POST, 'waypoints', FILTER_SANITIZE_STRING);
1280 1280
 	if ($waypoints == 'waypoints') {
1281
-		$settings = array_merge($settings,array('globalWaypoints' => 'TRUE'));
1281
+		$settings = array_merge($settings, array('globalWaypoints' => 'TRUE'));
1282 1282
 	} else {
1283
-		$settings = array_merge($settings,array('globalWaypoints' => 'FALSE'));
1283
+		$settings = array_merge($settings, array('globalWaypoints' => 'FALSE'));
1284 1284
 	}
1285
-	$noairlines = filter_input(INPUT_POST,'noairlines',FILTER_SANITIZE_STRING);
1285
+	$noairlines = filter_input(INPUT_POST, 'noairlines', FILTER_SANITIZE_STRING);
1286 1286
 	if ($noairlines == 'noairlines') {
1287
-		$settings = array_merge($settings,array('globalNoAirlines' => 'TRUE'));
1287
+		$settings = array_merge($settings, array('globalNoAirlines' => 'TRUE'));
1288 1288
 	} else {
1289
-		$settings = array_merge($settings,array('globalNoAirlines' => 'FALSE'));
1289
+		$settings = array_merge($settings, array('globalNoAirlines' => 'FALSE'));
1290 1290
 	}
1291 1291
 
1292
-	if (!isset($globalTransaction)) $settings = array_merge($settings,array('globalTransaction' => 'TRUE'));
1292
+	if (!isset($globalTransaction)) $settings = array_merge($settings, array('globalTransaction' => 'TRUE'));
1293 1293
 
1294 1294
 	// Set some defaults values...
1295 1295
 	if (!isset($globalAircraftImageSources)) {
1296
-	    $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
1297
-	    $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources));
1296
+	    $globalAircraftImageSources = array('ivaomtl', 'wikimedia', 'airportdata', 'deviantart', 'flickr', 'bing', 'jetphotos', 'planepictures', 'planespotters');
1297
+	    $settings = array_merge($settings, array('globalAircraftImageSources' => $globalAircraftImageSources));
1298 1298
 	}
1299 1299
 
1300 1300
 	if (!isset($globalSchedulesSources)) {
1301
-	    $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
1302
-    	    $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources));
1301
+	    $globalSchedulesSources = array('flightmapper', 'costtotravel', 'flightradar24', 'flightaware');
1302
+    	    $settings = array_merge($settings, array('globalSchedulesSources' => $globalSchedulesSources));
1303 1303
     	}
1304 1304
 
1305
-	$settings = array_merge($settings,array('globalInstalled' => 'TRUE'));
1305
+	$settings = array_merge($settings, array('globalInstalled' => 'TRUE'));
1306 1306
 
1307 1307
 	if ($error == '') settings::modify_settings($settings);
1308 1308
 	if ($error == '') settings::comment_settings($settings_comment);
Please login to merge, or discard this patch.