|
@@ -22,7 +22,7 @@ discard block |
|
|
block discarded – undo |
|
22
|
22
|
require_once(dirname(__FILE__).'/class.create_db.php'); |
|
23
|
23
|
require_once(dirname(__FILE__).'/class.update_schema.php'); |
|
24
|
24
|
require_once(dirname(__FILE__).'/class.settings.php'); |
|
25
|
|
-$title="Install"; |
|
|
25
|
+$title = "Install"; |
|
26
|
26
|
require(dirname(__FILE__).'/../require/settings.php'); |
|
27
|
27
|
require_once(dirname(__FILE__).'/../require/class.Common.php'); |
|
28
|
28
|
require(dirname(__FILE__).'/header.php'); |
|
@@ -93,8 +93,8 @@ discard block |
|
|
block discarded – undo |
|
93
|
93
|
if (!extension_loaded('curl')) { |
|
94
|
94
|
$error[] = "Curl is not loaded."; |
|
95
|
95
|
} |
|
96
|
|
- if(function_exists('apache_get_modules') ){ |
|
97
|
|
- if(!in_array('mod_rewrite',apache_get_modules())) { |
|
|
96
|
+ if (function_exists('apache_get_modules')) { |
|
|
97
|
+ if (!in_array('mod_rewrite', apache_get_modules())) { |
|
98
|
98
|
$error[] = "mod_rewrite is not available."; |
|
99
|
99
|
} |
|
100
|
100
|
/* |
|
@@ -111,12 +111,12 @@ discard block |
|
|
block discarded – undo |
|
111
|
111
|
if (isset($_SERVER['REQUEST_SCHEME']) && isset($_SERVER['SERVER_NAME']) && isset($_SERVER['SERVER_PORT']) && isset($_SERVER['REQUEST_URI'])) { |
|
112
|
112
|
if (function_exists('get_headers')) { |
|
113
|
113
|
//$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace(array('install/','install'),'search',str_replace('index.php','',$_SERVER["REQUEST_URI"]))); |
|
114
|
|
- $check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace(array('install/','install'),'live/geojson?test',str_replace('index.php','',$_SERVER["REQUEST_URI"]))); |
|
115
|
|
- if (isset($check_header[0]) && !stripos($check_header[0],"200 OK")) { |
|
|
114
|
+ $check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace(array('install/', 'install'), 'live/geojson?test', str_replace('index.php', '', $_SERVER["REQUEST_URI"]))); |
|
|
115
|
+ if (isset($check_header[0]) && !stripos($check_header[0], "200 OK")) { |
|
116
|
116
|
print '<div class="alert alert-danger"><strong>Error</strong> Check your configuration, rewrite don\'t seems to work well. If using Apache, you need to desactivate MultiViews <a href="https://github.com/Ysurac/FlightAirMap/wiki/Apache-configuration">https://github.com/Ysurac/FlightAirMap/wiki/Apache-configuration</a></div>'; |
|
117
|
117
|
} else { |
|
118
|
|
- $check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace(array('install/','install'),'search',str_replace('index.php','',$_SERVER["REQUEST_URI"]))); |
|
119
|
|
- if (isset($check_header[0]) && !stripos($check_header[0],"200 OK")) { |
|
|
118
|
+ $check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace(array('install/', 'install'), 'search', str_replace('index.php', '', $_SERVER["REQUEST_URI"]))); |
|
|
119
|
+ if (isset($check_header[0]) && !stripos($check_header[0], "200 OK")) { |
|
120
|
120
|
print '<div class="alert alert-danger"><strong>Error</strong> Check your configuration, rewrite don\'t seems to work well. If using Apache, you need to desactivate MultiViews <a href="https://github.com/Ysurac/FlightAirMap/wiki/Apache-configuration">https://github.com/Ysurac/FlightAirMap/wiki/Apache-configuration</a></div>'; |
|
121
|
121
|
} |
|
122
|
122
|
} |
|
@@ -196,7 +196,7 @@ discard block |
|
|
block discarded – undo |
|
196
|
196
|
if ((!isset($globalURL) || $globalURL == '') && (!isset($globalDBuser) || $globalDBuser == '')) { |
|
197
|
197
|
if (isset($_SERVER['REQUEST_URI'])) { |
|
198
|
198
|
$URL = $_SERVER['REQUEST_URI']; |
|
199
|
|
- $globalURL = str_replace('/install','',str_replace('/install/','',str_replace('/install/index.php','',$URL))); |
|
|
199
|
+ $globalURL = str_replace('/install', '', str_replace('/install/', '', str_replace('/install/index.php', '', $URL))); |
|
200
|
200
|
} |
|
201
|
201
|
} |
|
202
|
202
|
?> |
|
@@ -519,13 +519,13 @@ discard block |
|
|
block discarded – undo |
|
519
|
519
|
?> |
|
520
|
520
|
<tr> |
|
521
|
521
|
<?php |
|
522
|
|
- if (filter_var($source['host'],FILTER_VALIDATE_URL)) { |
|
|
522
|
+ if (filter_var($source['host'], FILTER_VALIDATE_URL)) { |
|
523
|
523
|
?> |
|
524
|
524
|
<td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td> |
|
525
|
525
|
<td><input type="text" name="port[]" class="col-xs-2" id="port" value="<?php if (isset($source['port'])) print $source['port']; ?>" /></td> |
|
526
|
526
|
<?php |
|
527
|
527
|
} else { |
|
528
|
|
- $hostport = explode(':',$source['host']); |
|
|
528
|
+ $hostport = explode(':', $source['host']); |
|
529
|
529
|
if (isset($hostport[1])) { |
|
530
|
530
|
$host = $hostport[0]; |
|
531
|
531
|
$port = $hostport[1]; |
|
@@ -575,7 +575,7 @@ discard block |
|
|
block discarded – undo |
|
575
|
575
|
<select name="timezones[]" id="timezones"> |
|
576
|
576
|
<?php |
|
577
|
577
|
$timezonelist = DateTimeZone::listIdentifiers(DateTimeZone::ALL); |
|
578
|
|
- foreach($timezonelist as $timezones){ |
|
|
578
|
+ foreach ($timezonelist as $timezones) { |
|
579
|
579
|
if (isset($source['timezone']) && $source['timezone'] == $timezones) { |
|
580
|
580
|
print '<option selected>'.$timezones.'</option>'; |
|
581
|
581
|
} elseif (!isset($source['timezone']) && $timezones == 'UTC') { |
|
@@ -630,7 +630,7 @@ discard block |
|
|
block discarded – undo |
|
630
|
630
|
<select name="timezones[]" id="timezones"> |
|
631
|
631
|
<?php |
|
632
|
632
|
$timezonelist = DateTimeZone::listIdentifiers(DateTimeZone::ALL); |
|
633
|
|
- foreach($timezonelist as $timezones){ |
|
|
633
|
+ foreach ($timezonelist as $timezones) { |
|
634
|
634
|
if ($timezones == 'UTC') { |
|
635
|
635
|
print '<option selected>'.$timezones.'</option>'; |
|
636
|
636
|
} else print '<option>'.$timezones.'</option>'; |
|
@@ -1089,7 +1089,7 @@ discard block |
|
|
block discarded – undo |
|
1089
|
1089
|
<br /> |
|
1090
|
1090
|
<p> |
|
1091
|
1091
|
<label for="aircraftsize">Size of aircraft icon on map (default to 30px if zoom > 7 else 15px), empty to default</label> |
|
1092
|
|
- <input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize;?>" /> |
|
|
1092
|
+ <input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize; ?>" /> |
|
1093
|
1093
|
</p> |
|
1094
|
1094
|
<br /> |
|
1095
|
1095
|
<p> |
|
@@ -1151,14 +1151,14 @@ discard block |
|
|
block discarded – undo |
|
1151
|
1151
|
$error = ''; |
|
1152
|
1152
|
|
|
1153
|
1153
|
if (isset($_POST['dbtype'])) { |
|
1154
|
|
- $dbtype = filter_input(INPUT_POST,'dbtype',FILTER_SANITIZE_STRING); |
|
1155
|
|
- $dbroot = filter_input(INPUT_POST,'dbroot',FILTER_SANITIZE_STRING); |
|
1156
|
|
- $dbrootpass = filter_input(INPUT_POST,'dbrootpass',FILTER_SANITIZE_STRING); |
|
1157
|
|
- $dbname = filter_input(INPUT_POST,'dbname',FILTER_SANITIZE_STRING); |
|
1158
|
|
- $dbuser = filter_input(INPUT_POST,'dbuser',FILTER_SANITIZE_STRING); |
|
1159
|
|
- $dbuserpass = filter_input(INPUT_POST,'dbuserpass',FILTER_SANITIZE_STRING); |
|
1160
|
|
- $dbhost = filter_input(INPUT_POST,'dbhost',FILTER_SANITIZE_STRING); |
|
1161
|
|
- $dbport = filter_input(INPUT_POST,'dbport',FILTER_SANITIZE_STRING); |
|
|
1154
|
+ $dbtype = filter_input(INPUT_POST, 'dbtype', FILTER_SANITIZE_STRING); |
|
|
1155
|
+ $dbroot = filter_input(INPUT_POST, 'dbroot', FILTER_SANITIZE_STRING); |
|
|
1156
|
+ $dbrootpass = filter_input(INPUT_POST, 'dbrootpass', FILTER_SANITIZE_STRING); |
|
|
1157
|
+ $dbname = filter_input(INPUT_POST, 'dbname', FILTER_SANITIZE_STRING); |
|
|
1158
|
+ $dbuser = filter_input(INPUT_POST, 'dbuser', FILTER_SANITIZE_STRING); |
|
|
1159
|
+ $dbuserpass = filter_input(INPUT_POST, 'dbuserpass', FILTER_SANITIZE_STRING); |
|
|
1160
|
+ $dbhost = filter_input(INPUT_POST, 'dbhost', FILTER_SANITIZE_STRING); |
|
|
1161
|
+ $dbport = filter_input(INPUT_POST, 'dbport', FILTER_SANITIZE_STRING); |
|
1162
|
1162
|
|
|
1163
|
1163
|
if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) $error .= 'Mysql driver for PDO must be loaded'; |
|
1164
|
1164
|
if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) $error .= 'PosgreSQL driver for PDO must be loaded'; |
|
@@ -1178,49 +1178,49 @@ discard block |
|
|
block discarded – undo |
|
1178
|
1178
|
} else $settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname)); |
|
1179
|
1179
|
*/ |
|
1180
|
1180
|
|
|
1181
|
|
- $settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname)); |
|
|
1181
|
+ $settings = array_merge($settings, array('globalDBdriver' => $dbtype, 'globalDBhost' => $dbhost, 'globalDBuser' => $dbuser, 'globalDBport' => $dbport, 'globalDBpass' => $dbuserpass, 'globalDBname' => $dbname)); |
|
1182
|
1182
|
|
|
1183
|
|
- $sitename = filter_input(INPUT_POST,'sitename',FILTER_SANITIZE_STRING); |
|
1184
|
|
- $siteurl = filter_input(INPUT_POST,'siteurl',FILTER_SANITIZE_STRING); |
|
1185
|
|
- $timezone = filter_input(INPUT_POST,'timezone',FILTER_SANITIZE_STRING); |
|
1186
|
|
- $language = filter_input(INPUT_POST,'language',FILTER_SANITIZE_STRING); |
|
1187
|
|
- $settings = array_merge($settings,array('globalName' => $sitename,'globalURL' => $siteurl, 'globalTimezone' => $timezone,'globalLanguage' => $language)); |
|
|
1183
|
+ $sitename = filter_input(INPUT_POST, 'sitename', FILTER_SANITIZE_STRING); |
|
|
1184
|
+ $siteurl = filter_input(INPUT_POST, 'siteurl', FILTER_SANITIZE_STRING); |
|
|
1185
|
+ $timezone = filter_input(INPUT_POST, 'timezone', FILTER_SANITIZE_STRING); |
|
|
1186
|
+ $language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_STRING); |
|
|
1187
|
+ $settings = array_merge($settings, array('globalName' => $sitename, 'globalURL' => $siteurl, 'globalTimezone' => $timezone, 'globalLanguage' => $language)); |
|
1188
|
1188
|
|
|
1189
|
|
- $mapprovider = filter_input(INPUT_POST,'mapprovider',FILTER_SANITIZE_STRING); |
|
1190
|
|
- $mapboxid = filter_input(INPUT_POST,'mapboxid',FILTER_SANITIZE_STRING); |
|
1191
|
|
- $mapboxtoken = filter_input(INPUT_POST,'mapboxtoken',FILTER_SANITIZE_STRING); |
|
1192
|
|
- $googlekey = filter_input(INPUT_POST,'googlekey',FILTER_SANITIZE_STRING); |
|
1193
|
|
- $bingkey = filter_input(INPUT_POST,'bingkey',FILTER_SANITIZE_STRING); |
|
1194
|
|
- $openweathermapkey = filter_input(INPUT_POST,'openweathermapkey',FILTER_SANITIZE_STRING); |
|
1195
|
|
- $mapquestkey = filter_input(INPUT_POST,'mapquestkey',FILTER_SANITIZE_STRING); |
|
1196
|
|
- $hereappid = filter_input(INPUT_POST,'hereappid',FILTER_SANITIZE_STRING); |
|
1197
|
|
- $hereappcode = filter_input(INPUT_POST,'hereappcode',FILTER_SANITIZE_STRING); |
|
1198
|
|
- $settings = array_merge($settings,array('globalMapProvider' => $mapprovider,'globalMapboxId' => $mapboxid,'globalMapboxToken' => $mapboxtoken,'globalGoogleAPIKey' => $googlekey,'globalBingMapKey' => $bingkey,'globalHereappID' => $hereappid,'globalHereappCode' => $hereappcode,'globalMapQuestKey' => $mapquestkey,'globalOpenWeatherMapKey' => $openweathermapkey)); |
|
|
1189
|
+ $mapprovider = filter_input(INPUT_POST, 'mapprovider', FILTER_SANITIZE_STRING); |
|
|
1190
|
+ $mapboxid = filter_input(INPUT_POST, 'mapboxid', FILTER_SANITIZE_STRING); |
|
|
1191
|
+ $mapboxtoken = filter_input(INPUT_POST, 'mapboxtoken', FILTER_SANITIZE_STRING); |
|
|
1192
|
+ $googlekey = filter_input(INPUT_POST, 'googlekey', FILTER_SANITIZE_STRING); |
|
|
1193
|
+ $bingkey = filter_input(INPUT_POST, 'bingkey', FILTER_SANITIZE_STRING); |
|
|
1194
|
+ $openweathermapkey = filter_input(INPUT_POST, 'openweathermapkey', FILTER_SANITIZE_STRING); |
|
|
1195
|
+ $mapquestkey = filter_input(INPUT_POST, 'mapquestkey', FILTER_SANITIZE_STRING); |
|
|
1196
|
+ $hereappid = filter_input(INPUT_POST, 'hereappid', FILTER_SANITIZE_STRING); |
|
|
1197
|
+ $hereappcode = filter_input(INPUT_POST, 'hereappcode', FILTER_SANITIZE_STRING); |
|
|
1198
|
+ $settings = array_merge($settings, array('globalMapProvider' => $mapprovider, 'globalMapboxId' => $mapboxid, 'globalMapboxToken' => $mapboxtoken, 'globalGoogleAPIKey' => $googlekey, 'globalBingMapKey' => $bingkey, 'globalHereappID' => $hereappid, 'globalHereappCode' => $hereappcode, 'globalMapQuestKey' => $mapquestkey, 'globalOpenWeatherMapKey' => $openweathermapkey)); |
|
1199
|
1199
|
|
|
1200
|
|
- $latitudemax = filter_input(INPUT_POST,'latitudemax',FILTER_SANITIZE_STRING); |
|
1201
|
|
- $latitudemin = filter_input(INPUT_POST,'latitudemin',FILTER_SANITIZE_STRING); |
|
1202
|
|
- $longitudemax = filter_input(INPUT_POST,'longitudemax',FILTER_SANITIZE_STRING); |
|
1203
|
|
- $longitudemin = filter_input(INPUT_POST,'longitudemin',FILTER_SANITIZE_STRING); |
|
1204
|
|
- $livezoom = filter_input(INPUT_POST,'livezoom',FILTER_SANITIZE_NUMBER_INT); |
|
1205
|
|
- $settings = array_merge($settings,array('globalLatitudeMax' => $latitudemax,'globalLatitudeMin' => $latitudemin,'globalLongitudeMax' => $longitudemax,'globalLongitudeMin' => $longitudemin,'globalLiveZoom' => $livezoom)); |
|
|
1200
|
+ $latitudemax = filter_input(INPUT_POST, 'latitudemax', FILTER_SANITIZE_STRING); |
|
|
1201
|
+ $latitudemin = filter_input(INPUT_POST, 'latitudemin', FILTER_SANITIZE_STRING); |
|
|
1202
|
+ $longitudemax = filter_input(INPUT_POST, 'longitudemax', FILTER_SANITIZE_STRING); |
|
|
1203
|
+ $longitudemin = filter_input(INPUT_POST, 'longitudemin', FILTER_SANITIZE_STRING); |
|
|
1204
|
+ $livezoom = filter_input(INPUT_POST, 'livezoom', FILTER_SANITIZE_NUMBER_INT); |
|
|
1205
|
+ $settings = array_merge($settings, array('globalLatitudeMax' => $latitudemax, 'globalLatitudeMin' => $latitudemin, 'globalLongitudeMax' => $longitudemax, 'globalLongitudeMin' => $longitudemin, 'globalLiveZoom' => $livezoom)); |
|
1206
|
1206
|
|
|
1207
|
|
- $squawk_country = filter_input(INPUT_POST,'squawk_country',FILTER_SANITIZE_STRING); |
|
1208
|
|
- $settings = array_merge($settings,array('globalSquawkCountry' => $squawk_country)); |
|
|
1207
|
+ $squawk_country = filter_input(INPUT_POST, 'squawk_country', FILTER_SANITIZE_STRING); |
|
|
1208
|
+ $settings = array_merge($settings, array('globalSquawkCountry' => $squawk_country)); |
|
1209
|
1209
|
|
|
1210
|
|
- $latitudecenter = filter_input(INPUT_POST,'latitudecenter',FILTER_SANITIZE_STRING); |
|
1211
|
|
- $longitudecenter = filter_input(INPUT_POST,'longitudecenter',FILTER_SANITIZE_STRING); |
|
1212
|
|
- $settings = array_merge($settings,array('globalCenterLatitude' => $latitudecenter,'globalCenterLongitude' => $longitudecenter)); |
|
|
1210
|
+ $latitudecenter = filter_input(INPUT_POST, 'latitudecenter', FILTER_SANITIZE_STRING); |
|
|
1211
|
+ $longitudecenter = filter_input(INPUT_POST, 'longitudecenter', FILTER_SANITIZE_STRING); |
|
|
1212
|
+ $settings = array_merge($settings, array('globalCenterLatitude' => $latitudecenter, 'globalCenterLongitude' => $longitudecenter)); |
|
1213
|
1213
|
|
|
1214
|
|
- $acars = filter_input(INPUT_POST,'acars',FILTER_SANITIZE_STRING); |
|
|
1214
|
+ $acars = filter_input(INPUT_POST, 'acars', FILTER_SANITIZE_STRING); |
|
1215
|
1215
|
if ($acars == 'acars') { |
|
1216
|
|
- $settings = array_merge($settings,array('globalACARS' => 'TRUE')); |
|
|
1216
|
+ $settings = array_merge($settings, array('globalACARS' => 'TRUE')); |
|
1217
|
1217
|
} else { |
|
1218
|
|
- $settings = array_merge($settings,array('globalACARS' => 'FALSE')); |
|
|
1218
|
+ $settings = array_merge($settings, array('globalACARS' => 'FALSE')); |
|
1219
|
1219
|
} |
|
1220
|
1220
|
|
|
1221
|
|
- $flightawareusername = filter_input(INPUT_POST,'flightawareusername',FILTER_SANITIZE_STRING); |
|
1222
|
|
- $flightawarepassword = filter_input(INPUT_POST,'flightawarepassword',FILTER_SANITIZE_STRING); |
|
1223
|
|
- $settings = array_merge($settings,array('globalFlightAwareUsername' => $flightawareusername,'globalFlightAwarePassword' => $flightawarepassword)); |
|
|
1221
|
+ $flightawareusername = filter_input(INPUT_POST, 'flightawareusername', FILTER_SANITIZE_STRING); |
|
|
1222
|
+ $flightawarepassword = filter_input(INPUT_POST, 'flightawarepassword', FILTER_SANITIZE_STRING); |
|
|
1223
|
+ $settings = array_merge($settings, array('globalFlightAwareUsername' => $flightawareusername, 'globalFlightAwarePassword' => $flightawarepassword)); |
|
1224
|
1224
|
|
|
1225
|
1225
|
$source_name = $_POST['source_name']; |
|
1226
|
1226
|
$source_latitude = $_POST['source_latitude']; |
|
@@ -1234,8 +1234,8 @@ discard block |
|
|
block discarded – undo |
|
1234
|
1234
|
|
|
1235
|
1235
|
$sources = array(); |
|
1236
|
1236
|
foreach ($source_name as $keys => $name) { |
|
1237
|
|
- 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]); |
|
1238
|
|
- 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]); |
|
|
1237
|
+ 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]); |
|
|
1238
|
+ 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]); |
|
1239
|
1239
|
} |
|
1240
|
1240
|
if (count($sources) > 0) $_SESSION['sources'] = $sources; |
|
1241
|
1241
|
|
|
@@ -1244,16 +1244,16 @@ discard block |
|
|
block discarded – undo |
|
1244
|
1244
|
$newstype = $_POST['newstype']; |
|
1245
|
1245
|
|
|
1246
|
1246
|
$newsfeeds = array(); |
|
1247
|
|
- foreach($newsurl as $newskey => $url) { |
|
|
1247
|
+ foreach ($newsurl as $newskey => $url) { |
|
1248
|
1248
|
if ($url != '') { |
|
1249
|
1249
|
$type = $newstype[$newskey]; |
|
1250
|
1250
|
$lng = $newslng[$newskey]; |
|
1251
|
1251
|
if (isset($newsfeeds[$type][$lng])) { |
|
1252
|
|
- $newsfeeds[$type][$lng] = array_merge($newsfeeds[$type][$lng],array($url)); |
|
|
1252
|
+ $newsfeeds[$type][$lng] = array_merge($newsfeeds[$type][$lng], array($url)); |
|
1253
|
1253
|
} else $newsfeeds[$type][$lng] = array($url); |
|
1254
|
1254
|
} |
|
1255
|
1255
|
} |
|
1256
|
|
- $settings = array_merge($settings,array('globalNewsFeeds' => $newsfeeds)); |
|
|
1256
|
+ $settings = array_merge($settings, array('globalNewsFeeds' => $newsfeeds)); |
|
1257
|
1257
|
|
|
1258
|
1258
|
//$sbshost = filter_input(INPUT_POST,'sbshost',FILTER_SANITIZE_STRING); |
|
1259
|
1259
|
//$sbsport = filter_input(INPUT_POST,'sbsport',FILTER_SANITIZE_NUMBER_INT); |
|
@@ -1264,27 +1264,27 @@ discard block |
|
|
block discarded – undo |
|
1264
|
1264
|
$sbsurl = $_POST['sbsurl']; |
|
1265
|
1265
|
*/ |
|
1266
|
1266
|
|
|
1267
|
|
- $globalvatsim = filter_input(INPUT_POST,'globalvatsim',FILTER_SANITIZE_STRING); |
|
1268
|
|
- $globalva = filter_input(INPUT_POST,'globalva',FILTER_SANITIZE_STRING); |
|
1269
|
|
- $globalivao = filter_input(INPUT_POST,'globalivao',FILTER_SANITIZE_STRING); |
|
1270
|
|
- $globalphpvms = filter_input(INPUT_POST,'globalphpvms',FILTER_SANITIZE_STRING); |
|
1271
|
|
- $globalvam = filter_input(INPUT_POST,'globalvam',FILTER_SANITIZE_STRING); |
|
1272
|
|
- $globalsbs = filter_input(INPUT_POST,'globalsbs',FILTER_SANITIZE_STRING); |
|
1273
|
|
- $globalaprs = filter_input(INPUT_POST,'globalaprs',FILTER_SANITIZE_STRING); |
|
1274
|
|
- $datasource = filter_input(INPUT_POST,'datasource',FILTER_SANITIZE_STRING); |
|
|
1267
|
+ $globalvatsim = filter_input(INPUT_POST, 'globalvatsim', FILTER_SANITIZE_STRING); |
|
|
1268
|
+ $globalva = filter_input(INPUT_POST, 'globalva', FILTER_SANITIZE_STRING); |
|
|
1269
|
+ $globalivao = filter_input(INPUT_POST, 'globalivao', FILTER_SANITIZE_STRING); |
|
|
1270
|
+ $globalphpvms = filter_input(INPUT_POST, 'globalphpvms', FILTER_SANITIZE_STRING); |
|
|
1271
|
+ $globalvam = filter_input(INPUT_POST, 'globalvam', FILTER_SANITIZE_STRING); |
|
|
1272
|
+ $globalsbs = filter_input(INPUT_POST, 'globalsbs', FILTER_SANITIZE_STRING); |
|
|
1273
|
+ $globalaprs = filter_input(INPUT_POST, 'globalaprs', FILTER_SANITIZE_STRING); |
|
|
1274
|
+ $datasource = filter_input(INPUT_POST, 'datasource', FILTER_SANITIZE_STRING); |
|
1275
|
1275
|
|
|
1276
|
|
- $globalaircraft = filter_input(INPUT_POST,'globalaircraft',FILTER_SANITIZE_STRING); |
|
1277
|
|
- if ($globalaircraft == 'aircraft') $settings = array_merge($settings,array('globalAircraft' => 'TRUE')); |
|
1278
|
|
- else $settings = array_merge($settings,array('globalAircraft' => 'FALSE')); |
|
1279
|
|
- $globaltracker = filter_input(INPUT_POST,'globaltracker',FILTER_SANITIZE_STRING); |
|
1280
|
|
- if ($globaltracker == 'tracker') $settings = array_merge($settings,array('globalTracker' => 'TRUE')); |
|
1281
|
|
- else $settings = array_merge($settings,array('globalTracker' => 'FALSE')); |
|
1282
|
|
- $globalmarine = filter_input(INPUT_POST,'globalmarine',FILTER_SANITIZE_STRING); |
|
1283
|
|
- if ($globalmarine == 'marine') $settings = array_merge($settings,array('globalMarine' => 'TRUE')); |
|
1284
|
|
- else $settings = array_merge($settings,array('globalMarine' => 'FALSE')); |
|
1285
|
|
- $globalsatellite = filter_input(INPUT_POST,'globalsatellite',FILTER_SANITIZE_STRING); |
|
1286
|
|
- if ($globalsatellite == 'satellite') $settings = array_merge($settings,array('globalSatellite' => 'TRUE')); |
|
1287
|
|
- else $settings = array_merge($settings,array('globalSatellite' => 'FALSE')); |
|
|
1276
|
+ $globalaircraft = filter_input(INPUT_POST, 'globalaircraft', FILTER_SANITIZE_STRING); |
|
|
1277
|
+ if ($globalaircraft == 'aircraft') $settings = array_merge($settings, array('globalAircraft' => 'TRUE')); |
|
|
1278
|
+ else $settings = array_merge($settings, array('globalAircraft' => 'FALSE')); |
|
|
1279
|
+ $globaltracker = filter_input(INPUT_POST, 'globaltracker', FILTER_SANITIZE_STRING); |
|
|
1280
|
+ if ($globaltracker == 'tracker') $settings = array_merge($settings, array('globalTracker' => 'TRUE')); |
|
|
1281
|
+ else $settings = array_merge($settings, array('globalTracker' => 'FALSE')); |
|
|
1282
|
+ $globalmarine = filter_input(INPUT_POST, 'globalmarine', FILTER_SANITIZE_STRING); |
|
|
1283
|
+ if ($globalmarine == 'marine') $settings = array_merge($settings, array('globalMarine' => 'TRUE')); |
|
|
1284
|
+ else $settings = array_merge($settings, array('globalMarine' => 'FALSE')); |
|
|
1285
|
+ $globalsatellite = filter_input(INPUT_POST, 'globalsatellite', FILTER_SANITIZE_STRING); |
|
|
1286
|
+ if ($globalsatellite == 'satellite') $settings = array_merge($settings, array('globalSatellite' => 'TRUE')); |
|
|
1287
|
+ else $settings = array_merge($settings, array('globalSatellite' => 'FALSE')); |
|
1288
|
1288
|
|
|
1289
|
1289
|
/* |
|
1290
|
1290
|
$globalSBS1Hosts = array(); |
|
@@ -1300,7 +1300,7 @@ discard block |
|
|
block discarded – undo |
|
1300
|
1300
|
} |
|
1301
|
1301
|
$settings = array_merge($settings,array('globalSBS1Hosts' => $globalSBS1Hosts)); |
|
1302
|
1302
|
*/ |
|
1303
|
|
- $settings_comment = array_merge($settings_comment,array('globalSBS1Hosts')); |
|
|
1303
|
+ $settings_comment = array_merge($settings_comment, array('globalSBS1Hosts')); |
|
1304
|
1304
|
$host = $_POST['host']; |
|
1305
|
1305
|
$port = $_POST['port']; |
|
1306
|
1306
|
$name = $_POST['name']; |
|
@@ -1317,115 +1317,115 @@ discard block |
|
|
block discarded – undo |
|
1317
|
1317
|
else $cov = 'FALSE'; |
|
1318
|
1318
|
if (isset($noarchive[$key]) && $noarchive[$key] == 1) $arch = 'TRUE'; |
|
1319
|
1319
|
else $arch = 'FALSE'; |
|
1320
|
|
- if (strpos($format[$key],'_callback')) { |
|
1321
|
|
- $gSources[] = array('host' => $h, 'pass' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'TRUE'); |
|
|
1320
|
+ if (strpos($format[$key], '_callback')) { |
|
|
1321
|
+ $gSources[] = array('host' => $h, 'pass' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov, 'noarchive' => $arch, 'timezone' => $timezones[$key], 'callback' => 'TRUE'); |
|
1322
|
1322
|
} elseif ($h != '' || $name[$key] != '') { |
|
1323
|
|
- $gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'FALSE'); |
|
|
1323
|
+ $gSources[] = array('host' => $h, 'port' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov, 'noarchive' => $arch, 'timezone' => $timezones[$key], 'callback' => 'FALSE'); |
|
1324
|
1324
|
} |
|
1325
|
1325
|
if ($format[$key] == 'airwhere') $forcepilots = true; |
|
1326
|
1326
|
} |
|
1327
|
|
- $settings = array_merge($settings,array('globalSources' => $gSources)); |
|
|
1327
|
+ $settings = array_merge($settings, array('globalSources' => $gSources)); |
|
1328
|
1328
|
|
|
1329
|
1329
|
/* |
|
1330
|
1330
|
$sbstimeout = filter_input(INPUT_POST,'sbstimeout',FILTER_SANITIZE_NUMBER_INT); |
|
1331
|
1331
|
$settings = array_merge($settings,array('globalSourcesTimeOut' => $sbstimeout)); |
|
1332
|
1332
|
*/ |
|
1333
|
|
- $acarshost = filter_input(INPUT_POST,'acarshost',FILTER_SANITIZE_STRING); |
|
1334
|
|
- $acarsport = filter_input(INPUT_POST,'acarsport',FILTER_SANITIZE_NUMBER_INT); |
|
1335
|
|
- $settings = array_merge($settings,array('globalACARSHost' => $acarshost,'globalACARSPort' => $acarsport)); |
|
|
1333
|
+ $acarshost = filter_input(INPUT_POST, 'acarshost', FILTER_SANITIZE_STRING); |
|
|
1334
|
+ $acarsport = filter_input(INPUT_POST, 'acarsport', FILTER_SANITIZE_NUMBER_INT); |
|
|
1335
|
+ $settings = array_merge($settings, array('globalACARSHost' => $acarshost, 'globalACARSPort' => $acarsport)); |
|
1336
|
1336
|
|
|
1337
|
|
- $bitly = filter_input(INPUT_POST,'bitly',FILTER_SANITIZE_STRING); |
|
1338
|
|
- $settings = array_merge($settings,array('globalBitlyAccessToken' => $bitly)); |
|
|
1337
|
+ $bitly = filter_input(INPUT_POST, 'bitly', FILTER_SANITIZE_STRING); |
|
|
1338
|
+ $settings = array_merge($settings, array('globalBitlyAccessToken' => $bitly)); |
|
1339
|
1339
|
|
|
1340
|
|
- $customcss = filter_input(INPUT_POST,'customcss',FILTER_SANITIZE_STRING); |
|
1341
|
|
- $settings = array_merge($settings,array('globalCustomCSS' => $customcss)); |
|
|
1340
|
+ $customcss = filter_input(INPUT_POST, 'customcss', FILTER_SANITIZE_STRING); |
|
|
1341
|
+ $settings = array_merge($settings, array('globalCustomCSS' => $customcss)); |
|
1342
|
1342
|
|
|
1343
|
|
- $map3dtile = filter_input(INPUT_POST,'map3dtileset',FILTER_SANITIZE_STRING); |
|
1344
|
|
- $settings = array_merge($settings,array('globalMap3DTiles' => $map3dtile)); |
|
|
1343
|
+ $map3dtile = filter_input(INPUT_POST, 'map3dtileset', FILTER_SANITIZE_STRING); |
|
|
1344
|
+ $settings = array_merge($settings, array('globalMap3DTiles' => $map3dtile)); |
|
1345
|
1345
|
|
|
1346
|
|
- $notamsource = filter_input(INPUT_POST,'notamsource',FILTER_SANITIZE_STRING); |
|
1347
|
|
- $settings = array_merge($settings,array('globalNOTAMSource' => $notamsource)); |
|
1348
|
|
- $metarsource = filter_input(INPUT_POST,'metarsource',FILTER_SANITIZE_STRING); |
|
1349
|
|
- $settings = array_merge($settings,array('globalMETARurl' => $metarsource)); |
|
|
1346
|
+ $notamsource = filter_input(INPUT_POST, 'notamsource', FILTER_SANITIZE_STRING); |
|
|
1347
|
+ $settings = array_merge($settings, array('globalNOTAMSource' => $notamsource)); |
|
|
1348
|
+ $metarsource = filter_input(INPUT_POST, 'metarsource', FILTER_SANITIZE_STRING); |
|
|
1349
|
+ $settings = array_merge($settings, array('globalMETARurl' => $metarsource)); |
|
1350
|
1350
|
|
|
1351
|
|
- $zoilatitude = filter_input(INPUT_POST,'zoilatitude',FILTER_SANITIZE_STRING); |
|
1352
|
|
- $zoilongitude = filter_input(INPUT_POST,'zoilongitude',FILTER_SANITIZE_STRING); |
|
1353
|
|
- $zoidistance = filter_input(INPUT_POST,'zoidistance',FILTER_SANITIZE_NUMBER_INT); |
|
|
1351
|
+ $zoilatitude = filter_input(INPUT_POST, 'zoilatitude', FILTER_SANITIZE_STRING); |
|
|
1352
|
+ $zoilongitude = filter_input(INPUT_POST, 'zoilongitude', FILTER_SANITIZE_STRING); |
|
|
1353
|
+ $zoidistance = filter_input(INPUT_POST, 'zoidistance', FILTER_SANITIZE_NUMBER_INT); |
|
1354
|
1354
|
if ($zoilatitude != '' && $zoilongitude != '' && $zoidistance != '') { |
|
1355
|
|
- $settings = array_merge($settings,array('globalDistanceIgnore' => array('latitude' => $zoilatitude,'longitude' => $zoilongitude,'distance' => $zoidistance))); |
|
1356
|
|
- } else $settings = array_merge($settings,array('globalDistanceIgnore' => array())); |
|
|
1355
|
+ $settings = array_merge($settings, array('globalDistanceIgnore' => array('latitude' => $zoilatitude, 'longitude' => $zoilongitude, 'distance' => $zoidistance))); |
|
|
1356
|
+ } else $settings = array_merge($settings, array('globalDistanceIgnore' => array())); |
|
1357
|
1357
|
|
|
1358
|
|
- $refresh = filter_input(INPUT_POST,'refresh',FILTER_SANITIZE_NUMBER_INT); |
|
1359
|
|
- $settings = array_merge($settings,array('globalLiveInterval' => $refresh)); |
|
1360
|
|
- $maprefresh = filter_input(INPUT_POST,'maprefresh',FILTER_SANITIZE_NUMBER_INT); |
|
1361
|
|
- $settings = array_merge($settings,array('globalMapRefresh' => $maprefresh)); |
|
1362
|
|
- $mapidle = filter_input(INPUT_POST,'mapidle',FILTER_SANITIZE_NUMBER_INT); |
|
1363
|
|
- $settings = array_merge($settings,array('globalMapIdleTimeout' => $mapidle)); |
|
1364
|
|
- $minfetch = filter_input(INPUT_POST,'minfetch',FILTER_SANITIZE_NUMBER_INT); |
|
1365
|
|
- $settings = array_merge($settings,array('globalMinFetch' => $minfetch)); |
|
1366
|
|
- $closestmindist = filter_input(INPUT_POST,'closestmindist',FILTER_SANITIZE_NUMBER_INT); |
|
1367
|
|
- $settings = array_merge($settings,array('globalClosestMinDist' => $closestmindist)); |
|
|
1358
|
+ $refresh = filter_input(INPUT_POST, 'refresh', FILTER_SANITIZE_NUMBER_INT); |
|
|
1359
|
+ $settings = array_merge($settings, array('globalLiveInterval' => $refresh)); |
|
|
1360
|
+ $maprefresh = filter_input(INPUT_POST, 'maprefresh', FILTER_SANITIZE_NUMBER_INT); |
|
|
1361
|
+ $settings = array_merge($settings, array('globalMapRefresh' => $maprefresh)); |
|
|
1362
|
+ $mapidle = filter_input(INPUT_POST, 'mapidle', FILTER_SANITIZE_NUMBER_INT); |
|
|
1363
|
+ $settings = array_merge($settings, array('globalMapIdleTimeout' => $mapidle)); |
|
|
1364
|
+ $minfetch = filter_input(INPUT_POST, 'minfetch', FILTER_SANITIZE_NUMBER_INT); |
|
|
1365
|
+ $settings = array_merge($settings, array('globalMinFetch' => $minfetch)); |
|
|
1366
|
+ $closestmindist = filter_input(INPUT_POST, 'closestmindist', FILTER_SANITIZE_NUMBER_INT); |
|
|
1367
|
+ $settings = array_merge($settings, array('globalClosestMinDist' => $closestmindist)); |
|
1368
|
1368
|
|
|
1369
|
|
- $aircraftsize = filter_input(INPUT_POST,'aircraftsize',FILTER_SANITIZE_NUMBER_INT); |
|
1370
|
|
- $settings = array_merge($settings,array('globalAircraftSize' => $aircraftsize)); |
|
|
1369
|
+ $aircraftsize = filter_input(INPUT_POST, 'aircraftsize', FILTER_SANITIZE_NUMBER_INT); |
|
|
1370
|
+ $settings = array_merge($settings, array('globalAircraftSize' => $aircraftsize)); |
|
1371
|
1371
|
|
|
1372
|
|
- $archivemonths = filter_input(INPUT_POST,'archivemonths',FILTER_SANITIZE_NUMBER_INT); |
|
1373
|
|
- $settings = array_merge($settings,array('globalArchiveMonths' => $archivemonths)); |
|
|
1372
|
+ $archivemonths = filter_input(INPUT_POST, 'archivemonths', FILTER_SANITIZE_NUMBER_INT); |
|
|
1373
|
+ $settings = array_merge($settings, array('globalArchiveMonths' => $archivemonths)); |
|
1374
|
1374
|
|
|
1375
|
|
- $archiveyear = filter_input(INPUT_POST,'archiveyear',FILTER_SANITIZE_STRING); |
|
|
1375
|
+ $archiveyear = filter_input(INPUT_POST, 'archiveyear', FILTER_SANITIZE_STRING); |
|
1376
|
1376
|
if ($archiveyear == "archiveyear") { |
|
1377
|
|
- $settings = array_merge($settings,array('globalArchiveYear' => 'TRUE')); |
|
|
1377
|
+ $settings = array_merge($settings, array('globalArchiveYear' => 'TRUE')); |
|
1378
|
1378
|
} else { |
|
1379
|
|
- $settings = array_merge($settings,array('globalArchiveYear' => 'FALSE')); |
|
|
1379
|
+ $settings = array_merge($settings, array('globalArchiveYear' => 'FALSE')); |
|
1380
|
1380
|
} |
|
1381
|
|
- $archivekeepmonths = filter_input(INPUT_POST,'archivekeepmonths',FILTER_SANITIZE_NUMBER_INT); |
|
1382
|
|
- $settings = array_merge($settings,array('globalArchiveKeepMonths' => $archivekeepmonths)); |
|
1383
|
|
- $archivekeeptrackmonths = filter_input(INPUT_POST,'archivekeeptrackmonths',FILTER_SANITIZE_NUMBER_INT); |
|
1384
|
|
- $settings = array_merge($settings,array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths)); |
|
|
1381
|
+ $archivekeepmonths = filter_input(INPUT_POST, 'archivekeepmonths', FILTER_SANITIZE_NUMBER_INT); |
|
|
1382
|
+ $settings = array_merge($settings, array('globalArchiveKeepMonths' => $archivekeepmonths)); |
|
|
1383
|
+ $archivekeeptrackmonths = filter_input(INPUT_POST, 'archivekeeptrackmonths', FILTER_SANITIZE_NUMBER_INT); |
|
|
1384
|
+ $settings = array_merge($settings, array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths)); |
|
1385
|
1385
|
|
|
1386
|
|
- $britishairways = filter_input(INPUT_POST,'britishairways',FILTER_SANITIZE_STRING); |
|
1387
|
|
- $settings = array_merge($settings,array('globalBritishAirwaysKey' => $britishairways)); |
|
1388
|
|
- $transavia = filter_input(INPUT_POST,'transavia',FILTER_SANITIZE_STRING); |
|
1389
|
|
- $settings = array_merge($settings,array('globalTransaviaKey' => $transavia)); |
|
|
1386
|
+ $britishairways = filter_input(INPUT_POST, 'britishairways', FILTER_SANITIZE_STRING); |
|
|
1387
|
+ $settings = array_merge($settings, array('globalBritishAirwaysKey' => $britishairways)); |
|
|
1388
|
+ $transavia = filter_input(INPUT_POST, 'transavia', FILTER_SANITIZE_STRING); |
|
|
1389
|
+ $settings = array_merge($settings, array('globalTransaviaKey' => $transavia)); |
|
1390
|
1390
|
|
|
1391
|
|
- $lufthansakey = filter_input(INPUT_POST,'lufthansakey',FILTER_SANITIZE_STRING); |
|
1392
|
|
- $lufthansasecret = filter_input(INPUT_POST,'lufthansasecret',FILTER_SANITIZE_STRING); |
|
1393
|
|
- $settings = array_merge($settings,array('globalLufthansaKey' => array('key' => $lufthansakey,'secret' => $lufthansasecret))); |
|
|
1391
|
+ $lufthansakey = filter_input(INPUT_POST, 'lufthansakey', FILTER_SANITIZE_STRING); |
|
|
1392
|
+ $lufthansasecret = filter_input(INPUT_POST, 'lufthansasecret', FILTER_SANITIZE_STRING); |
|
|
1393
|
+ $settings = array_merge($settings, array('globalLufthansaKey' => array('key' => $lufthansakey, 'secret' => $lufthansasecret))); |
|
1394
|
1394
|
|
|
1395
|
1395
|
// Create in settings.php keys not yet configurable if not already here |
|
1396
|
1396
|
//if (!isset($globalImageBingKey)) $settings = array_merge($settings,array('globalImageBingKey' => '')); |
|
1397
|
|
- if (!isset($globalDebug)) $settings = array_merge($settings,array('globalDebug' => 'TRUE')); |
|
|
1397
|
+ if (!isset($globalDebug)) $settings = array_merge($settings, array('globalDebug' => 'TRUE')); |
|
1398
|
1398
|
|
|
1399
|
|
- $resetyearstats = filter_input(INPUT_POST,'resetyearstats',FILTER_SANITIZE_STRING); |
|
|
1399
|
+ $resetyearstats = filter_input(INPUT_POST, 'resetyearstats', FILTER_SANITIZE_STRING); |
|
1400
|
1400
|
if ($resetyearstats == 'resetyearstats') { |
|
1401
|
|
- $settings = array_merge($settings,array('globalDeleteLastYearStats' => 'TRUE')); |
|
|
1401
|
+ $settings = array_merge($settings, array('globalDeleteLastYearStats' => 'TRUE')); |
|
1402
|
1402
|
} else { |
|
1403
|
|
- $settings = array_merge($settings,array('globalDeleteLastYearStats' => 'FALSE')); |
|
|
1403
|
+ $settings = array_merge($settings, array('globalDeleteLastYearStats' => 'FALSE')); |
|
1404
|
1404
|
} |
|
1405
|
1405
|
|
|
1406
|
|
- $archive = filter_input(INPUT_POST,'archive',FILTER_SANITIZE_STRING); |
|
|
1406
|
+ $archive = filter_input(INPUT_POST, 'archive', FILTER_SANITIZE_STRING); |
|
1407
|
1407
|
if ($archive == 'archive') { |
|
1408
|
|
- $settings = array_merge($settings,array('globalArchive' => 'TRUE')); |
|
|
1408
|
+ $settings = array_merge($settings, array('globalArchive' => 'TRUE')); |
|
1409
|
1409
|
} else { |
|
1410
|
|
- $settings = array_merge($settings,array('globalArchive' => 'FALSE')); |
|
|
1410
|
+ $settings = array_merge($settings, array('globalArchive' => 'FALSE')); |
|
1411
|
1411
|
} |
|
1412
|
|
- $archiveresults = filter_input(INPUT_POST,'archiveresults',FILTER_SANITIZE_STRING); |
|
|
1412
|
+ $archiveresults = filter_input(INPUT_POST, 'archiveresults', FILTER_SANITIZE_STRING); |
|
1413
|
1413
|
if ($archiveresults == 'archiveresults') { |
|
1414
|
|
- $settings = array_merge($settings,array('globalArchiveResults' => 'TRUE')); |
|
|
1414
|
+ $settings = array_merge($settings, array('globalArchiveResults' => 'TRUE')); |
|
1415
|
1415
|
} else { |
|
1416
|
|
- $settings = array_merge($settings,array('globalArchiveResults' => 'FALSE')); |
|
|
1416
|
+ $settings = array_merge($settings, array('globalArchiveResults' => 'FALSE')); |
|
1417
|
1417
|
} |
|
1418
|
|
- $daemon = filter_input(INPUT_POST,'daemon',FILTER_SANITIZE_STRING); |
|
|
1418
|
+ $daemon = filter_input(INPUT_POST, 'daemon', FILTER_SANITIZE_STRING); |
|
1419
|
1419
|
if ($daemon == 'daemon') { |
|
1420
|
|
- $settings = array_merge($settings,array('globalDaemon' => 'TRUE')); |
|
|
1420
|
+ $settings = array_merge($settings, array('globalDaemon' => 'TRUE')); |
|
1421
|
1421
|
} else { |
|
1422
|
|
- $settings = array_merge($settings,array('globalDaemon' => 'FALSE')); |
|
|
1422
|
+ $settings = array_merge($settings, array('globalDaemon' => 'FALSE')); |
|
1423
|
1423
|
} |
|
1424
|
|
- $schedules = filter_input(INPUT_POST,'schedules',FILTER_SANITIZE_STRING); |
|
|
1424
|
+ $schedules = filter_input(INPUT_POST, 'schedules', FILTER_SANITIZE_STRING); |
|
1425
|
1425
|
if ($schedules == 'schedules') { |
|
1426
|
|
- $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE')); |
|
|
1426
|
+ $settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE')); |
|
1427
|
1427
|
} else { |
|
1428
|
|
- $settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE')); |
|
|
1428
|
+ $settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE')); |
|
1429
|
1429
|
} |
|
1430
|
1430
|
|
|
1431
|
1431
|
/* |
|
@@ -1436,280 +1436,280 @@ discard block |
|
|
block discarded – undo |
|
1436
|
1436
|
$settings = array_merge($settings,array('globalFlightAware' => 'FALSE','globalSBS1' => 'TRUE')); |
|
1437
|
1437
|
} |
|
1438
|
1438
|
*/ |
|
1439
|
|
- $settings = array_merge($settings,array('globalFlightAware' => 'FALSE')); |
|
1440
|
|
- if ($globalsbs == 'sbs') $settings = array_merge($settings,array('globalSBS1' => 'TRUE')); |
|
1441
|
|
- else $settings = array_merge($settings,array('globalSBS1' => 'FALSE')); |
|
1442
|
|
- if ($globalaprs == 'aprs') $settings = array_merge($settings,array('globalAPRS' => 'TRUE')); |
|
1443
|
|
- else $settings = array_merge($settings,array('globalAPRS' => 'FALSE')); |
|
|
1439
|
+ $settings = array_merge($settings, array('globalFlightAware' => 'FALSE')); |
|
|
1440
|
+ if ($globalsbs == 'sbs') $settings = array_merge($settings, array('globalSBS1' => 'TRUE')); |
|
|
1441
|
+ else $settings = array_merge($settings, array('globalSBS1' => 'FALSE')); |
|
|
1442
|
+ if ($globalaprs == 'aprs') $settings = array_merge($settings, array('globalAPRS' => 'TRUE')); |
|
|
1443
|
+ else $settings = array_merge($settings, array('globalAPRS' => 'FALSE')); |
|
1444
|
1444
|
$va = false; |
|
1445
|
1445
|
if ($globalivao == 'ivao') { |
|
1446
|
|
- $settings = array_merge($settings,array('globalIVAO' => 'TRUE')); |
|
|
1446
|
+ $settings = array_merge($settings, array('globalIVAO' => 'TRUE')); |
|
1447
|
1447
|
$va = true; |
|
1448
|
|
- } else $settings = array_merge($settings,array('globalIVAO' => 'FALSE')); |
|
|
1448
|
+ } else $settings = array_merge($settings, array('globalIVAO' => 'FALSE')); |
|
1449
|
1449
|
if ($globalvatsim == 'vatsim') { |
|
1450
|
|
- $settings = array_merge($settings,array('globalVATSIM' => 'TRUE')); |
|
|
1450
|
+ $settings = array_merge($settings, array('globalVATSIM' => 'TRUE')); |
|
1451
|
1451
|
$va = true; |
|
1452
|
|
- } else $settings = array_merge($settings,array('globalVATSIM' => 'FALSE')); |
|
|
1452
|
+ } else $settings = array_merge($settings, array('globalVATSIM' => 'FALSE')); |
|
1453
|
1453
|
if ($globalphpvms == 'phpvms') { |
|
1454
|
|
- $settings = array_merge($settings,array('globalphpVMS' => 'TRUE')); |
|
|
1454
|
+ $settings = array_merge($settings, array('globalphpVMS' => 'TRUE')); |
|
1455
|
1455
|
$va = true; |
|
1456
|
|
- } else $settings = array_merge($settings,array('globalphpVMS' => 'FALSE')); |
|
|
1456
|
+ } else $settings = array_merge($settings, array('globalphpVMS' => 'FALSE')); |
|
1457
|
1457
|
if ($globalvam == 'vam') { |
|
1458
|
|
- $settings = array_merge($settings,array('globalVAM' => 'TRUE')); |
|
|
1458
|
+ $settings = array_merge($settings, array('globalVAM' => 'TRUE')); |
|
1459
|
1459
|
$va = true; |
|
1460
|
|
- } else $settings = array_merge($settings,array('globalVAM' => 'FALSE')); |
|
|
1460
|
+ } else $settings = array_merge($settings, array('globalVAM' => 'FALSE')); |
|
1461
|
1461
|
if ($va) { |
|
1462
|
|
- $settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE','globalTranslationFetch' => 'FALSE')); |
|
1463
|
|
- } else $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE')); |
|
|
1462
|
+ $settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE', 'globalTranslationFetch' => 'FALSE')); |
|
|
1463
|
+ } else $settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE', 'globalTranslationFetch' => 'TRUE')); |
|
1464
|
1464
|
if ($globalva == 'va' || $va) { |
|
1465
|
|
- $settings = array_merge($settings,array('globalVA' => 'TRUE')); |
|
1466
|
|
- $settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE')); |
|
|
1465
|
+ $settings = array_merge($settings, array('globalVA' => 'TRUE')); |
|
|
1466
|
+ $settings = array_merge($settings, array('globalUsePilot' => 'TRUE', 'globalUseOwner' => 'FALSE')); |
|
1467
|
1467
|
} else { |
|
1468
|
|
- $settings = array_merge($settings,array('globalVA' => 'FALSE')); |
|
1469
|
|
- if ($forcepilots) $settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE')); |
|
1470
|
|
- else $settings = array_merge($settings,array('globalUsePilot' => 'FALSE','globalUseOwner' => 'TRUE')); |
|
|
1468
|
+ $settings = array_merge($settings, array('globalVA' => 'FALSE')); |
|
|
1469
|
+ if ($forcepilots) $settings = array_merge($settings, array('globalUsePilot' => 'TRUE', 'globalUseOwner' => 'FALSE')); |
|
|
1470
|
+ else $settings = array_merge($settings, array('globalUsePilot' => 'FALSE', 'globalUseOwner' => 'TRUE')); |
|
1471
|
1471
|
} |
|
1472
|
1472
|
|
|
1473
|
1473
|
|
|
1474
|
|
- $mapoffline = filter_input(INPUT_POST,'mapoffline',FILTER_SANITIZE_STRING); |
|
|
1474
|
+ $mapoffline = filter_input(INPUT_POST, 'mapoffline', FILTER_SANITIZE_STRING); |
|
1475
|
1475
|
if ($mapoffline == 'mapoffline') { |
|
1476
|
|
- $settings = array_merge($settings,array('globalMapOffline' => 'TRUE')); |
|
|
1476
|
+ $settings = array_merge($settings, array('globalMapOffline' => 'TRUE')); |
|
1477
|
1477
|
} else { |
|
1478
|
|
- $settings = array_merge($settings,array('globalMapOffline' => 'FALSE')); |
|
|
1478
|
+ $settings = array_merge($settings, array('globalMapOffline' => 'FALSE')); |
|
1479
|
1479
|
} |
|
1480
|
|
- $globaloffline = filter_input(INPUT_POST,'globaloffline',FILTER_SANITIZE_STRING); |
|
|
1480
|
+ $globaloffline = filter_input(INPUT_POST, 'globaloffline', FILTER_SANITIZE_STRING); |
|
1481
|
1481
|
if ($globaloffline == 'globaloffline') { |
|
1482
|
|
- $settings = array_merge($settings,array('globalOffline' => 'TRUE')); |
|
|
1482
|
+ $settings = array_merge($settings, array('globalOffline' => 'TRUE')); |
|
1483
|
1483
|
} else { |
|
1484
|
|
- $settings = array_merge($settings,array('globalOffline' => 'FALSE')); |
|
|
1484
|
+ $settings = array_merge($settings, array('globalOffline' => 'FALSE')); |
|
1485
|
1485
|
} |
|
1486
|
1486
|
|
|
1487
|
|
- $notam = filter_input(INPUT_POST,'notam',FILTER_SANITIZE_STRING); |
|
|
1487
|
+ $notam = filter_input(INPUT_POST, 'notam', FILTER_SANITIZE_STRING); |
|
1488
|
1488
|
if ($notam == 'notam') { |
|
1489
|
|
- $settings = array_merge($settings,array('globalNOTAM' => 'TRUE')); |
|
|
1489
|
+ $settings = array_merge($settings, array('globalNOTAM' => 'TRUE')); |
|
1490
|
1490
|
} else { |
|
1491
|
|
- $settings = array_merge($settings,array('globalNOTAM' => 'FALSE')); |
|
|
1491
|
+ $settings = array_merge($settings, array('globalNOTAM' => 'FALSE')); |
|
1492
|
1492
|
} |
|
1493
|
|
- $owner = filter_input(INPUT_POST,'owner',FILTER_SANITIZE_STRING); |
|
|
1493
|
+ $owner = filter_input(INPUT_POST, 'owner', FILTER_SANITIZE_STRING); |
|
1494
|
1494
|
if ($owner == 'owner') { |
|
1495
|
|
- $settings = array_merge($settings,array('globalOwner' => 'TRUE')); |
|
|
1495
|
+ $settings = array_merge($settings, array('globalOwner' => 'TRUE')); |
|
1496
|
1496
|
} else { |
|
1497
|
|
- $settings = array_merge($settings,array('globalOwner' => 'FALSE')); |
|
|
1497
|
+ $settings = array_merge($settings, array('globalOwner' => 'FALSE')); |
|
1498
|
1498
|
} |
|
1499
|
|
- $map3d = filter_input(INPUT_POST,'map3d',FILTER_SANITIZE_STRING); |
|
|
1499
|
+ $map3d = filter_input(INPUT_POST, 'map3d', FILTER_SANITIZE_STRING); |
|
1500
|
1500
|
if ($map3d == 'map3d') { |
|
1501
|
|
- $settings = array_merge($settings,array('globalMap3D' => 'TRUE')); |
|
|
1501
|
+ $settings = array_merge($settings, array('globalMap3D' => 'TRUE')); |
|
1502
|
1502
|
} else { |
|
1503
|
|
- $settings = array_merge($settings,array('globalMap3D' => 'FALSE')); |
|
|
1503
|
+ $settings = array_merge($settings, array('globalMap3D' => 'FALSE')); |
|
1504
|
1504
|
} |
|
1505
|
|
- $crash = filter_input(INPUT_POST,'crash',FILTER_SANITIZE_STRING); |
|
|
1505
|
+ $crash = filter_input(INPUT_POST, 'crash', FILTER_SANITIZE_STRING); |
|
1506
|
1506
|
if ($crash == 'crash') { |
|
1507
|
|
- $settings = array_merge($settings,array('globalAccidents' => 'TRUE')); |
|
|
1507
|
+ $settings = array_merge($settings, array('globalAccidents' => 'TRUE')); |
|
1508
|
1508
|
} else { |
|
1509
|
|
- $settings = array_merge($settings,array('globalAccidents' => 'FALSE')); |
|
|
1509
|
+ $settings = array_merge($settings, array('globalAccidents' => 'FALSE')); |
|
1510
|
1510
|
} |
|
1511
|
|
- $fires = filter_input(INPUT_POST,'fires',FILTER_SANITIZE_STRING); |
|
|
1511
|
+ $fires = filter_input(INPUT_POST, 'fires', FILTER_SANITIZE_STRING); |
|
1512
|
1512
|
if ($fires == 'fires') { |
|
1513
|
|
- $settings = array_merge($settings,array('globalMapFires' => 'TRUE')); |
|
|
1513
|
+ $settings = array_merge($settings, array('globalMapFires' => 'TRUE')); |
|
1514
|
1514
|
} else { |
|
1515
|
|
- $settings = array_merge($settings,array('globalMapFires' => 'FALSE')); |
|
|
1515
|
+ $settings = array_merge($settings, array('globalMapFires' => 'FALSE')); |
|
1516
|
1516
|
} |
|
1517
|
|
- $firessupport = filter_input(INPUT_POST,'firessupport',FILTER_SANITIZE_STRING); |
|
|
1517
|
+ $firessupport = filter_input(INPUT_POST, 'firessupport', FILTER_SANITIZE_STRING); |
|
1518
|
1518
|
if ($firessupport == 'firessupport') { |
|
1519
|
|
- $settings = array_merge($settings,array('globalFires' => 'TRUE')); |
|
|
1519
|
+ $settings = array_merge($settings, array('globalFires' => 'TRUE')); |
|
1520
|
1520
|
} else { |
|
1521
|
|
- $settings = array_merge($settings,array('globalFires' => 'FALSE')); |
|
|
1521
|
+ $settings = array_merge($settings, array('globalFires' => 'FALSE')); |
|
1522
|
1522
|
} |
|
1523
|
|
- $mapsatellites = filter_input(INPUT_POST,'mapsatellites',FILTER_SANITIZE_STRING); |
|
|
1523
|
+ $mapsatellites = filter_input(INPUT_POST, 'mapsatellites', FILTER_SANITIZE_STRING); |
|
1524
|
1524
|
if ($mapsatellites == 'mapsatellites') { |
|
1525
|
|
- $settings = array_merge($settings,array('globalMapSatellites' => 'TRUE')); |
|
|
1525
|
+ $settings = array_merge($settings, array('globalMapSatellites' => 'TRUE')); |
|
1526
|
1526
|
} else { |
|
1527
|
|
- $settings = array_merge($settings,array('globalMapSatellites' => 'FALSE')); |
|
|
1527
|
+ $settings = array_merge($settings, array('globalMapSatellites' => 'FALSE')); |
|
1528
|
1528
|
} |
|
1529
|
|
- $map3ddefault = filter_input(INPUT_POST,'map3ddefault',FILTER_SANITIZE_STRING); |
|
|
1529
|
+ $map3ddefault = filter_input(INPUT_POST, 'map3ddefault', FILTER_SANITIZE_STRING); |
|
1530
|
1530
|
if ($map3ddefault == 'map3ddefault') { |
|
1531
|
|
- $settings = array_merge($settings,array('globalMap3Ddefault' => 'TRUE')); |
|
|
1531
|
+ $settings = array_merge($settings, array('globalMap3Ddefault' => 'TRUE')); |
|
1532
|
1532
|
} else { |
|
1533
|
|
- $settings = array_merge($settings,array('globalMap3Ddefault' => 'FALSE')); |
|
|
1533
|
+ $settings = array_merge($settings, array('globalMap3Ddefault' => 'FALSE')); |
|
1534
|
1534
|
} |
|
1535
|
|
- $one3dmodel = filter_input(INPUT_POST,'one3dmodel',FILTER_SANITIZE_STRING); |
|
|
1535
|
+ $one3dmodel = filter_input(INPUT_POST, 'one3dmodel', FILTER_SANITIZE_STRING); |
|
1536
|
1536
|
if ($one3dmodel == 'one3dmodel') { |
|
1537
|
|
- $settings = array_merge($settings,array('globalMap3DOneModel' => 'TRUE')); |
|
|
1537
|
+ $settings = array_merge($settings, array('globalMap3DOneModel' => 'TRUE')); |
|
1538
|
1538
|
} else { |
|
1539
|
|
- $settings = array_merge($settings,array('globalMap3DOneModel' => 'FALSE')); |
|
|
1539
|
+ $settings = array_merge($settings, array('globalMap3DOneModel' => 'FALSE')); |
|
1540
|
1540
|
} |
|
1541
|
|
- $map3dliveries = filter_input(INPUT_POST,'map3dliveries',FILTER_SANITIZE_STRING); |
|
|
1541
|
+ $map3dliveries = filter_input(INPUT_POST, 'map3dliveries', FILTER_SANITIZE_STRING); |
|
1542
|
1542
|
if ($map3dliveries == 'map3dliveries') { |
|
1543
|
|
- $settings = array_merge($settings,array('globalMap3DLiveries' => 'TRUE')); |
|
|
1543
|
+ $settings = array_merge($settings, array('globalMap3DLiveries' => 'TRUE')); |
|
1544
|
1544
|
} else { |
|
1545
|
|
- $settings = array_merge($settings,array('globalMap3DLiveries' => 'FALSE')); |
|
|
1545
|
+ $settings = array_merge($settings, array('globalMap3DLiveries' => 'FALSE')); |
|
1546
|
1546
|
} |
|
1547
|
|
- $translate = filter_input(INPUT_POST,'translate',FILTER_SANITIZE_STRING); |
|
|
1547
|
+ $translate = filter_input(INPUT_POST, 'translate', FILTER_SANITIZE_STRING); |
|
1548
|
1548
|
if ($translate == 'translate') { |
|
1549
|
|
- $settings = array_merge($settings,array('globalTranslate' => 'TRUE')); |
|
|
1549
|
+ $settings = array_merge($settings, array('globalTranslate' => 'TRUE')); |
|
1550
|
1550
|
} else { |
|
1551
|
|
- $settings = array_merge($settings,array('globalTranslate' => 'FALSE')); |
|
|
1551
|
+ $settings = array_merge($settings, array('globalTranslate' => 'FALSE')); |
|
1552
|
1552
|
} |
|
1553
|
|
- $realairlines = filter_input(INPUT_POST,'realairlines',FILTER_SANITIZE_STRING); |
|
|
1553
|
+ $realairlines = filter_input(INPUT_POST, 'realairlines', FILTER_SANITIZE_STRING); |
|
1554
|
1554
|
if ($realairlines == 'realairlines') { |
|
1555
|
|
- $settings = array_merge($settings,array('globalUseRealAirlines' => 'TRUE')); |
|
|
1555
|
+ $settings = array_merge($settings, array('globalUseRealAirlines' => 'TRUE')); |
|
1556
|
1556
|
} else { |
|
1557
|
|
- $settings = array_merge($settings,array('globalUseRealAirlines' => 'FALSE')); |
|
|
1557
|
+ $settings = array_merge($settings, array('globalUseRealAirlines' => 'FALSE')); |
|
1558
|
1558
|
} |
|
1559
|
|
- $estimation = filter_input(INPUT_POST,'estimation',FILTER_SANITIZE_STRING); |
|
|
1559
|
+ $estimation = filter_input(INPUT_POST, 'estimation', FILTER_SANITIZE_STRING); |
|
1560
|
1560
|
if ($estimation == 'estimation') { |
|
1561
|
|
- $settings = array_merge($settings,array('globalMapEstimation' => 'TRUE')); |
|
|
1561
|
+ $settings = array_merge($settings, array('globalMapEstimation' => 'TRUE')); |
|
1562
|
1562
|
} else { |
|
1563
|
|
- $settings = array_merge($settings,array('globalMapEstimation' => 'FALSE')); |
|
|
1563
|
+ $settings = array_merge($settings, array('globalMapEstimation' => 'FALSE')); |
|
1564
|
1564
|
} |
|
1565
|
|
- $metar = filter_input(INPUT_POST,'metar',FILTER_SANITIZE_STRING); |
|
|
1565
|
+ $metar = filter_input(INPUT_POST, 'metar', FILTER_SANITIZE_STRING); |
|
1566
|
1566
|
if ($metar == 'metar') { |
|
1567
|
|
- $settings = array_merge($settings,array('globalMETAR' => 'TRUE')); |
|
|
1567
|
+ $settings = array_merge($settings, array('globalMETAR' => 'TRUE')); |
|
1568
|
1568
|
} else { |
|
1569
|
|
- $settings = array_merge($settings,array('globalMETAR' => 'FALSE')); |
|
|
1569
|
+ $settings = array_merge($settings, array('globalMETAR' => 'FALSE')); |
|
1570
|
1570
|
} |
|
1571
|
|
- $metarcycle = filter_input(INPUT_POST,'metarcycle',FILTER_SANITIZE_STRING); |
|
|
1571
|
+ $metarcycle = filter_input(INPUT_POST, 'metarcycle', FILTER_SANITIZE_STRING); |
|
1572
|
1572
|
if ($metarcycle == 'metarcycle') { |
|
1573
|
|
- $settings = array_merge($settings,array('globalMETARcycle' => 'TRUE')); |
|
|
1573
|
+ $settings = array_merge($settings, array('globalMETARcycle' => 'TRUE')); |
|
1574
|
1574
|
} else { |
|
1575
|
|
- $settings = array_merge($settings,array('globalMETARcycle' => 'FALSE')); |
|
|
1575
|
+ $settings = array_merge($settings, array('globalMETARcycle' => 'FALSE')); |
|
1576
|
1576
|
} |
|
1577
|
|
- $fork = filter_input(INPUT_POST,'fork',FILTER_SANITIZE_STRING); |
|
|
1577
|
+ $fork = filter_input(INPUT_POST, 'fork', FILTER_SANITIZE_STRING); |
|
1578
|
1578
|
if ($fork == 'fork') { |
|
1579
|
|
- $settings = array_merge($settings,array('globalFork' => 'TRUE')); |
|
|
1579
|
+ $settings = array_merge($settings, array('globalFork' => 'TRUE')); |
|
1580
|
1580
|
} else { |
|
1581
|
|
- $settings = array_merge($settings,array('globalFork' => 'FALSE')); |
|
|
1581
|
+ $settings = array_merge($settings, array('globalFork' => 'FALSE')); |
|
1582
|
1582
|
} |
|
1583
|
1583
|
|
|
1584
|
|
- $colormap = filter_input(INPUT_POST,'colormap',FILTER_SANITIZE_STRING); |
|
|
1584
|
+ $colormap = filter_input(INPUT_POST, 'colormap', FILTER_SANITIZE_STRING); |
|
1585
|
1585
|
if ($colormap == 'colormap') { |
|
1586
|
|
- $settings = array_merge($settings,array('globalMapAltitudeColor' => 'TRUE')); |
|
|
1586
|
+ $settings = array_merge($settings, array('globalMapAltitudeColor' => 'TRUE')); |
|
1587
|
1587
|
} else { |
|
1588
|
|
- $settings = array_merge($settings,array('globalMapAltitudeColor' => 'FALSE')); |
|
|
1588
|
+ $settings = array_merge($settings, array('globalMapAltitudeColor' => 'FALSE')); |
|
1589
|
1589
|
} |
|
1590
|
1590
|
|
|
1591
|
1591
|
if (isset($_POST['aircrafticoncolor'])) { |
|
1592
|
|
- $aircrafticoncolor = filter_input(INPUT_POST,'aircrafticoncolor',FILTER_SANITIZE_STRING); |
|
1593
|
|
- $settings = array_merge($settings,array('globalAircraftIconColor' => substr($aircrafticoncolor,1))); |
|
|
1592
|
+ $aircrafticoncolor = filter_input(INPUT_POST, 'aircrafticoncolor', FILTER_SANITIZE_STRING); |
|
|
1593
|
+ $settings = array_merge($settings, array('globalAircraftIconColor' => substr($aircrafticoncolor, 1))); |
|
1594
|
1594
|
} |
|
1595
|
1595
|
|
|
1596
|
|
- $airportzoom = filter_input(INPUT_POST,'airportzoom',FILTER_SANITIZE_NUMBER_INT); |
|
1597
|
|
- $settings = array_merge($settings,array('globalAirportZoom' => $airportzoom)); |
|
|
1596
|
+ $airportzoom = filter_input(INPUT_POST, 'airportzoom', FILTER_SANITIZE_NUMBER_INT); |
|
|
1597
|
+ $settings = array_merge($settings, array('globalAirportZoom' => $airportzoom)); |
|
1598
|
1598
|
|
|
1599
|
|
- $unitdistance = filter_input(INPUT_POST,'unitdistance',FILTER_SANITIZE_STRING); |
|
1600
|
|
- $settings = array_merge($settings,array('globalUnitDistance' => $unitdistance)); |
|
1601
|
|
- $unitaltitude = filter_input(INPUT_POST,'unitaltitude',FILTER_SANITIZE_STRING); |
|
1602
|
|
- $settings = array_merge($settings,array('globalUnitAltitude' => $unitaltitude)); |
|
1603
|
|
- $unitspeed = filter_input(INPUT_POST,'unitspeed',FILTER_SANITIZE_STRING); |
|
1604
|
|
- $settings = array_merge($settings,array('globalUnitSpeed' => $unitspeed)); |
|
|
1599
|
+ $unitdistance = filter_input(INPUT_POST, 'unitdistance', FILTER_SANITIZE_STRING); |
|
|
1600
|
+ $settings = array_merge($settings, array('globalUnitDistance' => $unitdistance)); |
|
|
1601
|
+ $unitaltitude = filter_input(INPUT_POST, 'unitaltitude', FILTER_SANITIZE_STRING); |
|
|
1602
|
+ $settings = array_merge($settings, array('globalUnitAltitude' => $unitaltitude)); |
|
|
1603
|
+ $unitspeed = filter_input(INPUT_POST, 'unitspeed', FILTER_SANITIZE_STRING); |
|
|
1604
|
+ $settings = array_merge($settings, array('globalUnitSpeed' => $unitspeed)); |
|
1605
|
1605
|
|
|
1606
|
|
- $mappopup = filter_input(INPUT_POST,'mappopup',FILTER_SANITIZE_STRING); |
|
|
1606
|
+ $mappopup = filter_input(INPUT_POST, 'mappopup', FILTER_SANITIZE_STRING); |
|
1607
|
1607
|
if ($mappopup == 'mappopup') { |
|
1608
|
|
- $settings = array_merge($settings,array('globalMapPopup' => 'TRUE')); |
|
|
1608
|
+ $settings = array_merge($settings, array('globalMapPopup' => 'TRUE')); |
|
1609
|
1609
|
} else { |
|
1610
|
|
- $settings = array_merge($settings,array('globalMapPopup' => 'FALSE')); |
|
|
1610
|
+ $settings = array_merge($settings, array('globalMapPopup' => 'FALSE')); |
|
1611
|
1611
|
} |
|
1612
|
|
- $airportpopup = filter_input(INPUT_POST,'airportpopup',FILTER_SANITIZE_STRING); |
|
|
1612
|
+ $airportpopup = filter_input(INPUT_POST, 'airportpopup', FILTER_SANITIZE_STRING); |
|
1613
|
1613
|
if ($airportpopup == 'airportpopup') { |
|
1614
|
|
- $settings = array_merge($settings,array('globalAirportPopup' => 'TRUE')); |
|
|
1614
|
+ $settings = array_merge($settings, array('globalAirportPopup' => 'TRUE')); |
|
1615
|
1615
|
} else { |
|
1616
|
|
- $settings = array_merge($settings,array('globalAirportPopup' => 'FALSE')); |
|
|
1616
|
+ $settings = array_merge($settings, array('globalAirportPopup' => 'FALSE')); |
|
1617
|
1617
|
} |
|
1618
|
|
- $maphistory = filter_input(INPUT_POST,'maphistory',FILTER_SANITIZE_STRING); |
|
|
1618
|
+ $maphistory = filter_input(INPUT_POST, 'maphistory', FILTER_SANITIZE_STRING); |
|
1619
|
1619
|
if ($maphistory == 'maphistory') { |
|
1620
|
|
- $settings = array_merge($settings,array('globalMapHistory' => 'TRUE')); |
|
|
1620
|
+ $settings = array_merge($settings, array('globalMapHistory' => 'TRUE')); |
|
1621
|
1621
|
} else { |
|
1622
|
|
- $settings = array_merge($settings,array('globalMapHistory' => 'FALSE')); |
|
|
1622
|
+ $settings = array_merge($settings, array('globalMapHistory' => 'FALSE')); |
|
1623
|
1623
|
} |
|
1624
|
|
- $maptooltip = filter_input(INPUT_POST,'maptooltip',FILTER_SANITIZE_STRING); |
|
|
1624
|
+ $maptooltip = filter_input(INPUT_POST, 'maptooltip', FILTER_SANITIZE_STRING); |
|
1625
|
1625
|
if ($maptooltip == 'maptooltip') { |
|
1626
|
|
- $settings = array_merge($settings,array('globalMapTooltip' => 'TRUE')); |
|
|
1626
|
+ $settings = array_merge($settings, array('globalMapTooltip' => 'TRUE')); |
|
1627
|
1627
|
} else { |
|
1628
|
|
- $settings = array_merge($settings,array('globalMapTooltip' => 'FALSE')); |
|
|
1628
|
+ $settings = array_merge($settings, array('globalMapTooltip' => 'FALSE')); |
|
1629
|
1629
|
} |
|
1630
|
|
- $flightroute = filter_input(INPUT_POST,'flightroute',FILTER_SANITIZE_STRING); |
|
|
1630
|
+ $flightroute = filter_input(INPUT_POST, 'flightroute', FILTER_SANITIZE_STRING); |
|
1631
|
1631
|
if ($flightroute == 'flightroute') { |
|
1632
|
|
- $settings = array_merge($settings,array('globalMapRoute' => 'TRUE')); |
|
|
1632
|
+ $settings = array_merge($settings, array('globalMapRoute' => 'TRUE')); |
|
1633
|
1633
|
} else { |
|
1634
|
|
- $settings = array_merge($settings,array('globalMapRoute' => 'FALSE')); |
|
|
1634
|
+ $settings = array_merge($settings, array('globalMapRoute' => 'FALSE')); |
|
1635
|
1635
|
} |
|
1636
|
|
- $flightremainingroute = filter_input(INPUT_POST,'flightremainingroute',FILTER_SANITIZE_STRING); |
|
|
1636
|
+ $flightremainingroute = filter_input(INPUT_POST, 'flightremainingroute', FILTER_SANITIZE_STRING); |
|
1637
|
1637
|
if ($flightremainingroute == 'flightremainingroute') { |
|
1638
|
|
- $settings = array_merge($settings,array('globalMapRemainingRoute' => 'TRUE')); |
|
|
1638
|
+ $settings = array_merge($settings, array('globalMapRemainingRoute' => 'TRUE')); |
|
1639
|
1639
|
} else { |
|
1640
|
|
- $settings = array_merge($settings,array('globalMapRemainingRoute' => 'FALSE')); |
|
|
1640
|
+ $settings = array_merge($settings, array('globalMapRemainingRoute' => 'FALSE')); |
|
1641
|
1641
|
} |
|
1642
|
|
- $allflights = filter_input(INPUT_POST,'allflights',FILTER_SANITIZE_STRING); |
|
|
1642
|
+ $allflights = filter_input(INPUT_POST, 'allflights', FILTER_SANITIZE_STRING); |
|
1643
|
1643
|
if ($allflights == 'allflights') { |
|
1644
|
|
- $settings = array_merge($settings,array('globalAllFlights' => 'TRUE')); |
|
|
1644
|
+ $settings = array_merge($settings, array('globalAllFlights' => 'TRUE')); |
|
1645
|
1645
|
} else { |
|
1646
|
|
- $settings = array_merge($settings,array('globalAllFlights' => 'FALSE')); |
|
|
1646
|
+ $settings = array_merge($settings, array('globalAllFlights' => 'FALSE')); |
|
1647
|
1647
|
} |
|
1648
|
|
- $bbox = filter_input(INPUT_POST,'bbox',FILTER_SANITIZE_STRING); |
|
|
1648
|
+ $bbox = filter_input(INPUT_POST, 'bbox', FILTER_SANITIZE_STRING); |
|
1649
|
1649
|
if ($bbox == 'bbox') { |
|
1650
|
|
- $settings = array_merge($settings,array('globalMapUseBbox' => 'TRUE')); |
|
|
1650
|
+ $settings = array_merge($settings, array('globalMapUseBbox' => 'TRUE')); |
|
1651
|
1651
|
} else { |
|
1652
|
|
- $settings = array_merge($settings,array('globalMapUseBbox' => 'FALSE')); |
|
|
1652
|
+ $settings = array_merge($settings, array('globalMapUseBbox' => 'FALSE')); |
|
1653
|
1653
|
} |
|
1654
|
|
- $groundaltitude = filter_input(INPUT_POST,'groundaltitude',FILTER_SANITIZE_STRING); |
|
|
1654
|
+ $groundaltitude = filter_input(INPUT_POST, 'groundaltitude', FILTER_SANITIZE_STRING); |
|
1655
|
1655
|
if ($groundaltitude == 'groundaltitude') { |
|
1656
|
|
- $settings = array_merge($settings,array('globalGroundAltitude' => 'TRUE')); |
|
|
1656
|
+ $settings = array_merge($settings, array('globalGroundAltitude' => 'TRUE')); |
|
1657
|
1657
|
} else { |
|
1658
|
|
- $settings = array_merge($settings,array('globalGroundAltitude' => 'FALSE')); |
|
|
1658
|
+ $settings = array_merge($settings, array('globalGroundAltitude' => 'FALSE')); |
|
1659
|
1659
|
} |
|
1660
|
|
- $waypoints = filter_input(INPUT_POST,'waypoints',FILTER_SANITIZE_STRING); |
|
|
1660
|
+ $waypoints = filter_input(INPUT_POST, 'waypoints', FILTER_SANITIZE_STRING); |
|
1661
|
1661
|
if ($waypoints == 'waypoints') { |
|
1662
|
|
- $settings = array_merge($settings,array('globalWaypoints' => 'TRUE')); |
|
|
1662
|
+ $settings = array_merge($settings, array('globalWaypoints' => 'TRUE')); |
|
1663
|
1663
|
} else { |
|
1664
|
|
- $settings = array_merge($settings,array('globalWaypoints' => 'FALSE')); |
|
|
1664
|
+ $settings = array_merge($settings, array('globalWaypoints' => 'FALSE')); |
|
1665
|
1665
|
} |
|
1666
|
|
- $geoid = filter_input(INPUT_POST,'geoid',FILTER_SANITIZE_STRING); |
|
|
1666
|
+ $geoid = filter_input(INPUT_POST, 'geoid', FILTER_SANITIZE_STRING); |
|
1667
|
1667
|
if ($geoid == 'geoid') { |
|
1668
|
|
- $settings = array_merge($settings,array('globalGeoid' => 'TRUE')); |
|
|
1668
|
+ $settings = array_merge($settings, array('globalGeoid' => 'TRUE')); |
|
1669
|
1669
|
} else { |
|
1670
|
|
- $settings = array_merge($settings,array('globalGeoid' => 'FALSE')); |
|
|
1670
|
+ $settings = array_merge($settings, array('globalGeoid' => 'FALSE')); |
|
1671
|
1671
|
} |
|
1672
|
|
- $geoid_source = filter_input(INPUT_POST,'geoid_source',FILTER_SANITIZE_STRING); |
|
1673
|
|
- $settings = array_merge($settings,array('globalGeoidSource' => $geoid_source)); |
|
|
1672
|
+ $geoid_source = filter_input(INPUT_POST, 'geoid_source', FILTER_SANITIZE_STRING); |
|
|
1673
|
+ $settings = array_merge($settings, array('globalGeoidSource' => $geoid_source)); |
|
1674
|
1674
|
|
|
1675
|
|
- $noairlines = filter_input(INPUT_POST,'noairlines',FILTER_SANITIZE_STRING); |
|
|
1675
|
+ $noairlines = filter_input(INPUT_POST, 'noairlines', FILTER_SANITIZE_STRING); |
|
1676
|
1676
|
if ($noairlines == 'noairlines') { |
|
1677
|
|
- $settings = array_merge($settings,array('globalNoAirlines' => 'TRUE')); |
|
|
1677
|
+ $settings = array_merge($settings, array('globalNoAirlines' => 'TRUE')); |
|
1678
|
1678
|
} else { |
|
1679
|
|
- $settings = array_merge($settings,array('globalNoAirlines' => 'FALSE')); |
|
|
1679
|
+ $settings = array_merge($settings, array('globalNoAirlines' => 'FALSE')); |
|
1680
|
1680
|
} |
|
1681
|
1681
|
|
|
1682
|
|
- $tsk = filter_input(INPUT_POST,'tsk',FILTER_SANITIZE_STRING); |
|
|
1682
|
+ $tsk = filter_input(INPUT_POST, 'tsk', FILTER_SANITIZE_STRING); |
|
1683
|
1683
|
if ($tsk == 'tsk') { |
|
1684
|
|
- $settings = array_merge($settings,array('globalTSK' => 'TRUE')); |
|
|
1684
|
+ $settings = array_merge($settings, array('globalTSK' => 'TRUE')); |
|
1685
|
1685
|
} else { |
|
1686
|
|
- $settings = array_merge($settings,array('globalTSK' => 'FALSE')); |
|
|
1686
|
+ $settings = array_merge($settings, array('globalTSK' => 'FALSE')); |
|
1687
|
1687
|
} |
|
1688
|
|
- $mapmatching = filter_input(INPUT_POST,'mapmatching',FILTER_SANITIZE_STRING); |
|
|
1688
|
+ $mapmatching = filter_input(INPUT_POST, 'mapmatching', FILTER_SANITIZE_STRING); |
|
1689
|
1689
|
if ($mapmatching == 'mapmatching') { |
|
1690
|
|
- $settings = array_merge($settings,array('globalMapMatching' => 'TRUE')); |
|
|
1690
|
+ $settings = array_merge($settings, array('globalMapMatching' => 'TRUE')); |
|
1691
|
1691
|
} else { |
|
1692
|
|
- $settings = array_merge($settings,array('globalMapMatching' => 'FALSE')); |
|
|
1692
|
+ $settings = array_merge($settings, array('globalMapMatching' => 'FALSE')); |
|
1693
|
1693
|
} |
|
1694
|
|
- $mapmatchingsource = filter_input(INPUT_POST,'mapmatchingsource',FILTER_SANITIZE_STRING); |
|
1695
|
|
- $settings = array_merge($settings,array('globalMapMatchingSource' => $mapmatchingsource)); |
|
1696
|
|
- $graphhopper = filter_input(INPUT_POST,'graphhopper',FILTER_SANITIZE_STRING); |
|
1697
|
|
- $settings = array_merge($settings,array('globalGraphHopperKey' => $graphhopper)); |
|
|
1694
|
+ $mapmatchingsource = filter_input(INPUT_POST, 'mapmatchingsource', FILTER_SANITIZE_STRING); |
|
|
1695
|
+ $settings = array_merge($settings, array('globalMapMatchingSource' => $mapmatchingsource)); |
|
|
1696
|
+ $graphhopper = filter_input(INPUT_POST, 'graphhopper', FILTER_SANITIZE_STRING); |
|
|
1697
|
+ $settings = array_merge($settings, array('globalGraphHopperKey' => $graphhopper)); |
|
1698
|
1698
|
|
|
1699
|
|
- if (!isset($globalTransaction)) $settings = array_merge($settings,array('globalTransaction' => 'TRUE')); |
|
|
1699
|
+ if (!isset($globalTransaction)) $settings = array_merge($settings, array('globalTransaction' => 'TRUE')); |
|
1700
|
1700
|
|
|
1701
|
1701
|
// Set some defaults values... |
|
1702
|
1702
|
if (!isset($globalAircraftImageSources)) { |
|
1703
|
|
- $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters'); |
|
1704
|
|
- $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources)); |
|
|
1703
|
+ $globalAircraftImageSources = array('ivaomtl', 'wikimedia', 'airportdata', 'deviantart', 'flickr', 'bing', 'jetphotos', 'planepictures', 'planespotters'); |
|
|
1704
|
+ $settings = array_merge($settings, array('globalAircraftImageSources' => $globalAircraftImageSources)); |
|
1705
|
1705
|
} |
|
1706
|
1706
|
|
|
1707
|
1707
|
if (!isset($globalSchedulesSources)) { |
|
1708
|
|
- $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware'); |
|
1709
|
|
- $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources)); |
|
|
1708
|
+ $globalSchedulesSources = array('flightmapper', 'costtotravel', 'flightradar24', 'flightaware'); |
|
|
1709
|
+ $settings = array_merge($settings, array('globalSchedulesSources' => $globalSchedulesSources)); |
|
1710
|
1710
|
} |
|
1711
|
1711
|
|
|
1712
|
|
- $settings = array_merge($settings,array('globalInstalled' => 'TRUE')); |
|
|
1712
|
+ $settings = array_merge($settings, array('globalInstalled' => 'TRUE')); |
|
1713
|
1713
|
|
|
1714
|
1714
|
if ($error == '') settings::modify_settings($settings); |
|
1715
|
1715
|
if ($error == '') settings::comment_settings($settings_comment); |