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