Completed
Push — master ( 5b4de3...6ad718 )
by Yannick
08:33
created
install/index.php 1 patch
Spacing   +177 added lines, -177 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 require_once(dirname(__FILE__).'/class.create_db.php');
13 13
 require_once(dirname(__FILE__).'/class.update_schema.php');
14 14
 require_once(dirname(__FILE__).'/class.settings.php');
15
-$title="Install";
15
+$title = "Install";
16 16
 require(dirname(__FILE__).'/header.php');
17 17
 require(dirname(__FILE__).'/../require/settings.php');
18 18
 
@@ -66,8 +66,8 @@  discard block
 block discarded – undo
66 66
 if (!extension_loaded('curl')) {
67 67
 	$error[] = "Curl is not loaded.";
68 68
 }
69
-if(function_exists('apache_get_modules') ){
70
-	if(!in_array('mod_rewrite',apache_get_modules())) {
69
+if (function_exists('apache_get_modules')) {
70
+	if (!in_array('mod_rewrite', apache_get_modules())) {
71 71
 		$error[] = "mod_rewrite is not available.";
72 72
 	}
73 73
 	if (!isset($_SERVER['HTACCESS'])) {
@@ -499,13 +499,13 @@  discard block
 block discarded – undo
499 499
 ?>
500 500
 							<tr>
501 501
 								<?php
502
-								    if (filter_var($source['host'],FILTER_VALIDATE_URL)) {
502
+								    if (filter_var($source['host'], FILTER_VALIDATE_URL)) {
503 503
 								?>
504 504
 								<td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td>
505 505
 								<td><input type="number" name="port[]" id="port" value="<?php print $source['port']; ?>" /></td>
506 506
 								<?php
507 507
 								    } else {
508
-									$hostport = explode(':',$source['host']);
508
+									$hostport = explode(':', $source['host']);
509 509
 									if (isset($hostport[1])) {
510 510
 										$host = $hostport[0];
511 511
 										$port = $hostport[1];
@@ -787,7 +787,7 @@  discard block
 block discarded – undo
787 787
 			<br />
788 788
 			<p>
789 789
 				<label for="aircraftsize">Size of aircraft icon on map (default to 30px if zoom > 7 else 15px), empty to default</label>
790
-				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize;?>" />
790
+				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize; ?>" />
791 791
 			</p>
792 792
 			<br />
793 793
 			<p>
@@ -833,69 +833,69 @@  discard block
 block discarded – undo
833 833
 $error = '';
834 834
 
835 835
 if (isset($_POST['dbtype'])) {
836
-	$dbtype = filter_input(INPUT_POST,'dbtype',FILTER_SANITIZE_STRING);
837
-	$dbroot = filter_input(INPUT_POST,'dbroot',FILTER_SANITIZE_STRING);
838
-	$dbrootpass = filter_input(INPUT_POST,'dbrootpass',FILTER_SANITIZE_STRING);
839
-	$dbname = filter_input(INPUT_POST,'dbname',FILTER_SANITIZE_STRING);
840
-	$dbuser = filter_input(INPUT_POST,'dbuser',FILTER_SANITIZE_STRING);
841
-	$dbuserpass = filter_input(INPUT_POST,'dbuserpass',FILTER_SANITIZE_STRING);
842
-	$dbhost = filter_input(INPUT_POST,'dbhost',FILTER_SANITIZE_STRING);
843
-	$dbport = filter_input(INPUT_POST,'dbport',FILTER_SANITIZE_STRING);
836
+	$dbtype = filter_input(INPUT_POST, 'dbtype', FILTER_SANITIZE_STRING);
837
+	$dbroot = filter_input(INPUT_POST, 'dbroot', FILTER_SANITIZE_STRING);
838
+	$dbrootpass = filter_input(INPUT_POST, 'dbrootpass', FILTER_SANITIZE_STRING);
839
+	$dbname = filter_input(INPUT_POST, 'dbname', FILTER_SANITIZE_STRING);
840
+	$dbuser = filter_input(INPUT_POST, 'dbuser', FILTER_SANITIZE_STRING);
841
+	$dbuserpass = filter_input(INPUT_POST, 'dbuserpass', FILTER_SANITIZE_STRING);
842
+	$dbhost = filter_input(INPUT_POST, 'dbhost', FILTER_SANITIZE_STRING);
843
+	$dbport = filter_input(INPUT_POST, 'dbport', FILTER_SANITIZE_STRING);
844 844
 
845 845
 	if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) $error .= 'Mysql driver for PDO must be loaded';
846 846
 	if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) $error .= 'PosgreSQL driver for PDO must be loaded';
847 847
 	
848 848
 	if ($error == '' && isset($_POST['createdb']) && $dbname != '' && $dbuser != '' && $dbuserpass != '') {
849 849
 		if ($dbroot != '' && $dbrootpass != '') {
850
-			$result = create_db::create_database($dbroot,$dbrootpass,$dbuser,$dbuserpass,$dbname,$dbtype,$dbhost);
850
+			$result = create_db::create_database($dbroot, $dbrootpass, $dbuser, $dbuserpass, $dbname, $dbtype, $dbhost);
851 851
 			if ($result != '') $error .= $result;
852 852
 		}
853 853
 		if ($error == '') {
854 854
 			//$error .= create_db::import_all_db('../db/');
855
-			$settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBport' => $dbport,'globalDBuser' => $dbuser,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname));
855
+			$settings = array_merge($settings, array('globalDBdriver' => $dbtype, 'globalDBhost' => $dbhost, 'globalDBport' => $dbport, 'globalDBuser' => $dbuser, 'globalDBpass' => $dbuserpass, 'globalDBname' => $dbname));
856 856
 		}
857
-	} else $settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname));
857
+	} else $settings = array_merge($settings, array('globalDBdriver' => $dbtype, 'globalDBhost' => $dbhost, 'globalDBuser' => $dbuser, 'globalDBport' => $dbport, 'globalDBpass' => $dbuserpass, 'globalDBname' => $dbname));
858 858
 
859
-	$sitename = filter_input(INPUT_POST,'sitename',FILTER_SANITIZE_STRING);
860
-	$siteurl = filter_input(INPUT_POST,'siteurl',FILTER_SANITIZE_STRING);
861
-	$timezone = filter_input(INPUT_POST,'timezone',FILTER_SANITIZE_STRING);
862
-	$language = filter_input(INPUT_POST,'language',FILTER_SANITIZE_STRING);
863
-	$settings = array_merge($settings,array('globalName' => $sitename,'globalURL' => $siteurl, 'globalTimezone' => $timezone,'globalLanguage' => $language));
859
+	$sitename = filter_input(INPUT_POST, 'sitename', FILTER_SANITIZE_STRING);
860
+	$siteurl = filter_input(INPUT_POST, 'siteurl', FILTER_SANITIZE_STRING);
861
+	$timezone = filter_input(INPUT_POST, 'timezone', FILTER_SANITIZE_STRING);
862
+	$language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_STRING);
863
+	$settings = array_merge($settings, array('globalName' => $sitename, 'globalURL' => $siteurl, 'globalTimezone' => $timezone, 'globalLanguage' => $language));
864 864
 
865
-	$mapprovider = filter_input(INPUT_POST,'mapprovider',FILTER_SANITIZE_STRING);
866
-	$mapboxid = filter_input(INPUT_POST,'mapboxid',FILTER_SANITIZE_STRING);
867
-	$mapboxtoken = filter_input(INPUT_POST,'mapboxtoken',FILTER_SANITIZE_STRING);
868
-	$googlekey = filter_input(INPUT_POST,'googlekey',FILTER_SANITIZE_STRING);
869
-	$bingkey = filter_input(INPUT_POST,'bingkey',FILTER_SANITIZE_STRING);
870
-	$mapquestkey = filter_input(INPUT_POST,'mapquestkey',FILTER_SANITIZE_STRING);
871
-	$hereappid = filter_input(INPUT_POST,'hereappid',FILTER_SANITIZE_STRING);
872
-	$hereappcode = filter_input(INPUT_POST,'hereappcode',FILTER_SANITIZE_STRING);
873
-	$settings = array_merge($settings,array('globalMapProvider' => $mapprovider,'globalMapboxId' => $mapboxid,'globalMapboxToken' => $mapboxtoken,'globalGoogleAPIKey' => $googlekey,'globalBingMapKey' => $bingkey,'globalHereappID' => $hereappid,'globalHereappCode' => $hereappcode,'globalMapQuestKey' => $mapquestkey));
865
+	$mapprovider = filter_input(INPUT_POST, 'mapprovider', FILTER_SANITIZE_STRING);
866
+	$mapboxid = filter_input(INPUT_POST, 'mapboxid', FILTER_SANITIZE_STRING);
867
+	$mapboxtoken = filter_input(INPUT_POST, 'mapboxtoken', FILTER_SANITIZE_STRING);
868
+	$googlekey = filter_input(INPUT_POST, 'googlekey', FILTER_SANITIZE_STRING);
869
+	$bingkey = filter_input(INPUT_POST, 'bingkey', FILTER_SANITIZE_STRING);
870
+	$mapquestkey = filter_input(INPUT_POST, 'mapquestkey', FILTER_SANITIZE_STRING);
871
+	$hereappid = filter_input(INPUT_POST, 'hereappid', FILTER_SANITIZE_STRING);
872
+	$hereappcode = filter_input(INPUT_POST, 'hereappcode', FILTER_SANITIZE_STRING);
873
+	$settings = array_merge($settings, array('globalMapProvider' => $mapprovider, 'globalMapboxId' => $mapboxid, 'globalMapboxToken' => $mapboxtoken, 'globalGoogleAPIKey' => $googlekey, 'globalBingMapKey' => $bingkey, 'globalHereappID' => $hereappid, 'globalHereappCode' => $hereappcode, 'globalMapQuestKey' => $mapquestkey));
874 874
 	
875
-	$latitudemax = filter_input(INPUT_POST,'latitudemax',FILTER_SANITIZE_STRING);
876
-	$latitudemin = filter_input(INPUT_POST,'latitudemin',FILTER_SANITIZE_STRING);
877
-	$longitudemax = filter_input(INPUT_POST,'longitudemax',FILTER_SANITIZE_STRING);
878
-	$longitudemin = filter_input(INPUT_POST,'longitudemin',FILTER_SANITIZE_STRING);
879
-	$livezoom = filter_input(INPUT_POST,'livezoom',FILTER_SANITIZE_NUMBER_INT);
880
-	$settings = array_merge($settings,array('globalLatitudeMax' => $latitudemax,'globalLatitudeMin' => $latitudemin,'globalLongitudeMax' => $longitudemax,'globalLongitudeMin' => $longitudemin,'globalLiveZoom' => $livezoom));
875
+	$latitudemax = filter_input(INPUT_POST, 'latitudemax', FILTER_SANITIZE_STRING);
876
+	$latitudemin = filter_input(INPUT_POST, 'latitudemin', FILTER_SANITIZE_STRING);
877
+	$longitudemax = filter_input(INPUT_POST, 'longitudemax', FILTER_SANITIZE_STRING);
878
+	$longitudemin = filter_input(INPUT_POST, 'longitudemin', FILTER_SANITIZE_STRING);
879
+	$livezoom = filter_input(INPUT_POST, 'livezoom', FILTER_SANITIZE_NUMBER_INT);
880
+	$settings = array_merge($settings, array('globalLatitudeMax' => $latitudemax, 'globalLatitudeMin' => $latitudemin, 'globalLongitudeMax' => $longitudemax, 'globalLongitudeMin' => $longitudemin, 'globalLiveZoom' => $livezoom));
881 881
 
882
-	$squawk_country = filter_input(INPUT_POST,'squawk_country',FILTER_SANITIZE_STRING);
883
-	$settings = array_merge($settings,array('globalSquawkCountry' => $squawk_country));
882
+	$squawk_country = filter_input(INPUT_POST, 'squawk_country', FILTER_SANITIZE_STRING);
883
+	$settings = array_merge($settings, array('globalSquawkCountry' => $squawk_country));
884 884
 
885
-	$latitudecenter = filter_input(INPUT_POST,'latitudecenter',FILTER_SANITIZE_STRING);
886
-	$longitudecenter = filter_input(INPUT_POST,'longitudecenter',FILTER_SANITIZE_STRING);
887
-	$settings = array_merge($settings,array('globalCenterLatitude' => $latitudecenter,'globalCenterLongitude' => $longitudecenter));
885
+	$latitudecenter = filter_input(INPUT_POST, 'latitudecenter', FILTER_SANITIZE_STRING);
886
+	$longitudecenter = filter_input(INPUT_POST, 'longitudecenter', FILTER_SANITIZE_STRING);
887
+	$settings = array_merge($settings, array('globalCenterLatitude' => $latitudecenter, 'globalCenterLongitude' => $longitudecenter));
888 888
 
889
-	$acars = filter_input(INPUT_POST,'acars',FILTER_SANITIZE_STRING);
889
+	$acars = filter_input(INPUT_POST, 'acars', FILTER_SANITIZE_STRING);
890 890
 	if ($acars == 'acars') {
891
-		$settings = array_merge($settings,array('globalACARS' => 'TRUE'));
891
+		$settings = array_merge($settings, array('globalACARS' => 'TRUE'));
892 892
 	} else {
893
-		$settings = array_merge($settings,array('globalACARS' => 'FALSE'));
893
+		$settings = array_merge($settings, array('globalACARS' => 'FALSE'));
894 894
 	}
895 895
 
896
-	$flightawareusername = filter_input(INPUT_POST,'flightawareusername',FILTER_SANITIZE_STRING);
897
-	$flightawarepassword = filter_input(INPUT_POST,'flightawarepassword',FILTER_SANITIZE_STRING);
898
-	$settings = array_merge($settings,array('globalFlightAwareUsername' => $flightawareusername,'globalFlightAwarePassword' => $flightawarepassword));
896
+	$flightawareusername = filter_input(INPUT_POST, 'flightawareusername', FILTER_SANITIZE_STRING);
897
+	$flightawarepassword = filter_input(INPUT_POST, 'flightawarepassword', FILTER_SANITIZE_STRING);
898
+	$settings = array_merge($settings, array('globalFlightAwareUsername' => $flightawareusername, 'globalFlightAwarePassword' => $flightawarepassword));
899 899
 	
900 900
 	$source_name = $_POST['source_name'];
901 901
 	$source_latitude = $_POST['source_latitude'];
@@ -909,8 +909,8 @@  discard block
 block discarded – undo
909 909
 	
910 910
 	$sources = array();
911 911
 	foreach ($source_name as $keys => $name) {
912
-	    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]);
913
-	    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]);
912
+	    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]);
913
+	    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]);
914 914
 	}
915 915
 	if (count($sources) > 0) $_SESSION['sources'] = $sources;
916 916
 
@@ -923,12 +923,12 @@  discard block
 block discarded – undo
923 923
 	$sbsurl = $_POST['sbsurl'];
924 924
 	*/
925 925
 
926
-	$globalvatsim = filter_input(INPUT_POST,'globalvatsim',FILTER_SANITIZE_STRING);
927
-	$globalivao = filter_input(INPUT_POST,'globalivao',FILTER_SANITIZE_STRING);
928
-	$globalphpvms = filter_input(INPUT_POST,'globalphpvms',FILTER_SANITIZE_STRING);
929
-	$globalsbs = filter_input(INPUT_POST,'globalsbs',FILTER_SANITIZE_STRING);
930
-	$globalaprs = filter_input(INPUT_POST,'globalaprs',FILTER_SANITIZE_STRING);
931
-	$datasource = filter_input(INPUT_POST,'datasource',FILTER_SANITIZE_STRING);
926
+	$globalvatsim = filter_input(INPUT_POST, 'globalvatsim', FILTER_SANITIZE_STRING);
927
+	$globalivao = filter_input(INPUT_POST, 'globalivao', FILTER_SANITIZE_STRING);
928
+	$globalphpvms = filter_input(INPUT_POST, 'globalphpvms', FILTER_SANITIZE_STRING);
929
+	$globalsbs = filter_input(INPUT_POST, 'globalsbs', FILTER_SANITIZE_STRING);
930
+	$globalaprs = filter_input(INPUT_POST, 'globalaprs', FILTER_SANITIZE_STRING);
931
+	$datasource = filter_input(INPUT_POST, 'datasource', FILTER_SANITIZE_STRING);
932 932
 
933 933
 /*	
934 934
 	$globalSBS1Hosts = array();
@@ -944,7 +944,7 @@  discard block
 block discarded – undo
944 944
 	}
945 945
 	$settings = array_merge($settings,array('globalSBS1Hosts' => $globalSBS1Hosts));
946 946
 */
947
-	$settings_comment = array_merge($settings_comment,array('globalSBS1Hosts'));
947
+	$settings_comment = array_merge($settings_comment, array('globalSBS1Hosts'));
948 948
 	$host = $_POST['host'];
949 949
 	$port = $_POST['port'];
950 950
 	$name = $_POST['name'];
@@ -954,88 +954,88 @@  discard block
 block discarded – undo
954 954
 	foreach ($host as $key => $h) {
955 955
 		if (isset($sourcestats[$key]) && $sourcestats[$key] == 1) $cov = 'TRUE';
956 956
 		else $cov = 'FALSE';
957
-		if ($h != '') $gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov);
957
+		if ($h != '') $gSources[] = array('host' => $h, 'port' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov);
958 958
 	}
959
-	$settings = array_merge($settings,array('globalSources' => $gSources));
959
+	$settings = array_merge($settings, array('globalSources' => $gSources));
960 960
 
961
-	$sbstimeout = filter_input(INPUT_POST,'sbstimeout',FILTER_SANITIZE_NUMBER_INT);
962
-	$settings = array_merge($settings,array('globalSourcesTimeOut' => $sbstimeout));
961
+	$sbstimeout = filter_input(INPUT_POST, 'sbstimeout', FILTER_SANITIZE_NUMBER_INT);
962
+	$settings = array_merge($settings, array('globalSourcesTimeOut' => $sbstimeout));
963 963
 
964
-	$acarshost = filter_input(INPUT_POST,'acarshost',FILTER_SANITIZE_STRING);
965
-	$acarsport = filter_input(INPUT_POST,'acarsport',FILTER_SANITIZE_NUMBER_INT);
966
-	$settings = array_merge($settings,array('globalACARSHost' => $acarshost,'globalACARSPort' => $acarsport));
964
+	$acarshost = filter_input(INPUT_POST, 'acarshost', FILTER_SANITIZE_STRING);
965
+	$acarsport = filter_input(INPUT_POST, 'acarsport', FILTER_SANITIZE_NUMBER_INT);
966
+	$settings = array_merge($settings, array('globalACARSHost' => $acarshost, 'globalACARSPort' => $acarsport));
967 967
 
968
-	$bitly = filter_input(INPUT_POST,'bitly',FILTER_SANITIZE_STRING);
969
-	$settings = array_merge($settings,array('globalBitlyAccessToken' => $bitly));
968
+	$bitly = filter_input(INPUT_POST, 'bitly', FILTER_SANITIZE_STRING);
969
+	$settings = array_merge($settings, array('globalBitlyAccessToken' => $bitly));
970 970
 
971
-	$notamsource = filter_input(INPUT_POST,'notamsource',FILTER_SANITIZE_STRING);
972
-	$settings = array_merge($settings,array('globalNOTAMSource' => $notamsource));
973
-	$metarsource = filter_input(INPUT_POST,'metarsource',FILTER_SANITIZE_STRING);
974
-	$settings = array_merge($settings,array('globalMETARurl' => $metarsource));
971
+	$notamsource = filter_input(INPUT_POST, 'notamsource', FILTER_SANITIZE_STRING);
972
+	$settings = array_merge($settings, array('globalNOTAMSource' => $notamsource));
973
+	$metarsource = filter_input(INPUT_POST, 'metarsource', FILTER_SANITIZE_STRING);
974
+	$settings = array_merge($settings, array('globalMETARurl' => $metarsource));
975 975
 
976
-	$zoilatitude = filter_input(INPUT_POST,'zoilatitude',FILTER_SANITIZE_STRING);
977
-	$zoilongitude = filter_input(INPUT_POST,'zoilongitude',FILTER_SANITIZE_STRING);
978
-	$zoidistance = filter_input(INPUT_POST,'zoidistance',FILTER_SANITIZE_NUMBER_INT);
976
+	$zoilatitude = filter_input(INPUT_POST, 'zoilatitude', FILTER_SANITIZE_STRING);
977
+	$zoilongitude = filter_input(INPUT_POST, 'zoilongitude', FILTER_SANITIZE_STRING);
978
+	$zoidistance = filter_input(INPUT_POST, 'zoidistance', FILTER_SANITIZE_NUMBER_INT);
979 979
 	if ($zoilatitude != '' && $zoilongitude != '' && $zoidistance != '') {
980
-		$settings = array_merge($settings,array('globalDistanceIgnore' => array('latitude' => $zoilatitude,'longitude' => $zoilongitude,'distance' => $zoidistance)));
981
-	} else $settings = array_merge($settings,array('globalDistanceIgnore' => array()));
980
+		$settings = array_merge($settings, array('globalDistanceIgnore' => array('latitude' => $zoilatitude, 'longitude' => $zoilongitude, 'distance' => $zoidistance)));
981
+	} else $settings = array_merge($settings, array('globalDistanceIgnore' => array()));
982 982
 
983
-	$refresh = filter_input(INPUT_POST,'refresh',FILTER_SANITIZE_NUMBER_INT);
984
-	$settings = array_merge($settings,array('globalLiveInterval' => $refresh));
985
-	$maprefresh = filter_input(INPUT_POST,'maprefresh',FILTER_SANITIZE_NUMBER_INT);
986
-	$settings = array_merge($settings,array('globalMapRefresh' => $maprefresh));
987
-	$mapidle = filter_input(INPUT_POST,'mapidle',FILTER_SANITIZE_NUMBER_INT);
988
-	$settings = array_merge($settings,array('globalMapIdleTimeout' => $mapidle));
989
-	$closestmindist = filter_input(INPUT_POST,'closestmindist',FILTER_SANITIZE_NUMBER_INT);
990
-	$settings = array_merge($settings,array('globalClosestMinDist' => $closestmindist));
983
+	$refresh = filter_input(INPUT_POST, 'refresh', FILTER_SANITIZE_NUMBER_INT);
984
+	$settings = array_merge($settings, array('globalLiveInterval' => $refresh));
985
+	$maprefresh = filter_input(INPUT_POST, 'maprefresh', FILTER_SANITIZE_NUMBER_INT);
986
+	$settings = array_merge($settings, array('globalMapRefresh' => $maprefresh));
987
+	$mapidle = filter_input(INPUT_POST, 'mapidle', FILTER_SANITIZE_NUMBER_INT);
988
+	$settings = array_merge($settings, array('globalMapIdleTimeout' => $mapidle));
989
+	$closestmindist = filter_input(INPUT_POST, 'closestmindist', FILTER_SANITIZE_NUMBER_INT);
990
+	$settings = array_merge($settings, array('globalClosestMinDist' => $closestmindist));
991 991
 
992
-	$aircraftsize = filter_input(INPUT_POST,'aircraftsize',FILTER_SANITIZE_NUMBER_INT);
993
-	$settings = array_merge($settings,array('globalAircraftSize' => $aircraftsize));
992
+	$aircraftsize = filter_input(INPUT_POST, 'aircraftsize', FILTER_SANITIZE_NUMBER_INT);
993
+	$settings = array_merge($settings, array('globalAircraftSize' => $aircraftsize));
994 994
 
995
-	$archivemonths = filter_input(INPUT_POST,'archivemonths',FILTER_SANITIZE_NUMBER_INT);
996
-	$settings = array_merge($settings,array('globalArchiveMonths' => $archivemonths));
995
+	$archivemonths = filter_input(INPUT_POST, 'archivemonths', FILTER_SANITIZE_NUMBER_INT);
996
+	$settings = array_merge($settings, array('globalArchiveMonths' => $archivemonths));
997 997
 	
998
-	$archiveyear = filter_input(INPUT_POST,'archiveyear',FILTER_SANITIZE_STRING);
998
+	$archiveyear = filter_input(INPUT_POST, 'archiveyear', FILTER_SANITIZE_STRING);
999 999
 	if ($archiveyear == "archiveyear") {
1000
-		$settings = array_merge($settings,array('globalArchiveYear' => 'TRUE'));
1000
+		$settings = array_merge($settings, array('globalArchiveYear' => 'TRUE'));
1001 1001
 	} else {
1002
-		$settings = array_merge($settings,array('globalArchiveYear' => 'FALSE'));
1002
+		$settings = array_merge($settings, array('globalArchiveYear' => 'FALSE'));
1003 1003
 	}
1004
-	$archivekeepmonths = filter_input(INPUT_POST,'archivekeepmonths',FILTER_SANITIZE_NUMBER_INT);
1005
-	$settings = array_merge($settings,array('globalArchiveKeepMonths' => $archivekeepmonths));
1006
-	$archivekeeptrackmonths = filter_input(INPUT_POST,'archivekeeptrackmonths',FILTER_SANITIZE_NUMBER_INT);
1007
-	$settings = array_merge($settings,array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths));
1004
+	$archivekeepmonths = filter_input(INPUT_POST, 'archivekeepmonths', FILTER_SANITIZE_NUMBER_INT);
1005
+	$settings = array_merge($settings, array('globalArchiveKeepMonths' => $archivekeepmonths));
1006
+	$archivekeeptrackmonths = filter_input(INPUT_POST, 'archivekeeptrackmonths', FILTER_SANITIZE_NUMBER_INT);
1007
+	$settings = array_merge($settings, array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths));
1008 1008
 
1009
-	$britishairways = filter_input(INPUT_POST,'britishairways',FILTER_SANITIZE_STRING);
1010
-	$settings = array_merge($settings,array('globalBritishAirwaysKey' => $britishairways));
1011
-	$transavia = filter_input(INPUT_POST,'transavia',FILTER_SANITIZE_STRING);
1012
-	$settings = array_merge($settings,array('globalTransaviaKey' => $transavia));
1009
+	$britishairways = filter_input(INPUT_POST, 'britishairways', FILTER_SANITIZE_STRING);
1010
+	$settings = array_merge($settings, array('globalBritishAirwaysKey' => $britishairways));
1011
+	$transavia = filter_input(INPUT_POST, 'transavia', FILTER_SANITIZE_STRING);
1012
+	$settings = array_merge($settings, array('globalTransaviaKey' => $transavia));
1013 1013
 
1014
-	$lufthansakey = filter_input(INPUT_POST,'lufthansakey',FILTER_SANITIZE_STRING);
1015
-	$lufthansasecret = filter_input(INPUT_POST,'lufthansasecret',FILTER_SANITIZE_STRING);
1016
-	$settings = array_merge($settings,array('globalLufthansaKey' => array('key' => $lufthansakey,'secret' => $lufthansasecret)));
1014
+	$lufthansakey = filter_input(INPUT_POST, 'lufthansakey', FILTER_SANITIZE_STRING);
1015
+	$lufthansasecret = filter_input(INPUT_POST, 'lufthansasecret', FILTER_SANITIZE_STRING);
1016
+	$settings = array_merge($settings, array('globalLufthansaKey' => array('key' => $lufthansakey, 'secret' => $lufthansasecret)));
1017 1017
 
1018 1018
 	// Create in settings.php keys not yet configurable if not already here
1019 1019
 	//if (!isset($globalImageBingKey)) $settings = array_merge($settings,array('globalImageBingKey' => ''));
1020
-	if (!isset($globalDebug)) $settings = array_merge($settings,array('globalDebug' => 'TRUE'));
1020
+	if (!isset($globalDebug)) $settings = array_merge($settings, array('globalDebug' => 'TRUE'));
1021 1021
 
1022
-	$archive = filter_input(INPUT_POST,'archive',FILTER_SANITIZE_STRING);
1022
+	$archive = filter_input(INPUT_POST, 'archive', FILTER_SANITIZE_STRING);
1023 1023
 	if ($archive == 'archive') {
1024
-		$settings = array_merge($settings,array('globalArchive' => 'TRUE'));
1024
+		$settings = array_merge($settings, array('globalArchive' => 'TRUE'));
1025 1025
 	} else {
1026
-		$settings = array_merge($settings,array('globalArchive' => 'FALSE'));
1026
+		$settings = array_merge($settings, array('globalArchive' => 'FALSE'));
1027 1027
 	}
1028
-	$daemon = filter_input(INPUT_POST,'daemon',FILTER_SANITIZE_STRING);
1028
+	$daemon = filter_input(INPUT_POST, 'daemon', FILTER_SANITIZE_STRING);
1029 1029
 	if ($daemon == 'daemon') {
1030
-		$settings = array_merge($settings,array('globalDaemon' => 'TRUE'));
1030
+		$settings = array_merge($settings, array('globalDaemon' => 'TRUE'));
1031 1031
 	} else {
1032
-		$settings = array_merge($settings,array('globalDaemon' => 'FALSE'));
1032
+		$settings = array_merge($settings, array('globalDaemon' => 'FALSE'));
1033 1033
 	}
1034
-	$schedules = filter_input(INPUT_POST,'schedules',FILTER_SANITIZE_STRING);
1034
+	$schedules = filter_input(INPUT_POST, 'schedules', FILTER_SANITIZE_STRING);
1035 1035
 	if ($schedules == 'schedules') {
1036
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE'));
1036
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE'));
1037 1037
 	} else {
1038
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE'));
1038
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE'));
1039 1039
 	}
1040 1040
 
1041 1041
 /*
@@ -1046,132 +1046,132 @@  discard block
 block discarded – undo
1046 1046
 		$settings = array_merge($settings,array('globalFlightAware' => 'FALSE','globalSBS1' => 'TRUE'));
1047 1047
 	}
1048 1048
 */
1049
-	$settings = array_merge($settings,array('globalFlightAware' => 'FALSE'));
1050
-	if ($globalsbs == 'sbs') $settings = array_merge($settings,array('globalSBS1' => 'TRUE'));
1051
-	else $settings = array_merge($settings,array('globalSBS1' => 'FALSE'));
1052
-	if ($globalaprs == 'aprs') $settings = array_merge($settings,array('globalAPRS' => 'TRUE'));
1053
-	else $settings = array_merge($settings,array('globalAPRS' => 'FALSE'));
1049
+	$settings = array_merge($settings, array('globalFlightAware' => 'FALSE'));
1050
+	if ($globalsbs == 'sbs') $settings = array_merge($settings, array('globalSBS1' => 'TRUE'));
1051
+	else $settings = array_merge($settings, array('globalSBS1' => 'FALSE'));
1052
+	if ($globalaprs == 'aprs') $settings = array_merge($settings, array('globalAPRS' => 'TRUE'));
1053
+	else $settings = array_merge($settings, array('globalAPRS' => 'FALSE'));
1054 1054
 	if ($globalivao == 'ivao') {
1055 1055
 		//$settings = array_merge($settings,array('globalIVAO' => 'TRUE','globalVATSIM' => 'FALSE'));
1056
-		$settings = array_merge($settings,array('globalIVAO' => 'TRUE'));
1057
-	} else $settings = array_merge($settings,array('globalIVAO' => 'FALSE'));
1056
+		$settings = array_merge($settings, array('globalIVAO' => 'TRUE'));
1057
+	} else $settings = array_merge($settings, array('globalIVAO' => 'FALSE'));
1058 1058
 	if ($globalvatsim == 'vatsim') {
1059 1059
 		//$settings = array_merge($settings,array('globalVATSIM' => 'TRUE','globalIVAO' => 'FALSE'));
1060
-		$settings = array_merge($settings,array('globalVATSIM' => 'TRUE'));
1061
-	} else $settings = array_merge($settings,array('globalVATSIM' => 'FALSE'));
1060
+		$settings = array_merge($settings, array('globalVATSIM' => 'TRUE'));
1061
+	} else $settings = array_merge($settings, array('globalVATSIM' => 'FALSE'));
1062 1062
 	if ($globalphpvms == 'phpvms') {
1063
-		$settings = array_merge($settings,array('globalphpVMS' => 'TRUE'));
1064
-	} else $settings = array_merge($settings,array('globalphpVMS' => 'FALSE'));
1063
+		$settings = array_merge($settings, array('globalphpVMS' => 'TRUE'));
1064
+	} else $settings = array_merge($settings, array('globalphpVMS' => 'FALSE'));
1065 1065
 	if ($globalvatsim == 'vatsim' || $globalivao == 'ivao' || $globalphpvms == 'phpvms') {
1066
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE','globalTranslationFetch' => 'FALSE'));
1067
-	} else $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE'));
1066
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE', 'globalTranslationFetch' => 'FALSE'));
1067
+	} else $settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE', 'globalTranslationFetch' => 'TRUE'));
1068 1068
 	
1069 1069
 
1070 1070
 
1071
-	$notam = filter_input(INPUT_POST,'notam',FILTER_SANITIZE_STRING);
1071
+	$notam = filter_input(INPUT_POST, 'notam', FILTER_SANITIZE_STRING);
1072 1072
 	if ($notam == 'notam') {
1073
-		$settings = array_merge($settings,array('globalNOTAM' => 'TRUE'));
1073
+		$settings = array_merge($settings, array('globalNOTAM' => 'TRUE'));
1074 1074
 	} else {
1075
-		$settings = array_merge($settings,array('globalNOTAM' => 'FALSE'));
1075
+		$settings = array_merge($settings, array('globalNOTAM' => 'FALSE'));
1076 1076
 	}
1077
-	$owner = filter_input(INPUT_POST,'owner',FILTER_SANITIZE_STRING);
1077
+	$owner = filter_input(INPUT_POST, 'owner', FILTER_SANITIZE_STRING);
1078 1078
 	if ($owner == 'owner') {
1079
-		$settings = array_merge($settings,array('globalOwner' => 'TRUE'));
1079
+		$settings = array_merge($settings, array('globalOwner' => 'TRUE'));
1080 1080
 	} else {
1081
-		$settings = array_merge($settings,array('globalOwner' => 'FALSE'));
1081
+		$settings = array_merge($settings, array('globalOwner' => 'FALSE'));
1082 1082
 	}
1083
-	$translate = filter_input(INPUT_POST,'translate',FILTER_SANITIZE_STRING);
1083
+	$translate = filter_input(INPUT_POST, 'translate', FILTER_SANITIZE_STRING);
1084 1084
 	if ($translate == 'translate') {
1085
-		$settings = array_merge($settings,array('globalTranslate' => 'TRUE'));
1085
+		$settings = array_merge($settings, array('globalTranslate' => 'TRUE'));
1086 1086
 	} else {
1087
-		$settings = array_merge($settings,array('globalTranslate' => 'FALSE'));
1087
+		$settings = array_merge($settings, array('globalTranslate' => 'FALSE'));
1088 1088
 	}
1089
-	$estimation = filter_input(INPUT_POST,'estimation',FILTER_SANITIZE_STRING);
1089
+	$estimation = filter_input(INPUT_POST, 'estimation', FILTER_SANITIZE_STRING);
1090 1090
 	if ($estimation == 'estimation') {
1091
-		$settings = array_merge($settings,array('globalMapEstimation' => 'TRUE'));
1091
+		$settings = array_merge($settings, array('globalMapEstimation' => 'TRUE'));
1092 1092
 	} else {
1093
-		$settings = array_merge($settings,array('globalMapEstimation' => 'FALSE'));
1093
+		$settings = array_merge($settings, array('globalMapEstimation' => 'FALSE'));
1094 1094
 	}
1095
-	$metar = filter_input(INPUT_POST,'metar',FILTER_SANITIZE_STRING);
1095
+	$metar = filter_input(INPUT_POST, 'metar', FILTER_SANITIZE_STRING);
1096 1096
 	if ($metar == 'metar') {
1097
-		$settings = array_merge($settings,array('globalMETAR' => 'TRUE'));
1097
+		$settings = array_merge($settings, array('globalMETAR' => 'TRUE'));
1098 1098
 	} else {
1099
-		$settings = array_merge($settings,array('globalMETAR' => 'FALSE'));
1099
+		$settings = array_merge($settings, array('globalMETAR' => 'FALSE'));
1100 1100
 	}
1101
-	$metarcycle = filter_input(INPUT_POST,'metarcycle',FILTER_SANITIZE_STRING);
1101
+	$metarcycle = filter_input(INPUT_POST, 'metarcycle', FILTER_SANITIZE_STRING);
1102 1102
 	if ($metarcycle == 'metarcycle') {
1103
-		$settings = array_merge($settings,array('globalMETARcycle' => 'TRUE'));
1103
+		$settings = array_merge($settings, array('globalMETARcycle' => 'TRUE'));
1104 1104
 	} else {
1105
-		$settings = array_merge($settings,array('globalMETARcycle' => 'FALSE'));
1105
+		$settings = array_merge($settings, array('globalMETARcycle' => 'FALSE'));
1106 1106
 	}
1107
-	$fork = filter_input(INPUT_POST,'fork',FILTER_SANITIZE_STRING);
1107
+	$fork = filter_input(INPUT_POST, 'fork', FILTER_SANITIZE_STRING);
1108 1108
 	if ($fork == 'fork') {
1109
-		$settings = array_merge($settings,array('globalFork' => 'TRUE'));
1109
+		$settings = array_merge($settings, array('globalFork' => 'TRUE'));
1110 1110
 	} else {
1111
-		$settings = array_merge($settings,array('globalFork' => 'FALSE'));
1111
+		$settings = array_merge($settings, array('globalFork' => 'FALSE'));
1112 1112
 	}
1113 1113
 
1114
-	$colormap = filter_input(INPUT_POST,'colormap',FILTER_SANITIZE_STRING);
1114
+	$colormap = filter_input(INPUT_POST, 'colormap', FILTER_SANITIZE_STRING);
1115 1115
 	if ($colormap == 'colormap') {
1116
-		$settings = array_merge($settings,array('globalMapAltitudeColor' => 'TRUE'));
1116
+		$settings = array_merge($settings, array('globalMapAltitudeColor' => 'TRUE'));
1117 1117
 	} else {
1118
-		$settings = array_merge($settings,array('globalMapAltitudeColor' => 'FALSE'));
1118
+		$settings = array_merge($settings, array('globalMapAltitudeColor' => 'FALSE'));
1119 1119
 	}
1120 1120
 	
1121 1121
 	if (isset($_POST['aircrafticoncolor'])) {
1122
-		$aircrafticoncolor = filter_input(INPUT_POST,'aircrafticoncolor',FILTER_SANITIZE_STRING);
1123
-		$settings = array_merge($settings,array('globalAircraftIconColor' => substr($aircrafticoncolor,1)));
1122
+		$aircrafticoncolor = filter_input(INPUT_POST, 'aircrafticoncolor', FILTER_SANITIZE_STRING);
1123
+		$settings = array_merge($settings, array('globalAircraftIconColor' => substr($aircrafticoncolor, 1)));
1124 1124
 	}
1125 1125
 
1126
-	$airportzoom = filter_input(INPUT_POST,'airportzoom',FILTER_SANITIZE_NUMBER_INT);
1127
-	$settings = array_merge($settings,array('globalAirportZoom' => $airportzoom));
1126
+	$airportzoom = filter_input(INPUT_POST, 'airportzoom', FILTER_SANITIZE_NUMBER_INT);
1127
+	$settings = array_merge($settings, array('globalAirportZoom' => $airportzoom));
1128 1128
 
1129
-	$unitdistance = filter_input(INPUT_POST,'unitdistance',FILTER_SANITIZE_STRING);
1130
-	$settings = array_merge($settings,array('globalUnitDistance' => $unitdistance));
1131
-	$unitaltitude = filter_input(INPUT_POST,'unitaltitude',FILTER_SANITIZE_STRING);
1132
-	$settings = array_merge($settings,array('globalUnitAltitude' => $unitaltitude));
1133
-	$unitspeed = filter_input(INPUT_POST,'unitspeed',FILTER_SANITIZE_STRING);
1134
-	$settings = array_merge($settings,array('globalUnitSpeed' => $unitspeed));
1129
+	$unitdistance = filter_input(INPUT_POST, 'unitdistance', FILTER_SANITIZE_STRING);
1130
+	$settings = array_merge($settings, array('globalUnitDistance' => $unitdistance));
1131
+	$unitaltitude = filter_input(INPUT_POST, 'unitaltitude', FILTER_SANITIZE_STRING);
1132
+	$settings = array_merge($settings, array('globalUnitAltitude' => $unitaltitude));
1133
+	$unitspeed = filter_input(INPUT_POST, 'unitspeed', FILTER_SANITIZE_STRING);
1134
+	$settings = array_merge($settings, array('globalUnitSpeed' => $unitspeed));
1135 1135
 
1136
-	$mappopup = filter_input(INPUT_POST,'mappopup',FILTER_SANITIZE_STRING);
1136
+	$mappopup = filter_input(INPUT_POST, 'mappopup', FILTER_SANITIZE_STRING);
1137 1137
 	if ($mappopup == 'mappopup') {
1138
-		$settings = array_merge($settings,array('globalMapPopup' => 'TRUE'));
1138
+		$settings = array_merge($settings, array('globalMapPopup' => 'TRUE'));
1139 1139
 	} else {
1140
-		$settings = array_merge($settings,array('globalMapPopup' => 'FALSE'));
1140
+		$settings = array_merge($settings, array('globalMapPopup' => 'FALSE'));
1141 1141
 	}
1142
-	$airportpopup = filter_input(INPUT_POST,'airportpopup',FILTER_SANITIZE_STRING);
1142
+	$airportpopup = filter_input(INPUT_POST, 'airportpopup', FILTER_SANITIZE_STRING);
1143 1143
 	if ($airportpopup == 'airportpopup') {
1144
-		$settings = array_merge($settings,array('globalAirportPopup' => 'TRUE'));
1144
+		$settings = array_merge($settings, array('globalAirportPopup' => 'TRUE'));
1145 1145
 	} else {
1146
-		$settings = array_merge($settings,array('globalAirportPopup' => 'FALSE'));
1146
+		$settings = array_merge($settings, array('globalAirportPopup' => 'FALSE'));
1147 1147
 	}
1148
-	$maphistory = filter_input(INPUT_POST,'maphistory',FILTER_SANITIZE_STRING);
1148
+	$maphistory = filter_input(INPUT_POST, 'maphistory', FILTER_SANITIZE_STRING);
1149 1149
 	if ($maphistory == 'maphistory') {
1150
-		$settings = array_merge($settings,array('globalMapHistory' => 'TRUE'));
1150
+		$settings = array_merge($settings, array('globalMapHistory' => 'TRUE'));
1151 1151
 	} else {
1152
-		$settings = array_merge($settings,array('globalMapHistory' => 'FALSE'));
1152
+		$settings = array_merge($settings, array('globalMapHistory' => 'FALSE'));
1153 1153
 	}
1154
-	$flightroute = filter_input(INPUT_POST,'flightroute',FILTER_SANITIZE_STRING);
1154
+	$flightroute = filter_input(INPUT_POST, 'flightroute', FILTER_SANITIZE_STRING);
1155 1155
 	if ($flightroute == 'flightroute') {
1156
-		$settings = array_merge($settings,array('globalMapRoute' => 'TRUE'));
1156
+		$settings = array_merge($settings, array('globalMapRoute' => 'TRUE'));
1157 1157
 	} else {
1158
-		$settings = array_merge($settings,array('globalMapRoute' => 'FALSE'));
1158
+		$settings = array_merge($settings, array('globalMapRoute' => 'FALSE'));
1159 1159
 	}
1160 1160
 
1161
-	if (!isset($globalTransaction)) $settings = array_merge($settings,array('globalTransaction' => 'TRUE'));
1161
+	if (!isset($globalTransaction)) $settings = array_merge($settings, array('globalTransaction' => 'TRUE'));
1162 1162
 
1163 1163
 	// Set some defaults values...
1164 1164
 	if (!isset($globalAircraftImageSources)) {
1165
-	    $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
1166
-	    $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources));
1165
+	    $globalAircraftImageSources = array('ivaomtl', 'wikimedia', 'airportdata', 'deviantart', 'flickr', 'bing', 'jetphotos', 'planepictures', 'planespotters');
1166
+	    $settings = array_merge($settings, array('globalAircraftImageSources' => $globalAircraftImageSources));
1167 1167
 	}
1168 1168
 
1169 1169
 	if (!isset($globalSchedulesSources)) {
1170
-	    $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
1171
-    	    $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources));
1170
+	    $globalSchedulesSources = array('flightmapper', 'costtotravel', 'flightradar24', 'flightaware');
1171
+    	    $settings = array_merge($settings, array('globalSchedulesSources' => $globalSchedulesSources));
1172 1172
     	}
1173 1173
 
1174
-	$settings = array_merge($settings,array('globalInstalled' => 'TRUE'));
1174
+	$settings = array_merge($settings, array('globalInstalled' => 'TRUE'));
1175 1175
 
1176 1176
 	if ($error == '') settings::modify_settings($settings);
1177 1177
 	if ($error == '') settings::comment_settings($settings_comment);
@@ -1187,7 +1187,7 @@  discard block
 block discarded – undo
1187 1187
 		print '<div class="info column"><ul>';
1188 1188
 		
1189 1189
 		if (isset($_POST['createdb'])) {
1190
-			$_SESSION['done'] = array('Create database','Write configuration');
1190
+			$_SESSION['done'] = array('Create database', 'Write configuration');
1191 1191
 			print '<li>Create database....<strong>SUCCESS</strong></li>';
1192 1192
 		} else $_SESSION['done'] = array('Write configuration');
1193 1193
 		print '<li>Write configuration....<img src="../images/loading.gif" /></li></ul></div>';
Please login to merge, or discard this patch.