@@ -22,7 +22,7 @@ discard block |
||
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 |
||
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 | /* |
@@ -113,22 +113,22 @@ discard block |
||
113 | 113 | $alllng = $Language->listLocaleDir(); |
114 | 114 | if (count($alllng) != count($availablelng)) { |
115 | 115 | $notavailable = array(); |
116 | - foreach($alllng as $lng) { |
|
116 | + foreach ($alllng as $lng) { |
|
117 | 117 | if (!isset($availablelng[$lng])) $notavailable[] = $lng; |
118 | 118 | } |
119 | - print '<div class="alert alert-warning">The following translation can\'t be used on your system: '.implode(', ',$notavailable).'. You need to add the system locales: <a href="https://github.com/Ysurac/FlightAirMap/wiki/Translation">documentation</a>.</div>'; |
|
119 | + print '<div class="alert alert-warning">The following translation can\'t be used on your system: '.implode(', ', $notavailable).'. You need to add the system locales: <a href="https://github.com/Ysurac/FlightAirMap/wiki/Translation">documentation</a>.</div>'; |
|
120 | 120 | } |
121 | 121 | } |
122 | 122 | print '<div class="alert alert-info">If you use MySQL or MariaDB, check that <i>max_allowed_packet</i> >= 8M, else import of some tables can fail.</div>'; |
123 | 123 | if (isset($_SERVER['REQUEST_SCHEME']) && isset($_SERVER['SERVER_NAME']) && isset($_SERVER['SERVER_PORT']) && isset($_SERVER['REQUEST_URI'])) { |
124 | 124 | if (function_exists('get_headers')) { |
125 | 125 | //$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"]))); |
126 | - $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"]))); |
|
127 | - if (isset($check_header[0]) && !stripos($check_header[0],"200 OK")) { |
|
126 | + $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"]))); |
|
127 | + if (isset($check_header[0]) && !stripos($check_header[0], "200 OK")) { |
|
128 | 128 | 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>'; |
129 | 129 | } else { |
130 | - $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"]))); |
|
131 | - if (isset($check_header[0]) && !stripos($check_header[0],"200 OK")) { |
|
130 | + $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"]))); |
|
131 | + if (isset($check_header[0]) && !stripos($check_header[0], "200 OK")) { |
|
132 | 132 | 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>'; |
133 | 133 | } |
134 | 134 | } |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | if ((!isset($globalURL) || $globalURL == '') && (!isset($globalDBuser) || $globalDBuser == '')) { |
209 | 209 | if (isset($_SERVER['REQUEST_URI'])) { |
210 | 210 | $URL = $_SERVER['REQUEST_URI']; |
211 | - $globalURL = str_replace('/install','',str_replace('/install/','',str_replace('/install/index.php','',$URL))); |
|
211 | + $globalURL = str_replace('/install', '', str_replace('/install/', '', str_replace('/install/index.php', '', $URL))); |
|
212 | 212 | } |
213 | 213 | } |
214 | 214 | ?> |
@@ -549,13 +549,13 @@ discard block |
||
549 | 549 | ?> |
550 | 550 | <tr> |
551 | 551 | <?php |
552 | - if (filter_var($source['host'],FILTER_VALIDATE_URL)) { |
|
552 | + if (filter_var($source['host'], FILTER_VALIDATE_URL)) { |
|
553 | 553 | ?> |
554 | 554 | <td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td> |
555 | 555 | <td><input type="text" name="port[]" class="col-xs-2" id="port" value="<?php if (isset($source['port'])) print $source['port']; ?>" /></td> |
556 | 556 | <?php |
557 | 557 | } else { |
558 | - $hostport = explode(':',$source['host']); |
|
558 | + $hostport = explode(':', $source['host']); |
|
559 | 559 | if (isset($hostport[1])) { |
560 | 560 | $host = $hostport[0]; |
561 | 561 | $port = $hostport[1]; |
@@ -606,7 +606,7 @@ discard block |
||
606 | 606 | <select name="timezones[]" id="timezones"> |
607 | 607 | <?php |
608 | 608 | $timezonelist = DateTimeZone::listIdentifiers(DateTimeZone::ALL); |
609 | - foreach($timezonelist as $timezones){ |
|
609 | + foreach ($timezonelist as $timezones) { |
|
610 | 610 | if (isset($source['timezone']) && $source['timezone'] == $timezones) { |
611 | 611 | print '<option selected>'.$timezones.'</option>'; |
612 | 612 | } elseif (!isset($source['timezone']) && $timezones == 'UTC') { |
@@ -662,7 +662,7 @@ discard block |
||
662 | 662 | <select name="timezones[]" id="timezones"> |
663 | 663 | <?php |
664 | 664 | $timezonelist = DateTimeZone::listIdentifiers(DateTimeZone::ALL); |
665 | - foreach($timezonelist as $timezones){ |
|
665 | + foreach ($timezonelist as $timezones) { |
|
666 | 666 | if ($timezones == 'UTC') { |
667 | 667 | print '<option selected>'.$timezones.'</option>'; |
668 | 668 | } else print '<option>'.$timezones.'</option>'; |
@@ -1131,7 +1131,7 @@ discard block |
||
1131 | 1131 | <br /> |
1132 | 1132 | <p> |
1133 | 1133 | <label for="aircraftsize">Size of aircraft icon on map (default to 30px if zoom > 7 else 15px), empty to default</label> |
1134 | - <input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize;?>" /> |
|
1134 | + <input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize; ?>" /> |
|
1135 | 1135 | </p> |
1136 | 1136 | <br /> |
1137 | 1137 | <p> |
@@ -1193,14 +1193,14 @@ discard block |
||
1193 | 1193 | $error = ''; |
1194 | 1194 | |
1195 | 1195 | if (isset($_POST['dbtype'])) { |
1196 | - $dbtype = filter_input(INPUT_POST,'dbtype',FILTER_SANITIZE_STRING); |
|
1197 | - $dbroot = filter_input(INPUT_POST,'dbroot',FILTER_SANITIZE_STRING); |
|
1198 | - $dbrootpass = filter_input(INPUT_POST,'dbrootpass',FILTER_SANITIZE_STRING); |
|
1199 | - $dbname = filter_input(INPUT_POST,'dbname',FILTER_SANITIZE_STRING); |
|
1200 | - $dbuser = filter_input(INPUT_POST,'dbuser',FILTER_SANITIZE_STRING); |
|
1201 | - $dbuserpass = filter_input(INPUT_POST,'dbuserpass',FILTER_SANITIZE_STRING); |
|
1202 | - $dbhost = filter_input(INPUT_POST,'dbhost',FILTER_SANITIZE_STRING); |
|
1203 | - $dbport = filter_input(INPUT_POST,'dbport',FILTER_SANITIZE_STRING); |
|
1196 | + $dbtype = filter_input(INPUT_POST, 'dbtype', FILTER_SANITIZE_STRING); |
|
1197 | + $dbroot = filter_input(INPUT_POST, 'dbroot', FILTER_SANITIZE_STRING); |
|
1198 | + $dbrootpass = filter_input(INPUT_POST, 'dbrootpass', FILTER_SANITIZE_STRING); |
|
1199 | + $dbname = filter_input(INPUT_POST, 'dbname', FILTER_SANITIZE_STRING); |
|
1200 | + $dbuser = filter_input(INPUT_POST, 'dbuser', FILTER_SANITIZE_STRING); |
|
1201 | + $dbuserpass = filter_input(INPUT_POST, 'dbuserpass', FILTER_SANITIZE_STRING); |
|
1202 | + $dbhost = filter_input(INPUT_POST, 'dbhost', FILTER_SANITIZE_STRING); |
|
1203 | + $dbport = filter_input(INPUT_POST, 'dbport', FILTER_SANITIZE_STRING); |
|
1204 | 1204 | |
1205 | 1205 | if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) $error .= 'Mysql driver for PDO must be loaded'; |
1206 | 1206 | if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) $error .= 'PosgreSQL driver for PDO must be loaded'; |
@@ -1220,59 +1220,59 @@ discard block |
||
1220 | 1220 | } else $settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname)); |
1221 | 1221 | */ |
1222 | 1222 | |
1223 | - $settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname)); |
|
1223 | + $settings = array_merge($settings, array('globalDBdriver' => $dbtype, 'globalDBhost' => $dbhost, 'globalDBuser' => $dbuser, 'globalDBport' => $dbport, 'globalDBpass' => $dbuserpass, 'globalDBname' => $dbname)); |
|
1224 | 1224 | |
1225 | - $sitename = filter_input(INPUT_POST,'sitename',FILTER_SANITIZE_STRING); |
|
1226 | - $siteurl = filter_input(INPUT_POST,'siteurl',FILTER_SANITIZE_STRING); |
|
1227 | - $timezone = filter_input(INPUT_POST,'timezone',FILTER_SANITIZE_STRING); |
|
1228 | - $language = filter_input(INPUT_POST,'language',FILTER_SANITIZE_STRING); |
|
1229 | - $settings = array_merge($settings,array('globalName' => $sitename,'globalURL' => $siteurl, 'globalTimezone' => $timezone,'globalLanguage' => $language)); |
|
1225 | + $sitename = filter_input(INPUT_POST, 'sitename', FILTER_SANITIZE_STRING); |
|
1226 | + $siteurl = filter_input(INPUT_POST, 'siteurl', FILTER_SANITIZE_STRING); |
|
1227 | + $timezone = filter_input(INPUT_POST, 'timezone', FILTER_SANITIZE_STRING); |
|
1228 | + $language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_STRING); |
|
1229 | + $settings = array_merge($settings, array('globalName' => $sitename, 'globalURL' => $siteurl, 'globalTimezone' => $timezone, 'globalLanguage' => $language)); |
|
1230 | 1230 | |
1231 | - $mapprovider = filter_input(INPUT_POST,'mapprovider',FILTER_SANITIZE_STRING); |
|
1232 | - $mapboxid = filter_input(INPUT_POST,'mapboxid',FILTER_SANITIZE_STRING); |
|
1233 | - $mapboxtoken = filter_input(INPUT_POST,'mapboxtoken',FILTER_SANITIZE_STRING); |
|
1234 | - $googlekey = filter_input(INPUT_POST,'googlekey',FILTER_SANITIZE_STRING); |
|
1235 | - $bingkey = filter_input(INPUT_POST,'bingkey',FILTER_SANITIZE_STRING); |
|
1236 | - $openweathermapkey = filter_input(INPUT_POST,'openweathermapkey',FILTER_SANITIZE_STRING); |
|
1237 | - $mapquestkey = filter_input(INPUT_POST,'mapquestkey',FILTER_SANITIZE_STRING); |
|
1238 | - $hereappid = filter_input(INPUT_POST,'hereappid',FILTER_SANITIZE_STRING); |
|
1239 | - $hereappcode = filter_input(INPUT_POST,'hereappcode',FILTER_SANITIZE_STRING); |
|
1240 | - $settings = array_merge($settings,array('globalMapProvider' => $mapprovider,'globalMapboxId' => $mapboxid,'globalMapboxToken' => $mapboxtoken,'globalGoogleAPIKey' => $googlekey,'globalBingMapKey' => $bingkey,'globalHereappID' => $hereappid,'globalHereappCode' => $hereappcode,'globalMapQuestKey' => $mapquestkey,'globalOpenWeatherMapKey' => $openweathermapkey)); |
|
1231 | + $mapprovider = filter_input(INPUT_POST, 'mapprovider', FILTER_SANITIZE_STRING); |
|
1232 | + $mapboxid = filter_input(INPUT_POST, 'mapboxid', FILTER_SANITIZE_STRING); |
|
1233 | + $mapboxtoken = filter_input(INPUT_POST, 'mapboxtoken', FILTER_SANITIZE_STRING); |
|
1234 | + $googlekey = filter_input(INPUT_POST, 'googlekey', FILTER_SANITIZE_STRING); |
|
1235 | + $bingkey = filter_input(INPUT_POST, 'bingkey', FILTER_SANITIZE_STRING); |
|
1236 | + $openweathermapkey = filter_input(INPUT_POST, 'openweathermapkey', FILTER_SANITIZE_STRING); |
|
1237 | + $mapquestkey = filter_input(INPUT_POST, 'mapquestkey', FILTER_SANITIZE_STRING); |
|
1238 | + $hereappid = filter_input(INPUT_POST, 'hereappid', FILTER_SANITIZE_STRING); |
|
1239 | + $hereappcode = filter_input(INPUT_POST, 'hereappcode', FILTER_SANITIZE_STRING); |
|
1240 | + $settings = array_merge($settings, array('globalMapProvider' => $mapprovider, 'globalMapboxId' => $mapboxid, 'globalMapboxToken' => $mapboxtoken, 'globalGoogleAPIKey' => $googlekey, 'globalBingMapKey' => $bingkey, 'globalHereappID' => $hereappid, 'globalHereappCode' => $hereappcode, 'globalMapQuestKey' => $mapquestkey, 'globalOpenWeatherMapKey' => $openweathermapkey)); |
|
1241 | 1241 | |
1242 | - $latitudemax = filter_input(INPUT_POST,'latitudemax',FILTER_SANITIZE_STRING); |
|
1243 | - $latitudemin = filter_input(INPUT_POST,'latitudemin',FILTER_SANITIZE_STRING); |
|
1244 | - $longitudemax = filter_input(INPUT_POST,'longitudemax',FILTER_SANITIZE_STRING); |
|
1245 | - $longitudemin = filter_input(INPUT_POST,'longitudemin',FILTER_SANITIZE_STRING); |
|
1246 | - $livezoom = filter_input(INPUT_POST,'livezoom',FILTER_SANITIZE_NUMBER_INT); |
|
1247 | - $settings = array_merge($settings,array('globalLatitudeMax' => $latitudemax,'globalLatitudeMin' => $latitudemin,'globalLongitudeMax' => $longitudemax,'globalLongitudeMin' => $longitudemin,'globalLiveZoom' => $livezoom)); |
|
1242 | + $latitudemax = filter_input(INPUT_POST, 'latitudemax', FILTER_SANITIZE_STRING); |
|
1243 | + $latitudemin = filter_input(INPUT_POST, 'latitudemin', FILTER_SANITIZE_STRING); |
|
1244 | + $longitudemax = filter_input(INPUT_POST, 'longitudemax', FILTER_SANITIZE_STRING); |
|
1245 | + $longitudemin = filter_input(INPUT_POST, 'longitudemin', FILTER_SANITIZE_STRING); |
|
1246 | + $livezoom = filter_input(INPUT_POST, 'livezoom', FILTER_SANITIZE_NUMBER_INT); |
|
1247 | + $settings = array_merge($settings, array('globalLatitudeMax' => $latitudemax, 'globalLatitudeMin' => $latitudemin, 'globalLongitudeMax' => $longitudemax, 'globalLongitudeMin' => $longitudemin, 'globalLiveZoom' => $livezoom)); |
|
1248 | 1248 | |
1249 | - $squawk_country = filter_input(INPUT_POST,'squawk_country',FILTER_SANITIZE_STRING); |
|
1250 | - $settings = array_merge($settings,array('globalSquawkCountry' => $squawk_country)); |
|
1249 | + $squawk_country = filter_input(INPUT_POST, 'squawk_country', FILTER_SANITIZE_STRING); |
|
1250 | + $settings = array_merge($settings, array('globalSquawkCountry' => $squawk_country)); |
|
1251 | 1251 | |
1252 | - $latitudecenter = filter_input(INPUT_POST,'latitudecenter',FILTER_SANITIZE_STRING); |
|
1253 | - $longitudecenter = filter_input(INPUT_POST,'longitudecenter',FILTER_SANITIZE_STRING); |
|
1254 | - $settings = array_merge($settings,array('globalCenterLatitude' => $latitudecenter,'globalCenterLongitude' => $longitudecenter)); |
|
1252 | + $latitudecenter = filter_input(INPUT_POST, 'latitudecenter', FILTER_SANITIZE_STRING); |
|
1253 | + $longitudecenter = filter_input(INPUT_POST, 'longitudecenter', FILTER_SANITIZE_STRING); |
|
1254 | + $settings = array_merge($settings, array('globalCenterLatitude' => $latitudecenter, 'globalCenterLongitude' => $longitudecenter)); |
|
1255 | 1255 | |
1256 | - $acars = filter_input(INPUT_POST,'acars',FILTER_SANITIZE_STRING); |
|
1256 | + $acars = filter_input(INPUT_POST, 'acars', FILTER_SANITIZE_STRING); |
|
1257 | 1257 | if ($acars == 'acars') { |
1258 | - $settings = array_merge($settings,array('globalACARS' => 'TRUE')); |
|
1258 | + $settings = array_merge($settings, array('globalACARS' => 'TRUE')); |
|
1259 | 1259 | } else { |
1260 | - $settings = array_merge($settings,array('globalACARS' => 'FALSE')); |
|
1260 | + $settings = array_merge($settings, array('globalACARS' => 'FALSE')); |
|
1261 | 1261 | } |
1262 | - $updatecheck = filter_input(INPUT_POST,'updatecheck',FILTER_SANITIZE_STRING); |
|
1262 | + $updatecheck = filter_input(INPUT_POST, 'updatecheck', FILTER_SANITIZE_STRING); |
|
1263 | 1263 | if ($updatecheck == 'updatecheck') { |
1264 | - $settings = array_merge($settings,array('globalDisableUpdateCheck' => 'TRUE')); |
|
1264 | + $settings = array_merge($settings, array('globalDisableUpdateCheck' => 'TRUE')); |
|
1265 | 1265 | } else { |
1266 | - $settings = array_merge($settings,array('globalDisableUpdateCheck' => 'FALSE')); |
|
1266 | + $settings = array_merge($settings, array('globalDisableUpdateCheck' => 'FALSE')); |
|
1267 | 1267 | } |
1268 | 1268 | |
1269 | - $flightawareusername = filter_input(INPUT_POST,'flightawareusername',FILTER_SANITIZE_STRING); |
|
1270 | - $flightawarepassword = filter_input(INPUT_POST,'flightawarepassword',FILTER_SANITIZE_STRING); |
|
1271 | - $settings = array_merge($settings,array('globalFlightAwareUsername' => $flightawareusername,'globalFlightAwarePassword' => $flightawarepassword)); |
|
1269 | + $flightawareusername = filter_input(INPUT_POST, 'flightawareusername', FILTER_SANITIZE_STRING); |
|
1270 | + $flightawarepassword = filter_input(INPUT_POST, 'flightawarepassword', FILTER_SANITIZE_STRING); |
|
1271 | + $settings = array_merge($settings, array('globalFlightAwareUsername' => $flightawareusername, 'globalFlightAwarePassword' => $flightawarepassword)); |
|
1272 | 1272 | |
1273 | - $sailawayemail = filter_input(INPUT_POST,'sailawayemail',FILTER_SANITIZE_STRING); |
|
1274 | - $sailawaypass = filter_input(INPUT_POST,'sailawaypassword',FILTER_SANITIZE_STRING); |
|
1275 | - $settings = array_merge($settings,array('globalSailaway' => array('email' => $sailawayemail,'password' => $sailawaypass))); |
|
1273 | + $sailawayemail = filter_input(INPUT_POST, 'sailawayemail', FILTER_SANITIZE_STRING); |
|
1274 | + $sailawaypass = filter_input(INPUT_POST, 'sailawaypassword', FILTER_SANITIZE_STRING); |
|
1275 | + $settings = array_merge($settings, array('globalSailaway' => array('email' => $sailawayemail, 'password' => $sailawaypass))); |
|
1276 | 1276 | |
1277 | 1277 | $source_name = $_POST['source_name']; |
1278 | 1278 | $source_latitude = $_POST['source_latitude']; |
@@ -1286,8 +1286,8 @@ discard block |
||
1286 | 1286 | |
1287 | 1287 | $sources = array(); |
1288 | 1288 | foreach ($source_name as $keys => $name) { |
1289 | - 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]); |
|
1290 | - 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]); |
|
1289 | + 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]); |
|
1290 | + 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]); |
|
1291 | 1291 | } |
1292 | 1292 | if (count($sources) > 0) $_SESSION['sources'] = $sources; |
1293 | 1293 | |
@@ -1296,16 +1296,16 @@ discard block |
||
1296 | 1296 | $newstype = $_POST['newstype']; |
1297 | 1297 | |
1298 | 1298 | $newsfeeds = array(); |
1299 | - foreach($newsurl as $newskey => $url) { |
|
1299 | + foreach ($newsurl as $newskey => $url) { |
|
1300 | 1300 | if ($url != '') { |
1301 | 1301 | $type = $newstype[$newskey]; |
1302 | 1302 | $lng = $newslng[$newskey]; |
1303 | 1303 | if (isset($newsfeeds[$type][$lng])) { |
1304 | - $newsfeeds[$type][$lng] = array_merge($newsfeeds[$type][$lng],array($url)); |
|
1304 | + $newsfeeds[$type][$lng] = array_merge($newsfeeds[$type][$lng], array($url)); |
|
1305 | 1305 | } else $newsfeeds[$type][$lng] = array($url); |
1306 | 1306 | } |
1307 | 1307 | } |
1308 | - $settings = array_merge($settings,array('globalNewsFeeds' => $newsfeeds)); |
|
1308 | + $settings = array_merge($settings, array('globalNewsFeeds' => $newsfeeds)); |
|
1309 | 1309 | |
1310 | 1310 | //$sbshost = filter_input(INPUT_POST,'sbshost',FILTER_SANITIZE_STRING); |
1311 | 1311 | //$sbsport = filter_input(INPUT_POST,'sbsport',FILTER_SANITIZE_NUMBER_INT); |
@@ -1316,28 +1316,28 @@ discard block |
||
1316 | 1316 | $sbsurl = $_POST['sbsurl']; |
1317 | 1317 | */ |
1318 | 1318 | |
1319 | - $globalvatsim = filter_input(INPUT_POST,'globalvatsim',FILTER_SANITIZE_STRING); |
|
1320 | - $globalva = filter_input(INPUT_POST,'globalva',FILTER_SANITIZE_STRING); |
|
1321 | - $globalvm = filter_input(INPUT_POST,'globalvm',FILTER_SANITIZE_STRING); |
|
1322 | - $globalivao = filter_input(INPUT_POST,'globalivao',FILTER_SANITIZE_STRING); |
|
1323 | - $globalphpvms = filter_input(INPUT_POST,'globalphpvms',FILTER_SANITIZE_STRING); |
|
1324 | - $globalvam = filter_input(INPUT_POST,'globalvam',FILTER_SANITIZE_STRING); |
|
1325 | - $globalsbs = filter_input(INPUT_POST,'globalsbs',FILTER_SANITIZE_STRING); |
|
1326 | - $globalaprs = filter_input(INPUT_POST,'globalaprs',FILTER_SANITIZE_STRING); |
|
1327 | - $datasource = filter_input(INPUT_POST,'datasource',FILTER_SANITIZE_STRING); |
|
1319 | + $globalvatsim = filter_input(INPUT_POST, 'globalvatsim', FILTER_SANITIZE_STRING); |
|
1320 | + $globalva = filter_input(INPUT_POST, 'globalva', FILTER_SANITIZE_STRING); |
|
1321 | + $globalvm = filter_input(INPUT_POST, 'globalvm', FILTER_SANITIZE_STRING); |
|
1322 | + $globalivao = filter_input(INPUT_POST, 'globalivao', FILTER_SANITIZE_STRING); |
|
1323 | + $globalphpvms = filter_input(INPUT_POST, 'globalphpvms', FILTER_SANITIZE_STRING); |
|
1324 | + $globalvam = filter_input(INPUT_POST, 'globalvam', FILTER_SANITIZE_STRING); |
|
1325 | + $globalsbs = filter_input(INPUT_POST, 'globalsbs', FILTER_SANITIZE_STRING); |
|
1326 | + $globalaprs = filter_input(INPUT_POST, 'globalaprs', FILTER_SANITIZE_STRING); |
|
1327 | + $datasource = filter_input(INPUT_POST, 'datasource', FILTER_SANITIZE_STRING); |
|
1328 | 1328 | |
1329 | - $globalaircraft = filter_input(INPUT_POST,'globalaircraft',FILTER_SANITIZE_STRING); |
|
1330 | - if ($globalaircraft == 'aircraft') $settings = array_merge($settings,array('globalAircraft' => 'TRUE')); |
|
1331 | - else $settings = array_merge($settings,array('globalAircraft' => 'FALSE')); |
|
1332 | - $globaltracker = filter_input(INPUT_POST,'globaltracker',FILTER_SANITIZE_STRING); |
|
1333 | - if ($globaltracker == 'tracker') $settings = array_merge($settings,array('globalTracker' => 'TRUE')); |
|
1334 | - else $settings = array_merge($settings,array('globalTracker' => 'FALSE')); |
|
1335 | - $globalmarine = filter_input(INPUT_POST,'globalmarine',FILTER_SANITIZE_STRING); |
|
1336 | - if ($globalmarine == 'marine') $settings = array_merge($settings,array('globalMarine' => 'TRUE')); |
|
1337 | - else $settings = array_merge($settings,array('globalMarine' => 'FALSE')); |
|
1338 | - $globalsatellite = filter_input(INPUT_POST,'globalsatellite',FILTER_SANITIZE_STRING); |
|
1339 | - if ($globalsatellite == 'satellite') $settings = array_merge($settings,array('globalSatellite' => 'TRUE')); |
|
1340 | - else $settings = array_merge($settings,array('globalSatellite' => 'FALSE')); |
|
1329 | + $globalaircraft = filter_input(INPUT_POST, 'globalaircraft', FILTER_SANITIZE_STRING); |
|
1330 | + if ($globalaircraft == 'aircraft') $settings = array_merge($settings, array('globalAircraft' => 'TRUE')); |
|
1331 | + else $settings = array_merge($settings, array('globalAircraft' => 'FALSE')); |
|
1332 | + $globaltracker = filter_input(INPUT_POST, 'globaltracker', FILTER_SANITIZE_STRING); |
|
1333 | + if ($globaltracker == 'tracker') $settings = array_merge($settings, array('globalTracker' => 'TRUE')); |
|
1334 | + else $settings = array_merge($settings, array('globalTracker' => 'FALSE')); |
|
1335 | + $globalmarine = filter_input(INPUT_POST, 'globalmarine', FILTER_SANITIZE_STRING); |
|
1336 | + if ($globalmarine == 'marine') $settings = array_merge($settings, array('globalMarine' => 'TRUE')); |
|
1337 | + else $settings = array_merge($settings, array('globalMarine' => 'FALSE')); |
|
1338 | + $globalsatellite = filter_input(INPUT_POST, 'globalsatellite', FILTER_SANITIZE_STRING); |
|
1339 | + if ($globalsatellite == 'satellite') $settings = array_merge($settings, array('globalSatellite' => 'TRUE')); |
|
1340 | + else $settings = array_merge($settings, array('globalSatellite' => 'FALSE')); |
|
1341 | 1341 | |
1342 | 1342 | /* |
1343 | 1343 | $globalSBS1Hosts = array(); |
@@ -1353,7 +1353,7 @@ discard block |
||
1353 | 1353 | } |
1354 | 1354 | $settings = array_merge($settings,array('globalSBS1Hosts' => $globalSBS1Hosts)); |
1355 | 1355 | */ |
1356 | - $settings_comment = array_merge($settings_comment,array('globalSBS1Hosts')); |
|
1356 | + $settings_comment = array_merge($settings_comment, array('globalSBS1Hosts')); |
|
1357 | 1357 | $host = $_POST['host']; |
1358 | 1358 | $port = $_POST['port']; |
1359 | 1359 | $name = $_POST['name']; |
@@ -1370,115 +1370,115 @@ discard block |
||
1370 | 1370 | else $cov = 'FALSE'; |
1371 | 1371 | if (isset($noarchive[$key]) && $noarchive[$key] == 1) $arch = 'TRUE'; |
1372 | 1372 | else $arch = 'FALSE'; |
1373 | - if (strpos($format[$key],'_callback')) { |
|
1374 | - $gSources[] = array('host' => $h, 'pass' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'TRUE'); |
|
1373 | + if (strpos($format[$key], '_callback')) { |
|
1374 | + $gSources[] = array('host' => $h, 'pass' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov, 'noarchive' => $arch, 'timezone' => $timezones[$key], 'callback' => 'TRUE'); |
|
1375 | 1375 | } elseif ($format[$key] != 'auto' || ($h != '' || $name[$key] != '')) { |
1376 | - $gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'FALSE'); |
|
1376 | + $gSources[] = array('host' => $h, 'port' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov, 'noarchive' => $arch, 'timezone' => $timezones[$key], 'callback' => 'FALSE'); |
|
1377 | 1377 | } |
1378 | 1378 | if ($format[$key] == 'airwhere') $forcepilots = true; |
1379 | 1379 | } |
1380 | - $settings = array_merge($settings,array('globalSources' => $gSources)); |
|
1380 | + $settings = array_merge($settings, array('globalSources' => $gSources)); |
|
1381 | 1381 | |
1382 | 1382 | /* |
1383 | 1383 | $sbstimeout = filter_input(INPUT_POST,'sbstimeout',FILTER_SANITIZE_NUMBER_INT); |
1384 | 1384 | $settings = array_merge($settings,array('globalSourcesTimeOut' => $sbstimeout)); |
1385 | 1385 | */ |
1386 | - $acarshost = filter_input(INPUT_POST,'acarshost',FILTER_SANITIZE_STRING); |
|
1387 | - $acarsport = filter_input(INPUT_POST,'acarsport',FILTER_SANITIZE_NUMBER_INT); |
|
1388 | - $settings = array_merge($settings,array('globalACARSHost' => $acarshost,'globalACARSPort' => $acarsport)); |
|
1386 | + $acarshost = filter_input(INPUT_POST, 'acarshost', FILTER_SANITIZE_STRING); |
|
1387 | + $acarsport = filter_input(INPUT_POST, 'acarsport', FILTER_SANITIZE_NUMBER_INT); |
|
1388 | + $settings = array_merge($settings, array('globalACARSHost' => $acarshost, 'globalACARSPort' => $acarsport)); |
|
1389 | 1389 | |
1390 | - $bitly = filter_input(INPUT_POST,'bitly',FILTER_SANITIZE_STRING); |
|
1391 | - $settings = array_merge($settings,array('globalBitlyAccessToken' => $bitly)); |
|
1390 | + $bitly = filter_input(INPUT_POST, 'bitly', FILTER_SANITIZE_STRING); |
|
1391 | + $settings = array_merge($settings, array('globalBitlyAccessToken' => $bitly)); |
|
1392 | 1392 | |
1393 | - $customcss = filter_input(INPUT_POST,'customcss',FILTER_SANITIZE_STRING); |
|
1394 | - $settings = array_merge($settings,array('globalCustomCSS' => $customcss)); |
|
1393 | + $customcss = filter_input(INPUT_POST, 'customcss', FILTER_SANITIZE_STRING); |
|
1394 | + $settings = array_merge($settings, array('globalCustomCSS' => $customcss)); |
|
1395 | 1395 | |
1396 | - $map3dtile = filter_input(INPUT_POST,'map3dtileset',FILTER_SANITIZE_STRING); |
|
1397 | - $settings = array_merge($settings,array('globalMap3DTiles' => $map3dtile)); |
|
1396 | + $map3dtile = filter_input(INPUT_POST, 'map3dtileset', FILTER_SANITIZE_STRING); |
|
1397 | + $settings = array_merge($settings, array('globalMap3DTiles' => $map3dtile)); |
|
1398 | 1398 | |
1399 | - $notamsource = filter_input(INPUT_POST,'notamsource',FILTER_SANITIZE_STRING); |
|
1400 | - $settings = array_merge($settings,array('globalNOTAMSource' => $notamsource)); |
|
1401 | - $metarsource = filter_input(INPUT_POST,'metarsource',FILTER_SANITIZE_STRING); |
|
1402 | - $settings = array_merge($settings,array('globalMETARurl' => $metarsource)); |
|
1399 | + $notamsource = filter_input(INPUT_POST, 'notamsource', FILTER_SANITIZE_STRING); |
|
1400 | + $settings = array_merge($settings, array('globalNOTAMSource' => $notamsource)); |
|
1401 | + $metarsource = filter_input(INPUT_POST, 'metarsource', FILTER_SANITIZE_STRING); |
|
1402 | + $settings = array_merge($settings, array('globalMETARurl' => $metarsource)); |
|
1403 | 1403 | |
1404 | - $zoilatitude = filter_input(INPUT_POST,'zoilatitude',FILTER_SANITIZE_STRING); |
|
1405 | - $zoilongitude = filter_input(INPUT_POST,'zoilongitude',FILTER_SANITIZE_STRING); |
|
1406 | - $zoidistance = filter_input(INPUT_POST,'zoidistance',FILTER_SANITIZE_NUMBER_INT); |
|
1404 | + $zoilatitude = filter_input(INPUT_POST, 'zoilatitude', FILTER_SANITIZE_STRING); |
|
1405 | + $zoilongitude = filter_input(INPUT_POST, 'zoilongitude', FILTER_SANITIZE_STRING); |
|
1406 | + $zoidistance = filter_input(INPUT_POST, 'zoidistance', FILTER_SANITIZE_NUMBER_INT); |
|
1407 | 1407 | if ($zoilatitude != '' && $zoilongitude != '' && $zoidistance != '') { |
1408 | - $settings = array_merge($settings,array('globalDistanceIgnore' => array('latitude' => $zoilatitude,'longitude' => $zoilongitude,'distance' => $zoidistance))); |
|
1409 | - } else $settings = array_merge($settings,array('globalDistanceIgnore' => array())); |
|
1408 | + $settings = array_merge($settings, array('globalDistanceIgnore' => array('latitude' => $zoilatitude, 'longitude' => $zoilongitude, 'distance' => $zoidistance))); |
|
1409 | + } else $settings = array_merge($settings, array('globalDistanceIgnore' => array())); |
|
1410 | 1410 | |
1411 | - $refresh = filter_input(INPUT_POST,'refresh',FILTER_SANITIZE_NUMBER_INT); |
|
1412 | - $settings = array_merge($settings,array('globalLiveInterval' => $refresh)); |
|
1413 | - $maprefresh = filter_input(INPUT_POST,'maprefresh',FILTER_SANITIZE_NUMBER_INT); |
|
1414 | - $settings = array_merge($settings,array('globalMapRefresh' => $maprefresh)); |
|
1415 | - $mapidle = filter_input(INPUT_POST,'mapidle',FILTER_SANITIZE_NUMBER_INT); |
|
1416 | - $settings = array_merge($settings,array('globalMapIdleTimeout' => $mapidle)); |
|
1417 | - $minfetch = filter_input(INPUT_POST,'minfetch',FILTER_SANITIZE_NUMBER_INT); |
|
1418 | - $settings = array_merge($settings,array('globalMinFetch' => $minfetch)); |
|
1419 | - $closestmindist = filter_input(INPUT_POST,'closestmindist',FILTER_SANITIZE_NUMBER_INT); |
|
1420 | - $settings = array_merge($settings,array('globalClosestMinDist' => $closestmindist)); |
|
1411 | + $refresh = filter_input(INPUT_POST, 'refresh', FILTER_SANITIZE_NUMBER_INT); |
|
1412 | + $settings = array_merge($settings, array('globalLiveInterval' => $refresh)); |
|
1413 | + $maprefresh = filter_input(INPUT_POST, 'maprefresh', FILTER_SANITIZE_NUMBER_INT); |
|
1414 | + $settings = array_merge($settings, array('globalMapRefresh' => $maprefresh)); |
|
1415 | + $mapidle = filter_input(INPUT_POST, 'mapidle', FILTER_SANITIZE_NUMBER_INT); |
|
1416 | + $settings = array_merge($settings, array('globalMapIdleTimeout' => $mapidle)); |
|
1417 | + $minfetch = filter_input(INPUT_POST, 'minfetch', FILTER_SANITIZE_NUMBER_INT); |
|
1418 | + $settings = array_merge($settings, array('globalMinFetch' => $minfetch)); |
|
1419 | + $closestmindist = filter_input(INPUT_POST, 'closestmindist', FILTER_SANITIZE_NUMBER_INT); |
|
1420 | + $settings = array_merge($settings, array('globalClosestMinDist' => $closestmindist)); |
|
1421 | 1421 | |
1422 | - $aircraftsize = filter_input(INPUT_POST,'aircraftsize',FILTER_SANITIZE_NUMBER_INT); |
|
1423 | - $settings = array_merge($settings,array('globalAircraftSize' => $aircraftsize)); |
|
1422 | + $aircraftsize = filter_input(INPUT_POST, 'aircraftsize', FILTER_SANITIZE_NUMBER_INT); |
|
1423 | + $settings = array_merge($settings, array('globalAircraftSize' => $aircraftsize)); |
|
1424 | 1424 | |
1425 | - $archivemonths = filter_input(INPUT_POST,'archivemonths',FILTER_SANITIZE_NUMBER_INT); |
|
1426 | - $settings = array_merge($settings,array('globalArchiveMonths' => $archivemonths)); |
|
1425 | + $archivemonths = filter_input(INPUT_POST, 'archivemonths', FILTER_SANITIZE_NUMBER_INT); |
|
1426 | + $settings = array_merge($settings, array('globalArchiveMonths' => $archivemonths)); |
|
1427 | 1427 | |
1428 | - $archiveyear = filter_input(INPUT_POST,'archiveyear',FILTER_SANITIZE_STRING); |
|
1428 | + $archiveyear = filter_input(INPUT_POST, 'archiveyear', FILTER_SANITIZE_STRING); |
|
1429 | 1429 | if ($archiveyear == "archiveyear") { |
1430 | - $settings = array_merge($settings,array('globalArchiveYear' => 'TRUE')); |
|
1430 | + $settings = array_merge($settings, array('globalArchiveYear' => 'TRUE')); |
|
1431 | 1431 | } else { |
1432 | - $settings = array_merge($settings,array('globalArchiveYear' => 'FALSE')); |
|
1432 | + $settings = array_merge($settings, array('globalArchiveYear' => 'FALSE')); |
|
1433 | 1433 | } |
1434 | - $archivekeepmonths = filter_input(INPUT_POST,'archivekeepmonths',FILTER_SANITIZE_NUMBER_INT); |
|
1435 | - $settings = array_merge($settings,array('globalArchiveKeepMonths' => $archivekeepmonths)); |
|
1436 | - $archivekeeptrackmonths = filter_input(INPUT_POST,'archivekeeptrackmonths',FILTER_SANITIZE_NUMBER_INT); |
|
1437 | - $settings = array_merge($settings,array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths)); |
|
1434 | + $archivekeepmonths = filter_input(INPUT_POST, 'archivekeepmonths', FILTER_SANITIZE_NUMBER_INT); |
|
1435 | + $settings = array_merge($settings, array('globalArchiveKeepMonths' => $archivekeepmonths)); |
|
1436 | + $archivekeeptrackmonths = filter_input(INPUT_POST, 'archivekeeptrackmonths', FILTER_SANITIZE_NUMBER_INT); |
|
1437 | + $settings = array_merge($settings, array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths)); |
|
1438 | 1438 | |
1439 | - $britishairways = filter_input(INPUT_POST,'britishairways',FILTER_SANITIZE_STRING); |
|
1440 | - $settings = array_merge($settings,array('globalBritishAirwaysKey' => $britishairways)); |
|
1441 | - $transavia = filter_input(INPUT_POST,'transavia',FILTER_SANITIZE_STRING); |
|
1442 | - $settings = array_merge($settings,array('globalTransaviaKey' => $transavia)); |
|
1439 | + $britishairways = filter_input(INPUT_POST, 'britishairways', FILTER_SANITIZE_STRING); |
|
1440 | + $settings = array_merge($settings, array('globalBritishAirwaysKey' => $britishairways)); |
|
1441 | + $transavia = filter_input(INPUT_POST, 'transavia', FILTER_SANITIZE_STRING); |
|
1442 | + $settings = array_merge($settings, array('globalTransaviaKey' => $transavia)); |
|
1443 | 1443 | |
1444 | - $lufthansakey = filter_input(INPUT_POST,'lufthansakey',FILTER_SANITIZE_STRING); |
|
1445 | - $lufthansasecret = filter_input(INPUT_POST,'lufthansasecret',FILTER_SANITIZE_STRING); |
|
1446 | - $settings = array_merge($settings,array('globalLufthansaKey' => array('key' => $lufthansakey,'secret' => $lufthansasecret))); |
|
1444 | + $lufthansakey = filter_input(INPUT_POST, 'lufthansakey', FILTER_SANITIZE_STRING); |
|
1445 | + $lufthansasecret = filter_input(INPUT_POST, 'lufthansasecret', FILTER_SANITIZE_STRING); |
|
1446 | + $settings = array_merge($settings, array('globalLufthansaKey' => array('key' => $lufthansakey, 'secret' => $lufthansasecret))); |
|
1447 | 1447 | |
1448 | 1448 | // Create in settings.php keys not yet configurable if not already here |
1449 | 1449 | //if (!isset($globalImageBingKey)) $settings = array_merge($settings,array('globalImageBingKey' => '')); |
1450 | - if (!isset($globalDebug)) $settings = array_merge($settings,array('globalDebug' => 'TRUE')); |
|
1450 | + if (!isset($globalDebug)) $settings = array_merge($settings, array('globalDebug' => 'TRUE')); |
|
1451 | 1451 | |
1452 | - $resetyearstats = filter_input(INPUT_POST,'resetyearstats',FILTER_SANITIZE_STRING); |
|
1452 | + $resetyearstats = filter_input(INPUT_POST, 'resetyearstats', FILTER_SANITIZE_STRING); |
|
1453 | 1453 | if ($resetyearstats == 'resetyearstats') { |
1454 | - $settings = array_merge($settings,array('globalDeleteLastYearStats' => 'TRUE')); |
|
1454 | + $settings = array_merge($settings, array('globalDeleteLastYearStats' => 'TRUE')); |
|
1455 | 1455 | } else { |
1456 | - $settings = array_merge($settings,array('globalDeleteLastYearStats' => 'FALSE')); |
|
1456 | + $settings = array_merge($settings, array('globalDeleteLastYearStats' => 'FALSE')); |
|
1457 | 1457 | } |
1458 | 1458 | |
1459 | - $archive = filter_input(INPUT_POST,'archive',FILTER_SANITIZE_STRING); |
|
1459 | + $archive = filter_input(INPUT_POST, 'archive', FILTER_SANITIZE_STRING); |
|
1460 | 1460 | if ($archive == 'archive') { |
1461 | - $settings = array_merge($settings,array('globalArchive' => 'TRUE')); |
|
1461 | + $settings = array_merge($settings, array('globalArchive' => 'TRUE')); |
|
1462 | 1462 | } else { |
1463 | - $settings = array_merge($settings,array('globalArchive' => 'FALSE')); |
|
1463 | + $settings = array_merge($settings, array('globalArchive' => 'FALSE')); |
|
1464 | 1464 | } |
1465 | - $archiveresults = filter_input(INPUT_POST,'archiveresults',FILTER_SANITIZE_STRING); |
|
1465 | + $archiveresults = filter_input(INPUT_POST, 'archiveresults', FILTER_SANITIZE_STRING); |
|
1466 | 1466 | if ($archiveresults == 'archiveresults') { |
1467 | - $settings = array_merge($settings,array('globalArchiveResults' => 'TRUE')); |
|
1467 | + $settings = array_merge($settings, array('globalArchiveResults' => 'TRUE')); |
|
1468 | 1468 | } else { |
1469 | - $settings = array_merge($settings,array('globalArchiveResults' => 'FALSE')); |
|
1469 | + $settings = array_merge($settings, array('globalArchiveResults' => 'FALSE')); |
|
1470 | 1470 | } |
1471 | - $daemon = filter_input(INPUT_POST,'daemon',FILTER_SANITIZE_STRING); |
|
1471 | + $daemon = filter_input(INPUT_POST, 'daemon', FILTER_SANITIZE_STRING); |
|
1472 | 1472 | if ($daemon == 'daemon') { |
1473 | - $settings = array_merge($settings,array('globalDaemon' => 'TRUE')); |
|
1473 | + $settings = array_merge($settings, array('globalDaemon' => 'TRUE')); |
|
1474 | 1474 | } else { |
1475 | - $settings = array_merge($settings,array('globalDaemon' => 'FALSE')); |
|
1475 | + $settings = array_merge($settings, array('globalDaemon' => 'FALSE')); |
|
1476 | 1476 | } |
1477 | - $schedules = filter_input(INPUT_POST,'schedules',FILTER_SANITIZE_STRING); |
|
1477 | + $schedules = filter_input(INPUT_POST, 'schedules', FILTER_SANITIZE_STRING); |
|
1478 | 1478 | if ($schedules == 'schedules') { |
1479 | - $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE')); |
|
1479 | + $settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE')); |
|
1480 | 1480 | } else { |
1481 | - $settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE')); |
|
1481 | + $settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE')); |
|
1482 | 1482 | } |
1483 | 1483 | |
1484 | 1484 | /* |
@@ -1489,290 +1489,290 @@ discard block |
||
1489 | 1489 | $settings = array_merge($settings,array('globalFlightAware' => 'FALSE','globalSBS1' => 'TRUE')); |
1490 | 1490 | } |
1491 | 1491 | */ |
1492 | - $settings = array_merge($settings,array('globalFlightAware' => 'FALSE')); |
|
1493 | - if ($globalsbs == 'sbs') $settings = array_merge($settings,array('globalSBS1' => 'TRUE')); |
|
1494 | - else $settings = array_merge($settings,array('globalSBS1' => 'FALSE')); |
|
1495 | - if ($globalaprs == 'aprs') $settings = array_merge($settings,array('globalAPRS' => 'TRUE')); |
|
1496 | - else $settings = array_merge($settings,array('globalAPRS' => 'FALSE')); |
|
1492 | + $settings = array_merge($settings, array('globalFlightAware' => 'FALSE')); |
|
1493 | + if ($globalsbs == 'sbs') $settings = array_merge($settings, array('globalSBS1' => 'TRUE')); |
|
1494 | + else $settings = array_merge($settings, array('globalSBS1' => 'FALSE')); |
|
1495 | + if ($globalaprs == 'aprs') $settings = array_merge($settings, array('globalAPRS' => 'TRUE')); |
|
1496 | + else $settings = array_merge($settings, array('globalAPRS' => 'FALSE')); |
|
1497 | 1497 | $va = false; |
1498 | 1498 | if ($globalivao == 'ivao') { |
1499 | - $settings = array_merge($settings,array('globalIVAO' => 'TRUE')); |
|
1499 | + $settings = array_merge($settings, array('globalIVAO' => 'TRUE')); |
|
1500 | 1500 | $va = true; |
1501 | - } else $settings = array_merge($settings,array('globalIVAO' => 'FALSE')); |
|
1501 | + } else $settings = array_merge($settings, array('globalIVAO' => 'FALSE')); |
|
1502 | 1502 | if ($globalvatsim == 'vatsim') { |
1503 | - $settings = array_merge($settings,array('globalVATSIM' => 'TRUE')); |
|
1503 | + $settings = array_merge($settings, array('globalVATSIM' => 'TRUE')); |
|
1504 | 1504 | $va = true; |
1505 | - } else $settings = array_merge($settings,array('globalVATSIM' => 'FALSE')); |
|
1505 | + } else $settings = array_merge($settings, array('globalVATSIM' => 'FALSE')); |
|
1506 | 1506 | if ($globalphpvms == 'phpvms') { |
1507 | - $settings = array_merge($settings,array('globalphpVMS' => 'TRUE')); |
|
1507 | + $settings = array_merge($settings, array('globalphpVMS' => 'TRUE')); |
|
1508 | 1508 | $va = true; |
1509 | - } else $settings = array_merge($settings,array('globalphpVMS' => 'FALSE')); |
|
1509 | + } else $settings = array_merge($settings, array('globalphpVMS' => 'FALSE')); |
|
1510 | 1510 | if ($globalvam == 'vam') { |
1511 | - $settings = array_merge($settings,array('globalVAM' => 'TRUE')); |
|
1511 | + $settings = array_merge($settings, array('globalVAM' => 'TRUE')); |
|
1512 | 1512 | $va = true; |
1513 | - } else $settings = array_merge($settings,array('globalVAM' => 'FALSE')); |
|
1513 | + } else $settings = array_merge($settings, array('globalVAM' => 'FALSE')); |
|
1514 | 1514 | if ($va) { |
1515 | - $settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE','globalTranslationFetch' => 'FALSE')); |
|
1516 | - } else $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE')); |
|
1515 | + $settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE', 'globalTranslationFetch' => 'FALSE')); |
|
1516 | + } else $settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE', 'globalTranslationFetch' => 'TRUE')); |
|
1517 | 1517 | if ($globalva == 'va' || $va) { |
1518 | - $settings = array_merge($settings,array('globalVA' => 'TRUE')); |
|
1519 | - $settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE')); |
|
1518 | + $settings = array_merge($settings, array('globalVA' => 'TRUE')); |
|
1519 | + $settings = array_merge($settings, array('globalUsePilot' => 'TRUE', 'globalUseOwner' => 'FALSE')); |
|
1520 | 1520 | } else { |
1521 | - $settings = array_merge($settings,array('globalVA' => 'FALSE')); |
|
1522 | - if ($forcepilots) $settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE')); |
|
1523 | - else $settings = array_merge($settings,array('globalUsePilot' => 'FALSE','globalUseOwner' => 'TRUE')); |
|
1521 | + $settings = array_merge($settings, array('globalVA' => 'FALSE')); |
|
1522 | + if ($forcepilots) $settings = array_merge($settings, array('globalUsePilot' => 'TRUE', 'globalUseOwner' => 'FALSE')); |
|
1523 | + else $settings = array_merge($settings, array('globalUsePilot' => 'FALSE', 'globalUseOwner' => 'TRUE')); |
|
1524 | 1524 | } |
1525 | 1525 | if ($globalvm == 'vm') { |
1526 | - $settings = array_merge($settings,array('globalVM' => 'TRUE')); |
|
1526 | + $settings = array_merge($settings, array('globalVM' => 'TRUE')); |
|
1527 | 1527 | } else { |
1528 | - $settings = array_merge($settings,array('globalVM' => 'FALSE')); |
|
1528 | + $settings = array_merge($settings, array('globalVM' => 'FALSE')); |
|
1529 | 1529 | } |
1530 | 1530 | |
1531 | - $mapoffline = filter_input(INPUT_POST,'mapoffline',FILTER_SANITIZE_STRING); |
|
1531 | + $mapoffline = filter_input(INPUT_POST, 'mapoffline', FILTER_SANITIZE_STRING); |
|
1532 | 1532 | if ($mapoffline == 'mapoffline') { |
1533 | - $settings = array_merge($settings,array('globalMapOffline' => 'TRUE')); |
|
1533 | + $settings = array_merge($settings, array('globalMapOffline' => 'TRUE')); |
|
1534 | 1534 | } else { |
1535 | - $settings = array_merge($settings,array('globalMapOffline' => 'FALSE')); |
|
1535 | + $settings = array_merge($settings, array('globalMapOffline' => 'FALSE')); |
|
1536 | 1536 | } |
1537 | - $globaloffline = filter_input(INPUT_POST,'globaloffline',FILTER_SANITIZE_STRING); |
|
1537 | + $globaloffline = filter_input(INPUT_POST, 'globaloffline', FILTER_SANITIZE_STRING); |
|
1538 | 1538 | if ($globaloffline == 'globaloffline') { |
1539 | - $settings = array_merge($settings,array('globalOffline' => 'TRUE')); |
|
1539 | + $settings = array_merge($settings, array('globalOffline' => 'TRUE')); |
|
1540 | 1540 | } else { |
1541 | - $settings = array_merge($settings,array('globalOffline' => 'FALSE')); |
|
1541 | + $settings = array_merge($settings, array('globalOffline' => 'FALSE')); |
|
1542 | 1542 | } |
1543 | 1543 | |
1544 | - $notam = filter_input(INPUT_POST,'notam',FILTER_SANITIZE_STRING); |
|
1544 | + $notam = filter_input(INPUT_POST, 'notam', FILTER_SANITIZE_STRING); |
|
1545 | 1545 | if ($notam == 'notam') { |
1546 | - $settings = array_merge($settings,array('globalNOTAM' => 'TRUE')); |
|
1546 | + $settings = array_merge($settings, array('globalNOTAM' => 'TRUE')); |
|
1547 | 1547 | } else { |
1548 | - $settings = array_merge($settings,array('globalNOTAM' => 'FALSE')); |
|
1548 | + $settings = array_merge($settings, array('globalNOTAM' => 'FALSE')); |
|
1549 | 1549 | } |
1550 | - $owner = filter_input(INPUT_POST,'owner',FILTER_SANITIZE_STRING); |
|
1550 | + $owner = filter_input(INPUT_POST, 'owner', FILTER_SANITIZE_STRING); |
|
1551 | 1551 | if ($owner == 'owner') { |
1552 | - $settings = array_merge($settings,array('globalOwner' => 'TRUE')); |
|
1552 | + $settings = array_merge($settings, array('globalOwner' => 'TRUE')); |
|
1553 | 1553 | } else { |
1554 | - $settings = array_merge($settings,array('globalOwner' => 'FALSE')); |
|
1554 | + $settings = array_merge($settings, array('globalOwner' => 'FALSE')); |
|
1555 | 1555 | } |
1556 | - $map3d = filter_input(INPUT_POST,'map3d',FILTER_SANITIZE_STRING); |
|
1556 | + $map3d = filter_input(INPUT_POST, 'map3d', FILTER_SANITIZE_STRING); |
|
1557 | 1557 | if ($map3d == 'map3d') { |
1558 | - $settings = array_merge($settings,array('globalMap3D' => 'TRUE')); |
|
1558 | + $settings = array_merge($settings, array('globalMap3D' => 'TRUE')); |
|
1559 | 1559 | } else { |
1560 | - $settings = array_merge($settings,array('globalMap3D' => 'FALSE')); |
|
1560 | + $settings = array_merge($settings, array('globalMap3D' => 'FALSE')); |
|
1561 | 1561 | } |
1562 | - $crash = filter_input(INPUT_POST,'crash',FILTER_SANITIZE_STRING); |
|
1562 | + $crash = filter_input(INPUT_POST, 'crash', FILTER_SANITIZE_STRING); |
|
1563 | 1563 | if ($crash == 'crash') { |
1564 | - $settings = array_merge($settings,array('globalAccidents' => 'TRUE')); |
|
1564 | + $settings = array_merge($settings, array('globalAccidents' => 'TRUE')); |
|
1565 | 1565 | } else { |
1566 | - $settings = array_merge($settings,array('globalAccidents' => 'FALSE')); |
|
1566 | + $settings = array_merge($settings, array('globalAccidents' => 'FALSE')); |
|
1567 | 1567 | } |
1568 | - $fires = filter_input(INPUT_POST,'fires',FILTER_SANITIZE_STRING); |
|
1568 | + $fires = filter_input(INPUT_POST, 'fires', FILTER_SANITIZE_STRING); |
|
1569 | 1569 | if ($fires == 'fires') { |
1570 | - $settings = array_merge($settings,array('globalMapFires' => 'TRUE')); |
|
1570 | + $settings = array_merge($settings, array('globalMapFires' => 'TRUE')); |
|
1571 | 1571 | } else { |
1572 | - $settings = array_merge($settings,array('globalMapFires' => 'FALSE')); |
|
1572 | + $settings = array_merge($settings, array('globalMapFires' => 'FALSE')); |
|
1573 | 1573 | } |
1574 | - $firessupport = filter_input(INPUT_POST,'firessupport',FILTER_SANITIZE_STRING); |
|
1574 | + $firessupport = filter_input(INPUT_POST, 'firessupport', FILTER_SANITIZE_STRING); |
|
1575 | 1575 | if ($firessupport == 'firessupport') { |
1576 | - $settings = array_merge($settings,array('globalFires' => 'TRUE')); |
|
1576 | + $settings = array_merge($settings, array('globalFires' => 'TRUE')); |
|
1577 | 1577 | } else { |
1578 | - $settings = array_merge($settings,array('globalFires' => 'FALSE')); |
|
1578 | + $settings = array_merge($settings, array('globalFires' => 'FALSE')); |
|
1579 | 1579 | } |
1580 | - $mapsatellites = filter_input(INPUT_POST,'mapsatellites',FILTER_SANITIZE_STRING); |
|
1580 | + $mapsatellites = filter_input(INPUT_POST, 'mapsatellites', FILTER_SANITIZE_STRING); |
|
1581 | 1581 | if ($mapsatellites == 'mapsatellites') { |
1582 | - $settings = array_merge($settings,array('globalMapSatellites' => 'TRUE')); |
|
1582 | + $settings = array_merge($settings, array('globalMapSatellites' => 'TRUE')); |
|
1583 | 1583 | } else { |
1584 | - $settings = array_merge($settings,array('globalMapSatellites' => 'FALSE')); |
|
1584 | + $settings = array_merge($settings, array('globalMapSatellites' => 'FALSE')); |
|
1585 | 1585 | } |
1586 | - $map3ddefault = filter_input(INPUT_POST,'map3ddefault',FILTER_SANITIZE_STRING); |
|
1586 | + $map3ddefault = filter_input(INPUT_POST, 'map3ddefault', FILTER_SANITIZE_STRING); |
|
1587 | 1587 | if ($map3ddefault == 'map3ddefault') { |
1588 | - $settings = array_merge($settings,array('globalMap3Ddefault' => 'TRUE')); |
|
1588 | + $settings = array_merge($settings, array('globalMap3Ddefault' => 'TRUE')); |
|
1589 | 1589 | } else { |
1590 | - $settings = array_merge($settings,array('globalMap3Ddefault' => 'FALSE')); |
|
1590 | + $settings = array_merge($settings, array('globalMap3Ddefault' => 'FALSE')); |
|
1591 | 1591 | } |
1592 | - $one3dmodel = filter_input(INPUT_POST,'one3dmodel',FILTER_SANITIZE_STRING); |
|
1592 | + $one3dmodel = filter_input(INPUT_POST, 'one3dmodel', FILTER_SANITIZE_STRING); |
|
1593 | 1593 | if ($one3dmodel == 'one3dmodel') { |
1594 | - $settings = array_merge($settings,array('globalMap3DOneModel' => 'TRUE')); |
|
1594 | + $settings = array_merge($settings, array('globalMap3DOneModel' => 'TRUE')); |
|
1595 | 1595 | } else { |
1596 | - $settings = array_merge($settings,array('globalMap3DOneModel' => 'FALSE')); |
|
1596 | + $settings = array_merge($settings, array('globalMap3DOneModel' => 'FALSE')); |
|
1597 | 1597 | } |
1598 | - $map3dliveries = filter_input(INPUT_POST,'map3dliveries',FILTER_SANITIZE_STRING); |
|
1598 | + $map3dliveries = filter_input(INPUT_POST, 'map3dliveries', FILTER_SANITIZE_STRING); |
|
1599 | 1599 | if ($map3dliveries == 'map3dliveries') { |
1600 | - $settings = array_merge($settings,array('globalMap3DLiveries' => 'TRUE')); |
|
1600 | + $settings = array_merge($settings, array('globalMap3DLiveries' => 'TRUE')); |
|
1601 | 1601 | } else { |
1602 | - $settings = array_merge($settings,array('globalMap3DLiveries' => 'FALSE')); |
|
1602 | + $settings = array_merge($settings, array('globalMap3DLiveries' => 'FALSE')); |
|
1603 | 1603 | } |
1604 | - $map3dshadows = filter_input(INPUT_POST,'map3dshadows',FILTER_SANITIZE_STRING); |
|
1604 | + $map3dshadows = filter_input(INPUT_POST, 'map3dshadows', FILTER_SANITIZE_STRING); |
|
1605 | 1605 | if ($map3dshadows == 'map3dshadows') { |
1606 | - $settings = array_merge($settings,array('globalMap3DShadows' => 'TRUE')); |
|
1606 | + $settings = array_merge($settings, array('globalMap3DShadows' => 'TRUE')); |
|
1607 | 1607 | } else { |
1608 | - $settings = array_merge($settings,array('globalMap3DShadows' => 'FALSE')); |
|
1608 | + $settings = array_merge($settings, array('globalMap3DShadows' => 'FALSE')); |
|
1609 | 1609 | } |
1610 | - $translate = filter_input(INPUT_POST,'translate',FILTER_SANITIZE_STRING); |
|
1610 | + $translate = filter_input(INPUT_POST, 'translate', FILTER_SANITIZE_STRING); |
|
1611 | 1611 | if ($translate == 'translate') { |
1612 | - $settings = array_merge($settings,array('globalTranslate' => 'TRUE')); |
|
1612 | + $settings = array_merge($settings, array('globalTranslate' => 'TRUE')); |
|
1613 | 1613 | } else { |
1614 | - $settings = array_merge($settings,array('globalTranslate' => 'FALSE')); |
|
1614 | + $settings = array_merge($settings, array('globalTranslate' => 'FALSE')); |
|
1615 | 1615 | } |
1616 | - $realairlines = filter_input(INPUT_POST,'realairlines',FILTER_SANITIZE_STRING); |
|
1616 | + $realairlines = filter_input(INPUT_POST, 'realairlines', FILTER_SANITIZE_STRING); |
|
1617 | 1617 | if ($realairlines == 'realairlines') { |
1618 | - $settings = array_merge($settings,array('globalUseRealAirlines' => 'TRUE')); |
|
1618 | + $settings = array_merge($settings, array('globalUseRealAirlines' => 'TRUE')); |
|
1619 | 1619 | } else { |
1620 | - $settings = array_merge($settings,array('globalUseRealAirlines' => 'FALSE')); |
|
1620 | + $settings = array_merge($settings, array('globalUseRealAirlines' => 'FALSE')); |
|
1621 | 1621 | } |
1622 | - $estimation = filter_input(INPUT_POST,'estimation',FILTER_SANITIZE_STRING); |
|
1622 | + $estimation = filter_input(INPUT_POST, 'estimation', FILTER_SANITIZE_STRING); |
|
1623 | 1623 | if ($estimation == 'estimation') { |
1624 | - $settings = array_merge($settings,array('globalMapEstimation' => 'TRUE')); |
|
1624 | + $settings = array_merge($settings, array('globalMapEstimation' => 'TRUE')); |
|
1625 | 1625 | } else { |
1626 | - $settings = array_merge($settings,array('globalMapEstimation' => 'FALSE')); |
|
1626 | + $settings = array_merge($settings, array('globalMapEstimation' => 'FALSE')); |
|
1627 | 1627 | } |
1628 | - $metar = filter_input(INPUT_POST,'metar',FILTER_SANITIZE_STRING); |
|
1628 | + $metar = filter_input(INPUT_POST, 'metar', FILTER_SANITIZE_STRING); |
|
1629 | 1629 | if ($metar == 'metar') { |
1630 | - $settings = array_merge($settings,array('globalMETAR' => 'TRUE')); |
|
1630 | + $settings = array_merge($settings, array('globalMETAR' => 'TRUE')); |
|
1631 | 1631 | } else { |
1632 | - $settings = array_merge($settings,array('globalMETAR' => 'FALSE')); |
|
1632 | + $settings = array_merge($settings, array('globalMETAR' => 'FALSE')); |
|
1633 | 1633 | } |
1634 | - $metarcycle = filter_input(INPUT_POST,'metarcycle',FILTER_SANITIZE_STRING); |
|
1634 | + $metarcycle = filter_input(INPUT_POST, 'metarcycle', FILTER_SANITIZE_STRING); |
|
1635 | 1635 | if ($metarcycle == 'metarcycle') { |
1636 | - $settings = array_merge($settings,array('globalMETARcycle' => 'TRUE')); |
|
1636 | + $settings = array_merge($settings, array('globalMETARcycle' => 'TRUE')); |
|
1637 | 1637 | } else { |
1638 | - $settings = array_merge($settings,array('globalMETARcycle' => 'FALSE')); |
|
1638 | + $settings = array_merge($settings, array('globalMETARcycle' => 'FALSE')); |
|
1639 | 1639 | } |
1640 | - $fork = filter_input(INPUT_POST,'fork',FILTER_SANITIZE_STRING); |
|
1640 | + $fork = filter_input(INPUT_POST, 'fork', FILTER_SANITIZE_STRING); |
|
1641 | 1641 | if ($fork == 'fork') { |
1642 | - $settings = array_merge($settings,array('globalFork' => 'TRUE')); |
|
1642 | + $settings = array_merge($settings, array('globalFork' => 'TRUE')); |
|
1643 | 1643 | } else { |
1644 | - $settings = array_merge($settings,array('globalFork' => 'FALSE')); |
|
1644 | + $settings = array_merge($settings, array('globalFork' => 'FALSE')); |
|
1645 | 1645 | } |
1646 | 1646 | |
1647 | - $colormap = filter_input(INPUT_POST,'colormap',FILTER_SANITIZE_STRING); |
|
1647 | + $colormap = filter_input(INPUT_POST, 'colormap', FILTER_SANITIZE_STRING); |
|
1648 | 1648 | if ($colormap == 'colormap') { |
1649 | - $settings = array_merge($settings,array('globalMapAltitudeColor' => 'TRUE')); |
|
1649 | + $settings = array_merge($settings, array('globalMapAltitudeColor' => 'TRUE')); |
|
1650 | 1650 | } else { |
1651 | - $settings = array_merge($settings,array('globalMapAltitudeColor' => 'FALSE')); |
|
1651 | + $settings = array_merge($settings, array('globalMapAltitudeColor' => 'FALSE')); |
|
1652 | 1652 | } |
1653 | 1653 | |
1654 | 1654 | if (isset($_POST['aircrafticoncolor'])) { |
1655 | - $aircrafticoncolor = filter_input(INPUT_POST,'aircrafticoncolor',FILTER_SANITIZE_STRING); |
|
1656 | - $settings = array_merge($settings,array('globalAircraftIconColor' => substr($aircrafticoncolor,1))); |
|
1655 | + $aircrafticoncolor = filter_input(INPUT_POST, 'aircrafticoncolor', FILTER_SANITIZE_STRING); |
|
1656 | + $settings = array_merge($settings, array('globalAircraftIconColor' => substr($aircrafticoncolor, 1))); |
|
1657 | 1657 | } |
1658 | 1658 | |
1659 | - $airportzoom = filter_input(INPUT_POST,'airportzoom',FILTER_SANITIZE_NUMBER_INT); |
|
1660 | - $settings = array_merge($settings,array('globalAirportZoom' => $airportzoom)); |
|
1659 | + $airportzoom = filter_input(INPUT_POST, 'airportzoom', FILTER_SANITIZE_NUMBER_INT); |
|
1660 | + $settings = array_merge($settings, array('globalAirportZoom' => $airportzoom)); |
|
1661 | 1661 | |
1662 | - $unitdistance = filter_input(INPUT_POST,'unitdistance',FILTER_SANITIZE_STRING); |
|
1663 | - $settings = array_merge($settings,array('globalUnitDistance' => $unitdistance)); |
|
1664 | - $unitaltitude = filter_input(INPUT_POST,'unitaltitude',FILTER_SANITIZE_STRING); |
|
1665 | - $settings = array_merge($settings,array('globalUnitAltitude' => $unitaltitude)); |
|
1666 | - $unitspeed = filter_input(INPUT_POST,'unitspeed',FILTER_SANITIZE_STRING); |
|
1667 | - $settings = array_merge($settings,array('globalUnitSpeed' => $unitspeed)); |
|
1662 | + $unitdistance = filter_input(INPUT_POST, 'unitdistance', FILTER_SANITIZE_STRING); |
|
1663 | + $settings = array_merge($settings, array('globalUnitDistance' => $unitdistance)); |
|
1664 | + $unitaltitude = filter_input(INPUT_POST, 'unitaltitude', FILTER_SANITIZE_STRING); |
|
1665 | + $settings = array_merge($settings, array('globalUnitAltitude' => $unitaltitude)); |
|
1666 | + $unitspeed = filter_input(INPUT_POST, 'unitspeed', FILTER_SANITIZE_STRING); |
|
1667 | + $settings = array_merge($settings, array('globalUnitSpeed' => $unitspeed)); |
|
1668 | 1668 | |
1669 | - $mappopup = filter_input(INPUT_POST,'mappopup',FILTER_SANITIZE_STRING); |
|
1669 | + $mappopup = filter_input(INPUT_POST, 'mappopup', FILTER_SANITIZE_STRING); |
|
1670 | 1670 | if ($mappopup == 'mappopup') { |
1671 | - $settings = array_merge($settings,array('globalMapPopup' => 'TRUE')); |
|
1671 | + $settings = array_merge($settings, array('globalMapPopup' => 'TRUE')); |
|
1672 | 1672 | } else { |
1673 | - $settings = array_merge($settings,array('globalMapPopup' => 'FALSE')); |
|
1673 | + $settings = array_merge($settings, array('globalMapPopup' => 'FALSE')); |
|
1674 | 1674 | } |
1675 | - $airportpopup = filter_input(INPUT_POST,'airportpopup',FILTER_SANITIZE_STRING); |
|
1675 | + $airportpopup = filter_input(INPUT_POST, 'airportpopup', FILTER_SANITIZE_STRING); |
|
1676 | 1676 | if ($airportpopup == 'airportpopup') { |
1677 | - $settings = array_merge($settings,array('globalAirportPopup' => 'TRUE')); |
|
1677 | + $settings = array_merge($settings, array('globalAirportPopup' => 'TRUE')); |
|
1678 | 1678 | } else { |
1679 | - $settings = array_merge($settings,array('globalAirportPopup' => 'FALSE')); |
|
1679 | + $settings = array_merge($settings, array('globalAirportPopup' => 'FALSE')); |
|
1680 | 1680 | } |
1681 | - $maphistory = filter_input(INPUT_POST,'maphistory',FILTER_SANITIZE_STRING); |
|
1681 | + $maphistory = filter_input(INPUT_POST, 'maphistory', FILTER_SANITIZE_STRING); |
|
1682 | 1682 | if ($maphistory == 'maphistory') { |
1683 | - $settings = array_merge($settings,array('globalMapHistory' => 'TRUE')); |
|
1683 | + $settings = array_merge($settings, array('globalMapHistory' => 'TRUE')); |
|
1684 | 1684 | } else { |
1685 | - $settings = array_merge($settings,array('globalMapHistory' => 'FALSE')); |
|
1685 | + $settings = array_merge($settings, array('globalMapHistory' => 'FALSE')); |
|
1686 | 1686 | } |
1687 | - $maptooltip = filter_input(INPUT_POST,'maptooltip',FILTER_SANITIZE_STRING); |
|
1687 | + $maptooltip = filter_input(INPUT_POST, 'maptooltip', FILTER_SANITIZE_STRING); |
|
1688 | 1688 | if ($maptooltip == 'maptooltip') { |
1689 | - $settings = array_merge($settings,array('globalMapTooltip' => 'TRUE')); |
|
1689 | + $settings = array_merge($settings, array('globalMapTooltip' => 'TRUE')); |
|
1690 | 1690 | } else { |
1691 | - $settings = array_merge($settings,array('globalMapTooltip' => 'FALSE')); |
|
1691 | + $settings = array_merge($settings, array('globalMapTooltip' => 'FALSE')); |
|
1692 | 1692 | } |
1693 | - $flightroute = filter_input(INPUT_POST,'flightroute',FILTER_SANITIZE_STRING); |
|
1693 | + $flightroute = filter_input(INPUT_POST, 'flightroute', FILTER_SANITIZE_STRING); |
|
1694 | 1694 | if ($flightroute == 'flightroute') { |
1695 | - $settings = array_merge($settings,array('globalMapRoute' => 'TRUE')); |
|
1695 | + $settings = array_merge($settings, array('globalMapRoute' => 'TRUE')); |
|
1696 | 1696 | } else { |
1697 | - $settings = array_merge($settings,array('globalMapRoute' => 'FALSE')); |
|
1697 | + $settings = array_merge($settings, array('globalMapRoute' => 'FALSE')); |
|
1698 | 1698 | } |
1699 | - $flightremainingroute = filter_input(INPUT_POST,'flightremainingroute',FILTER_SANITIZE_STRING); |
|
1699 | + $flightremainingroute = filter_input(INPUT_POST, 'flightremainingroute', FILTER_SANITIZE_STRING); |
|
1700 | 1700 | if ($flightremainingroute == 'flightremainingroute') { |
1701 | - $settings = array_merge($settings,array('globalMapRemainingRoute' => 'TRUE')); |
|
1701 | + $settings = array_merge($settings, array('globalMapRemainingRoute' => 'TRUE')); |
|
1702 | 1702 | } else { |
1703 | - $settings = array_merge($settings,array('globalMapRemainingRoute' => 'FALSE')); |
|
1703 | + $settings = array_merge($settings, array('globalMapRemainingRoute' => 'FALSE')); |
|
1704 | 1704 | } |
1705 | - $allflights = filter_input(INPUT_POST,'allflights',FILTER_SANITIZE_STRING); |
|
1705 | + $allflights = filter_input(INPUT_POST, 'allflights', FILTER_SANITIZE_STRING); |
|
1706 | 1706 | if ($allflights == 'allflights') { |
1707 | - $settings = array_merge($settings,array('globalAllFlights' => 'TRUE')); |
|
1707 | + $settings = array_merge($settings, array('globalAllFlights' => 'TRUE')); |
|
1708 | 1708 | } else { |
1709 | - $settings = array_merge($settings,array('globalAllFlights' => 'FALSE')); |
|
1709 | + $settings = array_merge($settings, array('globalAllFlights' => 'FALSE')); |
|
1710 | 1710 | } |
1711 | - $bbox = filter_input(INPUT_POST,'bbox',FILTER_SANITIZE_STRING); |
|
1711 | + $bbox = filter_input(INPUT_POST, 'bbox', FILTER_SANITIZE_STRING); |
|
1712 | 1712 | if ($bbox == 'bbox') { |
1713 | - $settings = array_merge($settings,array('globalMapUseBbox' => 'TRUE')); |
|
1713 | + $settings = array_merge($settings, array('globalMapUseBbox' => 'TRUE')); |
|
1714 | 1714 | } else { |
1715 | - $settings = array_merge($settings,array('globalMapUseBbox' => 'FALSE')); |
|
1715 | + $settings = array_merge($settings, array('globalMapUseBbox' => 'FALSE')); |
|
1716 | 1716 | } |
1717 | - $groundaltitude = filter_input(INPUT_POST,'groundaltitude',FILTER_SANITIZE_STRING); |
|
1717 | + $groundaltitude = filter_input(INPUT_POST, 'groundaltitude', FILTER_SANITIZE_STRING); |
|
1718 | 1718 | if ($groundaltitude == 'groundaltitude') { |
1719 | - $settings = array_merge($settings,array('globalGroundAltitude' => 'TRUE')); |
|
1719 | + $settings = array_merge($settings, array('globalGroundAltitude' => 'TRUE')); |
|
1720 | 1720 | } else { |
1721 | - $settings = array_merge($settings,array('globalGroundAltitude' => 'FALSE')); |
|
1721 | + $settings = array_merge($settings, array('globalGroundAltitude' => 'FALSE')); |
|
1722 | 1722 | } |
1723 | - $waypoints = filter_input(INPUT_POST,'waypoints',FILTER_SANITIZE_STRING); |
|
1723 | + $waypoints = filter_input(INPUT_POST, 'waypoints', FILTER_SANITIZE_STRING); |
|
1724 | 1724 | if ($waypoints == 'waypoints') { |
1725 | - $settings = array_merge($settings,array('globalWaypoints' => 'TRUE')); |
|
1725 | + $settings = array_merge($settings, array('globalWaypoints' => 'TRUE')); |
|
1726 | 1726 | } else { |
1727 | - $settings = array_merge($settings,array('globalWaypoints' => 'FALSE')); |
|
1727 | + $settings = array_merge($settings, array('globalWaypoints' => 'FALSE')); |
|
1728 | 1728 | } |
1729 | - $geoid = filter_input(INPUT_POST,'geoid',FILTER_SANITIZE_STRING); |
|
1729 | + $geoid = filter_input(INPUT_POST, 'geoid', FILTER_SANITIZE_STRING); |
|
1730 | 1730 | if ($geoid == 'geoid') { |
1731 | - $settings = array_merge($settings,array('globalGeoid' => 'TRUE')); |
|
1731 | + $settings = array_merge($settings, array('globalGeoid' => 'TRUE')); |
|
1732 | 1732 | } else { |
1733 | - $settings = array_merge($settings,array('globalGeoid' => 'FALSE')); |
|
1733 | + $settings = array_merge($settings, array('globalGeoid' => 'FALSE')); |
|
1734 | 1734 | } |
1735 | - $geoid_source = filter_input(INPUT_POST,'geoid_source',FILTER_SANITIZE_STRING); |
|
1736 | - $settings = array_merge($settings,array('globalGeoidSource' => $geoid_source)); |
|
1735 | + $geoid_source = filter_input(INPUT_POST, 'geoid_source', FILTER_SANITIZE_STRING); |
|
1736 | + $settings = array_merge($settings, array('globalGeoidSource' => $geoid_source)); |
|
1737 | 1737 | |
1738 | - $noairlines = filter_input(INPUT_POST,'noairlines',FILTER_SANITIZE_STRING); |
|
1738 | + $noairlines = filter_input(INPUT_POST, 'noairlines', FILTER_SANITIZE_STRING); |
|
1739 | 1739 | if ($noairlines == 'noairlines') { |
1740 | - $settings = array_merge($settings,array('globalNoAirlines' => 'TRUE')); |
|
1740 | + $settings = array_merge($settings, array('globalNoAirlines' => 'TRUE')); |
|
1741 | 1741 | } else { |
1742 | - $settings = array_merge($settings,array('globalNoAirlines' => 'FALSE')); |
|
1742 | + $settings = array_merge($settings, array('globalNoAirlines' => 'FALSE')); |
|
1743 | 1743 | } |
1744 | 1744 | |
1745 | - $tsk = filter_input(INPUT_POST,'tsk',FILTER_SANITIZE_STRING); |
|
1745 | + $tsk = filter_input(INPUT_POST, 'tsk', FILTER_SANITIZE_STRING); |
|
1746 | 1746 | if ($tsk == 'tsk') { |
1747 | - $settings = array_merge($settings,array('globalTSK' => 'TRUE')); |
|
1747 | + $settings = array_merge($settings, array('globalTSK' => 'TRUE')); |
|
1748 | 1748 | } else { |
1749 | - $settings = array_merge($settings,array('globalTSK' => 'FALSE')); |
|
1749 | + $settings = array_merge($settings, array('globalTSK' => 'FALSE')); |
|
1750 | 1750 | } |
1751 | - $mapmatching = filter_input(INPUT_POST,'mapmatching',FILTER_SANITIZE_STRING); |
|
1751 | + $mapmatching = filter_input(INPUT_POST, 'mapmatching', FILTER_SANITIZE_STRING); |
|
1752 | 1752 | if ($mapmatching == 'mapmatching') { |
1753 | - $settings = array_merge($settings,array('globalMapMatching' => 'TRUE')); |
|
1753 | + $settings = array_merge($settings, array('globalMapMatching' => 'TRUE')); |
|
1754 | 1754 | } else { |
1755 | - $settings = array_merge($settings,array('globalMapMatching' => 'FALSE')); |
|
1755 | + $settings = array_merge($settings, array('globalMapMatching' => 'FALSE')); |
|
1756 | 1756 | } |
1757 | - $mapmatchingsource = filter_input(INPUT_POST,'mapmatchingsource',FILTER_SANITIZE_STRING); |
|
1758 | - $settings = array_merge($settings,array('globalMapMatchingSource' => $mapmatchingsource)); |
|
1759 | - $graphhopper = filter_input(INPUT_POST,'graphhopper',FILTER_SANITIZE_STRING); |
|
1760 | - $settings = array_merge($settings,array('globalGraphHopperKey' => $graphhopper)); |
|
1757 | + $mapmatchingsource = filter_input(INPUT_POST, 'mapmatchingsource', FILTER_SANITIZE_STRING); |
|
1758 | + $settings = array_merge($settings, array('globalMapMatchingSource' => $mapmatchingsource)); |
|
1759 | + $graphhopper = filter_input(INPUT_POST, 'graphhopper', FILTER_SANITIZE_STRING); |
|
1760 | + $settings = array_merge($settings, array('globalGraphHopperKey' => $graphhopper)); |
|
1761 | 1761 | |
1762 | - if (!isset($globalTransaction)) $settings = array_merge($settings,array('globalTransaction' => 'TRUE')); |
|
1762 | + if (!isset($globalTransaction)) $settings = array_merge($settings, array('globalTransaction' => 'TRUE')); |
|
1763 | 1763 | |
1764 | 1764 | // Set some defaults values... |
1765 | 1765 | if (!isset($globalAircraftImageSources)) { |
1766 | - $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters'); |
|
1767 | - $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources)); |
|
1766 | + $globalAircraftImageSources = array('ivaomtl', 'wikimedia', 'airportdata', 'deviantart', 'flickr', 'bing', 'jetphotos', 'planepictures', 'planespotters'); |
|
1767 | + $settings = array_merge($settings, array('globalAircraftImageSources' => $globalAircraftImageSources)); |
|
1768 | 1768 | } |
1769 | 1769 | |
1770 | 1770 | if (!isset($globalSchedulesSources)) { |
1771 | - $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware'); |
|
1772 | - $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources)); |
|
1771 | + $globalSchedulesSources = array('flightmapper', 'costtotravel', 'flightradar24', 'flightaware'); |
|
1772 | + $settings = array_merge($settings, array('globalSchedulesSources' => $globalSchedulesSources)); |
|
1773 | 1773 | } |
1774 | 1774 | |
1775 | - $settings = array_merge($settings,array('globalInstalled' => 'TRUE')); |
|
1775 | + $settings = array_merge($settings, array('globalInstalled' => 'TRUE')); |
|
1776 | 1776 | |
1777 | 1777 | if ($error == '') settings::modify_settings($settings); |
1778 | 1778 | if ($error == '') settings::comment_settings($settings_comment); |