Ysurac /
FlightAirMap
@@ -305,17 +305,17 @@ discard block |
||
| 305 | 305 | </tr> |
| 306 | 306 | <!-- |
| 307 | 307 | <?php |
| 308 | - require_once(dirname(__FILE__).'/../require/class.Connection.php'); |
|
| 309 | - $Connection = new Connection(); |
|
| 308 | + require_once(dirname(__FILE__).'/../require/class.Connection.php'); |
|
| 309 | + $Connection = new Connection(); |
|
| 310 | 310 | ?> |
| 311 | 311 | --> |
| 312 | 312 | <?php |
| 313 | - if ($Connection->db != NULL) { |
|
| 313 | + if ($Connection->db != NULL) { |
|
| 314 | 314 | if ($Connection->tableExists('source_location')) { |
| 315 | - require_once(dirname(__FILE__).'/../require/class.Source.php'); |
|
| 316 | - $Source = new Source(); |
|
| 317 | - $alllocations = $Source->getAllLocationInfo(); |
|
| 318 | - foreach ($alllocations as $location) { |
|
| 315 | + require_once(dirname(__FILE__).'/../require/class.Source.php'); |
|
| 316 | + $Source = new Source(); |
|
| 317 | + $alllocations = $Source->getAllLocationInfo(); |
|
| 318 | + foreach ($alllocations as $location) { |
|
| 319 | 319 | ?> |
| 320 | 320 | <tr> |
| 321 | 321 | <input type="hidden" name="source_id[]" value="<?php print $location['id']; ?>" /> |
@@ -329,9 +329,9 @@ discard block |
||
| 329 | 329 | </tr> |
| 330 | 330 | |
| 331 | 331 | <?php |
| 332 | - } |
|
| 332 | + } |
|
| 333 | + } |
|
| 333 | 334 | } |
| 334 | - } |
|
| 335 | 335 | ?> |
| 336 | 336 | |
| 337 | 337 | <tr> |
@@ -424,12 +424,12 @@ discard block |
||
| 424 | 424 | ?> |
| 425 | 425 | <tr> |
| 426 | 426 | <?php |
| 427 | - if (filter_var($source['host'],FILTER_VALIDATE_URL)) { |
|
| 427 | + if (filter_var($source['host'],FILTER_VALIDATE_URL)) { |
|
| 428 | 428 | ?> |
| 429 | 429 | <td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td> |
| 430 | 430 | <td><input type="number" name="port[]" id="port" value="<?php print $source['port']; ?>" /></td> |
| 431 | 431 | <?php |
| 432 | - } else { |
|
| 432 | + } else { |
|
| 433 | 433 | $hostport = explode(':',$source['host']); |
| 434 | 434 | if (isset($hostport[1])) { |
| 435 | 435 | $host = $hostport[0]; |
@@ -442,7 +442,7 @@ discard block |
||
| 442 | 442 | <td><input type="text" name="host[]" id="host" value="<?php print $host; ?>" /></td> |
| 443 | 443 | <td><input type="number" name="port[]" id="port" value="<?php print $port; ?>" /></td> |
| 444 | 444 | <?php |
| 445 | - } |
|
| 445 | + } |
|
| 446 | 446 | ?> |
| 447 | 447 | <td> |
| 448 | 448 | <select name="format[]" id="format"> |
@@ -758,7 +758,7 @@ discard block |
||
| 758 | 758 | <br /> |
| 759 | 759 | <p> |
| 760 | 760 | <?php |
| 761 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 761 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 762 | 762 | ?> |
| 763 | 763 | <label for="aircrafticoncolor">Color of aircraft icon on map</label> |
| 764 | 764 | <input type="color" name="aircrafticoncolor" id="aircrafticoncolor" value="#<?php if (isset($globalAircraftIconColor)) echo $globalAircraftIconColor; else echo '1a3151'; ?>" /> |
@@ -768,11 +768,11 @@ discard block |
||
| 768 | 768 | <b>The directory cache is not writable, aircraft icon will not be cached</b> |
| 769 | 769 | <?php |
| 770 | 770 | } |
| 771 | - } else { |
|
| 771 | + } else { |
|
| 772 | 772 | ?> |
| 773 | 773 | <b>PHP GD is not installed, you can t change color of aircraft icon on map</b> |
| 774 | 774 | <?php |
| 775 | - } |
|
| 775 | + } |
|
| 776 | 776 | ?> |
| 777 | 777 | </p> |
| 778 | 778 | <br /> |
@@ -791,7 +791,7 @@ discard block |
||
| 791 | 791 | </p> |
| 792 | 792 | <?php |
| 793 | 793 | require('../footer.php'); |
| 794 | - exit; |
|
| 794 | + exit; |
|
| 795 | 795 | } |
| 796 | 796 | |
| 797 | 797 | $settings = array(); |
@@ -881,8 +881,8 @@ discard block |
||
| 881 | 881 | |
| 882 | 882 | $sources = array(); |
| 883 | 883 | foreach ($source_name as $keys => $name) { |
| 884 | - 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]); |
|
| 885 | - 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]); |
|
| 884 | + 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]); |
|
| 885 | + 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]); |
|
| 886 | 886 | } |
| 887 | 887 | if (count($sources) > 0) $_SESSION['sources'] = $sources; |
| 888 | 888 | |
@@ -1176,14 +1176,14 @@ discard block |
||
| 1176 | 1176 | |
| 1177 | 1177 | // Set some defaults values... |
| 1178 | 1178 | if (!isset($globalAircraftImageSources)) { |
| 1179 | - $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters'); |
|
| 1180 | - $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources)); |
|
| 1179 | + $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters'); |
|
| 1180 | + $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources)); |
|
| 1181 | 1181 | } |
| 1182 | 1182 | |
| 1183 | 1183 | if (!isset($globalSchedulesSources)) { |
| 1184 | - $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware'); |
|
| 1185 | - $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources)); |
|
| 1186 | - } |
|
| 1184 | + $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware'); |
|
| 1185 | + $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources)); |
|
| 1186 | + } |
|
| 1187 | 1187 | |
| 1188 | 1188 | $settings = array_merge($settings,array('globalInstalled' => 'TRUE')); |
| 1189 | 1189 | |
@@ -1235,21 +1235,21 @@ discard block |
||
| 1235 | 1235 | $popi = false; |
| 1236 | 1236 | $popw = false; |
| 1237 | 1237 | foreach ($_SESSION['done'] as $done) { |
| 1238 | - print '<li>'.$done.'....<strong>SUCCESS</strong></li>'; |
|
| 1239 | - if ($done == 'Create database') $pop = true; |
|
| 1240 | - if ($_SESSION['install'] == 'database_create') $pop = true; |
|
| 1241 | - if ($_SESSION['install'] == 'database_import') $popi = true; |
|
| 1242 | - if ($_SESSION['install'] == 'waypoints') $popw = true; |
|
| 1238 | + print '<li>'.$done.'....<strong>SUCCESS</strong></li>'; |
|
| 1239 | + if ($done == 'Create database') $pop = true; |
|
| 1240 | + if ($_SESSION['install'] == 'database_create') $pop = true; |
|
| 1241 | + if ($_SESSION['install'] == 'database_import') $popi = true; |
|
| 1242 | + if ($_SESSION['install'] == 'waypoints') $popw = true; |
|
| 1243 | 1243 | } |
| 1244 | 1244 | if ($pop) { |
| 1245 | - sleep(5); |
|
| 1246 | - print '<li>Create database....<img src="../images/loading.gif" /></li>'; |
|
| 1245 | + sleep(5); |
|
| 1246 | + print '<li>Create database....<img src="../images/loading.gif" /></li>'; |
|
| 1247 | 1247 | } else if ($popi) { |
| 1248 | - sleep(5); |
|
| 1249 | - print '<li>Create and import tables....<img src="../images/loading.gif" /></li>'; |
|
| 1248 | + sleep(5); |
|
| 1249 | + print '<li>Create and import tables....<img src="../images/loading.gif" /></li>'; |
|
| 1250 | 1250 | } else if ($popw) { |
| 1251 | - sleep(5); |
|
| 1252 | - print '<li>Populate waypoints database....<img src="../images/loading.gif" /></li>'; |
|
| 1251 | + sleep(5); |
|
| 1252 | + print '<li>Populate waypoints database....<img src="../images/loading.gif" /></li>'; |
|
| 1253 | 1253 | } else print '<li>Update schema if needed....<img src="../images/loading.gif" /></li>'; |
| 1254 | 1254 | print '</div></ul>'; |
| 1255 | 1255 | print '<div id="error"></div>'; |
@@ -1312,7 +1312,7 @@ discard block |
||
| 1312 | 1312 | unset($_COOKIE['install']); |
| 1313 | 1313 | print '<div class="info column"><ul>'; |
| 1314 | 1314 | foreach ($_SESSION['done'] as $done) { |
| 1315 | - print '<li>'.$done.'....<strong>SUCCESS</strong></li>'; |
|
| 1315 | + print '<li>'.$done.'....<strong>SUCCESS</strong></li>'; |
|
| 1316 | 1316 | } |
| 1317 | 1317 | print '<li>Reloading page to check all is now ok....<strong>SUCCESS</strong></li>'; |
| 1318 | 1318 | 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 | |
@@ -69,8 +69,8 @@ discard block |
||
| 69 | 69 | if (!extension_loaded('curl')) { |
| 70 | 70 | $error[] = "Curl is not loaded."; |
| 71 | 71 | } |
| 72 | -if(function_exists('apache_get_modules') ){ |
|
| 73 | - if(!in_array('mod_rewrite',apache_get_modules())) { |
|
| 72 | +if (function_exists('apache_get_modules')) { |
|
| 73 | + if (!in_array('mod_rewrite', apache_get_modules())) { |
|
| 74 | 74 | $error[] = "mod_rewrite is not available."; |
| 75 | 75 | } |
| 76 | 76 | /* |
@@ -86,8 +86,8 @@ discard block |
||
| 86 | 86 | print '<div class="info column"><p><strong>If you use MySQL or MariaDB, check that <i>max_allowed_packet</i> >= 8M, else import of some table can fail.</strong></p></div>'; |
| 87 | 87 | if (isset($_SERVER['REQUEST_SCHEME']) && isset($_SERVER['SERVER_NAME']) && isset($_SERVER['SERVER_PORT']) && isset($_SERVER['REQUEST_URI'])) { |
| 88 | 88 | if (function_exists('get_headers')) { |
| 89 | - $check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace('install/','search',str_replace('index.php',$_SERVER["REQUEST_URI"]))); |
|
| 90 | - if (isset($check_header[0]) && !stripos($check_header[0],"200 OK")) { |
|
| 89 | + $check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace('install/', 'search', str_replace('index.php', $_SERVER["REQUEST_URI"]))); |
|
| 90 | + if (isset($check_header[0]) && !stripos($check_header[0], "200 OK")) { |
|
| 91 | 91 | print '<div class="info column"><p><strong>Check your configuration, rewrite don\'t seems to work.</strong></p></div>'; |
| 92 | 92 | } |
| 93 | 93 | } |
@@ -441,13 +441,13 @@ discard block |
||
| 441 | 441 | ?> |
| 442 | 442 | <tr> |
| 443 | 443 | <?php |
| 444 | - if (filter_var($source['host'],FILTER_VALIDATE_URL)) { |
|
| 444 | + if (filter_var($source['host'], FILTER_VALIDATE_URL)) { |
|
| 445 | 445 | ?> |
| 446 | 446 | <td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td> |
| 447 | 447 | <td><input type="number" name="port[]" id="port" value="<?php print $source['port']; ?>" /></td> |
| 448 | 448 | <?php |
| 449 | 449 | } else { |
| 450 | - $hostport = explode(':',$source['host']); |
|
| 450 | + $hostport = explode(':', $source['host']); |
|
| 451 | 451 | if (isset($hostport[1])) { |
| 452 | 452 | $host = $hostport[0]; |
| 453 | 453 | $port = $hostport[1]; |
@@ -791,7 +791,7 @@ discard block |
||
| 791 | 791 | <br /> |
| 792 | 792 | <p> |
| 793 | 793 | <label for="aircraftsize">Size of aircraft icon on map (default to 30px if zoom > 7 else 15px), empty to default</label> |
| 794 | - <input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize;?>" /> |
|
| 794 | + <input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize; ?>" /> |
|
| 795 | 795 | </p> |
| 796 | 796 | <br /> |
| 797 | 797 | <p> |
@@ -842,14 +842,14 @@ discard block |
||
| 842 | 842 | $error = ''; |
| 843 | 843 | |
| 844 | 844 | if (isset($_POST['dbtype'])) { |
| 845 | - $dbtype = filter_input(INPUT_POST,'dbtype',FILTER_SANITIZE_STRING); |
|
| 846 | - $dbroot = filter_input(INPUT_POST,'dbroot',FILTER_SANITIZE_STRING); |
|
| 847 | - $dbrootpass = filter_input(INPUT_POST,'dbrootpass',FILTER_SANITIZE_STRING); |
|
| 848 | - $dbname = filter_input(INPUT_POST,'dbname',FILTER_SANITIZE_STRING); |
|
| 849 | - $dbuser = filter_input(INPUT_POST,'dbuser',FILTER_SANITIZE_STRING); |
|
| 850 | - $dbuserpass = filter_input(INPUT_POST,'dbuserpass',FILTER_SANITIZE_STRING); |
|
| 851 | - $dbhost = filter_input(INPUT_POST,'dbhost',FILTER_SANITIZE_STRING); |
|
| 852 | - $dbport = filter_input(INPUT_POST,'dbport',FILTER_SANITIZE_STRING); |
|
| 845 | + $dbtype = filter_input(INPUT_POST, 'dbtype', FILTER_SANITIZE_STRING); |
|
| 846 | + $dbroot = filter_input(INPUT_POST, 'dbroot', FILTER_SANITIZE_STRING); |
|
| 847 | + $dbrootpass = filter_input(INPUT_POST, 'dbrootpass', FILTER_SANITIZE_STRING); |
|
| 848 | + $dbname = filter_input(INPUT_POST, 'dbname', FILTER_SANITIZE_STRING); |
|
| 849 | + $dbuser = filter_input(INPUT_POST, 'dbuser', FILTER_SANITIZE_STRING); |
|
| 850 | + $dbuserpass = filter_input(INPUT_POST, 'dbuserpass', FILTER_SANITIZE_STRING); |
|
| 851 | + $dbhost = filter_input(INPUT_POST, 'dbhost', FILTER_SANITIZE_STRING); |
|
| 852 | + $dbport = filter_input(INPUT_POST, 'dbport', FILTER_SANITIZE_STRING); |
|
| 853 | 853 | |
| 854 | 854 | if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) $error .= 'Mysql driver for PDO must be loaded'; |
| 855 | 855 | if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) $error .= 'PosgreSQL driver for PDO must be loaded'; |
@@ -869,48 +869,48 @@ discard block |
||
| 869 | 869 | } else $settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname)); |
| 870 | 870 | */ |
| 871 | 871 | |
| 872 | - $settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname)); |
|
| 872 | + $settings = array_merge($settings, array('globalDBdriver' => $dbtype, 'globalDBhost' => $dbhost, 'globalDBuser' => $dbuser, 'globalDBport' => $dbport, 'globalDBpass' => $dbuserpass, 'globalDBname' => $dbname)); |
|
| 873 | 873 | |
| 874 | - $sitename = filter_input(INPUT_POST,'sitename',FILTER_SANITIZE_STRING); |
|
| 875 | - $siteurl = filter_input(INPUT_POST,'siteurl',FILTER_SANITIZE_STRING); |
|
| 876 | - $timezone = filter_input(INPUT_POST,'timezone',FILTER_SANITIZE_STRING); |
|
| 877 | - $language = filter_input(INPUT_POST,'language',FILTER_SANITIZE_STRING); |
|
| 878 | - $settings = array_merge($settings,array('globalName' => $sitename,'globalURL' => $siteurl, 'globalTimezone' => $timezone,'globalLanguage' => $language)); |
|
| 874 | + $sitename = filter_input(INPUT_POST, 'sitename', FILTER_SANITIZE_STRING); |
|
| 875 | + $siteurl = filter_input(INPUT_POST, 'siteurl', FILTER_SANITIZE_STRING); |
|
| 876 | + $timezone = filter_input(INPUT_POST, 'timezone', FILTER_SANITIZE_STRING); |
|
| 877 | + $language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_STRING); |
|
| 878 | + $settings = array_merge($settings, array('globalName' => $sitename, 'globalURL' => $siteurl, 'globalTimezone' => $timezone, 'globalLanguage' => $language)); |
|
| 879 | 879 | |
| 880 | - $mapprovider = filter_input(INPUT_POST,'mapprovider',FILTER_SANITIZE_STRING); |
|
| 881 | - $mapboxid = filter_input(INPUT_POST,'mapboxid',FILTER_SANITIZE_STRING); |
|
| 882 | - $mapboxtoken = filter_input(INPUT_POST,'mapboxtoken',FILTER_SANITIZE_STRING); |
|
| 883 | - $googlekey = filter_input(INPUT_POST,'googlekey',FILTER_SANITIZE_STRING); |
|
| 884 | - $bingkey = filter_input(INPUT_POST,'bingkey',FILTER_SANITIZE_STRING); |
|
| 885 | - $mapquestkey = filter_input(INPUT_POST,'mapquestkey',FILTER_SANITIZE_STRING); |
|
| 886 | - $hereappid = filter_input(INPUT_POST,'hereappid',FILTER_SANITIZE_STRING); |
|
| 887 | - $hereappcode = filter_input(INPUT_POST,'hereappcode',FILTER_SANITIZE_STRING); |
|
| 888 | - $settings = array_merge($settings,array('globalMapProvider' => $mapprovider,'globalMapboxId' => $mapboxid,'globalMapboxToken' => $mapboxtoken,'globalGoogleAPIKey' => $googlekey,'globalBingMapKey' => $bingkey,'globalHereappID' => $hereappid,'globalHereappCode' => $hereappcode,'globalMapQuestKey' => $mapquestkey)); |
|
| 880 | + $mapprovider = filter_input(INPUT_POST, 'mapprovider', FILTER_SANITIZE_STRING); |
|
| 881 | + $mapboxid = filter_input(INPUT_POST, 'mapboxid', FILTER_SANITIZE_STRING); |
|
| 882 | + $mapboxtoken = filter_input(INPUT_POST, 'mapboxtoken', FILTER_SANITIZE_STRING); |
|
| 883 | + $googlekey = filter_input(INPUT_POST, 'googlekey', FILTER_SANITIZE_STRING); |
|
| 884 | + $bingkey = filter_input(INPUT_POST, 'bingkey', FILTER_SANITIZE_STRING); |
|
| 885 | + $mapquestkey = filter_input(INPUT_POST, 'mapquestkey', FILTER_SANITIZE_STRING); |
|
| 886 | + $hereappid = filter_input(INPUT_POST, 'hereappid', FILTER_SANITIZE_STRING); |
|
| 887 | + $hereappcode = filter_input(INPUT_POST, 'hereappcode', FILTER_SANITIZE_STRING); |
|
| 888 | + $settings = array_merge($settings, array('globalMapProvider' => $mapprovider, 'globalMapboxId' => $mapboxid, 'globalMapboxToken' => $mapboxtoken, 'globalGoogleAPIKey' => $googlekey, 'globalBingMapKey' => $bingkey, 'globalHereappID' => $hereappid, 'globalHereappCode' => $hereappcode, 'globalMapQuestKey' => $mapquestkey)); |
|
| 889 | 889 | |
| 890 | - $latitudemax = filter_input(INPUT_POST,'latitudemax',FILTER_SANITIZE_STRING); |
|
| 891 | - $latitudemin = filter_input(INPUT_POST,'latitudemin',FILTER_SANITIZE_STRING); |
|
| 892 | - $longitudemax = filter_input(INPUT_POST,'longitudemax',FILTER_SANITIZE_STRING); |
|
| 893 | - $longitudemin = filter_input(INPUT_POST,'longitudemin',FILTER_SANITIZE_STRING); |
|
| 894 | - $livezoom = filter_input(INPUT_POST,'livezoom',FILTER_SANITIZE_NUMBER_INT); |
|
| 895 | - $settings = array_merge($settings,array('globalLatitudeMax' => $latitudemax,'globalLatitudeMin' => $latitudemin,'globalLongitudeMax' => $longitudemax,'globalLongitudeMin' => $longitudemin,'globalLiveZoom' => $livezoom)); |
|
| 890 | + $latitudemax = filter_input(INPUT_POST, 'latitudemax', FILTER_SANITIZE_STRING); |
|
| 891 | + $latitudemin = filter_input(INPUT_POST, 'latitudemin', FILTER_SANITIZE_STRING); |
|
| 892 | + $longitudemax = filter_input(INPUT_POST, 'longitudemax', FILTER_SANITIZE_STRING); |
|
| 893 | + $longitudemin = filter_input(INPUT_POST, 'longitudemin', FILTER_SANITIZE_STRING); |
|
| 894 | + $livezoom = filter_input(INPUT_POST, 'livezoom', FILTER_SANITIZE_NUMBER_INT); |
|
| 895 | + $settings = array_merge($settings, array('globalLatitudeMax' => $latitudemax, 'globalLatitudeMin' => $latitudemin, 'globalLongitudeMax' => $longitudemax, 'globalLongitudeMin' => $longitudemin, 'globalLiveZoom' => $livezoom)); |
|
| 896 | 896 | |
| 897 | - $squawk_country = filter_input(INPUT_POST,'squawk_country',FILTER_SANITIZE_STRING); |
|
| 898 | - $settings = array_merge($settings,array('globalSquawkCountry' => $squawk_country)); |
|
| 897 | + $squawk_country = filter_input(INPUT_POST, 'squawk_country', FILTER_SANITIZE_STRING); |
|
| 898 | + $settings = array_merge($settings, array('globalSquawkCountry' => $squawk_country)); |
|
| 899 | 899 | |
| 900 | - $latitudecenter = filter_input(INPUT_POST,'latitudecenter',FILTER_SANITIZE_STRING); |
|
| 901 | - $longitudecenter = filter_input(INPUT_POST,'longitudecenter',FILTER_SANITIZE_STRING); |
|
| 902 | - $settings = array_merge($settings,array('globalCenterLatitude' => $latitudecenter,'globalCenterLongitude' => $longitudecenter)); |
|
| 900 | + $latitudecenter = filter_input(INPUT_POST, 'latitudecenter', FILTER_SANITIZE_STRING); |
|
| 901 | + $longitudecenter = filter_input(INPUT_POST, 'longitudecenter', FILTER_SANITIZE_STRING); |
|
| 902 | + $settings = array_merge($settings, array('globalCenterLatitude' => $latitudecenter, 'globalCenterLongitude' => $longitudecenter)); |
|
| 903 | 903 | |
| 904 | - $acars = filter_input(INPUT_POST,'acars',FILTER_SANITIZE_STRING); |
|
| 904 | + $acars = filter_input(INPUT_POST, 'acars', FILTER_SANITIZE_STRING); |
|
| 905 | 905 | if ($acars == 'acars') { |
| 906 | - $settings = array_merge($settings,array('globalACARS' => 'TRUE')); |
|
| 906 | + $settings = array_merge($settings, array('globalACARS' => 'TRUE')); |
|
| 907 | 907 | } else { |
| 908 | - $settings = array_merge($settings,array('globalACARS' => 'FALSE')); |
|
| 908 | + $settings = array_merge($settings, array('globalACARS' => 'FALSE')); |
|
| 909 | 909 | } |
| 910 | 910 | |
| 911 | - $flightawareusername = filter_input(INPUT_POST,'flightawareusername',FILTER_SANITIZE_STRING); |
|
| 912 | - $flightawarepassword = filter_input(INPUT_POST,'flightawarepassword',FILTER_SANITIZE_STRING); |
|
| 913 | - $settings = array_merge($settings,array('globalFlightAwareUsername' => $flightawareusername,'globalFlightAwarePassword' => $flightawarepassword)); |
|
| 911 | + $flightawareusername = filter_input(INPUT_POST, 'flightawareusername', FILTER_SANITIZE_STRING); |
|
| 912 | + $flightawarepassword = filter_input(INPUT_POST, 'flightawarepassword', FILTER_SANITIZE_STRING); |
|
| 913 | + $settings = array_merge($settings, array('globalFlightAwareUsername' => $flightawareusername, 'globalFlightAwarePassword' => $flightawarepassword)); |
|
| 914 | 914 | |
| 915 | 915 | $source_name = $_POST['source_name']; |
| 916 | 916 | $source_latitude = $_POST['source_latitude']; |
@@ -924,8 +924,8 @@ discard block |
||
| 924 | 924 | |
| 925 | 925 | $sources = array(); |
| 926 | 926 | foreach ($source_name as $keys => $name) { |
| 927 | - if (isset($source_id[$keys])) $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]); |
|
| 928 | - else $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]); |
|
| 927 | + if (isset($source_id[$keys])) $sources[] = array('name' => $name, 'latitude' => $source_latitude[$keys], 'longitude' => $source_longitude[$keys], 'altitude' => $source_altitude[$keys], 'city' => $source_city[$keys], 'country' => $source_country[$keys], 'id' => $source_id[$keys], 'source' => $source_ref[$keys]); |
|
| 928 | + else $sources[] = array('name' => $name, 'latitude' => $source_latitude[$keys], 'longitude' => $source_longitude[$keys], 'altitude' => $source_altitude[$keys], 'city' => $source_city[$keys], 'country' => $source_country[$keys], 'source' => $source_ref[$keys]); |
|
| 929 | 929 | } |
| 930 | 930 | if (count($sources) > 0) $_SESSION['sources'] = $sources; |
| 931 | 931 | |
@@ -938,24 +938,24 @@ discard block |
||
| 938 | 938 | $sbsurl = $_POST['sbsurl']; |
| 939 | 939 | */ |
| 940 | 940 | |
| 941 | - $globalvatsim = filter_input(INPUT_POST,'globalvatsim',FILTER_SANITIZE_STRING); |
|
| 942 | - $globalva = filter_input(INPUT_POST,'globalva',FILTER_SANITIZE_STRING); |
|
| 943 | - $globalivao = filter_input(INPUT_POST,'globalivao',FILTER_SANITIZE_STRING); |
|
| 944 | - $globalphpvms = filter_input(INPUT_POST,'globalphpvms',FILTER_SANITIZE_STRING); |
|
| 945 | - $globalvam = filter_input(INPUT_POST,'globalvam',FILTER_SANITIZE_STRING); |
|
| 946 | - $globalsbs = filter_input(INPUT_POST,'globalsbs',FILTER_SANITIZE_STRING); |
|
| 947 | - $globalaprs = filter_input(INPUT_POST,'globalaprs',FILTER_SANITIZE_STRING); |
|
| 948 | - $datasource = filter_input(INPUT_POST,'datasource',FILTER_SANITIZE_STRING); |
|
| 941 | + $globalvatsim = filter_input(INPUT_POST, 'globalvatsim', FILTER_SANITIZE_STRING); |
|
| 942 | + $globalva = filter_input(INPUT_POST, 'globalva', FILTER_SANITIZE_STRING); |
|
| 943 | + $globalivao = filter_input(INPUT_POST, 'globalivao', FILTER_SANITIZE_STRING); |
|
| 944 | + $globalphpvms = filter_input(INPUT_POST, 'globalphpvms', FILTER_SANITIZE_STRING); |
|
| 945 | + $globalvam = filter_input(INPUT_POST, 'globalvam', FILTER_SANITIZE_STRING); |
|
| 946 | + $globalsbs = filter_input(INPUT_POST, 'globalsbs', FILTER_SANITIZE_STRING); |
|
| 947 | + $globalaprs = filter_input(INPUT_POST, 'globalaprs', FILTER_SANITIZE_STRING); |
|
| 948 | + $datasource = filter_input(INPUT_POST, 'datasource', FILTER_SANITIZE_STRING); |
|
| 949 | 949 | |
| 950 | - $globalaircraft = filter_input(INPUT_POST,'globalaircraft',FILTER_SANITIZE_STRING); |
|
| 951 | - if ($globalaircraft == 'aircraft') $settings = array_merge($settings,array('globalAircraft' => 'TRUE')); |
|
| 952 | - else $settings = array_merge($settings,array('globalAircraft' => 'FALSE')); |
|
| 953 | - $globaltracker = filter_input(INPUT_POST,'globaltracker',FILTER_SANITIZE_STRING); |
|
| 954 | - if ($globaltracker == 'tracker') $settings = array_merge($settings,array('globalTracker' => 'TRUE')); |
|
| 955 | - else $settings = array_merge($settings,array('globalTracker' => 'FALSE')); |
|
| 956 | - $globalmarine = filter_input(INPUT_POST,'globalmarine',FILTER_SANITIZE_STRING); |
|
| 957 | - if ($globalmarine == 'marine') $settings = array_merge($settings,array('globalMarine' => 'TRUE')); |
|
| 958 | - else $settings = array_merge($settings,array('globalMarine' => 'FALSE')); |
|
| 950 | + $globalaircraft = filter_input(INPUT_POST, 'globalaircraft', FILTER_SANITIZE_STRING); |
|
| 951 | + if ($globalaircraft == 'aircraft') $settings = array_merge($settings, array('globalAircraft' => 'TRUE')); |
|
| 952 | + else $settings = array_merge($settings, array('globalAircraft' => 'FALSE')); |
|
| 953 | + $globaltracker = filter_input(INPUT_POST, 'globaltracker', FILTER_SANITIZE_STRING); |
|
| 954 | + if ($globaltracker == 'tracker') $settings = array_merge($settings, array('globalTracker' => 'TRUE')); |
|
| 955 | + else $settings = array_merge($settings, array('globalTracker' => 'FALSE')); |
|
| 956 | + $globalmarine = filter_input(INPUT_POST, 'globalmarine', FILTER_SANITIZE_STRING); |
|
| 957 | + if ($globalmarine == 'marine') $settings = array_merge($settings, array('globalMarine' => 'TRUE')); |
|
| 958 | + else $settings = array_merge($settings, array('globalMarine' => 'FALSE')); |
|
| 959 | 959 | |
| 960 | 960 | /* |
| 961 | 961 | $globalSBS1Hosts = array(); |
@@ -971,7 +971,7 @@ discard block |
||
| 971 | 971 | } |
| 972 | 972 | $settings = array_merge($settings,array('globalSBS1Hosts' => $globalSBS1Hosts)); |
| 973 | 973 | */ |
| 974 | - $settings_comment = array_merge($settings_comment,array('globalSBS1Hosts')); |
|
| 974 | + $settings_comment = array_merge($settings_comment, array('globalSBS1Hosts')); |
|
| 975 | 975 | $host = $_POST['host']; |
| 976 | 976 | $port = $_POST['port']; |
| 977 | 977 | $name = $_POST['name']; |
@@ -986,96 +986,96 @@ discard block |
||
| 986 | 986 | else $cov = 'FALSE'; |
| 987 | 987 | if (isset($noarchive[$key]) && $noarchive[$key] == 1) $arch = 'TRUE'; |
| 988 | 988 | else $arch = 'FALSE'; |
| 989 | - if ($h != '') $gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch); |
|
| 989 | + if ($h != '') $gSources[] = array('host' => $h, 'port' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov, 'noarchive' => $arch); |
|
| 990 | 990 | } |
| 991 | - $settings = array_merge($settings,array('globalSources' => $gSources)); |
|
| 991 | + $settings = array_merge($settings, array('globalSources' => $gSources)); |
|
| 992 | 992 | |
| 993 | 993 | /* |
| 994 | 994 | $sbstimeout = filter_input(INPUT_POST,'sbstimeout',FILTER_SANITIZE_NUMBER_INT); |
| 995 | 995 | $settings = array_merge($settings,array('globalSourcesTimeOut' => $sbstimeout)); |
| 996 | 996 | */ |
| 997 | - $acarshost = filter_input(INPUT_POST,'acarshost',FILTER_SANITIZE_STRING); |
|
| 998 | - $acarsport = filter_input(INPUT_POST,'acarsport',FILTER_SANITIZE_NUMBER_INT); |
|
| 999 | - $settings = array_merge($settings,array('globalACARSHost' => $acarshost,'globalACARSPort' => $acarsport)); |
|
| 997 | + $acarshost = filter_input(INPUT_POST, 'acarshost', FILTER_SANITIZE_STRING); |
|
| 998 | + $acarsport = filter_input(INPUT_POST, 'acarsport', FILTER_SANITIZE_NUMBER_INT); |
|
| 999 | + $settings = array_merge($settings, array('globalACARSHost' => $acarshost, 'globalACARSPort' => $acarsport)); |
|
| 1000 | 1000 | |
| 1001 | - $bitly = filter_input(INPUT_POST,'bitly',FILTER_SANITIZE_STRING); |
|
| 1002 | - $settings = array_merge($settings,array('globalBitlyAccessToken' => $bitly)); |
|
| 1001 | + $bitly = filter_input(INPUT_POST, 'bitly', FILTER_SANITIZE_STRING); |
|
| 1002 | + $settings = array_merge($settings, array('globalBitlyAccessToken' => $bitly)); |
|
| 1003 | 1003 | |
| 1004 | - $notamsource = filter_input(INPUT_POST,'notamsource',FILTER_SANITIZE_STRING); |
|
| 1005 | - $settings = array_merge($settings,array('globalNOTAMSource' => $notamsource)); |
|
| 1006 | - $metarsource = filter_input(INPUT_POST,'metarsource',FILTER_SANITIZE_STRING); |
|
| 1007 | - $settings = array_merge($settings,array('globalMETARurl' => $metarsource)); |
|
| 1004 | + $notamsource = filter_input(INPUT_POST, 'notamsource', FILTER_SANITIZE_STRING); |
|
| 1005 | + $settings = array_merge($settings, array('globalNOTAMSource' => $notamsource)); |
|
| 1006 | + $metarsource = filter_input(INPUT_POST, 'metarsource', FILTER_SANITIZE_STRING); |
|
| 1007 | + $settings = array_merge($settings, array('globalMETARurl' => $metarsource)); |
|
| 1008 | 1008 | |
| 1009 | - $zoilatitude = filter_input(INPUT_POST,'zoilatitude',FILTER_SANITIZE_STRING); |
|
| 1010 | - $zoilongitude = filter_input(INPUT_POST,'zoilongitude',FILTER_SANITIZE_STRING); |
|
| 1011 | - $zoidistance = filter_input(INPUT_POST,'zoidistance',FILTER_SANITIZE_NUMBER_INT); |
|
| 1009 | + $zoilatitude = filter_input(INPUT_POST, 'zoilatitude', FILTER_SANITIZE_STRING); |
|
| 1010 | + $zoilongitude = filter_input(INPUT_POST, 'zoilongitude', FILTER_SANITIZE_STRING); |
|
| 1011 | + $zoidistance = filter_input(INPUT_POST, 'zoidistance', FILTER_SANITIZE_NUMBER_INT); |
|
| 1012 | 1012 | if ($zoilatitude != '' && $zoilongitude != '' && $zoidistance != '') { |
| 1013 | - $settings = array_merge($settings,array('globalDistanceIgnore' => array('latitude' => $zoilatitude,'longitude' => $zoilongitude,'distance' => $zoidistance))); |
|
| 1014 | - } else $settings = array_merge($settings,array('globalDistanceIgnore' => array())); |
|
| 1013 | + $settings = array_merge($settings, array('globalDistanceIgnore' => array('latitude' => $zoilatitude, 'longitude' => $zoilongitude, 'distance' => $zoidistance))); |
|
| 1014 | + } else $settings = array_merge($settings, array('globalDistanceIgnore' => array())); |
|
| 1015 | 1015 | |
| 1016 | - $refresh = filter_input(INPUT_POST,'refresh',FILTER_SANITIZE_NUMBER_INT); |
|
| 1017 | - $settings = array_merge($settings,array('globalLiveInterval' => $refresh)); |
|
| 1018 | - $maprefresh = filter_input(INPUT_POST,'maprefresh',FILTER_SANITIZE_NUMBER_INT); |
|
| 1019 | - $settings = array_merge($settings,array('globalMapRefresh' => $maprefresh)); |
|
| 1020 | - $mapidle = filter_input(INPUT_POST,'mapidle',FILTER_SANITIZE_NUMBER_INT); |
|
| 1021 | - $settings = array_merge($settings,array('globalMapIdleTimeout' => $mapidle)); |
|
| 1022 | - $closestmindist = filter_input(INPUT_POST,'closestmindist',FILTER_SANITIZE_NUMBER_INT); |
|
| 1023 | - $settings = array_merge($settings,array('globalClosestMinDist' => $closestmindist)); |
|
| 1016 | + $refresh = filter_input(INPUT_POST, 'refresh', FILTER_SANITIZE_NUMBER_INT); |
|
| 1017 | + $settings = array_merge($settings, array('globalLiveInterval' => $refresh)); |
|
| 1018 | + $maprefresh = filter_input(INPUT_POST, 'maprefresh', FILTER_SANITIZE_NUMBER_INT); |
|
| 1019 | + $settings = array_merge($settings, array('globalMapRefresh' => $maprefresh)); |
|
| 1020 | + $mapidle = filter_input(INPUT_POST, 'mapidle', FILTER_SANITIZE_NUMBER_INT); |
|
| 1021 | + $settings = array_merge($settings, array('globalMapIdleTimeout' => $mapidle)); |
|
| 1022 | + $closestmindist = filter_input(INPUT_POST, 'closestmindist', FILTER_SANITIZE_NUMBER_INT); |
|
| 1023 | + $settings = array_merge($settings, array('globalClosestMinDist' => $closestmindist)); |
|
| 1024 | 1024 | |
| 1025 | - $aircraftsize = filter_input(INPUT_POST,'aircraftsize',FILTER_SANITIZE_NUMBER_INT); |
|
| 1026 | - $settings = array_merge($settings,array('globalAircraftSize' => $aircraftsize)); |
|
| 1025 | + $aircraftsize = filter_input(INPUT_POST, 'aircraftsize', FILTER_SANITIZE_NUMBER_INT); |
|
| 1026 | + $settings = array_merge($settings, array('globalAircraftSize' => $aircraftsize)); |
|
| 1027 | 1027 | |
| 1028 | - $archivemonths = filter_input(INPUT_POST,'archivemonths',FILTER_SANITIZE_NUMBER_INT); |
|
| 1029 | - $settings = array_merge($settings,array('globalArchiveMonths' => $archivemonths)); |
|
| 1028 | + $archivemonths = filter_input(INPUT_POST, 'archivemonths', FILTER_SANITIZE_NUMBER_INT); |
|
| 1029 | + $settings = array_merge($settings, array('globalArchiveMonths' => $archivemonths)); |
|
| 1030 | 1030 | |
| 1031 | - $archiveyear = filter_input(INPUT_POST,'archiveyear',FILTER_SANITIZE_STRING); |
|
| 1031 | + $archiveyear = filter_input(INPUT_POST, 'archiveyear', FILTER_SANITIZE_STRING); |
|
| 1032 | 1032 | if ($archiveyear == "archiveyear") { |
| 1033 | - $settings = array_merge($settings,array('globalArchiveYear' => 'TRUE')); |
|
| 1033 | + $settings = array_merge($settings, array('globalArchiveYear' => 'TRUE')); |
|
| 1034 | 1034 | } else { |
| 1035 | - $settings = array_merge($settings,array('globalArchiveYear' => 'FALSE')); |
|
| 1035 | + $settings = array_merge($settings, array('globalArchiveYear' => 'FALSE')); |
|
| 1036 | 1036 | } |
| 1037 | - $archivekeepmonths = filter_input(INPUT_POST,'archivekeepmonths',FILTER_SANITIZE_NUMBER_INT); |
|
| 1038 | - $settings = array_merge($settings,array('globalArchiveKeepMonths' => $archivekeepmonths)); |
|
| 1039 | - $archivekeeptrackmonths = filter_input(INPUT_POST,'archivekeeptrackmonths',FILTER_SANITIZE_NUMBER_INT); |
|
| 1040 | - $settings = array_merge($settings,array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths)); |
|
| 1037 | + $archivekeepmonths = filter_input(INPUT_POST, 'archivekeepmonths', FILTER_SANITIZE_NUMBER_INT); |
|
| 1038 | + $settings = array_merge($settings, array('globalArchiveKeepMonths' => $archivekeepmonths)); |
|
| 1039 | + $archivekeeptrackmonths = filter_input(INPUT_POST, 'archivekeeptrackmonths', FILTER_SANITIZE_NUMBER_INT); |
|
| 1040 | + $settings = array_merge($settings, array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths)); |
|
| 1041 | 1041 | |
| 1042 | - $britishairways = filter_input(INPUT_POST,'britishairways',FILTER_SANITIZE_STRING); |
|
| 1043 | - $settings = array_merge($settings,array('globalBritishAirwaysKey' => $britishairways)); |
|
| 1044 | - $transavia = filter_input(INPUT_POST,'transavia',FILTER_SANITIZE_STRING); |
|
| 1045 | - $settings = array_merge($settings,array('globalTransaviaKey' => $transavia)); |
|
| 1042 | + $britishairways = filter_input(INPUT_POST, 'britishairways', FILTER_SANITIZE_STRING); |
|
| 1043 | + $settings = array_merge($settings, array('globalBritishAirwaysKey' => $britishairways)); |
|
| 1044 | + $transavia = filter_input(INPUT_POST, 'transavia', FILTER_SANITIZE_STRING); |
|
| 1045 | + $settings = array_merge($settings, array('globalTransaviaKey' => $transavia)); |
|
| 1046 | 1046 | |
| 1047 | - $lufthansakey = filter_input(INPUT_POST,'lufthansakey',FILTER_SANITIZE_STRING); |
|
| 1048 | - $lufthansasecret = filter_input(INPUT_POST,'lufthansasecret',FILTER_SANITIZE_STRING); |
|
| 1049 | - $settings = array_merge($settings,array('globalLufthansaKey' => array('key' => $lufthansakey,'secret' => $lufthansasecret))); |
|
| 1047 | + $lufthansakey = filter_input(INPUT_POST, 'lufthansakey', FILTER_SANITIZE_STRING); |
|
| 1048 | + $lufthansasecret = filter_input(INPUT_POST, 'lufthansasecret', FILTER_SANITIZE_STRING); |
|
| 1049 | + $settings = array_merge($settings, array('globalLufthansaKey' => array('key' => $lufthansakey, 'secret' => $lufthansasecret))); |
|
| 1050 | 1050 | |
| 1051 | 1051 | // Create in settings.php keys not yet configurable if not already here |
| 1052 | 1052 | //if (!isset($globalImageBingKey)) $settings = array_merge($settings,array('globalImageBingKey' => '')); |
| 1053 | - if (!isset($globalDebug)) $settings = array_merge($settings,array('globalDebug' => 'TRUE')); |
|
| 1053 | + if (!isset($globalDebug)) $settings = array_merge($settings, array('globalDebug' => 'TRUE')); |
|
| 1054 | 1054 | |
| 1055 | - $resetyearstats = filter_input(INPUT_POST,'resetyearstats',FILTER_SANITIZE_STRING); |
|
| 1055 | + $resetyearstats = filter_input(INPUT_POST, 'resetyearstats', FILTER_SANITIZE_STRING); |
|
| 1056 | 1056 | if ($resetyearstats == 'resetyearstats') { |
| 1057 | - $settings = array_merge($settings,array('globalDeleteLastYearStats' => 'TRUE')); |
|
| 1057 | + $settings = array_merge($settings, array('globalDeleteLastYearStats' => 'TRUE')); |
|
| 1058 | 1058 | } else { |
| 1059 | - $settings = array_merge($settings,array('globalDeleteLastYearStats' => 'FALSE')); |
|
| 1059 | + $settings = array_merge($settings, array('globalDeleteLastYearStats' => 'FALSE')); |
|
| 1060 | 1060 | } |
| 1061 | 1061 | |
| 1062 | - $archive = filter_input(INPUT_POST,'archive',FILTER_SANITIZE_STRING); |
|
| 1062 | + $archive = filter_input(INPUT_POST, 'archive', FILTER_SANITIZE_STRING); |
|
| 1063 | 1063 | if ($archive == 'archive') { |
| 1064 | - $settings = array_merge($settings,array('globalArchive' => 'TRUE')); |
|
| 1064 | + $settings = array_merge($settings, array('globalArchive' => 'TRUE')); |
|
| 1065 | 1065 | } else { |
| 1066 | - $settings = array_merge($settings,array('globalArchive' => 'FALSE')); |
|
| 1066 | + $settings = array_merge($settings, array('globalArchive' => 'FALSE')); |
|
| 1067 | 1067 | } |
| 1068 | - $daemon = filter_input(INPUT_POST,'daemon',FILTER_SANITIZE_STRING); |
|
| 1068 | + $daemon = filter_input(INPUT_POST, 'daemon', FILTER_SANITIZE_STRING); |
|
| 1069 | 1069 | if ($daemon == 'daemon') { |
| 1070 | - $settings = array_merge($settings,array('globalDaemon' => 'TRUE')); |
|
| 1070 | + $settings = array_merge($settings, array('globalDaemon' => 'TRUE')); |
|
| 1071 | 1071 | } else { |
| 1072 | - $settings = array_merge($settings,array('globalDaemon' => 'FALSE')); |
|
| 1072 | + $settings = array_merge($settings, array('globalDaemon' => 'FALSE')); |
|
| 1073 | 1073 | } |
| 1074 | - $schedules = filter_input(INPUT_POST,'schedules',FILTER_SANITIZE_STRING); |
|
| 1074 | + $schedules = filter_input(INPUT_POST, 'schedules', FILTER_SANITIZE_STRING); |
|
| 1075 | 1075 | if ($schedules == 'schedules') { |
| 1076 | - $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE')); |
|
| 1076 | + $settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE')); |
|
| 1077 | 1077 | } else { |
| 1078 | - $settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE')); |
|
| 1078 | + $settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE')); |
|
| 1079 | 1079 | } |
| 1080 | 1080 | |
| 1081 | 1081 | /* |
@@ -1086,195 +1086,195 @@ discard block |
||
| 1086 | 1086 | $settings = array_merge($settings,array('globalFlightAware' => 'FALSE','globalSBS1' => 'TRUE')); |
| 1087 | 1087 | } |
| 1088 | 1088 | */ |
| 1089 | - $settings = array_merge($settings,array('globalFlightAware' => 'FALSE')); |
|
| 1090 | - if ($globalsbs == 'sbs') $settings = array_merge($settings,array('globalSBS1' => 'TRUE')); |
|
| 1091 | - else $settings = array_merge($settings,array('globalSBS1' => 'FALSE')); |
|
| 1092 | - if ($globalaprs == 'aprs') $settings = array_merge($settings,array('globalAPRS' => 'TRUE')); |
|
| 1093 | - else $settings = array_merge($settings,array('globalAPRS' => 'FALSE')); |
|
| 1089 | + $settings = array_merge($settings, array('globalFlightAware' => 'FALSE')); |
|
| 1090 | + if ($globalsbs == 'sbs') $settings = array_merge($settings, array('globalSBS1' => 'TRUE')); |
|
| 1091 | + else $settings = array_merge($settings, array('globalSBS1' => 'FALSE')); |
|
| 1092 | + if ($globalaprs == 'aprs') $settings = array_merge($settings, array('globalAPRS' => 'TRUE')); |
|
| 1093 | + else $settings = array_merge($settings, array('globalAPRS' => 'FALSE')); |
|
| 1094 | 1094 | $va = false; |
| 1095 | 1095 | if ($globalivao == 'ivao') { |
| 1096 | - $settings = array_merge($settings,array('globalIVAO' => 'TRUE')); |
|
| 1096 | + $settings = array_merge($settings, array('globalIVAO' => 'TRUE')); |
|
| 1097 | 1097 | $va = true; |
| 1098 | - } else $settings = array_merge($settings,array('globalIVAO' => 'FALSE')); |
|
| 1098 | + } else $settings = array_merge($settings, array('globalIVAO' => 'FALSE')); |
|
| 1099 | 1099 | if ($globalvatsim == 'vatsim') { |
| 1100 | - $settings = array_merge($settings,array('globalVATSIM' => 'TRUE')); |
|
| 1100 | + $settings = array_merge($settings, array('globalVATSIM' => 'TRUE')); |
|
| 1101 | 1101 | $va = true; |
| 1102 | - } else $settings = array_merge($settings,array('globalVATSIM' => 'FALSE')); |
|
| 1102 | + } else $settings = array_merge($settings, array('globalVATSIM' => 'FALSE')); |
|
| 1103 | 1103 | if ($globalphpvms == 'phpvms') { |
| 1104 | - $settings = array_merge($settings,array('globalphpVMS' => 'TRUE')); |
|
| 1104 | + $settings = array_merge($settings, array('globalphpVMS' => 'TRUE')); |
|
| 1105 | 1105 | $va = true; |
| 1106 | - } else $settings = array_merge($settings,array('globalphpVMS' => 'FALSE')); |
|
| 1106 | + } else $settings = array_merge($settings, array('globalphpVMS' => 'FALSE')); |
|
| 1107 | 1107 | if ($globalvam == 'vam') { |
| 1108 | - $settings = array_merge($settings,array('globalVAM' => 'TRUE')); |
|
| 1108 | + $settings = array_merge($settings, array('globalVAM' => 'TRUE')); |
|
| 1109 | 1109 | $va = true; |
| 1110 | - } else $settings = array_merge($settings,array('globalVAM' => 'FALSE')); |
|
| 1110 | + } else $settings = array_merge($settings, array('globalVAM' => 'FALSE')); |
|
| 1111 | 1111 | if ($va) { |
| 1112 | - $settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE','globalTranslationFetch' => 'FALSE')); |
|
| 1113 | - } else $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE')); |
|
| 1112 | + $settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE', 'globalTranslationFetch' => 'FALSE')); |
|
| 1113 | + } else $settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE', 'globalTranslationFetch' => 'TRUE')); |
|
| 1114 | 1114 | if ($globalva == 'va' || $va) { |
| 1115 | - $settings = array_merge($settings,array('globalVA' => 'TRUE')); |
|
| 1116 | - } else $settings = array_merge($settings,array('globalVA' => 'FALSE')); |
|
| 1115 | + $settings = array_merge($settings, array('globalVA' => 'TRUE')); |
|
| 1116 | + } else $settings = array_merge($settings, array('globalVA' => 'FALSE')); |
|
| 1117 | 1117 | |
| 1118 | 1118 | |
| 1119 | 1119 | |
| 1120 | - $notam = filter_input(INPUT_POST,'notam',FILTER_SANITIZE_STRING); |
|
| 1120 | + $notam = filter_input(INPUT_POST, 'notam', FILTER_SANITIZE_STRING); |
|
| 1121 | 1121 | if ($notam == 'notam') { |
| 1122 | - $settings = array_merge($settings,array('globalNOTAM' => 'TRUE')); |
|
| 1122 | + $settings = array_merge($settings, array('globalNOTAM' => 'TRUE')); |
|
| 1123 | 1123 | } else { |
| 1124 | - $settings = array_merge($settings,array('globalNOTAM' => 'FALSE')); |
|
| 1124 | + $settings = array_merge($settings, array('globalNOTAM' => 'FALSE')); |
|
| 1125 | 1125 | } |
| 1126 | - $owner = filter_input(INPUT_POST,'owner',FILTER_SANITIZE_STRING); |
|
| 1126 | + $owner = filter_input(INPUT_POST, 'owner', FILTER_SANITIZE_STRING); |
|
| 1127 | 1127 | if ($owner == 'owner') { |
| 1128 | - $settings = array_merge($settings,array('globalOwner' => 'TRUE')); |
|
| 1128 | + $settings = array_merge($settings, array('globalOwner' => 'TRUE')); |
|
| 1129 | 1129 | } else { |
| 1130 | - $settings = array_merge($settings,array('globalOwner' => 'FALSE')); |
|
| 1130 | + $settings = array_merge($settings, array('globalOwner' => 'FALSE')); |
|
| 1131 | 1131 | } |
| 1132 | - $map3d = filter_input(INPUT_POST,'map3d',FILTER_SANITIZE_STRING); |
|
| 1132 | + $map3d = filter_input(INPUT_POST, 'map3d', FILTER_SANITIZE_STRING); |
|
| 1133 | 1133 | if ($map3d == 'map3d') { |
| 1134 | - $settings = array_merge($settings,array('globalMap3D' => 'TRUE')); |
|
| 1134 | + $settings = array_merge($settings, array('globalMap3D' => 'TRUE')); |
|
| 1135 | 1135 | } else { |
| 1136 | - $settings = array_merge($settings,array('globalMap3D' => 'FALSE')); |
|
| 1136 | + $settings = array_merge($settings, array('globalMap3D' => 'FALSE')); |
|
| 1137 | 1137 | } |
| 1138 | - $crash = filter_input(INPUT_POST,'crash',FILTER_SANITIZE_STRING); |
|
| 1138 | + $crash = filter_input(INPUT_POST, 'crash', FILTER_SANITIZE_STRING); |
|
| 1139 | 1139 | if ($crash == 'crash') { |
| 1140 | - $settings = array_merge($settings,array('globalAccidents' => 'TRUE')); |
|
| 1140 | + $settings = array_merge($settings, array('globalAccidents' => 'TRUE')); |
|
| 1141 | 1141 | } else { |
| 1142 | - $settings = array_merge($settings,array('globalAccidents' => 'FALSE')); |
|
| 1142 | + $settings = array_merge($settings, array('globalAccidents' => 'FALSE')); |
|
| 1143 | 1143 | } |
| 1144 | - $mapsatellites = filter_input(INPUT_POST,'mapsatellites',FILTER_SANITIZE_STRING); |
|
| 1144 | + $mapsatellites = filter_input(INPUT_POST, 'mapsatellites', FILTER_SANITIZE_STRING); |
|
| 1145 | 1145 | if ($mapsatellites == 'mapsatellites') { |
| 1146 | - $settings = array_merge($settings,array('globalMapSatellites' => 'TRUE')); |
|
| 1146 | + $settings = array_merge($settings, array('globalMapSatellites' => 'TRUE')); |
|
| 1147 | 1147 | } else { |
| 1148 | - $settings = array_merge($settings,array('globalMapSatellites' => 'FALSE')); |
|
| 1148 | + $settings = array_merge($settings, array('globalMapSatellites' => 'FALSE')); |
|
| 1149 | 1149 | } |
| 1150 | - $map3ddefault = filter_input(INPUT_POST,'map3ddefault',FILTER_SANITIZE_STRING); |
|
| 1150 | + $map3ddefault = filter_input(INPUT_POST, 'map3ddefault', FILTER_SANITIZE_STRING); |
|
| 1151 | 1151 | if ($map3ddefault == 'map3ddefault') { |
| 1152 | - $settings = array_merge($settings,array('globalMap3Ddefault' => 'TRUE')); |
|
| 1152 | + $settings = array_merge($settings, array('globalMap3Ddefault' => 'TRUE')); |
|
| 1153 | 1153 | } else { |
| 1154 | - $settings = array_merge($settings,array('globalMap3Ddefault' => 'FALSE')); |
|
| 1154 | + $settings = array_merge($settings, array('globalMap3Ddefault' => 'FALSE')); |
|
| 1155 | 1155 | } |
| 1156 | - $translate = filter_input(INPUT_POST,'translate',FILTER_SANITIZE_STRING); |
|
| 1156 | + $translate = filter_input(INPUT_POST, 'translate', FILTER_SANITIZE_STRING); |
|
| 1157 | 1157 | if ($translate == 'translate') { |
| 1158 | - $settings = array_merge($settings,array('globalTranslate' => 'TRUE')); |
|
| 1158 | + $settings = array_merge($settings, array('globalTranslate' => 'TRUE')); |
|
| 1159 | 1159 | } else { |
| 1160 | - $settings = array_merge($settings,array('globalTranslate' => 'FALSE')); |
|
| 1160 | + $settings = array_merge($settings, array('globalTranslate' => 'FALSE')); |
|
| 1161 | 1161 | } |
| 1162 | - $realairlines = filter_input(INPUT_POST,'realairlines',FILTER_SANITIZE_STRING); |
|
| 1162 | + $realairlines = filter_input(INPUT_POST, 'realairlines', FILTER_SANITIZE_STRING); |
|
| 1163 | 1163 | if ($realairlines == 'realairlines') { |
| 1164 | - $settings = array_merge($settings,array('globalUseRealAirlines' => 'TRUE')); |
|
| 1164 | + $settings = array_merge($settings, array('globalUseRealAirlines' => 'TRUE')); |
|
| 1165 | 1165 | } else { |
| 1166 | - $settings = array_merge($settings,array('globalUseRealAirlines' => 'FALSE')); |
|
| 1166 | + $settings = array_merge($settings, array('globalUseRealAirlines' => 'FALSE')); |
|
| 1167 | 1167 | } |
| 1168 | - $estimation = filter_input(INPUT_POST,'estimation',FILTER_SANITIZE_STRING); |
|
| 1168 | + $estimation = filter_input(INPUT_POST, 'estimation', FILTER_SANITIZE_STRING); |
|
| 1169 | 1169 | if ($estimation == 'estimation') { |
| 1170 | - $settings = array_merge($settings,array('globalMapEstimation' => 'TRUE')); |
|
| 1170 | + $settings = array_merge($settings, array('globalMapEstimation' => 'TRUE')); |
|
| 1171 | 1171 | } else { |
| 1172 | - $settings = array_merge($settings,array('globalMapEstimation' => 'FALSE')); |
|
| 1172 | + $settings = array_merge($settings, array('globalMapEstimation' => 'FALSE')); |
|
| 1173 | 1173 | } |
| 1174 | - $metar = filter_input(INPUT_POST,'metar',FILTER_SANITIZE_STRING); |
|
| 1174 | + $metar = filter_input(INPUT_POST, 'metar', FILTER_SANITIZE_STRING); |
|
| 1175 | 1175 | if ($metar == 'metar') { |
| 1176 | - $settings = array_merge($settings,array('globalMETAR' => 'TRUE')); |
|
| 1176 | + $settings = array_merge($settings, array('globalMETAR' => 'TRUE')); |
|
| 1177 | 1177 | } else { |
| 1178 | - $settings = array_merge($settings,array('globalMETAR' => 'FALSE')); |
|
| 1178 | + $settings = array_merge($settings, array('globalMETAR' => 'FALSE')); |
|
| 1179 | 1179 | } |
| 1180 | - $metarcycle = filter_input(INPUT_POST,'metarcycle',FILTER_SANITIZE_STRING); |
|
| 1180 | + $metarcycle = filter_input(INPUT_POST, 'metarcycle', FILTER_SANITIZE_STRING); |
|
| 1181 | 1181 | if ($metarcycle == 'metarcycle') { |
| 1182 | - $settings = array_merge($settings,array('globalMETARcycle' => 'TRUE')); |
|
| 1182 | + $settings = array_merge($settings, array('globalMETARcycle' => 'TRUE')); |
|
| 1183 | 1183 | } else { |
| 1184 | - $settings = array_merge($settings,array('globalMETARcycle' => 'FALSE')); |
|
| 1184 | + $settings = array_merge($settings, array('globalMETARcycle' => 'FALSE')); |
|
| 1185 | 1185 | } |
| 1186 | - $fork = filter_input(INPUT_POST,'fork',FILTER_SANITIZE_STRING); |
|
| 1186 | + $fork = filter_input(INPUT_POST, 'fork', FILTER_SANITIZE_STRING); |
|
| 1187 | 1187 | if ($fork == 'fork') { |
| 1188 | - $settings = array_merge($settings,array('globalFork' => 'TRUE')); |
|
| 1188 | + $settings = array_merge($settings, array('globalFork' => 'TRUE')); |
|
| 1189 | 1189 | } else { |
| 1190 | - $settings = array_merge($settings,array('globalFork' => 'FALSE')); |
|
| 1190 | + $settings = array_merge($settings, array('globalFork' => 'FALSE')); |
|
| 1191 | 1191 | } |
| 1192 | 1192 | |
| 1193 | - $colormap = filter_input(INPUT_POST,'colormap',FILTER_SANITIZE_STRING); |
|
| 1193 | + $colormap = filter_input(INPUT_POST, 'colormap', FILTER_SANITIZE_STRING); |
|
| 1194 | 1194 | if ($colormap == 'colormap') { |
| 1195 | - $settings = array_merge($settings,array('globalMapAltitudeColor' => 'TRUE')); |
|
| 1195 | + $settings = array_merge($settings, array('globalMapAltitudeColor' => 'TRUE')); |
|
| 1196 | 1196 | } else { |
| 1197 | - $settings = array_merge($settings,array('globalMapAltitudeColor' => 'FALSE')); |
|
| 1197 | + $settings = array_merge($settings, array('globalMapAltitudeColor' => 'FALSE')); |
|
| 1198 | 1198 | } |
| 1199 | 1199 | |
| 1200 | 1200 | if (isset($_POST['aircrafticoncolor'])) { |
| 1201 | - $aircrafticoncolor = filter_input(INPUT_POST,'aircrafticoncolor',FILTER_SANITIZE_STRING); |
|
| 1202 | - $settings = array_merge($settings,array('globalAircraftIconColor' => substr($aircrafticoncolor,1))); |
|
| 1201 | + $aircrafticoncolor = filter_input(INPUT_POST, 'aircrafticoncolor', FILTER_SANITIZE_STRING); |
|
| 1202 | + $settings = array_merge($settings, array('globalAircraftIconColor' => substr($aircrafticoncolor, 1))); |
|
| 1203 | 1203 | } |
| 1204 | 1204 | |
| 1205 | - $airportzoom = filter_input(INPUT_POST,'airportzoom',FILTER_SANITIZE_NUMBER_INT); |
|
| 1206 | - $settings = array_merge($settings,array('globalAirportZoom' => $airportzoom)); |
|
| 1205 | + $airportzoom = filter_input(INPUT_POST, 'airportzoom', FILTER_SANITIZE_NUMBER_INT); |
|
| 1206 | + $settings = array_merge($settings, array('globalAirportZoom' => $airportzoom)); |
|
| 1207 | 1207 | |
| 1208 | - $unitdistance = filter_input(INPUT_POST,'unitdistance',FILTER_SANITIZE_STRING); |
|
| 1209 | - $settings = array_merge($settings,array('globalUnitDistance' => $unitdistance)); |
|
| 1210 | - $unitaltitude = filter_input(INPUT_POST,'unitaltitude',FILTER_SANITIZE_STRING); |
|
| 1211 | - $settings = array_merge($settings,array('globalUnitAltitude' => $unitaltitude)); |
|
| 1212 | - $unitspeed = filter_input(INPUT_POST,'unitspeed',FILTER_SANITIZE_STRING); |
|
| 1213 | - $settings = array_merge($settings,array('globalUnitSpeed' => $unitspeed)); |
|
| 1208 | + $unitdistance = filter_input(INPUT_POST, 'unitdistance', FILTER_SANITIZE_STRING); |
|
| 1209 | + $settings = array_merge($settings, array('globalUnitDistance' => $unitdistance)); |
|
| 1210 | + $unitaltitude = filter_input(INPUT_POST, 'unitaltitude', FILTER_SANITIZE_STRING); |
|
| 1211 | + $settings = array_merge($settings, array('globalUnitAltitude' => $unitaltitude)); |
|
| 1212 | + $unitspeed = filter_input(INPUT_POST, 'unitspeed', FILTER_SANITIZE_STRING); |
|
| 1213 | + $settings = array_merge($settings, array('globalUnitSpeed' => $unitspeed)); |
|
| 1214 | 1214 | |
| 1215 | - $mappopup = filter_input(INPUT_POST,'mappopup',FILTER_SANITIZE_STRING); |
|
| 1215 | + $mappopup = filter_input(INPUT_POST, 'mappopup', FILTER_SANITIZE_STRING); |
|
| 1216 | 1216 | if ($mappopup == 'mappopup') { |
| 1217 | - $settings = array_merge($settings,array('globalMapPopup' => 'TRUE')); |
|
| 1217 | + $settings = array_merge($settings, array('globalMapPopup' => 'TRUE')); |
|
| 1218 | 1218 | } else { |
| 1219 | - $settings = array_merge($settings,array('globalMapPopup' => 'FALSE')); |
|
| 1219 | + $settings = array_merge($settings, array('globalMapPopup' => 'FALSE')); |
|
| 1220 | 1220 | } |
| 1221 | - $airportpopup = filter_input(INPUT_POST,'airportpopup',FILTER_SANITIZE_STRING); |
|
| 1221 | + $airportpopup = filter_input(INPUT_POST, 'airportpopup', FILTER_SANITIZE_STRING); |
|
| 1222 | 1222 | if ($airportpopup == 'airportpopup') { |
| 1223 | - $settings = array_merge($settings,array('globalAirportPopup' => 'TRUE')); |
|
| 1223 | + $settings = array_merge($settings, array('globalAirportPopup' => 'TRUE')); |
|
| 1224 | 1224 | } else { |
| 1225 | - $settings = array_merge($settings,array('globalAirportPopup' => 'FALSE')); |
|
| 1225 | + $settings = array_merge($settings, array('globalAirportPopup' => 'FALSE')); |
|
| 1226 | 1226 | } |
| 1227 | - $maphistory = filter_input(INPUT_POST,'maphistory',FILTER_SANITIZE_STRING); |
|
| 1227 | + $maphistory = filter_input(INPUT_POST, 'maphistory', FILTER_SANITIZE_STRING); |
|
| 1228 | 1228 | if ($maphistory == 'maphistory') { |
| 1229 | - $settings = array_merge($settings,array('globalMapHistory' => 'TRUE')); |
|
| 1229 | + $settings = array_merge($settings, array('globalMapHistory' => 'TRUE')); |
|
| 1230 | 1230 | } else { |
| 1231 | - $settings = array_merge($settings,array('globalMapHistory' => 'FALSE')); |
|
| 1231 | + $settings = array_merge($settings, array('globalMapHistory' => 'FALSE')); |
|
| 1232 | 1232 | } |
| 1233 | - $flightroute = filter_input(INPUT_POST,'flightroute',FILTER_SANITIZE_STRING); |
|
| 1233 | + $flightroute = filter_input(INPUT_POST, 'flightroute', FILTER_SANITIZE_STRING); |
|
| 1234 | 1234 | if ($flightroute == 'flightroute') { |
| 1235 | - $settings = array_merge($settings,array('globalMapRoute' => 'TRUE')); |
|
| 1235 | + $settings = array_merge($settings, array('globalMapRoute' => 'TRUE')); |
|
| 1236 | 1236 | } else { |
| 1237 | - $settings = array_merge($settings,array('globalMapRoute' => 'FALSE')); |
|
| 1237 | + $settings = array_merge($settings, array('globalMapRoute' => 'FALSE')); |
|
| 1238 | 1238 | } |
| 1239 | - $allflights = filter_input(INPUT_POST,'allflights',FILTER_SANITIZE_STRING); |
|
| 1239 | + $allflights = filter_input(INPUT_POST, 'allflights', FILTER_SANITIZE_STRING); |
|
| 1240 | 1240 | if ($allflights == 'allflights') { |
| 1241 | - $settings = array_merge($settings,array('globalAllFlights' => 'TRUE')); |
|
| 1241 | + $settings = array_merge($settings, array('globalAllFlights' => 'TRUE')); |
|
| 1242 | 1242 | } else { |
| 1243 | - $settings = array_merge($settings,array('globalAllFlights' => 'FALSE')); |
|
| 1243 | + $settings = array_merge($settings, array('globalAllFlights' => 'FALSE')); |
|
| 1244 | 1244 | } |
| 1245 | - $bbox = filter_input(INPUT_POST,'bbox',FILTER_SANITIZE_STRING); |
|
| 1245 | + $bbox = filter_input(INPUT_POST, 'bbox', FILTER_SANITIZE_STRING); |
|
| 1246 | 1246 | if ($bbox == 'bbox') { |
| 1247 | - $settings = array_merge($settings,array('globalMapUseBbox' => 'TRUE')); |
|
| 1247 | + $settings = array_merge($settings, array('globalMapUseBbox' => 'TRUE')); |
|
| 1248 | 1248 | } else { |
| 1249 | - $settings = array_merge($settings,array('globalMapUseBbox' => 'FALSE')); |
|
| 1249 | + $settings = array_merge($settings, array('globalMapUseBbox' => 'FALSE')); |
|
| 1250 | 1250 | } |
| 1251 | - $waypoints = filter_input(INPUT_POST,'waypoints',FILTER_SANITIZE_STRING); |
|
| 1251 | + $waypoints = filter_input(INPUT_POST, 'waypoints', FILTER_SANITIZE_STRING); |
|
| 1252 | 1252 | if ($waypoints == 'waypoints') { |
| 1253 | - $settings = array_merge($settings,array('globalWaypoints' => 'TRUE')); |
|
| 1253 | + $settings = array_merge($settings, array('globalWaypoints' => 'TRUE')); |
|
| 1254 | 1254 | } else { |
| 1255 | - $settings = array_merge($settings,array('globalWaypoints' => 'FALSE')); |
|
| 1255 | + $settings = array_merge($settings, array('globalWaypoints' => 'FALSE')); |
|
| 1256 | 1256 | } |
| 1257 | - $noairlines = filter_input(INPUT_POST,'noairlines',FILTER_SANITIZE_STRING); |
|
| 1257 | + $noairlines = filter_input(INPUT_POST, 'noairlines', FILTER_SANITIZE_STRING); |
|
| 1258 | 1258 | if ($noairlines == 'noairlines') { |
| 1259 | - $settings = array_merge($settings,array('globalNoAirlines' => 'TRUE')); |
|
| 1259 | + $settings = array_merge($settings, array('globalNoAirlines' => 'TRUE')); |
|
| 1260 | 1260 | } else { |
| 1261 | - $settings = array_merge($settings,array('globalNoAirlines' => 'FALSE')); |
|
| 1261 | + $settings = array_merge($settings, array('globalNoAirlines' => 'FALSE')); |
|
| 1262 | 1262 | } |
| 1263 | 1263 | |
| 1264 | - if (!isset($globalTransaction)) $settings = array_merge($settings,array('globalTransaction' => 'TRUE')); |
|
| 1264 | + if (!isset($globalTransaction)) $settings = array_merge($settings, array('globalTransaction' => 'TRUE')); |
|
| 1265 | 1265 | |
| 1266 | 1266 | // Set some defaults values... |
| 1267 | 1267 | if (!isset($globalAircraftImageSources)) { |
| 1268 | - $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters'); |
|
| 1269 | - $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources)); |
|
| 1268 | + $globalAircraftImageSources = array('ivaomtl', 'wikimedia', 'airportdata', 'deviantart', 'flickr', 'bing', 'jetphotos', 'planepictures', 'planespotters'); |
|
| 1269 | + $settings = array_merge($settings, array('globalAircraftImageSources' => $globalAircraftImageSources)); |
|
| 1270 | 1270 | } |
| 1271 | 1271 | |
| 1272 | 1272 | if (!isset($globalSchedulesSources)) { |
| 1273 | - $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware'); |
|
| 1274 | - $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources)); |
|
| 1273 | + $globalSchedulesSources = array('flightmapper', 'costtotravel', 'flightradar24', 'flightaware'); |
|
| 1274 | + $settings = array_merge($settings, array('globalSchedulesSources' => $globalSchedulesSources)); |
|
| 1275 | 1275 | } |
| 1276 | 1276 | |
| 1277 | - $settings = array_merge($settings,array('globalInstalled' => 'TRUE')); |
|
| 1277 | + $settings = array_merge($settings, array('globalInstalled' => 'TRUE')); |
|
| 1278 | 1278 | |
| 1279 | 1279 | if ($error == '') settings::modify_settings($settings); |
| 1280 | 1280 | if ($error == '') settings::comment_settings($settings_comment); |
@@ -131,45 +131,72 @@ discard block |
||
| 131 | 131 | </div> |
| 132 | 132 | <p> |
| 133 | 133 | <label for="dbhost">Database hostname</label> |
| 134 | - <input type="text" name="dbhost" id="dbhost" value="<?php if (isset($globalDBhost)) print $globalDBhost; ?>" /> |
|
| 134 | + <input type="text" name="dbhost" id="dbhost" value="<?php if (isset($globalDBhost)) { |
|
| 135 | + print $globalDBhost; |
|
| 136 | +} |
|
| 137 | +?>" /> |
|
| 135 | 138 | </p> |
| 136 | 139 | <p> |
| 137 | 140 | <label for="dbport">Database port</label> |
| 138 | - <input type="text" name="dbport" id="dbport" value="<?php if (isset($globalDBport)) print $globalDBport; ?>" /> |
|
| 141 | + <input type="text" name="dbport" id="dbport" value="<?php if (isset($globalDBport)) { |
|
| 142 | + print $globalDBport; |
|
| 143 | +} |
|
| 144 | +?>" /> |
|
| 139 | 145 | <p class="help-block">Default is 3306 for MariaDB/MySQL, 5432 for PostgreSQL</p> |
| 140 | 146 | </p> |
| 141 | 147 | <p> |
| 142 | 148 | <label for="dbname">Database name</label> |
| 143 | - <input type="text" name="dbname" id="dbname" value="<?php if (isset($globalDBname)) print $globalDBname; ?>" /> |
|
| 149 | + <input type="text" name="dbname" id="dbname" value="<?php if (isset($globalDBname)) { |
|
| 150 | + print $globalDBname; |
|
| 151 | +} |
|
| 152 | +?>" /> |
|
| 144 | 153 | </p> |
| 145 | 154 | <p> |
| 146 | 155 | <label for="dbuser">Database user</label> |
| 147 | - <input type="text" name="dbuser" id="dbuser" value="<?php if (isset($globalDBuser)) print $globalDBuser; ?>" /> |
|
| 156 | + <input type="text" name="dbuser" id="dbuser" value="<?php if (isset($globalDBuser)) { |
|
| 157 | + print $globalDBuser; |
|
| 158 | +} |
|
| 159 | +?>" /> |
|
| 148 | 160 | </p> |
| 149 | 161 | <p> |
| 150 | 162 | <label for="dbuserpass">Database user password</label> |
| 151 | - <input type="password" name="dbuserpass" id="dbuserpass" value="<?php if (isset($globalDBpass)) print $globalDBpass; ?>" /> |
|
| 163 | + <input type="password" name="dbuserpass" id="dbuserpass" value="<?php if (isset($globalDBpass)) { |
|
| 164 | + print $globalDBpass; |
|
| 165 | +} |
|
| 166 | +?>" /> |
|
| 152 | 167 | </p> |
| 153 | 168 | </fieldset> |
| 154 | 169 | <fieldset id="site"> |
| 155 | 170 | <legend>Site configuration</legend> |
| 156 | 171 | <p> |
| 157 | 172 | <label for="sitename">Site name</label> |
| 158 | - <input type="text" name="sitename" id="sitename" value="<?php if (isset($globalName)) print $globalName; ?>" /> |
|
| 173 | + <input type="text" name="sitename" id="sitename" value="<?php if (isset($globalName)) { |
|
| 174 | + print $globalName; |
|
| 175 | +} |
|
| 176 | +?>" /> |
|
| 159 | 177 | </p> |
| 160 | 178 | <p> |
| 161 | 179 | <label for="siteurl">Site directory</label> |
| 162 | - <input type="text" name="siteurl" id="siteurl" value="<?php if (isset($globalURL)) print $globalURL; ?>" /> |
|
| 180 | + <input type="text" name="siteurl" id="siteurl" value="<?php if (isset($globalURL)) { |
|
| 181 | + print $globalURL; |
|
| 182 | +} |
|
| 183 | +?>" /> |
|
| 163 | 184 | <p class="help-block">Can be null. ex : <i>flightairmap</i> if complete URL is <i>http://toto.com/flightairmap</i></p> |
| 164 | 185 | </p> |
| 165 | 186 | <p> |
| 166 | 187 | <label for="timezone">Timezone</label> |
| 167 | - <input type="text" name="timezone" id="timezone" value="<?php if (isset($globalTimezone)) print $globalTimezone; ?>" /> |
|
| 188 | + <input type="text" name="timezone" id="timezone" value="<?php if (isset($globalTimezone)) { |
|
| 189 | + print $globalTimezone; |
|
| 190 | +} |
|
| 191 | +?>" /> |
|
| 168 | 192 | <p class="help-block">ex : UTC, Europe/Paris,...</p> |
| 169 | 193 | </p> |
| 170 | 194 | <p> |
| 171 | 195 | <label for="language">Language</label> |
| 172 | - <input type="text" name="language" id="language" value="<?php if (isset($globalLanguage)) print $globalLanguage; ?>" /> |
|
| 196 | + <input type="text" name="language" id="language" value="<?php if (isset($globalLanguage)) { |
|
| 197 | + print $globalLanguage; |
|
| 198 | +} |
|
| 199 | +?>" /> |
|
| 173 | 200 | <p class="help-block">Used only when link to wikipedia for now. Can be EN,DE,FR,...</p> |
| 174 | 201 | </p> |
| 175 | 202 | </fieldset> |
@@ -190,11 +217,17 @@ discard block |
||
| 190 | 217 | <div id="mapbox_data"> |
| 191 | 218 | <p> |
| 192 | 219 | <label for="mapboxid">Mapbox id</label> |
| 193 | - <input type="text" name="mapboxid" id="mapboxid" value="<?php if (isset($globalMapboxId)) print $globalMapboxId; ?>" /> |
|
| 220 | + <input type="text" name="mapboxid" id="mapboxid" value="<?php if (isset($globalMapboxId)) { |
|
| 221 | + print $globalMapboxId; |
|
| 222 | +} |
|
| 223 | +?>" /> |
|
| 194 | 224 | </p> |
| 195 | 225 | <p> |
| 196 | 226 | <label for="mapboxtoken">Mapbox token</label> |
| 197 | - <input type="text" name="mapboxtoken" id="mapboxtoken" value="<?php if (isset($globalMapboxToken)) print $globalMapboxToken; ?>" /> |
|
| 227 | + <input type="text" name="mapboxtoken" id="mapboxtoken" value="<?php if (isset($globalMapboxToken)) { |
|
| 228 | + print $globalMapboxToken; |
|
| 229 | +} |
|
| 230 | +?>" /> |
|
| 198 | 231 | </p> |
| 199 | 232 | <p class="help-block">Get a key <a href="https://www.mapbox.com/developers/">here</a></p> |
| 200 | 233 | </div> |
@@ -202,7 +235,10 @@ discard block |
||
| 202 | 235 | <div id="google_data"> |
| 203 | 236 | <p> |
| 204 | 237 | <label for="googlekey">Google API key</label> |
| 205 | - <input type="text" name="googlekey" id="googlekey" value="<?php if (isset($globalGoogleAPIKey)) print $globalGoogleAPIKey; ?>" /> |
|
| 238 | + <input type="text" name="googlekey" id="googlekey" value="<?php if (isset($globalGoogleAPIKey)) { |
|
| 239 | + print $globalGoogleAPIKey; |
|
| 240 | +} |
|
| 241 | +?>" /> |
|
| 206 | 242 | <p class="help-block">Get a key <a href="https://developers.google.com/maps/documentation/javascript/get-api-key#get-an-api-key">here</a></p> |
| 207 | 243 | </p> |
| 208 | 244 | </div> |
@@ -210,7 +246,10 @@ discard block |
||
| 210 | 246 | <div id="bing_data"> |
| 211 | 247 | <p> |
| 212 | 248 | <label for="bingkey">Bing Map key</label> |
| 213 | - <input type="text" name="bingkey" id="bingkey" value="<?php if (isset($globalBingMapKey)) print $globalBingMapKey; ?>" /> |
|
| 249 | + <input type="text" name="bingkey" id="bingkey" value="<?php if (isset($globalBingMapKey)) { |
|
| 250 | + print $globalBingMapKey; |
|
| 251 | +} |
|
| 252 | +?>" /> |
|
| 214 | 253 | <p class="help-block">Get a key <a href="https://www.bingmapsportal.com/">here</a></p> |
| 215 | 254 | </p> |
| 216 | 255 | </div> |
@@ -218,7 +257,10 @@ discard block |
||
| 218 | 257 | <div id="mapquest_data"> |
| 219 | 258 | <p> |
| 220 | 259 | <label for="mapquestkey">MapQuest key</label> |
| 221 | - <input type="text" name="mapquestkey" id="mapquestkey" value="<?php if (isset($globalMapQuestKey)) print $globalMapQuestKey; ?>" /> |
|
| 260 | + <input type="text" name="mapquestkey" id="mapquestkey" value="<?php if (isset($globalMapQuestKey)) { |
|
| 261 | + print $globalMapQuestKey; |
|
| 262 | +} |
|
| 263 | +?>" /> |
|
| 222 | 264 | <p class="help-block">Get a key <a href="https://developer.mapquest.com/user/me/apps">here</a></p> |
| 223 | 265 | </p> |
| 224 | 266 | </div> |
@@ -226,11 +268,17 @@ discard block |
||
| 226 | 268 | <div id="here_data"> |
| 227 | 269 | <p> |
| 228 | 270 | <label for="hereappid">Here App_Id</label> |
| 229 | - <input type="text" name="hereappid" id="hereappid" value="<?php if (isset($globalHereappId)) print $globalHereappId; ?>" /> |
|
| 271 | + <input type="text" name="hereappid" id="hereappid" value="<?php if (isset($globalHereappId)) { |
|
| 272 | + print $globalHereappId; |
|
| 273 | +} |
|
| 274 | +?>" /> |
|
| 230 | 275 | </p> |
| 231 | 276 | <p> |
| 232 | 277 | <label for="hereappcode">Here App_Code</label> |
| 233 | - <input type="text" name="hereappcode" id="hereappcode" value="<?php if (isset($globalHereappCode)) print $globalHereappCode; ?>" /> |
|
| 278 | + <input type="text" name="hereappcode" id="hereappcode" value="<?php if (isset($globalHereappCode)) { |
|
| 279 | + print $globalHereappCode; |
|
| 280 | +} |
|
| 281 | +?>" /> |
|
| 234 | 282 | </p> |
| 235 | 283 | <p class="help-block">Get a key <a href="https://developer.here.com/rest-apis/documentation/enterprise-map-tile/topics/quick-start.html">here</a></p> |
| 236 | 284 | </div> |
@@ -239,42 +287,86 @@ discard block |
||
| 239 | 287 | <legend>Coverage area</legend> |
| 240 | 288 | <p> |
| 241 | 289 | <label for="latitudemax">The maximum latitude (north)</label> |
| 242 | - <input type="text" name="latitudemax" id="latitudemax" value="<?php if (isset($globalLatitudeMax)) print $globalLatitudeMax; ?>" /> |
|
| 290 | + <input type="text" name="latitudemax" id="latitudemax" value="<?php if (isset($globalLatitudeMax)) { |
|
| 291 | + print $globalLatitudeMax; |
|
| 292 | +} |
|
| 293 | +?>" /> |
|
| 243 | 294 | </p> |
| 244 | 295 | <p> |
| 245 | 296 | <label for="latitudemin">The minimum latitude (south)</label> |
| 246 | - <input type="text" name="latitudemin" id="latitudemin" value="<?php if (isset($globalLatitudeMin)) print $globalLatitudeMin; ?>" /> |
|
| 297 | + <input type="text" name="latitudemin" id="latitudemin" value="<?php if (isset($globalLatitudeMin)) { |
|
| 298 | + print $globalLatitudeMin; |
|
| 299 | +} |
|
| 300 | +?>" /> |
|
| 247 | 301 | </p> |
| 248 | 302 | <p> |
| 249 | 303 | <label for="longitudemax">The maximum longitude (west)</label> |
| 250 | - <input type="text" name="longitudemax" id="longitudemax" value="<?php if (isset($globalLongitudeMax)) print $globalLongitudeMax; ?>" /> |
|
| 304 | + <input type="text" name="longitudemax" id="longitudemax" value="<?php if (isset($globalLongitudeMax)) { |
|
| 305 | + print $globalLongitudeMax; |
|
| 306 | +} |
|
| 307 | +?>" /> |
|
| 251 | 308 | </p> |
| 252 | 309 | <p> |
| 253 | 310 | <label for="longitudemin">The minimum longitude (east)</label> |
| 254 | - <input type="text" name="longitudemin" id="longitudemin" value="<?php if (isset($globalLongitudeMin)) print $globalLongitudeMin; ?>" /> |
|
| 311 | + <input type="text" name="longitudemin" id="longitudemin" value="<?php if (isset($globalLongitudeMin)) { |
|
| 312 | + print $globalLongitudeMin; |
|
| 313 | +} |
|
| 314 | +?>" /> |
|
| 255 | 315 | </p> |
| 256 | 316 | <p> |
| 257 | 317 | <label for="latitudecenter">The latitude center</label> |
| 258 | - <input type="text" name="latitudecenter" id="latitudecenter" value="<?php if (isset($globalCenterLatitude)) print $globalCenterLatitude; ?>" /> |
|
| 318 | + <input type="text" name="latitudecenter" id="latitudecenter" value="<?php if (isset($globalCenterLatitude)) { |
|
| 319 | + print $globalCenterLatitude; |
|
| 320 | +} |
|
| 321 | +?>" /> |
|
| 259 | 322 | </p> |
| 260 | 323 | <p> |
| 261 | 324 | <label for="longitudecenter">The longitude center</label> |
| 262 | - <input type="text" name="longitudecenter" id="longitudecenter" value="<?php if (isset($globalCenterLongitude)) print $globalCenterLongitude; ?>" /> |
|
| 325 | + <input type="text" name="longitudecenter" id="longitudecenter" value="<?php if (isset($globalCenterLongitude)) { |
|
| 326 | + print $globalCenterLongitude; |
|
| 327 | +} |
|
| 328 | +?>" /> |
|
| 263 | 329 | </p> |
| 264 | 330 | <p> |
| 265 | 331 | <label for="livezoom">Default Zoom on live map</label> |
| 266 | - <input type="number" name="livezoom" id="livezoom" value="<?php if (isset($globalLiveZoom)) print $globalLiveZoom; else print '9'; ?>" /> |
|
| 332 | + <input type="number" name="livezoom" id="livezoom" value="<?php if (isset($globalLiveZoom)) { |
|
| 333 | + print $globalLiveZoom; |
|
| 334 | +} else { |
|
| 335 | + print '9'; |
|
| 336 | +} |
|
| 337 | +?>" /> |
|
| 267 | 338 | </p> |
| 268 | 339 | <p> |
| 269 | 340 | <label for="squawk_country">Country for squawk usage</label> |
| 270 | 341 | <select name="squawk_country" id="squawk_country"> |
| 271 | - <option value="UK"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'UK') print ' selected '; ?>>UK</option> |
|
| 272 | - <option value="NZ"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'NZ') print ' selected '; ?>>NZ</option> |
|
| 273 | - <option value="US"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'US') print ' selected '; ?>>US</option> |
|
| 274 | - <option value="AU"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'AU') print ' selected '; ?>>AU</option> |
|
| 275 | - <option value="NL"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'NL') print ' selected '; ?>>NL</option> |
|
| 276 | - <option value="FR"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'FR') print ' selected '; ?>>FR</option> |
|
| 277 | - <option value="TR"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'TR') print ' selected '; ?>>TR</option> |
|
| 342 | + <option value="UK"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'UK') { |
|
| 343 | + print ' selected '; |
|
| 344 | +} |
|
| 345 | +?>>UK</option> |
|
| 346 | + <option value="NZ"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'NZ') { |
|
| 347 | + print ' selected '; |
|
| 348 | +} |
|
| 349 | +?>>NZ</option> |
|
| 350 | + <option value="US"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'US') { |
|
| 351 | + print ' selected '; |
|
| 352 | +} |
|
| 353 | +?>>US</option> |
|
| 354 | + <option value="AU"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'AU') { |
|
| 355 | + print ' selected '; |
|
| 356 | +} |
|
| 357 | +?>>AU</option> |
|
| 358 | + <option value="NL"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'NL') { |
|
| 359 | + print ' selected '; |
|
| 360 | +} |
|
| 361 | +?>>NL</option> |
|
| 362 | + <option value="FR"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'FR') { |
|
| 363 | + print ' selected '; |
|
| 364 | +} |
|
| 365 | +?>>FR</option> |
|
| 366 | + <option value="TR"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'TR') { |
|
| 367 | + print ' selected '; |
|
| 368 | +} |
|
| 369 | +?>>TR</option> |
|
| 278 | 370 | </select> |
| 279 | 371 | </p> |
| 280 | 372 | </fieldset> |
@@ -283,15 +375,24 @@ discard block |
||
| 283 | 375 | <p><i>Only put in DB flights that are inside a circle</i></p> |
| 284 | 376 | <p> |
| 285 | 377 | <label for="latitude">Center latitude</label> |
| 286 | - <input type="text" name="zoilatitude" id="latitude" value="<?php if (isset($globalDistanceIgnore['latitude'])) echo $globalDistanceIgnore['latitude']; ?>" /> |
|
| 378 | + <input type="text" name="zoilatitude" id="latitude" value="<?php if (isset($globalDistanceIgnore['latitude'])) { |
|
| 379 | + echo $globalDistanceIgnore['latitude']; |
|
| 380 | +} |
|
| 381 | +?>" /> |
|
| 287 | 382 | </p> |
| 288 | 383 | <p> |
| 289 | 384 | <label for="longitude">Center longitude</label> |
| 290 | - <input type="text" name="zoilongitude" id="longitude" value="<?php if (isset($globalDistanceIgnore['longitude'])) echo $globalDistanceIgnore['longitude']; ?>" /> |
|
| 385 | + <input type="text" name="zoilongitude" id="longitude" value="<?php if (isset($globalDistanceIgnore['longitude'])) { |
|
| 386 | + echo $globalDistanceIgnore['longitude']; |
|
| 387 | +} |
|
| 388 | +?>" /> |
|
| 291 | 389 | </p> |
| 292 | 390 | <p> |
| 293 | 391 | <label for="Distance">Distance (in km)</label> |
| 294 | - <input type="text" name="zoidistance" id="distance" value="<?php if (isset($globalDistanceIgnore['distance'])) echo $globalDistanceIgnore['distance']; ?>" /> |
|
| 392 | + <input type="text" name="zoidistance" id="distance" value="<?php if (isset($globalDistanceIgnore['distance'])) { |
|
| 393 | + echo $globalDistanceIgnore['distance']; |
|
| 394 | +} |
|
| 395 | +?>" /> |
|
| 295 | 396 | </p> |
| 296 | 397 | </fieldset> |
| 297 | 398 | <fieldset id="sourceloc"> |
@@ -399,11 +500,17 @@ discard block |
||
| 399 | 500 | <div id="flightaware_data"> |
| 400 | 501 | <p> |
| 401 | 502 | <label for="flightawareusername">FlightAware username</label> |
| 402 | - <input type="text" name="flightawareusername" id="flightawareusername" value="<?php if (isset($globalFlightAwareUsername)) print $globalFlightAwareUsername; ?>" /> |
|
| 503 | + <input type="text" name="flightawareusername" id="flightawareusername" value="<?php if (isset($globalFlightAwareUsername)) { |
|
| 504 | + print $globalFlightAwareUsername; |
|
| 505 | +} |
|
| 506 | +?>" /> |
|
| 403 | 507 | </p> |
| 404 | 508 | <p> |
| 405 | 509 | <label for="flightawarepassword">FlightAware password/API key</label> |
| 406 | - <input type="text" name="flightawarepassword" id="flightawarepassword" value="<?php if (isset($globalFlightAwarePassword)) print $globalFlightAwarePassword; ?>" /> |
|
| 510 | + <input type="text" name="flightawarepassword" id="flightawarepassword" value="<?php if (isset($globalFlightAwarePassword)) { |
|
| 511 | + print $globalFlightAwarePassword; |
|
| 512 | +} |
|
| 513 | +?>" /> |
|
| 407 | 514 | </p> |
| 408 | 515 | </div> |
| 409 | 516 | --> |
@@ -463,28 +570,88 @@ discard block |
||
| 463 | 570 | ?> |
| 464 | 571 | <td> |
| 465 | 572 | <select name="format[]" id="format"> |
| 466 | - <option value="auto" <?php if (!isset($source['format'])) print 'selected'; ?>>Auto</option> |
|
| 467 | - <option value="sbs" <?php if (isset($source['format']) && $source['format'] == 'sbs') print 'selected'; ?>>SBS</option> |
|
| 468 | - <option value="tsv" <?php if (isset($source['format']) && $source['format'] == 'tsv') print 'selected'; ?>>TSV</option> |
|
| 469 | - <option value="raw" <?php if (isset($source['format']) && $source['format'] == 'raw') print 'selected'; ?>>Raw</option> |
|
| 470 | - <option value="aprs" <?php if (isset($source['format']) && $source['format'] == 'aprs') print 'selected'; ?>>APRS</option> |
|
| 471 | - <option value="deltadbtxt" <?php if (isset($source['format']) && $source['format'] == 'deltadbtxt') print 'selected'; ?>>Radarcape deltadb.txt</option> |
|
| 472 | - <option value="vatsimtxt" <?php if (isset($source['format']) && $source['format'] == 'vatsimtxt') print 'selected'; ?>>Vatsim</option> |
|
| 473 | - <option value="aircraftlistjson" <?php if (isset($source['format']) && $source['format'] == 'aircraftlistjson') print 'selected'; ?>>Virtual Radar Server AircraftList.json</option> |
|
| 474 | - <option value="vrstcp" <?php if (isset($source['format']) && $source['format'] == 'vrstcp') print 'selected'; ?>>Virtual Radar Server TCP</option> |
|
| 475 | - <option value="phpvmacars" <?php if (isset($source['format']) && $source['format'] == 'phpvmacars') print 'selected'; ?>>phpVMS</option> |
|
| 476 | - <option value="vam" <?php if (isset($source['format']) && $source['format'] == 'vam') print 'selected'; ?>>Virtual Airlines Manager</option> |
|
| 477 | - <option value="whazzup" <?php if (isset($source['format']) && $source['format'] == 'whazzup') print 'selected'; ?>>IVAO</option> |
|
| 478 | - <option value="flightgearmp" <?php if (isset($source['format']) && $source['format'] == 'flightgearmp') print 'selected'; ?>>FlightGear Multiplayer</option> |
|
| 479 | - <option value="flightgearsp" <?php if (isset($source['format']) && $source['format'] == 'flightgearsp') print 'selected'; ?>>FlightGear Singleplayer</option> |
|
| 480 | - <option value="acars" <?php if (isset($source['format']) && $source['format'] == 'acars') print 'selected'; ?>>ACARS from acarsdec/acarsdeco2 over UDP</option> |
|
| 481 | - <option value="acarssbs3" <?php if (isset($source['format']) && $source['format'] == 'acarssbs3') print 'selected'; ?>>ACARS SBS-3 over TCP</option> |
|
| 482 | - <option value="ais" <?php if (isset($source['format']) && $source['format'] == 'ais') print 'selected'; ?>>NMEA AIS over TCP</option> |
|
| 573 | + <option value="auto" <?php if (!isset($source['format'])) { |
|
| 574 | + print 'selected'; |
|
| 575 | +} |
|
| 576 | +?>>Auto</option> |
|
| 577 | + <option value="sbs" <?php if (isset($source['format']) && $source['format'] == 'sbs') { |
|
| 578 | + print 'selected'; |
|
| 579 | +} |
|
| 580 | +?>>SBS</option> |
|
| 581 | + <option value="tsv" <?php if (isset($source['format']) && $source['format'] == 'tsv') { |
|
| 582 | + print 'selected'; |
|
| 583 | +} |
|
| 584 | +?>>TSV</option> |
|
| 585 | + <option value="raw" <?php if (isset($source['format']) && $source['format'] == 'raw') { |
|
| 586 | + print 'selected'; |
|
| 587 | +} |
|
| 588 | +?>>Raw</option> |
|
| 589 | + <option value="aprs" <?php if (isset($source['format']) && $source['format'] == 'aprs') { |
|
| 590 | + print 'selected'; |
|
| 591 | +} |
|
| 592 | +?>>APRS</option> |
|
| 593 | + <option value="deltadbtxt" <?php if (isset($source['format']) && $source['format'] == 'deltadbtxt') { |
|
| 594 | + print 'selected'; |
|
| 595 | +} |
|
| 596 | +?>>Radarcape deltadb.txt</option> |
|
| 597 | + <option value="vatsimtxt" <?php if (isset($source['format']) && $source['format'] == 'vatsimtxt') { |
|
| 598 | + print 'selected'; |
|
| 599 | +} |
|
| 600 | +?>>Vatsim</option> |
|
| 601 | + <option value="aircraftlistjson" <?php if (isset($source['format']) && $source['format'] == 'aircraftlistjson') { |
|
| 602 | + print 'selected'; |
|
| 603 | +} |
|
| 604 | +?>>Virtual Radar Server AircraftList.json</option> |
|
| 605 | + <option value="vrstcp" <?php if (isset($source['format']) && $source['format'] == 'vrstcp') { |
|
| 606 | + print 'selected'; |
|
| 607 | +} |
|
| 608 | +?>>Virtual Radar Server TCP</option> |
|
| 609 | + <option value="phpvmacars" <?php if (isset($source['format']) && $source['format'] == 'phpvmacars') { |
|
| 610 | + print 'selected'; |
|
| 611 | +} |
|
| 612 | +?>>phpVMS</option> |
|
| 613 | + <option value="vam" <?php if (isset($source['format']) && $source['format'] == 'vam') { |
|
| 614 | + print 'selected'; |
|
| 615 | +} |
|
| 616 | +?>>Virtual Airlines Manager</option> |
|
| 617 | + <option value="whazzup" <?php if (isset($source['format']) && $source['format'] == 'whazzup') { |
|
| 618 | + print 'selected'; |
|
| 619 | +} |
|
| 620 | +?>>IVAO</option> |
|
| 621 | + <option value="flightgearmp" <?php if (isset($source['format']) && $source['format'] == 'flightgearmp') { |
|
| 622 | + print 'selected'; |
|
| 623 | +} |
|
| 624 | +?>>FlightGear Multiplayer</option> |
|
| 625 | + <option value="flightgearsp" <?php if (isset($source['format']) && $source['format'] == 'flightgearsp') { |
|
| 626 | + print 'selected'; |
|
| 627 | +} |
|
| 628 | +?>>FlightGear Singleplayer</option> |
|
| 629 | + <option value="acars" <?php if (isset($source['format']) && $source['format'] == 'acars') { |
|
| 630 | + print 'selected'; |
|
| 631 | +} |
|
| 632 | +?>>ACARS from acarsdec/acarsdeco2 over UDP</option> |
|
| 633 | + <option value="acarssbs3" <?php if (isset($source['format']) && $source['format'] == 'acarssbs3') { |
|
| 634 | + print 'selected'; |
|
| 635 | +} |
|
| 636 | +?>>ACARS SBS-3 over TCP</option> |
|
| 637 | + <option value="ais" <?php if (isset($source['format']) && $source['format'] == 'ais') { |
|
| 638 | + print 'selected'; |
|
| 639 | +} |
|
| 640 | +?>>NMEA AIS over TCP</option> |
|
| 483 | 641 | </select> |
| 484 | 642 | </td> |
| 485 | - <td><input type="text" name="name[]" id="name" value="<?php if (isset($source['name'])) print $source['name']; ?>" /></td> |
|
| 486 | - <td><input type="checkbox" name="sourcestats[]" id="sourcestats" title="Create statistics for the source like number of messages, distance,..." value="1" <?php if (isset($source['sourcestats']) && $source['sourcestats']) print 'checked'; ?> /></td> |
|
| 487 | - <td><input type="checkbox" name="noarchive[]" id="noarchive" title="Don't archive this source" value="1" <?php if (isset($source['noarchive']) && $source['noarchive']) print 'checked'; ?> /></td> |
|
| 643 | + <td><input type="text" name="name[]" id="name" value="<?php if (isset($source['name'])) { |
|
| 644 | + print $source['name']; |
|
| 645 | +} |
|
| 646 | +?>" /></td> |
|
| 647 | + <td><input type="checkbox" name="sourcestats[]" id="sourcestats" title="Create statistics for the source like number of messages, distance,..." value="1" <?php if (isset($source['sourcestats']) && $source['sourcestats']) { |
|
| 648 | + print 'checked'; |
|
| 649 | +} |
|
| 650 | +?> /></td> |
|
| 651 | + <td><input type="checkbox" name="noarchive[]" id="noarchive" title="Don't archive this source" value="1" <?php if (isset($source['noarchive']) && $source['noarchive']) { |
|
| 652 | + print 'checked'; |
|
| 653 | +} |
|
| 654 | +?> /></td> |
|
| 488 | 655 | <td><input type="button" id="delhost" value="Delete" onclick="deleteRow(this)" /> <input type="button" id="addhost" value="Add" onclick="insRow()" /></td> |
| 489 | 656 | </tr> |
| 490 | 657 | <?php |
@@ -533,11 +700,17 @@ discard block |
||
| 533 | 700 | <p>Listen UDP server for acarsdec/acarsdeco2/... with <i>daemon-acars.php</i> script</p> |
| 534 | 701 | <p> |
| 535 | 702 | <label for="acarshost">ACARS UDP host</label> |
| 536 | - <input type="text" name="acarshost" id="acarshost" value="<?php if (isset($globalACARSHost)) print $globalACARSHost; ?>" /> |
|
| 703 | + <input type="text" name="acarshost" id="acarshost" value="<?php if (isset($globalACARSHost)) { |
|
| 704 | + print $globalACARSHost; |
|
| 705 | +} |
|
| 706 | +?>" /> |
|
| 537 | 707 | </p> |
| 538 | 708 | <p> |
| 539 | 709 | <label for="acarsport">ACARS UDP port</label> |
| 540 | - <input type="number" name="acarsport" id="acarsport" value="<?php if (isset($globalACARSPort)) print $globalACARSPort; ?>" /> |
|
| 710 | + <input type="number" name="acarsport" id="acarsport" value="<?php if (isset($globalACARSPort)) { |
|
| 711 | + print $globalACARSPort; |
|
| 712 | +} |
|
| 713 | +?>" /> |
|
| 541 | 714 | </p> |
| 542 | 715 | </fieldset> |
| 543 | 716 | </div> |
@@ -617,13 +790,19 @@ discard block |
||
| 617 | 790 | <div id="schedules_options"> |
| 618 | 791 | <p> |
| 619 | 792 | <label for="britishairways">British Airways API Key</label> |
| 620 | - <input type="text" name="britishairways" id="britishairways" value="<?php if (isset($globalBritishAirwaysKey)) print $globalBritishAirwaysKey; ?>" /> |
|
| 793 | + <input type="text" name="britishairways" id="britishairways" value="<?php if (isset($globalBritishAirwaysKey)) { |
|
| 794 | + print $globalBritishAirwaysKey; |
|
| 795 | +} |
|
| 796 | +?>" /> |
|
| 621 | 797 | <p class="help-block">Register an account on <a href="https://developer.ba.com/">https://developer.ba.com/</a></p> |
| 622 | 798 | </p> |
| 623 | 799 | <!-- |
| 624 | 800 | <p> |
| 625 | 801 | <label for="transavia">Transavia Test API Consumer Key</label> |
| 626 | - <input type="text" name="transavia" id="transavia" value="<?php if (isset($globalTransaviaKey)) print $globalTransaviaKey; ?>" /> |
|
| 802 | + <input type="text" name="transavia" id="transavia" value="<?php if (isset($globalTransaviaKey)) { |
|
| 803 | + print $globalTransaviaKey; |
|
| 804 | +} |
|
| 805 | +?>" /> |
|
| 627 | 806 | <p class="help-block">Register an account on <a href="https://developer.transavia.com">https://developer.transavia.com</a></p> |
| 628 | 807 | </p> |
| 629 | 808 | --> |
@@ -632,10 +811,16 @@ discard block |
||
| 632 | 811 | <b>Lufthansa API Key</b> |
| 633 | 812 | <p> |
| 634 | 813 | <label for="lufthansakey">Key</label> |
| 635 | - <input type="text" name="lufthansakey" id="lufthansakey" value="<?php if (isset($globalLufthansaKey['key'])) print $globalLufthansaKey['key']; ?>" /> |
|
| 814 | + <input type="text" name="lufthansakey" id="lufthansakey" value="<?php if (isset($globalLufthansaKey['key'])) { |
|
| 815 | + print $globalLufthansaKey['key']; |
|
| 816 | +} |
|
| 817 | +?>" /> |
|
| 636 | 818 | </p><p> |
| 637 | 819 | <label for="lufthansasecret">Secret</label> |
| 638 | - <input type="text" name="lufthansasecret" id="lufthansasecret" value="<?php if (isset($globalLufthansaKey['secret'])) print $globalLufthansaKey['secret']; ?>" /> |
|
| 820 | + <input type="text" name="lufthansasecret" id="lufthansasecret" value="<?php if (isset($globalLufthansaKey['secret'])) { |
|
| 821 | + print $globalLufthansaKey['secret']; |
|
| 822 | +} |
|
| 823 | +?>" /> |
|
| 639 | 824 | </p> |
| 640 | 825 | </div> |
| 641 | 826 | <p class="help-block">Register an account on <a href="https://developer.lufthansa.com/page">https://developer.lufthansa.com/page</a></p> |
@@ -655,7 +840,10 @@ discard block |
||
| 655 | 840 | </p> |
| 656 | 841 | <p> |
| 657 | 842 | <label for="notamsource">URL of your feed from notaminfo.com</label> |
| 658 | - <input type="text" name="notamsource" id="notamsource" value="<?php if (isset($globalNOTAMSource)) print $globalNOTAMSource; ?>" /> |
|
| 843 | + <input type="text" name="notamsource" id="notamsource" value="<?php if (isset($globalNOTAMSource)) { |
|
| 844 | + print $globalNOTAMSource; |
|
| 845 | +} |
|
| 846 | +?>" /> |
|
| 659 | 847 | <p class="help-block">If you want to use world NOTAM from FlightAirMap website, leave it blank</p> |
| 660 | 848 | </p> |
| 661 | 849 | <br /> |
@@ -671,14 +859,20 @@ discard block |
||
| 671 | 859 | <div id="metarsrc"> |
| 672 | 860 | <p> |
| 673 | 861 | <label for="metarsource">URL of your METAR source</label> |
| 674 | - <input type="text" name="metarsource" id="metarsource" value="<?php if (isset($globalMETARurl)) print $globalMETARurl; ?>" /> |
|
| 862 | + <input type="text" name="metarsource" id="metarsource" value="<?php if (isset($globalMETARurl)) { |
|
| 863 | + print $globalMETARurl; |
|
| 864 | +} |
|
| 865 | +?>" /> |
|
| 675 | 866 | <p class="help-block">Use {icao} to specify where we replace by airport icao. ex : http://metar.vatsim.net/metar.php?id={icao}</p> |
| 676 | 867 | </p> |
| 677 | 868 | </div> |
| 678 | 869 | <br /> |
| 679 | 870 | <p> |
| 680 | 871 | <label for="bitly">Bit.ly access token api (used in search page)</label> |
| 681 | - <input type="text" name="bitly" id="bitly" value="<?php if (isset($globalBitlyAccessToken)) print $globalBitlyAccessToken; ?>" /> |
|
| 872 | + <input type="text" name="bitly" id="bitly" value="<?php if (isset($globalBitlyAccessToken)) { |
|
| 873 | + print $globalBitlyAccessToken; |
|
| 874 | +} |
|
| 875 | +?>" /> |
|
| 682 | 876 | </p> |
| 683 | 877 | <br /> |
| 684 | 878 | <p> |
@@ -698,7 +892,12 @@ discard block |
||
| 698 | 892 | </p> |
| 699 | 893 | <p> |
| 700 | 894 | <label for="archivemonths">Generate statistics, delete or put in archive flights older than xx months</label> |
| 701 | - <input type="number" name="archivemonths" id="archivemonths" value="<?php if (isset($globalArchiveMonths)) print $globalArchiveMonths; else echo '0'; ?>" /> |
|
| 895 | + <input type="number" name="archivemonths" id="archivemonths" value="<?php if (isset($globalArchiveMonths)) { |
|
| 896 | + print $globalArchiveMonths; |
|
| 897 | +} else { |
|
| 898 | + echo '0'; |
|
| 899 | +} |
|
| 900 | +?>" /> |
|
| 702 | 901 | <p class="help-block">0 to disable, delete old flight if <i>Archive all flights data</i> is disabled</p> |
| 703 | 902 | </p> |
| 704 | 903 | <p> |
@@ -708,12 +907,22 @@ discard block |
||
| 708 | 907 | </p> |
| 709 | 908 | <p> |
| 710 | 909 | <label for="archivekeepmonths">Keep flights data for xx months in archive</label> |
| 711 | - <input type="number" name="archivekeepmonths" id="archivekeepmonths" value="<?php if (isset($globalArchiveKeepMonths)) print $globalArchiveKeepMonths; else echo '0'; ?>" /> |
|
| 910 | + <input type="number" name="archivekeepmonths" id="archivekeepmonths" value="<?php if (isset($globalArchiveKeepMonths)) { |
|
| 911 | + print $globalArchiveKeepMonths; |
|
| 912 | +} else { |
|
| 913 | + echo '0'; |
|
| 914 | +} |
|
| 915 | +?>" /> |
|
| 712 | 916 | <p class="help-block">0 to disable</p> |
| 713 | 917 | </p> |
| 714 | 918 | <p> |
| 715 | 919 | <label for="archivekeeptrackmonths">Keep flights track data for xx months in archive</label> |
| 716 | - <input type="number" name="archivekeeptrackmonths" id="archivekeeptrackmonths" value="<?php if (isset($globalArchiveKeepTrackMonths)) print $globalArchiveKeepTrackMonths; else echo '0'; ?>" /> |
|
| 920 | + <input type="number" name="archivekeeptrackmonths" id="archivekeeptrackmonths" value="<?php if (isset($globalArchiveKeepTrackMonths)) { |
|
| 921 | + print $globalArchiveKeepTrackMonths; |
|
| 922 | +} else { |
|
| 923 | + echo '0'; |
|
| 924 | +} |
|
| 925 | +?>" /> |
|
| 717 | 926 | <p class="help-block">0 to disable, should be less or egal to <i>Keep flights data</i> value</p> |
| 718 | 927 | </p> |
| 719 | 928 | <br /> |
@@ -723,7 +932,12 @@ discard block |
||
| 723 | 932 | <p class="help-block">Uncheck if the script is running as cron job</p> |
| 724 | 933 | <div id="cronends"> |
| 725 | 934 | <label for="cronend">Run script for xx seconds</label> |
| 726 | - <input type="number" name="cronend" id="cronend" value="<?php if (isset($globalCronEnd)) print $globalCronEnd; else print '0'; ?>" /> |
|
| 935 | + <input type="number" name="cronend" id="cronend" value="<?php if (isset($globalCronEnd)) { |
|
| 936 | + print $globalCronEnd; |
|
| 937 | +} else { |
|
| 938 | + print '0'; |
|
| 939 | +} |
|
| 940 | +?>" /> |
|
| 727 | 941 | <p class="help-block">Set to 0 to disable. Should be disabled if source is URL.</p> |
| 728 | 942 | </div> |
| 729 | 943 | </p> |
@@ -768,15 +982,30 @@ discard block |
||
| 768 | 982 | <br /> |
| 769 | 983 | <p> |
| 770 | 984 | <label for="refresh">Show flights detected since xxx seconds</label> |
| 771 | - <input type="number" name="refresh" id="refresh" value="<?php if (isset($globalLiveInterval)) echo $globalLiveInterval; else echo '200'; ?>" /> |
|
| 985 | + <input type="number" name="refresh" id="refresh" value="<?php if (isset($globalLiveInterval)) { |
|
| 986 | + echo $globalLiveInterval; |
|
| 987 | +} else { |
|
| 988 | + echo '200'; |
|
| 989 | +} |
|
| 990 | +?>" /> |
|
| 772 | 991 | </p> |
| 773 | 992 | <p> |
| 774 | 993 | <label for="maprefresh">Live map refresh (in seconds)</label> |
| 775 | - <input type="number" name="maprefresh" id="maprefresh" value="<?php if (isset($globalMapRefresh)) echo $globalMapRefresh; else echo '30'; ?>" /> |
|
| 994 | + <input type="number" name="maprefresh" id="maprefresh" value="<?php if (isset($globalMapRefresh)) { |
|
| 995 | + echo $globalMapRefresh; |
|
| 996 | +} else { |
|
| 997 | + echo '30'; |
|
| 998 | +} |
|
| 999 | +?>" /> |
|
| 776 | 1000 | </p> |
| 777 | 1001 | <p> |
| 778 | 1002 | <label for="mapidle">Map idle timeout (in minutes)</label> |
| 779 | - <input type="number" name="mapidle" id="mapidle" value="<?php if (isset($globalMapIdleTimeout)) echo $globalMapIdleTimeout; else echo '30'; ?>" /> |
|
| 1003 | + <input type="number" name="mapidle" id="mapidle" value="<?php if (isset($globalMapIdleTimeout)) { |
|
| 1004 | + echo $globalMapIdleTimeout; |
|
| 1005 | +} else { |
|
| 1006 | + echo '30'; |
|
| 1007 | +} |
|
| 1008 | +?>" /> |
|
| 780 | 1009 | <p class="help-block">0 to disable</p> |
| 781 | 1010 | </p> |
| 782 | 1011 | <p> |
@@ -786,12 +1015,20 @@ discard block |
||
| 786 | 1015 | <br /> |
| 787 | 1016 | <p> |
| 788 | 1017 | <label for="closestmindist">Distance to airport set as arrival (in km)</label> |
| 789 | - <input type="number" name="closestmindist" id="closestmindist" value="<?php if (isset($globalClosestMinDist)) echo $globalClosestMinDist; else echo '50'; ?>" /> |
|
| 1018 | + <input type="number" name="closestmindist" id="closestmindist" value="<?php if (isset($globalClosestMinDist)) { |
|
| 1019 | + echo $globalClosestMinDist; |
|
| 1020 | +} else { |
|
| 1021 | + echo '50'; |
|
| 1022 | +} |
|
| 1023 | +?>" /> |
|
| 790 | 1024 | </p> |
| 791 | 1025 | <br /> |
| 792 | 1026 | <p> |
| 793 | 1027 | <label for="aircraftsize">Size of aircraft icon on map (default to 30px if zoom > 7 else 15px), empty to default</label> |
| 794 | - <input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize;?>" /> |
|
| 1028 | + <input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) { |
|
| 1029 | + echo $globalAircraftSize; |
|
| 1030 | +} |
|
| 1031 | +?>" /> |
|
| 795 | 1032 | </p> |
| 796 | 1033 | <br /> |
| 797 | 1034 | <p> |
@@ -804,7 +1041,12 @@ discard block |
||
| 804 | 1041 | if (extension_loaded('gd') && function_exists('gd_info')) { |
| 805 | 1042 | ?> |
| 806 | 1043 | <label for="aircrafticoncolor">Color of aircraft icon on map</label> |
| 807 | - <input type="color" name="aircrafticoncolor" id="aircrafticoncolor" value="#<?php if (isset($globalAircraftIconColor)) echo $globalAircraftIconColor; else echo '1a3151'; ?>" /> |
|
| 1044 | + <input type="color" name="aircrafticoncolor" id="aircrafticoncolor" value="#<?php if (isset($globalAircraftIconColor)) { |
|
| 1045 | + echo $globalAircraftIconColor; |
|
| 1046 | +} else { |
|
| 1047 | + echo '1a3151'; |
|
| 1048 | +} |
|
| 1049 | +?>" /> |
|
| 808 | 1050 | <?php |
| 809 | 1051 | if (!is_writable('../cache')) { |
| 810 | 1052 | ?> |
@@ -822,8 +1064,18 @@ discard block |
||
| 822 | 1064 | <p> |
| 823 | 1065 | <label for="airportzoom">Zoom level minimum to see airports icons</label> |
| 824 | 1066 | <div class="range"> |
| 825 | - <input type="range" name="airportzoom" id="airportzoom" value="<?php if (isset($globalAirportZoom)) echo $globalAirportZoom; else echo '7'; ?>" /> |
|
| 826 | - <output id="range"><?php if (isset($globalAirportZoom)) echo $globalAirportZoom; else echo '7'; ?></output> |
|
| 1067 | + <input type="range" name="airportzoom" id="airportzoom" value="<?php if (isset($globalAirportZoom)) { |
|
| 1068 | + echo $globalAirportZoom; |
|
| 1069 | +} else { |
|
| 1070 | + echo '7'; |
|
| 1071 | +} |
|
| 1072 | +?>" /> |
|
| 1073 | + <output id="range"><?php if (isset($globalAirportZoom)) { |
|
| 1074 | + echo $globalAirportZoom; |
|
| 1075 | +} else { |
|
| 1076 | + echo '7'; |
|
| 1077 | +} |
|
| 1078 | +?></output> |
|
| 827 | 1079 | </div> |
| 828 | 1080 | </p> |
| 829 | 1081 | </fieldset> |
@@ -851,8 +1103,12 @@ discard block |
||
| 851 | 1103 | $dbhost = filter_input(INPUT_POST,'dbhost',FILTER_SANITIZE_STRING); |
| 852 | 1104 | $dbport = filter_input(INPUT_POST,'dbport',FILTER_SANITIZE_STRING); |
| 853 | 1105 | |
| 854 | - if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) $error .= 'Mysql driver for PDO must be loaded'; |
|
| 855 | - if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) $error .= 'PosgreSQL driver for PDO must be loaded'; |
|
| 1106 | + if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) { |
|
| 1107 | + $error .= 'Mysql driver for PDO must be loaded'; |
|
| 1108 | + } |
|
| 1109 | + if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) { |
|
| 1110 | + $error .= 'PosgreSQL driver for PDO must be loaded'; |
|
| 1111 | + } |
|
| 856 | 1112 | |
| 857 | 1113 | $_SESSION['database_root'] = $dbroot; |
| 858 | 1114 | $_SESSION['database_rootpass'] = $dbrootpass; |
@@ -919,15 +1175,23 @@ discard block |
||
| 919 | 1175 | $source_city = $_POST['source_city']; |
| 920 | 1176 | $source_country = $_POST['source_country']; |
| 921 | 1177 | $source_ref = $_POST['source_ref']; |
| 922 | - if (isset($source_id)) $source_id = $_POST['source_id']; |
|
| 923 | - else $source_id = array(); |
|
| 1178 | + if (isset($source_id)) { |
|
| 1179 | + $source_id = $_POST['source_id']; |
|
| 1180 | + } else { |
|
| 1181 | + $source_id = array(); |
|
| 1182 | + } |
|
| 924 | 1183 | |
| 925 | 1184 | $sources = array(); |
| 926 | 1185 | foreach ($source_name as $keys => $name) { |
| 927 | - if (isset($source_id[$keys])) $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]); |
|
| 928 | - else $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]); |
|
| 1186 | + if (isset($source_id[$keys])) { |
|
| 1187 | + $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]); |
|
| 1188 | + } else { |
|
| 1189 | + $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]); |
|
| 1190 | + } |
|
| 1191 | + } |
|
| 1192 | + if (count($sources) > 0) { |
|
| 1193 | + $_SESSION['sources'] = $sources; |
|
| 929 | 1194 | } |
| 930 | - if (count($sources) > 0) $_SESSION['sources'] = $sources; |
|
| 931 | 1195 | |
| 932 | 1196 | //$sbshost = filter_input(INPUT_POST,'sbshost',FILTER_SANITIZE_STRING); |
| 933 | 1197 | //$sbsport = filter_input(INPUT_POST,'sbsport',FILTER_SANITIZE_NUMBER_INT); |
@@ -948,14 +1212,23 @@ discard block |
||
| 948 | 1212 | $datasource = filter_input(INPUT_POST,'datasource',FILTER_SANITIZE_STRING); |
| 949 | 1213 | |
| 950 | 1214 | $globalaircraft = filter_input(INPUT_POST,'globalaircraft',FILTER_SANITIZE_STRING); |
| 951 | - if ($globalaircraft == 'aircraft') $settings = array_merge($settings,array('globalAircraft' => 'TRUE')); |
|
| 952 | - else $settings = array_merge($settings,array('globalAircraft' => 'FALSE')); |
|
| 1215 | + if ($globalaircraft == 'aircraft') { |
|
| 1216 | + $settings = array_merge($settings,array('globalAircraft' => 'TRUE')); |
|
| 1217 | + } else { |
|
| 1218 | + $settings = array_merge($settings,array('globalAircraft' => 'FALSE')); |
|
| 1219 | + } |
|
| 953 | 1220 | $globaltracker = filter_input(INPUT_POST,'globaltracker',FILTER_SANITIZE_STRING); |
| 954 | - if ($globaltracker == 'tracker') $settings = array_merge($settings,array('globalTracker' => 'TRUE')); |
|
| 955 | - else $settings = array_merge($settings,array('globalTracker' => 'FALSE')); |
|
| 1221 | + if ($globaltracker == 'tracker') { |
|
| 1222 | + $settings = array_merge($settings,array('globalTracker' => 'TRUE')); |
|
| 1223 | + } else { |
|
| 1224 | + $settings = array_merge($settings,array('globalTracker' => 'FALSE')); |
|
| 1225 | + } |
|
| 956 | 1226 | $globalmarine = filter_input(INPUT_POST,'globalmarine',FILTER_SANITIZE_STRING); |
| 957 | - if ($globalmarine == 'marine') $settings = array_merge($settings,array('globalMarine' => 'TRUE')); |
|
| 958 | - else $settings = array_merge($settings,array('globalMarine' => 'FALSE')); |
|
| 1227 | + if ($globalmarine == 'marine') { |
|
| 1228 | + $settings = array_merge($settings,array('globalMarine' => 'TRUE')); |
|
| 1229 | + } else { |
|
| 1230 | + $settings = array_merge($settings,array('globalMarine' => 'FALSE')); |
|
| 1231 | + } |
|
| 959 | 1232 | |
| 960 | 1233 | /* |
| 961 | 1234 | $globalSBS1Hosts = array(); |
@@ -976,17 +1249,31 @@ discard block |
||
| 976 | 1249 | $port = $_POST['port']; |
| 977 | 1250 | $name = $_POST['name']; |
| 978 | 1251 | $format = $_POST['format']; |
| 979 | - if (isset($_POST['sourcestats'])) $sourcestats = $_POST['sourcestats']; |
|
| 980 | - else $sourcestats = array(); |
|
| 981 | - if (isset($_POST['noarchive'])) $noarchive = $_POST['noarchive']; |
|
| 982 | - else $noarchive = array(); |
|
| 1252 | + if (isset($_POST['sourcestats'])) { |
|
| 1253 | + $sourcestats = $_POST['sourcestats']; |
|
| 1254 | + } else { |
|
| 1255 | + $sourcestats = array(); |
|
| 1256 | + } |
|
| 1257 | + if (isset($_POST['noarchive'])) { |
|
| 1258 | + $noarchive = $_POST['noarchive']; |
|
| 1259 | + } else { |
|
| 1260 | + $noarchive = array(); |
|
| 1261 | + } |
|
| 983 | 1262 | $gSources = array(); |
| 984 | 1263 | foreach ($host as $key => $h) { |
| 985 | - if (isset($sourcestats[$key]) && $sourcestats[$key] == 1) $cov = 'TRUE'; |
|
| 986 | - else $cov = 'FALSE'; |
|
| 987 | - if (isset($noarchive[$key]) && $noarchive[$key] == 1) $arch = 'TRUE'; |
|
| 988 | - else $arch = 'FALSE'; |
|
| 989 | - if ($h != '') $gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch); |
|
| 1264 | + if (isset($sourcestats[$key]) && $sourcestats[$key] == 1) { |
|
| 1265 | + $cov = 'TRUE'; |
|
| 1266 | + } else { |
|
| 1267 | + $cov = 'FALSE'; |
|
| 1268 | + } |
|
| 1269 | + if (isset($noarchive[$key]) && $noarchive[$key] == 1) { |
|
| 1270 | + $arch = 'TRUE'; |
|
| 1271 | + } else { |
|
| 1272 | + $arch = 'FALSE'; |
|
| 1273 | + } |
|
| 1274 | + if ($h != '') { |
|
| 1275 | + $gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch); |
|
| 1276 | + } |
|
| 990 | 1277 | } |
| 991 | 1278 | $settings = array_merge($settings,array('globalSources' => $gSources)); |
| 992 | 1279 | |
@@ -1011,7 +1298,9 @@ discard block |
||
| 1011 | 1298 | $zoidistance = filter_input(INPUT_POST,'zoidistance',FILTER_SANITIZE_NUMBER_INT); |
| 1012 | 1299 | if ($zoilatitude != '' && $zoilongitude != '' && $zoidistance != '') { |
| 1013 | 1300 | $settings = array_merge($settings,array('globalDistanceIgnore' => array('latitude' => $zoilatitude,'longitude' => $zoilongitude,'distance' => $zoidistance))); |
| 1014 | - } else $settings = array_merge($settings,array('globalDistanceIgnore' => array())); |
|
| 1301 | + } else { |
|
| 1302 | + $settings = array_merge($settings,array('globalDistanceIgnore' => array())); |
|
| 1303 | + } |
|
| 1015 | 1304 | |
| 1016 | 1305 | $refresh = filter_input(INPUT_POST,'refresh',FILTER_SANITIZE_NUMBER_INT); |
| 1017 | 1306 | $settings = array_merge($settings,array('globalLiveInterval' => $refresh)); |
@@ -1050,7 +1339,9 @@ discard block |
||
| 1050 | 1339 | |
| 1051 | 1340 | // Create in settings.php keys not yet configurable if not already here |
| 1052 | 1341 | //if (!isset($globalImageBingKey)) $settings = array_merge($settings,array('globalImageBingKey' => '')); |
| 1053 | - if (!isset($globalDebug)) $settings = array_merge($settings,array('globalDebug' => 'TRUE')); |
|
| 1342 | + if (!isset($globalDebug)) { |
|
| 1343 | + $settings = array_merge($settings,array('globalDebug' => 'TRUE')); |
|
| 1344 | + } |
|
| 1054 | 1345 | |
| 1055 | 1346 | $resetyearstats = filter_input(INPUT_POST,'resetyearstats',FILTER_SANITIZE_STRING); |
| 1056 | 1347 | if ($resetyearstats == 'resetyearstats') { |
@@ -1087,33 +1378,51 @@ discard block |
||
| 1087 | 1378 | } |
| 1088 | 1379 | */ |
| 1089 | 1380 | $settings = array_merge($settings,array('globalFlightAware' => 'FALSE')); |
| 1090 | - if ($globalsbs == 'sbs') $settings = array_merge($settings,array('globalSBS1' => 'TRUE')); |
|
| 1091 | - else $settings = array_merge($settings,array('globalSBS1' => 'FALSE')); |
|
| 1092 | - if ($globalaprs == 'aprs') $settings = array_merge($settings,array('globalAPRS' => 'TRUE')); |
|
| 1093 | - else $settings = array_merge($settings,array('globalAPRS' => 'FALSE')); |
|
| 1381 | + if ($globalsbs == 'sbs') { |
|
| 1382 | + $settings = array_merge($settings,array('globalSBS1' => 'TRUE')); |
|
| 1383 | + } else { |
|
| 1384 | + $settings = array_merge($settings,array('globalSBS1' => 'FALSE')); |
|
| 1385 | + } |
|
| 1386 | + if ($globalaprs == 'aprs') { |
|
| 1387 | + $settings = array_merge($settings,array('globalAPRS' => 'TRUE')); |
|
| 1388 | + } else { |
|
| 1389 | + $settings = array_merge($settings,array('globalAPRS' => 'FALSE')); |
|
| 1390 | + } |
|
| 1094 | 1391 | $va = false; |
| 1095 | 1392 | if ($globalivao == 'ivao') { |
| 1096 | 1393 | $settings = array_merge($settings,array('globalIVAO' => 'TRUE')); |
| 1097 | 1394 | $va = true; |
| 1098 | - } else $settings = array_merge($settings,array('globalIVAO' => 'FALSE')); |
|
| 1395 | + } else { |
|
| 1396 | + $settings = array_merge($settings,array('globalIVAO' => 'FALSE')); |
|
| 1397 | + } |
|
| 1099 | 1398 | if ($globalvatsim == 'vatsim') { |
| 1100 | 1399 | $settings = array_merge($settings,array('globalVATSIM' => 'TRUE')); |
| 1101 | 1400 | $va = true; |
| 1102 | - } else $settings = array_merge($settings,array('globalVATSIM' => 'FALSE')); |
|
| 1401 | + } else { |
|
| 1402 | + $settings = array_merge($settings,array('globalVATSIM' => 'FALSE')); |
|
| 1403 | + } |
|
| 1103 | 1404 | if ($globalphpvms == 'phpvms') { |
| 1104 | 1405 | $settings = array_merge($settings,array('globalphpVMS' => 'TRUE')); |
| 1105 | 1406 | $va = true; |
| 1106 | - } else $settings = array_merge($settings,array('globalphpVMS' => 'FALSE')); |
|
| 1407 | + } else { |
|
| 1408 | + $settings = array_merge($settings,array('globalphpVMS' => 'FALSE')); |
|
| 1409 | + } |
|
| 1107 | 1410 | if ($globalvam == 'vam') { |
| 1108 | 1411 | $settings = array_merge($settings,array('globalVAM' => 'TRUE')); |
| 1109 | 1412 | $va = true; |
| 1110 | - } else $settings = array_merge($settings,array('globalVAM' => 'FALSE')); |
|
| 1413 | + } else { |
|
| 1414 | + $settings = array_merge($settings,array('globalVAM' => 'FALSE')); |
|
| 1415 | + } |
|
| 1111 | 1416 | if ($va) { |
| 1112 | 1417 | $settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE','globalTranslationFetch' => 'FALSE')); |
| 1113 | - } else $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE')); |
|
| 1418 | + } else { |
|
| 1419 | + $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE')); |
|
| 1420 | + } |
|
| 1114 | 1421 | if ($globalva == 'va' || $va) { |
| 1115 | 1422 | $settings = array_merge($settings,array('globalVA' => 'TRUE')); |
| 1116 | - } else $settings = array_merge($settings,array('globalVA' => 'FALSE')); |
|
| 1423 | + } else { |
|
| 1424 | + $settings = array_merge($settings,array('globalVA' => 'FALSE')); |
|
| 1425 | + } |
|
| 1117 | 1426 | |
| 1118 | 1427 | |
| 1119 | 1428 | |
@@ -1261,7 +1570,9 @@ discard block |
||
| 1261 | 1570 | $settings = array_merge($settings,array('globalNoAirlines' => 'FALSE')); |
| 1262 | 1571 | } |
| 1263 | 1572 | |
| 1264 | - if (!isset($globalTransaction)) $settings = array_merge($settings,array('globalTransaction' => 'TRUE')); |
|
| 1573 | + if (!isset($globalTransaction)) { |
|
| 1574 | + $settings = array_merge($settings,array('globalTransaction' => 'TRUE')); |
|
| 1575 | + } |
|
| 1265 | 1576 | |
| 1266 | 1577 | // Set some defaults values... |
| 1267 | 1578 | if (!isset($globalAircraftImageSources)) { |
@@ -1276,15 +1587,23 @@ discard block |
||
| 1276 | 1587 | |
| 1277 | 1588 | $settings = array_merge($settings,array('globalInstalled' => 'TRUE')); |
| 1278 | 1589 | |
| 1279 | - if ($error == '') settings::modify_settings($settings); |
|
| 1280 | - if ($error == '') settings::comment_settings($settings_comment); |
|
| 1590 | + if ($error == '') { |
|
| 1591 | + settings::modify_settings($settings); |
|
| 1592 | + } |
|
| 1593 | + if ($error == '') { |
|
| 1594 | + settings::comment_settings($settings_comment); |
|
| 1595 | + } |
|
| 1281 | 1596 | if ($error != '') { |
| 1282 | 1597 | print '<div class="info column">'.$error.'</div>'; |
| 1283 | 1598 | require('../footer.php'); |
| 1284 | 1599 | exit; |
| 1285 | 1600 | } else { |
| 1286 | - if (isset($_POST['waypoints']) && $_POST['waypoints'] == 'waypoints') $_SESSION['waypoints'] = 1; |
|
| 1287 | - if (isset($_POST['owner']) && $_POST['owner'] == 'owner') $_SESSION['owner'] = 1; |
|
| 1601 | + if (isset($_POST['waypoints']) && $_POST['waypoints'] == 'waypoints') { |
|
| 1602 | + $_SESSION['waypoints'] = 1; |
|
| 1603 | + } |
|
| 1604 | + if (isset($_POST['owner']) && $_POST['owner'] == 'owner') { |
|
| 1605 | + $_SESSION['owner'] = 1; |
|
| 1606 | + } |
|
| 1288 | 1607 | if (isset($_POST['createdb'])) { |
| 1289 | 1608 | $_SESSION['install'] = 'database_create'; |
| 1290 | 1609 | } else { |
@@ -1325,10 +1644,18 @@ discard block |
||
| 1325 | 1644 | $popw = false; |
| 1326 | 1645 | foreach ($_SESSION['done'] as $done) { |
| 1327 | 1646 | print '<li>'.$done.'....<strong>SUCCESS</strong></li>'; |
| 1328 | - if ($done == 'Create database') $pop = true; |
|
| 1329 | - if ($_SESSION['install'] == 'database_create') $pop = true; |
|
| 1330 | - if ($_SESSION['install'] == 'database_import') $popi = true; |
|
| 1331 | - if ($_SESSION['install'] == 'waypoints') $popw = true; |
|
| 1647 | + if ($done == 'Create database') { |
|
| 1648 | + $pop = true; |
|
| 1649 | + } |
|
| 1650 | + if ($_SESSION['install'] == 'database_create') { |
|
| 1651 | + $pop = true; |
|
| 1652 | + } |
|
| 1653 | + if ($_SESSION['install'] == 'database_import') { |
|
| 1654 | + $popi = true; |
|
| 1655 | + } |
|
| 1656 | + if ($_SESSION['install'] == 'waypoints') { |
|
| 1657 | + $popw = true; |
|
| 1658 | + } |
|
| 1332 | 1659 | } |
| 1333 | 1660 | if ($pop) { |
| 1334 | 1661 | sleep(5); |
@@ -1339,7 +1666,9 @@ discard block |
||
| 1339 | 1666 | } else if ($popw) { |
| 1340 | 1667 | sleep(5); |
| 1341 | 1668 | print '<li>Populate waypoints database....<img src="../images/loading.gif" /></li>'; |
| 1342 | - } else print '<li>Update schema if needed....<img src="../images/loading.gif" /></li>'; |
|
| 1669 | + } else { |
|
| 1670 | + print '<li>Update schema if needed....<img src="../images/loading.gif" /></li>'; |
|
| 1671 | + } |
|
| 1343 | 1672 | print '</div></ul>'; |
| 1344 | 1673 | print '<div id="error"></div>'; |
| 1345 | 1674 | /* foreach ($_SESSION['done'] as $done) { |
@@ -22,7 +22,9 @@ |
||
| 22 | 22 | print '<select name="aircraft_manufacturer" class="selectpicker" data-live-search="true">'; |
| 23 | 23 | $Stats = new Stats(); |
| 24 | 24 | $all_manufacturers = $Stats->getAllManufacturers(); |
| 25 | - if (empty($all_manufacturers)) $all_manufacturers = $Spotter->getAllManufacturers(); |
|
| 25 | + if (empty($all_manufacturers)) { |
|
| 26 | + $all_manufacturers = $Spotter->getAllManufacturers(); |
|
| 27 | + } |
|
| 26 | 28 | foreach($all_manufacturers as $all_manufacturer) |
| 27 | 29 | { |
| 28 | 30 | if($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer']))) |
@@ -8,13 +8,13 @@ discard block |
||
| 8 | 8 | die(); |
| 9 | 9 | } |
| 10 | 10 | $Spotter = new Spotter(); |
| 11 | -$manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING))); |
|
| 12 | -$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
|
| 13 | -$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer,"0,1", $sort); |
|
| 11 | +$manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET, 'aircraft_manufacturer', FILTER_SANITIZE_STRING))); |
|
| 12 | +$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING); |
|
| 13 | +$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer, "0,1", $sort); |
|
| 14 | 14 | |
| 15 | 15 | if (!empty($spotter_array)) |
| 16 | 16 | { |
| 17 | - $title = sprintf(_("Most Common Aircraft from %s"),$manufacturer); |
|
| 17 | + $title = sprintf(_("Most Common Aircraft from %s"), $manufacturer); |
|
| 18 | 18 | |
| 19 | 19 | require_once('header.php'); |
| 20 | 20 | print '<div class="select-item">'; |
@@ -23,9 +23,9 @@ discard block |
||
| 23 | 23 | $Stats = new Stats(); |
| 24 | 24 | $all_manufacturers = $Stats->getAllManufacturers(); |
| 25 | 25 | if (empty($all_manufacturers)) $all_manufacturers = $Spotter->getAllManufacturers(); |
| 26 | - foreach($all_manufacturers as $all_manufacturer) |
|
| 26 | + foreach ($all_manufacturers as $all_manufacturer) |
|
| 27 | 27 | { |
| 28 | - if($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer']))) |
|
| 28 | + if ($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer']))) |
|
| 29 | 29 | { |
| 30 | 30 | print '<option value="'.strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])).'" selected="selected">'.$all_manufacturer['aircraft_manufacturer'].'</option>'; |
| 31 | 31 | } else { |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | include('manufacturer-sub-menu.php'); |
| 45 | 45 | print '<div class="column">'; |
| 46 | 46 | print '<h2>'._("Most Common Aircraft").'</h2>'; |
| 47 | - print '<p>'.sprintf(_("The statistic below shows the most common aircrafts of flights from <strong>%s</strong>."),$manufacturer).'</p>'; |
|
| 47 | + print '<p>'.sprintf(_("The statistic below shows the most common aircrafts of flights from <strong>%s</strong>."), $manufacturer).'</p>'; |
|
| 48 | 48 | |
| 49 | 49 | $aircraft_array = $Spotter->countAllAircraftTypesByManufacturer($manufacturer); |
| 50 | 50 | if (!empty($aircraft_array)) |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | print '</thead>'; |
| 60 | 60 | print '<tbody>'; |
| 61 | 61 | $i = 1; |
| 62 | - foreach($aircraft_array as $aircraft_item) |
|
| 62 | + foreach ($aircraft_array as $aircraft_item) |
|
| 63 | 63 | { |
| 64 | 64 | print '<tr>'; |
| 65 | 65 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -4,8 +4,8 @@ |
||
| 4 | 4 | require_once('require/class.Stats.php'); |
| 5 | 5 | require_once('require/class.Language.php'); |
| 6 | 6 | if (!isset($_GET['aircraft_manufacturer'])) { |
| 7 | - header('Location: '.$globalURL.'/manufacturer'); |
|
| 8 | - die(); |
|
| 7 | + header('Location: '.$globalURL.'/manufacturer'); |
|
| 8 | + die(); |
|
| 9 | 9 | } |
| 10 | 10 | $Spotter = new Spotter(); |
| 11 | 11 | $manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING))); |
@@ -22,7 +22,9 @@ |
||
| 22 | 22 | print '<select name="aircraft_manufacturer" class="selectpicker" data-live-search="true">'; |
| 23 | 23 | $Stats = new Stats(); |
| 24 | 24 | $all_manufacturers = $Stats->getAllManufacturers(); |
| 25 | - if (empty($all_manufacturers)) $all_manufacturers = $Spotter->getAllManufacturers(); |
|
| 25 | + if (empty($all_manufacturers)) { |
|
| 26 | + $all_manufacturers = $Spotter->getAllManufacturers(); |
|
| 27 | + } |
|
| 26 | 28 | foreach($all_manufacturers as $all_manufacturer) |
| 27 | 29 | { |
| 28 | 30 | if($GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer']))) |
@@ -8,13 +8,13 @@ discard block |
||
| 8 | 8 | die(); |
| 9 | 9 | } |
| 10 | 10 | $Spotter = new Spotter(); |
| 11 | -$manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING))); |
|
| 12 | -$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
|
| 13 | -$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer,"0,1", $sort); |
|
| 11 | +$manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET, 'aircraft_manufacturer', FILTER_SANITIZE_STRING))); |
|
| 12 | +$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING); |
|
| 13 | +$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer, "0,1", $sort); |
|
| 14 | 14 | |
| 15 | 15 | if (!empty($spotter_array)) |
| 16 | 16 | { |
| 17 | - $title = sprintf(_("Most Common Airlines by Country from %s"),$manufacturer); |
|
| 17 | + $title = sprintf(_("Most Common Airlines by Country from %s"), $manufacturer); |
|
| 18 | 18 | |
| 19 | 19 | require_once('header.php'); |
| 20 | 20 | print '<div class="select-item">'; |
@@ -23,9 +23,9 @@ discard block |
||
| 23 | 23 | $Stats = new Stats(); |
| 24 | 24 | $all_manufacturers = $Stats->getAllManufacturers(); |
| 25 | 25 | if (empty($all_manufacturers)) $all_manufacturers = $Spotter->getAllManufacturers(); |
| 26 | - foreach($all_manufacturers as $all_manufacturer) |
|
| 26 | + foreach ($all_manufacturers as $all_manufacturer) |
|
| 27 | 27 | { |
| 28 | - if($GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer']))) |
|
| 28 | + if ($GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer']))) |
|
| 29 | 29 | { |
| 30 | 30 | print '<option value="'.strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])).'" selected="selected">'.$all_manufacturer['aircraft_manufacturer'].'</option>'; |
| 31 | 31 | } else { |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | include('manufacturer-sub-menu.php'); |
| 45 | 45 | print '<div class="column">'; |
| 46 | 46 | print '<h2>'._("Most Common Airlines by Country").'</h2>'; |
| 47 | - print '<p>'.sprintf(_("The statistic below shows the most common airlines by Country of origin of flights from <strong>%s</strong>."),$manufacturer).'</p>'; |
|
| 47 | + print '<p>'.sprintf(_("The statistic below shows the most common airlines by Country of origin of flights from <strong>%s</strong>."), $manufacturer).'</p>'; |
|
| 48 | 48 | $airline_array = $Spotter->countAllAirlineCountriesByManufacturer($manufacturer); |
| 49 | 49 | print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>'; |
| 50 | 50 | print '<div id="chartCountry" class="chart" width="100%"></div> |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | ["'._("Country").'", "'._("# of times").'"], '; |
| 57 | 57 | |
| 58 | 58 | $country_data = ''; |
| 59 | - foreach($airline_array as $airline_item) |
|
| 59 | + foreach ($airline_array as $airline_item) |
|
| 60 | 60 | { |
| 61 | 61 | $country_data .= '[ "'.$airline_item['airline_country'].'",'.$airline_item['airline_country_count'].'],'; |
| 62 | 62 | } |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | print '</thead>'; |
| 91 | 91 | print '<tbody>'; |
| 92 | 92 | $i = 1; |
| 93 | - foreach($airline_array as $airline_item) |
|
| 93 | + foreach ($airline_array as $airline_item) |
|
| 94 | 94 | { |
| 95 | 95 | print '<tr>'; |
| 96 | 96 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -4,8 +4,8 @@ |
||
| 4 | 4 | require_once('require/class.Stats.php'); |
| 5 | 5 | require_once('require/class.Language.php'); |
| 6 | 6 | if (!isset($_GET['aircraft_manufacturer'])) { |
| 7 | - header('Location: '.$globalURL.'/manufacturer'); |
|
| 8 | - die(); |
|
| 7 | + header('Location: '.$globalURL.'/manufacturer'); |
|
| 8 | + die(); |
|
| 9 | 9 | } |
| 10 | 10 | $Spotter = new Spotter(); |
| 11 | 11 | $manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING))); |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | $limit_start = 0; |
| 14 | 14 | $limit_end = 25; |
| 15 | 15 | $absolute_difference = 25; |
| 16 | - } else { |
|
| 16 | + } else { |
|
| 17 | 17 | $limit_explode = explode(",", $_GET['limit']); |
| 18 | 18 | $limit_start = $limit_explode[0]; |
| 19 | 19 | $limit_end = $limit_explode[1]; |
@@ -47,7 +47,9 @@ discard block |
||
| 47 | 47 | print '<select name="aircraft_manufacturer" class="selectpicker" data-live-search="true">'; |
| 48 | 48 | $Stats = new Stats(); |
| 49 | 49 | $all_manufacturers = $Stats->getAllManufacturers(); |
| 50 | - if (empty($all_manufacturers)) $all_manufacturers = $Spotter->getAllManufacturers(); |
|
| 50 | + if (empty($all_manufacturers)) { |
|
| 51 | + $all_manufacturers = $Spotter->getAllManufacturers(); |
|
| 52 | + } |
|
| 51 | 53 | foreach($all_manufacturers as $all_manufacturer) |
| 52 | 54 | { |
| 53 | 55 | if($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer']))) |
@@ -4,16 +4,16 @@ discard block |
||
| 4 | 4 | require_once('require/class.Stats.php'); |
| 5 | 5 | require_once('require/class.Language.php'); |
| 6 | 6 | $Spotter = new Spotter(); |
| 7 | -if (!isset($_GET['aircraft_manufacturer'])){ |
|
| 7 | +if (!isset($_GET['aircraft_manufacturer'])) { |
|
| 8 | 8 | header('Location: '.$globalURL.''); |
| 9 | 9 | } else { |
| 10 | 10 | //calculuation for the pagination |
| 11 | - if(!isset($_GET['limit'])) |
|
| 11 | + if (!isset($_GET['limit'])) |
|
| 12 | 12 | { |
| 13 | 13 | $limit_start = 0; |
| 14 | 14 | $limit_end = 25; |
| 15 | 15 | $absolute_difference = 25; |
| 16 | - } else { |
|
| 16 | + } else { |
|
| 17 | 17 | $limit_explode = explode(",", $_GET['limit']); |
| 18 | 18 | $limit_start = $limit_explode[0]; |
| 19 | 19 | $limit_end = $limit_explode[1]; |
@@ -27,19 +27,19 @@ discard block |
||
| 27 | 27 | $limit_previous_1 = $limit_start - $absolute_difference; |
| 28 | 28 | $limit_previous_2 = $limit_end - $absolute_difference; |
| 29 | 29 | |
| 30 | - $manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING))); |
|
| 31 | - $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
|
| 30 | + $manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET, 'aircraft_manufacturer', FILTER_SANITIZE_STRING))); |
|
| 31 | + $sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING); |
|
| 32 | 32 | $page_url = $globalURL.'/manufacturer/'.$manufacturer; |
| 33 | 33 | |
| 34 | 34 | if ($sort != '') { |
| 35 | - $spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer,$limit_start.",".$absolute_difference, $sort); |
|
| 35 | + $spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer, $limit_start.",".$absolute_difference, $sort); |
|
| 36 | 36 | } else { |
| 37 | - $spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer,$limit_start.",".$absolute_difference, ''); |
|
| 37 | + $spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer, $limit_start.",".$absolute_difference, ''); |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | if (!empty($spotter_array)) |
| 41 | 41 | { |
| 42 | - $title = sprintf(_("Detailed View for %s"),$manufacturer); |
|
| 42 | + $title = sprintf(_("Detailed View for %s"), $manufacturer); |
|
| 43 | 43 | |
| 44 | 44 | require_once('header.php'); |
| 45 | 45 | print '<div class="select-item">'; |
@@ -48,9 +48,9 @@ discard block |
||
| 48 | 48 | $Stats = new Stats(); |
| 49 | 49 | $all_manufacturers = $Stats->getAllManufacturers(); |
| 50 | 50 | if (empty($all_manufacturers)) $all_manufacturers = $Spotter->getAllManufacturers(); |
| 51 | - foreach($all_manufacturers as $all_manufacturer) |
|
| 51 | + foreach ($all_manufacturers as $all_manufacturer) |
|
| 52 | 52 | { |
| 53 | - if($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer']))) |
|
| 53 | + if ($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer']))) |
|
| 54 | 54 | { |
| 55 | 55 | print '<option value="'.strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])).'" selected="selected">'.$all_manufacturer['aircraft_manufacturer'].'</option>'; |
| 56 | 56 | } else { |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | print '</div>'; |
| 68 | 68 | |
| 69 | 69 | print '<div class="table column">'; |
| 70 | - print '<p>'.sprintf(_("The table below shows the detailed information of all flights from <strong>%s</strong."),$manufacturer).'</p>'; |
|
| 70 | + print '<p>'.sprintf(_("The table below shows the detailed information of all flights from <strong>%s</strong."), $manufacturer).'</p>'; |
|
| 71 | 71 | |
| 72 | 72 | include('manufacturer-sub-menu.php'); |
| 73 | 73 | include('table-output.php'); |
@@ -11,7 +11,7 @@ |
||
| 11 | 11 | /** |
| 12 | 12 | * Get SQL query part for filter used |
| 13 | 13 | * @param Array $filter the filter |
| 14 | - * @return Array the SQL part |
|
| 14 | + * @return string the SQL part |
|
| 15 | 15 | */ |
| 16 | 16 | public function getFilter($filter = array(),$where = false,$and = false) { |
| 17 | 17 | global $globalFilter, $globalStatsFilters, $globalFilterName; |
@@ -20,20 +20,27 @@ discard block |
||
| 20 | 20 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 21 | 21 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 22 | 22 | foreach($globalStatsFilters[$globalFilterName] as $source) { |
| 23 | - if (isset($source['source'])) $filter['source'][] = $source['source']; |
|
| 23 | + if (isset($source['source'])) { |
|
| 24 | + $filter['source'][] = $source['source']; |
|
| 25 | + } |
|
| 24 | 26 | } |
| 25 | 27 | } else { |
| 26 | 28 | $filter = $globalStatsFilters[$globalFilterName]; |
| 27 | 29 | } |
| 28 | 30 | } |
| 29 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 31 | + if (is_array($globalFilter)) { |
|
| 32 | + $filter = array_merge($filter,$globalFilter); |
|
| 33 | + } |
|
| 30 | 34 | $filter_query_join = ''; |
| 31 | 35 | $filter_query_where = ''; |
| 32 | 36 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 33 | 37 | $filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')"; |
| 34 | 38 | } |
| 35 | - if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
|
| 36 | - elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
|
| 39 | + if ($filter_query_where == '' && $where) { |
|
| 40 | + $filter_query_where = ' WHERE'; |
|
| 41 | + } elseif ($filter_query_where != '' && $and) { |
|
| 42 | + $filter_query_where .= ' AND'; |
|
| 43 | + } |
|
| 37 | 44 | $filter_query = $filter_query_join.$filter_query_where; |
| 38 | 45 | return $filter_query; |
| 39 | 46 | } |
@@ -57,7 +64,9 @@ discard block |
||
| 57 | 64 | $info = str_replace('^','<br />',$info); |
| 58 | 65 | $info = str_replace('&sect;','',$info); |
| 59 | 66 | $info = str_replace('"','',$info); |
| 60 | - if ($type == '') $type = NULL; |
|
| 67 | + if ($type == '') { |
|
| 68 | + $type = NULL; |
|
| 69 | + } |
|
| 61 | 70 | $query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)"; |
| 62 | 71 | $query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name); |
| 63 | 72 | try { |
@@ -10,100 +10,100 @@ |
||
| 10 | 10 | } |
| 11 | 11 | |
| 12 | 12 | |
| 13 | - /** |
|
| 14 | - * Get SQL query part for filter used |
|
| 15 | - * @param Array $filter the filter |
|
| 16 | - * @return Array the SQL part |
|
| 17 | - */ |
|
| 18 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 13 | + /** |
|
| 14 | + * Get SQL query part for filter used |
|
| 15 | + * @param Array $filter the filter |
|
| 16 | + * @return Array the SQL part |
|
| 17 | + */ |
|
| 18 | + public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 19 | 19 | global $globalFilter, $globalStatsFilters, $globalFilterName; |
| 20 | 20 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 21 | - if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
|
| 21 | + if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
|
| 22 | 22 | foreach($globalStatsFilters[$globalFilterName] as $source) { |
| 23 | 23 | if (isset($source['source'])) $filter['source'][] = $source['source']; |
| 24 | 24 | } |
| 25 | - } else { |
|
| 25 | + } else { |
|
| 26 | 26 | $filter = $globalStatsFilters[$globalFilterName]; |
| 27 | - } |
|
| 27 | + } |
|
| 28 | 28 | } |
| 29 | 29 | if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
| 30 | 30 | $filter_query_join = ''; |
| 31 | 31 | $filter_query_where = ''; |
| 32 | 32 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 33 | - $filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 33 | + $filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 34 | 34 | } |
| 35 | 35 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 36 | 36 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
| 37 | 37 | $filter_query = $filter_query_join.$filter_query_where; |
| 38 | 38 | return $filter_query; |
| 39 | - } |
|
| 39 | + } |
|
| 40 | 40 | |
| 41 | - public function getAll() { |
|
| 42 | - $filter_query = $this->getFilter(array()); |
|
| 43 | - $query = "SELECT * FROM atc".$filter_query; |
|
| 44 | - $query_values = array(); |
|
| 45 | - try { |
|
| 46 | - $sth = $this->db->prepare($query); |
|
| 47 | - $sth->execute($query_values); |
|
| 48 | - } catch(PDOException $e) { |
|
| 49 | - return "error : ".$e->getMessage(); |
|
| 50 | - } |
|
| 51 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 52 | - return $all; |
|
| 53 | - } |
|
| 41 | + public function getAll() { |
|
| 42 | + $filter_query = $this->getFilter(array()); |
|
| 43 | + $query = "SELECT * FROM atc".$filter_query; |
|
| 44 | + $query_values = array(); |
|
| 45 | + try { |
|
| 46 | + $sth = $this->db->prepare($query); |
|
| 47 | + $sth->execute($query_values); |
|
| 48 | + } catch(PDOException $e) { |
|
| 49 | + return "error : ".$e->getMessage(); |
|
| 50 | + } |
|
| 51 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 52 | + return $all; |
|
| 53 | + } |
|
| 54 | 54 | |
| 55 | - public function add($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '',$format_source = '',$source_name = '') { |
|
| 56 | - $info = preg_replace('/[^(\x20-\x7F)]*/','',$info); |
|
| 57 | - $info = str_replace('^','<br />',$info); |
|
| 58 | - $info = str_replace('&sect;','',$info); |
|
| 59 | - $info = str_replace('"','',$info); |
|
| 60 | - if ($type == '') $type = NULL; |
|
| 61 | - $query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)"; |
|
| 62 | - $query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name); |
|
| 63 | - try { |
|
| 64 | - $sth = $this->db->prepare($query); |
|
| 65 | - $sth->execute($query_values); |
|
| 66 | - } catch(PDOException $e) { |
|
| 67 | - return "error : ".$e->getMessage(); |
|
| 68 | - } |
|
| 69 | - } |
|
| 55 | + public function add($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '',$format_source = '',$source_name = '') { |
|
| 56 | + $info = preg_replace('/[^(\x20-\x7F)]*/','',$info); |
|
| 57 | + $info = str_replace('^','<br />',$info); |
|
| 58 | + $info = str_replace('&sect;','',$info); |
|
| 59 | + $info = str_replace('"','',$info); |
|
| 60 | + if ($type == '') $type = NULL; |
|
| 61 | + $query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)"; |
|
| 62 | + $query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name); |
|
| 63 | + try { |
|
| 64 | + $sth = $this->db->prepare($query); |
|
| 65 | + $sth->execute($query_values); |
|
| 66 | + } catch(PDOException $e) { |
|
| 67 | + return "error : ".$e->getMessage(); |
|
| 68 | + } |
|
| 69 | + } |
|
| 70 | 70 | |
| 71 | - public function deleteById($id) { |
|
| 72 | - $query = "DELETE FROM atc WHERE atc_id = :id"; |
|
| 73 | - $query_values = array(':id' => $id); |
|
| 74 | - try { |
|
| 75 | - $sth = $this->db->prepare($query); |
|
| 76 | - $sth->execute($query_values); |
|
| 77 | - } catch(PDOException $e) { |
|
| 78 | - return "error : ".$e->getMessage(); |
|
| 79 | - } |
|
| 80 | - } |
|
| 71 | + public function deleteById($id) { |
|
| 72 | + $query = "DELETE FROM atc WHERE atc_id = :id"; |
|
| 73 | + $query_values = array(':id' => $id); |
|
| 74 | + try { |
|
| 75 | + $sth = $this->db->prepare($query); |
|
| 76 | + $sth->execute($query_values); |
|
| 77 | + } catch(PDOException $e) { |
|
| 78 | + return "error : ".$e->getMessage(); |
|
| 79 | + } |
|
| 80 | + } |
|
| 81 | 81 | |
| 82 | - public function deleteAll() { |
|
| 83 | - $query = "DELETE FROM atc"; |
|
| 84 | - $query_values = array(); |
|
| 85 | - try { |
|
| 86 | - $sth = $this->db->prepare($query); |
|
| 87 | - $sth->execute($query_values); |
|
| 88 | - } catch(PDOException $e) { |
|
| 89 | - return "error : ".$e->getMessage(); |
|
| 90 | - } |
|
| 91 | - } |
|
| 82 | + public function deleteAll() { |
|
| 83 | + $query = "DELETE FROM atc"; |
|
| 84 | + $query_values = array(); |
|
| 85 | + try { |
|
| 86 | + $sth = $this->db->prepare($query); |
|
| 87 | + $sth->execute($query_values); |
|
| 88 | + } catch(PDOException $e) { |
|
| 89 | + return "error : ".$e->getMessage(); |
|
| 90 | + } |
|
| 91 | + } |
|
| 92 | 92 | |
| 93 | 93 | public function deleteOldATC() { |
| 94 | - global $globalDBdriver; |
|
| 95 | - if ($globalDBdriver == 'mysql') { |
|
| 96 | - $query = "DELETE FROM atc WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= atc.atc_lastseen"; |
|
| 97 | - } else { |
|
| 98 | - $query = "DELETE FROM atc WHERE NOW() AT TIME ZONE 'UTC' - '1 HOUR'->INTERVAL >= atc.atc_lastseen"; |
|
| 99 | - } |
|
| 100 | - try { |
|
| 101 | - $sth = $this->db->prepare($query); |
|
| 102 | - $sth->execute(); |
|
| 103 | - } catch(PDOException $e) { |
|
| 104 | - return "error"; |
|
| 105 | - } |
|
| 106 | - return "success"; |
|
| 107 | - } |
|
| 94 | + global $globalDBdriver; |
|
| 95 | + if ($globalDBdriver == 'mysql') { |
|
| 96 | + $query = "DELETE FROM atc WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= atc.atc_lastseen"; |
|
| 97 | + } else { |
|
| 98 | + $query = "DELETE FROM atc WHERE NOW() AT TIME ZONE 'UTC' - '1 HOUR'->INTERVAL >= atc.atc_lastseen"; |
|
| 99 | + } |
|
| 100 | + try { |
|
| 101 | + $sth = $this->db->prepare($query); |
|
| 102 | + $sth->execute(); |
|
| 103 | + } catch(PDOException $e) { |
|
| 104 | + return "error"; |
|
| 105 | + } |
|
| 106 | + return "success"; |
|
| 107 | + } |
|
| 108 | 108 | } |
| 109 | 109 | ?> |
| 110 | 110 | \ No newline at end of file |
@@ -15,22 +15,22 @@ discard block |
||
| 15 | 15 | * @param Array $filter the filter |
| 16 | 16 | * @return Array the SQL part |
| 17 | 17 | */ |
| 18 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 18 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 19 | 19 | global $globalFilter, $globalStatsFilters, $globalFilterName; |
| 20 | 20 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 21 | 21 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 22 | - foreach($globalStatsFilters[$globalFilterName] as $source) { |
|
| 22 | + foreach ($globalStatsFilters[$globalFilterName] as $source) { |
|
| 23 | 23 | if (isset($source['source'])) $filter['source'][] = $source['source']; |
| 24 | 24 | } |
| 25 | 25 | } else { |
| 26 | 26 | $filter = $globalStatsFilters[$globalFilterName]; |
| 27 | 27 | } |
| 28 | 28 | } |
| 29 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 29 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 30 | 30 | $filter_query_join = ''; |
| 31 | 31 | $filter_query_where = ''; |
| 32 | 32 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 33 | - $filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 33 | + $filter_query_where = " WHERE format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 34 | 34 | } |
| 35 | 35 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 36 | 36 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
@@ -45,25 +45,25 @@ discard block |
||
| 45 | 45 | try { |
| 46 | 46 | $sth = $this->db->prepare($query); |
| 47 | 47 | $sth->execute($query_values); |
| 48 | - } catch(PDOException $e) { |
|
| 48 | + } catch (PDOException $e) { |
|
| 49 | 49 | return "error : ".$e->getMessage(); |
| 50 | 50 | } |
| 51 | 51 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 52 | 52 | return $all; |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | - public function add($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '',$format_source = '',$source_name = '') { |
|
| 56 | - $info = preg_replace('/[^(\x20-\x7F)]*/','',$info); |
|
| 57 | - $info = str_replace('^','<br />',$info); |
|
| 58 | - $info = str_replace('&sect;','',$info); |
|
| 59 | - $info = str_replace('"','',$info); |
|
| 55 | + public function add($ident, $frequency, $latitude, $longitude, $range, $info, $date, $type = '', $ivao_id = '', $ivao_name = '', $format_source = '', $source_name = '') { |
|
| 56 | + $info = preg_replace('/[^(\x20-\x7F)]*/', '', $info); |
|
| 57 | + $info = str_replace('^', '<br />', $info); |
|
| 58 | + $info = str_replace('&sect;', '', $info); |
|
| 59 | + $info = str_replace('"', '', $info); |
|
| 60 | 60 | if ($type == '') $type = NULL; |
| 61 | 61 | $query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)"; |
| 62 | - $query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name); |
|
| 62 | + $query_values = array(':ident' => $ident, ':frequency' => $frequency, ':latitude' => $latitude, ':longitude' => $longitude, ':range' => $range, ':info' => $info, ':date' => $date, ':ivao_id' => $ivao_id, ':ivao_name' => $ivao_name, ':type' => $type, ':format_source' => $format_source, ':source_name' => $source_name); |
|
| 63 | 63 | try { |
| 64 | 64 | $sth = $this->db->prepare($query); |
| 65 | 65 | $sth->execute($query_values); |
| 66 | - } catch(PDOException $e) { |
|
| 66 | + } catch (PDOException $e) { |
|
| 67 | 67 | return "error : ".$e->getMessage(); |
| 68 | 68 | } |
| 69 | 69 | } |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | try { |
| 75 | 75 | $sth = $this->db->prepare($query); |
| 76 | 76 | $sth->execute($query_values); |
| 77 | - } catch(PDOException $e) { |
|
| 77 | + } catch (PDOException $e) { |
|
| 78 | 78 | return "error : ".$e->getMessage(); |
| 79 | 79 | } |
| 80 | 80 | } |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | try { |
| 86 | 86 | $sth = $this->db->prepare($query); |
| 87 | 87 | $sth->execute($query_values); |
| 88 | - } catch(PDOException $e) { |
|
| 88 | + } catch (PDOException $e) { |
|
| 89 | 89 | return "error : ".$e->getMessage(); |
| 90 | 90 | } |
| 91 | 91 | } |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | try { |
| 101 | 101 | $sth = $this->db->prepare($query); |
| 102 | 102 | $sth->execute(); |
| 103 | - } catch(PDOException $e) { |
|
| 103 | + } catch (PDOException $e) { |
|
| 104 | 104 | return "error"; |
| 105 | 105 | } |
| 106 | 106 | return "success"; |
@@ -7,7 +7,7 @@ discard block |
||
| 7 | 7 | <button type="button" class="close">×</button> |
| 8 | 8 | <?php |
| 9 | 9 | |
| 10 | -$sat = filter_input(INPUT_GET,'sat',FILTER_SANITIZE_STRING); |
|
| 10 | +$sat = filter_input(INPUT_GET, 'sat', FILTER_SANITIZE_STRING); |
|
| 11 | 11 | $sat = urldecode($sat); |
| 12 | 12 | |
| 13 | 13 | if ($sat == 'ISS (ZARYA)') { |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | $aircraft_name = 'INTEGRAL'; |
| 43 | 43 | // $ground_speed = 14970; |
| 44 | 44 | $launch_date = '17 October 2002'; |
| 45 | -} elseif (strpos($sat,'IRIDIUM') !== false) { |
|
| 45 | +} elseif (strpos($sat, 'IRIDIUM') !== false) { |
|
| 46 | 46 | $image = 'https://upload.wikimedia.org/wikipedia/commons/b/b6/Iridium_Satellite.jpg'; |
| 47 | 47 | $image_copyright = 'Cliff'; |
| 48 | 48 | $ident = 'Iridium satellite constellation'; |
@@ -50,22 +50,22 @@ discard block |
||
| 50 | 50 | $aircraft_name = $sat; |
| 51 | 51 | // $ground_speed = 14970; |
| 52 | 52 | // $launch_date = '29 september 2011'; |
| 53 | -} elseif (strpos($sat,'ORBCOMM') !== false) { |
|
| 53 | +} elseif (strpos($sat, 'ORBCOMM') !== false) { |
|
| 54 | 54 | $ident = 'Orbcomm'; |
| 55 | 55 | $aircraft_wiki = 'https://en.wikipedia.org/wiki/Orbcomm_(satellite)'; |
| 56 | 56 | $aircraft_name = $sat; |
| 57 | -} elseif (strpos($sat,'GLOBALSTAR') !== false) { |
|
| 57 | +} elseif (strpos($sat, 'GLOBALSTAR') !== false) { |
|
| 58 | 58 | $ident = 'Globalstar'; |
| 59 | 59 | $aircraft_wiki = 'https://en.wikipedia.org/wiki/Globalstar'; |
| 60 | 60 | $aircraft_name = $sat; |
| 61 | -} elseif (strpos($sat,'OSCAR 7') !== false) { |
|
| 61 | +} elseif (strpos($sat, 'OSCAR 7') !== false) { |
|
| 62 | 62 | $image = 'https://upload.wikimedia.org/wikipedia/en/a/ad/AMSAT-OSCAR_7.jpg'; |
| 63 | 63 | $image_copyright = 'Amsat.org'; |
| 64 | 64 | $ident = 'AMSAT-OSCAR 7'; |
| 65 | 65 | $aircraft_wiki = 'https://en.wikipedia.org/wiki/AMSAT-OSCAR_7'; |
| 66 | 66 | $aircraft_name = $sat; |
| 67 | 67 | $launch_date = '15 November 1974'; |
| 68 | -} elseif (strpos($sat,'santaclaus') !== false) { |
|
| 68 | +} elseif (strpos($sat, 'santaclaus') !== false) { |
|
| 69 | 69 | $image = 'https://upload.wikimedia.org/wikipedia/commons/4/49/Jonathan_G_Meath_portrays_Santa_Claus.jpg'; |
| 70 | 70 | $image_copyright = 'Jonathan G Meath'; |
| 71 | 71 | $ident = 'Santa Claus'; |
@@ -28,7 +28,9 @@ discard block |
||
| 28 | 28 | |
| 29 | 29 | // $output .= ',"clock": {"interval" : "'.date("c",time()-$globalLiveInterval).'/'.date("c").'","currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}'; |
| 30 | 30 | $output .= ',"clock": {"currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"'; |
| 31 | -if (!isset($_GET['now'])) $output .= ',"interval": "'.date("Y").'-12-24T02:00:00Z/'.date("Y").'-12-25T02:00:00Z"'; |
|
| 31 | +if (!isset($_GET['now'])) { |
|
| 32 | + $output .= ',"interval": "'.date("Y").'-12-24T02:00:00Z/'.date("Y").'-12-25T02:00:00Z"'; |
|
| 33 | +} |
|
| 32 | 34 | $output .= '}'; |
| 33 | 35 | //$output .= ',"clock": {"currentTime" : "'.date("c",time()).'","multiplier" : 300,"range" : "UNBOUNDED","step": "TICK_DEPENDENT"}'; |
| 34 | 36 | //$output .= ',"clock": {"currentTime" : "%minitime%","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}'; |
@@ -37,7 +39,9 @@ discard block |
||
| 37 | 39 | $output .= '},'; |
| 38 | 40 | $output .= '{'; |
| 39 | 41 | $output .= '"id": "santaclaus",'; |
| 40 | -if (!isset($_GET['now'])) $output .= '"interval": "'.date("Y").'-12-24T02:00:00Z/'.date("Y").'-12-25T02:00:00Z",'; |
|
| 42 | +if (!isset($_GET['now'])) { |
|
| 43 | + $output .= '"interval": "'.date("Y").'-12-24T02:00:00Z/'.date("Y").'-12-25T02:00:00Z",'; |
|
| 44 | +} |
|
| 41 | 45 | $output .= '"properties": {'; |
| 42 | 46 | // Not yet supported in CZML with Cesium |
| 43 | 47 | $output .= '},'; |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | // $output .= ',"clock": {"interval" : "'.date("c",time()-$globalLiveInterval).'/'.date("c").'","currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "LOOP_STOP","step": "SYSTEM_CLOCK_MULTIPLIER"}'; |
| 28 | 28 | |
| 29 | 29 | // $output .= ',"clock": {"interval" : "'.date("c",time()-$globalLiveInterval).'/'.date("c").'","currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}'; |
| 30 | -$output .= ',"clock": {"currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"'; |
|
| 30 | +$output .= ',"clock": {"currentTime" : "'.date("c", time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"'; |
|
| 31 | 31 | if (!isset($_GET['now'])) $output .= ',"interval": "'.date("Y").'-12-24T02:00:00Z/'.date("Y").'-12-25T02:00:00Z"'; |
| 32 | 32 | $output .= '}'; |
| 33 | 33 | //$output .= ',"clock": {"currentTime" : "'.date("c",time()).'","multiplier" : 300,"range" : "UNBOUNDED","step": "TICK_DEPENDENT"}'; |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | if (!isset($_GET['now'])) { |
| 60 | 60 | $output .= '"epoch" : "'.date("Y").'-12-24T02:00:00Z",'; |
| 61 | 61 | } else { |
| 62 | - $output .= '"epoch" : "'.date("c",time() - $globalLiveInterval).'",'; |
|
| 62 | + $output .= '"epoch" : "'.date("c", time() - $globalLiveInterval).'",'; |
|
| 63 | 63 | } |
| 64 | 64 | //$output .= '"type": "Point",'; |
| 65 | 65 | //$output .= '"interpolationAlgorithm" : "LAGRANGE",'; |
@@ -69,581 +69,581 @@ discard block |
||
| 69 | 69 | $output .= '"cartographicDegrees": ['; |
| 70 | 70 | $i = 0; |
| 71 | 71 | $output .= $i.',-114.4,82.7,150000,'; |
| 72 | -$i = $i+300; |
|
| 72 | +$i = $i + 300; |
|
| 73 | 73 | $output .= $i.',-173.300003,64.379997,150000,'; |
| 74 | -$i = $i+300; |
|
| 74 | +$i = $i + 300; |
|
| 75 | 75 | $output .= $i.',177.479995,64.75,150000,'; |
| 76 | -$i = $i+300; |
|
| 76 | +$i = $i + 300; |
|
| 77 | 77 | $output .= $i.',158.65,53.016667,150000,'; |
| 78 | -$i = $i+300; |
|
| 78 | +$i = $i + 300; |
|
| 79 | 79 | $output .= $i.',165.545318,11.626074,150000,'; |
| 80 | -$i = $i+300; |
|
| 80 | +$i = $i + 300; |
|
| 81 | 81 | $output .= $i.',171.1300517813333,7.07999665990053,150000,'; |
| 82 | -$i = $i+300; |
|
| 82 | +$i = $i + 300; |
|
| 83 | 83 | $output .= $i.',179.380004,-16.469999,150000,'; |
| 84 | -$i = $i+300; |
|
| 84 | +$i = $i + 300; |
|
| 85 | 85 | $output .= $i.',178.429992,-18.129999,150000,'; |
| 86 | -$i = $i+300; |
|
| 86 | +$i = $i + 300; |
|
| 87 | 87 | $output .= $i.',174.759994,-36.849998,150000,'; |
| 88 | -$i = $i+300; |
|
| 88 | +$i = $i + 300; |
|
| 89 | 89 | $output .= $i.',176.839996,-39.639999,150000,'; |
| 90 | -$i = $i+300; |
|
| 90 | +$i = $i + 300; |
|
| 91 | 91 | $output .= $i.',174.779998,-41.279998,150000,'; |
| 92 | -$i = $i+300; |
|
| 92 | +$i = $i + 300; |
|
| 93 | 93 | $output .= $i.',172.639999,-43.529998,150000,'; |
| 94 | -$i = $i+300; |
|
| 94 | +$i = $i + 300; |
|
| 95 | 95 | $output .= $i.',167.838199,-46.986747,150000,'; |
| 96 | -$i = $i+300; |
|
| 96 | +$i = $i + 300; |
|
| 97 | 97 | $output .= $i.',168.320999,-17.740391,150000,'; |
| 98 | -$i = $i+300; |
|
| 98 | +$i = $i + 300; |
|
| 99 | 99 | $output .= $i.',167.149993,-15.51,150000,'; |
| 100 | -$i = $i+300; |
|
| 100 | +$i = $i + 300; |
|
| 101 | 101 | $output .= $i.',159.910003,-9.43,150000,'; |
| 102 | -$i = $i+300; |
|
| 102 | +$i = $i + 300; |
|
| 103 | 103 | $output .= $i.',156.850006,-8.1,150000,'; |
| 104 | -$i = $i+300; |
|
| 104 | +$i = $i + 300; |
|
| 105 | 105 | $output .= $i.',158.160003,6.92,150000,'; |
| 106 | -$i = $i+300; |
|
| 106 | +$i = $i + 300; |
|
| 107 | 107 | $output .= $i.',150.017702,45.873311,150000,'; |
| 108 | -$i = $i+300; |
|
| 108 | +$i = $i + 300; |
|
| 109 | 109 | $output .= $i.',154.796487,49.429802,150000,'; |
| 110 | -$i = $i+300; |
|
| 110 | +$i = $i + 300; |
|
| 111 | 111 | $output .= $i.',142.7262,46.948978,150000,'; |
| 112 | -$i = $i+300; |
|
| 112 | +$i = $i + 300; |
|
| 113 | 113 | $output .= $i.',150.800003,59.569999,150000,'; |
| 114 | -$i = $i+300; |
|
| 114 | +$i = $i + 300; |
|
| 115 | 115 | $output .= $i.',135.119995,48.419998,150000,'; |
| 116 | -$i = $i+300; |
|
| 116 | +$i = $i + 300; |
|
| 117 | 117 | $output .= $i.',131.899993,43.130001,150000,'; |
| 118 | -$i = $i+300; |
|
| 118 | +$i = $i + 300; |
|
| 119 | 119 | $output .= $i.',142.212096,27.070652,150000,'; |
| 120 | -$i = $i+300; |
|
| 120 | +$i = $i + 300; |
|
| 121 | 121 | $output .= $i.',141.312779,24.78389,150000,'; |
| 122 | -$i = $i+300; |
|
| 122 | +$i = $i + 300; |
|
| 123 | 123 | $output .= $i.',144.79373,13.444305,150000,'; |
| 124 | -$i = $i+300; |
|
| 124 | +$i = $i + 300; |
|
| 125 | 125 | $output .= $i.',151.783334,8.45,150000,'; |
| 126 | -$i = $i+300; |
|
| 126 | +$i = $i + 300; |
|
| 127 | 127 | $output .= $i.',151.749999,7.416667,150000,'; |
| 128 | -$i = $i+300; |
|
| 128 | +$i = $i + 300; |
|
| 129 | 129 | $output .= $i.',152.160003,-4.199999,150000,'; |
| 130 | -$i = $i+300; |
|
| 130 | +$i = $i + 300; |
|
| 131 | 131 | $output .= $i.',146.990005,-6.719999,150000,'; |
| 132 | -$i = $i+300; |
|
| 132 | +$i = $i + 300; |
|
| 133 | 133 | $output .= $i.',143.211639,-9.085352,150000,'; |
| 134 | -$i = $i+300; |
|
| 134 | +$i = $i + 300; |
|
| 135 | 135 | $output .= $i.',146.779998,-19.26,150000,'; |
| 136 | -$i = $i+300; |
|
| 136 | +$i = $i + 300; |
|
| 137 | 137 | $output .= $i.',149.179992,-21.139999,150000,'; |
| 138 | -$i = $i+300; |
|
| 138 | +$i = $i + 300; |
|
| 139 | 139 | $output .= $i.',153.020004,-27.459999,150000,'; |
| 140 | -$i = $i+300; |
|
| 140 | +$i = $i + 300; |
|
| 141 | 141 | $output .= $i.',151.210006,-33.869998,150000,'; |
| 142 | -$i = $i+300; |
|
| 142 | +$i = $i + 300; |
|
| 143 | 143 | $output .= $i.',147.291199,-42.85088,150000,'; |
| 144 | -$i = $i+300; |
|
| 144 | +$i = $i + 300; |
|
| 145 | 145 | $output .= $i.',138.600006,-34.93,150000,'; |
| 146 | -$i = $i+300; |
|
| 146 | +$i = $i + 300; |
|
| 147 | 147 | $output .= $i.',133.869995,-23.7,150000,'; |
| 148 | -$i = $i+300; |
|
| 148 | +$i = $i + 300; |
|
| 149 | 149 | $output .= $i.',130.850006,-12.43,150000,'; |
| 150 | -$i = $i+300; |
|
| 150 | +$i = $i + 300; |
|
| 151 | 151 | $output .= $i.',143.62,-3.56,150000,'; |
| 152 | -$i = $i+300; |
|
| 152 | +$i = $i + 300; |
|
| 153 | 153 | $output .= $i.',134.5552,7.3608,150000,'; |
| 154 | -$i = $i+300; |
|
| 154 | +$i = $i + 300; |
|
| 155 | 155 | $output .= $i.',135.169998,34.68,150000,'; |
| 156 | -$i = $i+300; |
|
| 156 | +$i = $i + 300; |
|
| 157 | 157 | $output .= $i.',138.690002,35.169998,150000,'; |
| 158 | -$i = $i+300; |
|
| 158 | +$i = $i + 300; |
|
| 159 | 159 | $output .= $i.',139.770004,35.669998,150000,'; |
| 160 | -$i = $i+300; |
|
| 160 | +$i = $i + 300; |
|
| 161 | 161 | $output .= $i.',140.740005,40.830001,150000,'; |
| 162 | -$i = $i+300; |
|
| 162 | +$i = $i + 300; |
|
| 163 | 163 | $output .= $i.',128.600006,35.869998,150000,'; |
| 164 | -$i = $i+300; |
|
| 164 | +$i = $i + 300; |
|
| 165 | 165 | $output .= $i.',125.925925,38.950981,150000,'; |
| 166 | -$i = $i+300; |
|
| 166 | +$i = $i + 300; |
|
| 167 | 167 | $output .= $i.',129.771118,62.093056,150000,'; |
| 168 | -$i = $i+300; |
|
| 168 | +$i = $i + 300; |
|
| 169 | 169 | $output .= $i.',104.239997,52.330001,150000,'; |
| 170 | -$i = $i+300; |
|
| 170 | +$i = $i + 300; |
|
| 171 | 171 | $output .= $i.',114.5056,48.060478,150000,'; |
| 172 | -$i = $i+300; |
|
| 172 | +$i = $i + 300; |
|
| 173 | 173 | $output .= $i.',106.580001,29.569999,150000,'; |
| 174 | -$i = $i+300; |
|
| 174 | +$i = $i + 300; |
|
| 175 | 175 | $output .= $i.',121.470001,31.229999,150000,'; |
| 176 | -$i = $i+300; |
|
| 176 | +$i = $i + 300; |
|
| 177 | 177 | $output .= $i.',113.25,23.12,150000,'; |
| 178 | -$i = $i+300; |
|
| 178 | +$i = $i + 300; |
|
| 179 | 179 | $output .= $i.',114.177465,22.307184,150000,'; |
| 180 | -$i = $i+300; |
|
| 180 | +$i = $i + 300; |
|
| 181 | 181 | $output .= $i.',121.639999,18.36,150000,'; |
| 182 | -$i = $i+300; |
|
| 182 | +$i = $i + 300; |
|
| 183 | 183 | $output .= $i.',122.080001,6.92,150000,'; |
| 184 | -$i = $i+300; |
|
| 184 | +$i = $i + 300; |
|
| 185 | 185 | $output .= $i.',114.639999,4.809999,150000,'; |
| 186 | -$i = $i+300; |
|
| 186 | +$i = $i + 300; |
|
| 187 | 187 | $output .= $i.',119.412399,-5.152193,150000,'; |
| 188 | -$i = $i+300; |
|
| 188 | +$i = $i + 300; |
|
| 189 | 189 | $output .= $i.',122.230003,-17.959999,150000,'; |
| 190 | -$i = $i+300; |
|
| 190 | +$i = $i + 300; |
|
| 191 | 191 | $output .= $i.',115.839996,-31.959999,150000,'; |
| 192 | -$i = $i+300; |
|
| 192 | +$i = $i + 300; |
|
| 193 | 193 | $output .= $i.',105.680687,-10.428593,150000,'; |
| 194 | -$i = $i+300; |
|
| 194 | +$i = $i + 300; |
|
| 195 | 195 | $output .= $i.',104.75,-2.99,150000,'; |
| 196 | -$i = $i+300; |
|
| 196 | +$i = $i + 300; |
|
| 197 | 197 | $output .= $i.',113.029998,3.17,150000,'; |
| 198 | -$i = $i+300; |
|
| 198 | +$i = $i + 300; |
|
| 199 | 199 | $output .= $i.',100.720001,4.86,150000,'; |
| 200 | -$i = $i+300; |
|
| 200 | +$i = $i + 300; |
|
| 201 | 201 | $output .= $i.',104.18,10.609999,150000,'; |
| 202 | -$i = $i+300; |
|
| 202 | +$i = $i + 300; |
|
| 203 | 203 | $output .= $i.',103.864403,13.36866,150000,'; |
| 204 | -$i = $i+300; |
|
| 204 | +$i = $i + 300; |
|
| 205 | 205 | $output .= $i.',99.330001,9.14,150000,'; |
| 206 | -$i = $i+300; |
|
| 206 | +$i = $i + 300; |
|
| 207 | 207 | $output .= $i.',105.073303,18.30217,150000,'; |
| 208 | -$i = $i+300; |
|
| 208 | +$i = $i + 300; |
|
| 209 | 209 | $output .= $i.',91.132088,29.6507,150000,'; |
| 210 | -$i = $i+300; |
|
| 210 | +$i = $i + 300; |
|
| 211 | 211 | $output .= $i.',116.477651,40.332809,150000,'; |
| 212 | -$i = $i+300; |
|
| 212 | +$i = $i + 300; |
|
| 213 | 213 | $output .= $i.',93.059997,56.02,150000,'; |
| 214 | -$i = $i+300; |
|
| 214 | +$i = $i + 300; |
|
| 215 | 215 | $output .= $i.',86.18,69.410003,150000,'; |
| 216 | -$i = $i+300; |
|
| 216 | +$i = $i + 300; |
|
| 217 | 217 | $output .= $i.',88.202881,69.315422,150000,'; |
| 218 | -$i = $i+300; |
|
| 218 | +$i = $i + 300; |
|
| 219 | 219 | $output .= $i.',73.400001,55,150000,'; |
| 220 | -$i = $i+300; |
|
| 220 | +$i = $i + 300; |
|
| 221 | 221 | $output .= $i.',76.949996,52.299999,150000,'; |
| 222 | -$i = $i+300; |
|
| 222 | +$i = $i + 300; |
|
| 223 | 223 | $output .= $i.',78.379997,42.490001,150000,'; |
| 224 | -$i = $i+300; |
|
| 224 | +$i = $i + 300; |
|
| 225 | 225 | $output .= $i.',69.779998,37.919998,150000,'; |
| 226 | -$i = $i+300; |
|
| 226 | +$i = $i + 300; |
|
| 227 | 227 | $output .= $i.',86.933333,27.983333,150000,'; |
| 228 | -$i = $i+300; |
|
| 228 | +$i = $i + 300; |
|
| 229 | 229 | $output .= $i.',84.870002,27.02,150000,'; |
| 230 | -$i = $i+300; |
|
| 230 | +$i = $i + 300; |
|
| 231 | 231 | $output .= $i.',88.36,22.569999,150000,'; |
| 232 | -$i = $i+300; |
|
| 232 | +$i = $i + 300; |
|
| 233 | 233 | $output .= $i.',90.389999,23.7,150000,'; |
| 234 | -$i = $i+300; |
|
| 234 | +$i = $i + 300; |
|
| 235 | 235 | $output .= $i.',97.04,20.78,150000,'; |
| 236 | -$i = $i+300; |
|
| 236 | +$i = $i + 300; |
|
| 237 | 237 | $output .= $i.',92.762917,11.66857,150000,'; |
| 238 | -$i = $i+300; |
|
| 238 | +$i = $i + 300; |
|
| 239 | 239 | $output .= $i.',50.23720550537109,-46.10261535644531,150000,'; |
| 240 | -$i = $i+300; |
|
| 240 | +$i = $i + 300; |
|
| 241 | 241 | $output .= $i.',72.422489,-7.336367,150000,'; |
| 242 | -$i = $i+300; |
|
| 242 | +$i = $i + 300; |
|
| 243 | 243 | $output .= $i.',73.510915,4.174199,150000,'; |
| 244 | -$i = $i+300; |
|
| 244 | +$i = $i + 300; |
|
| 245 | 245 | $output .= $i.',81.050003,6.989999,150000,'; |
| 246 | -$i = $i+300; |
|
| 246 | +$i = $i + 300; |
|
| 247 | 247 | $output .= $i.',72.819999,18.959999,150000,'; |
| 248 | -$i = $i+300; |
|
| 248 | +$i = $i + 300; |
|
| 249 | 249 | $output .= $i.',78.042222,27.174167,150000,'; |
| 250 | -$i = $i+300; |
|
| 250 | +$i = $i + 300; |
|
| 251 | 251 | $output .= $i.',71.449996,30.2,150000,'; |
| 252 | -$i = $i+300; |
|
| 252 | +$i = $i + 300; |
|
| 253 | 253 | $output .= $i.',67.109993,36.703819,150000,'; |
| 254 | -$i = $i+300; |
|
| 254 | +$i = $i + 300; |
|
| 255 | 255 | $output .= $i.',54.36,39.509998,150000,'; |
| 256 | -$i = $i+300; |
|
| 256 | +$i = $i + 300; |
|
| 257 | 257 | $output .= $i.',63.726529,40.214486,150000,'; |
| 258 | -$i = $i+300; |
|
| 258 | +$i = $i + 300; |
|
| 259 | 259 | $output .= $i.',58.853439,48.251126,150000,'; |
| 260 | -$i = $i+300; |
|
| 260 | +$i = $i + 300; |
|
| 261 | 261 | $output .= $i.',56.23246,58.00024,150000,'; |
| 262 | -$i = $i+300; |
|
| 262 | +$i = $i + 300; |
|
| 263 | 263 | $output .= $i.',49.659999,58.599998,150000,'; |
| 264 | -$i = $i+300; |
|
| 264 | +$i = $i + 300; |
|
| 265 | 265 | $output .= $i.',50.150001,53.2,150000,'; |
| 266 | -$i = $i+300; |
|
| 266 | +$i = $i + 300; |
|
| 267 | 267 | $output .= $i.',44.11,41.979999,150000,'; |
| 268 | -$i = $i+300; |
|
| 268 | +$i = $i + 300; |
|
| 269 | 269 | $output .= $i.',49.893226,40.38344,150000,'; |
| 270 | -$i = $i+300; |
|
| 270 | +$i = $i + 300; |
|
| 271 | 271 | $output .= $i.',44.75,40.5,150000,'; |
| 272 | -$i = $i+300; |
|
| 272 | +$i = $i + 300; |
|
| 273 | 273 | $output .= $i.',50.95,34.650001,150000,'; |
| 274 | -$i = $i+300; |
|
| 274 | +$i = $i + 300; |
|
| 275 | 275 | $output .= $i.',56.27433,27.18717,150000,'; |
| 276 | -$i = $i+300; |
|
| 276 | +$i = $i + 300; |
|
| 277 | 277 | $output .= $i.',54.989491,25.005817,150000,'; |
| 278 | -$i = $i+300; |
|
| 278 | +$i = $i + 300; |
|
| 279 | 279 | $output .= $i.',59.549999,22.569999,150000,'; |
| 280 | -$i = $i+300; |
|
| 280 | +$i = $i + 300; |
|
| 281 | 281 | $output .= $i.',47.58318996007591,-9.722414273737707,150000,'; |
| 282 | -$i = $i+300; |
|
| 282 | +$i = $i + 300; |
|
| 283 | 283 | $output .= $i.',57.471008,-20.26026,150000,'; |
| 284 | -$i = $i+300; |
|
| 284 | +$i = $i + 300; |
|
| 285 | 285 | $output .= $i.',37.946460723877,-46.6428451538086,150000,'; |
| 286 | -$i = $i+300; |
|
| 286 | +$i = $i + 300; |
|
| 287 | 287 | $output .= $i.',53,-67.5,150000,'; |
| 288 | -$i = $i+300; |
|
| 288 | +$i = $i + 300; |
|
| 289 | 289 | $output .= $i.',46.99004,-25.03233,150000,'; |
| 290 | -$i = $i+300; |
|
| 290 | +$i = $i + 300; |
|
| 291 | 291 | $output .= $i.',46.310001,-15.72,150000,'; |
| 292 | -$i = $i+300; |
|
| 292 | +$i = $i + 300; |
|
| 293 | 293 | $output .= $i.',44.41203117370608,-12.22338294982911,150000,'; |
| 294 | -$i = $i+300; |
|
| 294 | +$i = $i + 300; |
|
| 295 | 295 | $output .= $i.',39.3822,-6.097406,150000,'; |
| 296 | -$i = $i+300; |
|
| 296 | +$i = $i + 300; |
|
| 297 | 297 | $output .= $i.',39.659999,-4.039999,150000,'; |
| 298 | -$i = $i+300; |
|
| 298 | +$i = $i + 300; |
|
| 299 | 299 | $output .= $i.',40.033333,7.916667,150000,'; |
| 300 | -$i = $i+300; |
|
| 300 | +$i = $i + 300; |
|
| 301 | 301 | $output .= $i.',42.549999,16.899999,150000,'; |
| 302 | -$i = $i+300; |
|
| 302 | +$i = $i + 300; |
|
| 303 | 303 | $output .= $i.',43.970001,26.37,150000,'; |
| 304 | -$i = $i+300; |
|
| 304 | +$i = $i + 300; |
|
| 305 | 305 | $output .= $i.',41.12,30.455,150000,'; |
| 306 | -$i = $i+300; |
|
| 306 | +$i = $i + 300; |
|
| 307 | 307 | $output .= $i.',38.278671,34.547951,150000,'; |
| 308 | -$i = $i+300; |
|
| 308 | +$i = $i + 300; |
|
| 309 | 309 | $output .= $i.',37.619998,55.75,150000,'; |
| 310 | -$i = $i+300; |
|
| 310 | +$i = $i + 300; |
|
| 311 | 311 | $output .= $i.',30.453329,59.951889,150000,'; |
| 312 | -$i = $i+300; |
|
| 312 | +$i = $i + 300; |
|
| 313 | 313 | $output .= $i.',23.12,63.84,150000,'; |
| 314 | -$i = $i+300; |
|
| 314 | +$i = $i + 300; |
|
| 315 | 315 | $output .= $i.',26.709999,58.380001,150000,'; |
| 316 | -$i = $i+300; |
|
| 316 | +$i = $i + 300; |
|
| 317 | 317 | $output .= $i.',25.42,57.549999,150000,'; |
| 318 | -$i = $i+300; |
|
| 318 | +$i = $i + 300; |
|
| 319 | 319 | $output .= $i.',23.319999,55.93,150000,'; |
| 320 | -$i = $i+300; |
|
| 320 | +$i = $i + 300; |
|
| 321 | 321 | $output .= $i.',26.1,52.119998,150000,'; |
| 322 | -$i = $i+300; |
|
| 322 | +$i = $i + 300; |
|
| 323 | 323 | $output .= $i.',32.259998,48.5,150000,'; |
| 324 | -$i = $i+300; |
|
| 324 | +$i = $i + 300; |
|
| 325 | 325 | $output .= $i.',28.829999,47.029998,150000,'; |
| 326 | -$i = $i+300; |
|
| 326 | +$i = $i + 300; |
|
| 327 | 327 | $output .= $i.',25.61,45.659999,150000,'; |
| 328 | -$i = $i+300; |
|
| 328 | +$i = $i + 300; |
|
| 329 | 329 | $output .= $i.',27.469999,42.509998,150000,'; |
| 330 | -$i = $i+300; |
|
| 330 | +$i = $i + 300; |
|
| 331 | 331 | $output .= $i.',23.729999,37.979999,150000,'; |
| 332 | -$i = $i+300; |
|
| 332 | +$i = $i + 300; |
|
| 333 | 333 | $output .= $i.',27.149999,38.43,150000,'; |
| 334 | -$i = $i+300; |
|
| 334 | +$i = $i + 300; |
|
| 335 | 335 | $output .= $i.',31.132659,29.977088,150000,'; |
| 336 | -$i = $i+300; |
|
| 336 | +$i = $i + 300; |
|
| 337 | 337 | $output .= $i.',32.659999,13.17,150000,'; |
| 338 | -$i = $i+300; |
|
| 338 | +$i = $i + 300; |
|
| 339 | 339 | $output .= $i.',33.599998,1.71,150000,'; |
| 340 | -$i = $i+300; |
|
| 340 | +$i = $i + 300; |
|
| 341 | 341 | $output .= $i.',25.92,-2.95,150000,'; |
| 342 | -$i = $i+300; |
|
| 342 | +$i = $i + 300; |
|
| 343 | 343 | $output .= $i.',28.45,-14.439999,150000,'; |
| 344 | -$i = $i+300; |
|
| 344 | +$i = $i + 300; |
|
| 345 | 345 | $output .= $i.',30.819999,-20.059999,150000,'; |
| 346 | -$i = $i+300; |
|
| 346 | +$i = $i + 300; |
|
| 347 | 347 | $output .= $i.',21.639999,-21.7,150000,'; |
| 348 | -$i = $i+300; |
|
| 348 | +$i = $i + 300; |
|
| 349 | 349 | $output .= $i.',25.59,-33.959999,150000,'; |
| 350 | -$i = $i+300; |
|
| 350 | +$i = $i + 300; |
|
| 351 | 351 | $output .= $i.',18.129999,-26.579999,150000,'; |
| 352 | -$i = $i+300; |
|
| 352 | +$i = $i + 300; |
|
| 353 | 353 | $output .= $i.',13.767777,-10.722417,150000,'; |
| 354 | -$i = $i+300; |
|
| 354 | +$i = $i + 300; |
|
| 355 | 355 | $output .= $i.',10.13,-0.15,150000,'; |
| 356 | -$i = $i+300; |
|
| 356 | +$i = $i + 300; |
|
| 357 | 357 | $output .= $i.',20.67,5.76,150000,'; |
| 358 | -$i = $i+300; |
|
| 358 | +$i = $i + 300; |
|
| 359 | 359 | $output .= $i.',9.71,4.059999,150000,'; |
| 360 | -$i = $i+300; |
|
| 360 | +$i = $i + 300; |
|
| 361 | 361 | $output .= $i.',7.44,10.52,150000,'; |
| 362 | -$i = $i+300; |
|
| 362 | +$i = $i + 300; |
|
| 363 | 363 | $output .= $i.',18.69,12.189999,150000,'; |
| 364 | -$i = $i+300; |
|
| 364 | +$i = $i + 300; |
|
| 365 | 365 | $output .= $i.',7.98,17,150000,'; |
| 366 | -$i = $i+300; |
|
| 366 | +$i = $i + 300; |
|
| 367 | 367 | $output .= $i.',14.42,27.069999,150000,'; |
| 368 | -$i = $i+300; |
|
| 368 | +$i = $i + 300; |
|
| 369 | 369 | $output .= $i.',3.678539,32.489059,150000,'; |
| 370 | -$i = $i+300; |
|
| 370 | +$i = $i + 300; |
|
| 371 | 371 | $output .= $i.',-7.619999,33.599998,150000,'; |
| 372 | -$i = $i+300; |
|
| 372 | +$i = $i + 300; |
|
| 373 | 373 | $output .= $i.',13.611066,38.129963,150000,'; |
| 374 | -$i = $i+300; |
|
| 374 | +$i = $i + 300; |
|
| 375 | 375 | $output .= $i.',12.482323,41.895466,150000,'; |
| 376 | -$i = $i+300; |
|
| 376 | +$i = $i + 300; |
|
| 377 | 377 | $output .= $i.',17.189752,44.763891,150000,'; |
| 378 | -$i = $i+300; |
|
| 378 | +$i = $i + 300; |
|
| 379 | 379 | $output .= $i.',16.45,43.509998,150000,'; |
| 380 | -$i = $i+300; |
|
| 380 | +$i = $i + 300; |
|
| 381 | 381 | $output .= $i.',14.51,46.060001,150000,'; |
| 382 | -$i = $i+300; |
|
| 382 | +$i = $i + 300; |
|
| 383 | 383 | $output .= $i.',21.629999,47.54,150000,'; |
| 384 | -$i = $i+300; |
|
| 384 | +$i = $i + 300; |
|
| 385 | 385 | $output .= $i.',16.37,48.220001,150000,'; |
| 386 | -$i = $i+300; |
|
| 386 | +$i = $i + 300; |
|
| 387 | 387 | $output .= $i.',10.736111,47.554444,150000,'; |
| 388 | -$i = $i+300; |
|
| 388 | +$i = $i + 300; |
|
| 389 | 389 | $output .= $i.',14.43,50.080001,150000,'; |
| 390 | -$i = $i+300; |
|
| 390 | +$i = $i + 300; |
|
| 391 | 391 | $output .= $i.',17.129999,48.159999,150000,'; |
| 392 | -$i = $i+300; |
|
| 392 | +$i = $i + 300; |
|
| 393 | 393 | $output .= $i.',22.569999,51.240001,150000,'; |
| 394 | -$i = $i+300; |
|
| 394 | +$i = $i + 300; |
|
| 395 | 395 | $output .= $i.',13.411895,52.523781,150000,'; |
| 396 | -$i = $i+300; |
|
| 396 | +$i = $i + 300; |
|
| 397 | 397 | $output .= $i.',10.039999,56.470001,150000,'; |
| 398 | -$i = $i+300; |
|
| 398 | +$i = $i + 300; |
|
| 399 | 399 | $output .= $i.',13.02,55.61,150000,'; |
| 400 | -$i = $i+300; |
|
| 400 | +$i = $i + 300; |
|
| 401 | 401 | $output .= $i.',17.329999,62.400001,150000,'; |
| 402 | -$i = $i+300; |
|
| 402 | +$i = $i + 300; |
|
| 403 | 403 | $output .= $i.',14.229999,78.059997,150000,'; |
| 404 | -$i = $i+300; |
|
| 404 | +$i = $i + 300; |
|
| 405 | 405 | $output .= $i.',10.399999,63.439998,150000,'; |
| 406 | -$i = $i+300; |
|
| 406 | +$i = $i + 300; |
|
| 407 | 407 | $output .= $i.',2.350966,48.856558,150000,'; |
| 408 | -$i = $i+300; |
|
| 408 | +$i = $i + 300; |
|
| 409 | 409 | $output .= $i.',7.42,43.75,150000,'; |
| 410 | -$i = $i+300; |
|
| 410 | +$i = $i + 300; |
|
| 411 | 411 | $output .= $i.',1.57,42.54,150000,'; |
| 412 | -$i = $i+300; |
|
| 412 | +$i = $i + 300; |
|
| 413 | 413 | $output .= $i.',-0.991293,37.605651,150000,'; |
| 414 | -$i = $i+300; |
|
| 414 | +$i = $i + 300; |
|
| 415 | 415 | $output .= $i.',-7.429999,39.29,150000,'; |
| 416 | -$i = $i+300; |
|
| 416 | +$i = $i + 300; |
|
| 417 | 417 | $output .= $i.',-11.4053,16.5889,150000,'; |
| 418 | -$i = $i+300; |
|
| 418 | +$i = $i + 300; |
|
| 419 | 419 | $output .= $i.',-3.009999,16.78,150000,'; |
| 420 | -$i = $i+300; |
|
| 420 | +$i = $i + 300; |
|
| 421 | 421 | $output .= $i.',-5.36008,5.83885,150000,'; |
| 422 | -$i = $i+300; |
|
| 422 | +$i = $i + 300; |
|
| 423 | 423 | $output .= $i.',-12.3,11.319999,150000,'; |
| 424 | -$i = $i+300; |
|
| 424 | +$i = $i + 300; |
|
| 425 | 425 | $output .= $i.',-16.239999,12.829999,150000,'; |
| 426 | -$i = $i+300; |
|
| 426 | +$i = $i + 300; |
|
| 427 | 427 | $output .= $i.',-16.2507,28.457661,150000,'; |
| 428 | -$i = $i+300; |
|
| 428 | +$i = $i + 300; |
|
| 429 | 429 | $output .= $i.',-0.126197,51.500197,150000,'; |
| 430 | -$i = $i+300; |
|
| 430 | +$i = $i + 300; |
|
| 431 | 431 | $output .= $i.',-2.968111,56.461428,150000,'; |
| 432 | -$i = $i+300; |
|
| 432 | +$i = $i + 300; |
|
| 433 | 433 | $output .= $i.',-7.308429,54.998539,150000,'; |
| 434 | -$i = $i+300; |
|
| 434 | +$i = $i + 300; |
|
| 435 | 435 | $output .= $i.',-8.92,52.7,150000,'; |
| 436 | -$i = $i+300; |
|
| 436 | +$i = $i + 300; |
|
| 437 | 437 | $output .= $i.',-19.000959,63.427502,150000,'; |
| 438 | -$i = $i+300; |
|
| 438 | +$i = $i + 300; |
|
| 439 | 439 | $output .= $i.',-28.364049911499,38.47212219238281,150000,'; |
| 440 | -$i = $i+300; |
|
| 440 | +$i = $i + 300; |
|
| 441 | 441 | $output .= $i.',-23.76,15.279999,150000,'; |
| 442 | -$i = $i+300; |
|
| 442 | +$i = $i + 300; |
|
| 443 | 443 | $output .= $i.',-36.511219,-54.274151,150000,'; |
| 444 | -$i = $i+300; |
|
| 444 | +$i = $i + 300; |
|
| 445 | 445 | $output .= $i.',-58.979999,-51.830001,150000,'; |
| 446 | -$i = $i+300; |
|
| 446 | +$i = $i + 300; |
|
| 447 | 447 | $output .= $i.',-64.190002,-31.399999,150000,'; |
| 448 | -$i = $i+300; |
|
| 448 | +$i = $i + 300; |
|
| 449 | 449 | $output .= $i.',-54.18,-32.36,150000,'; |
| 450 | -$i = $i+300; |
|
| 450 | +$i = $i + 300; |
|
| 451 | 451 | $output .= $i.',-43.2,-22.909999,150000,'; |
| 452 | -$i = $i+300; |
|
| 452 | +$i = $i + 300; |
|
| 453 | 453 | $output .= $i.',-37.333333,65.666667,150000,'; |
| 454 | -$i = $i+300; |
|
| 454 | +$i = $i + 300; |
|
| 455 | 455 | $output .= $i.',-69.345131,77.48262,150000,'; |
| 456 | -$i = $i+300; |
|
| 456 | +$i = $i + 300; |
|
| 457 | 457 | $output .= $i.',-55.65049,48.929001,150000,'; |
| 458 | -$i = $i+300; |
|
| 458 | +$i = $i + 300; |
|
| 459 | 459 | $output .= $i.',-63.530471,44.681263,150000,'; |
| 460 | -$i = $i+300; |
|
| 460 | +$i = $i + 300; |
|
| 461 | 461 | $output .= $i.',-66.647818,45.957319,150000,'; |
| 462 | -$i = $i+300; |
|
| 462 | +$i = $i + 300; |
|
| 463 | 463 | $output .= $i.',-59.630001,13.18,150000,'; |
| 464 | -$i = $i+300; |
|
| 464 | +$i = $i + 300; |
|
| 465 | 465 | $output .= $i.',-61.744888,12.06526,150000,'; |
| 466 | -$i = $i+300; |
|
| 466 | +$i = $i + 300; |
|
| 467 | 467 | $output .= $i.',-61.171322,10.30501,150000,'; |
| 468 | -$i = $i+300; |
|
| 468 | +$i = $i + 300; |
|
| 469 | 469 | $output .= $i.',-67.470001,7.9,150000,'; |
| 470 | -$i = $i+300; |
|
| 470 | +$i = $i + 300; |
|
| 471 | 471 | $output .= $i.',-58.159999,6.789999,150000,'; |
| 472 | -$i = $i+300; |
|
| 472 | +$i = $i + 300; |
|
| 473 | 473 | $output .= $i.',-60.02,-3.119999,150000,'; |
| 474 | -$i = $i+300; |
|
| 474 | +$i = $i + 300; |
|
| 475 | 475 | $output .= $i.',-56.45,-14.409999,150000,'; |
| 476 | -$i = $i+300; |
|
| 476 | +$i = $i + 300; |
|
| 477 | 477 | $output .= $i.',-65.260002,-19.059999,150000,'; |
| 478 | -$i = $i+300; |
|
| 478 | +$i = $i + 300; |
|
| 479 | 479 | $output .= $i.',-56.636503,-24.158676,150000,'; |
| 480 | -$i = $i+300; |
|
| 480 | +$i = $i + 300; |
|
| 481 | 481 | $output .= $i.',-56.509998,-33.409999,150000,'; |
| 482 | -$i = $i+300; |
|
| 482 | +$i = $i + 300; |
|
| 483 | 483 | $output .= $i.',-68.523514,-50.021889,150000,'; |
| 484 | -$i = $i+300; |
|
| 484 | +$i = $i + 300; |
|
| 485 | 485 | $output .= $i.',-72.505127,-51.732529,150000,'; |
| 486 | -$i = $i+300; |
|
| 486 | +$i = $i + 300; |
|
| 487 | 487 | $output .= $i.',-71.639999,-33.04,150000,'; |
| 488 | -$i = $i+300; |
|
| 488 | +$i = $i + 300; |
|
| 489 | 489 | $output .= $i.',-72.515821,-13.162849,150000,'; |
| 490 | -$i = $i+300; |
|
| 490 | +$i = $i + 300; |
|
| 491 | 491 | $output .= $i.',-76.970001,-6.03,150000,'; |
| 492 | -$i = $i+300; |
|
| 492 | +$i = $i + 300; |
|
| 493 | 493 | $output .= $i.',-78.620002,-1.24,150000,'; |
| 494 | -$i = $i+300; |
|
| 494 | +$i = $i + 300; |
|
| 495 | 495 | $output .= $i.',-76.739997,8.1,150000,'; |
| 496 | -$i = $i+300; |
|
| 496 | +$i = $i + 300; |
|
| 497 | 497 | $output .= $i.',-79.879913,9.368985,150000,'; |
| 498 | -$i = $i+300; |
|
| 498 | +$i = $i + 300; |
|
| 499 | 499 | $output .= $i.',-76.949996,18,150000,'; |
| 500 | -$i = $i+300; |
|
| 500 | +$i = $i + 300; |
|
| 501 | 501 | $output .= $i.',-72.699996,19.11,150000,'; |
| 502 | -$i = $i+300; |
|
| 502 | +$i = $i + 300; |
|
| 503 | 503 | $output .= $i.',-75.220001,20.149999,150000,'; |
| 504 | -$i = $i+300; |
|
| 504 | +$i = $i + 300; |
|
| 505 | 505 | $output .= $i.',-73.682953,20.95027,150000,'; |
| 506 | -$i = $i+300; |
|
| 506 | +$i = $i + 300; |
|
| 507 | 507 | $output .= $i.',-80.605,28.405556,150000,'; |
| 508 | -$i = $i+300; |
|
| 508 | +$i = $i + 300; |
|
| 509 | 509 | $output .= $i.',-84.388056,33.748889,150000,'; |
| 510 | -$i = $i+300; |
|
| 510 | +$i = $i + 300; |
|
| 511 | 511 | $output .= $i.',-79.931111,32.776389,150000,'; |
| 512 | -$i = $i+300; |
|
| 512 | +$i = $i + 300; |
|
| 513 | 513 | $output .= $i.',-83.920833,35.960556,150000,'; |
| 514 | -$i = $i+300; |
|
| 514 | +$i = $i + 300; |
|
| 515 | 515 | $output .= $i.',-84.500278,38.049167,150000,'; |
| 516 | -$i = $i+300; |
|
| 516 | +$i = $i + 300; |
|
| 517 | 517 | $output .= $i.',-77.460833,38.303056,150000,'; |
| 518 | -$i = $i+300; |
|
| 518 | +$i = $i + 300; |
|
| 519 | 519 | $output .= $i.',-82.515556,40.758333,150000,'; |
| 520 | -$i = $i+300; |
|
| 520 | +$i = $i + 300; |
|
| 521 | 521 | $output .= $i.',-83.045833,42.331389,150000,'; |
| 522 | -$i = $i+300; |
|
| 522 | +$i = $i + 300; |
|
| 523 | 523 | $output .= $i.',-74.006389,40.714167,150000,'; |
| 524 | -$i = $i+300; |
|
| 524 | +$i = $i + 300; |
|
| 525 | 525 | $output .= $i.',-71.802778,42.2625,150000,'; |
| 526 | -$i = $i+300; |
|
| 526 | +$i = $i + 300; |
|
| 527 | 527 | $output .= $i.',-72.973056,43.610556,150000,'; |
| 528 | -$i = $i+300; |
|
| 528 | +$i = $i + 300; |
|
| 529 | 529 | $output .= $i.',-68.0125,46.860556,150000,'; |
| 530 | -$i = $i+300; |
|
| 530 | +$i = $i + 300; |
|
| 531 | 531 | $output .= $i.',-72.581779,46.357398,150000,'; |
| 532 | -$i = $i+300; |
|
| 532 | +$i = $i + 300; |
|
| 533 | 533 | $output .= $i.',-78.53632621543271,52.72737572958358,150000,'; |
| 534 | -$i = $i+300; |
|
| 534 | +$i = $i + 300; |
|
| 535 | 535 | $output .= $i.',-66.921779,52.940118,150000,'; |
| 536 | -$i = $i+300; |
|
| 536 | +$i = $i + 300; |
|
| 537 | 537 | $output .= $i.',-75.652573,62.201069,150000,'; |
| 538 | -$i = $i+300; |
|
| 538 | +$i = $i + 300; |
|
| 539 | 539 | $output .= $i.',-64.865257,67.935417,150000,'; |
| 540 | -$i = $i+300; |
|
| 540 | +$i = $i + 300; |
|
| 541 | 541 | $output .= $i.',-94.969443,74.716943,150000,'; |
| 542 | -$i = $i+300; |
|
| 542 | +$i = $i + 300; |
|
| 543 | 543 | $output .= $i.',-82.793909,76.395731,150000,'; |
| 544 | -$i = $i+300; |
|
| 544 | +$i = $i + 300; |
|
| 545 | 545 | $output .= $i.',-97.49276733398439,69.18675994873048,150000,'; |
| 546 | -$i = $i+300; |
|
| 546 | +$i = $i + 300; |
|
| 547 | 547 | $output .= $i.',-90.5537452697754,63.36753463745121,150000,'; |
| 548 | -$i = $i+300; |
|
| 548 | +$i = $i + 300; |
|
| 549 | 549 | $output .= $i.',-89.270113,48.412197,150000,'; |
| 550 | -$i = $i+300; |
|
| 550 | +$i = $i + 300; |
|
| 551 | 551 | $output .= $i.',-79.604159,43.68731,150000,'; |
| 552 | -$i = $i+300; |
|
| 552 | +$i = $i + 300; |
|
| 553 | 553 | $output .= $i.',-89.401111,43.073056,150000,'; |
| 554 | -$i = $i+300; |
|
| 554 | +$i = $i + 300; |
|
| 555 | 555 | $output .= $i.',-94.633611,42.395278,150000,'; |
| 556 | -$i = $i+300; |
|
| 556 | +$i = $i + 300; |
|
| 557 | 557 | $output .= $i.',-89.588889,40.693611,150000,'; |
| 558 | -$i = $i+300; |
|
| 558 | +$i = $i + 300; |
|
| 559 | 559 | $output .= $i.',-90.197778,38.627222,150000,'; |
| 560 | -$i = $i+300; |
|
| 560 | +$i = $i + 300; |
|
| 561 | 561 | $output .= $i.',-90.704167,35.842222,150000,'; |
| 562 | -$i = $i+300; |
|
| 562 | +$i = $i + 300; |
|
| 563 | 563 | $output .= $i.',-91.061667,33.41,150000,'; |
| 564 | -$i = $i+300; |
|
| 564 | +$i = $i + 300; |
|
| 565 | 565 | $output .= $i.',-92.445,31.311111,150000,'; |
| 566 | -$i = $i+300; |
|
| 566 | +$i = $i + 300; |
|
| 567 | 567 | $output .= $i.',-98.493333,29.423889,150000,'; |
| 568 | -$i = $i+300; |
|
| 568 | +$i = $i + 300; |
|
| 569 | 569 | $output .= $i.',-103.349998,20.67,150000,'; |
| 570 | -$i = $i+300; |
|
| 570 | +$i = $i + 300; |
|
| 571 | 571 | $output .= $i.',-86.830001,21.17,150000,'; |
| 572 | -$i = $i+300; |
|
| 572 | +$i = $i + 300; |
|
| 573 | 573 | $output .= $i.',-89.529998,14.979999,150000,'; |
| 574 | -$i = $i+300; |
|
| 574 | +$i = $i + 300; |
|
| 575 | 575 | $output .= $i.',-87.449996,13.42,150000,'; |
| 576 | -$i = $i+300; |
|
| 576 | +$i = $i + 300; |
|
| 577 | 577 | $output .= $i.',-83.709999,9.369999,150000,'; |
| 578 | -$i = $i+300; |
|
| 578 | +$i = $i + 300; |
|
| 579 | 579 | $output .= $i.',-91.5149765,-0.3781085,150000,'; |
| 580 | -$i = $i+300; |
|
| 580 | +$i = $i + 300; |
|
| 581 | 581 | $output .= $i.',-109.425598,-27.1546,150000,'; |
| 582 | -$i = $i+300; |
|
| 582 | +$i = $i + 300; |
|
| 583 | 583 | $output .= $i.',-109.9142,22.88093,150000,'; |
| 584 | -$i = $i+300; |
|
| 584 | +$i = $i + 300; |
|
| 585 | 585 | $output .= $i.',-110.910003,27.92,150000,'; |
| 586 | -$i = $i+300; |
|
| 586 | +$i = $i + 300; |
|
| 587 | 587 | $output .= $i.',-110.925833,32.221667,150000,'; |
| 588 | -$i = $i+300; |
|
| 588 | +$i = $i + 300; |
|
| 589 | 589 | $output .= $i.',-104.526667,33.395,150000,'; |
| 590 | -$i = $i+300; |
|
| 590 | +$i = $i + 300; |
|
| 591 | 591 | $output .= $i.',-113.061111,37.6775,150000,'; |
| 592 | -$i = $i+300; |
|
| 592 | +$i = $i + 300; |
|
| 593 | 593 | $output .= $i.',-104.820833,38.833889,150000,'; |
| 594 | -$i = $i+300; |
|
| 594 | +$i = $i + 300; |
|
| 595 | 595 | $output .= $i.',-108.73,42.833056,150000,'; |
| 596 | -$i = $i+300; |
|
| 596 | +$i = $i + 300; |
|
| 597 | 597 | $output .= $i.',-113.895,45.175833,150000,'; |
| 598 | -$i = $i+300; |
|
| 598 | +$i = $i + 300; |
|
| 599 | 599 | $output .= $i.',-113.993056,46.872222,150000,'; |
| 600 | -$i = $i+300; |
|
| 600 | +$i = $i + 300; |
|
| 601 | 601 | $output .= $i.',-114.080796,51.039877,150000,'; |
| 602 | -$i = $i+300; |
|
| 602 | +$i = $i + 300; |
|
| 603 | 603 | $output .= $i.',-102.3889594419702,57.15883691318781,150000,'; |
| 604 | -$i = $i+300; |
|
| 604 | +$i = $i + 300; |
|
| 605 | 605 | $output .= $i.',-118.0333,66.0833,150000,'; |
| 606 | -$i = $i+300; |
|
| 606 | +$i = $i + 300; |
|
| 607 | 607 | $output .= $i.',-140.55,64.45,150000,'; |
| 608 | -$i = $i+300; |
|
| 608 | +$i = $i + 300; |
|
| 609 | 609 | $output .= $i.',-122.690386,58.80667,150000,'; |
| 610 | -$i = $i+300; |
|
| 610 | +$i = $i + 300; |
|
| 611 | 611 | $output .= $i.',-121.92985,50.686341,150000,'; |
| 612 | -$i = $i+300; |
|
| 612 | +$i = $i + 300; |
|
| 613 | 613 | $output .= $i.',-122.330833,47.606389,150000,'; |
| 614 | -$i = $i+300; |
|
| 614 | +$i = $i + 300; |
|
| 615 | 615 | $output .= $i.',-122.274167,47.564167,150000,'; |
| 616 | -$i = $i+300; |
|
| 616 | +$i = $i + 300; |
|
| 617 | 617 | $output .= $i.',-122.968503,45.309901,150000,'; |
| 618 | -$i = $i+300; |
|
| 618 | +$i = $i + 300; |
|
| 619 | 619 | $output .= $i.',-122.874444,42.326667,150000,'; |
| 620 | -$i = $i+300; |
|
| 620 | +$i = $i + 300; |
|
| 621 | 621 | $output .= $i.',-122.390556,40.586667,150000,'; |
| 622 | -$i = $i+300; |
|
| 622 | +$i = $i + 300; |
|
| 623 | 623 | $output .= $i.',-117.068611,39.493333,150000,'; |
| 624 | -$i = $i+300; |
|
| 624 | +$i = $i + 300; |
|
| 625 | 625 | $output .= $i.',-122.418333,37.775,150000,'; |
| 626 | -$i = $i+300; |
|
| 626 | +$i = $i + 300; |
|
| 627 | 627 | $output .= $i.',-117.108333,34.207778,150000,'; |
| 628 | -$i = $i+300; |
|
| 628 | +$i = $i + 300; |
|
| 629 | 629 | $output .= $i.',-116.544444,33.830278,150000,'; |
| 630 | -$i = $i+300; |
|
| 630 | +$i = $i + 300; |
|
| 631 | 631 | $output .= $i.',-117.156389,32.715278,150000,'; |
| 632 | -$i = $i+300; |
|
| 632 | +$i = $i + 300; |
|
| 633 | 633 | $output .= $i.',-149.891667,61.218333,150000,'; |
| 634 | -$i = $i+300; |
|
| 634 | +$i = $i + 300; |
|
| 635 | 635 | $output .= $i.',-155.566389,62.948889,150000,'; |
| 636 | -$i = $i+300; |
|
| 636 | +$i = $i + 300; |
|
| 637 | 637 | $output .= $i.',-165.406389,64.501111,150000,'; |
| 638 | -$i = $i+300; |
|
| 638 | +$i = $i + 300; |
|
| 639 | 639 | $output .= $i.',-155.09,19.729722,150000,'; |
| 640 | -$i = $i+300; |
|
| 640 | +$i = $i + 300; |
|
| 641 | 641 | $output .= $i.',-156.337974,20.804858,150000,'; |
| 642 | -$i = $i+300; |
|
| 642 | +$i = $i + 300; |
|
| 643 | 643 | $output .= $i.',-157.043209,21.141189,150000,'; |
| 644 | -$i = $i+300; |
|
| 644 | +$i = $i + 300; |
|
| 645 | 645 | $output .= $i.',-158.009167,21.386667,150000,'; |
| 646 | -$i = $i+300; |
|
| 646 | +$i = $i + 300; |
|
| 647 | 647 | $output .= $i.',-159.371111,21.981111,150000'; |
| 648 | 648 | |
| 649 | 649 | $output .= ']}}'; |
@@ -3,17 +3,17 @@ discard block |
||
| 3 | 3 | require_once('require/class.Spotter.php'); |
| 4 | 4 | require_once('require/class.Language.php'); |
| 5 | 5 | |
| 6 | -if (!isset($_GET['departure_airport']) || !isset($_GET['arrival_airport'])){ |
|
| 6 | +if (!isset($_GET['departure_airport']) || !isset($_GET['arrival_airport'])) { |
|
| 7 | 7 | header('Location: '.$globalURL.''); |
| 8 | 8 | } else { |
| 9 | 9 | $Spotter = new Spotter(); |
| 10 | 10 | //calculuation for the pagination |
| 11 | - if(!isset($_GET['limit'])) |
|
| 11 | + if (!isset($_GET['limit'])) |
|
| 12 | 12 | { |
| 13 | 13 | $limit_start = 0; |
| 14 | 14 | $limit_end = 25; |
| 15 | 15 | $absolute_difference = 25; |
| 16 | - } else { |
|
| 16 | + } else { |
|
| 17 | 17 | $limit_explode = explode(",", $_GET['limit']); |
| 18 | 18 | $limit_start = $limit_explode[0]; |
| 19 | 19 | $limit_end = $limit_explode[1]; |
@@ -27,10 +27,10 @@ discard block |
||
| 27 | 27 | $limit_previous_1 = $limit_start - $absolute_difference; |
| 28 | 28 | $limit_previous_2 = $limit_end - $absolute_difference; |
| 29 | 29 | |
| 30 | - $departure_airport = filter_input(INPUT_GET,'departure_airport',FILTER_SANITIZE_STRING); |
|
| 31 | - $arrival_airport = filter_input(INPUT_GET,'arrival_airport',FILTER_SANITIZE_STRING); |
|
| 30 | + $departure_airport = filter_input(INPUT_GET, 'departure_airport', FILTER_SANITIZE_STRING); |
|
| 31 | + $arrival_airport = filter_input(INPUT_GET, 'arrival_airport', FILTER_SANITIZE_STRING); |
|
| 32 | 32 | $page_url = $globalURL.'/route/'.$departure_airport.'/'.$arrival_airport; |
| 33 | - $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
|
| 33 | + $sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING); |
|
| 34 | 34 | if ($sort != '') { |
| 35 | 35 | $spotter_array = $Spotter->getSpotterDataByRoute($departure_airport, $arrival_airport, $limit_start.",".$absolute_difference, $sort); |
| 36 | 36 | } else { |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | |
| 40 | 40 | if (!empty($spotter_array)) |
| 41 | 41 | { |
| 42 | - $title = sprintf(_("Detailed View for flights between %s (%s), %s - %s (%s), %s"),$spotter_array[0]['departure_airport_name'],$spotter_array[0]['departure_airport_icao'],$spotter_array[0]['departure_airport_country'],$spotter_array[0]['arrival_airport_name'],$spotter_array[0]['arrival_airport_icao'],$spotter_array[0]['arrival_airport_country']); |
|
| 42 | + $title = sprintf(_("Detailed View for flights between %s (%s), %s - %s (%s), %s"), $spotter_array[0]['departure_airport_name'], $spotter_array[0]['departure_airport_icao'], $spotter_array[0]['departure_airport_country'], $spotter_array[0]['arrival_airport_name'], $spotter_array[0]['arrival_airport_icao'], $spotter_array[0]['arrival_airport_country']); |
|
| 43 | 43 | require_once('header.php'); |
| 44 | 44 | print '<div class="info column">'; |
| 45 | 45 | print '<h1>'._("Flights between").' '.$spotter_array[0]['departure_airport_name'].' ('.$spotter_array[0]['departure_airport_icao'].'), '.$spotter_array[0]['departure_airport_country'].' - '.$spotter_array[0]['arrival_airport_name'].' ('.$spotter_array[0]['arrival_airport_icao'].'), '.$spotter_array[0]['arrival_airport_country'].'</h1>'; |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | |
| 50 | 50 | include('route-sub-menu.php'); |
| 51 | 51 | print '<div class="table column">'; |
| 52 | - print '<p>'.sprintf(_("The table below shows the detailed information of all flights that used the route <strong>%s - %s</strong>."),$spotter_array[0]['departure_airport_icao'],$spotter_array[0]['arrival_airport_icao']).'</p>'; |
|
| 52 | + print '<p>'.sprintf(_("The table below shows the detailed information of all flights that used the route <strong>%s - %s</strong>."), $spotter_array[0]['departure_airport_icao'], $spotter_array[0]['arrival_airport_icao']).'</p>'; |
|
| 53 | 53 | |
| 54 | 54 | include('table-output.php'); |
| 55 | 55 | print '<div class="pagination">'; |
@@ -14,7 +14,7 @@ |
||
| 14 | 14 | $limit_start = 0; |
| 15 | 15 | $limit_end = 25; |
| 16 | 16 | $absolute_difference = 25; |
| 17 | - } else { |
|
| 17 | + } else { |
|
| 18 | 18 | $limit_explode = explode(",", $_GET['limit']); |
| 19 | 19 | $limit_start = $limit_explode[0]; |
| 20 | 20 | $limit_end = $limit_explode[1]; |
@@ -5,7 +5,7 @@ |
||
| 5 | 5 | $Spotter = new Spotter(); |
| 6 | 6 | if ($_GET['flightaware_id'] != "") |
| 7 | 7 | { |
| 8 | - $flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING); |
|
| 8 | + $flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING); |
|
| 9 | 9 | $spotter_id = $Spotter->getSpotterIDBasedOnFlightAwareID($flightaware_id); |
| 10 | 10 | |
| 11 | 11 | if ($spotter_id != "") |
@@ -8,11 +8,11 @@ |
||
| 8 | 8 | $flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING); |
| 9 | 9 | $spotter_id = $Spotter->getSpotterIDBasedOnFlightAwareID($flightaware_id); |
| 10 | 10 | |
| 11 | - if ($spotter_id != "") |
|
| 12 | - { |
|
| 13 | - header('Location: '.$globalURL.'/flightid/'.$spotter_id); |
|
| 14 | - } else { |
|
| 11 | + if ($spotter_id != "") |
|
| 12 | + { |
|
| 13 | + header('Location: '.$globalURL.'/flightid/'.$spotter_id); |
|
| 14 | + } else { |
|
| 15 | 15 | header('Location: '.$globalURL); |
| 16 | - } |
|
| 16 | + } |
|
| 17 | 17 | } |
| 18 | 18 | ?> |
| 19 | 19 | \ No newline at end of file |
