Ysurac /
FlightAirMap
@@ -73,8 +73,11 @@ discard block |
||
| 73 | 73 | $globalDBSname = $globalDBname; |
| 74 | 74 | $globalDBSuser = $globalDBuser; |
| 75 | 75 | $globalDBSpass = $globalDBpass; |
| 76 | - if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') $globalDBSport = 3306; |
|
| 77 | - else $globalDBSport = $globalDBport; |
|
| 76 | + if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') { |
|
| 77 | + $globalDBSport = 3306; |
|
| 78 | + } else { |
|
| 79 | + $globalDBSport = $globalDBport; |
|
| 80 | + } |
|
| 78 | 81 | } else { |
| 79 | 82 | $DBname = 'default'; |
| 80 | 83 | $globalDBSdriver = $globalDBdriver; |
@@ -82,8 +85,11 @@ discard block |
||
| 82 | 85 | $globalDBSname = $globalDBname; |
| 83 | 86 | $globalDBSuser = $user; |
| 84 | 87 | $globalDBSpass = $pass; |
| 85 | - if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') $globalDBSport = 3306; |
|
| 86 | - else $globalDBSport = $globalDBport; |
|
| 88 | + if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') { |
|
| 89 | + $globalDBSport = 3306; |
|
| 90 | + } else { |
|
| 91 | + $globalDBSport = $globalDBport; |
|
| 92 | + } |
|
| 87 | 93 | } |
| 88 | 94 | } else { |
| 89 | 95 | $globalDBSdriver = $globalDB[$DBname]['driver']; |
@@ -91,11 +97,16 @@ discard block |
||
| 91 | 97 | $globalDBSname = $globalDB[$DBname]['name']; |
| 92 | 98 | $globalDBSuser = $globalDB[$DBname]['user']; |
| 93 | 99 | $globalDBSpass = $globalDB[$DBname]['pass']; |
| 94 | - if (isset($globalDB[$DBname]['port'])) $globalDBSport = $globalDB[$DBname]['port']; |
|
| 95 | - else $globalDBSport = 3306; |
|
| 100 | + if (isset($globalDB[$DBname]['port'])) { |
|
| 101 | + $globalDBSport = $globalDB[$DBname]['port']; |
|
| 102 | + } else { |
|
| 103 | + $globalDBSport = 3306; |
|
| 104 | + } |
|
| 96 | 105 | } |
| 97 | 106 | // Set number of try to connect to DB |
| 98 | - if (!isset($globalDBretry) || $globalDBretry == '' || $globalDBretry === NULL) $globalDBretry = 5; |
|
| 107 | + if (!isset($globalDBretry) || $globalDBretry == '' || $globalDBretry === NULL) { |
|
| 108 | + $globalDBretry = 5; |
|
| 109 | + } |
|
| 99 | 110 | $i = 0; |
| 100 | 111 | while (true) { |
| 101 | 112 | try { |
@@ -104,10 +115,16 @@ discard block |
||
| 104 | 115 | $this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'"); |
| 105 | 116 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
| 106 | 117 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER); |
| 107 | - if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500); |
|
| 108 | - else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut); |
|
| 109 | - if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true); |
|
| 110 | - else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent); |
|
| 118 | + if (!isset($globalDBTimeOut)) { |
|
| 119 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500); |
|
| 120 | + } else { |
|
| 121 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut); |
|
| 122 | + } |
|
| 123 | + if (!isset($globalDBPersistent)) { |
|
| 124 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true); |
|
| 125 | + } else { |
|
| 126 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent); |
|
| 127 | + } |
|
| 111 | 128 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true); |
| 112 | 129 | $this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true); |
| 113 | 130 | // Workaround against "ONLY_FULL_GROUP_BY" mode |
@@ -121,24 +138,36 @@ discard block |
||
| 121 | 138 | //$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'"); |
| 122 | 139 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
| 123 | 140 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER); |
| 124 | - if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200); |
|
| 125 | - else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut); |
|
| 126 | - if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true); |
|
| 127 | - else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent); |
|
| 141 | + if (!isset($globalDBTimeOut)) { |
|
| 142 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200); |
|
| 143 | + } else { |
|
| 144 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut); |
|
| 145 | + } |
|
| 146 | + if (!isset($globalDBPersistent)) { |
|
| 147 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true); |
|
| 148 | + } else { |
|
| 149 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent); |
|
| 150 | + } |
|
| 128 | 151 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true); |
| 129 | 152 | $this->dbs[$DBname]->exec('SET timezone="UTC"'); |
| 130 | 153 | } |
| 131 | 154 | break; |
| 132 | 155 | } catch(PDOException $e) { |
| 133 | 156 | $i++; |
| 134 | - if (isset($globalDebug) && $globalDebug) echo 'Error connecting to DB: '.$globalDBSname.' - Error: '.$e->getMessage()."\n"; |
|
| 157 | + if (isset($globalDebug) && $globalDebug) { |
|
| 158 | + echo 'Error connecting to DB: '.$globalDBSname.' - Error: '.$e->getMessage()."\n"; |
|
| 159 | + } |
|
| 135 | 160 | //exit; |
| 136 | - if ($i > $globalDBretry) return false; |
|
| 161 | + if ($i > $globalDBretry) { |
|
| 162 | + return false; |
|
| 163 | + } |
|
| 137 | 164 | //return false; |
| 138 | 165 | } |
| 139 | 166 | sleep(2); |
| 140 | 167 | } |
| 141 | - if ($DBname === 'default') $this->db = $this->dbs['default']; |
|
| 168 | + if ($DBname === 'default') { |
|
| 169 | + $this->db = $this->dbs['default']; |
|
| 170 | + } |
|
| 142 | 171 | return true; |
| 143 | 172 | } |
| 144 | 173 | |
@@ -150,7 +179,9 @@ discard block |
||
| 150 | 179 | } else { |
| 151 | 180 | $query = "SELECT * FROM pg_catalog.pg_tables WHERE tablename = '".$table."'"; |
| 152 | 181 | } |
| 153 | - if ($this->db == NULL) return false; |
|
| 182 | + if ($this->db == NULL) { |
|
| 183 | + return false; |
|
| 184 | + } |
|
| 154 | 185 | try { |
| 155 | 186 | //$Connection = new Connection(); |
| 156 | 187 | $results = $this->db->query($query); |
@@ -159,22 +190,31 @@ discard block |
||
| 159 | 190 | } |
| 160 | 191 | if($results->rowCount()>0) { |
| 161 | 192 | return true; |
| 193 | + } else { |
|
| 194 | + return false; |
|
| 162 | 195 | } |
| 163 | - else return false; |
|
| 164 | 196 | } |
| 165 | 197 | |
| 166 | 198 | public function connectionExists() |
| 167 | 199 | { |
| 168 | 200 | global $globalDBdriver, $globalDBCheckConnection, $globalNoDB; |
| 169 | - if (isset($globalDBCheckConnection) && $globalDBCheckConnection === FALSE) return true; |
|
| 170 | - if (isset($globalNoDB) && $globalNoDB === TRUE) return true; |
|
| 201 | + if (isset($globalDBCheckConnection) && $globalDBCheckConnection === FALSE) { |
|
| 202 | + return true; |
|
| 203 | + } |
|
| 204 | + if (isset($globalNoDB) && $globalNoDB === TRUE) { |
|
| 205 | + return true; |
|
| 206 | + } |
|
| 171 | 207 | $query = "SELECT 1 + 1"; |
| 172 | - if ($this->db === null) return false; |
|
| 208 | + if ($this->db === null) { |
|
| 209 | + return false; |
|
| 210 | + } |
|
| 173 | 211 | try { |
| 174 | 212 | $sum = @$this->db->query($query); |
| 175 | 213 | if ($sum instanceof \PDOStatement) { |
| 176 | 214 | $sum = $sum->fetchColumn(0); |
| 177 | - } else $sum = 0; |
|
| 215 | + } else { |
|
| 216 | + $sum = 0; |
|
| 217 | + } |
|
| 178 | 218 | if (intval($sum) !== 2) { |
| 179 | 219 | return false; |
| 180 | 220 | } |
@@ -209,8 +249,9 @@ discard block |
||
| 209 | 249 | $nb = $results->fetchAll(PDO::FETCH_ASSOC); |
| 210 | 250 | if($nb[0]['nb'] > 0) { |
| 211 | 251 | return true; |
| 252 | + } else { |
|
| 253 | + return false; |
|
| 212 | 254 | } |
| 213 | - else return false; |
|
| 214 | 255 | } |
| 215 | 256 | |
| 216 | 257 | /* |
@@ -260,9 +301,12 @@ discard block |
||
| 260 | 301 | } |
| 261 | 302 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
| 262 | 303 | $sth->closeCursor(); |
| 263 | - if ($result['nb'] > 0) return true; |
|
| 264 | - else return false; |
|
| 265 | -/* } else { |
|
| 304 | + if ($result['nb'] > 0) { |
|
| 305 | + return true; |
|
| 306 | + } else { |
|
| 307 | + return false; |
|
| 308 | + } |
|
| 309 | + /* } else { |
|
| 266 | 310 | $query = "SELECT * FROM ".$table." LIMIT 0"; |
| 267 | 311 | try { |
| 268 | 312 | $results = $this->db->query($query); |
@@ -301,7 +345,9 @@ discard block |
||
| 301 | 345 | $sth->closeCursor(); |
| 302 | 346 | return $result['value']; |
| 303 | 347 | } |
| 304 | - } else return $version; |
|
| 348 | + } else { |
|
| 349 | + return $version; |
|
| 350 | + } |
|
| 305 | 351 | } |
| 306 | 352 | |
| 307 | 353 | /* |
@@ -310,9 +356,14 @@ discard block |
||
| 310 | 356 | */ |
| 311 | 357 | public function latest() { |
| 312 | 358 | global $globalNoDB; |
| 313 | - if (isset($globalNoDB) && $globalNoDB === TRUE) return true; |
|
| 314 | - if ($this->check_schema_version() == $this->latest_schema) return true; |
|
| 315 | - else return false; |
|
| 359 | + if (isset($globalNoDB) && $globalNoDB === TRUE) { |
|
| 360 | + return true; |
|
| 361 | + } |
|
| 362 | + if ($this->check_schema_version() == $this->latest_schema) { |
|
| 363 | + return true; |
|
| 364 | + } else { |
|
| 365 | + return false; |
|
| 366 | + } |
|
| 316 | 367 | } |
| 317 | 368 | |
| 318 | 369 | } |
@@ -322,14 +322,14 @@ discard block |
||
| 322 | 322 | </tr> |
| 323 | 323 | <!-- |
| 324 | 324 | <?php |
| 325 | - if (isset($globalDBuser) && isset($globalDBpass) && $globalDBuser != '' && $globalDBpass != '') { |
|
| 326 | - require_once(dirname(__FILE__).'/../require/class.Connection.php'); |
|
| 327 | - $Connection = new Connection(); |
|
| 325 | + if (isset($globalDBuser) && isset($globalDBpass) && $globalDBuser != '' && $globalDBpass != '') { |
|
| 326 | + require_once(dirname(__FILE__).'/../require/class.Connection.php'); |
|
| 327 | + $Connection = new Connection(); |
|
| 328 | 328 | ?> |
| 329 | 329 | --> |
| 330 | 330 | <?php |
| 331 | 331 | if ($Connection->db != NULL) { |
| 332 | - if ($Connection->tableExists('source_location')) { |
|
| 332 | + if ($Connection->tableExists('source_location')) { |
|
| 333 | 333 | require_once(dirname(__FILE__).'/../require/class.Source.php'); |
| 334 | 334 | $Source = new Source(); |
| 335 | 335 | //$alllocations = $Source->getAllLocationInfo(); |
@@ -349,9 +349,9 @@ discard block |
||
| 349 | 349 | |
| 350 | 350 | <?php |
| 351 | 351 | } |
| 352 | - } |
|
| 352 | + } |
|
| 353 | + } |
|
| 353 | 354 | } |
| 354 | - } |
|
| 355 | 355 | ?> |
| 356 | 356 | |
| 357 | 357 | <tr> |
@@ -461,12 +461,12 @@ discard block |
||
| 461 | 461 | ?> |
| 462 | 462 | <tr> |
| 463 | 463 | <?php |
| 464 | - if (filter_var($source['host'],FILTER_VALIDATE_URL)) { |
|
| 464 | + if (filter_var($source['host'],FILTER_VALIDATE_URL)) { |
|
| 465 | 465 | ?> |
| 466 | 466 | <td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td> |
| 467 | 467 | <td><input type="text" name="port[]" class="col-xs-2" id="port" value="<?php if (isset($source['port'])) print $source['port']; ?>" /></td> |
| 468 | 468 | <?php |
| 469 | - } else { |
|
| 469 | + } else { |
|
| 470 | 470 | $hostport = explode(':',$source['host']); |
| 471 | 471 | if (isset($hostport[1])) { |
| 472 | 472 | $host = $hostport[0]; |
@@ -479,7 +479,7 @@ discard block |
||
| 479 | 479 | <td><input type="text" name="host[]" id="host" value="<?php print $host; ?>" /></td> |
| 480 | 480 | <td><input type="text" name="port[]" class="col-xs-2" id="port" value="<?php print $port; ?>" /></td> |
| 481 | 481 | <?php |
| 482 | - } |
|
| 482 | + } |
|
| 483 | 483 | ?> |
| 484 | 484 | <td> |
| 485 | 485 | <select name="format[]" id="format"> |
@@ -893,7 +893,7 @@ discard block |
||
| 893 | 893 | <br /> |
| 894 | 894 | <p> |
| 895 | 895 | <?php |
| 896 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 896 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 897 | 897 | ?> |
| 898 | 898 | <label for="aircrafticoncolor">Color of aircraft icon on map</label> |
| 899 | 899 | <input type="color" name="aircrafticoncolor" id="aircrafticoncolor" value="#<?php if (isset($globalAircraftIconColor)) echo $globalAircraftIconColor; else echo '1a3151'; ?>" /> |
@@ -903,11 +903,11 @@ discard block |
||
| 903 | 903 | <b>The directory cache is not writable, aircraft icon will not be cached</b> |
| 904 | 904 | <?php |
| 905 | 905 | } |
| 906 | - } else { |
|
| 906 | + } else { |
|
| 907 | 907 | ?> |
| 908 | 908 | <b>PHP GD is not installed, you can't change color of aircraft icon on map</b> |
| 909 | 909 | <?php |
| 910 | - } |
|
| 910 | + } |
|
| 911 | 911 | ?> |
| 912 | 912 | </p> |
| 913 | 913 | <br /> |
@@ -931,7 +931,7 @@ discard block |
||
| 931 | 931 | </p> |
| 932 | 932 | <?php |
| 933 | 933 | require('../footer.php'); |
| 934 | - exit; |
|
| 934 | + exit; |
|
| 935 | 935 | } |
| 936 | 936 | // ' |
| 937 | 937 | $settings = array(); |
@@ -1022,8 +1022,8 @@ discard block |
||
| 1022 | 1022 | |
| 1023 | 1023 | $sources = array(); |
| 1024 | 1024 | foreach ($source_name as $keys => $name) { |
| 1025 | - 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]); |
|
| 1026 | - 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]); |
|
| 1025 | + 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]); |
|
| 1026 | + 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]); |
|
| 1027 | 1027 | } |
| 1028 | 1028 | if (count($sources) > 0) $_SESSION['sources'] = $sources; |
| 1029 | 1029 | |
@@ -1408,14 +1408,14 @@ discard block |
||
| 1408 | 1408 | |
| 1409 | 1409 | // Set some defaults values... |
| 1410 | 1410 | if (!isset($globalAircraftImageSources)) { |
| 1411 | - $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters'); |
|
| 1412 | - $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources)); |
|
| 1411 | + $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters'); |
|
| 1412 | + $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources)); |
|
| 1413 | 1413 | } |
| 1414 | 1414 | |
| 1415 | 1415 | if (!isset($globalSchedulesSources)) { |
| 1416 | - $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware'); |
|
| 1417 | - $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources)); |
|
| 1418 | - } |
|
| 1416 | + $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware'); |
|
| 1417 | + $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources)); |
|
| 1418 | + } |
|
| 1419 | 1419 | |
| 1420 | 1420 | $settings = array_merge($settings,array('globalInstalled' => 'TRUE')); |
| 1421 | 1421 | |
@@ -1462,21 +1462,21 @@ discard block |
||
| 1462 | 1462 | $popi = false; |
| 1463 | 1463 | $popw = false; |
| 1464 | 1464 | foreach ($_SESSION['done'] as $done) { |
| 1465 | - print '<li>'.$done.'....<strong>SUCCESS</strong></li>'; |
|
| 1466 | - if ($done == 'Create database') $pop = true; |
|
| 1467 | - if ($_SESSION['install'] == 'database_create') $pop = true; |
|
| 1468 | - if ($_SESSION['install'] == 'database_import') $popi = true; |
|
| 1469 | - if ($_SESSION['install'] == 'waypoints') $popw = true; |
|
| 1465 | + print '<li>'.$done.'....<strong>SUCCESS</strong></li>'; |
|
| 1466 | + if ($done == 'Create database') $pop = true; |
|
| 1467 | + if ($_SESSION['install'] == 'database_create') $pop = true; |
|
| 1468 | + if ($_SESSION['install'] == 'database_import') $popi = true; |
|
| 1469 | + if ($_SESSION['install'] == 'waypoints') $popw = true; |
|
| 1470 | 1470 | } |
| 1471 | 1471 | if ($pop) { |
| 1472 | - sleep(5); |
|
| 1473 | - print '<li>Create database....<img src="../images/loading.gif" /></li>'; |
|
| 1472 | + sleep(5); |
|
| 1473 | + print '<li>Create database....<img src="../images/loading.gif" /></li>'; |
|
| 1474 | 1474 | } else if ($popi) { |
| 1475 | - sleep(5); |
|
| 1476 | - print '<li>Create and import tables....<img src="../images/loading.gif" /></li>'; |
|
| 1475 | + sleep(5); |
|
| 1476 | + print '<li>Create and import tables....<img src="../images/loading.gif" /></li>'; |
|
| 1477 | 1477 | } else if ($popw) { |
| 1478 | - sleep(5); |
|
| 1479 | - print '<li>Populate waypoints database....<img src="../images/loading.gif" /></li>'; |
|
| 1478 | + sleep(5); |
|
| 1479 | + print '<li>Populate waypoints database....<img src="../images/loading.gif" /></li>'; |
|
| 1480 | 1480 | } else print '<li>Update schema if needed....<img src="../images/loading.gif" /></li>'; |
| 1481 | 1481 | print '</div></ul>'; |
| 1482 | 1482 | print '<div id="error"></div>'; |
@@ -1539,7 +1539,7 @@ discard block |
||
| 1539 | 1539 | unset($_COOKIE['install']); |
| 1540 | 1540 | print '<div class="info column"><ul>'; |
| 1541 | 1541 | foreach ($_SESSION['done'] as $done) { |
| 1542 | - print '<li>'.$done.'....<strong>SUCCESS</strong></li>'; |
|
| 1542 | + print '<li>'.$done.'....<strong>SUCCESS</strong></li>'; |
|
| 1543 | 1543 | } |
| 1544 | 1544 | print '<li>Reloading page to check all is now ok....<strong>SUCCESS</strong></li>'; |
| 1545 | 1545 | print '</ul></div>'; |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | require_once(dirname(__FILE__).'/class.create_db.php'); |
| 11 | 11 | require_once(dirname(__FILE__).'/class.update_schema.php'); |
| 12 | 12 | require_once(dirname(__FILE__).'/class.settings.php'); |
| 13 | -$title="Install"; |
|
| 13 | +$title = "Install"; |
|
| 14 | 14 | require(dirname(__FILE__).'/../require/settings.php'); |
| 15 | 15 | require(dirname(__FILE__).'/header.php'); |
| 16 | 16 | |
@@ -73,8 +73,8 @@ discard block |
||
| 73 | 73 | if (!extension_loaded('curl')) { |
| 74 | 74 | $error[] = "Curl is not loaded."; |
| 75 | 75 | } |
| 76 | - if(function_exists('apache_get_modules') ){ |
|
| 77 | - if(!in_array('mod_rewrite',apache_get_modules())) { |
|
| 76 | + if (function_exists('apache_get_modules')) { |
|
| 77 | + if (!in_array('mod_rewrite', apache_get_modules())) { |
|
| 78 | 78 | $error[] = "mod_rewrite is not available."; |
| 79 | 79 | } |
| 80 | 80 | /* |
@@ -90,8 +90,8 @@ discard block |
||
| 90 | 90 | print '<div class="info column"><p><strong>If you use MySQL or MariaDB, check that <i>max_allowed_packet</i> >= 8M, else import of some table can fail.</strong></p></div>'; |
| 91 | 91 | if (isset($_SERVER['REQUEST_SCHEME']) && isset($_SERVER['SERVER_NAME']) && isset($_SERVER['SERVER_PORT']) && isset($_SERVER['REQUEST_URI'])) { |
| 92 | 92 | if (function_exists('get_headers')) { |
| 93 | - $check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace('install/','search',str_replace('index.php',$_SERVER["REQUEST_URI"]))); |
|
| 94 | - if (isset($check_header[0]) && !stripos($check_header[0],"200 OK")) { |
|
| 93 | + $check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace('install/', 'search', str_replace('index.php', $_SERVER["REQUEST_URI"]))); |
|
| 94 | + if (isset($check_header[0]) && !stripos($check_header[0], "200 OK")) { |
|
| 95 | 95 | print '<div class="info column"><p><strong>Check your configuration, rewrite don\'t seems to work.</strong></p></div>'; |
| 96 | 96 | } |
| 97 | 97 | } |
@@ -461,13 +461,13 @@ discard block |
||
| 461 | 461 | ?> |
| 462 | 462 | <tr> |
| 463 | 463 | <?php |
| 464 | - if (filter_var($source['host'],FILTER_VALIDATE_URL)) { |
|
| 464 | + if (filter_var($source['host'], FILTER_VALIDATE_URL)) { |
|
| 465 | 465 | ?> |
| 466 | 466 | <td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td> |
| 467 | 467 | <td><input type="text" name="port[]" class="col-xs-2" id="port" value="<?php if (isset($source['port'])) print $source['port']; ?>" /></td> |
| 468 | 468 | <?php |
| 469 | 469 | } else { |
| 470 | - $hostport = explode(':',$source['host']); |
|
| 470 | + $hostport = explode(':', $source['host']); |
|
| 471 | 471 | if (isset($hostport[1])) { |
| 472 | 472 | $host = $hostport[0]; |
| 473 | 473 | $port = $hostport[1]; |
@@ -514,7 +514,7 @@ discard block |
||
| 514 | 514 | <select name="timezones[]" id="timezones"> |
| 515 | 515 | <?php |
| 516 | 516 | $timezonelist = DateTimeZone::listIdentifiers(DateTimeZone::ALL); |
| 517 | - foreach($timezonelist as $timezones){ |
|
| 517 | + foreach ($timezonelist as $timezones) { |
|
| 518 | 518 | if (isset($source['timezone']) && $source['timezone'] == $timezones) { |
| 519 | 519 | print '<option selected>'.$timezones.'</option>'; |
| 520 | 520 | } elseif (!isset($source['timezone']) && $timezones == 'UTC') { |
@@ -566,7 +566,7 @@ discard block |
||
| 566 | 566 | <select name="timezones[]" id="timezones"> |
| 567 | 567 | <?php |
| 568 | 568 | $timezonelist = DateTimeZone::listIdentifiers(DateTimeZone::ALL); |
| 569 | - foreach($timezonelist as $timezones){ |
|
| 569 | + foreach ($timezonelist as $timezones) { |
|
| 570 | 570 | if ($timezones == 'UTC') { |
| 571 | 571 | print '<option selected>'.$timezones.'</option>'; |
| 572 | 572 | } else print '<option>'.$timezones.'</option>'; |
@@ -883,7 +883,7 @@ discard block |
||
| 883 | 883 | <br /> |
| 884 | 884 | <p> |
| 885 | 885 | <label for="aircraftsize">Size of aircraft icon on map (default to 30px if zoom > 7 else 15px), empty to default</label> |
| 886 | - <input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize;?>" /> |
|
| 886 | + <input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize; ?>" /> |
|
| 887 | 887 | </p> |
| 888 | 888 | <br /> |
| 889 | 889 | <p> |
@@ -939,14 +939,14 @@ discard block |
||
| 939 | 939 | $error = ''; |
| 940 | 940 | |
| 941 | 941 | if (isset($_POST['dbtype'])) { |
| 942 | - $dbtype = filter_input(INPUT_POST,'dbtype',FILTER_SANITIZE_STRING); |
|
| 943 | - $dbroot = filter_input(INPUT_POST,'dbroot',FILTER_SANITIZE_STRING); |
|
| 944 | - $dbrootpass = filter_input(INPUT_POST,'dbrootpass',FILTER_SANITIZE_STRING); |
|
| 945 | - $dbname = filter_input(INPUT_POST,'dbname',FILTER_SANITIZE_STRING); |
|
| 946 | - $dbuser = filter_input(INPUT_POST,'dbuser',FILTER_SANITIZE_STRING); |
|
| 947 | - $dbuserpass = filter_input(INPUT_POST,'dbuserpass',FILTER_SANITIZE_STRING); |
|
| 948 | - $dbhost = filter_input(INPUT_POST,'dbhost',FILTER_SANITIZE_STRING); |
|
| 949 | - $dbport = filter_input(INPUT_POST,'dbport',FILTER_SANITIZE_STRING); |
|
| 942 | + $dbtype = filter_input(INPUT_POST, 'dbtype', FILTER_SANITIZE_STRING); |
|
| 943 | + $dbroot = filter_input(INPUT_POST, 'dbroot', FILTER_SANITIZE_STRING); |
|
| 944 | + $dbrootpass = filter_input(INPUT_POST, 'dbrootpass', FILTER_SANITIZE_STRING); |
|
| 945 | + $dbname = filter_input(INPUT_POST, 'dbname', FILTER_SANITIZE_STRING); |
|
| 946 | + $dbuser = filter_input(INPUT_POST, 'dbuser', FILTER_SANITIZE_STRING); |
|
| 947 | + $dbuserpass = filter_input(INPUT_POST, 'dbuserpass', FILTER_SANITIZE_STRING); |
|
| 948 | + $dbhost = filter_input(INPUT_POST, 'dbhost', FILTER_SANITIZE_STRING); |
|
| 949 | + $dbport = filter_input(INPUT_POST, 'dbport', FILTER_SANITIZE_STRING); |
|
| 950 | 950 | |
| 951 | 951 | if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) $error .= 'Mysql driver for PDO must be loaded'; |
| 952 | 952 | if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) $error .= 'PosgreSQL driver for PDO must be loaded'; |
@@ -966,49 +966,49 @@ discard block |
||
| 966 | 966 | } else $settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname)); |
| 967 | 967 | */ |
| 968 | 968 | |
| 969 | - $settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname)); |
|
| 969 | + $settings = array_merge($settings, array('globalDBdriver' => $dbtype, 'globalDBhost' => $dbhost, 'globalDBuser' => $dbuser, 'globalDBport' => $dbport, 'globalDBpass' => $dbuserpass, 'globalDBname' => $dbname)); |
|
| 970 | 970 | |
| 971 | - $sitename = filter_input(INPUT_POST,'sitename',FILTER_SANITIZE_STRING); |
|
| 972 | - $siteurl = filter_input(INPUT_POST,'siteurl',FILTER_SANITIZE_STRING); |
|
| 973 | - $timezone = filter_input(INPUT_POST,'timezone',FILTER_SANITIZE_STRING); |
|
| 974 | - $language = filter_input(INPUT_POST,'language',FILTER_SANITIZE_STRING); |
|
| 975 | - $settings = array_merge($settings,array('globalName' => $sitename,'globalURL' => $siteurl, 'globalTimezone' => $timezone,'globalLanguage' => $language)); |
|
| 971 | + $sitename = filter_input(INPUT_POST, 'sitename', FILTER_SANITIZE_STRING); |
|
| 972 | + $siteurl = filter_input(INPUT_POST, 'siteurl', FILTER_SANITIZE_STRING); |
|
| 973 | + $timezone = filter_input(INPUT_POST, 'timezone', FILTER_SANITIZE_STRING); |
|
| 974 | + $language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_STRING); |
|
| 975 | + $settings = array_merge($settings, array('globalName' => $sitename, 'globalURL' => $siteurl, 'globalTimezone' => $timezone, 'globalLanguage' => $language)); |
|
| 976 | 976 | |
| 977 | - $mapprovider = filter_input(INPUT_POST,'mapprovider',FILTER_SANITIZE_STRING); |
|
| 978 | - $mapboxid = filter_input(INPUT_POST,'mapboxid',FILTER_SANITIZE_STRING); |
|
| 979 | - $mapboxtoken = filter_input(INPUT_POST,'mapboxtoken',FILTER_SANITIZE_STRING); |
|
| 980 | - $googlekey = filter_input(INPUT_POST,'googlekey',FILTER_SANITIZE_STRING); |
|
| 981 | - $bingkey = filter_input(INPUT_POST,'bingkey',FILTER_SANITIZE_STRING); |
|
| 982 | - $openweathermapkey = filter_input(INPUT_POST,'openweathermapkey',FILTER_SANITIZE_STRING); |
|
| 983 | - $mapquestkey = filter_input(INPUT_POST,'mapquestkey',FILTER_SANITIZE_STRING); |
|
| 984 | - $hereappid = filter_input(INPUT_POST,'hereappid',FILTER_SANITIZE_STRING); |
|
| 985 | - $hereappcode = filter_input(INPUT_POST,'hereappcode',FILTER_SANITIZE_STRING); |
|
| 986 | - $settings = array_merge($settings,array('globalMapProvider' => $mapprovider,'globalMapboxId' => $mapboxid,'globalMapboxToken' => $mapboxtoken,'globalGoogleAPIKey' => $googlekey,'globalBingMapKey' => $bingkey,'globalHereappID' => $hereappid,'globalHereappCode' => $hereappcode,'globalMapQuestKey' => $mapquestkey,'globalOpenWeatherMapKey' => $openweathermapkey)); |
|
| 977 | + $mapprovider = filter_input(INPUT_POST, 'mapprovider', FILTER_SANITIZE_STRING); |
|
| 978 | + $mapboxid = filter_input(INPUT_POST, 'mapboxid', FILTER_SANITIZE_STRING); |
|
| 979 | + $mapboxtoken = filter_input(INPUT_POST, 'mapboxtoken', FILTER_SANITIZE_STRING); |
|
| 980 | + $googlekey = filter_input(INPUT_POST, 'googlekey', FILTER_SANITIZE_STRING); |
|
| 981 | + $bingkey = filter_input(INPUT_POST, 'bingkey', FILTER_SANITIZE_STRING); |
|
| 982 | + $openweathermapkey = filter_input(INPUT_POST, 'openweathermapkey', FILTER_SANITIZE_STRING); |
|
| 983 | + $mapquestkey = filter_input(INPUT_POST, 'mapquestkey', FILTER_SANITIZE_STRING); |
|
| 984 | + $hereappid = filter_input(INPUT_POST, 'hereappid', FILTER_SANITIZE_STRING); |
|
| 985 | + $hereappcode = filter_input(INPUT_POST, 'hereappcode', FILTER_SANITIZE_STRING); |
|
| 986 | + $settings = array_merge($settings, array('globalMapProvider' => $mapprovider, 'globalMapboxId' => $mapboxid, 'globalMapboxToken' => $mapboxtoken, 'globalGoogleAPIKey' => $googlekey, 'globalBingMapKey' => $bingkey, 'globalHereappID' => $hereappid, 'globalHereappCode' => $hereappcode, 'globalMapQuestKey' => $mapquestkey, 'globalOpenWeatherMapKey' => $openweathermapkey)); |
|
| 987 | 987 | |
| 988 | - $latitudemax = filter_input(INPUT_POST,'latitudemax',FILTER_SANITIZE_STRING); |
|
| 989 | - $latitudemin = filter_input(INPUT_POST,'latitudemin',FILTER_SANITIZE_STRING); |
|
| 990 | - $longitudemax = filter_input(INPUT_POST,'longitudemax',FILTER_SANITIZE_STRING); |
|
| 991 | - $longitudemin = filter_input(INPUT_POST,'longitudemin',FILTER_SANITIZE_STRING); |
|
| 992 | - $livezoom = filter_input(INPUT_POST,'livezoom',FILTER_SANITIZE_NUMBER_INT); |
|
| 993 | - $settings = array_merge($settings,array('globalLatitudeMax' => $latitudemax,'globalLatitudeMin' => $latitudemin,'globalLongitudeMax' => $longitudemax,'globalLongitudeMin' => $longitudemin,'globalLiveZoom' => $livezoom)); |
|
| 988 | + $latitudemax = filter_input(INPUT_POST, 'latitudemax', FILTER_SANITIZE_STRING); |
|
| 989 | + $latitudemin = filter_input(INPUT_POST, 'latitudemin', FILTER_SANITIZE_STRING); |
|
| 990 | + $longitudemax = filter_input(INPUT_POST, 'longitudemax', FILTER_SANITIZE_STRING); |
|
| 991 | + $longitudemin = filter_input(INPUT_POST, 'longitudemin', FILTER_SANITIZE_STRING); |
|
| 992 | + $livezoom = filter_input(INPUT_POST, 'livezoom', FILTER_SANITIZE_NUMBER_INT); |
|
| 993 | + $settings = array_merge($settings, array('globalLatitudeMax' => $latitudemax, 'globalLatitudeMin' => $latitudemin, 'globalLongitudeMax' => $longitudemax, 'globalLongitudeMin' => $longitudemin, 'globalLiveZoom' => $livezoom)); |
|
| 994 | 994 | |
| 995 | - $squawk_country = filter_input(INPUT_POST,'squawk_country',FILTER_SANITIZE_STRING); |
|
| 996 | - $settings = array_merge($settings,array('globalSquawkCountry' => $squawk_country)); |
|
| 995 | + $squawk_country = filter_input(INPUT_POST, 'squawk_country', FILTER_SANITIZE_STRING); |
|
| 996 | + $settings = array_merge($settings, array('globalSquawkCountry' => $squawk_country)); |
|
| 997 | 997 | |
| 998 | - $latitudecenter = filter_input(INPUT_POST,'latitudecenter',FILTER_SANITIZE_STRING); |
|
| 999 | - $longitudecenter = filter_input(INPUT_POST,'longitudecenter',FILTER_SANITIZE_STRING); |
|
| 1000 | - $settings = array_merge($settings,array('globalCenterLatitude' => $latitudecenter,'globalCenterLongitude' => $longitudecenter)); |
|
| 998 | + $latitudecenter = filter_input(INPUT_POST, 'latitudecenter', FILTER_SANITIZE_STRING); |
|
| 999 | + $longitudecenter = filter_input(INPUT_POST, 'longitudecenter', FILTER_SANITIZE_STRING); |
|
| 1000 | + $settings = array_merge($settings, array('globalCenterLatitude' => $latitudecenter, 'globalCenterLongitude' => $longitudecenter)); |
|
| 1001 | 1001 | |
| 1002 | - $acars = filter_input(INPUT_POST,'acars',FILTER_SANITIZE_STRING); |
|
| 1002 | + $acars = filter_input(INPUT_POST, 'acars', FILTER_SANITIZE_STRING); |
|
| 1003 | 1003 | if ($acars == 'acars') { |
| 1004 | - $settings = array_merge($settings,array('globalACARS' => 'TRUE')); |
|
| 1004 | + $settings = array_merge($settings, array('globalACARS' => 'TRUE')); |
|
| 1005 | 1005 | } else { |
| 1006 | - $settings = array_merge($settings,array('globalACARS' => 'FALSE')); |
|
| 1006 | + $settings = array_merge($settings, array('globalACARS' => 'FALSE')); |
|
| 1007 | 1007 | } |
| 1008 | 1008 | |
| 1009 | - $flightawareusername = filter_input(INPUT_POST,'flightawareusername',FILTER_SANITIZE_STRING); |
|
| 1010 | - $flightawarepassword = filter_input(INPUT_POST,'flightawarepassword',FILTER_SANITIZE_STRING); |
|
| 1011 | - $settings = array_merge($settings,array('globalFlightAwareUsername' => $flightawareusername,'globalFlightAwarePassword' => $flightawarepassword)); |
|
| 1009 | + $flightawareusername = filter_input(INPUT_POST, 'flightawareusername', FILTER_SANITIZE_STRING); |
|
| 1010 | + $flightawarepassword = filter_input(INPUT_POST, 'flightawarepassword', FILTER_SANITIZE_STRING); |
|
| 1011 | + $settings = array_merge($settings, array('globalFlightAwareUsername' => $flightawareusername, 'globalFlightAwarePassword' => $flightawarepassword)); |
|
| 1012 | 1012 | |
| 1013 | 1013 | $source_name = $_POST['source_name']; |
| 1014 | 1014 | $source_latitude = $_POST['source_latitude']; |
@@ -1022,8 +1022,8 @@ discard block |
||
| 1022 | 1022 | |
| 1023 | 1023 | $sources = array(); |
| 1024 | 1024 | foreach ($source_name as $keys => $name) { |
| 1025 | - 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]); |
|
| 1026 | - 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]); |
|
| 1025 | + 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]); |
|
| 1026 | + 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]); |
|
| 1027 | 1027 | } |
| 1028 | 1028 | if (count($sources) > 0) $_SESSION['sources'] = $sources; |
| 1029 | 1029 | |
@@ -1036,27 +1036,27 @@ discard block |
||
| 1036 | 1036 | $sbsurl = $_POST['sbsurl']; |
| 1037 | 1037 | */ |
| 1038 | 1038 | |
| 1039 | - $globalvatsim = filter_input(INPUT_POST,'globalvatsim',FILTER_SANITIZE_STRING); |
|
| 1040 | - $globalva = filter_input(INPUT_POST,'globalva',FILTER_SANITIZE_STRING); |
|
| 1041 | - $globalivao = filter_input(INPUT_POST,'globalivao',FILTER_SANITIZE_STRING); |
|
| 1042 | - $globalphpvms = filter_input(INPUT_POST,'globalphpvms',FILTER_SANITIZE_STRING); |
|
| 1043 | - $globalvam = filter_input(INPUT_POST,'globalvam',FILTER_SANITIZE_STRING); |
|
| 1044 | - $globalsbs = filter_input(INPUT_POST,'globalsbs',FILTER_SANITIZE_STRING); |
|
| 1045 | - $globalaprs = filter_input(INPUT_POST,'globalaprs',FILTER_SANITIZE_STRING); |
|
| 1046 | - $datasource = filter_input(INPUT_POST,'datasource',FILTER_SANITIZE_STRING); |
|
| 1039 | + $globalvatsim = filter_input(INPUT_POST, 'globalvatsim', FILTER_SANITIZE_STRING); |
|
| 1040 | + $globalva = filter_input(INPUT_POST, 'globalva', FILTER_SANITIZE_STRING); |
|
| 1041 | + $globalivao = filter_input(INPUT_POST, 'globalivao', FILTER_SANITIZE_STRING); |
|
| 1042 | + $globalphpvms = filter_input(INPUT_POST, 'globalphpvms', FILTER_SANITIZE_STRING); |
|
| 1043 | + $globalvam = filter_input(INPUT_POST, 'globalvam', FILTER_SANITIZE_STRING); |
|
| 1044 | + $globalsbs = filter_input(INPUT_POST, 'globalsbs', FILTER_SANITIZE_STRING); |
|
| 1045 | + $globalaprs = filter_input(INPUT_POST, 'globalaprs', FILTER_SANITIZE_STRING); |
|
| 1046 | + $datasource = filter_input(INPUT_POST, 'datasource', FILTER_SANITIZE_STRING); |
|
| 1047 | 1047 | |
| 1048 | - $globalaircraft = filter_input(INPUT_POST,'globalaircraft',FILTER_SANITIZE_STRING); |
|
| 1049 | - if ($globalaircraft == 'aircraft') $settings = array_merge($settings,array('globalAircraft' => 'TRUE')); |
|
| 1050 | - else $settings = array_merge($settings,array('globalAircraft' => 'FALSE')); |
|
| 1051 | - $globaltracker = filter_input(INPUT_POST,'globaltracker',FILTER_SANITIZE_STRING); |
|
| 1052 | - if ($globaltracker == 'tracker') $settings = array_merge($settings,array('globalTracker' => 'TRUE')); |
|
| 1053 | - else $settings = array_merge($settings,array('globalTracker' => 'FALSE')); |
|
| 1054 | - $globalmarine = filter_input(INPUT_POST,'globalmarine',FILTER_SANITIZE_STRING); |
|
| 1055 | - if ($globalmarine == 'marine') $settings = array_merge($settings,array('globalMarine' => 'TRUE')); |
|
| 1056 | - else $settings = array_merge($settings,array('globalMarine' => 'FALSE')); |
|
| 1057 | - $globalsatellite = filter_input(INPUT_POST,'globalsatellite',FILTER_SANITIZE_STRING); |
|
| 1058 | - if ($globalsatellite == 'satellite') $settings = array_merge($settings,array('globalSatellite' => 'TRUE')); |
|
| 1059 | - else $settings = array_merge($settings,array('globalSatellite' => 'FALSE')); |
|
| 1048 | + $globalaircraft = filter_input(INPUT_POST, 'globalaircraft', FILTER_SANITIZE_STRING); |
|
| 1049 | + if ($globalaircraft == 'aircraft') $settings = array_merge($settings, array('globalAircraft' => 'TRUE')); |
|
| 1050 | + else $settings = array_merge($settings, array('globalAircraft' => 'FALSE')); |
|
| 1051 | + $globaltracker = filter_input(INPUT_POST, 'globaltracker', FILTER_SANITIZE_STRING); |
|
| 1052 | + if ($globaltracker == 'tracker') $settings = array_merge($settings, array('globalTracker' => 'TRUE')); |
|
| 1053 | + else $settings = array_merge($settings, array('globalTracker' => 'FALSE')); |
|
| 1054 | + $globalmarine = filter_input(INPUT_POST, 'globalmarine', FILTER_SANITIZE_STRING); |
|
| 1055 | + if ($globalmarine == 'marine') $settings = array_merge($settings, array('globalMarine' => 'TRUE')); |
|
| 1056 | + else $settings = array_merge($settings, array('globalMarine' => 'FALSE')); |
|
| 1057 | + $globalsatellite = filter_input(INPUT_POST, 'globalsatellite', FILTER_SANITIZE_STRING); |
|
| 1058 | + if ($globalsatellite == 'satellite') $settings = array_merge($settings, array('globalSatellite' => 'TRUE')); |
|
| 1059 | + else $settings = array_merge($settings, array('globalSatellite' => 'FALSE')); |
|
| 1060 | 1060 | |
| 1061 | 1061 | /* |
| 1062 | 1062 | $globalSBS1Hosts = array(); |
@@ -1072,7 +1072,7 @@ discard block |
||
| 1072 | 1072 | } |
| 1073 | 1073 | $settings = array_merge($settings,array('globalSBS1Hosts' => $globalSBS1Hosts)); |
| 1074 | 1074 | */ |
| 1075 | - $settings_comment = array_merge($settings_comment,array('globalSBS1Hosts')); |
|
| 1075 | + $settings_comment = array_merge($settings_comment, array('globalSBS1Hosts')); |
|
| 1076 | 1076 | $host = $_POST['host']; |
| 1077 | 1077 | $port = $_POST['port']; |
| 1078 | 1078 | $name = $_POST['name']; |
@@ -1089,104 +1089,104 @@ discard block |
||
| 1089 | 1089 | else $cov = 'FALSE'; |
| 1090 | 1090 | if (isset($noarchive[$key]) && $noarchive[$key] == 1) $arch = 'TRUE'; |
| 1091 | 1091 | else $arch = 'FALSE'; |
| 1092 | - if (strpos($format[$key],'_callback')) { |
|
| 1093 | - $gSources[] = array('host' => $h, 'pass' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'TRUE'); |
|
| 1092 | + if (strpos($format[$key], '_callback')) { |
|
| 1093 | + $gSources[] = array('host' => $h, 'pass' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov, 'noarchive' => $arch, 'timezone' => $timezones[$key], 'callback' => 'TRUE'); |
|
| 1094 | 1094 | } elseif ($h != '' || $name[$key] != '') { |
| 1095 | - $gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'FALSE'); |
|
| 1095 | + $gSources[] = array('host' => $h, 'port' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov, 'noarchive' => $arch, 'timezone' => $timezones[$key], 'callback' => 'FALSE'); |
|
| 1096 | 1096 | } |
| 1097 | 1097 | if ($format[$key] == 'airwhere') $forcepilots = true; |
| 1098 | 1098 | } |
| 1099 | - $settings = array_merge($settings,array('globalSources' => $gSources)); |
|
| 1099 | + $settings = array_merge($settings, array('globalSources' => $gSources)); |
|
| 1100 | 1100 | |
| 1101 | 1101 | /* |
| 1102 | 1102 | $sbstimeout = filter_input(INPUT_POST,'sbstimeout',FILTER_SANITIZE_NUMBER_INT); |
| 1103 | 1103 | $settings = array_merge($settings,array('globalSourcesTimeOut' => $sbstimeout)); |
| 1104 | 1104 | */ |
| 1105 | - $acarshost = filter_input(INPUT_POST,'acarshost',FILTER_SANITIZE_STRING); |
|
| 1106 | - $acarsport = filter_input(INPUT_POST,'acarsport',FILTER_SANITIZE_NUMBER_INT); |
|
| 1107 | - $settings = array_merge($settings,array('globalACARSHost' => $acarshost,'globalACARSPort' => $acarsport)); |
|
| 1105 | + $acarshost = filter_input(INPUT_POST, 'acarshost', FILTER_SANITIZE_STRING); |
|
| 1106 | + $acarsport = filter_input(INPUT_POST, 'acarsport', FILTER_SANITIZE_NUMBER_INT); |
|
| 1107 | + $settings = array_merge($settings, array('globalACARSHost' => $acarshost, 'globalACARSPort' => $acarsport)); |
|
| 1108 | 1108 | |
| 1109 | - $bitly = filter_input(INPUT_POST,'bitly',FILTER_SANITIZE_STRING); |
|
| 1110 | - $settings = array_merge($settings,array('globalBitlyAccessToken' => $bitly)); |
|
| 1109 | + $bitly = filter_input(INPUT_POST, 'bitly', FILTER_SANITIZE_STRING); |
|
| 1110 | + $settings = array_merge($settings, array('globalBitlyAccessToken' => $bitly)); |
|
| 1111 | 1111 | |
| 1112 | - $customcss = filter_input(INPUT_POST,'customcss',FILTER_SANITIZE_STRING); |
|
| 1113 | - $settings = array_merge($settings,array('globalCustomCSS' => $customcss)); |
|
| 1112 | + $customcss = filter_input(INPUT_POST, 'customcss', FILTER_SANITIZE_STRING); |
|
| 1113 | + $settings = array_merge($settings, array('globalCustomCSS' => $customcss)); |
|
| 1114 | 1114 | |
| 1115 | - $notamsource = filter_input(INPUT_POST,'notamsource',FILTER_SANITIZE_STRING); |
|
| 1116 | - $settings = array_merge($settings,array('globalNOTAMSource' => $notamsource)); |
|
| 1117 | - $metarsource = filter_input(INPUT_POST,'metarsource',FILTER_SANITIZE_STRING); |
|
| 1118 | - $settings = array_merge($settings,array('globalMETARurl' => $metarsource)); |
|
| 1115 | + $notamsource = filter_input(INPUT_POST, 'notamsource', FILTER_SANITIZE_STRING); |
|
| 1116 | + $settings = array_merge($settings, array('globalNOTAMSource' => $notamsource)); |
|
| 1117 | + $metarsource = filter_input(INPUT_POST, 'metarsource', FILTER_SANITIZE_STRING); |
|
| 1118 | + $settings = array_merge($settings, array('globalMETARurl' => $metarsource)); |
|
| 1119 | 1119 | |
| 1120 | - $zoilatitude = filter_input(INPUT_POST,'zoilatitude',FILTER_SANITIZE_STRING); |
|
| 1121 | - $zoilongitude = filter_input(INPUT_POST,'zoilongitude',FILTER_SANITIZE_STRING); |
|
| 1122 | - $zoidistance = filter_input(INPUT_POST,'zoidistance',FILTER_SANITIZE_NUMBER_INT); |
|
| 1120 | + $zoilatitude = filter_input(INPUT_POST, 'zoilatitude', FILTER_SANITIZE_STRING); |
|
| 1121 | + $zoilongitude = filter_input(INPUT_POST, 'zoilongitude', FILTER_SANITIZE_STRING); |
|
| 1122 | + $zoidistance = filter_input(INPUT_POST, 'zoidistance', FILTER_SANITIZE_NUMBER_INT); |
|
| 1123 | 1123 | if ($zoilatitude != '' && $zoilongitude != '' && $zoidistance != '') { |
| 1124 | - $settings = array_merge($settings,array('globalDistanceIgnore' => array('latitude' => $zoilatitude,'longitude' => $zoilongitude,'distance' => $zoidistance))); |
|
| 1125 | - } else $settings = array_merge($settings,array('globalDistanceIgnore' => array())); |
|
| 1124 | + $settings = array_merge($settings, array('globalDistanceIgnore' => array('latitude' => $zoilatitude, 'longitude' => $zoilongitude, 'distance' => $zoidistance))); |
|
| 1125 | + } else $settings = array_merge($settings, array('globalDistanceIgnore' => array())); |
|
| 1126 | 1126 | |
| 1127 | - $refresh = filter_input(INPUT_POST,'refresh',FILTER_SANITIZE_NUMBER_INT); |
|
| 1128 | - $settings = array_merge($settings,array('globalLiveInterval' => $refresh)); |
|
| 1129 | - $maprefresh = filter_input(INPUT_POST,'maprefresh',FILTER_SANITIZE_NUMBER_INT); |
|
| 1130 | - $settings = array_merge($settings,array('globalMapRefresh' => $maprefresh)); |
|
| 1131 | - $mapidle = filter_input(INPUT_POST,'mapidle',FILTER_SANITIZE_NUMBER_INT); |
|
| 1132 | - $settings = array_merge($settings,array('globalMapIdleTimeout' => $mapidle)); |
|
| 1133 | - $closestmindist = filter_input(INPUT_POST,'closestmindist',FILTER_SANITIZE_NUMBER_INT); |
|
| 1134 | - $settings = array_merge($settings,array('globalClosestMinDist' => $closestmindist)); |
|
| 1127 | + $refresh = filter_input(INPUT_POST, 'refresh', FILTER_SANITIZE_NUMBER_INT); |
|
| 1128 | + $settings = array_merge($settings, array('globalLiveInterval' => $refresh)); |
|
| 1129 | + $maprefresh = filter_input(INPUT_POST, 'maprefresh', FILTER_SANITIZE_NUMBER_INT); |
|
| 1130 | + $settings = array_merge($settings, array('globalMapRefresh' => $maprefresh)); |
|
| 1131 | + $mapidle = filter_input(INPUT_POST, 'mapidle', FILTER_SANITIZE_NUMBER_INT); |
|
| 1132 | + $settings = array_merge($settings, array('globalMapIdleTimeout' => $mapidle)); |
|
| 1133 | + $closestmindist = filter_input(INPUT_POST, 'closestmindist', FILTER_SANITIZE_NUMBER_INT); |
|
| 1134 | + $settings = array_merge($settings, array('globalClosestMinDist' => $closestmindist)); |
|
| 1135 | 1135 | |
| 1136 | - $aircraftsize = filter_input(INPUT_POST,'aircraftsize',FILTER_SANITIZE_NUMBER_INT); |
|
| 1137 | - $settings = array_merge($settings,array('globalAircraftSize' => $aircraftsize)); |
|
| 1136 | + $aircraftsize = filter_input(INPUT_POST, 'aircraftsize', FILTER_SANITIZE_NUMBER_INT); |
|
| 1137 | + $settings = array_merge($settings, array('globalAircraftSize' => $aircraftsize)); |
|
| 1138 | 1138 | |
| 1139 | - $archivemonths = filter_input(INPUT_POST,'archivemonths',FILTER_SANITIZE_NUMBER_INT); |
|
| 1140 | - $settings = array_merge($settings,array('globalArchiveMonths' => $archivemonths)); |
|
| 1139 | + $archivemonths = filter_input(INPUT_POST, 'archivemonths', FILTER_SANITIZE_NUMBER_INT); |
|
| 1140 | + $settings = array_merge($settings, array('globalArchiveMonths' => $archivemonths)); |
|
| 1141 | 1141 | |
| 1142 | - $archiveyear = filter_input(INPUT_POST,'archiveyear',FILTER_SANITIZE_STRING); |
|
| 1142 | + $archiveyear = filter_input(INPUT_POST, 'archiveyear', FILTER_SANITIZE_STRING); |
|
| 1143 | 1143 | if ($archiveyear == "archiveyear") { |
| 1144 | - $settings = array_merge($settings,array('globalArchiveYear' => 'TRUE')); |
|
| 1144 | + $settings = array_merge($settings, array('globalArchiveYear' => 'TRUE')); |
|
| 1145 | 1145 | } else { |
| 1146 | - $settings = array_merge($settings,array('globalArchiveYear' => 'FALSE')); |
|
| 1146 | + $settings = array_merge($settings, array('globalArchiveYear' => 'FALSE')); |
|
| 1147 | 1147 | } |
| 1148 | - $archivekeepmonths = filter_input(INPUT_POST,'archivekeepmonths',FILTER_SANITIZE_NUMBER_INT); |
|
| 1149 | - $settings = array_merge($settings,array('globalArchiveKeepMonths' => $archivekeepmonths)); |
|
| 1150 | - $archivekeeptrackmonths = filter_input(INPUT_POST,'archivekeeptrackmonths',FILTER_SANITIZE_NUMBER_INT); |
|
| 1151 | - $settings = array_merge($settings,array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths)); |
|
| 1148 | + $archivekeepmonths = filter_input(INPUT_POST, 'archivekeepmonths', FILTER_SANITIZE_NUMBER_INT); |
|
| 1149 | + $settings = array_merge($settings, array('globalArchiveKeepMonths' => $archivekeepmonths)); |
|
| 1150 | + $archivekeeptrackmonths = filter_input(INPUT_POST, 'archivekeeptrackmonths', FILTER_SANITIZE_NUMBER_INT); |
|
| 1151 | + $settings = array_merge($settings, array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths)); |
|
| 1152 | 1152 | |
| 1153 | - $britishairways = filter_input(INPUT_POST,'britishairways',FILTER_SANITIZE_STRING); |
|
| 1154 | - $settings = array_merge($settings,array('globalBritishAirwaysKey' => $britishairways)); |
|
| 1155 | - $transavia = filter_input(INPUT_POST,'transavia',FILTER_SANITIZE_STRING); |
|
| 1156 | - $settings = array_merge($settings,array('globalTransaviaKey' => $transavia)); |
|
| 1153 | + $britishairways = filter_input(INPUT_POST, 'britishairways', FILTER_SANITIZE_STRING); |
|
| 1154 | + $settings = array_merge($settings, array('globalBritishAirwaysKey' => $britishairways)); |
|
| 1155 | + $transavia = filter_input(INPUT_POST, 'transavia', FILTER_SANITIZE_STRING); |
|
| 1156 | + $settings = array_merge($settings, array('globalTransaviaKey' => $transavia)); |
|
| 1157 | 1157 | |
| 1158 | - $lufthansakey = filter_input(INPUT_POST,'lufthansakey',FILTER_SANITIZE_STRING); |
|
| 1159 | - $lufthansasecret = filter_input(INPUT_POST,'lufthansasecret',FILTER_SANITIZE_STRING); |
|
| 1160 | - $settings = array_merge($settings,array('globalLufthansaKey' => array('key' => $lufthansakey,'secret' => $lufthansasecret))); |
|
| 1158 | + $lufthansakey = filter_input(INPUT_POST, 'lufthansakey', FILTER_SANITIZE_STRING); |
|
| 1159 | + $lufthansasecret = filter_input(INPUT_POST, 'lufthansasecret', FILTER_SANITIZE_STRING); |
|
| 1160 | + $settings = array_merge($settings, array('globalLufthansaKey' => array('key' => $lufthansakey, 'secret' => $lufthansasecret))); |
|
| 1161 | 1161 | |
| 1162 | 1162 | // Create in settings.php keys not yet configurable if not already here |
| 1163 | 1163 | //if (!isset($globalImageBingKey)) $settings = array_merge($settings,array('globalImageBingKey' => '')); |
| 1164 | - if (!isset($globalDebug)) $settings = array_merge($settings,array('globalDebug' => 'TRUE')); |
|
| 1164 | + if (!isset($globalDebug)) $settings = array_merge($settings, array('globalDebug' => 'TRUE')); |
|
| 1165 | 1165 | |
| 1166 | - $resetyearstats = filter_input(INPUT_POST,'resetyearstats',FILTER_SANITIZE_STRING); |
|
| 1166 | + $resetyearstats = filter_input(INPUT_POST, 'resetyearstats', FILTER_SANITIZE_STRING); |
|
| 1167 | 1167 | if ($resetyearstats == 'resetyearstats') { |
| 1168 | - $settings = array_merge($settings,array('globalDeleteLastYearStats' => 'TRUE')); |
|
| 1168 | + $settings = array_merge($settings, array('globalDeleteLastYearStats' => 'TRUE')); |
|
| 1169 | 1169 | } else { |
| 1170 | - $settings = array_merge($settings,array('globalDeleteLastYearStats' => 'FALSE')); |
|
| 1170 | + $settings = array_merge($settings, array('globalDeleteLastYearStats' => 'FALSE')); |
|
| 1171 | 1171 | } |
| 1172 | 1172 | |
| 1173 | - $archive = filter_input(INPUT_POST,'archive',FILTER_SANITIZE_STRING); |
|
| 1173 | + $archive = filter_input(INPUT_POST, 'archive', FILTER_SANITIZE_STRING); |
|
| 1174 | 1174 | if ($archive == 'archive') { |
| 1175 | - $settings = array_merge($settings,array('globalArchive' => 'TRUE')); |
|
| 1175 | + $settings = array_merge($settings, array('globalArchive' => 'TRUE')); |
|
| 1176 | 1176 | } else { |
| 1177 | - $settings = array_merge($settings,array('globalArchive' => 'FALSE')); |
|
| 1177 | + $settings = array_merge($settings, array('globalArchive' => 'FALSE')); |
|
| 1178 | 1178 | } |
| 1179 | - $daemon = filter_input(INPUT_POST,'daemon',FILTER_SANITIZE_STRING); |
|
| 1179 | + $daemon = filter_input(INPUT_POST, 'daemon', FILTER_SANITIZE_STRING); |
|
| 1180 | 1180 | if ($daemon == 'daemon') { |
| 1181 | - $settings = array_merge($settings,array('globalDaemon' => 'TRUE')); |
|
| 1181 | + $settings = array_merge($settings, array('globalDaemon' => 'TRUE')); |
|
| 1182 | 1182 | } else { |
| 1183 | - $settings = array_merge($settings,array('globalDaemon' => 'FALSE')); |
|
| 1183 | + $settings = array_merge($settings, array('globalDaemon' => 'FALSE')); |
|
| 1184 | 1184 | } |
| 1185 | - $schedules = filter_input(INPUT_POST,'schedules',FILTER_SANITIZE_STRING); |
|
| 1185 | + $schedules = filter_input(INPUT_POST, 'schedules', FILTER_SANITIZE_STRING); |
|
| 1186 | 1186 | if ($schedules == 'schedules') { |
| 1187 | - $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE')); |
|
| 1187 | + $settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE')); |
|
| 1188 | 1188 | } else { |
| 1189 | - $settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE')); |
|
| 1189 | + $settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE')); |
|
| 1190 | 1190 | } |
| 1191 | 1191 | |
| 1192 | 1192 | /* |
@@ -1197,227 +1197,227 @@ discard block |
||
| 1197 | 1197 | $settings = array_merge($settings,array('globalFlightAware' => 'FALSE','globalSBS1' => 'TRUE')); |
| 1198 | 1198 | } |
| 1199 | 1199 | */ |
| 1200 | - $settings = array_merge($settings,array('globalFlightAware' => 'FALSE')); |
|
| 1201 | - if ($globalsbs == 'sbs') $settings = array_merge($settings,array('globalSBS1' => 'TRUE')); |
|
| 1202 | - else $settings = array_merge($settings,array('globalSBS1' => 'FALSE')); |
|
| 1203 | - if ($globalaprs == 'aprs') $settings = array_merge($settings,array('globalAPRS' => 'TRUE')); |
|
| 1204 | - else $settings = array_merge($settings,array('globalAPRS' => 'FALSE')); |
|
| 1200 | + $settings = array_merge($settings, array('globalFlightAware' => 'FALSE')); |
|
| 1201 | + if ($globalsbs == 'sbs') $settings = array_merge($settings, array('globalSBS1' => 'TRUE')); |
|
| 1202 | + else $settings = array_merge($settings, array('globalSBS1' => 'FALSE')); |
|
| 1203 | + if ($globalaprs == 'aprs') $settings = array_merge($settings, array('globalAPRS' => 'TRUE')); |
|
| 1204 | + else $settings = array_merge($settings, array('globalAPRS' => 'FALSE')); |
|
| 1205 | 1205 | $va = false; |
| 1206 | 1206 | if ($globalivao == 'ivao') { |
| 1207 | - $settings = array_merge($settings,array('globalIVAO' => 'TRUE')); |
|
| 1207 | + $settings = array_merge($settings, array('globalIVAO' => 'TRUE')); |
|
| 1208 | 1208 | $va = true; |
| 1209 | - } else $settings = array_merge($settings,array('globalIVAO' => 'FALSE')); |
|
| 1209 | + } else $settings = array_merge($settings, array('globalIVAO' => 'FALSE')); |
|
| 1210 | 1210 | if ($globalvatsim == 'vatsim') { |
| 1211 | - $settings = array_merge($settings,array('globalVATSIM' => 'TRUE')); |
|
| 1211 | + $settings = array_merge($settings, array('globalVATSIM' => 'TRUE')); |
|
| 1212 | 1212 | $va = true; |
| 1213 | - } else $settings = array_merge($settings,array('globalVATSIM' => 'FALSE')); |
|
| 1213 | + } else $settings = array_merge($settings, array('globalVATSIM' => 'FALSE')); |
|
| 1214 | 1214 | if ($globalphpvms == 'phpvms') { |
| 1215 | - $settings = array_merge($settings,array('globalphpVMS' => 'TRUE')); |
|
| 1215 | + $settings = array_merge($settings, array('globalphpVMS' => 'TRUE')); |
|
| 1216 | 1216 | $va = true; |
| 1217 | - } else $settings = array_merge($settings,array('globalphpVMS' => 'FALSE')); |
|
| 1217 | + } else $settings = array_merge($settings, array('globalphpVMS' => 'FALSE')); |
|
| 1218 | 1218 | if ($globalvam == 'vam') { |
| 1219 | - $settings = array_merge($settings,array('globalVAM' => 'TRUE')); |
|
| 1219 | + $settings = array_merge($settings, array('globalVAM' => 'TRUE')); |
|
| 1220 | 1220 | $va = true; |
| 1221 | - } else $settings = array_merge($settings,array('globalVAM' => 'FALSE')); |
|
| 1221 | + } else $settings = array_merge($settings, array('globalVAM' => 'FALSE')); |
|
| 1222 | 1222 | if ($va) { |
| 1223 | - $settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE','globalTranslationFetch' => 'FALSE')); |
|
| 1224 | - } else $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE')); |
|
| 1223 | + $settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE', 'globalTranslationFetch' => 'FALSE')); |
|
| 1224 | + } else $settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE', 'globalTranslationFetch' => 'TRUE')); |
|
| 1225 | 1225 | if ($globalva == 'va' || $va) { |
| 1226 | - $settings = array_merge($settings,array('globalVA' => 'TRUE')); |
|
| 1227 | - $settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE')); |
|
| 1226 | + $settings = array_merge($settings, array('globalVA' => 'TRUE')); |
|
| 1227 | + $settings = array_merge($settings, array('globalUsePilot' => 'TRUE', 'globalUseOwner' => 'FALSE')); |
|
| 1228 | 1228 | } else { |
| 1229 | - $settings = array_merge($settings,array('globalVA' => 'FALSE')); |
|
| 1230 | - if ($forcepilots) $settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE')); |
|
| 1231 | - else $settings = array_merge($settings,array('globalUsePilot' => 'FALSE','globalUseOwner' => 'TRUE')); |
|
| 1229 | + $settings = array_merge($settings, array('globalVA' => 'FALSE')); |
|
| 1230 | + if ($forcepilots) $settings = array_merge($settings, array('globalUsePilot' => 'TRUE', 'globalUseOwner' => 'FALSE')); |
|
| 1231 | + else $settings = array_merge($settings, array('globalUsePilot' => 'FALSE', 'globalUseOwner' => 'TRUE')); |
|
| 1232 | 1232 | } |
| 1233 | 1233 | |
| 1234 | 1234 | |
| 1235 | 1235 | |
| 1236 | - $notam = filter_input(INPUT_POST,'notam',FILTER_SANITIZE_STRING); |
|
| 1236 | + $notam = filter_input(INPUT_POST, 'notam', FILTER_SANITIZE_STRING); |
|
| 1237 | 1237 | if ($notam == 'notam') { |
| 1238 | - $settings = array_merge($settings,array('globalNOTAM' => 'TRUE')); |
|
| 1238 | + $settings = array_merge($settings, array('globalNOTAM' => 'TRUE')); |
|
| 1239 | 1239 | } else { |
| 1240 | - $settings = array_merge($settings,array('globalNOTAM' => 'FALSE')); |
|
| 1240 | + $settings = array_merge($settings, array('globalNOTAM' => 'FALSE')); |
|
| 1241 | 1241 | } |
| 1242 | - $owner = filter_input(INPUT_POST,'owner',FILTER_SANITIZE_STRING); |
|
| 1242 | + $owner = filter_input(INPUT_POST, 'owner', FILTER_SANITIZE_STRING); |
|
| 1243 | 1243 | if ($owner == 'owner') { |
| 1244 | - $settings = array_merge($settings,array('globalOwner' => 'TRUE')); |
|
| 1244 | + $settings = array_merge($settings, array('globalOwner' => 'TRUE')); |
|
| 1245 | 1245 | } else { |
| 1246 | - $settings = array_merge($settings,array('globalOwner' => 'FALSE')); |
|
| 1246 | + $settings = array_merge($settings, array('globalOwner' => 'FALSE')); |
|
| 1247 | 1247 | } |
| 1248 | - $map3d = filter_input(INPUT_POST,'map3d',FILTER_SANITIZE_STRING); |
|
| 1248 | + $map3d = filter_input(INPUT_POST, 'map3d', FILTER_SANITIZE_STRING); |
|
| 1249 | 1249 | if ($map3d == 'map3d') { |
| 1250 | - $settings = array_merge($settings,array('globalMap3D' => 'TRUE')); |
|
| 1250 | + $settings = array_merge($settings, array('globalMap3D' => 'TRUE')); |
|
| 1251 | 1251 | } else { |
| 1252 | - $settings = array_merge($settings,array('globalMap3D' => 'FALSE')); |
|
| 1252 | + $settings = array_merge($settings, array('globalMap3D' => 'FALSE')); |
|
| 1253 | 1253 | } |
| 1254 | - $crash = filter_input(INPUT_POST,'crash',FILTER_SANITIZE_STRING); |
|
| 1254 | + $crash = filter_input(INPUT_POST, 'crash', FILTER_SANITIZE_STRING); |
|
| 1255 | 1255 | if ($crash == 'crash') { |
| 1256 | - $settings = array_merge($settings,array('globalAccidents' => 'TRUE')); |
|
| 1256 | + $settings = array_merge($settings, array('globalAccidents' => 'TRUE')); |
|
| 1257 | 1257 | } else { |
| 1258 | - $settings = array_merge($settings,array('globalAccidents' => 'FALSE')); |
|
| 1258 | + $settings = array_merge($settings, array('globalAccidents' => 'FALSE')); |
|
| 1259 | 1259 | } |
| 1260 | - $mapsatellites = filter_input(INPUT_POST,'mapsatellites',FILTER_SANITIZE_STRING); |
|
| 1260 | + $mapsatellites = filter_input(INPUT_POST, 'mapsatellites', FILTER_SANITIZE_STRING); |
|
| 1261 | 1261 | if ($mapsatellites == 'mapsatellites') { |
| 1262 | - $settings = array_merge($settings,array('globalMapSatellites' => 'TRUE')); |
|
| 1262 | + $settings = array_merge($settings, array('globalMapSatellites' => 'TRUE')); |
|
| 1263 | 1263 | } else { |
| 1264 | - $settings = array_merge($settings,array('globalMapSatellites' => 'FALSE')); |
|
| 1264 | + $settings = array_merge($settings, array('globalMapSatellites' => 'FALSE')); |
|
| 1265 | 1265 | } |
| 1266 | - $map3ddefault = filter_input(INPUT_POST,'map3ddefault',FILTER_SANITIZE_STRING); |
|
| 1266 | + $map3ddefault = filter_input(INPUT_POST, 'map3ddefault', FILTER_SANITIZE_STRING); |
|
| 1267 | 1267 | if ($map3ddefault == 'map3ddefault') { |
| 1268 | - $settings = array_merge($settings,array('globalMap3Ddefault' => 'TRUE')); |
|
| 1268 | + $settings = array_merge($settings, array('globalMap3Ddefault' => 'TRUE')); |
|
| 1269 | 1269 | } else { |
| 1270 | - $settings = array_merge($settings,array('globalMap3Ddefault' => 'FALSE')); |
|
| 1270 | + $settings = array_merge($settings, array('globalMap3Ddefault' => 'FALSE')); |
|
| 1271 | 1271 | } |
| 1272 | - $translate = filter_input(INPUT_POST,'translate',FILTER_SANITIZE_STRING); |
|
| 1272 | + $translate = filter_input(INPUT_POST, 'translate', FILTER_SANITIZE_STRING); |
|
| 1273 | 1273 | if ($translate == 'translate') { |
| 1274 | - $settings = array_merge($settings,array('globalTranslate' => 'TRUE')); |
|
| 1274 | + $settings = array_merge($settings, array('globalTranslate' => 'TRUE')); |
|
| 1275 | 1275 | } else { |
| 1276 | - $settings = array_merge($settings,array('globalTranslate' => 'FALSE')); |
|
| 1276 | + $settings = array_merge($settings, array('globalTranslate' => 'FALSE')); |
|
| 1277 | 1277 | } |
| 1278 | - $realairlines = filter_input(INPUT_POST,'realairlines',FILTER_SANITIZE_STRING); |
|
| 1278 | + $realairlines = filter_input(INPUT_POST, 'realairlines', FILTER_SANITIZE_STRING); |
|
| 1279 | 1279 | if ($realairlines == 'realairlines') { |
| 1280 | - $settings = array_merge($settings,array('globalUseRealAirlines' => 'TRUE')); |
|
| 1280 | + $settings = array_merge($settings, array('globalUseRealAirlines' => 'TRUE')); |
|
| 1281 | 1281 | } else { |
| 1282 | - $settings = array_merge($settings,array('globalUseRealAirlines' => 'FALSE')); |
|
| 1282 | + $settings = array_merge($settings, array('globalUseRealAirlines' => 'FALSE')); |
|
| 1283 | 1283 | } |
| 1284 | - $estimation = filter_input(INPUT_POST,'estimation',FILTER_SANITIZE_STRING); |
|
| 1284 | + $estimation = filter_input(INPUT_POST, 'estimation', FILTER_SANITIZE_STRING); |
|
| 1285 | 1285 | if ($estimation == 'estimation') { |
| 1286 | - $settings = array_merge($settings,array('globalMapEstimation' => 'TRUE')); |
|
| 1286 | + $settings = array_merge($settings, array('globalMapEstimation' => 'TRUE')); |
|
| 1287 | 1287 | } else { |
| 1288 | - $settings = array_merge($settings,array('globalMapEstimation' => 'FALSE')); |
|
| 1288 | + $settings = array_merge($settings, array('globalMapEstimation' => 'FALSE')); |
|
| 1289 | 1289 | } |
| 1290 | - $metar = filter_input(INPUT_POST,'metar',FILTER_SANITIZE_STRING); |
|
| 1290 | + $metar = filter_input(INPUT_POST, 'metar', FILTER_SANITIZE_STRING); |
|
| 1291 | 1291 | if ($metar == 'metar') { |
| 1292 | - $settings = array_merge($settings,array('globalMETAR' => 'TRUE')); |
|
| 1292 | + $settings = array_merge($settings, array('globalMETAR' => 'TRUE')); |
|
| 1293 | 1293 | } else { |
| 1294 | - $settings = array_merge($settings,array('globalMETAR' => 'FALSE')); |
|
| 1294 | + $settings = array_merge($settings, array('globalMETAR' => 'FALSE')); |
|
| 1295 | 1295 | } |
| 1296 | - $metarcycle = filter_input(INPUT_POST,'metarcycle',FILTER_SANITIZE_STRING); |
|
| 1296 | + $metarcycle = filter_input(INPUT_POST, 'metarcycle', FILTER_SANITIZE_STRING); |
|
| 1297 | 1297 | if ($metarcycle == 'metarcycle') { |
| 1298 | - $settings = array_merge($settings,array('globalMETARcycle' => 'TRUE')); |
|
| 1298 | + $settings = array_merge($settings, array('globalMETARcycle' => 'TRUE')); |
|
| 1299 | 1299 | } else { |
| 1300 | - $settings = array_merge($settings,array('globalMETARcycle' => 'FALSE')); |
|
| 1300 | + $settings = array_merge($settings, array('globalMETARcycle' => 'FALSE')); |
|
| 1301 | 1301 | } |
| 1302 | - $fork = filter_input(INPUT_POST,'fork',FILTER_SANITIZE_STRING); |
|
| 1302 | + $fork = filter_input(INPUT_POST, 'fork', FILTER_SANITIZE_STRING); |
|
| 1303 | 1303 | if ($fork == 'fork') { |
| 1304 | - $settings = array_merge($settings,array('globalFork' => 'TRUE')); |
|
| 1304 | + $settings = array_merge($settings, array('globalFork' => 'TRUE')); |
|
| 1305 | 1305 | } else { |
| 1306 | - $settings = array_merge($settings,array('globalFork' => 'FALSE')); |
|
| 1306 | + $settings = array_merge($settings, array('globalFork' => 'FALSE')); |
|
| 1307 | 1307 | } |
| 1308 | 1308 | |
| 1309 | - $colormap = filter_input(INPUT_POST,'colormap',FILTER_SANITIZE_STRING); |
|
| 1309 | + $colormap = filter_input(INPUT_POST, 'colormap', FILTER_SANITIZE_STRING); |
|
| 1310 | 1310 | if ($colormap == 'colormap') { |
| 1311 | - $settings = array_merge($settings,array('globalMapAltitudeColor' => 'TRUE')); |
|
| 1311 | + $settings = array_merge($settings, array('globalMapAltitudeColor' => 'TRUE')); |
|
| 1312 | 1312 | } else { |
| 1313 | - $settings = array_merge($settings,array('globalMapAltitudeColor' => 'FALSE')); |
|
| 1313 | + $settings = array_merge($settings, array('globalMapAltitudeColor' => 'FALSE')); |
|
| 1314 | 1314 | } |
| 1315 | 1315 | |
| 1316 | 1316 | if (isset($_POST['aircrafticoncolor'])) { |
| 1317 | - $aircrafticoncolor = filter_input(INPUT_POST,'aircrafticoncolor',FILTER_SANITIZE_STRING); |
|
| 1318 | - $settings = array_merge($settings,array('globalAircraftIconColor' => substr($aircrafticoncolor,1))); |
|
| 1317 | + $aircrafticoncolor = filter_input(INPUT_POST, 'aircrafticoncolor', FILTER_SANITIZE_STRING); |
|
| 1318 | + $settings = array_merge($settings, array('globalAircraftIconColor' => substr($aircrafticoncolor, 1))); |
|
| 1319 | 1319 | } |
| 1320 | 1320 | |
| 1321 | - $airportzoom = filter_input(INPUT_POST,'airportzoom',FILTER_SANITIZE_NUMBER_INT); |
|
| 1322 | - $settings = array_merge($settings,array('globalAirportZoom' => $airportzoom)); |
|
| 1321 | + $airportzoom = filter_input(INPUT_POST, 'airportzoom', FILTER_SANITIZE_NUMBER_INT); |
|
| 1322 | + $settings = array_merge($settings, array('globalAirportZoom' => $airportzoom)); |
|
| 1323 | 1323 | |
| 1324 | - $unitdistance = filter_input(INPUT_POST,'unitdistance',FILTER_SANITIZE_STRING); |
|
| 1325 | - $settings = array_merge($settings,array('globalUnitDistance' => $unitdistance)); |
|
| 1326 | - $unitaltitude = filter_input(INPUT_POST,'unitaltitude',FILTER_SANITIZE_STRING); |
|
| 1327 | - $settings = array_merge($settings,array('globalUnitAltitude' => $unitaltitude)); |
|
| 1328 | - $unitspeed = filter_input(INPUT_POST,'unitspeed',FILTER_SANITIZE_STRING); |
|
| 1329 | - $settings = array_merge($settings,array('globalUnitSpeed' => $unitspeed)); |
|
| 1324 | + $unitdistance = filter_input(INPUT_POST, 'unitdistance', FILTER_SANITIZE_STRING); |
|
| 1325 | + $settings = array_merge($settings, array('globalUnitDistance' => $unitdistance)); |
|
| 1326 | + $unitaltitude = filter_input(INPUT_POST, 'unitaltitude', FILTER_SANITIZE_STRING); |
|
| 1327 | + $settings = array_merge($settings, array('globalUnitAltitude' => $unitaltitude)); |
|
| 1328 | + $unitspeed = filter_input(INPUT_POST, 'unitspeed', FILTER_SANITIZE_STRING); |
|
| 1329 | + $settings = array_merge($settings, array('globalUnitSpeed' => $unitspeed)); |
|
| 1330 | 1330 | |
| 1331 | - $mappopup = filter_input(INPUT_POST,'mappopup',FILTER_SANITIZE_STRING); |
|
| 1331 | + $mappopup = filter_input(INPUT_POST, 'mappopup', FILTER_SANITIZE_STRING); |
|
| 1332 | 1332 | if ($mappopup == 'mappopup') { |
| 1333 | - $settings = array_merge($settings,array('globalMapPopup' => 'TRUE')); |
|
| 1333 | + $settings = array_merge($settings, array('globalMapPopup' => 'TRUE')); |
|
| 1334 | 1334 | } else { |
| 1335 | - $settings = array_merge($settings,array('globalMapPopup' => 'FALSE')); |
|
| 1335 | + $settings = array_merge($settings, array('globalMapPopup' => 'FALSE')); |
|
| 1336 | 1336 | } |
| 1337 | - $airportpopup = filter_input(INPUT_POST,'airportpopup',FILTER_SANITIZE_STRING); |
|
| 1337 | + $airportpopup = filter_input(INPUT_POST, 'airportpopup', FILTER_SANITIZE_STRING); |
|
| 1338 | 1338 | if ($airportpopup == 'airportpopup') { |
| 1339 | - $settings = array_merge($settings,array('globalAirportPopup' => 'TRUE')); |
|
| 1339 | + $settings = array_merge($settings, array('globalAirportPopup' => 'TRUE')); |
|
| 1340 | 1340 | } else { |
| 1341 | - $settings = array_merge($settings,array('globalAirportPopup' => 'FALSE')); |
|
| 1341 | + $settings = array_merge($settings, array('globalAirportPopup' => 'FALSE')); |
|
| 1342 | 1342 | } |
| 1343 | - $maphistory = filter_input(INPUT_POST,'maphistory',FILTER_SANITIZE_STRING); |
|
| 1343 | + $maphistory = filter_input(INPUT_POST, 'maphistory', FILTER_SANITIZE_STRING); |
|
| 1344 | 1344 | if ($maphistory == 'maphistory') { |
| 1345 | - $settings = array_merge($settings,array('globalMapHistory' => 'TRUE')); |
|
| 1345 | + $settings = array_merge($settings, array('globalMapHistory' => 'TRUE')); |
|
| 1346 | 1346 | } else { |
| 1347 | - $settings = array_merge($settings,array('globalMapHistory' => 'FALSE')); |
|
| 1347 | + $settings = array_merge($settings, array('globalMapHistory' => 'FALSE')); |
|
| 1348 | 1348 | } |
| 1349 | - $maptooltip = filter_input(INPUT_POST,'maptooltip',FILTER_SANITIZE_STRING); |
|
| 1349 | + $maptooltip = filter_input(INPUT_POST, 'maptooltip', FILTER_SANITIZE_STRING); |
|
| 1350 | 1350 | if ($maptooltip == 'maptooltip') { |
| 1351 | - $settings = array_merge($settings,array('globalMapTooltip' => 'TRUE')); |
|
| 1351 | + $settings = array_merge($settings, array('globalMapTooltip' => 'TRUE')); |
|
| 1352 | 1352 | } else { |
| 1353 | - $settings = array_merge($settings,array('globalMapTooltip' => 'FALSE')); |
|
| 1353 | + $settings = array_merge($settings, array('globalMapTooltip' => 'FALSE')); |
|
| 1354 | 1354 | } |
| 1355 | - $flightroute = filter_input(INPUT_POST,'flightroute',FILTER_SANITIZE_STRING); |
|
| 1355 | + $flightroute = filter_input(INPUT_POST, 'flightroute', FILTER_SANITIZE_STRING); |
|
| 1356 | 1356 | if ($flightroute == 'flightroute') { |
| 1357 | - $settings = array_merge($settings,array('globalMapRoute' => 'TRUE')); |
|
| 1357 | + $settings = array_merge($settings, array('globalMapRoute' => 'TRUE')); |
|
| 1358 | 1358 | } else { |
| 1359 | - $settings = array_merge($settings,array('globalMapRoute' => 'FALSE')); |
|
| 1359 | + $settings = array_merge($settings, array('globalMapRoute' => 'FALSE')); |
|
| 1360 | 1360 | } |
| 1361 | - $flightremainingroute = filter_input(INPUT_POST,'flightremainingroute',FILTER_SANITIZE_STRING); |
|
| 1361 | + $flightremainingroute = filter_input(INPUT_POST, 'flightremainingroute', FILTER_SANITIZE_STRING); |
|
| 1362 | 1362 | if ($flightremainingroute == 'flightremainingroute') { |
| 1363 | - $settings = array_merge($settings,array('globalMapRemainingRoute' => 'TRUE')); |
|
| 1363 | + $settings = array_merge($settings, array('globalMapRemainingRoute' => 'TRUE')); |
|
| 1364 | 1364 | } else { |
| 1365 | - $settings = array_merge($settings,array('globalMapRemainingRoute' => 'FALSE')); |
|
| 1365 | + $settings = array_merge($settings, array('globalMapRemainingRoute' => 'FALSE')); |
|
| 1366 | 1366 | } |
| 1367 | - $allflights = filter_input(INPUT_POST,'allflights',FILTER_SANITIZE_STRING); |
|
| 1367 | + $allflights = filter_input(INPUT_POST, 'allflights', FILTER_SANITIZE_STRING); |
|
| 1368 | 1368 | if ($allflights == 'allflights') { |
| 1369 | - $settings = array_merge($settings,array('globalAllFlights' => 'TRUE')); |
|
| 1369 | + $settings = array_merge($settings, array('globalAllFlights' => 'TRUE')); |
|
| 1370 | 1370 | } else { |
| 1371 | - $settings = array_merge($settings,array('globalAllFlights' => 'FALSE')); |
|
| 1371 | + $settings = array_merge($settings, array('globalAllFlights' => 'FALSE')); |
|
| 1372 | 1372 | } |
| 1373 | - $bbox = filter_input(INPUT_POST,'bbox',FILTER_SANITIZE_STRING); |
|
| 1373 | + $bbox = filter_input(INPUT_POST, 'bbox', FILTER_SANITIZE_STRING); |
|
| 1374 | 1374 | if ($bbox == 'bbox') { |
| 1375 | - $settings = array_merge($settings,array('globalMapUseBbox' => 'TRUE')); |
|
| 1375 | + $settings = array_merge($settings, array('globalMapUseBbox' => 'TRUE')); |
|
| 1376 | 1376 | } else { |
| 1377 | - $settings = array_merge($settings,array('globalMapUseBbox' => 'FALSE')); |
|
| 1377 | + $settings = array_merge($settings, array('globalMapUseBbox' => 'FALSE')); |
|
| 1378 | 1378 | } |
| 1379 | - $groundaltitude = filter_input(INPUT_POST,'groundaltitude',FILTER_SANITIZE_STRING); |
|
| 1379 | + $groundaltitude = filter_input(INPUT_POST, 'groundaltitude', FILTER_SANITIZE_STRING); |
|
| 1380 | 1380 | if ($groundaltitude == 'groundaltitude') { |
| 1381 | - $settings = array_merge($settings,array('globalGroundAltitude' => 'TRUE')); |
|
| 1381 | + $settings = array_merge($settings, array('globalGroundAltitude' => 'TRUE')); |
|
| 1382 | 1382 | } else { |
| 1383 | - $settings = array_merge($settings,array('globalGroundAltitude' => 'FALSE')); |
|
| 1383 | + $settings = array_merge($settings, array('globalGroundAltitude' => 'FALSE')); |
|
| 1384 | 1384 | } |
| 1385 | - $waypoints = filter_input(INPUT_POST,'waypoints',FILTER_SANITIZE_STRING); |
|
| 1385 | + $waypoints = filter_input(INPUT_POST, 'waypoints', FILTER_SANITIZE_STRING); |
|
| 1386 | 1386 | if ($waypoints == 'waypoints') { |
| 1387 | - $settings = array_merge($settings,array('globalWaypoints' => 'TRUE')); |
|
| 1387 | + $settings = array_merge($settings, array('globalWaypoints' => 'TRUE')); |
|
| 1388 | 1388 | } else { |
| 1389 | - $settings = array_merge($settings,array('globalWaypoints' => 'FALSE')); |
|
| 1389 | + $settings = array_merge($settings, array('globalWaypoints' => 'FALSE')); |
|
| 1390 | 1390 | } |
| 1391 | - $geoid = filter_input(INPUT_POST,'geoid',FILTER_SANITIZE_STRING); |
|
| 1391 | + $geoid = filter_input(INPUT_POST, 'geoid', FILTER_SANITIZE_STRING); |
|
| 1392 | 1392 | if ($geoid == 'geoid') { |
| 1393 | - $settings = array_merge($settings,array('globalGeoid' => 'TRUE')); |
|
| 1393 | + $settings = array_merge($settings, array('globalGeoid' => 'TRUE')); |
|
| 1394 | 1394 | } else { |
| 1395 | - $settings = array_merge($settings,array('globalGeoid' => 'FALSE')); |
|
| 1395 | + $settings = array_merge($settings, array('globalGeoid' => 'FALSE')); |
|
| 1396 | 1396 | } |
| 1397 | - $geoid_source = filter_input(INPUT_POST,'geoid_source',FILTER_SANITIZE_STRING); |
|
| 1398 | - $settings = array_merge($settings,array('globalGeoidSource' => $geoid_source)); |
|
| 1397 | + $geoid_source = filter_input(INPUT_POST, 'geoid_source', FILTER_SANITIZE_STRING); |
|
| 1398 | + $settings = array_merge($settings, array('globalGeoidSource' => $geoid_source)); |
|
| 1399 | 1399 | |
| 1400 | - $noairlines = filter_input(INPUT_POST,'noairlines',FILTER_SANITIZE_STRING); |
|
| 1400 | + $noairlines = filter_input(INPUT_POST, 'noairlines', FILTER_SANITIZE_STRING); |
|
| 1401 | 1401 | if ($noairlines == 'noairlines') { |
| 1402 | - $settings = array_merge($settings,array('globalNoAirlines' => 'TRUE')); |
|
| 1402 | + $settings = array_merge($settings, array('globalNoAirlines' => 'TRUE')); |
|
| 1403 | 1403 | } else { |
| 1404 | - $settings = array_merge($settings,array('globalNoAirlines' => 'FALSE')); |
|
| 1404 | + $settings = array_merge($settings, array('globalNoAirlines' => 'FALSE')); |
|
| 1405 | 1405 | } |
| 1406 | 1406 | |
| 1407 | - if (!isset($globalTransaction)) $settings = array_merge($settings,array('globalTransaction' => 'TRUE')); |
|
| 1407 | + if (!isset($globalTransaction)) $settings = array_merge($settings, array('globalTransaction' => 'TRUE')); |
|
| 1408 | 1408 | |
| 1409 | 1409 | // Set some defaults values... |
| 1410 | 1410 | if (!isset($globalAircraftImageSources)) { |
| 1411 | - $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters'); |
|
| 1412 | - $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources)); |
|
| 1411 | + $globalAircraftImageSources = array('ivaomtl', 'wikimedia', 'airportdata', 'deviantart', 'flickr', 'bing', 'jetphotos', 'planepictures', 'planespotters'); |
|
| 1412 | + $settings = array_merge($settings, array('globalAircraftImageSources' => $globalAircraftImageSources)); |
|
| 1413 | 1413 | } |
| 1414 | 1414 | |
| 1415 | 1415 | if (!isset($globalSchedulesSources)) { |
| 1416 | - $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware'); |
|
| 1417 | - $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources)); |
|
| 1416 | + $globalSchedulesSources = array('flightmapper', 'costtotravel', 'flightradar24', 'flightaware'); |
|
| 1417 | + $settings = array_merge($settings, array('globalSchedulesSources' => $globalSchedulesSources)); |
|
| 1418 | 1418 | } |
| 1419 | 1419 | |
| 1420 | - $settings = array_merge($settings,array('globalInstalled' => 'TRUE')); |
|
| 1420 | + $settings = array_merge($settings, array('globalInstalled' => 'TRUE')); |
|
| 1421 | 1421 | |
| 1422 | 1422 | if ($error == '') settings::modify_settings($settings); |
| 1423 | 1423 | if ($error == '') settings::comment_settings($settings_comment); |
