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