Ysurac /
FlightAirMap
@@ -3,13 +3,13 @@ discard block |
||
| 3 | 3 | require_once('require/class.Spotter.php'); |
| 4 | 4 | require_once('require/class.Language.php'); |
| 5 | 5 | $Spotter = new Spotter(); |
| 6 | -$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
|
| 7 | -$date = filter_input(INPUT_GET,'date',FILTER_SANITIZE_STRING); |
|
| 8 | -$spotter_array = $Spotter->getSpotterDataByDate($date,"0,1", $sort); |
|
| 6 | +$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING); |
|
| 7 | +$date = filter_input(INPUT_GET, 'date', FILTER_SANITIZE_STRING); |
|
| 8 | +$spotter_array = $Spotter->getSpotterDataByDate($date, "0,1", $sort); |
|
| 9 | 9 | |
| 10 | 10 | if (!empty($spotter_array)) |
| 11 | 11 | { |
| 12 | - $title = sprintf(_("Most Common Arrival Airports on %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))); |
|
| 12 | + $title = sprintf(_("Most Common Arrival Airports on %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))); |
|
| 13 | 13 | |
| 14 | 14 | require_once('header.php'); |
| 15 | 15 | print '<div class="select-item">'; |
@@ -27,13 +27,13 @@ discard block |
||
| 27 | 27 | print '<script type="text/javascript">$(function () { $("#datepicker").datetimepicker({ format: "YYYY-MM-DD", defaultDate: "'.$date.'" }); }); </script>'; |
| 28 | 28 | print '<br />'; |
| 29 | 29 | print '<div class="info column">'; |
| 30 | - print '<h1>'.sprintf(_("Flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>'; |
|
| 30 | + print '<h1>'.sprintf(_("Flights from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>'; |
|
| 31 | 31 | print '</div>'; |
| 32 | 32 | |
| 33 | 33 | include('date-sub-menu.php'); |
| 34 | 34 | print '<div class="column">'; |
| 35 | 35 | print '<h2>'._("Most Common Arrival Airports").'</h2>'; |
| 36 | - print '<p>'.sprintf(_("The statistic below shows all arrival airports of flights on <strong>%s</strong>."),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>'; |
|
| 36 | + print '<p>'.sprintf(_("The statistic below shows all arrival airports of flights on <strong>%s</strong>."), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>'; |
|
| 37 | 37 | $airport_airport_array = $Spotter->countAllArrivalAirportsByDate($date); |
| 38 | 38 | print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>'; |
| 39 | 39 | print '<script type="text/javascript" src="'.$globalURL.'/js/topojson.v2.min.js"></script>'; |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | print '<script>'; |
| 43 | 43 | print 'var series = ['; |
| 44 | 44 | $airport_data = ''; |
| 45 | - foreach($airport_airport_array as $airport_item) |
|
| 45 | + foreach ($airport_airport_array as $airport_item) |
|
| 46 | 46 | { |
| 47 | 47 | $airport_data .= '[ "'.$airport_item['airport_arrival_icao_count'].'", "'.$airport_item['airport_arrival_icao'].'",'.$airport_item['airport_arrival_latitude'].','.$airport_item['airport_arrival_longitude'].'],'; |
| 48 | 48 | } |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | print '</thead>'; |
| 98 | 98 | print '<tbody>'; |
| 99 | 99 | $i = 1; |
| 100 | - foreach($airport_airport_array as $airport_item) |
|
| 100 | + foreach ($airport_airport_array as $airport_item) |
|
| 101 | 101 | { |
| 102 | 102 | print '<tr>'; |
| 103 | 103 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | $title = _("Unknown Date"); |
| 123 | 123 | require_once('header.php'); |
| 124 | 124 | print '<h1>'._("Error").'</h1>'; |
| 125 | - print '<p>'._("Sorry, this date does not exist in this database. :(");'</p>'; |
|
| 125 | + print '<p>'._("Sorry, this date does not exist in this database. :("); '</p>'; |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | require_once('footer.php'); |
@@ -317,18 +317,18 @@ discard block |
||
| 317 | 317 | </tr> |
| 318 | 318 | <!-- |
| 319 | 319 | <?php |
| 320 | - require_once(dirname(__FILE__).'/../require/class.Connection.php'); |
|
| 321 | - $Connection = new Connection(); |
|
| 320 | + require_once(dirname(__FILE__).'/../require/class.Connection.php'); |
|
| 321 | + $Connection = new Connection(); |
|
| 322 | 322 | ?> |
| 323 | 323 | --> |
| 324 | 324 | <?php |
| 325 | - if ($Connection->db != NULL) { |
|
| 325 | + if ($Connection->db != NULL) { |
|
| 326 | 326 | if ($Connection->tableExists('source_location')) { |
| 327 | - require_once(dirname(__FILE__).'/../require/class.Source.php'); |
|
| 328 | - $Source = new Source(); |
|
| 329 | - //$alllocations = $Source->getAllLocationInfo(); |
|
| 330 | - $alllocations = $Source->getLocationInfobyType(''); |
|
| 331 | - foreach ($alllocations as $location) { |
|
| 327 | + require_once(dirname(__FILE__).'/../require/class.Source.php'); |
|
| 328 | + $Source = new Source(); |
|
| 329 | + //$alllocations = $Source->getAllLocationInfo(); |
|
| 330 | + $alllocations = $Source->getLocationInfobyType(''); |
|
| 331 | + foreach ($alllocations as $location) { |
|
| 332 | 332 | ?> |
| 333 | 333 | <tr> |
| 334 | 334 | <input type="hidden" name="source_id[]" value="<?php print $location['id']; ?>" /> |
@@ -342,9 +342,9 @@ discard block |
||
| 342 | 342 | </tr> |
| 343 | 343 | |
| 344 | 344 | <?php |
| 345 | - } |
|
| 345 | + } |
|
| 346 | + } |
|
| 346 | 347 | } |
| 347 | - } |
|
| 348 | 348 | ?> |
| 349 | 349 | |
| 350 | 350 | <tr> |
@@ -452,12 +452,12 @@ discard block |
||
| 452 | 452 | ?> |
| 453 | 453 | <tr> |
| 454 | 454 | <?php |
| 455 | - if (filter_var($source['host'],FILTER_VALIDATE_URL)) { |
|
| 455 | + if (filter_var($source['host'],FILTER_VALIDATE_URL)) { |
|
| 456 | 456 | ?> |
| 457 | 457 | <td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td> |
| 458 | 458 | <td><input type="text" name="port[]" class="col-xs-2" id="port" value="<?php if (isset($source['port'])) print $source['port']; ?>" /></td> |
| 459 | 459 | <?php |
| 460 | - } else { |
|
| 460 | + } else { |
|
| 461 | 461 | $hostport = explode(':',$source['host']); |
| 462 | 462 | if (isset($hostport[1])) { |
| 463 | 463 | $host = $hostport[0]; |
@@ -470,7 +470,7 @@ discard block |
||
| 470 | 470 | <td><input type="text" name="host[]" id="host" value="<?php print $host; ?>" /></td> |
| 471 | 471 | <td><input type="text" name="port[]" class="col-xs-2" id="port" value="<?php print $port; ?>" /></td> |
| 472 | 472 | <?php |
| 473 | - } |
|
| 473 | + } |
|
| 474 | 474 | ?> |
| 475 | 475 | <td> |
| 476 | 476 | <select name="format[]" id="format"> |
@@ -880,7 +880,7 @@ discard block |
||
| 880 | 880 | <br /> |
| 881 | 881 | <p> |
| 882 | 882 | <?php |
| 883 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 883 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 884 | 884 | ?> |
| 885 | 885 | <label for="aircrafticoncolor">Color of aircraft icon on map</label> |
| 886 | 886 | <input type="color" name="aircrafticoncolor" id="aircrafticoncolor" value="#<?php if (isset($globalAircraftIconColor)) echo $globalAircraftIconColor; else echo '1a3151'; ?>" /> |
@@ -890,11 +890,11 @@ discard block |
||
| 890 | 890 | <b>The directory cache is not writable, aircraft icon will not be cached</b> |
| 891 | 891 | <?php |
| 892 | 892 | } |
| 893 | - } else { |
|
| 893 | + } else { |
|
| 894 | 894 | ?> |
| 895 | 895 | <b>PHP GD is not installed, you can't change color of aircraft icon on map</b> |
| 896 | 896 | <?php |
| 897 | - } |
|
| 897 | + } |
|
| 898 | 898 | ?> |
| 899 | 899 | </p> |
| 900 | 900 | <br /> |
@@ -918,7 +918,7 @@ discard block |
||
| 918 | 918 | </p> |
| 919 | 919 | <?php |
| 920 | 920 | require('../footer.php'); |
| 921 | - exit; |
|
| 921 | + exit; |
|
| 922 | 922 | } |
| 923 | 923 | // ' |
| 924 | 924 | $settings = array(); |
@@ -1009,8 +1009,8 @@ discard block |
||
| 1009 | 1009 | |
| 1010 | 1010 | $sources = array(); |
| 1011 | 1011 | foreach ($source_name as $keys => $name) { |
| 1012 | - 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]); |
|
| 1013 | - 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]); |
|
| 1012 | + 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]); |
|
| 1013 | + 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]); |
|
| 1014 | 1014 | } |
| 1015 | 1015 | if (count($sources) > 0) $_SESSION['sources'] = $sources; |
| 1016 | 1016 | |
@@ -1392,14 +1392,14 @@ discard block |
||
| 1392 | 1392 | |
| 1393 | 1393 | // Set some defaults values... |
| 1394 | 1394 | if (!isset($globalAircraftImageSources)) { |
| 1395 | - $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters'); |
|
| 1396 | - $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources)); |
|
| 1395 | + $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters'); |
|
| 1396 | + $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources)); |
|
| 1397 | 1397 | } |
| 1398 | 1398 | |
| 1399 | 1399 | if (!isset($globalSchedulesSources)) { |
| 1400 | - $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware'); |
|
| 1401 | - $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources)); |
|
| 1402 | - } |
|
| 1400 | + $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware'); |
|
| 1401 | + $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources)); |
|
| 1402 | + } |
|
| 1403 | 1403 | |
| 1404 | 1404 | $settings = array_merge($settings,array('globalInstalled' => 'TRUE')); |
| 1405 | 1405 | |
@@ -1446,21 +1446,21 @@ discard block |
||
| 1446 | 1446 | $popi = false; |
| 1447 | 1447 | $popw = false; |
| 1448 | 1448 | foreach ($_SESSION['done'] as $done) { |
| 1449 | - print '<li>'.$done.'....<strong>SUCCESS</strong></li>'; |
|
| 1450 | - if ($done == 'Create database') $pop = true; |
|
| 1451 | - if ($_SESSION['install'] == 'database_create') $pop = true; |
|
| 1452 | - if ($_SESSION['install'] == 'database_import') $popi = true; |
|
| 1453 | - if ($_SESSION['install'] == 'waypoints') $popw = true; |
|
| 1449 | + print '<li>'.$done.'....<strong>SUCCESS</strong></li>'; |
|
| 1450 | + if ($done == 'Create database') $pop = true; |
|
| 1451 | + if ($_SESSION['install'] == 'database_create') $pop = true; |
|
| 1452 | + if ($_SESSION['install'] == 'database_import') $popi = true; |
|
| 1453 | + if ($_SESSION['install'] == 'waypoints') $popw = true; |
|
| 1454 | 1454 | } |
| 1455 | 1455 | if ($pop) { |
| 1456 | - sleep(5); |
|
| 1457 | - print '<li>Create database....<img src="../images/loading.gif" /></li>'; |
|
| 1456 | + sleep(5); |
|
| 1457 | + print '<li>Create database....<img src="../images/loading.gif" /></li>'; |
|
| 1458 | 1458 | } else if ($popi) { |
| 1459 | - sleep(5); |
|
| 1460 | - print '<li>Create and import tables....<img src="../images/loading.gif" /></li>'; |
|
| 1459 | + sleep(5); |
|
| 1460 | + print '<li>Create and import tables....<img src="../images/loading.gif" /></li>'; |
|
| 1461 | 1461 | } else if ($popw) { |
| 1462 | - sleep(5); |
|
| 1463 | - print '<li>Populate waypoints database....<img src="../images/loading.gif" /></li>'; |
|
| 1462 | + sleep(5); |
|
| 1463 | + print '<li>Populate waypoints database....<img src="../images/loading.gif" /></li>'; |
|
| 1464 | 1464 | } else print '<li>Update schema if needed....<img src="../images/loading.gif" /></li>'; |
| 1465 | 1465 | print '</div></ul>'; |
| 1466 | 1466 | print '<div id="error"></div>'; |
@@ -1523,7 +1523,7 @@ discard block |
||
| 1523 | 1523 | unset($_COOKIE['install']); |
| 1524 | 1524 | print '<div class="info column"><ul>'; |
| 1525 | 1525 | foreach ($_SESSION['done'] as $done) { |
| 1526 | - print '<li>'.$done.'....<strong>SUCCESS</strong></li>'; |
|
| 1526 | + print '<li>'.$done.'....<strong>SUCCESS</strong></li>'; |
|
| 1527 | 1527 | } |
| 1528 | 1528 | print '<li>Reloading page to check all is now ok....<strong>SUCCESS</strong></li>'; |
| 1529 | 1529 | 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 | } |
@@ -452,13 +452,13 @@ discard block |
||
| 452 | 452 | ?> |
| 453 | 453 | <tr> |
| 454 | 454 | <?php |
| 455 | - if (filter_var($source['host'],FILTER_VALIDATE_URL)) { |
|
| 455 | + if (filter_var($source['host'], FILTER_VALIDATE_URL)) { |
|
| 456 | 456 | ?> |
| 457 | 457 | <td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td> |
| 458 | 458 | <td><input type="text" name="port[]" class="col-xs-2" id="port" value="<?php if (isset($source['port'])) print $source['port']; ?>" /></td> |
| 459 | 459 | <?php |
| 460 | 460 | } else { |
| 461 | - $hostport = explode(':',$source['host']); |
|
| 461 | + $hostport = explode(':', $source['host']); |
|
| 462 | 462 | if (isset($hostport[1])) { |
| 463 | 463 | $host = $hostport[0]; |
| 464 | 464 | $port = $hostport[1]; |
@@ -504,7 +504,7 @@ discard block |
||
| 504 | 504 | <select name="timezones[]" id="timezones"> |
| 505 | 505 | <?php |
| 506 | 506 | $timezonelist = DateTimeZone::listIdentifiers(DateTimeZone::ALL); |
| 507 | - foreach($timezonelist as $timezones){ |
|
| 507 | + foreach ($timezonelist as $timezones) { |
|
| 508 | 508 | if (isset($source['timezone']) && $source['timezone'] == $timezones) { |
| 509 | 509 | print '<option selected>'.$timezones.'</option>'; |
| 510 | 510 | } elseif (!isset($source['timezone']) && $timezones == 'UTC') { |
@@ -555,7 +555,7 @@ discard block |
||
| 555 | 555 | <select name="timezones[]" id="timezones"> |
| 556 | 556 | <?php |
| 557 | 557 | $timezonelist = DateTimeZone::listIdentifiers(DateTimeZone::ALL); |
| 558 | - foreach($timezonelist as $timezones){ |
|
| 558 | + foreach ($timezonelist as $timezones) { |
|
| 559 | 559 | if ($timezones == 'UTC') { |
| 560 | 560 | print '<option selected>'.$timezones.'</option>'; |
| 561 | 561 | } else print '<option>'.$timezones.'</option>'; |
@@ -870,7 +870,7 @@ discard block |
||
| 870 | 870 | <br /> |
| 871 | 871 | <p> |
| 872 | 872 | <label for="aircraftsize">Size of aircraft icon on map (default to 30px if zoom > 7 else 15px), empty to default</label> |
| 873 | - <input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize;?>" /> |
|
| 873 | + <input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize; ?>" /> |
|
| 874 | 874 | </p> |
| 875 | 875 | <br /> |
| 876 | 876 | <p> |
@@ -926,14 +926,14 @@ discard block |
||
| 926 | 926 | $error = ''; |
| 927 | 927 | |
| 928 | 928 | if (isset($_POST['dbtype'])) { |
| 929 | - $dbtype = filter_input(INPUT_POST,'dbtype',FILTER_SANITIZE_STRING); |
|
| 930 | - $dbroot = filter_input(INPUT_POST,'dbroot',FILTER_SANITIZE_STRING); |
|
| 931 | - $dbrootpass = filter_input(INPUT_POST,'dbrootpass',FILTER_SANITIZE_STRING); |
|
| 932 | - $dbname = filter_input(INPUT_POST,'dbname',FILTER_SANITIZE_STRING); |
|
| 933 | - $dbuser = filter_input(INPUT_POST,'dbuser',FILTER_SANITIZE_STRING); |
|
| 934 | - $dbuserpass = filter_input(INPUT_POST,'dbuserpass',FILTER_SANITIZE_STRING); |
|
| 935 | - $dbhost = filter_input(INPUT_POST,'dbhost',FILTER_SANITIZE_STRING); |
|
| 936 | - $dbport = filter_input(INPUT_POST,'dbport',FILTER_SANITIZE_STRING); |
|
| 929 | + $dbtype = filter_input(INPUT_POST, 'dbtype', FILTER_SANITIZE_STRING); |
|
| 930 | + $dbroot = filter_input(INPUT_POST, 'dbroot', FILTER_SANITIZE_STRING); |
|
| 931 | + $dbrootpass = filter_input(INPUT_POST, 'dbrootpass', FILTER_SANITIZE_STRING); |
|
| 932 | + $dbname = filter_input(INPUT_POST, 'dbname', FILTER_SANITIZE_STRING); |
|
| 933 | + $dbuser = filter_input(INPUT_POST, 'dbuser', FILTER_SANITIZE_STRING); |
|
| 934 | + $dbuserpass = filter_input(INPUT_POST, 'dbuserpass', FILTER_SANITIZE_STRING); |
|
| 935 | + $dbhost = filter_input(INPUT_POST, 'dbhost', FILTER_SANITIZE_STRING); |
|
| 936 | + $dbport = filter_input(INPUT_POST, 'dbport', FILTER_SANITIZE_STRING); |
|
| 937 | 937 | |
| 938 | 938 | if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) $error .= 'Mysql driver for PDO must be loaded'; |
| 939 | 939 | if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) $error .= 'PosgreSQL driver for PDO must be loaded'; |
@@ -953,49 +953,49 @@ discard block |
||
| 953 | 953 | } else $settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname)); |
| 954 | 954 | */ |
| 955 | 955 | |
| 956 | - $settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname)); |
|
| 956 | + $settings = array_merge($settings, array('globalDBdriver' => $dbtype, 'globalDBhost' => $dbhost, 'globalDBuser' => $dbuser, 'globalDBport' => $dbport, 'globalDBpass' => $dbuserpass, 'globalDBname' => $dbname)); |
|
| 957 | 957 | |
| 958 | - $sitename = filter_input(INPUT_POST,'sitename',FILTER_SANITIZE_STRING); |
|
| 959 | - $siteurl = filter_input(INPUT_POST,'siteurl',FILTER_SANITIZE_STRING); |
|
| 960 | - $timezone = filter_input(INPUT_POST,'timezone',FILTER_SANITIZE_STRING); |
|
| 961 | - $language = filter_input(INPUT_POST,'language',FILTER_SANITIZE_STRING); |
|
| 962 | - $settings = array_merge($settings,array('globalName' => $sitename,'globalURL' => $siteurl, 'globalTimezone' => $timezone,'globalLanguage' => $language)); |
|
| 958 | + $sitename = filter_input(INPUT_POST, 'sitename', FILTER_SANITIZE_STRING); |
|
| 959 | + $siteurl = filter_input(INPUT_POST, 'siteurl', FILTER_SANITIZE_STRING); |
|
| 960 | + $timezone = filter_input(INPUT_POST, 'timezone', FILTER_SANITIZE_STRING); |
|
| 961 | + $language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_STRING); |
|
| 962 | + $settings = array_merge($settings, array('globalName' => $sitename, 'globalURL' => $siteurl, 'globalTimezone' => $timezone, 'globalLanguage' => $language)); |
|
| 963 | 963 | |
| 964 | - $mapprovider = filter_input(INPUT_POST,'mapprovider',FILTER_SANITIZE_STRING); |
|
| 965 | - $mapboxid = filter_input(INPUT_POST,'mapboxid',FILTER_SANITIZE_STRING); |
|
| 966 | - $mapboxtoken = filter_input(INPUT_POST,'mapboxtoken',FILTER_SANITIZE_STRING); |
|
| 967 | - $googlekey = filter_input(INPUT_POST,'googlekey',FILTER_SANITIZE_STRING); |
|
| 968 | - $bingkey = filter_input(INPUT_POST,'bingkey',FILTER_SANITIZE_STRING); |
|
| 969 | - $openweathermapkey = filter_input(INPUT_POST,'openweathermapkey',FILTER_SANITIZE_STRING); |
|
| 970 | - $mapquestkey = filter_input(INPUT_POST,'mapquestkey',FILTER_SANITIZE_STRING); |
|
| 971 | - $hereappid = filter_input(INPUT_POST,'hereappid',FILTER_SANITIZE_STRING); |
|
| 972 | - $hereappcode = filter_input(INPUT_POST,'hereappcode',FILTER_SANITIZE_STRING); |
|
| 973 | - $settings = array_merge($settings,array('globalMapProvider' => $mapprovider,'globalMapboxId' => $mapboxid,'globalMapboxToken' => $mapboxtoken,'globalGoogleAPIKey' => $googlekey,'globalBingMapKey' => $bingkey,'globalHereappID' => $hereappid,'globalHereappCode' => $hereappcode,'globalMapQuestKey' => $mapquestkey,'globalOpenWeatherMapKey' => $openweathermapkey)); |
|
| 964 | + $mapprovider = filter_input(INPUT_POST, 'mapprovider', FILTER_SANITIZE_STRING); |
|
| 965 | + $mapboxid = filter_input(INPUT_POST, 'mapboxid', FILTER_SANITIZE_STRING); |
|
| 966 | + $mapboxtoken = filter_input(INPUT_POST, 'mapboxtoken', FILTER_SANITIZE_STRING); |
|
| 967 | + $googlekey = filter_input(INPUT_POST, 'googlekey', FILTER_SANITIZE_STRING); |
|
| 968 | + $bingkey = filter_input(INPUT_POST, 'bingkey', FILTER_SANITIZE_STRING); |
|
| 969 | + $openweathermapkey = filter_input(INPUT_POST, 'openweathermapkey', FILTER_SANITIZE_STRING); |
|
| 970 | + $mapquestkey = filter_input(INPUT_POST, 'mapquestkey', FILTER_SANITIZE_STRING); |
|
| 971 | + $hereappid = filter_input(INPUT_POST, 'hereappid', FILTER_SANITIZE_STRING); |
|
| 972 | + $hereappcode = filter_input(INPUT_POST, 'hereappcode', FILTER_SANITIZE_STRING); |
|
| 973 | + $settings = array_merge($settings, array('globalMapProvider' => $mapprovider, 'globalMapboxId' => $mapboxid, 'globalMapboxToken' => $mapboxtoken, 'globalGoogleAPIKey' => $googlekey, 'globalBingMapKey' => $bingkey, 'globalHereappID' => $hereappid, 'globalHereappCode' => $hereappcode, 'globalMapQuestKey' => $mapquestkey, 'globalOpenWeatherMapKey' => $openweathermapkey)); |
|
| 974 | 974 | |
| 975 | - $latitudemax = filter_input(INPUT_POST,'latitudemax',FILTER_SANITIZE_STRING); |
|
| 976 | - $latitudemin = filter_input(INPUT_POST,'latitudemin',FILTER_SANITIZE_STRING); |
|
| 977 | - $longitudemax = filter_input(INPUT_POST,'longitudemax',FILTER_SANITIZE_STRING); |
|
| 978 | - $longitudemin = filter_input(INPUT_POST,'longitudemin',FILTER_SANITIZE_STRING); |
|
| 979 | - $livezoom = filter_input(INPUT_POST,'livezoom',FILTER_SANITIZE_NUMBER_INT); |
|
| 980 | - $settings = array_merge($settings,array('globalLatitudeMax' => $latitudemax,'globalLatitudeMin' => $latitudemin,'globalLongitudeMax' => $longitudemax,'globalLongitudeMin' => $longitudemin,'globalLiveZoom' => $livezoom)); |
|
| 975 | + $latitudemax = filter_input(INPUT_POST, 'latitudemax', FILTER_SANITIZE_STRING); |
|
| 976 | + $latitudemin = filter_input(INPUT_POST, 'latitudemin', FILTER_SANITIZE_STRING); |
|
| 977 | + $longitudemax = filter_input(INPUT_POST, 'longitudemax', FILTER_SANITIZE_STRING); |
|
| 978 | + $longitudemin = filter_input(INPUT_POST, 'longitudemin', FILTER_SANITIZE_STRING); |
|
| 979 | + $livezoom = filter_input(INPUT_POST, 'livezoom', FILTER_SANITIZE_NUMBER_INT); |
|
| 980 | + $settings = array_merge($settings, array('globalLatitudeMax' => $latitudemax, 'globalLatitudeMin' => $latitudemin, 'globalLongitudeMax' => $longitudemax, 'globalLongitudeMin' => $longitudemin, 'globalLiveZoom' => $livezoom)); |
|
| 981 | 981 | |
| 982 | - $squawk_country = filter_input(INPUT_POST,'squawk_country',FILTER_SANITIZE_STRING); |
|
| 983 | - $settings = array_merge($settings,array('globalSquawkCountry' => $squawk_country)); |
|
| 982 | + $squawk_country = filter_input(INPUT_POST, 'squawk_country', FILTER_SANITIZE_STRING); |
|
| 983 | + $settings = array_merge($settings, array('globalSquawkCountry' => $squawk_country)); |
|
| 984 | 984 | |
| 985 | - $latitudecenter = filter_input(INPUT_POST,'latitudecenter',FILTER_SANITIZE_STRING); |
|
| 986 | - $longitudecenter = filter_input(INPUT_POST,'longitudecenter',FILTER_SANITIZE_STRING); |
|
| 987 | - $settings = array_merge($settings,array('globalCenterLatitude' => $latitudecenter,'globalCenterLongitude' => $longitudecenter)); |
|
| 985 | + $latitudecenter = filter_input(INPUT_POST, 'latitudecenter', FILTER_SANITIZE_STRING); |
|
| 986 | + $longitudecenter = filter_input(INPUT_POST, 'longitudecenter', FILTER_SANITIZE_STRING); |
|
| 987 | + $settings = array_merge($settings, array('globalCenterLatitude' => $latitudecenter, 'globalCenterLongitude' => $longitudecenter)); |
|
| 988 | 988 | |
| 989 | - $acars = filter_input(INPUT_POST,'acars',FILTER_SANITIZE_STRING); |
|
| 989 | + $acars = filter_input(INPUT_POST, 'acars', FILTER_SANITIZE_STRING); |
|
| 990 | 990 | if ($acars == 'acars') { |
| 991 | - $settings = array_merge($settings,array('globalACARS' => 'TRUE')); |
|
| 991 | + $settings = array_merge($settings, array('globalACARS' => 'TRUE')); |
|
| 992 | 992 | } else { |
| 993 | - $settings = array_merge($settings,array('globalACARS' => 'FALSE')); |
|
| 993 | + $settings = array_merge($settings, array('globalACARS' => 'FALSE')); |
|
| 994 | 994 | } |
| 995 | 995 | |
| 996 | - $flightawareusername = filter_input(INPUT_POST,'flightawareusername',FILTER_SANITIZE_STRING); |
|
| 997 | - $flightawarepassword = filter_input(INPUT_POST,'flightawarepassword',FILTER_SANITIZE_STRING); |
|
| 998 | - $settings = array_merge($settings,array('globalFlightAwareUsername' => $flightawareusername,'globalFlightAwarePassword' => $flightawarepassword)); |
|
| 996 | + $flightawareusername = filter_input(INPUT_POST, 'flightawareusername', FILTER_SANITIZE_STRING); |
|
| 997 | + $flightawarepassword = filter_input(INPUT_POST, 'flightawarepassword', FILTER_SANITIZE_STRING); |
|
| 998 | + $settings = array_merge($settings, array('globalFlightAwareUsername' => $flightawareusername, 'globalFlightAwarePassword' => $flightawarepassword)); |
|
| 999 | 999 | |
| 1000 | 1000 | $source_name = $_POST['source_name']; |
| 1001 | 1001 | $source_latitude = $_POST['source_latitude']; |
@@ -1009,8 +1009,8 @@ discard block |
||
| 1009 | 1009 | |
| 1010 | 1010 | $sources = array(); |
| 1011 | 1011 | foreach ($source_name as $keys => $name) { |
| 1012 | - 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]); |
|
| 1013 | - 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]); |
|
| 1012 | + 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]); |
|
| 1013 | + 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]); |
|
| 1014 | 1014 | } |
| 1015 | 1015 | if (count($sources) > 0) $_SESSION['sources'] = $sources; |
| 1016 | 1016 | |
@@ -1023,24 +1023,24 @@ discard block |
||
| 1023 | 1023 | $sbsurl = $_POST['sbsurl']; |
| 1024 | 1024 | */ |
| 1025 | 1025 | |
| 1026 | - $globalvatsim = filter_input(INPUT_POST,'globalvatsim',FILTER_SANITIZE_STRING); |
|
| 1027 | - $globalva = filter_input(INPUT_POST,'globalva',FILTER_SANITIZE_STRING); |
|
| 1028 | - $globalivao = filter_input(INPUT_POST,'globalivao',FILTER_SANITIZE_STRING); |
|
| 1029 | - $globalphpvms = filter_input(INPUT_POST,'globalphpvms',FILTER_SANITIZE_STRING); |
|
| 1030 | - $globalvam = filter_input(INPUT_POST,'globalvam',FILTER_SANITIZE_STRING); |
|
| 1031 | - $globalsbs = filter_input(INPUT_POST,'globalsbs',FILTER_SANITIZE_STRING); |
|
| 1032 | - $globalaprs = filter_input(INPUT_POST,'globalaprs',FILTER_SANITIZE_STRING); |
|
| 1033 | - $datasource = filter_input(INPUT_POST,'datasource',FILTER_SANITIZE_STRING); |
|
| 1026 | + $globalvatsim = filter_input(INPUT_POST, 'globalvatsim', FILTER_SANITIZE_STRING); |
|
| 1027 | + $globalva = filter_input(INPUT_POST, 'globalva', FILTER_SANITIZE_STRING); |
|
| 1028 | + $globalivao = filter_input(INPUT_POST, 'globalivao', FILTER_SANITIZE_STRING); |
|
| 1029 | + $globalphpvms = filter_input(INPUT_POST, 'globalphpvms', FILTER_SANITIZE_STRING); |
|
| 1030 | + $globalvam = filter_input(INPUT_POST, 'globalvam', FILTER_SANITIZE_STRING); |
|
| 1031 | + $globalsbs = filter_input(INPUT_POST, 'globalsbs', FILTER_SANITIZE_STRING); |
|
| 1032 | + $globalaprs = filter_input(INPUT_POST, 'globalaprs', FILTER_SANITIZE_STRING); |
|
| 1033 | + $datasource = filter_input(INPUT_POST, 'datasource', FILTER_SANITIZE_STRING); |
|
| 1034 | 1034 | |
| 1035 | - $globalaircraft = filter_input(INPUT_POST,'globalaircraft',FILTER_SANITIZE_STRING); |
|
| 1036 | - if ($globalaircraft == 'aircraft') $settings = array_merge($settings,array('globalAircraft' => 'TRUE')); |
|
| 1037 | - else $settings = array_merge($settings,array('globalAircraft' => 'FALSE')); |
|
| 1038 | - $globaltracker = filter_input(INPUT_POST,'globaltracker',FILTER_SANITIZE_STRING); |
|
| 1039 | - if ($globaltracker == 'tracker') $settings = array_merge($settings,array('globalTracker' => 'TRUE')); |
|
| 1040 | - else $settings = array_merge($settings,array('globalTracker' => 'FALSE')); |
|
| 1041 | - $globalmarine = filter_input(INPUT_POST,'globalmarine',FILTER_SANITIZE_STRING); |
|
| 1042 | - if ($globalmarine == 'marine') $settings = array_merge($settings,array('globalMarine' => 'TRUE')); |
|
| 1043 | - else $settings = array_merge($settings,array('globalMarine' => 'FALSE')); |
|
| 1035 | + $globalaircraft = filter_input(INPUT_POST, 'globalaircraft', FILTER_SANITIZE_STRING); |
|
| 1036 | + if ($globalaircraft == 'aircraft') $settings = array_merge($settings, array('globalAircraft' => 'TRUE')); |
|
| 1037 | + else $settings = array_merge($settings, array('globalAircraft' => 'FALSE')); |
|
| 1038 | + $globaltracker = filter_input(INPUT_POST, 'globaltracker', FILTER_SANITIZE_STRING); |
|
| 1039 | + if ($globaltracker == 'tracker') $settings = array_merge($settings, array('globalTracker' => 'TRUE')); |
|
| 1040 | + else $settings = array_merge($settings, array('globalTracker' => 'FALSE')); |
|
| 1041 | + $globalmarine = filter_input(INPUT_POST, 'globalmarine', FILTER_SANITIZE_STRING); |
|
| 1042 | + if ($globalmarine == 'marine') $settings = array_merge($settings, array('globalMarine' => 'TRUE')); |
|
| 1043 | + else $settings = array_merge($settings, array('globalMarine' => 'FALSE')); |
|
| 1044 | 1044 | |
| 1045 | 1045 | /* |
| 1046 | 1046 | $globalSBS1Hosts = array(); |
@@ -1056,7 +1056,7 @@ discard block |
||
| 1056 | 1056 | } |
| 1057 | 1057 | $settings = array_merge($settings,array('globalSBS1Hosts' => $globalSBS1Hosts)); |
| 1058 | 1058 | */ |
| 1059 | - $settings_comment = array_merge($settings_comment,array('globalSBS1Hosts')); |
|
| 1059 | + $settings_comment = array_merge($settings_comment, array('globalSBS1Hosts')); |
|
| 1060 | 1060 | $host = $_POST['host']; |
| 1061 | 1061 | $port = $_POST['port']; |
| 1062 | 1062 | $name = $_POST['name']; |
@@ -1073,104 +1073,104 @@ discard block |
||
| 1073 | 1073 | else $cov = 'FALSE'; |
| 1074 | 1074 | if (isset($noarchive[$key]) && $noarchive[$key] == 1) $arch = 'TRUE'; |
| 1075 | 1075 | else $arch = 'FALSE'; |
| 1076 | - if (strpos($format[$key],'_callback')) { |
|
| 1077 | - $gSources[] = array('host' => $h, 'pass' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'TRUE'); |
|
| 1076 | + if (strpos($format[$key], '_callback')) { |
|
| 1077 | + $gSources[] = array('host' => $h, 'pass' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov, 'noarchive' => $arch, 'timezone' => $timezones[$key], 'callback' => 'TRUE'); |
|
| 1078 | 1078 | } elseif ($h != '' || $name[$key] != '') { |
| 1079 | - $gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'FALSE'); |
|
| 1079 | + $gSources[] = array('host' => $h, 'port' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov, 'noarchive' => $arch, 'timezone' => $timezones[$key], 'callback' => 'FALSE'); |
|
| 1080 | 1080 | } |
| 1081 | 1081 | if ($format[$key] == 'airwhere') $forcepilots = true; |
| 1082 | 1082 | } |
| 1083 | - $settings = array_merge($settings,array('globalSources' => $gSources)); |
|
| 1083 | + $settings = array_merge($settings, array('globalSources' => $gSources)); |
|
| 1084 | 1084 | |
| 1085 | 1085 | /* |
| 1086 | 1086 | $sbstimeout = filter_input(INPUT_POST,'sbstimeout',FILTER_SANITIZE_NUMBER_INT); |
| 1087 | 1087 | $settings = array_merge($settings,array('globalSourcesTimeOut' => $sbstimeout)); |
| 1088 | 1088 | */ |
| 1089 | - $acarshost = filter_input(INPUT_POST,'acarshost',FILTER_SANITIZE_STRING); |
|
| 1090 | - $acarsport = filter_input(INPUT_POST,'acarsport',FILTER_SANITIZE_NUMBER_INT); |
|
| 1091 | - $settings = array_merge($settings,array('globalACARSHost' => $acarshost,'globalACARSPort' => $acarsport)); |
|
| 1089 | + $acarshost = filter_input(INPUT_POST, 'acarshost', FILTER_SANITIZE_STRING); |
|
| 1090 | + $acarsport = filter_input(INPUT_POST, 'acarsport', FILTER_SANITIZE_NUMBER_INT); |
|
| 1091 | + $settings = array_merge($settings, array('globalACARSHost' => $acarshost, 'globalACARSPort' => $acarsport)); |
|
| 1092 | 1092 | |
| 1093 | - $bitly = filter_input(INPUT_POST,'bitly',FILTER_SANITIZE_STRING); |
|
| 1094 | - $settings = array_merge($settings,array('globalBitlyAccessToken' => $bitly)); |
|
| 1093 | + $bitly = filter_input(INPUT_POST, 'bitly', FILTER_SANITIZE_STRING); |
|
| 1094 | + $settings = array_merge($settings, array('globalBitlyAccessToken' => $bitly)); |
|
| 1095 | 1095 | |
| 1096 | - $customcss = filter_input(INPUT_POST,'customcss',FILTER_SANITIZE_STRING); |
|
| 1097 | - $settings = array_merge($settings,array('globalCustomCSS' => $customcss)); |
|
| 1096 | + $customcss = filter_input(INPUT_POST, 'customcss', FILTER_SANITIZE_STRING); |
|
| 1097 | + $settings = array_merge($settings, array('globalCustomCSS' => $customcss)); |
|
| 1098 | 1098 | |
| 1099 | - $notamsource = filter_input(INPUT_POST,'notamsource',FILTER_SANITIZE_STRING); |
|
| 1100 | - $settings = array_merge($settings,array('globalNOTAMSource' => $notamsource)); |
|
| 1101 | - $metarsource = filter_input(INPUT_POST,'metarsource',FILTER_SANITIZE_STRING); |
|
| 1102 | - $settings = array_merge($settings,array('globalMETARurl' => $metarsource)); |
|
| 1099 | + $notamsource = filter_input(INPUT_POST, 'notamsource', FILTER_SANITIZE_STRING); |
|
| 1100 | + $settings = array_merge($settings, array('globalNOTAMSource' => $notamsource)); |
|
| 1101 | + $metarsource = filter_input(INPUT_POST, 'metarsource', FILTER_SANITIZE_STRING); |
|
| 1102 | + $settings = array_merge($settings, array('globalMETARurl' => $metarsource)); |
|
| 1103 | 1103 | |
| 1104 | - $zoilatitude = filter_input(INPUT_POST,'zoilatitude',FILTER_SANITIZE_STRING); |
|
| 1105 | - $zoilongitude = filter_input(INPUT_POST,'zoilongitude',FILTER_SANITIZE_STRING); |
|
| 1106 | - $zoidistance = filter_input(INPUT_POST,'zoidistance',FILTER_SANITIZE_NUMBER_INT); |
|
| 1104 | + $zoilatitude = filter_input(INPUT_POST, 'zoilatitude', FILTER_SANITIZE_STRING); |
|
| 1105 | + $zoilongitude = filter_input(INPUT_POST, 'zoilongitude', FILTER_SANITIZE_STRING); |
|
| 1106 | + $zoidistance = filter_input(INPUT_POST, 'zoidistance', FILTER_SANITIZE_NUMBER_INT); |
|
| 1107 | 1107 | if ($zoilatitude != '' && $zoilongitude != '' && $zoidistance != '') { |
| 1108 | - $settings = array_merge($settings,array('globalDistanceIgnore' => array('latitude' => $zoilatitude,'longitude' => $zoilongitude,'distance' => $zoidistance))); |
|
| 1109 | - } else $settings = array_merge($settings,array('globalDistanceIgnore' => array())); |
|
| 1108 | + $settings = array_merge($settings, array('globalDistanceIgnore' => array('latitude' => $zoilatitude, 'longitude' => $zoilongitude, 'distance' => $zoidistance))); |
|
| 1109 | + } else $settings = array_merge($settings, array('globalDistanceIgnore' => array())); |
|
| 1110 | 1110 | |
| 1111 | - $refresh = filter_input(INPUT_POST,'refresh',FILTER_SANITIZE_NUMBER_INT); |
|
| 1112 | - $settings = array_merge($settings,array('globalLiveInterval' => $refresh)); |
|
| 1113 | - $maprefresh = filter_input(INPUT_POST,'maprefresh',FILTER_SANITIZE_NUMBER_INT); |
|
| 1114 | - $settings = array_merge($settings,array('globalMapRefresh' => $maprefresh)); |
|
| 1115 | - $mapidle = filter_input(INPUT_POST,'mapidle',FILTER_SANITIZE_NUMBER_INT); |
|
| 1116 | - $settings = array_merge($settings,array('globalMapIdleTimeout' => $mapidle)); |
|
| 1117 | - $closestmindist = filter_input(INPUT_POST,'closestmindist',FILTER_SANITIZE_NUMBER_INT); |
|
| 1118 | - $settings = array_merge($settings,array('globalClosestMinDist' => $closestmindist)); |
|
| 1111 | + $refresh = filter_input(INPUT_POST, 'refresh', FILTER_SANITIZE_NUMBER_INT); |
|
| 1112 | + $settings = array_merge($settings, array('globalLiveInterval' => $refresh)); |
|
| 1113 | + $maprefresh = filter_input(INPUT_POST, 'maprefresh', FILTER_SANITIZE_NUMBER_INT); |
|
| 1114 | + $settings = array_merge($settings, array('globalMapRefresh' => $maprefresh)); |
|
| 1115 | + $mapidle = filter_input(INPUT_POST, 'mapidle', FILTER_SANITIZE_NUMBER_INT); |
|
| 1116 | + $settings = array_merge($settings, array('globalMapIdleTimeout' => $mapidle)); |
|
| 1117 | + $closestmindist = filter_input(INPUT_POST, 'closestmindist', FILTER_SANITIZE_NUMBER_INT); |
|
| 1118 | + $settings = array_merge($settings, array('globalClosestMinDist' => $closestmindist)); |
|
| 1119 | 1119 | |
| 1120 | - $aircraftsize = filter_input(INPUT_POST,'aircraftsize',FILTER_SANITIZE_NUMBER_INT); |
|
| 1121 | - $settings = array_merge($settings,array('globalAircraftSize' => $aircraftsize)); |
|
| 1120 | + $aircraftsize = filter_input(INPUT_POST, 'aircraftsize', FILTER_SANITIZE_NUMBER_INT); |
|
| 1121 | + $settings = array_merge($settings, array('globalAircraftSize' => $aircraftsize)); |
|
| 1122 | 1122 | |
| 1123 | - $archivemonths = filter_input(INPUT_POST,'archivemonths',FILTER_SANITIZE_NUMBER_INT); |
|
| 1124 | - $settings = array_merge($settings,array('globalArchiveMonths' => $archivemonths)); |
|
| 1123 | + $archivemonths = filter_input(INPUT_POST, 'archivemonths', FILTER_SANITIZE_NUMBER_INT); |
|
| 1124 | + $settings = array_merge($settings, array('globalArchiveMonths' => $archivemonths)); |
|
| 1125 | 1125 | |
| 1126 | - $archiveyear = filter_input(INPUT_POST,'archiveyear',FILTER_SANITIZE_STRING); |
|
| 1126 | + $archiveyear = filter_input(INPUT_POST, 'archiveyear', FILTER_SANITIZE_STRING); |
|
| 1127 | 1127 | if ($archiveyear == "archiveyear") { |
| 1128 | - $settings = array_merge($settings,array('globalArchiveYear' => 'TRUE')); |
|
| 1128 | + $settings = array_merge($settings, array('globalArchiveYear' => 'TRUE')); |
|
| 1129 | 1129 | } else { |
| 1130 | - $settings = array_merge($settings,array('globalArchiveYear' => 'FALSE')); |
|
| 1130 | + $settings = array_merge($settings, array('globalArchiveYear' => 'FALSE')); |
|
| 1131 | 1131 | } |
| 1132 | - $archivekeepmonths = filter_input(INPUT_POST,'archivekeepmonths',FILTER_SANITIZE_NUMBER_INT); |
|
| 1133 | - $settings = array_merge($settings,array('globalArchiveKeepMonths' => $archivekeepmonths)); |
|
| 1134 | - $archivekeeptrackmonths = filter_input(INPUT_POST,'archivekeeptrackmonths',FILTER_SANITIZE_NUMBER_INT); |
|
| 1135 | - $settings = array_merge($settings,array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths)); |
|
| 1132 | + $archivekeepmonths = filter_input(INPUT_POST, 'archivekeepmonths', FILTER_SANITIZE_NUMBER_INT); |
|
| 1133 | + $settings = array_merge($settings, array('globalArchiveKeepMonths' => $archivekeepmonths)); |
|
| 1134 | + $archivekeeptrackmonths = filter_input(INPUT_POST, 'archivekeeptrackmonths', FILTER_SANITIZE_NUMBER_INT); |
|
| 1135 | + $settings = array_merge($settings, array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths)); |
|
| 1136 | 1136 | |
| 1137 | - $britishairways = filter_input(INPUT_POST,'britishairways',FILTER_SANITIZE_STRING); |
|
| 1138 | - $settings = array_merge($settings,array('globalBritishAirwaysKey' => $britishairways)); |
|
| 1139 | - $transavia = filter_input(INPUT_POST,'transavia',FILTER_SANITIZE_STRING); |
|
| 1140 | - $settings = array_merge($settings,array('globalTransaviaKey' => $transavia)); |
|
| 1137 | + $britishairways = filter_input(INPUT_POST, 'britishairways', FILTER_SANITIZE_STRING); |
|
| 1138 | + $settings = array_merge($settings, array('globalBritishAirwaysKey' => $britishairways)); |
|
| 1139 | + $transavia = filter_input(INPUT_POST, 'transavia', FILTER_SANITIZE_STRING); |
|
| 1140 | + $settings = array_merge($settings, array('globalTransaviaKey' => $transavia)); |
|
| 1141 | 1141 | |
| 1142 | - $lufthansakey = filter_input(INPUT_POST,'lufthansakey',FILTER_SANITIZE_STRING); |
|
| 1143 | - $lufthansasecret = filter_input(INPUT_POST,'lufthansasecret',FILTER_SANITIZE_STRING); |
|
| 1144 | - $settings = array_merge($settings,array('globalLufthansaKey' => array('key' => $lufthansakey,'secret' => $lufthansasecret))); |
|
| 1142 | + $lufthansakey = filter_input(INPUT_POST, 'lufthansakey', FILTER_SANITIZE_STRING); |
|
| 1143 | + $lufthansasecret = filter_input(INPUT_POST, 'lufthansasecret', FILTER_SANITIZE_STRING); |
|
| 1144 | + $settings = array_merge($settings, array('globalLufthansaKey' => array('key' => $lufthansakey, 'secret' => $lufthansasecret))); |
|
| 1145 | 1145 | |
| 1146 | 1146 | // Create in settings.php keys not yet configurable if not already here |
| 1147 | 1147 | //if (!isset($globalImageBingKey)) $settings = array_merge($settings,array('globalImageBingKey' => '')); |
| 1148 | - if (!isset($globalDebug)) $settings = array_merge($settings,array('globalDebug' => 'TRUE')); |
|
| 1148 | + if (!isset($globalDebug)) $settings = array_merge($settings, array('globalDebug' => 'TRUE')); |
|
| 1149 | 1149 | |
| 1150 | - $resetyearstats = filter_input(INPUT_POST,'resetyearstats',FILTER_SANITIZE_STRING); |
|
| 1150 | + $resetyearstats = filter_input(INPUT_POST, 'resetyearstats', FILTER_SANITIZE_STRING); |
|
| 1151 | 1151 | if ($resetyearstats == 'resetyearstats') { |
| 1152 | - $settings = array_merge($settings,array('globalDeleteLastYearStats' => 'TRUE')); |
|
| 1152 | + $settings = array_merge($settings, array('globalDeleteLastYearStats' => 'TRUE')); |
|
| 1153 | 1153 | } else { |
| 1154 | - $settings = array_merge($settings,array('globalDeleteLastYearStats' => 'FALSE')); |
|
| 1154 | + $settings = array_merge($settings, array('globalDeleteLastYearStats' => 'FALSE')); |
|
| 1155 | 1155 | } |
| 1156 | 1156 | |
| 1157 | - $archive = filter_input(INPUT_POST,'archive',FILTER_SANITIZE_STRING); |
|
| 1157 | + $archive = filter_input(INPUT_POST, 'archive', FILTER_SANITIZE_STRING); |
|
| 1158 | 1158 | if ($archive == 'archive') { |
| 1159 | - $settings = array_merge($settings,array('globalArchive' => 'TRUE')); |
|
| 1159 | + $settings = array_merge($settings, array('globalArchive' => 'TRUE')); |
|
| 1160 | 1160 | } else { |
| 1161 | - $settings = array_merge($settings,array('globalArchive' => 'FALSE')); |
|
| 1161 | + $settings = array_merge($settings, array('globalArchive' => 'FALSE')); |
|
| 1162 | 1162 | } |
| 1163 | - $daemon = filter_input(INPUT_POST,'daemon',FILTER_SANITIZE_STRING); |
|
| 1163 | + $daemon = filter_input(INPUT_POST, 'daemon', FILTER_SANITIZE_STRING); |
|
| 1164 | 1164 | if ($daemon == 'daemon') { |
| 1165 | - $settings = array_merge($settings,array('globalDaemon' => 'TRUE')); |
|
| 1165 | + $settings = array_merge($settings, array('globalDaemon' => 'TRUE')); |
|
| 1166 | 1166 | } else { |
| 1167 | - $settings = array_merge($settings,array('globalDaemon' => 'FALSE')); |
|
| 1167 | + $settings = array_merge($settings, array('globalDaemon' => 'FALSE')); |
|
| 1168 | 1168 | } |
| 1169 | - $schedules = filter_input(INPUT_POST,'schedules',FILTER_SANITIZE_STRING); |
|
| 1169 | + $schedules = filter_input(INPUT_POST, 'schedules', FILTER_SANITIZE_STRING); |
|
| 1170 | 1170 | if ($schedules == 'schedules') { |
| 1171 | - $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE')); |
|
| 1171 | + $settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE')); |
|
| 1172 | 1172 | } else { |
| 1173 | - $settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE')); |
|
| 1173 | + $settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE')); |
|
| 1174 | 1174 | } |
| 1175 | 1175 | |
| 1176 | 1176 | /* |
@@ -1181,227 +1181,227 @@ discard block |
||
| 1181 | 1181 | $settings = array_merge($settings,array('globalFlightAware' => 'FALSE','globalSBS1' => 'TRUE')); |
| 1182 | 1182 | } |
| 1183 | 1183 | */ |
| 1184 | - $settings = array_merge($settings,array('globalFlightAware' => 'FALSE')); |
|
| 1185 | - if ($globalsbs == 'sbs') $settings = array_merge($settings,array('globalSBS1' => 'TRUE')); |
|
| 1186 | - else $settings = array_merge($settings,array('globalSBS1' => 'FALSE')); |
|
| 1187 | - if ($globalaprs == 'aprs') $settings = array_merge($settings,array('globalAPRS' => 'TRUE')); |
|
| 1188 | - else $settings = array_merge($settings,array('globalAPRS' => 'FALSE')); |
|
| 1184 | + $settings = array_merge($settings, array('globalFlightAware' => 'FALSE')); |
|
| 1185 | + if ($globalsbs == 'sbs') $settings = array_merge($settings, array('globalSBS1' => 'TRUE')); |
|
| 1186 | + else $settings = array_merge($settings, array('globalSBS1' => 'FALSE')); |
|
| 1187 | + if ($globalaprs == 'aprs') $settings = array_merge($settings, array('globalAPRS' => 'TRUE')); |
|
| 1188 | + else $settings = array_merge($settings, array('globalAPRS' => 'FALSE')); |
|
| 1189 | 1189 | $va = false; |
| 1190 | 1190 | if ($globalivao == 'ivao') { |
| 1191 | - $settings = array_merge($settings,array('globalIVAO' => 'TRUE')); |
|
| 1191 | + $settings = array_merge($settings, array('globalIVAO' => 'TRUE')); |
|
| 1192 | 1192 | $va = true; |
| 1193 | - } else $settings = array_merge($settings,array('globalIVAO' => 'FALSE')); |
|
| 1193 | + } else $settings = array_merge($settings, array('globalIVAO' => 'FALSE')); |
|
| 1194 | 1194 | if ($globalvatsim == 'vatsim') { |
| 1195 | - $settings = array_merge($settings,array('globalVATSIM' => 'TRUE')); |
|
| 1195 | + $settings = array_merge($settings, array('globalVATSIM' => 'TRUE')); |
|
| 1196 | 1196 | $va = true; |
| 1197 | - } else $settings = array_merge($settings,array('globalVATSIM' => 'FALSE')); |
|
| 1197 | + } else $settings = array_merge($settings, array('globalVATSIM' => 'FALSE')); |
|
| 1198 | 1198 | if ($globalphpvms == 'phpvms') { |
| 1199 | - $settings = array_merge($settings,array('globalphpVMS' => 'TRUE')); |
|
| 1199 | + $settings = array_merge($settings, array('globalphpVMS' => 'TRUE')); |
|
| 1200 | 1200 | $va = true; |
| 1201 | - } else $settings = array_merge($settings,array('globalphpVMS' => 'FALSE')); |
|
| 1201 | + } else $settings = array_merge($settings, array('globalphpVMS' => 'FALSE')); |
|
| 1202 | 1202 | if ($globalvam == 'vam') { |
| 1203 | - $settings = array_merge($settings,array('globalVAM' => 'TRUE')); |
|
| 1203 | + $settings = array_merge($settings, array('globalVAM' => 'TRUE')); |
|
| 1204 | 1204 | $va = true; |
| 1205 | - } else $settings = array_merge($settings,array('globalVAM' => 'FALSE')); |
|
| 1205 | + } else $settings = array_merge($settings, array('globalVAM' => 'FALSE')); |
|
| 1206 | 1206 | if ($va) { |
| 1207 | - $settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE','globalTranslationFetch' => 'FALSE')); |
|
| 1208 | - } else $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE')); |
|
| 1207 | + $settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE', 'globalTranslationFetch' => 'FALSE')); |
|
| 1208 | + } else $settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE', 'globalTranslationFetch' => 'TRUE')); |
|
| 1209 | 1209 | if ($globalva == 'va' || $va) { |
| 1210 | - $settings = array_merge($settings,array('globalVA' => 'TRUE')); |
|
| 1211 | - $settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE')); |
|
| 1210 | + $settings = array_merge($settings, array('globalVA' => 'TRUE')); |
|
| 1211 | + $settings = array_merge($settings, array('globalUsePilot' => 'TRUE', 'globalUseOwner' => 'FALSE')); |
|
| 1212 | 1212 | } else { |
| 1213 | - $settings = array_merge($settings,array('globalVA' => 'FALSE')); |
|
| 1214 | - if ($forcepilots) $settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE')); |
|
| 1215 | - else $settings = array_merge($settings,array('globalUsePilot' => 'FALSE','globalUseOwner' => 'TRUE')); |
|
| 1213 | + $settings = array_merge($settings, array('globalVA' => 'FALSE')); |
|
| 1214 | + if ($forcepilots) $settings = array_merge($settings, array('globalUsePilot' => 'TRUE', 'globalUseOwner' => 'FALSE')); |
|
| 1215 | + else $settings = array_merge($settings, array('globalUsePilot' => 'FALSE', 'globalUseOwner' => 'TRUE')); |
|
| 1216 | 1216 | } |
| 1217 | 1217 | |
| 1218 | 1218 | |
| 1219 | 1219 | |
| 1220 | - $notam = filter_input(INPUT_POST,'notam',FILTER_SANITIZE_STRING); |
|
| 1220 | + $notam = filter_input(INPUT_POST, 'notam', FILTER_SANITIZE_STRING); |
|
| 1221 | 1221 | if ($notam == 'notam') { |
| 1222 | - $settings = array_merge($settings,array('globalNOTAM' => 'TRUE')); |
|
| 1222 | + $settings = array_merge($settings, array('globalNOTAM' => 'TRUE')); |
|
| 1223 | 1223 | } else { |
| 1224 | - $settings = array_merge($settings,array('globalNOTAM' => 'FALSE')); |
|
| 1224 | + $settings = array_merge($settings, array('globalNOTAM' => 'FALSE')); |
|
| 1225 | 1225 | } |
| 1226 | - $owner = filter_input(INPUT_POST,'owner',FILTER_SANITIZE_STRING); |
|
| 1226 | + $owner = filter_input(INPUT_POST, 'owner', FILTER_SANITIZE_STRING); |
|
| 1227 | 1227 | if ($owner == 'owner') { |
| 1228 | - $settings = array_merge($settings,array('globalOwner' => 'TRUE')); |
|
| 1228 | + $settings = array_merge($settings, array('globalOwner' => 'TRUE')); |
|
| 1229 | 1229 | } else { |
| 1230 | - $settings = array_merge($settings,array('globalOwner' => 'FALSE')); |
|
| 1230 | + $settings = array_merge($settings, array('globalOwner' => 'FALSE')); |
|
| 1231 | 1231 | } |
| 1232 | - $map3d = filter_input(INPUT_POST,'map3d',FILTER_SANITIZE_STRING); |
|
| 1232 | + $map3d = filter_input(INPUT_POST, 'map3d', FILTER_SANITIZE_STRING); |
|
| 1233 | 1233 | if ($map3d == 'map3d') { |
| 1234 | - $settings = array_merge($settings,array('globalMap3D' => 'TRUE')); |
|
| 1234 | + $settings = array_merge($settings, array('globalMap3D' => 'TRUE')); |
|
| 1235 | 1235 | } else { |
| 1236 | - $settings = array_merge($settings,array('globalMap3D' => 'FALSE')); |
|
| 1236 | + $settings = array_merge($settings, array('globalMap3D' => 'FALSE')); |
|
| 1237 | 1237 | } |
| 1238 | - $crash = filter_input(INPUT_POST,'crash',FILTER_SANITIZE_STRING); |
|
| 1238 | + $crash = filter_input(INPUT_POST, 'crash', FILTER_SANITIZE_STRING); |
|
| 1239 | 1239 | if ($crash == 'crash') { |
| 1240 | - $settings = array_merge($settings,array('globalAccidents' => 'TRUE')); |
|
| 1240 | + $settings = array_merge($settings, array('globalAccidents' => 'TRUE')); |
|
| 1241 | 1241 | } else { |
| 1242 | - $settings = array_merge($settings,array('globalAccidents' => 'FALSE')); |
|
| 1242 | + $settings = array_merge($settings, array('globalAccidents' => 'FALSE')); |
|
| 1243 | 1243 | } |
| 1244 | - $mapsatellites = filter_input(INPUT_POST,'mapsatellites',FILTER_SANITIZE_STRING); |
|
| 1244 | + $mapsatellites = filter_input(INPUT_POST, 'mapsatellites', FILTER_SANITIZE_STRING); |
|
| 1245 | 1245 | if ($mapsatellites == 'mapsatellites') { |
| 1246 | - $settings = array_merge($settings,array('globalMapSatellites' => 'TRUE')); |
|
| 1246 | + $settings = array_merge($settings, array('globalMapSatellites' => 'TRUE')); |
|
| 1247 | 1247 | } else { |
| 1248 | - $settings = array_merge($settings,array('globalMapSatellites' => 'FALSE')); |
|
| 1248 | + $settings = array_merge($settings, array('globalMapSatellites' => 'FALSE')); |
|
| 1249 | 1249 | } |
| 1250 | - $map3ddefault = filter_input(INPUT_POST,'map3ddefault',FILTER_SANITIZE_STRING); |
|
| 1250 | + $map3ddefault = filter_input(INPUT_POST, 'map3ddefault', FILTER_SANITIZE_STRING); |
|
| 1251 | 1251 | if ($map3ddefault == 'map3ddefault') { |
| 1252 | - $settings = array_merge($settings,array('globalMap3Ddefault' => 'TRUE')); |
|
| 1252 | + $settings = array_merge($settings, array('globalMap3Ddefault' => 'TRUE')); |
|
| 1253 | 1253 | } else { |
| 1254 | - $settings = array_merge($settings,array('globalMap3Ddefault' => 'FALSE')); |
|
| 1254 | + $settings = array_merge($settings, array('globalMap3Ddefault' => 'FALSE')); |
|
| 1255 | 1255 | } |
| 1256 | - $translate = filter_input(INPUT_POST,'translate',FILTER_SANITIZE_STRING); |
|
| 1256 | + $translate = filter_input(INPUT_POST, 'translate', FILTER_SANITIZE_STRING); |
|
| 1257 | 1257 | if ($translate == 'translate') { |
| 1258 | - $settings = array_merge($settings,array('globalTranslate' => 'TRUE')); |
|
| 1258 | + $settings = array_merge($settings, array('globalTranslate' => 'TRUE')); |
|
| 1259 | 1259 | } else { |
| 1260 | - $settings = array_merge($settings,array('globalTranslate' => 'FALSE')); |
|
| 1260 | + $settings = array_merge($settings, array('globalTranslate' => 'FALSE')); |
|
| 1261 | 1261 | } |
| 1262 | - $realairlines = filter_input(INPUT_POST,'realairlines',FILTER_SANITIZE_STRING); |
|
| 1262 | + $realairlines = filter_input(INPUT_POST, 'realairlines', FILTER_SANITIZE_STRING); |
|
| 1263 | 1263 | if ($realairlines == 'realairlines') { |
| 1264 | - $settings = array_merge($settings,array('globalUseRealAirlines' => 'TRUE')); |
|
| 1264 | + $settings = array_merge($settings, array('globalUseRealAirlines' => 'TRUE')); |
|
| 1265 | 1265 | } else { |
| 1266 | - $settings = array_merge($settings,array('globalUseRealAirlines' => 'FALSE')); |
|
| 1266 | + $settings = array_merge($settings, array('globalUseRealAirlines' => 'FALSE')); |
|
| 1267 | 1267 | } |
| 1268 | - $estimation = filter_input(INPUT_POST,'estimation',FILTER_SANITIZE_STRING); |
|
| 1268 | + $estimation = filter_input(INPUT_POST, 'estimation', FILTER_SANITIZE_STRING); |
|
| 1269 | 1269 | if ($estimation == 'estimation') { |
| 1270 | - $settings = array_merge($settings,array('globalMapEstimation' => 'TRUE')); |
|
| 1270 | + $settings = array_merge($settings, array('globalMapEstimation' => 'TRUE')); |
|
| 1271 | 1271 | } else { |
| 1272 | - $settings = array_merge($settings,array('globalMapEstimation' => 'FALSE')); |
|
| 1272 | + $settings = array_merge($settings, array('globalMapEstimation' => 'FALSE')); |
|
| 1273 | 1273 | } |
| 1274 | - $metar = filter_input(INPUT_POST,'metar',FILTER_SANITIZE_STRING); |
|
| 1274 | + $metar = filter_input(INPUT_POST, 'metar', FILTER_SANITIZE_STRING); |
|
| 1275 | 1275 | if ($metar == 'metar') { |
| 1276 | - $settings = array_merge($settings,array('globalMETAR' => 'TRUE')); |
|
| 1276 | + $settings = array_merge($settings, array('globalMETAR' => 'TRUE')); |
|
| 1277 | 1277 | } else { |
| 1278 | - $settings = array_merge($settings,array('globalMETAR' => 'FALSE')); |
|
| 1278 | + $settings = array_merge($settings, array('globalMETAR' => 'FALSE')); |
|
| 1279 | 1279 | } |
| 1280 | - $metarcycle = filter_input(INPUT_POST,'metarcycle',FILTER_SANITIZE_STRING); |
|
| 1280 | + $metarcycle = filter_input(INPUT_POST, 'metarcycle', FILTER_SANITIZE_STRING); |
|
| 1281 | 1281 | if ($metarcycle == 'metarcycle') { |
| 1282 | - $settings = array_merge($settings,array('globalMETARcycle' => 'TRUE')); |
|
| 1282 | + $settings = array_merge($settings, array('globalMETARcycle' => 'TRUE')); |
|
| 1283 | 1283 | } else { |
| 1284 | - $settings = array_merge($settings,array('globalMETARcycle' => 'FALSE')); |
|
| 1284 | + $settings = array_merge($settings, array('globalMETARcycle' => 'FALSE')); |
|
| 1285 | 1285 | } |
| 1286 | - $fork = filter_input(INPUT_POST,'fork',FILTER_SANITIZE_STRING); |
|
| 1286 | + $fork = filter_input(INPUT_POST, 'fork', FILTER_SANITIZE_STRING); |
|
| 1287 | 1287 | if ($fork == 'fork') { |
| 1288 | - $settings = array_merge($settings,array('globalFork' => 'TRUE')); |
|
| 1288 | + $settings = array_merge($settings, array('globalFork' => 'TRUE')); |
|
| 1289 | 1289 | } else { |
| 1290 | - $settings = array_merge($settings,array('globalFork' => 'FALSE')); |
|
| 1290 | + $settings = array_merge($settings, array('globalFork' => 'FALSE')); |
|
| 1291 | 1291 | } |
| 1292 | 1292 | |
| 1293 | - $colormap = filter_input(INPUT_POST,'colormap',FILTER_SANITIZE_STRING); |
|
| 1293 | + $colormap = filter_input(INPUT_POST, 'colormap', FILTER_SANITIZE_STRING); |
|
| 1294 | 1294 | if ($colormap == 'colormap') { |
| 1295 | - $settings = array_merge($settings,array('globalMapAltitudeColor' => 'TRUE')); |
|
| 1295 | + $settings = array_merge($settings, array('globalMapAltitudeColor' => 'TRUE')); |
|
| 1296 | 1296 | } else { |
| 1297 | - $settings = array_merge($settings,array('globalMapAltitudeColor' => 'FALSE')); |
|
| 1297 | + $settings = array_merge($settings, array('globalMapAltitudeColor' => 'FALSE')); |
|
| 1298 | 1298 | } |
| 1299 | 1299 | |
| 1300 | 1300 | if (isset($_POST['aircrafticoncolor'])) { |
| 1301 | - $aircrafticoncolor = filter_input(INPUT_POST,'aircrafticoncolor',FILTER_SANITIZE_STRING); |
|
| 1302 | - $settings = array_merge($settings,array('globalAircraftIconColor' => substr($aircrafticoncolor,1))); |
|
| 1301 | + $aircrafticoncolor = filter_input(INPUT_POST, 'aircrafticoncolor', FILTER_SANITIZE_STRING); |
|
| 1302 | + $settings = array_merge($settings, array('globalAircraftIconColor' => substr($aircrafticoncolor, 1))); |
|
| 1303 | 1303 | } |
| 1304 | 1304 | |
| 1305 | - $airportzoom = filter_input(INPUT_POST,'airportzoom',FILTER_SANITIZE_NUMBER_INT); |
|
| 1306 | - $settings = array_merge($settings,array('globalAirportZoom' => $airportzoom)); |
|
| 1305 | + $airportzoom = filter_input(INPUT_POST, 'airportzoom', FILTER_SANITIZE_NUMBER_INT); |
|
| 1306 | + $settings = array_merge($settings, array('globalAirportZoom' => $airportzoom)); |
|
| 1307 | 1307 | |
| 1308 | - $unitdistance = filter_input(INPUT_POST,'unitdistance',FILTER_SANITIZE_STRING); |
|
| 1309 | - $settings = array_merge($settings,array('globalUnitDistance' => $unitdistance)); |
|
| 1310 | - $unitaltitude = filter_input(INPUT_POST,'unitaltitude',FILTER_SANITIZE_STRING); |
|
| 1311 | - $settings = array_merge($settings,array('globalUnitAltitude' => $unitaltitude)); |
|
| 1312 | - $unitspeed = filter_input(INPUT_POST,'unitspeed',FILTER_SANITIZE_STRING); |
|
| 1313 | - $settings = array_merge($settings,array('globalUnitSpeed' => $unitspeed)); |
|
| 1308 | + $unitdistance = filter_input(INPUT_POST, 'unitdistance', FILTER_SANITIZE_STRING); |
|
| 1309 | + $settings = array_merge($settings, array('globalUnitDistance' => $unitdistance)); |
|
| 1310 | + $unitaltitude = filter_input(INPUT_POST, 'unitaltitude', FILTER_SANITIZE_STRING); |
|
| 1311 | + $settings = array_merge($settings, array('globalUnitAltitude' => $unitaltitude)); |
|
| 1312 | + $unitspeed = filter_input(INPUT_POST, 'unitspeed', FILTER_SANITIZE_STRING); |
|
| 1313 | + $settings = array_merge($settings, array('globalUnitSpeed' => $unitspeed)); |
|
| 1314 | 1314 | |
| 1315 | - $mappopup = filter_input(INPUT_POST,'mappopup',FILTER_SANITIZE_STRING); |
|
| 1315 | + $mappopup = filter_input(INPUT_POST, 'mappopup', FILTER_SANITIZE_STRING); |
|
| 1316 | 1316 | if ($mappopup == 'mappopup') { |
| 1317 | - $settings = array_merge($settings,array('globalMapPopup' => 'TRUE')); |
|
| 1317 | + $settings = array_merge($settings, array('globalMapPopup' => 'TRUE')); |
|
| 1318 | 1318 | } else { |
| 1319 | - $settings = array_merge($settings,array('globalMapPopup' => 'FALSE')); |
|
| 1319 | + $settings = array_merge($settings, array('globalMapPopup' => 'FALSE')); |
|
| 1320 | 1320 | } |
| 1321 | - $airportpopup = filter_input(INPUT_POST,'airportpopup',FILTER_SANITIZE_STRING); |
|
| 1321 | + $airportpopup = filter_input(INPUT_POST, 'airportpopup', FILTER_SANITIZE_STRING); |
|
| 1322 | 1322 | if ($airportpopup == 'airportpopup') { |
| 1323 | - $settings = array_merge($settings,array('globalAirportPopup' => 'TRUE')); |
|
| 1323 | + $settings = array_merge($settings, array('globalAirportPopup' => 'TRUE')); |
|
| 1324 | 1324 | } else { |
| 1325 | - $settings = array_merge($settings,array('globalAirportPopup' => 'FALSE')); |
|
| 1325 | + $settings = array_merge($settings, array('globalAirportPopup' => 'FALSE')); |
|
| 1326 | 1326 | } |
| 1327 | - $maphistory = filter_input(INPUT_POST,'maphistory',FILTER_SANITIZE_STRING); |
|
| 1327 | + $maphistory = filter_input(INPUT_POST, 'maphistory', FILTER_SANITIZE_STRING); |
|
| 1328 | 1328 | if ($maphistory == 'maphistory') { |
| 1329 | - $settings = array_merge($settings,array('globalMapHistory' => 'TRUE')); |
|
| 1329 | + $settings = array_merge($settings, array('globalMapHistory' => 'TRUE')); |
|
| 1330 | 1330 | } else { |
| 1331 | - $settings = array_merge($settings,array('globalMapHistory' => 'FALSE')); |
|
| 1331 | + $settings = array_merge($settings, array('globalMapHistory' => 'FALSE')); |
|
| 1332 | 1332 | } |
| 1333 | - $maptooltip = filter_input(INPUT_POST,'maptooltip',FILTER_SANITIZE_STRING); |
|
| 1333 | + $maptooltip = filter_input(INPUT_POST, 'maptooltip', FILTER_SANITIZE_STRING); |
|
| 1334 | 1334 | if ($maptooltip == 'maptooltip') { |
| 1335 | - $settings = array_merge($settings,array('globalMapTooltip' => 'TRUE')); |
|
| 1335 | + $settings = array_merge($settings, array('globalMapTooltip' => 'TRUE')); |
|
| 1336 | 1336 | } else { |
| 1337 | - $settings = array_merge($settings,array('globalMapTooltip' => 'FALSE')); |
|
| 1337 | + $settings = array_merge($settings, array('globalMapTooltip' => 'FALSE')); |
|
| 1338 | 1338 | } |
| 1339 | - $flightroute = filter_input(INPUT_POST,'flightroute',FILTER_SANITIZE_STRING); |
|
| 1339 | + $flightroute = filter_input(INPUT_POST, 'flightroute', FILTER_SANITIZE_STRING); |
|
| 1340 | 1340 | if ($flightroute == 'flightroute') { |
| 1341 | - $settings = array_merge($settings,array('globalMapRoute' => 'TRUE')); |
|
| 1341 | + $settings = array_merge($settings, array('globalMapRoute' => 'TRUE')); |
|
| 1342 | 1342 | } else { |
| 1343 | - $settings = array_merge($settings,array('globalMapRoute' => 'FALSE')); |
|
| 1343 | + $settings = array_merge($settings, array('globalMapRoute' => 'FALSE')); |
|
| 1344 | 1344 | } |
| 1345 | - $flightremainingroute = filter_input(INPUT_POST,'flightremainingroute',FILTER_SANITIZE_STRING); |
|
| 1345 | + $flightremainingroute = filter_input(INPUT_POST, 'flightremainingroute', FILTER_SANITIZE_STRING); |
|
| 1346 | 1346 | if ($flightremainingroute == 'flightremainingroute') { |
| 1347 | - $settings = array_merge($settings,array('globalMapRemainingRoute' => 'TRUE')); |
|
| 1347 | + $settings = array_merge($settings, array('globalMapRemainingRoute' => 'TRUE')); |
|
| 1348 | 1348 | } else { |
| 1349 | - $settings = array_merge($settings,array('globalMapRemainingRoute' => 'FALSE')); |
|
| 1349 | + $settings = array_merge($settings, array('globalMapRemainingRoute' => 'FALSE')); |
|
| 1350 | 1350 | } |
| 1351 | - $allflights = filter_input(INPUT_POST,'allflights',FILTER_SANITIZE_STRING); |
|
| 1351 | + $allflights = filter_input(INPUT_POST, 'allflights', FILTER_SANITIZE_STRING); |
|
| 1352 | 1352 | if ($allflights == 'allflights') { |
| 1353 | - $settings = array_merge($settings,array('globalAllFlights' => 'TRUE')); |
|
| 1353 | + $settings = array_merge($settings, array('globalAllFlights' => 'TRUE')); |
|
| 1354 | 1354 | } else { |
| 1355 | - $settings = array_merge($settings,array('globalAllFlights' => 'FALSE')); |
|
| 1355 | + $settings = array_merge($settings, array('globalAllFlights' => 'FALSE')); |
|
| 1356 | 1356 | } |
| 1357 | - $bbox = filter_input(INPUT_POST,'bbox',FILTER_SANITIZE_STRING); |
|
| 1357 | + $bbox = filter_input(INPUT_POST, 'bbox', FILTER_SANITIZE_STRING); |
|
| 1358 | 1358 | if ($bbox == 'bbox') { |
| 1359 | - $settings = array_merge($settings,array('globalMapUseBbox' => 'TRUE')); |
|
| 1359 | + $settings = array_merge($settings, array('globalMapUseBbox' => 'TRUE')); |
|
| 1360 | 1360 | } else { |
| 1361 | - $settings = array_merge($settings,array('globalMapUseBbox' => 'FALSE')); |
|
| 1361 | + $settings = array_merge($settings, array('globalMapUseBbox' => 'FALSE')); |
|
| 1362 | 1362 | } |
| 1363 | - $groundaltitude = filter_input(INPUT_POST,'groundaltitude',FILTER_SANITIZE_STRING); |
|
| 1363 | + $groundaltitude = filter_input(INPUT_POST, 'groundaltitude', FILTER_SANITIZE_STRING); |
|
| 1364 | 1364 | if ($groundaltitude == 'groundaltitude') { |
| 1365 | - $settings = array_merge($settings,array('globalGroundAltitude' => 'TRUE')); |
|
| 1365 | + $settings = array_merge($settings, array('globalGroundAltitude' => 'TRUE')); |
|
| 1366 | 1366 | } else { |
| 1367 | - $settings = array_merge($settings,array('globalGroundAltitude' => 'FALSE')); |
|
| 1367 | + $settings = array_merge($settings, array('globalGroundAltitude' => 'FALSE')); |
|
| 1368 | 1368 | } |
| 1369 | - $waypoints = filter_input(INPUT_POST,'waypoints',FILTER_SANITIZE_STRING); |
|
| 1369 | + $waypoints = filter_input(INPUT_POST, 'waypoints', FILTER_SANITIZE_STRING); |
|
| 1370 | 1370 | if ($waypoints == 'waypoints') { |
| 1371 | - $settings = array_merge($settings,array('globalWaypoints' => 'TRUE')); |
|
| 1371 | + $settings = array_merge($settings, array('globalWaypoints' => 'TRUE')); |
|
| 1372 | 1372 | } else { |
| 1373 | - $settings = array_merge($settings,array('globalWaypoints' => 'FALSE')); |
|
| 1373 | + $settings = array_merge($settings, array('globalWaypoints' => 'FALSE')); |
|
| 1374 | 1374 | } |
| 1375 | - $geoid = filter_input(INPUT_POST,'geoid',FILTER_SANITIZE_STRING); |
|
| 1375 | + $geoid = filter_input(INPUT_POST, 'geoid', FILTER_SANITIZE_STRING); |
|
| 1376 | 1376 | if ($geoid == 'geoid') { |
| 1377 | - $settings = array_merge($settings,array('globalGeoid' => 'TRUE')); |
|
| 1377 | + $settings = array_merge($settings, array('globalGeoid' => 'TRUE')); |
|
| 1378 | 1378 | } else { |
| 1379 | - $settings = array_merge($settings,array('globalGeoid' => 'FALSE')); |
|
| 1379 | + $settings = array_merge($settings, array('globalGeoid' => 'FALSE')); |
|
| 1380 | 1380 | } |
| 1381 | - $geoid_source = filter_input(INPUT_POST,'geoid_source',FILTER_SANITIZE_STRING); |
|
| 1382 | - $settings = array_merge($settings,array('globalGeoidSource' => $geoid_source)); |
|
| 1381 | + $geoid_source = filter_input(INPUT_POST, 'geoid_source', FILTER_SANITIZE_STRING); |
|
| 1382 | + $settings = array_merge($settings, array('globalGeoidSource' => $geoid_source)); |
|
| 1383 | 1383 | |
| 1384 | - $noairlines = filter_input(INPUT_POST,'noairlines',FILTER_SANITIZE_STRING); |
|
| 1384 | + $noairlines = filter_input(INPUT_POST, 'noairlines', FILTER_SANITIZE_STRING); |
|
| 1385 | 1385 | if ($noairlines == 'noairlines') { |
| 1386 | - $settings = array_merge($settings,array('globalNoAirlines' => 'TRUE')); |
|
| 1386 | + $settings = array_merge($settings, array('globalNoAirlines' => 'TRUE')); |
|
| 1387 | 1387 | } else { |
| 1388 | - $settings = array_merge($settings,array('globalNoAirlines' => 'FALSE')); |
|
| 1388 | + $settings = array_merge($settings, array('globalNoAirlines' => 'FALSE')); |
|
| 1389 | 1389 | } |
| 1390 | 1390 | |
| 1391 | - if (!isset($globalTransaction)) $settings = array_merge($settings,array('globalTransaction' => 'TRUE')); |
|
| 1391 | + if (!isset($globalTransaction)) $settings = array_merge($settings, array('globalTransaction' => 'TRUE')); |
|
| 1392 | 1392 | |
| 1393 | 1393 | // Set some defaults values... |
| 1394 | 1394 | if (!isset($globalAircraftImageSources)) { |
| 1395 | - $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters'); |
|
| 1396 | - $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources)); |
|
| 1395 | + $globalAircraftImageSources = array('ivaomtl', 'wikimedia', 'airportdata', 'deviantart', 'flickr', 'bing', 'jetphotos', 'planepictures', 'planespotters'); |
|
| 1396 | + $settings = array_merge($settings, array('globalAircraftImageSources' => $globalAircraftImageSources)); |
|
| 1397 | 1397 | } |
| 1398 | 1398 | |
| 1399 | 1399 | if (!isset($globalSchedulesSources)) { |
| 1400 | - $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware'); |
|
| 1401 | - $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources)); |
|
| 1400 | + $globalSchedulesSources = array('flightmapper', 'costtotravel', 'flightradar24', 'flightaware'); |
|
| 1401 | + $settings = array_merge($settings, array('globalSchedulesSources' => $globalSchedulesSources)); |
|
| 1402 | 1402 | } |
| 1403 | 1403 | |
| 1404 | - $settings = array_merge($settings,array('globalInstalled' => 'TRUE')); |
|
| 1404 | + $settings = array_merge($settings, array('globalInstalled' => 'TRUE')); |
|
| 1405 | 1405 | |
| 1406 | 1406 | if ($error == '') settings::modify_settings($settings); |
| 1407 | 1407 | 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> |
@@ -238,7 +286,10 @@ discard block |
||
| 238 | 286 | <div id="openweathermap_data"> |
| 239 | 287 | <p> |
| 240 | 288 | <label for="openweathermapkey">OpenWeatherMap key (weather layer)</label> |
| 241 | - <input type="text" name="openweathermapkey" id="openweathermapkey" value="<?php if (isset($globalOpenWeatherMapKey)) print $globalOpenWeatherMapKey; ?>" /> |
|
| 289 | + <input type="text" name="openweathermapkey" id="openweathermapkey" value="<?php if (isset($globalOpenWeatherMapKey)) { |
|
| 290 | + print $globalOpenWeatherMapKey; |
|
| 291 | +} |
|
| 292 | +?>" /> |
|
| 242 | 293 | <p class="help-block">Get a key <a href="https://openweathermap.org/">here</a></p> |
| 243 | 294 | </p> |
| 244 | 295 | </div> |
@@ -248,42 +299,86 @@ discard block |
||
| 248 | 299 | <legend>Coverage area</legend> |
| 249 | 300 | <p> |
| 250 | 301 | <label for="latitudemax">The maximum latitude (north)</label> |
| 251 | - <input type="text" name="latitudemax" id="latitudemax" value="<?php if (isset($globalLatitudeMax)) print $globalLatitudeMax; ?>" /> |
|
| 302 | + <input type="text" name="latitudemax" id="latitudemax" value="<?php if (isset($globalLatitudeMax)) { |
|
| 303 | + print $globalLatitudeMax; |
|
| 304 | +} |
|
| 305 | +?>" /> |
|
| 252 | 306 | </p> |
| 253 | 307 | <p> |
| 254 | 308 | <label for="latitudemin">The minimum latitude (south)</label> |
| 255 | - <input type="text" name="latitudemin" id="latitudemin" value="<?php if (isset($globalLatitudeMin)) print $globalLatitudeMin; ?>" /> |
|
| 309 | + <input type="text" name="latitudemin" id="latitudemin" value="<?php if (isset($globalLatitudeMin)) { |
|
| 310 | + print $globalLatitudeMin; |
|
| 311 | +} |
|
| 312 | +?>" /> |
|
| 256 | 313 | </p> |
| 257 | 314 | <p> |
| 258 | 315 | <label for="longitudemax">The maximum longitude (west)</label> |
| 259 | - <input type="text" name="longitudemax" id="longitudemax" value="<?php if (isset($globalLongitudeMax)) print $globalLongitudeMax; ?>" /> |
|
| 316 | + <input type="text" name="longitudemax" id="longitudemax" value="<?php if (isset($globalLongitudeMax)) { |
|
| 317 | + print $globalLongitudeMax; |
|
| 318 | +} |
|
| 319 | +?>" /> |
|
| 260 | 320 | </p> |
| 261 | 321 | <p> |
| 262 | 322 | <label for="longitudemin">The minimum longitude (east)</label> |
| 263 | - <input type="text" name="longitudemin" id="longitudemin" value="<?php if (isset($globalLongitudeMin)) print $globalLongitudeMin; ?>" /> |
|
| 323 | + <input type="text" name="longitudemin" id="longitudemin" value="<?php if (isset($globalLongitudeMin)) { |
|
| 324 | + print $globalLongitudeMin; |
|
| 325 | +} |
|
| 326 | +?>" /> |
|
| 264 | 327 | </p> |
| 265 | 328 | <p> |
| 266 | 329 | <label for="latitudecenter">The latitude center</label> |
| 267 | - <input type="text" name="latitudecenter" id="latitudecenter" value="<?php if (isset($globalCenterLatitude)) print $globalCenterLatitude; ?>" /> |
|
| 330 | + <input type="text" name="latitudecenter" id="latitudecenter" value="<?php if (isset($globalCenterLatitude)) { |
|
| 331 | + print $globalCenterLatitude; |
|
| 332 | +} |
|
| 333 | +?>" /> |
|
| 268 | 334 | </p> |
| 269 | 335 | <p> |
| 270 | 336 | <label for="longitudecenter">The longitude center</label> |
| 271 | - <input type="text" name="longitudecenter" id="longitudecenter" value="<?php if (isset($globalCenterLongitude)) print $globalCenterLongitude; ?>" /> |
|
| 337 | + <input type="text" name="longitudecenter" id="longitudecenter" value="<?php if (isset($globalCenterLongitude)) { |
|
| 338 | + print $globalCenterLongitude; |
|
| 339 | +} |
|
| 340 | +?>" /> |
|
| 272 | 341 | </p> |
| 273 | 342 | <p> |
| 274 | 343 | <label for="livezoom">Default Zoom on live map</label> |
| 275 | - <input type="number" name="livezoom" id="livezoom" value="<?php if (isset($globalLiveZoom)) print $globalLiveZoom; else print '9'; ?>" /> |
|
| 344 | + <input type="number" name="livezoom" id="livezoom" value="<?php if (isset($globalLiveZoom)) { |
|
| 345 | + print $globalLiveZoom; |
|
| 346 | +} else { |
|
| 347 | + print '9'; |
|
| 348 | +} |
|
| 349 | +?>" /> |
|
| 276 | 350 | </p> |
| 277 | 351 | <p> |
| 278 | 352 | <label for="squawk_country">Country for squawk usage</label> |
| 279 | 353 | <select name="squawk_country" id="squawk_country"> |
| 280 | - <option value="UK"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'UK') print ' selected '; ?>>UK</option> |
|
| 281 | - <option value="NZ"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'NZ') print ' selected '; ?>>NZ</option> |
|
| 282 | - <option value="US"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'US') print ' selected '; ?>>US</option> |
|
| 283 | - <option value="AU"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'AU') print ' selected '; ?>>AU</option> |
|
| 284 | - <option value="NL"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'NL') print ' selected '; ?>>NL</option> |
|
| 285 | - <option value="FR"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'FR') print ' selected '; ?>>FR</option> |
|
| 286 | - <option value="TR"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'TR') print ' selected '; ?>>TR</option> |
|
| 354 | + <option value="UK"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'UK') { |
|
| 355 | + print ' selected '; |
|
| 356 | +} |
|
| 357 | +?>>UK</option> |
|
| 358 | + <option value="NZ"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'NZ') { |
|
| 359 | + print ' selected '; |
|
| 360 | +} |
|
| 361 | +?>>NZ</option> |
|
| 362 | + <option value="US"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'US') { |
|
| 363 | + print ' selected '; |
|
| 364 | +} |
|
| 365 | +?>>US</option> |
|
| 366 | + <option value="AU"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'AU') { |
|
| 367 | + print ' selected '; |
|
| 368 | +} |
|
| 369 | +?>>AU</option> |
|
| 370 | + <option value="NL"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'NL') { |
|
| 371 | + print ' selected '; |
|
| 372 | +} |
|
| 373 | +?>>NL</option> |
|
| 374 | + <option value="FR"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'FR') { |
|
| 375 | + print ' selected '; |
|
| 376 | +} |
|
| 377 | +?>>FR</option> |
|
| 378 | + <option value="TR"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'TR') { |
|
| 379 | + print ' selected '; |
|
| 380 | +} |
|
| 381 | +?>>TR</option> |
|
| 287 | 382 | </select> |
| 288 | 383 | </p> |
| 289 | 384 | </fieldset> |
@@ -292,15 +387,24 @@ discard block |
||
| 292 | 387 | <p><i>Only put in DB flights that are inside a circle</i></p> |
| 293 | 388 | <p> |
| 294 | 389 | <label for="latitude">Center latitude</label> |
| 295 | - <input type="text" name="zoilatitude" id="latitude" value="<?php if (isset($globalDistanceIgnore['latitude'])) echo $globalDistanceIgnore['latitude']; ?>" /> |
|
| 390 | + <input type="text" name="zoilatitude" id="latitude" value="<?php if (isset($globalDistanceIgnore['latitude'])) { |
|
| 391 | + echo $globalDistanceIgnore['latitude']; |
|
| 392 | +} |
|
| 393 | +?>" /> |
|
| 296 | 394 | </p> |
| 297 | 395 | <p> |
| 298 | 396 | <label for="longitude">Center longitude</label> |
| 299 | - <input type="text" name="zoilongitude" id="longitude" value="<?php if (isset($globalDistanceIgnore['longitude'])) echo $globalDistanceIgnore['longitude']; ?>" /> |
|
| 397 | + <input type="text" name="zoilongitude" id="longitude" value="<?php if (isset($globalDistanceIgnore['longitude'])) { |
|
| 398 | + echo $globalDistanceIgnore['longitude']; |
|
| 399 | +} |
|
| 400 | +?>" /> |
|
| 300 | 401 | </p> |
| 301 | 402 | <p> |
| 302 | 403 | <label for="Distance">Distance (in km)</label> |
| 303 | - <input type="text" name="zoidistance" id="distance" value="<?php if (isset($globalDistanceIgnore['distance'])) echo $globalDistanceIgnore['distance']; ?>" /> |
|
| 404 | + <input type="text" name="zoidistance" id="distance" value="<?php if (isset($globalDistanceIgnore['distance'])) { |
|
| 405 | + echo $globalDistanceIgnore['distance']; |
|
| 406 | +} |
|
| 407 | +?>" /> |
|
| 304 | 408 | </p> |
| 305 | 409 | </fieldset> |
| 306 | 410 | <fieldset id="sourceloc"> |
@@ -409,11 +513,17 @@ discard block |
||
| 409 | 513 | <div id="flightaware_data"> |
| 410 | 514 | <p> |
| 411 | 515 | <label for="flightawareusername">FlightAware username</label> |
| 412 | - <input type="text" name="flightawareusername" id="flightawareusername" value="<?php if (isset($globalFlightAwareUsername)) print $globalFlightAwareUsername; ?>" /> |
|
| 516 | + <input type="text" name="flightawareusername" id="flightawareusername" value="<?php if (isset($globalFlightAwareUsername)) { |
|
| 517 | + print $globalFlightAwareUsername; |
|
| 518 | +} |
|
| 519 | +?>" /> |
|
| 413 | 520 | </p> |
| 414 | 521 | <p> |
| 415 | 522 | <label for="flightawarepassword">FlightAware password/API key</label> |
| 416 | - <input type="text" name="flightawarepassword" id="flightawarepassword" value="<?php if (isset($globalFlightAwarePassword)) print $globalFlightAwarePassword; ?>" /> |
|
| 523 | + <input type="text" name="flightawarepassword" id="flightawarepassword" value="<?php if (isset($globalFlightAwarePassword)) { |
|
| 524 | + print $globalFlightAwarePassword; |
|
| 525 | +} |
|
| 526 | +?>" /> |
|
| 417 | 527 | </p> |
| 418 | 528 | </div> |
| 419 | 529 | --> |
@@ -455,7 +565,10 @@ discard block |
||
| 455 | 565 | if (filter_var($source['host'],FILTER_VALIDATE_URL)) { |
| 456 | 566 | ?> |
| 457 | 567 | <td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td> |
| 458 | - <td><input type="text" name="port[]" class="col-xs-2" id="port" value="<?php if (isset($source['port'])) print $source['port']; ?>" /></td> |
|
| 568 | + <td><input type="text" name="port[]" class="col-xs-2" id="port" value="<?php if (isset($source['port'])) { |
|
| 569 | + print $source['port']; |
|
| 570 | +} |
|
| 571 | +?>" /></td> |
|
| 459 | 572 | <?php |
| 460 | 573 | } else { |
| 461 | 574 | $hostport = explode(':',$source['host']); |
@@ -474,33 +587,102 @@ discard block |
||
| 474 | 587 | ?> |
| 475 | 588 | <td> |
| 476 | 589 | <select name="format[]" id="format"> |
| 477 | - <option value="auto" <?php if (!isset($source['format'])) print 'selected'; ?>>Auto</option> |
|
| 478 | - <option value="sbs" <?php if (isset($source['format']) && $source['format'] == 'sbs') print 'selected'; ?>>SBS</option> |
|
| 479 | - <option value="tsv" <?php if (isset($source['format']) && $source['format'] == 'tsv') print 'selected'; ?>>TSV</option> |
|
| 480 | - <option value="raw" <?php if (isset($source['format']) && $source['format'] == 'raw') print 'selected'; ?>>Raw</option> |
|
| 481 | - <option value="aprs" <?php if (isset($source['format']) && $source['format'] == 'aprs') print 'selected'; ?>>APRS</option> |
|
| 482 | - <option value="deltadbtxt" <?php if (isset($source['format']) && $source['format'] == 'deltadbtxt') print 'selected'; ?>>Radarcape deltadb.txt</option> |
|
| 483 | - <option value="vatsimtxt" <?php if (isset($source['format']) && $source['format'] == 'vatsimtxt') print 'selected'; ?>>Vatsim</option> |
|
| 484 | - <option value="aircraftlistjson" <?php if (isset($source['format']) && $source['format'] == 'aircraftlistjson') print 'selected'; ?>>Virtual Radar Server AircraftList.json</option> |
|
| 485 | - <option value="vrstcp" <?php if (isset($source['format']) && $source['format'] == 'vrstcp') print 'selected'; ?>>Virtual Radar Server TCP</option> |
|
| 486 | - <option value="phpvmacars" <?php if (isset($source['format']) && $source['format'] == 'phpvmacars') print 'selected'; ?>>phpVMS</option> |
|
| 487 | - <option value="vam" <?php if (isset($source['format']) && $source['format'] == 'vam') print 'selected'; ?>>Virtual Airlines Manager</option> |
|
| 488 | - <option value="whazzup" <?php if (isset($source['format']) && $source['format'] == 'whazzup') print 'selected'; ?>>IVAO</option> |
|
| 489 | - <option value="flightgearmp" <?php if (isset($source['format']) && $source['format'] == 'flightgearmp') print 'selected'; ?>>FlightGear Multiplayer</option> |
|
| 490 | - <option value="flightgearsp" <?php if (isset($source['format']) && $source['format'] == 'flightgearsp') print 'selected'; ?>>FlightGear Singleplayer</option> |
|
| 491 | - <option value="acars" <?php if (isset($source['format']) && $source['format'] == 'acars') print 'selected'; ?>>ACARS from acarsdec/acarsdeco2 over UDP</option> |
|
| 492 | - <option value="acarssbs3" <?php if (isset($source['format']) && $source['format'] == 'acarssbs3') print 'selected'; ?>>ACARS SBS-3 over TCP</option> |
|
| 493 | - <option value="ais" <?php if (isset($source['format']) && $source['format'] == 'ais') print 'selected'; ?>>NMEA AIS over TCP</option> |
|
| 494 | - <option value="airwhere" <?php if (isset($source['format']) && $source['format'] == 'airwhere') print 'selected'; ?>>AirWhere website</option> |
|
| 495 | - <option value="hidnseek_callback" <?php if (isset($source['format']) && $source['format'] == 'hidnseek_callback') print 'selected'; ?>>HidnSeek Callback</option> |
|
| 496 | - <option value="blitzortung" <?php if (isset($source['format']) && $source['format'] == 'blitzortung') print 'selected'; ?>>Blitzortung</option> |
|
| 590 | + <option value="auto" <?php if (!isset($source['format'])) { |
|
| 591 | + print 'selected'; |
|
| 592 | +} |
|
| 593 | +?>>Auto</option> |
|
| 594 | + <option value="sbs" <?php if (isset($source['format']) && $source['format'] == 'sbs') { |
|
| 595 | + print 'selected'; |
|
| 596 | +} |
|
| 597 | +?>>SBS</option> |
|
| 598 | + <option value="tsv" <?php if (isset($source['format']) && $source['format'] == 'tsv') { |
|
| 599 | + print 'selected'; |
|
| 600 | +} |
|
| 601 | +?>>TSV</option> |
|
| 602 | + <option value="raw" <?php if (isset($source['format']) && $source['format'] == 'raw') { |
|
| 603 | + print 'selected'; |
|
| 604 | +} |
|
| 605 | +?>>Raw</option> |
|
| 606 | + <option value="aprs" <?php if (isset($source['format']) && $source['format'] == 'aprs') { |
|
| 607 | + print 'selected'; |
|
| 608 | +} |
|
| 609 | +?>>APRS</option> |
|
| 610 | + <option value="deltadbtxt" <?php if (isset($source['format']) && $source['format'] == 'deltadbtxt') { |
|
| 611 | + print 'selected'; |
|
| 612 | +} |
|
| 613 | +?>>Radarcape deltadb.txt</option> |
|
| 614 | + <option value="vatsimtxt" <?php if (isset($source['format']) && $source['format'] == 'vatsimtxt') { |
|
| 615 | + print 'selected'; |
|
| 616 | +} |
|
| 617 | +?>>Vatsim</option> |
|
| 618 | + <option value="aircraftlistjson" <?php if (isset($source['format']) && $source['format'] == 'aircraftlistjson') { |
|
| 619 | + print 'selected'; |
|
| 620 | +} |
|
| 621 | +?>>Virtual Radar Server AircraftList.json</option> |
|
| 622 | + <option value="vrstcp" <?php if (isset($source['format']) && $source['format'] == 'vrstcp') { |
|
| 623 | + print 'selected'; |
|
| 624 | +} |
|
| 625 | +?>>Virtual Radar Server TCP</option> |
|
| 626 | + <option value="phpvmacars" <?php if (isset($source['format']) && $source['format'] == 'phpvmacars') { |
|
| 627 | + print 'selected'; |
|
| 628 | +} |
|
| 629 | +?>>phpVMS</option> |
|
| 630 | + <option value="vam" <?php if (isset($source['format']) && $source['format'] == 'vam') { |
|
| 631 | + print 'selected'; |
|
| 632 | +} |
|
| 633 | +?>>Virtual Airlines Manager</option> |
|
| 634 | + <option value="whazzup" <?php if (isset($source['format']) && $source['format'] == 'whazzup') { |
|
| 635 | + print 'selected'; |
|
| 636 | +} |
|
| 637 | +?>>IVAO</option> |
|
| 638 | + <option value="flightgearmp" <?php if (isset($source['format']) && $source['format'] == 'flightgearmp') { |
|
| 639 | + print 'selected'; |
|
| 640 | +} |
|
| 641 | +?>>FlightGear Multiplayer</option> |
|
| 642 | + <option value="flightgearsp" <?php if (isset($source['format']) && $source['format'] == 'flightgearsp') { |
|
| 643 | + print 'selected'; |
|
| 644 | +} |
|
| 645 | +?>>FlightGear Singleplayer</option> |
|
| 646 | + <option value="acars" <?php if (isset($source['format']) && $source['format'] == 'acars') { |
|
| 647 | + print 'selected'; |
|
| 648 | +} |
|
| 649 | +?>>ACARS from acarsdec/acarsdeco2 over UDP</option> |
|
| 650 | + <option value="acarssbs3" <?php if (isset($source['format']) && $source['format'] == 'acarssbs3') { |
|
| 651 | + print 'selected'; |
|
| 652 | +} |
|
| 653 | +?>>ACARS SBS-3 over TCP</option> |
|
| 654 | + <option value="ais" <?php if (isset($source['format']) && $source['format'] == 'ais') { |
|
| 655 | + print 'selected'; |
|
| 656 | +} |
|
| 657 | +?>>NMEA AIS over TCP</option> |
|
| 658 | + <option value="airwhere" <?php if (isset($source['format']) && $source['format'] == 'airwhere') { |
|
| 659 | + print 'selected'; |
|
| 660 | +} |
|
| 661 | +?>>AirWhere website</option> |
|
| 662 | + <option value="hidnseek_callback" <?php if (isset($source['format']) && $source['format'] == 'hidnseek_callback') { |
|
| 663 | + print 'selected'; |
|
| 664 | +} |
|
| 665 | +?>>HidnSeek Callback</option> |
|
| 666 | + <option value="blitzortung" <?php if (isset($source['format']) && $source['format'] == 'blitzortung') { |
|
| 667 | + print 'selected'; |
|
| 668 | +} |
|
| 669 | +?>>Blitzortung</option> |
|
| 497 | 670 | </select> |
| 498 | 671 | </td> |
| 499 | 672 | <td> |
| 500 | - <input type="text" name="name[]" id="name" value="<?php if (isset($source['name'])) print $source['name']; ?>" /> |
|
| 673 | + <input type="text" name="name[]" id="name" value="<?php if (isset($source['name'])) { |
|
| 674 | + print $source['name']; |
|
| 675 | +} |
|
| 676 | +?>" /> |
|
| 501 | 677 | </td> |
| 502 | - <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> |
|
| 503 | - <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> |
|
| 678 | + <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']) { |
|
| 679 | + print 'checked'; |
|
| 680 | +} |
|
| 681 | +?> /></td> |
|
| 682 | + <td><input type="checkbox" name="noarchive[]" id="noarchive" title="Don't archive this source" value="1" <?php if (isset($source['noarchive']) && $source['noarchive']) { |
|
| 683 | + print 'checked'; |
|
| 684 | +} |
|
| 685 | +?> /></td> |
|
| 504 | 686 | <td> |
| 505 | 687 | <select name="timezones[]" id="timezones"> |
| 506 | 688 | <?php |
@@ -510,7 +692,9 @@ discard block |
||
| 510 | 692 | print '<option selected>'.$timezones.'</option>'; |
| 511 | 693 | } elseif (!isset($source['timezone']) && $timezones == 'UTC') { |
| 512 | 694 | print '<option selected>'.$timezones.'</option>'; |
| 513 | - } else print '<option>'.$timezones.'</option>'; |
|
| 695 | + } else { |
|
| 696 | + print '<option>'.$timezones.'</option>'; |
|
| 697 | + } |
|
| 514 | 698 | } |
| 515 | 699 | ?> |
| 516 | 700 | </select> |
@@ -560,7 +744,9 @@ discard block |
||
| 560 | 744 | foreach($timezonelist as $timezones){ |
| 561 | 745 | if ($timezones == 'UTC') { |
| 562 | 746 | print '<option selected>'.$timezones.'</option>'; |
| 563 | - } else print '<option>'.$timezones.'</option>'; |
|
| 747 | + } else { |
|
| 748 | + print '<option>'.$timezones.'</option>'; |
|
| 749 | + } |
|
| 564 | 750 | } |
| 565 | 751 | ?> |
| 566 | 752 | </select> |
@@ -583,11 +769,17 @@ discard block |
||
| 583 | 769 | <p>Listen UDP server for acarsdec/acarsdeco2/... with <i>daemon-acars.php</i> script</p> |
| 584 | 770 | <p> |
| 585 | 771 | <label for="acarshost">ACARS UDP host</label> |
| 586 | - <input type="text" name="acarshost" id="acarshost" value="<?php if (isset($globalACARSHost)) print $globalACARSHost; ?>" /> |
|
| 772 | + <input type="text" name="acarshost" id="acarshost" value="<?php if (isset($globalACARSHost)) { |
|
| 773 | + print $globalACARSHost; |
|
| 774 | +} |
|
| 775 | +?>" /> |
|
| 587 | 776 | </p> |
| 588 | 777 | <p> |
| 589 | 778 | <label for="acarsport">ACARS UDP port</label> |
| 590 | - <input type="number" name="acarsport" id="acarsport" value="<?php if (isset($globalACARSPort)) print $globalACARSPort; ?>" /> |
|
| 779 | + <input type="number" name="acarsport" id="acarsport" value="<?php if (isset($globalACARSPort)) { |
|
| 780 | + print $globalACARSPort; |
|
| 781 | +} |
|
| 782 | +?>" /> |
|
| 591 | 783 | </p> |
| 592 | 784 | </fieldset> |
| 593 | 785 | </div> |
@@ -667,13 +859,19 @@ discard block |
||
| 667 | 859 | <div id="schedules_options"> |
| 668 | 860 | <p> |
| 669 | 861 | <label for="britishairways">British Airways API Key</label> |
| 670 | - <input type="text" name="britishairways" id="britishairways" value="<?php if (isset($globalBritishAirwaysKey)) print $globalBritishAirwaysKey; ?>" /> |
|
| 862 | + <input type="text" name="britishairways" id="britishairways" value="<?php if (isset($globalBritishAirwaysKey)) { |
|
| 863 | + print $globalBritishAirwaysKey; |
|
| 864 | +} |
|
| 865 | +?>" /> |
|
| 671 | 866 | <p class="help-block">Register an account on <a href="https://developer.ba.com/">https://developer.ba.com/</a></p> |
| 672 | 867 | </p> |
| 673 | 868 | <!-- |
| 674 | 869 | <p> |
| 675 | 870 | <label for="transavia">Transavia Test API Consumer Key</label> |
| 676 | - <input type="text" name="transavia" id="transavia" value="<?php if (isset($globalTransaviaKey)) print $globalTransaviaKey; ?>" /> |
|
| 871 | + <input type="text" name="transavia" id="transavia" value="<?php if (isset($globalTransaviaKey)) { |
|
| 872 | + print $globalTransaviaKey; |
|
| 873 | +} |
|
| 874 | +?>" /> |
|
| 677 | 875 | <p class="help-block">Register an account on <a href="https://developer.transavia.com">https://developer.transavia.com</a></p> |
| 678 | 876 | </p> |
| 679 | 877 | --> |
@@ -682,10 +880,16 @@ discard block |
||
| 682 | 880 | <b>Lufthansa API Key</b> |
| 683 | 881 | <p> |
| 684 | 882 | <label for="lufthansakey">Key</label> |
| 685 | - <input type="text" name="lufthansakey" id="lufthansakey" value="<?php if (isset($globalLufthansaKey['key'])) print $globalLufthansaKey['key']; ?>" /> |
|
| 883 | + <input type="text" name="lufthansakey" id="lufthansakey" value="<?php if (isset($globalLufthansaKey['key'])) { |
|
| 884 | + print $globalLufthansaKey['key']; |
|
| 885 | +} |
|
| 886 | +?>" /> |
|
| 686 | 887 | </p><p> |
| 687 | 888 | <label for="lufthansasecret">Secret</label> |
| 688 | - <input type="text" name="lufthansasecret" id="lufthansasecret" value="<?php if (isset($globalLufthansaKey['secret'])) print $globalLufthansaKey['secret']; ?>" /> |
|
| 889 | + <input type="text" name="lufthansasecret" id="lufthansasecret" value="<?php if (isset($globalLufthansaKey['secret'])) { |
|
| 890 | + print $globalLufthansaKey['secret']; |
|
| 891 | +} |
|
| 892 | +?>" /> |
|
| 689 | 893 | </p> |
| 690 | 894 | </div> |
| 691 | 895 | <p class="help-block">Register an account on <a href="https://developer.lufthansa.com/page">https://developer.lufthansa.com/page</a></p> |
@@ -705,7 +909,10 @@ discard block |
||
| 705 | 909 | </p> |
| 706 | 910 | <p> |
| 707 | 911 | <label for="notamsource">URL of your feed from notaminfo.com</label> |
| 708 | - <input type="text" name="notamsource" id="notamsource" value="<?php if (isset($globalNOTAMSource)) print $globalNOTAMSource; ?>" /> |
|
| 912 | + <input type="text" name="notamsource" id="notamsource" value="<?php if (isset($globalNOTAMSource)) { |
|
| 913 | + print $globalNOTAMSource; |
|
| 914 | +} |
|
| 915 | +?>" /> |
|
| 709 | 916 | <p class="help-block">If you want to use world NOTAM from FlightAirMap website, leave it blank</p> |
| 710 | 917 | </p> |
| 711 | 918 | <br /> |
@@ -721,14 +928,20 @@ discard block |
||
| 721 | 928 | <div id="metarsrc"> |
| 722 | 929 | <p> |
| 723 | 930 | <label for="metarsource">URL of your METAR source</label> |
| 724 | - <input type="text" name="metarsource" id="metarsource" value="<?php if (isset($globalMETARurl)) print $globalMETARurl; ?>" /> |
|
| 931 | + <input type="text" name="metarsource" id="metarsource" value="<?php if (isset($globalMETARurl)) { |
|
| 932 | + print $globalMETARurl; |
|
| 933 | +} |
|
| 934 | +?>" /> |
|
| 725 | 935 | <p class="help-block">Use {icao} to specify where we replace by airport icao. ex : http://metar.vatsim.net/metar.php?id={icao}</p> |
| 726 | 936 | </p> |
| 727 | 937 | </div> |
| 728 | 938 | <br /> |
| 729 | 939 | <p> |
| 730 | 940 | <label for="bitly">Bit.ly access token api (used in search page)</label> |
| 731 | - <input type="text" name="bitly" id="bitly" value="<?php if (isset($globalBitlyAccessToken)) print $globalBitlyAccessToken; ?>" /> |
|
| 941 | + <input type="text" name="bitly" id="bitly" value="<?php if (isset($globalBitlyAccessToken)) { |
|
| 942 | + print $globalBitlyAccessToken; |
|
| 943 | +} |
|
| 944 | +?>" /> |
|
| 732 | 945 | </p> |
| 733 | 946 | <br /> |
| 734 | 947 | <p> |
@@ -744,11 +957,26 @@ discard block |
||
| 744 | 957 | <p> |
| 745 | 958 | <label for="geoid_source">Geoid Source</label> |
| 746 | 959 | <select name="geoid_source" id="geoid_source"> |
| 747 | - <option value="egm96-15"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm96-15') print ' selected="selected"'; ?>>EGM96 15' (2.1MB)</option> |
|
| 748 | - <option value="egm96-5"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm96-5') print ' selected="selected"'; ?>>EGM96 5' (19MB)</option> |
|
| 749 | - <option value="egm2008-5"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm2008-5') print ' selected="selected"'; ?>>EGM2008 5' (19MB)</option> |
|
| 750 | - <option value="egm2008-2_5"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm2008-2_5') print ' selected="selected"'; ?>>EGM2008 2.5' (75MB)</option> |
|
| 751 | - <option value="egm2008-1"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm2008-1') print ' selected="selected"'; ?>>EGM2008 1' (470MB)</option> |
|
| 960 | + <option value="egm96-15"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm96-15') { |
|
| 961 | + print ' selected="selected"'; |
|
| 962 | +} |
|
| 963 | +?>>EGM96 15' (2.1MB)</option> |
|
| 964 | + <option value="egm96-5"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm96-5') { |
|
| 965 | + print ' selected="selected"'; |
|
| 966 | +} |
|
| 967 | +?>>EGM96 5' (19MB)</option> |
|
| 968 | + <option value="egm2008-5"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm2008-5') { |
|
| 969 | + print ' selected="selected"'; |
|
| 970 | +} |
|
| 971 | +?>>EGM2008 5' (19MB)</option> |
|
| 972 | + <option value="egm2008-2_5"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm2008-2_5') { |
|
| 973 | + print ' selected="selected"'; |
|
| 974 | +} |
|
| 975 | +?>>EGM2008 2.5' (75MB)</option> |
|
| 976 | + <option value="egm2008-1"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm2008-1') { |
|
| 977 | + print ' selected="selected"'; |
|
| 978 | +} |
|
| 979 | +?>>EGM2008 1' (470MB)</option> |
|
| 752 | 980 | </select> |
| 753 | 981 | <p class="help-block">The geoid is approximated by an "earth gravity model" (EGM).</p> |
| 754 | 982 | </p> |
@@ -766,7 +994,12 @@ discard block |
||
| 766 | 994 | </p> |
| 767 | 995 | <p> |
| 768 | 996 | <label for="archivemonths">Generate statistics, delete or put in archive flights older than xx months</label> |
| 769 | - <input type="number" name="archivemonths" id="archivemonths" value="<?php if (isset($globalArchiveMonths)) print $globalArchiveMonths; else echo '1'; ?>" /> |
|
| 997 | + <input type="number" name="archivemonths" id="archivemonths" value="<?php if (isset($globalArchiveMonths)) { |
|
| 998 | + print $globalArchiveMonths; |
|
| 999 | +} else { |
|
| 1000 | + echo '1'; |
|
| 1001 | +} |
|
| 1002 | +?>" /> |
|
| 770 | 1003 | <p class="help-block">0 to disable, delete old flight if <i>Archive all flights data</i> is disabled</p> |
| 771 | 1004 | </p> |
| 772 | 1005 | <p> |
@@ -776,12 +1009,22 @@ discard block |
||
| 776 | 1009 | </p> |
| 777 | 1010 | <p> |
| 778 | 1011 | <label for="archivekeepmonths">Keep flights data for xx months in archive</label> |
| 779 | - <input type="number" name="archivekeepmonths" id="archivekeepmonths" value="<?php if (isset($globalArchiveKeepMonths)) print $globalArchiveKeepMonths; else echo '1'; ?>" /> |
|
| 1012 | + <input type="number" name="archivekeepmonths" id="archivekeepmonths" value="<?php if (isset($globalArchiveKeepMonths)) { |
|
| 1013 | + print $globalArchiveKeepMonths; |
|
| 1014 | +} else { |
|
| 1015 | + echo '1'; |
|
| 1016 | +} |
|
| 1017 | +?>" /> |
|
| 780 | 1018 | <p class="help-block">0 to disable</p> |
| 781 | 1019 | </p> |
| 782 | 1020 | <p> |
| 783 | 1021 | <label for="archivekeeptrackmonths">Keep flights track data for xx months in archive</label> |
| 784 | - <input type="number" name="archivekeeptrackmonths" id="archivekeeptrackmonths" value="<?php if (isset($globalArchiveKeepTrackMonths)) print $globalArchiveKeepTrackMonths; else echo '1'; ?>" /> |
|
| 1022 | + <input type="number" name="archivekeeptrackmonths" id="archivekeeptrackmonths" value="<?php if (isset($globalArchiveKeepTrackMonths)) { |
|
| 1023 | + print $globalArchiveKeepTrackMonths; |
|
| 1024 | +} else { |
|
| 1025 | + echo '1'; |
|
| 1026 | +} |
|
| 1027 | +?>" /> |
|
| 785 | 1028 | <p class="help-block">0 to disable, should be less or egal to <i>Keep flights data</i> value</p> |
| 786 | 1029 | </p> |
| 787 | 1030 | <br /> |
@@ -791,7 +1034,12 @@ discard block |
||
| 791 | 1034 | <p class="help-block">Uncheck if the script is running as cron job</p> |
| 792 | 1035 | <div id="cronends"> |
| 793 | 1036 | <label for="cronend">Run script for xx seconds</label> |
| 794 | - <input type="number" name="cronend" id="cronend" value="<?php if (isset($globalCronEnd)) print $globalCronEnd; else print '0'; ?>" /> |
|
| 1037 | + <input type="number" name="cronend" id="cronend" value="<?php if (isset($globalCronEnd)) { |
|
| 1038 | + print $globalCronEnd; |
|
| 1039 | +} else { |
|
| 1040 | + print '0'; |
|
| 1041 | +} |
|
| 1042 | +?>" /> |
|
| 795 | 1043 | <p class="help-block">Set to 0 to disable. Should be disabled if source is URL.</p> |
| 796 | 1044 | </div> |
| 797 | 1045 | </p> |
@@ -844,15 +1092,30 @@ discard block |
||
| 844 | 1092 | <br /> |
| 845 | 1093 | <p> |
| 846 | 1094 | <label for="refresh">Show flights detected since xxx seconds</label> |
| 847 | - <input type="number" name="refresh" id="refresh" value="<?php if (isset($globalLiveInterval)) echo $globalLiveInterval; else echo '200'; ?>" /> |
|
| 1095 | + <input type="number" name="refresh" id="refresh" value="<?php if (isset($globalLiveInterval)) { |
|
| 1096 | + echo $globalLiveInterval; |
|
| 1097 | +} else { |
|
| 1098 | + echo '200'; |
|
| 1099 | +} |
|
| 1100 | +?>" /> |
|
| 848 | 1101 | </p> |
| 849 | 1102 | <p> |
| 850 | 1103 | <label for="maprefresh">Live map refresh (in seconds)</label> |
| 851 | - <input type="number" name="maprefresh" id="maprefresh" value="<?php if (isset($globalMapRefresh)) echo $globalMapRefresh; else echo '30'; ?>" /> |
|
| 1104 | + <input type="number" name="maprefresh" id="maprefresh" value="<?php if (isset($globalMapRefresh)) { |
|
| 1105 | + echo $globalMapRefresh; |
|
| 1106 | +} else { |
|
| 1107 | + echo '30'; |
|
| 1108 | +} |
|
| 1109 | +?>" /> |
|
| 852 | 1110 | </p> |
| 853 | 1111 | <p> |
| 854 | 1112 | <label for="mapidle">Map idle timeout (in minutes)</label> |
| 855 | - <input type="number" name="mapidle" id="mapidle" value="<?php if (isset($globalMapIdleTimeout)) echo $globalMapIdleTimeout; else echo '30'; ?>" /> |
|
| 1113 | + <input type="number" name="mapidle" id="mapidle" value="<?php if (isset($globalMapIdleTimeout)) { |
|
| 1114 | + echo $globalMapIdleTimeout; |
|
| 1115 | +} else { |
|
| 1116 | + echo '30'; |
|
| 1117 | +} |
|
| 1118 | +?>" /> |
|
| 856 | 1119 | <p class="help-block">0 to disable</p> |
| 857 | 1120 | </p> |
| 858 | 1121 | <p> |
@@ -867,12 +1130,20 @@ discard block |
||
| 867 | 1130 | <br /> |
| 868 | 1131 | <p> |
| 869 | 1132 | <label for="closestmindist">Distance to airport set as arrival (in km)</label> |
| 870 | - <input type="number" name="closestmindist" id="closestmindist" value="<?php if (isset($globalClosestMinDist)) echo $globalClosestMinDist; else echo '50'; ?>" /> |
|
| 1133 | + <input type="number" name="closestmindist" id="closestmindist" value="<?php if (isset($globalClosestMinDist)) { |
|
| 1134 | + echo $globalClosestMinDist; |
|
| 1135 | +} else { |
|
| 1136 | + echo '50'; |
|
| 1137 | +} |
|
| 1138 | +?>" /> |
|
| 871 | 1139 | </p> |
| 872 | 1140 | <br /> |
| 873 | 1141 | <p> |
| 874 | 1142 | <label for="aircraftsize">Size of aircraft icon on map (default to 30px if zoom > 7 else 15px), empty to default</label> |
| 875 | - <input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize;?>" /> |
|
| 1143 | + <input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) { |
|
| 1144 | + echo $globalAircraftSize; |
|
| 1145 | +} |
|
| 1146 | +?>" /> |
|
| 876 | 1147 | </p> |
| 877 | 1148 | <br /> |
| 878 | 1149 | <p> |
@@ -885,7 +1156,12 @@ discard block |
||
| 885 | 1156 | if (extension_loaded('gd') && function_exists('gd_info')) { |
| 886 | 1157 | ?> |
| 887 | 1158 | <label for="aircrafticoncolor">Color of aircraft icon on map</label> |
| 888 | - <input type="color" name="aircrafticoncolor" id="aircrafticoncolor" value="#<?php if (isset($globalAircraftIconColor)) echo $globalAircraftIconColor; else echo '1a3151'; ?>" /> |
|
| 1159 | + <input type="color" name="aircrafticoncolor" id="aircrafticoncolor" value="#<?php if (isset($globalAircraftIconColor)) { |
|
| 1160 | + echo $globalAircraftIconColor; |
|
| 1161 | +} else { |
|
| 1162 | + echo '1a3151'; |
|
| 1163 | +} |
|
| 1164 | +?>" /> |
|
| 889 | 1165 | <?php |
| 890 | 1166 | if (!is_writable('../cache')) { |
| 891 | 1167 | ?> |
@@ -903,14 +1179,27 @@ discard block |
||
| 903 | 1179 | <p> |
| 904 | 1180 | <label for="airportzoom">Zoom level minimum to see airports icons</label> |
| 905 | 1181 | <div class="range"> |
| 906 | - <input type="range" name="airportzoom" id="airportzoom" value="<?php if (isset($globalAirportZoom)) echo $globalAirportZoom; else echo '7'; ?>" /> |
|
| 907 | - <output id="range"><?php if (isset($globalAirportZoom)) echo $globalAirportZoom; else echo '7'; ?></output> |
|
| 1182 | + <input type="range" name="airportzoom" id="airportzoom" value="<?php if (isset($globalAirportZoom)) { |
|
| 1183 | + echo $globalAirportZoom; |
|
| 1184 | +} else { |
|
| 1185 | + echo '7'; |
|
| 1186 | +} |
|
| 1187 | +?>" /> |
|
| 1188 | + <output id="range"><?php if (isset($globalAirportZoom)) { |
|
| 1189 | + echo $globalAirportZoom; |
|
| 1190 | +} else { |
|
| 1191 | + echo '7'; |
|
| 1192 | +} |
|
| 1193 | +?></output> |
|
| 908 | 1194 | </div> |
| 909 | 1195 | </p> |
| 910 | 1196 | <br /> |
| 911 | 1197 | <p> |
| 912 | 1198 | <label for="customcss">Custom CSS web path</label> |
| 913 | - <input type="text" name="customcss" id="customcss" value="<?php if (isset($globalCustomCSS)) echo $globalCustomCSS; ?>" /> |
|
| 1199 | + <input type="text" name="customcss" id="customcss" value="<?php if (isset($globalCustomCSS)) { |
|
| 1200 | + echo $globalCustomCSS; |
|
| 1201 | +} |
|
| 1202 | +?>" /> |
|
| 914 | 1203 | </p> |
| 915 | 1204 | </fieldset> |
| 916 | 1205 | <input type="submit" name="submit" value="Create/Update database & write setup" /> |
@@ -937,8 +1226,12 @@ discard block |
||
| 937 | 1226 | $dbhost = filter_input(INPUT_POST,'dbhost',FILTER_SANITIZE_STRING); |
| 938 | 1227 | $dbport = filter_input(INPUT_POST,'dbport',FILTER_SANITIZE_STRING); |
| 939 | 1228 | |
| 940 | - if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) $error .= 'Mysql driver for PDO must be loaded'; |
|
| 941 | - if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) $error .= 'PosgreSQL driver for PDO must be loaded'; |
|
| 1229 | + if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) { |
|
| 1230 | + $error .= 'Mysql driver for PDO must be loaded'; |
|
| 1231 | + } |
|
| 1232 | + if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) { |
|
| 1233 | + $error .= 'PosgreSQL driver for PDO must be loaded'; |
|
| 1234 | + } |
|
| 942 | 1235 | |
| 943 | 1236 | $_SESSION['database_root'] = $dbroot; |
| 944 | 1237 | $_SESSION['database_rootpass'] = $dbrootpass; |
@@ -1006,15 +1299,23 @@ discard block |
||
| 1006 | 1299 | $source_city = $_POST['source_city']; |
| 1007 | 1300 | $source_country = $_POST['source_country']; |
| 1008 | 1301 | $source_ref = $_POST['source_ref']; |
| 1009 | - if (isset($source_id)) $source_id = $_POST['source_id']; |
|
| 1010 | - else $source_id = array(); |
|
| 1302 | + if (isset($source_id)) { |
|
| 1303 | + $source_id = $_POST['source_id']; |
|
| 1304 | + } else { |
|
| 1305 | + $source_id = array(); |
|
| 1306 | + } |
|
| 1011 | 1307 | |
| 1012 | 1308 | $sources = array(); |
| 1013 | 1309 | foreach ($source_name as $keys => $name) { |
| 1014 | - 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]); |
|
| 1015 | - 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]); |
|
| 1310 | + if (isset($source_id[$keys])) { |
|
| 1311 | + $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]); |
|
| 1312 | + } else { |
|
| 1313 | + $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]); |
|
| 1314 | + } |
|
| 1315 | + } |
|
| 1316 | + if (count($sources) > 0) { |
|
| 1317 | + $_SESSION['sources'] = $sources; |
|
| 1016 | 1318 | } |
| 1017 | - if (count($sources) > 0) $_SESSION['sources'] = $sources; |
|
| 1018 | 1319 | |
| 1019 | 1320 | //$sbshost = filter_input(INPUT_POST,'sbshost',FILTER_SANITIZE_STRING); |
| 1020 | 1321 | //$sbsport = filter_input(INPUT_POST,'sbsport',FILTER_SANITIZE_NUMBER_INT); |
@@ -1035,14 +1336,23 @@ discard block |
||
| 1035 | 1336 | $datasource = filter_input(INPUT_POST,'datasource',FILTER_SANITIZE_STRING); |
| 1036 | 1337 | |
| 1037 | 1338 | $globalaircraft = filter_input(INPUT_POST,'globalaircraft',FILTER_SANITIZE_STRING); |
| 1038 | - if ($globalaircraft == 'aircraft') $settings = array_merge($settings,array('globalAircraft' => 'TRUE')); |
|
| 1039 | - else $settings = array_merge($settings,array('globalAircraft' => 'FALSE')); |
|
| 1339 | + if ($globalaircraft == 'aircraft') { |
|
| 1340 | + $settings = array_merge($settings,array('globalAircraft' => 'TRUE')); |
|
| 1341 | + } else { |
|
| 1342 | + $settings = array_merge($settings,array('globalAircraft' => 'FALSE')); |
|
| 1343 | + } |
|
| 1040 | 1344 | $globaltracker = filter_input(INPUT_POST,'globaltracker',FILTER_SANITIZE_STRING); |
| 1041 | - if ($globaltracker == 'tracker') $settings = array_merge($settings,array('globalTracker' => 'TRUE')); |
|
| 1042 | - else $settings = array_merge($settings,array('globalTracker' => 'FALSE')); |
|
| 1345 | + if ($globaltracker == 'tracker') { |
|
| 1346 | + $settings = array_merge($settings,array('globalTracker' => 'TRUE')); |
|
| 1347 | + } else { |
|
| 1348 | + $settings = array_merge($settings,array('globalTracker' => 'FALSE')); |
|
| 1349 | + } |
|
| 1043 | 1350 | $globalmarine = filter_input(INPUT_POST,'globalmarine',FILTER_SANITIZE_STRING); |
| 1044 | - if ($globalmarine == 'marine') $settings = array_merge($settings,array('globalMarine' => 'TRUE')); |
|
| 1045 | - else $settings = array_merge($settings,array('globalMarine' => 'FALSE')); |
|
| 1351 | + if ($globalmarine == 'marine') { |
|
| 1352 | + $settings = array_merge($settings,array('globalMarine' => 'TRUE')); |
|
| 1353 | + } else { |
|
| 1354 | + $settings = array_merge($settings,array('globalMarine' => 'FALSE')); |
|
| 1355 | + } |
|
| 1046 | 1356 | |
| 1047 | 1357 | /* |
| 1048 | 1358 | $globalSBS1Hosts = array(); |
@@ -1064,23 +1374,37 @@ discard block |
||
| 1064 | 1374 | $name = $_POST['name']; |
| 1065 | 1375 | $format = $_POST['format']; |
| 1066 | 1376 | $timezones = $_POST['timezones']; |
| 1067 | - if (isset($_POST['sourcestats'])) $sourcestats = $_POST['sourcestats']; |
|
| 1068 | - else $sourcestats = array(); |
|
| 1069 | - if (isset($_POST['noarchive'])) $noarchive = $_POST['noarchive']; |
|
| 1070 | - else $noarchive = array(); |
|
| 1377 | + if (isset($_POST['sourcestats'])) { |
|
| 1378 | + $sourcestats = $_POST['sourcestats']; |
|
| 1379 | + } else { |
|
| 1380 | + $sourcestats = array(); |
|
| 1381 | + } |
|
| 1382 | + if (isset($_POST['noarchive'])) { |
|
| 1383 | + $noarchive = $_POST['noarchive']; |
|
| 1384 | + } else { |
|
| 1385 | + $noarchive = array(); |
|
| 1386 | + } |
|
| 1071 | 1387 | $gSources = array(); |
| 1072 | 1388 | $forcepilots = false; |
| 1073 | 1389 | foreach ($host as $key => $h) { |
| 1074 | - if (isset($sourcestats[$key]) && $sourcestats[$key] == 1) $cov = 'TRUE'; |
|
| 1075 | - else $cov = 'FALSE'; |
|
| 1076 | - if (isset($noarchive[$key]) && $noarchive[$key] == 1) $arch = 'TRUE'; |
|
| 1077 | - else $arch = 'FALSE'; |
|
| 1390 | + if (isset($sourcestats[$key]) && $sourcestats[$key] == 1) { |
|
| 1391 | + $cov = 'TRUE'; |
|
| 1392 | + } else { |
|
| 1393 | + $cov = 'FALSE'; |
|
| 1394 | + } |
|
| 1395 | + if (isset($noarchive[$key]) && $noarchive[$key] == 1) { |
|
| 1396 | + $arch = 'TRUE'; |
|
| 1397 | + } else { |
|
| 1398 | + $arch = 'FALSE'; |
|
| 1399 | + } |
|
| 1078 | 1400 | if (strpos($format[$key],'_callback')) { |
| 1079 | 1401 | $gSources[] = array('host' => $h, 'pass' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'TRUE'); |
| 1080 | 1402 | } elseif ($h != '' || $name[$key] != '') { |
| 1081 | 1403 | $gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'FALSE'); |
| 1082 | 1404 | } |
| 1083 | - if ($format[$key] == 'airwhere') $forcepilots = true; |
|
| 1405 | + if ($format[$key] == 'airwhere') { |
|
| 1406 | + $forcepilots = true; |
|
| 1407 | + } |
|
| 1084 | 1408 | } |
| 1085 | 1409 | $settings = array_merge($settings,array('globalSources' => $gSources)); |
| 1086 | 1410 | |
@@ -1108,7 +1432,9 @@ discard block |
||
| 1108 | 1432 | $zoidistance = filter_input(INPUT_POST,'zoidistance',FILTER_SANITIZE_NUMBER_INT); |
| 1109 | 1433 | if ($zoilatitude != '' && $zoilongitude != '' && $zoidistance != '') { |
| 1110 | 1434 | $settings = array_merge($settings,array('globalDistanceIgnore' => array('latitude' => $zoilatitude,'longitude' => $zoilongitude,'distance' => $zoidistance))); |
| 1111 | - } else $settings = array_merge($settings,array('globalDistanceIgnore' => array())); |
|
| 1435 | + } else { |
|
| 1436 | + $settings = array_merge($settings,array('globalDistanceIgnore' => array())); |
|
| 1437 | + } |
|
| 1112 | 1438 | |
| 1113 | 1439 | $refresh = filter_input(INPUT_POST,'refresh',FILTER_SANITIZE_NUMBER_INT); |
| 1114 | 1440 | $settings = array_merge($settings,array('globalLiveInterval' => $refresh)); |
@@ -1147,7 +1473,9 @@ discard block |
||
| 1147 | 1473 | |
| 1148 | 1474 | // Create in settings.php keys not yet configurable if not already here |
| 1149 | 1475 | //if (!isset($globalImageBingKey)) $settings = array_merge($settings,array('globalImageBingKey' => '')); |
| 1150 | - if (!isset($globalDebug)) $settings = array_merge($settings,array('globalDebug' => 'TRUE')); |
|
| 1476 | + if (!isset($globalDebug)) { |
|
| 1477 | + $settings = array_merge($settings,array('globalDebug' => 'TRUE')); |
|
| 1478 | + } |
|
| 1151 | 1479 | |
| 1152 | 1480 | $resetyearstats = filter_input(INPUT_POST,'resetyearstats',FILTER_SANITIZE_STRING); |
| 1153 | 1481 | if ($resetyearstats == 'resetyearstats') { |
@@ -1184,37 +1512,56 @@ discard block |
||
| 1184 | 1512 | } |
| 1185 | 1513 | */ |
| 1186 | 1514 | $settings = array_merge($settings,array('globalFlightAware' => 'FALSE')); |
| 1187 | - if ($globalsbs == 'sbs') $settings = array_merge($settings,array('globalSBS1' => 'TRUE')); |
|
| 1188 | - else $settings = array_merge($settings,array('globalSBS1' => 'FALSE')); |
|
| 1189 | - if ($globalaprs == 'aprs') $settings = array_merge($settings,array('globalAPRS' => 'TRUE')); |
|
| 1190 | - else $settings = array_merge($settings,array('globalAPRS' => 'FALSE')); |
|
| 1515 | + if ($globalsbs == 'sbs') { |
|
| 1516 | + $settings = array_merge($settings,array('globalSBS1' => 'TRUE')); |
|
| 1517 | + } else { |
|
| 1518 | + $settings = array_merge($settings,array('globalSBS1' => 'FALSE')); |
|
| 1519 | + } |
|
| 1520 | + if ($globalaprs == 'aprs') { |
|
| 1521 | + $settings = array_merge($settings,array('globalAPRS' => 'TRUE')); |
|
| 1522 | + } else { |
|
| 1523 | + $settings = array_merge($settings,array('globalAPRS' => 'FALSE')); |
|
| 1524 | + } |
|
| 1191 | 1525 | $va = false; |
| 1192 | 1526 | if ($globalivao == 'ivao') { |
| 1193 | 1527 | $settings = array_merge($settings,array('globalIVAO' => 'TRUE')); |
| 1194 | 1528 | $va = true; |
| 1195 | - } else $settings = array_merge($settings,array('globalIVAO' => 'FALSE')); |
|
| 1529 | + } else { |
|
| 1530 | + $settings = array_merge($settings,array('globalIVAO' => 'FALSE')); |
|
| 1531 | + } |
|
| 1196 | 1532 | if ($globalvatsim == 'vatsim') { |
| 1197 | 1533 | $settings = array_merge($settings,array('globalVATSIM' => 'TRUE')); |
| 1198 | 1534 | $va = true; |
| 1199 | - } else $settings = array_merge($settings,array('globalVATSIM' => 'FALSE')); |
|
| 1535 | + } else { |
|
| 1536 | + $settings = array_merge($settings,array('globalVATSIM' => 'FALSE')); |
|
| 1537 | + } |
|
| 1200 | 1538 | if ($globalphpvms == 'phpvms') { |
| 1201 | 1539 | $settings = array_merge($settings,array('globalphpVMS' => 'TRUE')); |
| 1202 | 1540 | $va = true; |
| 1203 | - } else $settings = array_merge($settings,array('globalphpVMS' => 'FALSE')); |
|
| 1541 | + } else { |
|
| 1542 | + $settings = array_merge($settings,array('globalphpVMS' => 'FALSE')); |
|
| 1543 | + } |
|
| 1204 | 1544 | if ($globalvam == 'vam') { |
| 1205 | 1545 | $settings = array_merge($settings,array('globalVAM' => 'TRUE')); |
| 1206 | 1546 | $va = true; |
| 1207 | - } else $settings = array_merge($settings,array('globalVAM' => 'FALSE')); |
|
| 1547 | + } else { |
|
| 1548 | + $settings = array_merge($settings,array('globalVAM' => 'FALSE')); |
|
| 1549 | + } |
|
| 1208 | 1550 | if ($va) { |
| 1209 | 1551 | $settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE','globalTranslationFetch' => 'FALSE')); |
| 1210 | - } else $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE')); |
|
| 1552 | + } else { |
|
| 1553 | + $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE')); |
|
| 1554 | + } |
|
| 1211 | 1555 | if ($globalva == 'va' || $va) { |
| 1212 | 1556 | $settings = array_merge($settings,array('globalVA' => 'TRUE')); |
| 1213 | 1557 | $settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE')); |
| 1214 | 1558 | } else { |
| 1215 | 1559 | $settings = array_merge($settings,array('globalVA' => 'FALSE')); |
| 1216 | - if ($forcepilots) $settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE')); |
|
| 1217 | - else $settings = array_merge($settings,array('globalUsePilot' => 'FALSE','globalUseOwner' => 'TRUE')); |
|
| 1560 | + if ($forcepilots) { |
|
| 1561 | + $settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE')); |
|
| 1562 | + } else { |
|
| 1563 | + $settings = array_merge($settings,array('globalUsePilot' => 'FALSE','globalUseOwner' => 'TRUE')); |
|
| 1564 | + } |
|
| 1218 | 1565 | } |
| 1219 | 1566 | |
| 1220 | 1567 | |
@@ -1390,7 +1737,9 @@ discard block |
||
| 1390 | 1737 | $settings = array_merge($settings,array('globalNoAirlines' => 'FALSE')); |
| 1391 | 1738 | } |
| 1392 | 1739 | |
| 1393 | - if (!isset($globalTransaction)) $settings = array_merge($settings,array('globalTransaction' => 'TRUE')); |
|
| 1740 | + if (!isset($globalTransaction)) { |
|
| 1741 | + $settings = array_merge($settings,array('globalTransaction' => 'TRUE')); |
|
| 1742 | + } |
|
| 1394 | 1743 | |
| 1395 | 1744 | // Set some defaults values... |
| 1396 | 1745 | if (!isset($globalAircraftImageSources)) { |
@@ -1405,15 +1754,23 @@ discard block |
||
| 1405 | 1754 | |
| 1406 | 1755 | $settings = array_merge($settings,array('globalInstalled' => 'TRUE')); |
| 1407 | 1756 | |
| 1408 | - if ($error == '') settings::modify_settings($settings); |
|
| 1409 | - if ($error == '') settings::comment_settings($settings_comment); |
|
| 1757 | + if ($error == '') { |
|
| 1758 | + settings::modify_settings($settings); |
|
| 1759 | + } |
|
| 1760 | + if ($error == '') { |
|
| 1761 | + settings::comment_settings($settings_comment); |
|
| 1762 | + } |
|
| 1410 | 1763 | if ($error != '') { |
| 1411 | 1764 | print '<div class="info column">'.$error.'</div>'; |
| 1412 | 1765 | require('../footer.php'); |
| 1413 | 1766 | exit; |
| 1414 | 1767 | } else { |
| 1415 | - if (isset($_POST['waypoints']) && $_POST['waypoints'] == 'waypoints') $_SESSION['waypoints'] = 1; |
|
| 1416 | - if (isset($_POST['owner']) && $_POST['owner'] == 'owner') $_SESSION['owner'] = 1; |
|
| 1768 | + if (isset($_POST['waypoints']) && $_POST['waypoints'] == 'waypoints') { |
|
| 1769 | + $_SESSION['waypoints'] = 1; |
|
| 1770 | + } |
|
| 1771 | + if (isset($_POST['owner']) && $_POST['owner'] == 'owner') { |
|
| 1772 | + $_SESSION['owner'] = 1; |
|
| 1773 | + } |
|
| 1417 | 1774 | if (isset($_POST['createdb'])) { |
| 1418 | 1775 | $_SESSION['install'] = 'database_create'; |
| 1419 | 1776 | } else { |
@@ -1449,10 +1806,18 @@ discard block |
||
| 1449 | 1806 | $popw = false; |
| 1450 | 1807 | foreach ($_SESSION['done'] as $done) { |
| 1451 | 1808 | print '<li>'.$done.'....<strong>SUCCESS</strong></li>'; |
| 1452 | - if ($done == 'Create database') $pop = true; |
|
| 1453 | - if ($_SESSION['install'] == 'database_create') $pop = true; |
|
| 1454 | - if ($_SESSION['install'] == 'database_import') $popi = true; |
|
| 1455 | - if ($_SESSION['install'] == 'waypoints') $popw = true; |
|
| 1809 | + if ($done == 'Create database') { |
|
| 1810 | + $pop = true; |
|
| 1811 | + } |
|
| 1812 | + if ($_SESSION['install'] == 'database_create') { |
|
| 1813 | + $pop = true; |
|
| 1814 | + } |
|
| 1815 | + if ($_SESSION['install'] == 'database_import') { |
|
| 1816 | + $popi = true; |
|
| 1817 | + } |
|
| 1818 | + if ($_SESSION['install'] == 'waypoints') { |
|
| 1819 | + $popw = true; |
|
| 1820 | + } |
|
| 1456 | 1821 | } |
| 1457 | 1822 | if ($pop) { |
| 1458 | 1823 | sleep(5); |
@@ -1463,7 +1828,9 @@ discard block |
||
| 1463 | 1828 | } else if ($popw) { |
| 1464 | 1829 | sleep(5); |
| 1465 | 1830 | print '<li>Populate waypoints database....<img src="../images/loading.gif" /></li>'; |
| 1466 | - } else print '<li>Update schema if needed....<img src="../images/loading.gif" /></li>'; |
|
| 1831 | + } else { |
|
| 1832 | + print '<li>Update schema if needed....<img src="../images/loading.gif" /></li>'; |
|
| 1833 | + } |
|
| 1467 | 1834 | print '</div></ul>'; |
| 1468 | 1835 | print '<div id="error"></div>'; |
| 1469 | 1836 | /* foreach ($_SESSION['done'] as $done) { |
@@ -45,15 +45,18 @@ |
||
| 45 | 45 | $output .= '"city": "'.$spotter_item['city'].'",'; |
| 46 | 46 | $output .= '"country": "'.$spotter_item['country'].'",'; |
| 47 | 47 | $output .= '"altitude": "'.$spotter_item['altitude'].'",'; |
| 48 | - if ($spotter_item['name'] != '' && $spotter_item['city'] != '' && $spotter_item['country'] != '') |
|
| 49 | - $output .= '"popupContent": "'.$spotter_item['name'].' : '.$spotter_item['city'].', '.$spotter_item['country'].'",'; |
|
| 50 | - elseif ($spotter_item['location_id'] != '') |
|
| 51 | - $output .= '"popupContent": "'.$spotter_item['location_id'].'",'; |
|
| 48 | + if ($spotter_item['name'] != '' && $spotter_item['city'] != '' && $spotter_item['country'] != '') { |
|
| 49 | + $output .= '"popupContent": "'.$spotter_item['name'].' : '.$spotter_item['city'].', '.$spotter_item['country'].'",'; |
|
| 50 | + } elseif ($spotter_item['location_id'] != '') { |
|
| 51 | + $output .= '"popupContent": "'.$spotter_item['location_id'].'",'; |
|
| 52 | + } |
|
| 52 | 53 | $output .= '"icon": "'.$globalURL.'/images/'.$spotter_item['logo'].'",'; |
| 53 | 54 | $output .= '"type": "'.$spotter_item['type'].'",'; |
| 54 | 55 | if ($spotter_item['type'] == 'wx') { |
| 55 | 56 | $weather = json_decode($spotter_item['description'],true); |
| 56 | - if (isset($weather['temp'])) $output.= '"temp": "'.$weather['temp'].'",'; |
|
| 57 | + if (isset($weather['temp'])) { |
|
| 58 | + $output.= '"temp": "'.$weather['temp'].'",'; |
|
| 59 | + } |
|
| 57 | 60 | } |
| 58 | 61 | $output .= '"image_thumb": "'.$spotter_item['image_thumb'].'"'; |
| 59 | 62 | $output .= '},'; |
@@ -14,31 +14,31 @@ discard block |
||
| 14 | 14 | { |
| 15 | 15 | $coords = explode(',',$_GET['coord']); |
| 16 | 16 | if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') |
| 17 | - || (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) { |
|
| 17 | + || (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) { |
|
| 18 | 18 | //$spotter_array = $Source->getAllLocationInfo(); |
| 19 | 19 | $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('gs')); |
| 20 | 20 | } |
| 21 | 21 | if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') |
| 22 | - || (!isset($_COOKIE['show_WeatherStation']) && (!isset($globalMapWeatherStation) || $globalMapWeatherStation === TRUE))) { |
|
| 22 | + || (!isset($_COOKIE['show_WeatherStation']) && (!isset($globalMapWeatherStation) || $globalMapWeatherStation === TRUE))) { |
|
| 23 | 23 | $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('wx')); |
| 24 | 24 | } |
| 25 | 25 | if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') |
| 26 | - || (!isset($_COOKIE['show_Lightning']) && (!isset($globalMapLightning) || $globalMapLightning === TRUE))) { |
|
| 26 | + || (!isset($_COOKIE['show_Lightning']) && (!isset($globalMapLightning) || $globalMapLightning === TRUE))) { |
|
| 27 | 27 | $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('lightning')); |
| 28 | 28 | } |
| 29 | 29 | $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('')); |
| 30 | 30 | } else { |
| 31 | 31 | if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') |
| 32 | - || (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) { |
|
| 32 | + || (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) { |
|
| 33 | 33 | //$spotter_array = $Source->getAllLocationInfo(); |
| 34 | 34 | $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('gs')); |
| 35 | 35 | } |
| 36 | 36 | if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') |
| 37 | - || (!isset($_COOKIE['show_WeatherStation']) && (!isset($globalMapWeatherStation) || $globalMapWeatherStation === TRUE))) { |
|
| 37 | + || (!isset($_COOKIE['show_WeatherStation']) && (!isset($globalMapWeatherStation) || $globalMapWeatherStation === TRUE))) { |
|
| 38 | 38 | $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('wx')); |
| 39 | 39 | } |
| 40 | 40 | if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') |
| 41 | - || (!isset($_COOKIE['show_Lightning']) && (!isset($globalMapLightning) || $globalMapLightning === TRUE))) { |
|
| 41 | + || (!isset($_COOKIE['show_Lightning']) && (!isset($globalMapLightning) || $globalMapLightning === TRUE))) { |
|
| 42 | 42 | $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('lightning')); |
| 43 | 43 | } |
| 44 | 44 | $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('')); |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | date_default_timezone_set('UTC'); |
| 54 | 54 | //waypoint plotting |
| 55 | 55 | $output .= '{"type": "Feature",'; |
| 56 | - $output .= '"properties": {'; |
|
| 56 | + $output .= '"properties": {'; |
|
| 57 | 57 | $output .= '"id": "'.$spotter_item['id'].'",'; |
| 58 | 58 | $output .= '"location_id": "'.$spotter_item['location_id'].'",'; |
| 59 | 59 | $output .= '"name": "'.$spotter_item['name'].'",'; |
@@ -71,13 +71,13 @@ discard block |
||
| 71 | 71 | if (isset($weather['temp'])) $output.= '"temp": "'.$weather['temp'].'",'; |
| 72 | 72 | } |
| 73 | 73 | $output .= '"image_thumb": "'.$spotter_item['image_thumb'].'"'; |
| 74 | - $output .= '},'; |
|
| 75 | - $output .= '"geometry": {'; |
|
| 74 | + $output .= '},'; |
|
| 75 | + $output .= '"geometry": {'; |
|
| 76 | 76 | $output .= '"type": "Point",'; |
| 77 | 77 | $output .= '"coordinates": ['; |
| 78 | - $output .= $spotter_item['longitude'].', '.$spotter_item['latitude']; |
|
| 78 | + $output .= $spotter_item['longitude'].', '.$spotter_item['latitude']; |
|
| 79 | 79 | $output .= ']'; |
| 80 | - $output .= '}'; |
|
| 80 | + $output .= '}'; |
|
| 81 | 81 | $output .= '},'; |
| 82 | 82 | } |
| 83 | 83 | $output = substr($output, 0, -1); |
@@ -12,43 +12,43 @@ discard block |
||
| 12 | 12 | if (!isset($globalDemo)) { |
| 13 | 13 | if (isset($_GET['coord'])) |
| 14 | 14 | { |
| 15 | - $coords = explode(',',$_GET['coord']); |
|
| 15 | + $coords = explode(',', $_GET['coord']); |
|
| 16 | 16 | if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') |
| 17 | 17 | || (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) { |
| 18 | 18 | //$spotter_array = $Source->getAllLocationInfo(); |
| 19 | - $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('gs')); |
|
| 19 | + $spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('gs')); |
|
| 20 | 20 | } |
| 21 | 21 | if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') |
| 22 | 22 | || (!isset($_COOKIE['show_WeatherStation']) && (!isset($globalMapWeatherStation) || $globalMapWeatherStation === TRUE))) { |
| 23 | - $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('wx')); |
|
| 23 | + $spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('wx')); |
|
| 24 | 24 | } |
| 25 | 25 | if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') |
| 26 | 26 | || (!isset($_COOKIE['show_Lightning']) && (!isset($globalMapLightning) || $globalMapLightning === TRUE))) { |
| 27 | - $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('lightning')); |
|
| 27 | + $spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('lightning')); |
|
| 28 | 28 | } |
| 29 | - $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('')); |
|
| 29 | + $spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('')); |
|
| 30 | 30 | } else { |
| 31 | 31 | if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') |
| 32 | 32 | || (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) { |
| 33 | 33 | //$spotter_array = $Source->getAllLocationInfo(); |
| 34 | - $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('gs')); |
|
| 34 | + $spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('gs')); |
|
| 35 | 35 | } |
| 36 | 36 | if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') |
| 37 | 37 | || (!isset($_COOKIE['show_WeatherStation']) && (!isset($globalMapWeatherStation) || $globalMapWeatherStation === TRUE))) { |
| 38 | - $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('wx')); |
|
| 38 | + $spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('wx')); |
|
| 39 | 39 | } |
| 40 | 40 | if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') |
| 41 | 41 | || (!isset($_COOKIE['show_Lightning']) && (!isset($globalMapLightning) || $globalMapLightning === TRUE))) { |
| 42 | - $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('lightning')); |
|
| 42 | + $spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('lightning')); |
|
| 43 | 43 | } |
| 44 | - $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('')); |
|
| 44 | + $spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('')); |
|
| 45 | 45 | } |
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | $output = '{"type": "FeatureCollection","features": ['; |
| 49 | 49 | if (!empty($spotter_array) && count($spotter_array) > 0) |
| 50 | 50 | { |
| 51 | - foreach($spotter_array as $spotter_item) |
|
| 51 | + foreach ($spotter_array as $spotter_item) |
|
| 52 | 52 | { |
| 53 | 53 | date_default_timezone_set('UTC'); |
| 54 | 54 | //waypoint plotting |
@@ -67,8 +67,8 @@ discard block |
||
| 67 | 67 | $output .= '"icon": "'.$globalURL.'/images/'.$spotter_item['logo'].'",'; |
| 68 | 68 | $output .= '"type": "'.$spotter_item['type'].'",'; |
| 69 | 69 | if ($spotter_item['type'] == 'wx') { |
| 70 | - $weather = json_decode($spotter_item['description'],true); |
|
| 71 | - if (isset($weather['temp'])) $output.= '"temp": "'.$weather['temp'].'",'; |
|
| 70 | + $weather = json_decode($spotter_item['description'], true); |
|
| 71 | + if (isset($weather['temp'])) $output .= '"temp": "'.$weather['temp'].'",'; |
|
| 72 | 72 | } |
| 73 | 73 | $output .= '"image_thumb": "'.$spotter_item['image_thumb'].'"'; |
| 74 | 74 | $output .= '},'; |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | $output .= '}'; |
| 81 | 81 | $output .= '},'; |
| 82 | 82 | } |
| 83 | - $output = substr($output, 0, -1); |
|
| 83 | + $output = substr($output, 0, -1); |
|
| 84 | 84 | } |
| 85 | 85 | $output .= ']}'; |
| 86 | 86 | |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | if (isset($this->all_tracked[$key]['id'])) { |
| 48 | 48 | //echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].' '.$this->all_tracked[$key]['longitude']."\n"; |
| 49 | 49 | $Tracker = new Tracker($this->db); |
| 50 | - $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']); |
|
| 50 | + $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'], $this->all_tracked[$key]['ident'], $this->all_tracked[$key]['latitude'], $this->all_tracked[$key]['longitude'], $this->all_tracked[$key]['altitude'], $this->all_tracked[$key]['speed'], $this->all_tracked[$key]['datetime']); |
|
| 51 | 51 | } |
| 52 | 52 | } |
| 53 | 53 | } |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | if ($globalDebug) echo 'Delete old values and update latest data...'."\n"; |
| 59 | 59 | foreach ($this->all_tracked as $key => $flight) { |
| 60 | 60 | if (isset($flight['lastupdate'])) { |
| 61 | - if ($flight['lastupdate'] < (time()-3000)) { |
|
| 61 | + if ($flight['lastupdate'] < (time() - 3000)) { |
|
| 62 | 62 | if (isset($this->all_tracked[$key]['id'])) { |
| 63 | 63 | if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n"; |
| 64 | 64 | /* |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | //$real_arrival = $this->arrival($key); |
| 70 | 70 | $Tracker = new Tracker($this->db); |
| 71 | 71 | if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') { |
| 72 | - $result = $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed']); |
|
| 72 | + $result = $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'], $this->all_tracked[$key]['ident'], $this->all_tracked[$key]['latitude'], $this->all_tracked[$key]['longitude'], $this->all_tracked[$key]['altitude'], $this->all_tracked[$key]['speed']); |
|
| 73 | 73 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 74 | 74 | } |
| 75 | 75 | // Put in archive |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | $send = false; |
| 90 | 90 | |
| 91 | 91 | // SBS format is CSV format |
| 92 | - if(is_array($line) && isset($line['ident'])) { |
|
| 92 | + if (is_array($line) && isset($line['ident'])) { |
|
| 93 | 93 | //print_r($line); |
| 94 | 94 | if (isset($line['ident'])) { |
| 95 | 95 | |
@@ -113,33 +113,33 @@ discard block |
||
| 113 | 113 | |
| 114 | 114 | if (!isset($this->all_tracked[$id])) { |
| 115 | 115 | $this->all_tracked[$id] = array(); |
| 116 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedTracker' => 0)); |
|
| 117 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => '')); |
|
| 118 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time())); |
|
| 116 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('addedTracker' => 0)); |
|
| 117 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('ident' => '', 'latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '', 'source_name' => '', 'comment'=> '', 'type' => '', 'noarchive' => false, 'putinarchive' => true, 'over_country' => '')); |
|
| 118 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('lastupdate' => time())); |
|
| 119 | 119 | if (!isset($line['id'])) { |
| 120 | 120 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 121 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 122 | - } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id'])); |
|
| 121 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $id.'-'.date('YmdHi'))); |
|
| 122 | + } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $line['id'])); |
|
| 123 | 123 | if ($globalAllTracked !== FALSE) $dataFound = true; |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | - if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) { |
|
| 126 | + if (isset($line['datetime']) && strtotime($line['datetime']) > time() - 20*60 && strtotime($line['datetime']) < time() + 20*60) { |
|
| 127 | 127 | if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_tracked[$id]['datetime'])) { |
| 128 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime'])); |
|
| 128 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('datetime' => $line['datetime'])); |
|
| 129 | 129 | } else { |
| 130 | 130 | if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n"; |
| 131 | 131 | elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n"; |
| 132 | 132 | return ''; |
| 133 | 133 | } |
| 134 | - } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
|
| 134 | + } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time() - 20*60) { |
|
| 135 | 135 | if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n"; |
| 136 | 136 | return ''; |
| 137 | - } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) { |
|
| 137 | + } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time() + 20*60) { |
|
| 138 | 138 | if ($globalDebug) echo "!!! Date is in the future ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n"; |
| 139 | 139 | return ''; |
| 140 | 140 | } elseif (!isset($line['datetime'])) { |
| 141 | 141 | date_default_timezone_set('UTC'); |
| 142 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => date('Y-m-d H:i:s'))); |
|
| 142 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('datetime' => date('Y-m-d H:i:s'))); |
|
| 143 | 143 | } else { |
| 144 | 144 | if ($globalDebug) echo "!!! Unknow date error ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n"; |
| 145 | 145 | return ''; |
@@ -147,38 +147,38 @@ discard block |
||
| 147 | 147 | |
| 148 | 148 | //if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9-]+$/', $line['ident'])) { |
| 149 | 149 | if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident']))) { |
| 150 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident']))); |
|
| 150 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('ident' => trim($line['ident']))); |
|
| 151 | 151 | if ($this->all_tracked[$id]['addedTracker'] == 1) { |
| 152 | 152 | $timeelapsed = microtime(true); |
| 153 | 153 | $Tracker = new Tracker($this->db); |
| 154 | 154 | $fromsource = NULL; |
| 155 | - $result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource); |
|
| 155 | + $result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $fromsource); |
|
| 156 | 156 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 157 | 157 | $Tracker->db = null; |
| 158 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 158 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 159 | 159 | } |
| 160 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'])); |
|
| 160 | + if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $this->all_tracked[$id]['ident'])); |
|
| 161 | 161 | } |
| 162 | 162 | |
| 163 | 163 | if (isset($line['speed']) && $line['speed'] != '') { |
| 164 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed']))); |
|
| 165 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true)); |
|
| 164 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed' => round($line['speed']))); |
|
| 165 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed_fromsrc' => true)); |
|
| 166 | 166 | } else if (!isset($this->all_tracked[$id]['speed_fromsrc']) && isset($this->all_tracked[$id]['time_last_coord']) && $this->all_tracked[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) { |
| 167 | - $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m'); |
|
| 167 | + $distance = $Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm'); |
|
| 168 | 168 | if ($distance > 100 && $distance < 10000) { |
| 169 | 169 | $speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']); |
| 170 | 170 | $speed = $speed*3.6; |
| 171 | - if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed))); |
|
| 171 | + if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed' => round($speed))); |
|
| 172 | 172 | if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['ident']." : ".$speed." - distance : ".$distance."\n"; |
| 173 | 173 | } |
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
| 177 | - if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']); |
|
| 177 | + if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time() - $this->all_tracked[$id]['time_last_coord']); |
|
| 178 | 178 | else unset($timediff); |
| 179 | - if ($this->tmd > 5 || !isset($timediff) || $timediff > 100 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) { |
|
| 179 | + if ($this->tmd > 5 || !isset($timediff) || $timediff > 100 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff, $Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')))) { |
|
| 180 | 180 | if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) { |
| 181 | - if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'],0.1)) { |
|
| 181 | + if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'], $this->all_tracked[$id]['archive_longitude'], $this->all_tracked[$id]['livedb_latitude'], $this->all_tracked[$id]['livedb_longitude'], $line['latitude'], $line['longitude'], 0.1)) { |
|
| 182 | 182 | $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
| 183 | 183 | $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
| 184 | 184 | $this->all_tracked[$id]['putinarchive'] = true; |
@@ -186,10 +186,10 @@ discard block |
||
| 186 | 186 | if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
| 187 | 187 | $timeelapsed = microtime(true); |
| 188 | 188 | $Tracker = new Tracker($this->db); |
| 189 | - $all_country = $Tracker->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
|
| 189 | + $all_country = $Tracker->getCountryFromLatitudeLongitude($line['latitude'], $line['longitude']); |
|
| 190 | 190 | if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2']; |
| 191 | 191 | $Tracker->db = null; |
| 192 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 192 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 193 | 193 | $this->tmd = 0; |
| 194 | 194 | if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n"; |
| 195 | 195 | } |
@@ -197,75 +197,75 @@ discard block |
||
| 197 | 197 | |
| 198 | 198 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 199 | 199 | if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
| 200 | - if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') { |
|
| 200 | + if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude'] - $line['latitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') { |
|
| 201 | 201 | $this->all_tracked[$id]['livedb_latitude'] = $line['latitude']; |
| 202 | 202 | $dataFound = true; |
| 203 | 203 | $this->all_tracked[$id]['time_last_coord'] = time(); |
| 204 | 204 | } |
| 205 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude'])); |
|
| 205 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('latitude' => $line['latitude'])); |
|
| 206 | 206 | } |
| 207 | 207 | if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) { |
| 208 | 208 | if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
| 209 | 209 | if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
| 210 | - if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') { |
|
| 210 | + if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude'] - $line['longitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') { |
|
| 211 | 211 | $this->all_tracked[$id]['livedb_longitude'] = $line['longitude']; |
| 212 | 212 | $dataFound = true; |
| 213 | 213 | $this->all_tracked[$id]['time_last_coord'] = time(); |
| 214 | 214 | } |
| 215 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('longitude' => $line['longitude'])); |
|
| 215 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('longitude' => $line['longitude'])); |
|
| 216 | 216 | } |
| 217 | 217 | |
| 218 | 218 | } else if ($globalDebug && $timediff > 20) { |
| 219 | 219 | $this->tmd = $this->tmd + 1; |
| 220 | 220 | if ($line['latitude'] != $this->all_tracked[$id]['latitude'] && $line['longitude'] != $this->all_tracked[$id]['longitude']) { |
| 221 | 221 | echo '!!! Too much distance in short time... for '.$this->all_tracked[$id]['ident']."\n"; |
| 222 | - echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')."m -"; |
|
| 223 | - echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')/$timediff)*3.6)." km/h - "; |
|
| 222 | + echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')."m -"; |
|
| 223 | + echo 'Speed : '.(($Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')/$timediff)*3.6)." km/h - "; |
|
| 224 | 224 | echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_tracked[$id]['latitude'].' - prev long : '.$this->all_tracked[$id]['longitude']." \n"; |
| 225 | 225 | } |
| 226 | 226 | } |
| 227 | 227 | } |
| 228 | 228 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 229 | 229 | if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true; |
| 230 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update'])); |
|
| 230 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('last_update' => $line['last_update'])); |
|
| 231 | 231 | } |
| 232 | 232 | if (isset($line['format_source']) && $line['format_source'] != '') { |
| 233 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source'])); |
|
| 233 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('format_source' => $line['format_source'])); |
|
| 234 | 234 | } |
| 235 | 235 | if (isset($line['source_name']) && $line['source_name'] != '') { |
| 236 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name'])); |
|
| 236 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('source_name' => $line['source_name'])); |
|
| 237 | 237 | } |
| 238 | 238 | if (isset($line['comment']) && $line['comment'] != '') { |
| 239 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('comment' => $line['comment'])); |
|
| 239 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('comment' => $line['comment'])); |
|
| 240 | 240 | //$dataFound = true; |
| 241 | 241 | } |
| 242 | 242 | if (isset($line['type']) && $line['type'] != '') { |
| 243 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type'])); |
|
| 243 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('type' => $line['type'])); |
|
| 244 | 244 | //$dataFound = true; |
| 245 | 245 | } |
| 246 | 246 | |
| 247 | 247 | if (isset($line['altitude']) && $line['altitude'] != '') { |
| 248 | 248 | //if (!isset($this->all_tracked[$id]['altitude']) || $this->all_tracked[$id]['altitude'] == '' || ($this->all_tracked[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
| 249 | - if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_tracked[$id]['altitude']) > 3) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 250 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude' => $line['altitude'])); |
|
| 251 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude_real' => $line['altitude'])); |
|
| 249 | + if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100) - $this->all_tracked[$id]['altitude']) > 3) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 250 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('altitude' => $line['altitude'])); |
|
| 251 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('altitude_real' => $line['altitude'])); |
|
| 252 | 252 | //$dataFound = true; |
| 253 | 253 | //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
| 254 | 254 | } |
| 255 | 255 | |
| 256 | 256 | if (isset($line['noarchive']) && $line['noarchive'] === true) { |
| 257 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true)); |
|
| 257 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('noarchive' => true)); |
|
| 258 | 258 | } |
| 259 | 259 | |
| 260 | 260 | if (isset($line['heading']) && $line['heading'] != '') { |
| 261 | - if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 262 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading']))); |
|
| 263 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true)); |
|
| 261 | + if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading'] - round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 262 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading' => round($line['heading']))); |
|
| 263 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading_fromsrc' => true)); |
|
| 264 | 264 | //$dataFound = true; |
| 265 | 265 | } elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) { |
| 266 | - $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']); |
|
| 267 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading))); |
|
| 268 | - if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 266 | + $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'], $this->all_tracked[$id]['archive_longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude']); |
|
| 267 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading' => round($heading))); |
|
| 268 | + if (abs($this->all_tracked[$id]['heading'] - round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 269 | 269 | if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n"; |
| 270 | 270 | } |
| 271 | 271 | //if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
@@ -273,54 +273,54 @@ discard block |
||
| 273 | 273 | if ($dataFound === true && isset($this->all_tracked[$id]['ident'])) { |
| 274 | 274 | $this->all_tracked[$id]['lastupdate'] = time(); |
| 275 | 275 | if ($this->all_tracked[$id]['addedTracker'] == 0) { |
| 276 | - if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == '' || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 276 | + if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == '' || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 277 | 277 | if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) { |
| 278 | 278 | if ($globalDebug) echo "Check if aircraft is already in DB..."; |
| 279 | 279 | $timeelapsed = microtime(true); |
| 280 | 280 | $TrackerLive = new TrackerLive($this->db); |
| 281 | 281 | if (isset($line['id'])) { |
| 282 | 282 | $recent_ident = $TrackerLive->checkIdRecent($line['id']); |
| 283 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 283 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 284 | 284 | } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') { |
| 285 | 285 | $recent_ident = $TrackerLive->checkIdentRecent($this->all_tracked[$id]['ident']); |
| 286 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 286 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 287 | 287 | } else $recent_ident = ''; |
| 288 | - $TrackerLive->db=null; |
|
| 288 | + $TrackerLive->db = null; |
|
| 289 | 289 | |
| 290 | 290 | if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
| 291 | 291 | elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
| 292 | 292 | } else { |
| 293 | 293 | $recent_ident = ''; |
| 294 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0)); |
|
| 294 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('forcenew' => 0)); |
|
| 295 | 295 | } |
| 296 | 296 | //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
| 297 | - if($recent_ident == "") |
|
| 297 | + if ($recent_ident == "") |
|
| 298 | 298 | { |
| 299 | 299 | if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." in archive DB : "; |
| 300 | 300 | //adds the spotter data for the archive |
| 301 | 301 | $highlight = ''; |
| 302 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi'))); |
|
| 302 | + if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi'))); |
|
| 303 | 303 | $timeelapsed = microtime(true); |
| 304 | 304 | $Tracker = new Tracker($this->db); |
| 305 | - $result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']); |
|
| 305 | + $result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'], $this->all_tracked[$id]['type'], $this->all_tracked[$id]['format_source'], $this->all_tracked[$id]['source_name']); |
|
| 306 | 306 | $Tracker->db = null; |
| 307 | 307 | if ($globalDebug && isset($result)) echo $result."\n"; |
| 308 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 308 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 309 | 309 | |
| 310 | 310 | |
| 311 | 311 | // Add source stat in DB |
| 312 | 312 | $Stats = new Stats($this->db); |
| 313 | 313 | if (!empty($this->stats)) { |
| 314 | 314 | if ($globalDebug) echo 'Add source stats : '; |
| 315 | - foreach($this->stats as $date => $data) { |
|
| 316 | - foreach($data as $source => $sourced) { |
|
| 315 | + foreach ($this->stats as $date => $data) { |
|
| 316 | + foreach ($data as $source => $sourced) { |
|
| 317 | 317 | //print_r($sourced); |
| 318 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date); |
|
| 319 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date); |
|
| 318 | + if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']), $source, 'polar_tracker', $date); |
|
| 319 | + if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']), $source, 'hist_tracker', $date); |
|
| 320 | 320 | if (isset($sourced['msg'])) { |
| 321 | 321 | if (time() - $sourced['msg']['date'] > 10) { |
| 322 | 322 | $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
| 323 | - echo $Stats->addStatSource($nbmsg,$source,'msg_tracker',$date); |
|
| 323 | + echo $Stats->addStatSource($nbmsg, $source, 'msg_tracker', $date); |
|
| 324 | 324 | unset($this->stats[$date][$source]['msg']); |
| 325 | 325 | } |
| 326 | 326 | } |
@@ -343,7 +343,7 @@ discard block |
||
| 343 | 343 | //TrackerLive->deleteLiveTrackerDataNotUpdated(); |
| 344 | 344 | $TrackerLive = new TrackerLive($this->db); |
| 345 | 345 | $TrackerLive->deleteLiveTrackerData(); |
| 346 | - $TrackerLive->db=null; |
|
| 346 | + $TrackerLive->db = null; |
|
| 347 | 347 | if ($globalDebug) echo " Done\n"; |
| 348 | 348 | $this->last_delete = time(); |
| 349 | 349 | } |
@@ -352,7 +352,7 @@ discard block |
||
| 352 | 352 | $this->all_tracked[$id]['addedTracker'] = 1; |
| 353 | 353 | if (isset($globalDaemon) && !$globalDaemon) { |
| 354 | 354 | $Tracker = new Tracker($this->db); |
| 355 | - $Tracker->updateLatestTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$this->all_tracked[$id]['altitude'],$this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime']); |
|
| 355 | + $Tracker->updateLatestTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime']); |
|
| 356 | 356 | $Tracker->db = null; |
| 357 | 357 | } |
| 358 | 358 | |
@@ -366,14 +366,14 @@ discard block |
||
| 366 | 366 | $ignoreImport = false; |
| 367 | 367 | |
| 368 | 368 | if (!$ignoreImport) { |
| 369 | - if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 369 | + if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 370 | 370 | if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : "; |
| 371 | 371 | $timeelapsed = microtime(true); |
| 372 | 372 | $TrackerLive = new TrackerLive($this->db); |
| 373 | - $result = $TrackerLive->addLiveTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']); |
|
| 373 | + $result = $TrackerLive->addLiveTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'], $this->all_tracked[$id]['comment'], $this->all_tracked[$id]['type'], $this->all_tracked[$id]['noarchive'], $this->all_tracked[$id]['format_source'], $this->all_tracked[$id]['source_name'], $this->all_tracked[$id]['over_country']); |
|
| 374 | 374 | $TrackerLive->db = null; |
| 375 | 375 | $this->all_tracked[$id]['putinarchive'] = false; |
| 376 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 376 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 377 | 377 | |
| 378 | 378 | // Put statistics in $this->stats variable |
| 379 | 379 | |
@@ -390,19 +390,19 @@ discard block |
||
| 390 | 390 | $latitude = $globalCenterLatitude; |
| 391 | 391 | $longitude = $globalCenterLongitude; |
| 392 | 392 | } |
| 393 | - $this->source_location[$source] = array('latitude' => $latitude,'longitude' => $longitude); |
|
| 393 | + $this->source_location[$source] = array('latitude' => $latitude, 'longitude' => $longitude); |
|
| 394 | 394 | } else { |
| 395 | 395 | $latitude = $this->source_location[$source]['latitude']; |
| 396 | 396 | $longitude = $this->source_location[$source]['longitude']; |
| 397 | 397 | } |
| 398 | - $stats_heading = $Common->getHeading($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']); |
|
| 398 | + $stats_heading = $Common->getHeading($latitude, $longitude, $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude']); |
|
| 399 | 399 | //$stats_heading = $stats_heading%22.5; |
| 400 | 400 | $stats_heading = round($stats_heading/22.5); |
| 401 | - $stats_distance = $Common->distance($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']); |
|
| 401 | + $stats_distance = $Common->distance($latitude, $longitude, $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude']); |
|
| 402 | 402 | $current_date = date('Y-m-d'); |
| 403 | 403 | if ($stats_heading == 16) $stats_heading = 0; |
| 404 | 404 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
| 405 | - for ($i=0;$i<=15;$i++) { |
|
| 405 | + for ($i = 0; $i <= 15; $i++) { |
|
| 406 | 406 | $this->stats[$current_date][$source]['polar'][$i] = 0; |
| 407 | 407 | } |
| 408 | 408 | $this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance; |
@@ -417,9 +417,9 @@ discard block |
||
| 417 | 417 | if (!isset($this->stats[$current_date][$source]['hist'][$distance])) { |
| 418 | 418 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
| 419 | 419 | end($this->stats[$current_date][$source]['hist']); |
| 420 | - $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 420 | + $mini = key($this->stats[$current_date][$source]['hist']) + 10; |
|
| 421 | 421 | } else $mini = 0; |
| 422 | - for ($i=$mini;$i<=$distance;$i+=10) { |
|
| 422 | + for ($i = $mini; $i <= $distance; $i += 10) { |
|
| 423 | 423 | $this->stats[$current_date][$source]['hist'][$i] = 0; |
| 424 | 424 | } |
| 425 | 425 | $this->stats[$current_date][$source]['hist'][$distance] = 1; |
@@ -431,7 +431,7 @@ discard block |
||
| 431 | 431 | $this->all_tracked[$id]['lastupdate'] = time(); |
| 432 | 432 | if ($this->all_tracked[$id]['putinarchive']) $send = true; |
| 433 | 433 | if ($globalDebug) echo $result."\n"; |
| 434 | - } elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
|
| 434 | + } elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude'])."\n"; |
|
| 435 | 435 | //$this->del(); |
| 436 | 436 | |
| 437 | 437 | |
@@ -7,16 +7,16 @@ discard block |
||
| 7 | 7 | require_once(dirname(__FILE__).'/class.Source.php'); |
| 8 | 8 | |
| 9 | 9 | class TrackerImport { |
| 10 | - private $all_tracked = array(); |
|
| 11 | - private $last_delete_hourly = 0; |
|
| 12 | - private $last_delete = 0; |
|
| 13 | - private $stats = array(); |
|
| 14 | - private $tmd = 0; |
|
| 15 | - private $source_location = array(); |
|
| 16 | - public $db = null; |
|
| 17 | - public $nb = 0; |
|
| 10 | + private $all_tracked = array(); |
|
| 11 | + private $last_delete_hourly = 0; |
|
| 12 | + private $last_delete = 0; |
|
| 13 | + private $stats = array(); |
|
| 14 | + private $tmd = 0; |
|
| 15 | + private $source_location = array(); |
|
| 16 | + public $db = null; |
|
| 17 | + public $nb = 0; |
|
| 18 | 18 | |
| 19 | - public function __construct($dbc = null) { |
|
| 19 | + public function __construct($dbc = null) { |
|
| 20 | 20 | global $globalBeta; |
| 21 | 21 | $Connection = new Connection($dbc); |
| 22 | 22 | $this->db = $Connection->db(); |
@@ -38,50 +38,50 @@ discard block |
||
| 38 | 38 | } |
| 39 | 39 | } |
| 40 | 40 | */ |
| 41 | - } |
|
| 41 | + } |
|
| 42 | 42 | |
| 43 | - public function checkAll() { |
|
| 43 | + public function checkAll() { |
|
| 44 | 44 | global $globalDebug; |
| 45 | 45 | if ($globalDebug) echo "Update last seen tracked data...\n"; |
| 46 | 46 | foreach ($this->all_tracked as $key => $flight) { |
| 47 | - if (isset($this->all_tracked[$key]['id'])) { |
|
| 47 | + if (isset($this->all_tracked[$key]['id'])) { |
|
| 48 | 48 | //echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].' '.$this->all_tracked[$key]['longitude']."\n"; |
| 49 | - $Tracker = new Tracker($this->db); |
|
| 50 | - $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']); |
|
| 51 | - } |
|
| 49 | + $Tracker = new Tracker($this->db); |
|
| 50 | + $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']); |
|
| 51 | + } |
|
| 52 | + } |
|
| 52 | 53 | } |
| 53 | - } |
|
| 54 | 54 | |
| 55 | - public function del() { |
|
| 55 | + public function del() { |
|
| 56 | 56 | global $globalDebug; |
| 57 | 57 | // Delete old infos |
| 58 | 58 | if ($globalDebug) echo 'Delete old values and update latest data...'."\n"; |
| 59 | 59 | foreach ($this->all_tracked as $key => $flight) { |
| 60 | - if (isset($flight['lastupdate'])) { |
|
| 61 | - if ($flight['lastupdate'] < (time()-3000)) { |
|
| 62 | - if (isset($this->all_tracked[$key]['id'])) { |
|
| 63 | - if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n"; |
|
| 60 | + if (isset($flight['lastupdate'])) { |
|
| 61 | + if ($flight['lastupdate'] < (time()-3000)) { |
|
| 62 | + if (isset($this->all_tracked[$key]['id'])) { |
|
| 63 | + if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n"; |
|
| 64 | 64 | /* |
| 65 | 65 | $TrackerLive = new TrackerLive(); |
| 66 | 66 | $TrackerLive->deleteLiveTrackerDataById($this->all_tracked[$key]['id']); |
| 67 | 67 | $TrackerLive->db = null; |
| 68 | 68 | */ |
| 69 | - //$real_arrival = $this->arrival($key); |
|
| 70 | - $Tracker = new Tracker($this->db); |
|
| 71 | - if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') { |
|
| 69 | + //$real_arrival = $this->arrival($key); |
|
| 70 | + $Tracker = new Tracker($this->db); |
|
| 71 | + if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') { |
|
| 72 | 72 | $result = $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed']); |
| 73 | 73 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 74 | 74 | } |
| 75 | 75 | // Put in archive |
| 76 | 76 | // $Tracker->db = null; |
| 77 | - } |
|
| 78 | - unset($this->all_tracked[$key]); |
|
| 79 | - } |
|
| 80 | - } |
|
| 81 | - } |
|
| 82 | - } |
|
| 77 | + } |
|
| 78 | + unset($this->all_tracked[$key]); |
|
| 79 | + } |
|
| 80 | + } |
|
| 81 | + } |
|
| 82 | + } |
|
| 83 | 83 | |
| 84 | - public function add($line) { |
|
| 84 | + public function add($line) { |
|
| 85 | 85 | global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChangeTracker, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked; |
| 86 | 86 | if (!isset($globalCoordMinChangeTracker) || $globalCoordMinChangeTracker == '') $globalCoordMinChangeTracker = '0.015'; |
| 87 | 87 | date_default_timezone_set('UTC'); |
@@ -90,47 +90,47 @@ discard block |
||
| 90 | 90 | |
| 91 | 91 | // SBS format is CSV format |
| 92 | 92 | if(is_array($line) && isset($line['ident'])) { |
| 93 | - //print_r($line); |
|
| 94 | - if (isset($line['ident'])) { |
|
| 93 | + //print_r($line); |
|
| 94 | + if (isset($line['ident'])) { |
|
| 95 | 95 | |
| 96 | 96 | |
| 97 | 97 | // Increment message number |
| 98 | 98 | if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) { |
| 99 | - $current_date = date('Y-m-d'); |
|
| 100 | - if (isset($line['source_name'])) $source = $line['source_name']; |
|
| 101 | - else $source = ''; |
|
| 102 | - if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source']; |
|
| 103 | - if (!isset($this->stats[$current_date][$source]['msg'])) { |
|
| 104 | - $this->stats[$current_date][$source]['msg']['date'] = time(); |
|
| 105 | - $this->stats[$current_date][$source]['msg']['nb'] = 1; |
|
| 106 | - } else $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 99 | + $current_date = date('Y-m-d'); |
|
| 100 | + if (isset($line['source_name'])) $source = $line['source_name']; |
|
| 101 | + else $source = ''; |
|
| 102 | + if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source']; |
|
| 103 | + if (!isset($this->stats[$current_date][$source]['msg'])) { |
|
| 104 | + $this->stats[$current_date][$source]['msg']['date'] = time(); |
|
| 105 | + $this->stats[$current_date][$source]['msg']['nb'] = 1; |
|
| 106 | + } else $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | |
| 110 | 110 | $Common = new Common(); |
| 111 | - if (!isset($line['id'])) $id = trim($line['ident']); |
|
| 112 | - else $id = trim($line['id']); |
|
| 111 | + if (!isset($line['id'])) $id = trim($line['ident']); |
|
| 112 | + else $id = trim($line['id']); |
|
| 113 | 113 | |
| 114 | 114 | if (!isset($this->all_tracked[$id])) { |
| 115 | - $this->all_tracked[$id] = array(); |
|
| 116 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedTracker' => 0)); |
|
| 117 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => '')); |
|
| 118 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time())); |
|
| 119 | - if (!isset($line['id'])) { |
|
| 115 | + $this->all_tracked[$id] = array(); |
|
| 116 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedTracker' => 0)); |
|
| 117 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => '')); |
|
| 118 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time())); |
|
| 119 | + if (!isset($line['id'])) { |
|
| 120 | 120 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 121 | 121 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi'))); |
| 122 | - } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id'])); |
|
| 123 | - if ($globalAllTracked !== FALSE) $dataFound = true; |
|
| 122 | + } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id'])); |
|
| 123 | + if ($globalAllTracked !== FALSE) $dataFound = true; |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) { |
| 127 | - if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_tracked[$id]['datetime'])) { |
|
| 127 | + if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_tracked[$id]['datetime'])) { |
|
| 128 | 128 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime'])); |
| 129 | - } else { |
|
| 129 | + } else { |
|
| 130 | 130 | if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n"; |
| 131 | 131 | elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n"; |
| 132 | 132 | return ''; |
| 133 | - } |
|
| 133 | + } |
|
| 134 | 134 | } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
| 135 | 135 | if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n"; |
| 136 | 136 | return ''; |
@@ -147,38 +147,38 @@ discard block |
||
| 147 | 147 | |
| 148 | 148 | //if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9-]+$/', $line['ident'])) { |
| 149 | 149 | if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident']))) { |
| 150 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident']))); |
|
| 151 | - if ($this->all_tracked[$id]['addedTracker'] == 1) { |
|
| 150 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident']))); |
|
| 151 | + if ($this->all_tracked[$id]['addedTracker'] == 1) { |
|
| 152 | 152 | $timeelapsed = microtime(true); |
| 153 | - $Tracker = new Tracker($this->db); |
|
| 154 | - $fromsource = NULL; |
|
| 155 | - $result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource); |
|
| 153 | + $Tracker = new Tracker($this->db); |
|
| 154 | + $fromsource = NULL; |
|
| 155 | + $result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource); |
|
| 156 | 156 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 157 | 157 | $Tracker->db = null; |
| 158 | 158 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 159 | - } |
|
| 160 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'])); |
|
| 159 | + } |
|
| 160 | + if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'])); |
|
| 161 | 161 | } |
| 162 | 162 | |
| 163 | 163 | if (isset($line['speed']) && $line['speed'] != '') { |
| 164 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed']))); |
|
| 165 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true)); |
|
| 164 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed']))); |
|
| 165 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true)); |
|
| 166 | 166 | } else if (!isset($this->all_tracked[$id]['speed_fromsrc']) && isset($this->all_tracked[$id]['time_last_coord']) && $this->all_tracked[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) { |
| 167 | - $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m'); |
|
| 168 | - if ($distance > 100 && $distance < 10000) { |
|
| 167 | + $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m'); |
|
| 168 | + if ($distance > 100 && $distance < 10000) { |
|
| 169 | 169 | $speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']); |
| 170 | 170 | $speed = $speed*3.6; |
| 171 | 171 | if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed))); |
| 172 | 172 | if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['ident']." : ".$speed." - distance : ".$distance."\n"; |
| 173 | - } |
|
| 173 | + } |
|
| 174 | 174 | } |
| 175 | 175 | |
| 176 | - if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
|
| 177 | - if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']); |
|
| 178 | - else unset($timediff); |
|
| 179 | - if ($this->tmd > 5 || !isset($timediff) || $timediff > 100 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) { |
|
| 176 | + if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
|
| 177 | + if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']); |
|
| 178 | + else unset($timediff); |
|
| 179 | + if ($this->tmd > 5 || !isset($timediff) || $timediff > 100 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) { |
|
| 180 | 180 | if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) { |
| 181 | - if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'],0.1)) { |
|
| 181 | + if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'],0.1)) { |
|
| 182 | 182 | $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
| 183 | 183 | $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
| 184 | 184 | $this->all_tracked[$id]['putinarchive'] = true; |
@@ -192,30 +192,30 @@ discard block |
||
| 192 | 192 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 193 | 193 | $this->tmd = 0; |
| 194 | 194 | if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n"; |
| 195 | - } |
|
| 195 | + } |
|
| 196 | 196 | } |
| 197 | 197 | |
| 198 | 198 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 199 | 199 | if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
| 200 | 200 | if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') { |
| 201 | - $this->all_tracked[$id]['livedb_latitude'] = $line['latitude']; |
|
| 202 | - $dataFound = true; |
|
| 203 | - $this->all_tracked[$id]['time_last_coord'] = time(); |
|
| 201 | + $this->all_tracked[$id]['livedb_latitude'] = $line['latitude']; |
|
| 202 | + $dataFound = true; |
|
| 203 | + $this->all_tracked[$id]['time_last_coord'] = time(); |
|
| 204 | 204 | } |
| 205 | 205 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude'])); |
| 206 | 206 | } |
| 207 | 207 | if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) { |
| 208 | - if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 208 | + if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 209 | 209 | if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
| 210 | 210 | if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') { |
| 211 | - $this->all_tracked[$id]['livedb_longitude'] = $line['longitude']; |
|
| 212 | - $dataFound = true; |
|
| 213 | - $this->all_tracked[$id]['time_last_coord'] = time(); |
|
| 211 | + $this->all_tracked[$id]['livedb_longitude'] = $line['longitude']; |
|
| 212 | + $dataFound = true; |
|
| 213 | + $this->all_tracked[$id]['time_last_coord'] = time(); |
|
| 214 | 214 | } |
| 215 | 215 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('longitude' => $line['longitude'])); |
| 216 | 216 | } |
| 217 | 217 | |
| 218 | - } else if ($globalDebug && $timediff > 20) { |
|
| 218 | + } else if ($globalDebug && $timediff > 20) { |
|
| 219 | 219 | $this->tmd = $this->tmd + 1; |
| 220 | 220 | if ($line['latitude'] != $this->all_tracked[$id]['latitude'] && $line['longitude'] != $this->all_tracked[$id]['longitude']) { |
| 221 | 221 | echo '!!! Too much distance in short time... for '.$this->all_tracked[$id]['ident']."\n"; |
@@ -223,131 +223,131 @@ discard block |
||
| 223 | 223 | echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')/$timediff)*3.6)." km/h - "; |
| 224 | 224 | echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_tracked[$id]['latitude'].' - prev long : '.$this->all_tracked[$id]['longitude']." \n"; |
| 225 | 225 | } |
| 226 | - } |
|
| 226 | + } |
|
| 227 | 227 | } |
| 228 | 228 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 229 | - if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
| 230 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update'])); |
|
| 229 | + if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
| 230 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update'])); |
|
| 231 | 231 | } |
| 232 | 232 | if (isset($line['format_source']) && $line['format_source'] != '') { |
| 233 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source'])); |
|
| 233 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source'])); |
|
| 234 | 234 | } |
| 235 | 235 | if (isset($line['source_name']) && $line['source_name'] != '') { |
| 236 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name'])); |
|
| 236 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name'])); |
|
| 237 | 237 | } |
| 238 | 238 | if (isset($line['comment']) && $line['comment'] != '') { |
| 239 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('comment' => $line['comment'])); |
|
| 240 | - //$dataFound = true; |
|
| 239 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('comment' => $line['comment'])); |
|
| 240 | + //$dataFound = true; |
|
| 241 | 241 | } |
| 242 | 242 | if (isset($line['type']) && $line['type'] != '') { |
| 243 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type'])); |
|
| 244 | - //$dataFound = true; |
|
| 243 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type'])); |
|
| 244 | + //$dataFound = true; |
|
| 245 | 245 | } |
| 246 | 246 | |
| 247 | 247 | if (isset($line['altitude']) && $line['altitude'] != '') { |
| 248 | - //if (!isset($this->all_tracked[$id]['altitude']) || $this->all_tracked[$id]['altitude'] == '' || ($this->all_tracked[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
|
| 248 | + //if (!isset($this->all_tracked[$id]['altitude']) || $this->all_tracked[$id]['altitude'] == '' || ($this->all_tracked[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
|
| 249 | 249 | if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_tracked[$id]['altitude']) > 3) $this->all_tracked[$id]['putinarchive'] = true; |
| 250 | 250 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude' => $line['altitude'])); |
| 251 | 251 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude_real' => $line['altitude'])); |
| 252 | 252 | //$dataFound = true; |
| 253 | - //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
|
| 253 | + //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
|
| 254 | 254 | } |
| 255 | 255 | |
| 256 | 256 | if (isset($line['noarchive']) && $line['noarchive'] === true) { |
| 257 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true)); |
|
| 257 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true)); |
|
| 258 | 258 | } |
| 259 | 259 | |
| 260 | 260 | if (isset($line['heading']) && $line['heading'] != '') { |
| 261 | - if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 262 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading']))); |
|
| 263 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true)); |
|
| 264 | - //$dataFound = true; |
|
| 261 | + if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 262 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading']))); |
|
| 263 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true)); |
|
| 264 | + //$dataFound = true; |
|
| 265 | 265 | } elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) { |
| 266 | - $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']); |
|
| 267 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading))); |
|
| 268 | - if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 269 | - if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n"; |
|
| 266 | + $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']); |
|
| 267 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading))); |
|
| 268 | + if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 269 | + if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n"; |
|
| 270 | 270 | } |
| 271 | 271 | //if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
| 272 | 272 | |
| 273 | 273 | if ($dataFound === true && isset($this->all_tracked[$id]['ident'])) { |
| 274 | - $this->all_tracked[$id]['lastupdate'] = time(); |
|
| 275 | - if ($this->all_tracked[$id]['addedTracker'] == 0) { |
|
| 276 | - if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == '' || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 277 | - if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) { |
|
| 274 | + $this->all_tracked[$id]['lastupdate'] = time(); |
|
| 275 | + if ($this->all_tracked[$id]['addedTracker'] == 0) { |
|
| 276 | + if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == '' || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 277 | + if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) { |
|
| 278 | 278 | if ($globalDebug) echo "Check if aircraft is already in DB..."; |
| 279 | 279 | $timeelapsed = microtime(true); |
| 280 | 280 | $TrackerLive = new TrackerLive($this->db); |
| 281 | 281 | if (isset($line['id'])) { |
| 282 | - $recent_ident = $TrackerLive->checkIdRecent($line['id']); |
|
| 283 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 282 | + $recent_ident = $TrackerLive->checkIdRecent($line['id']); |
|
| 283 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 284 | 284 | } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') { |
| 285 | - $recent_ident = $TrackerLive->checkIdentRecent($this->all_tracked[$id]['ident']); |
|
| 286 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 285 | + $recent_ident = $TrackerLive->checkIdentRecent($this->all_tracked[$id]['ident']); |
|
| 286 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 287 | 287 | } else $recent_ident = ''; |
| 288 | 288 | $TrackerLive->db=null; |
| 289 | 289 | |
| 290 | 290 | if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
| 291 | 291 | elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
| 292 | - } else { |
|
| 292 | + } else { |
|
| 293 | 293 | $recent_ident = ''; |
| 294 | 294 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0)); |
| 295 | - } |
|
| 296 | - //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
|
| 297 | - if($recent_ident == "") |
|
| 298 | - { |
|
| 295 | + } |
|
| 296 | + //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
|
| 297 | + if($recent_ident == "") |
|
| 298 | + { |
|
| 299 | 299 | if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." in archive DB : "; |
| 300 | 300 | //adds the spotter data for the archive |
| 301 | - $highlight = ''; |
|
| 302 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi'))); |
|
| 303 | - $timeelapsed = microtime(true); |
|
| 304 | - $Tracker = new Tracker($this->db); |
|
| 305 | - $result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']); |
|
| 306 | - $Tracker->db = null; |
|
| 307 | - if ($globalDebug && isset($result)) echo $result."\n"; |
|
| 308 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 301 | + $highlight = ''; |
|
| 302 | + if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi'))); |
|
| 303 | + $timeelapsed = microtime(true); |
|
| 304 | + $Tracker = new Tracker($this->db); |
|
| 305 | + $result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']); |
|
| 306 | + $Tracker->db = null; |
|
| 307 | + if ($globalDebug && isset($result)) echo $result."\n"; |
|
| 308 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 309 | 309 | |
| 310 | 310 | |
| 311 | - // Add source stat in DB |
|
| 312 | - $Stats = new Stats($this->db); |
|
| 313 | - if (!empty($this->stats)) { |
|
| 311 | + // Add source stat in DB |
|
| 312 | + $Stats = new Stats($this->db); |
|
| 313 | + if (!empty($this->stats)) { |
|
| 314 | 314 | if ($globalDebug) echo 'Add source stats : '; |
| 315 | - foreach($this->stats as $date => $data) { |
|
| 316 | - foreach($data as $source => $sourced) { |
|
| 317 | - //print_r($sourced); |
|
| 318 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date); |
|
| 319 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date); |
|
| 320 | - if (isset($sourced['msg'])) { |
|
| 321 | - if (time() - $sourced['msg']['date'] > 10) { |
|
| 322 | - $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
|
| 323 | - echo $Stats->addStatSource($nbmsg,$source,'msg_tracker',$date); |
|
| 324 | - unset($this->stats[$date][$source]['msg']); |
|
| 325 | - } |
|
| 326 | - } |
|
| 327 | - } |
|
| 328 | - if ($date != date('Y-m-d')) { |
|
| 329 | - unset($this->stats[$date]); |
|
| 330 | - } |
|
| 331 | - } |
|
| 332 | - if ($globalDebug) echo 'Done'."\n"; |
|
| 315 | + foreach($this->stats as $date => $data) { |
|
| 316 | + foreach($data as $source => $sourced) { |
|
| 317 | + //print_r($sourced); |
|
| 318 | + if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date); |
|
| 319 | + if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date); |
|
| 320 | + if (isset($sourced['msg'])) { |
|
| 321 | + if (time() - $sourced['msg']['date'] > 10) { |
|
| 322 | + $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
|
| 323 | + echo $Stats->addStatSource($nbmsg,$source,'msg_tracker',$date); |
|
| 324 | + unset($this->stats[$date][$source]['msg']); |
|
| 325 | + } |
|
| 326 | + } |
|
| 327 | + } |
|
| 328 | + if ($date != date('Y-m-d')) { |
|
| 329 | + unset($this->stats[$date]); |
|
| 330 | + } |
|
| 331 | + } |
|
| 332 | + if ($globalDebug) echo 'Done'."\n"; |
|
| 333 | 333 | |
| 334 | - } |
|
| 335 | - $Stats->db = null; |
|
| 334 | + } |
|
| 335 | + $Stats->db = null; |
|
| 336 | 336 | |
| 337 | - $this->del(); |
|
| 337 | + $this->del(); |
|
| 338 | 338 | //$ignoreImport = false; |
| 339 | 339 | $this->all_tracked[$id]['addedTracker'] = 1; |
| 340 | 340 | //print_r($this->all_tracked[$id]); |
| 341 | 341 | if ($this->last_delete == 0 || time() - $this->last_delete > 1800) { |
| 342 | - if ($globalDebug) echo "---- Deleting Live Tracker data older than 9 hours..."; |
|
| 343 | - //TrackerLive->deleteLiveTrackerDataNotUpdated(); |
|
| 344 | - $TrackerLive = new TrackerLive($this->db); |
|
| 345 | - $TrackerLive->deleteLiveTrackerData(); |
|
| 346 | - $TrackerLive->db=null; |
|
| 347 | - if ($globalDebug) echo " Done\n"; |
|
| 348 | - $this->last_delete = time(); |
|
| 342 | + if ($globalDebug) echo "---- Deleting Live Tracker data older than 9 hours..."; |
|
| 343 | + //TrackerLive->deleteLiveTrackerDataNotUpdated(); |
|
| 344 | + $TrackerLive = new TrackerLive($this->db); |
|
| 345 | + $TrackerLive->deleteLiveTrackerData(); |
|
| 346 | + $TrackerLive->db=null; |
|
| 347 | + if ($globalDebug) echo " Done\n"; |
|
| 348 | + $this->last_delete = time(); |
|
| 349 | 349 | } |
| 350 | - } else { |
|
| 350 | + } else { |
|
| 351 | 351 | $this->all_tracked[$id]['id'] = $recent_ident; |
| 352 | 352 | $this->all_tracked[$id]['addedTracker'] = 1; |
| 353 | 353 | if (isset($globalDaemon) && !$globalDaemon) { |
@@ -356,16 +356,16 @@ discard block |
||
| 356 | 356 | $Tracker->db = null; |
| 357 | 357 | } |
| 358 | 358 | |
| 359 | - } |
|
| 359 | + } |
|
| 360 | 360 | } |
| 361 | - } |
|
| 362 | - //adds the spotter LIVE data |
|
| 363 | - if ($globalDebug) { |
|
| 361 | + } |
|
| 362 | + //adds the spotter LIVE data |
|
| 363 | + if ($globalDebug) { |
|
| 364 | 364 | echo 'DATA : ident : '.$this->all_tracked[$id]['ident'].' - type : '.$this->all_tracked[$id]['type'].' - Latitude : '.$this->all_tracked[$id]['latitude'].' - Longitude : '.$this->all_tracked[$id]['longitude'].' - Altitude : '.$this->all_tracked[$id]['altitude'].' - Heading : '.$this->all_tracked[$id]['heading'].' - Speed : '.$this->all_tracked[$id]['speed']."\n"; |
| 365 | - } |
|
| 366 | - $ignoreImport = false; |
|
| 365 | + } |
|
| 366 | + $ignoreImport = false; |
|
| 367 | 367 | |
| 368 | - if (!$ignoreImport) { |
|
| 368 | + if (!$ignoreImport) { |
|
| 369 | 369 | if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
| 370 | 370 | if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : "; |
| 371 | 371 | $timeelapsed = microtime(true); |
@@ -403,7 +403,7 @@ discard block |
||
| 403 | 403 | if ($stats_heading == 16) $stats_heading = 0; |
| 404 | 404 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
| 405 | 405 | for ($i=0;$i<=15;$i++) { |
| 406 | - $this->stats[$current_date][$source]['polar'][$i] = 0; |
|
| 406 | + $this->stats[$current_date][$source]['polar'][$i] = 0; |
|
| 407 | 407 | } |
| 408 | 408 | $this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance; |
| 409 | 409 | } else { |
@@ -416,11 +416,11 @@ discard block |
||
| 416 | 416 | //var_dump($this->stats); |
| 417 | 417 | if (!isset($this->stats[$current_date][$source]['hist'][$distance])) { |
| 418 | 418 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
| 419 | - end($this->stats[$current_date][$source]['hist']); |
|
| 420 | - $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 419 | + end($this->stats[$current_date][$source]['hist']); |
|
| 420 | + $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 421 | 421 | } else $mini = 0; |
| 422 | 422 | for ($i=$mini;$i<=$distance;$i+=10) { |
| 423 | - $this->stats[$current_date][$source]['hist'][$i] = 0; |
|
| 423 | + $this->stats[$current_date][$source]['hist'][$i] = 0; |
|
| 424 | 424 | } |
| 425 | 425 | $this->stats[$current_date][$source]['hist'][$distance] = 1; |
| 426 | 426 | } else { |
@@ -436,22 +436,22 @@ discard block |
||
| 436 | 436 | |
| 437 | 437 | |
| 438 | 438 | if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) { |
| 439 | - if ($globalDebug) echo "---- Deleting Live Tracker data Not updated since 2 hour..."; |
|
| 440 | - $TrackerLive = new TrackerLive($this->db); |
|
| 441 | - $TrackerLive->deleteLiveTrackerDataNotUpdated(); |
|
| 442 | - $TrackerLive->db = null; |
|
| 443 | - //TrackerLive->deleteLiveTrackerData(); |
|
| 444 | - if ($globalDebug) echo " Done\n"; |
|
| 445 | - $this->last_delete_hourly = time(); |
|
| 439 | + if ($globalDebug) echo "---- Deleting Live Tracker data Not updated since 2 hour..."; |
|
| 440 | + $TrackerLive = new TrackerLive($this->db); |
|
| 441 | + $TrackerLive->deleteLiveTrackerDataNotUpdated(); |
|
| 442 | + $TrackerLive->db = null; |
|
| 443 | + //TrackerLive->deleteLiveTrackerData(); |
|
| 444 | + if ($globalDebug) echo " Done\n"; |
|
| 445 | + $this->last_delete_hourly = time(); |
|
| 446 | 446 | } |
| 447 | 447 | |
| 448 | - } |
|
| 449 | - //$ignoreImport = false; |
|
| 448 | + } |
|
| 449 | + //$ignoreImport = false; |
|
| 450 | 450 | } |
| 451 | 451 | //if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN); |
| 452 | 452 | if ($send) return $this->all_tracked[$id]; |
| 453 | - } |
|
| 453 | + } |
|
| 454 | + } |
|
| 454 | 455 | } |
| 455 | - } |
|
| 456 | 456 | } |
| 457 | 457 | ?> |
@@ -42,7 +42,9 @@ discard block |
||
| 42 | 42 | |
| 43 | 43 | public function checkAll() { |
| 44 | 44 | global $globalDebug; |
| 45 | - if ($globalDebug) echo "Update last seen tracked data...\n"; |
|
| 45 | + if ($globalDebug) { |
|
| 46 | + echo "Update last seen tracked data...\n"; |
|
| 47 | + } |
|
| 46 | 48 | foreach ($this->all_tracked as $key => $flight) { |
| 47 | 49 | if (isset($this->all_tracked[$key]['id'])) { |
| 48 | 50 | //echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].' '.$this->all_tracked[$key]['longitude']."\n"; |
@@ -55,12 +57,16 @@ discard block |
||
| 55 | 57 | public function del() { |
| 56 | 58 | global $globalDebug; |
| 57 | 59 | // Delete old infos |
| 58 | - if ($globalDebug) echo 'Delete old values and update latest data...'."\n"; |
|
| 60 | + if ($globalDebug) { |
|
| 61 | + echo 'Delete old values and update latest data...'."\n"; |
|
| 62 | + } |
|
| 59 | 63 | foreach ($this->all_tracked as $key => $flight) { |
| 60 | 64 | if (isset($flight['lastupdate'])) { |
| 61 | 65 | if ($flight['lastupdate'] < (time()-3000)) { |
| 62 | 66 | if (isset($this->all_tracked[$key]['id'])) { |
| 63 | - if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n"; |
|
| 67 | + if ($globalDebug) { |
|
| 68 | + echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n"; |
|
| 69 | + } |
|
| 64 | 70 | /* |
| 65 | 71 | $TrackerLive = new TrackerLive(); |
| 66 | 72 | $TrackerLive->deleteLiveTrackerDataById($this->all_tracked[$key]['id']); |
@@ -70,7 +76,9 @@ discard block |
||
| 70 | 76 | $Tracker = new Tracker($this->db); |
| 71 | 77 | if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') { |
| 72 | 78 | $result = $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed']); |
| 73 | - if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
|
| 79 | + if ($globalDebug && $result != 'success') { |
|
| 80 | + echo '!!! ERROR : '.$result."\n"; |
|
| 81 | + } |
|
| 74 | 82 | } |
| 75 | 83 | // Put in archive |
| 76 | 84 | // $Tracker->db = null; |
@@ -83,7 +91,9 @@ discard block |
||
| 83 | 91 | |
| 84 | 92 | public function add($line) { |
| 85 | 93 | global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChangeTracker, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked; |
| 86 | - if (!isset($globalCoordMinChangeTracker) || $globalCoordMinChangeTracker == '') $globalCoordMinChangeTracker = '0.015'; |
|
| 94 | + if (!isset($globalCoordMinChangeTracker) || $globalCoordMinChangeTracker == '') { |
|
| 95 | + $globalCoordMinChangeTracker = '0.015'; |
|
| 96 | + } |
|
| 87 | 97 | date_default_timezone_set('UTC'); |
| 88 | 98 | $dataFound = false; |
| 89 | 99 | $send = false; |
@@ -97,19 +107,29 @@ discard block |
||
| 97 | 107 | // Increment message number |
| 98 | 108 | if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) { |
| 99 | 109 | $current_date = date('Y-m-d'); |
| 100 | - if (isset($line['source_name'])) $source = $line['source_name']; |
|
| 101 | - else $source = ''; |
|
| 102 | - if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source']; |
|
| 110 | + if (isset($line['source_name'])) { |
|
| 111 | + $source = $line['source_name']; |
|
| 112 | + } else { |
|
| 113 | + $source = ''; |
|
| 114 | + } |
|
| 115 | + if ($source == '' || $line['format_source'] == 'aprs') { |
|
| 116 | + $source = $line['format_source']; |
|
| 117 | + } |
|
| 103 | 118 | if (!isset($this->stats[$current_date][$source]['msg'])) { |
| 104 | 119 | $this->stats[$current_date][$source]['msg']['date'] = time(); |
| 105 | 120 | $this->stats[$current_date][$source]['msg']['nb'] = 1; |
| 106 | - } else $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 121 | + } else { |
|
| 122 | + $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 123 | + } |
|
| 107 | 124 | } |
| 108 | 125 | |
| 109 | 126 | |
| 110 | 127 | $Common = new Common(); |
| 111 | - if (!isset($line['id'])) $id = trim($line['ident']); |
|
| 112 | - else $id = trim($line['id']); |
|
| 128 | + if (!isset($line['id'])) { |
|
| 129 | + $id = trim($line['ident']); |
|
| 130 | + } else { |
|
| 131 | + $id = trim($line['id']); |
|
| 132 | + } |
|
| 113 | 133 | |
| 114 | 134 | if (!isset($this->all_tracked[$id])) { |
| 115 | 135 | $this->all_tracked[$id] = array(); |
@@ -117,31 +137,46 @@ discard block |
||
| 117 | 137 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => '')); |
| 118 | 138 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time())); |
| 119 | 139 | if (!isset($line['id'])) { |
| 120 | - if (!isset($globalDaemon)) $globalDaemon = TRUE; |
|
| 140 | + if (!isset($globalDaemon)) { |
|
| 141 | + $globalDaemon = TRUE; |
|
| 142 | + } |
|
| 121 | 143 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi'))); |
| 122 | - } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id'])); |
|
| 123 | - if ($globalAllTracked !== FALSE) $dataFound = true; |
|
| 144 | + } else { |
|
| 145 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id'])); |
|
| 146 | + } |
|
| 147 | + if ($globalAllTracked !== FALSE) { |
|
| 148 | + $dataFound = true; |
|
| 149 | + } |
|
| 124 | 150 | } |
| 125 | 151 | |
| 126 | 152 | if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) { |
| 127 | 153 | if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_tracked[$id]['datetime'])) { |
| 128 | 154 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime'])); |
| 129 | 155 | } else { |
| 130 | - if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n"; |
|
| 131 | - elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n"; |
|
| 156 | + if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) { |
|
| 157 | + echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n"; |
|
| 158 | + } elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) { |
|
| 159 | + echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n"; |
|
| 160 | + } |
|
| 132 | 161 | return ''; |
| 133 | 162 | } |
| 134 | 163 | } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
| 135 | - if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n"; |
|
| 164 | + if ($globalDebug) { |
|
| 165 | + echo "!!! Date is too old ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n"; |
|
| 166 | + } |
|
| 136 | 167 | return ''; |
| 137 | 168 | } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) { |
| 138 | - if ($globalDebug) echo "!!! Date is in the future ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n"; |
|
| 169 | + if ($globalDebug) { |
|
| 170 | + echo "!!! Date is in the future ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n"; |
|
| 171 | + } |
|
| 139 | 172 | return ''; |
| 140 | 173 | } elseif (!isset($line['datetime'])) { |
| 141 | 174 | date_default_timezone_set('UTC'); |
| 142 | 175 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => date('Y-m-d H:i:s'))); |
| 143 | 176 | } else { |
| 144 | - if ($globalDebug) echo "!!! Unknow date error ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n"; |
|
| 177 | + if ($globalDebug) { |
|
| 178 | + echo "!!! Unknow date error ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n"; |
|
| 179 | + } |
|
| 145 | 180 | return ''; |
| 146 | 181 | } |
| 147 | 182 | |
@@ -153,11 +188,17 @@ discard block |
||
| 153 | 188 | $Tracker = new Tracker($this->db); |
| 154 | 189 | $fromsource = NULL; |
| 155 | 190 | $result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource); |
| 156 | - if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
|
| 191 | + if ($globalDebug && $result != 'success') { |
|
| 192 | + echo '!!! ERROR : '.$result."\n"; |
|
| 193 | + } |
|
| 157 | 194 | $Tracker->db = null; |
| 158 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 195 | + if ($globalDebugTimeElapsed) { |
|
| 196 | + echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 197 | + } |
|
| 198 | + } |
|
| 199 | + if (!isset($this->all_tracked[$id]['id'])) { |
|
| 200 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'])); |
|
| 159 | 201 | } |
| 160 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'])); |
|
| 161 | 202 | } |
| 162 | 203 | |
| 163 | 204 | if (isset($line['speed']) && $line['speed'] != '') { |
@@ -168,14 +209,21 @@ discard block |
||
| 168 | 209 | if ($distance > 100 && $distance < 10000) { |
| 169 | 210 | $speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']); |
| 170 | 211 | $speed = $speed*3.6; |
| 171 | - if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed))); |
|
| 172 | - if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['ident']." : ".$speed." - distance : ".$distance."\n"; |
|
| 212 | + if ($speed < 1000) { |
|
| 213 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed))); |
|
| 214 | + } |
|
| 215 | + if ($globalDebug) { |
|
| 216 | + echo "ø Calculated Speed for ".$this->all_tracked[$id]['ident']." : ".$speed." - distance : ".$distance."\n"; |
|
| 217 | + } |
|
| 173 | 218 | } |
| 174 | 219 | } |
| 175 | 220 | |
| 176 | 221 | if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
| 177 | - if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']); |
|
| 178 | - else unset($timediff); |
|
| 222 | + if (isset($this->all_tracked[$id]['time_last_coord'])) { |
|
| 223 | + $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']); |
|
| 224 | + } else { |
|
| 225 | + unset($timediff); |
|
| 226 | + } |
|
| 179 | 227 | if ($this->tmd > 5 || !isset($timediff) || $timediff > 100 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) { |
| 180 | 228 | if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) { |
| 181 | 229 | if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'],0.1)) { |
@@ -183,20 +231,30 @@ discard block |
||
| 183 | 231 | $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
| 184 | 232 | $this->all_tracked[$id]['putinarchive'] = true; |
| 185 | 233 | |
| 186 | - if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
| 234 | + if ($globalDebug) { |
|
| 235 | + echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
| 236 | + } |
|
| 187 | 237 | $timeelapsed = microtime(true); |
| 188 | 238 | $Tracker = new Tracker($this->db); |
| 189 | 239 | $all_country = $Tracker->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
| 190 | - if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2']; |
|
| 240 | + if (!empty($all_country)) { |
|
| 241 | + $this->all_tracked[$id]['over_country'] = $all_country['iso2']; |
|
| 242 | + } |
|
| 191 | 243 | $Tracker->db = null; |
| 192 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 244 | + if ($globalDebugTimeElapsed) { |
|
| 245 | + echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 246 | + } |
|
| 193 | 247 | $this->tmd = 0; |
| 194 | - if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n"; |
|
| 248 | + if ($globalDebug) { |
|
| 249 | + echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n"; |
|
| 250 | + } |
|
| 195 | 251 | } |
| 196 | 252 | } |
| 197 | 253 | |
| 198 | 254 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 199 | - if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
|
| 255 | + if (!isset($this->all_tracked[$id]['archive_latitude'])) { |
|
| 256 | + $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
|
| 257 | + } |
|
| 200 | 258 | if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') { |
| 201 | 259 | $this->all_tracked[$id]['livedb_latitude'] = $line['latitude']; |
| 202 | 260 | $dataFound = true; |
@@ -205,8 +263,12 @@ discard block |
||
| 205 | 263 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude'])); |
| 206 | 264 | } |
| 207 | 265 | if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) { |
| 208 | - if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 209 | - if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
|
| 266 | + if ($line['longitude'] > 180) { |
|
| 267 | + $line['longitude'] = $line['longitude'] - 360; |
|
| 268 | + } |
|
| 269 | + if (!isset($this->all_tracked[$id]['archive_longitude'])) { |
|
| 270 | + $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
|
| 271 | + } |
|
| 210 | 272 | if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') { |
| 211 | 273 | $this->all_tracked[$id]['livedb_longitude'] = $line['longitude']; |
| 212 | 274 | $dataFound = true; |
@@ -226,7 +288,9 @@ discard block |
||
| 226 | 288 | } |
| 227 | 289 | } |
| 228 | 290 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 229 | - if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
| 291 | + if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) { |
|
| 292 | + $dataFound = true; |
|
| 293 | + } |
|
| 230 | 294 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update'])); |
| 231 | 295 | } |
| 232 | 296 | if (isset($line['format_source']) && $line['format_source'] != '') { |
@@ -246,7 +310,9 @@ discard block |
||
| 246 | 310 | |
| 247 | 311 | if (isset($line['altitude']) && $line['altitude'] != '') { |
| 248 | 312 | //if (!isset($this->all_tracked[$id]['altitude']) || $this->all_tracked[$id]['altitude'] == '' || ($this->all_tracked[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
| 249 | - if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_tracked[$id]['altitude']) > 3) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 313 | + if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_tracked[$id]['altitude']) > 3) { |
|
| 314 | + $this->all_tracked[$id]['putinarchive'] = true; |
|
| 315 | + } |
|
| 250 | 316 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude' => $line['altitude'])); |
| 251 | 317 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude_real' => $line['altitude'])); |
| 252 | 318 | //$dataFound = true; |
@@ -258,15 +324,21 @@ discard block |
||
| 258 | 324 | } |
| 259 | 325 | |
| 260 | 326 | if (isset($line['heading']) && $line['heading'] != '') { |
| 261 | - if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 327 | + if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) { |
|
| 328 | + $this->all_tracked[$id]['putinarchive'] = true; |
|
| 329 | + } |
|
| 262 | 330 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading']))); |
| 263 | 331 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true)); |
| 264 | 332 | //$dataFound = true; |
| 265 | 333 | } elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) { |
| 266 | 334 | $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']); |
| 267 | 335 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading))); |
| 268 | - if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 269 | - if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n"; |
|
| 336 | + if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) { |
|
| 337 | + $this->all_tracked[$id]['putinarchive'] = true; |
|
| 338 | + } |
|
| 339 | + if ($globalDebug) { |
|
| 340 | + echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n"; |
|
| 341 | + } |
|
| 270 | 342 | } |
| 271 | 343 | //if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
| 272 | 344 | |
@@ -275,20 +347,31 @@ discard block |
||
| 275 | 347 | if ($this->all_tracked[$id]['addedTracker'] == 0) { |
| 276 | 348 | if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == '' || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
| 277 | 349 | if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) { |
| 278 | - if ($globalDebug) echo "Check if aircraft is already in DB..."; |
|
| 350 | + if ($globalDebug) { |
|
| 351 | + echo "Check if aircraft is already in DB..."; |
|
| 352 | + } |
|
| 279 | 353 | $timeelapsed = microtime(true); |
| 280 | 354 | $TrackerLive = new TrackerLive($this->db); |
| 281 | 355 | if (isset($line['id'])) { |
| 282 | 356 | $recent_ident = $TrackerLive->checkIdRecent($line['id']); |
| 283 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 357 | + if ($globalDebugTimeElapsed) { |
|
| 358 | + echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 359 | + } |
|
| 284 | 360 | } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') { |
| 285 | 361 | $recent_ident = $TrackerLive->checkIdentRecent($this->all_tracked[$id]['ident']); |
| 286 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 287 | - } else $recent_ident = ''; |
|
| 362 | + if ($globalDebugTimeElapsed) { |
|
| 363 | + echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 364 | + } |
|
| 365 | + } else { |
|
| 366 | + $recent_ident = ''; |
|
| 367 | + } |
|
| 288 | 368 | $TrackerLive->db=null; |
| 289 | 369 | |
| 290 | - if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
|
| 291 | - elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
|
| 370 | + if ($globalDebug && $recent_ident == '') { |
|
| 371 | + echo " Not in DB.\n"; |
|
| 372 | + } elseif ($globalDebug && $recent_ident != '') { |
|
| 373 | + echo " Already in DB.\n"; |
|
| 374 | + } |
|
| 292 | 375 | } else { |
| 293 | 376 | $recent_ident = ''; |
| 294 | 377 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0)); |
@@ -296,27 +379,41 @@ discard block |
||
| 296 | 379 | //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
| 297 | 380 | if($recent_ident == "") |
| 298 | 381 | { |
| 299 | - if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." in archive DB : "; |
|
| 382 | + if ($globalDebug) { |
|
| 383 | + echo "\o/ Add ".$this->all_tracked[$id]['ident']." in archive DB : "; |
|
| 384 | + } |
|
| 300 | 385 | //adds the spotter data for the archive |
| 301 | 386 | $highlight = ''; |
| 302 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi'))); |
|
| 387 | + if (!isset($this->all_tracked[$id]['id'])) { |
|
| 388 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi'))); |
|
| 389 | + } |
|
| 303 | 390 | $timeelapsed = microtime(true); |
| 304 | 391 | $Tracker = new Tracker($this->db); |
| 305 | 392 | $result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']); |
| 306 | 393 | $Tracker->db = null; |
| 307 | - if ($globalDebug && isset($result)) echo $result."\n"; |
|
| 308 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 394 | + if ($globalDebug && isset($result)) { |
|
| 395 | + echo $result."\n"; |
|
| 396 | + } |
|
| 397 | + if ($globalDebugTimeElapsed) { |
|
| 398 | + echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 399 | + } |
|
| 309 | 400 | |
| 310 | 401 | |
| 311 | 402 | // Add source stat in DB |
| 312 | 403 | $Stats = new Stats($this->db); |
| 313 | 404 | if (!empty($this->stats)) { |
| 314 | - if ($globalDebug) echo 'Add source stats : '; |
|
| 405 | + if ($globalDebug) { |
|
| 406 | + echo 'Add source stats : '; |
|
| 407 | + } |
|
| 315 | 408 | foreach($this->stats as $date => $data) { |
| 316 | 409 | foreach($data as $source => $sourced) { |
| 317 | 410 | //print_r($sourced); |
| 318 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date); |
|
| 319 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date); |
|
| 411 | + if (isset($sourced['polar'])) { |
|
| 412 | + echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date); |
|
| 413 | + } |
|
| 414 | + if (isset($sourced['hist'])) { |
|
| 415 | + echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date); |
|
| 416 | + } |
|
| 320 | 417 | if (isset($sourced['msg'])) { |
| 321 | 418 | if (time() - $sourced['msg']['date'] > 10) { |
| 322 | 419 | $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
@@ -329,7 +426,9 @@ discard block |
||
| 329 | 426 | unset($this->stats[$date]); |
| 330 | 427 | } |
| 331 | 428 | } |
| 332 | - if ($globalDebug) echo 'Done'."\n"; |
|
| 429 | + if ($globalDebug) { |
|
| 430 | + echo 'Done'."\n"; |
|
| 431 | + } |
|
| 333 | 432 | |
| 334 | 433 | } |
| 335 | 434 | $Stats->db = null; |
@@ -339,12 +438,16 @@ discard block |
||
| 339 | 438 | $this->all_tracked[$id]['addedTracker'] = 1; |
| 340 | 439 | //print_r($this->all_tracked[$id]); |
| 341 | 440 | if ($this->last_delete == 0 || time() - $this->last_delete > 1800) { |
| 342 | - if ($globalDebug) echo "---- Deleting Live Tracker data older than 9 hours..."; |
|
| 441 | + if ($globalDebug) { |
|
| 442 | + echo "---- Deleting Live Tracker data older than 9 hours..."; |
|
| 443 | + } |
|
| 343 | 444 | //TrackerLive->deleteLiveTrackerDataNotUpdated(); |
| 344 | 445 | $TrackerLive = new TrackerLive($this->db); |
| 345 | 446 | $TrackerLive->deleteLiveTrackerData(); |
| 346 | 447 | $TrackerLive->db=null; |
| 347 | - if ($globalDebug) echo " Done\n"; |
|
| 448 | + if ($globalDebug) { |
|
| 449 | + echo " Done\n"; |
|
| 450 | + } |
|
| 348 | 451 | $this->last_delete = time(); |
| 349 | 452 | } |
| 350 | 453 | } else { |
@@ -367,19 +470,25 @@ discard block |
||
| 367 | 470 | |
| 368 | 471 | if (!$ignoreImport) { |
| 369 | 472 | if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
| 370 | - if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : "; |
|
| 473 | + if ($globalDebug) { |
|
| 474 | + echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : "; |
|
| 475 | + } |
|
| 371 | 476 | $timeelapsed = microtime(true); |
| 372 | 477 | $TrackerLive = new TrackerLive($this->db); |
| 373 | 478 | $result = $TrackerLive->addLiveTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']); |
| 374 | 479 | $TrackerLive->db = null; |
| 375 | 480 | $this->all_tracked[$id]['putinarchive'] = false; |
| 376 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 481 | + if ($globalDebugTimeElapsed) { |
|
| 482 | + echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 483 | + } |
|
| 377 | 484 | |
| 378 | 485 | // Put statistics in $this->stats variable |
| 379 | 486 | |
| 380 | 487 | if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') { |
| 381 | 488 | $source = $this->all_tracked[$id]['source_name']; |
| 382 | - if ($source == '') $source = $this->all_tracked[$id]['format_source']; |
|
| 489 | + if ($source == '') { |
|
| 490 | + $source = $this->all_tracked[$id]['format_source']; |
|
| 491 | + } |
|
| 383 | 492 | if (!isset($this->source_location[$source])) { |
| 384 | 493 | $Location = new Source(); |
| 385 | 494 | $coord = $Location->getLocationInfobySourceName($source); |
@@ -400,7 +509,9 @@ discard block |
||
| 400 | 509 | $stats_heading = round($stats_heading/22.5); |
| 401 | 510 | $stats_distance = $Common->distance($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']); |
| 402 | 511 | $current_date = date('Y-m-d'); |
| 403 | - if ($stats_heading == 16) $stats_heading = 0; |
|
| 512 | + if ($stats_heading == 16) { |
|
| 513 | + $stats_heading = 0; |
|
| 514 | + } |
|
| 404 | 515 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
| 405 | 516 | for ($i=0;$i<=15;$i++) { |
| 406 | 517 | $this->stats[$current_date][$source]['polar'][$i] = 0; |
@@ -418,7 +529,9 @@ discard block |
||
| 418 | 529 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
| 419 | 530 | end($this->stats[$current_date][$source]['hist']); |
| 420 | 531 | $mini = key($this->stats[$current_date][$source]['hist'])+10; |
| 421 | - } else $mini = 0; |
|
| 532 | + } else { |
|
| 533 | + $mini = 0; |
|
| 534 | + } |
|
| 422 | 535 | for ($i=$mini;$i<=$distance;$i+=10) { |
| 423 | 536 | $this->stats[$current_date][$source]['hist'][$i] = 0; |
| 424 | 537 | } |
@@ -429,19 +542,29 @@ discard block |
||
| 429 | 542 | } |
| 430 | 543 | |
| 431 | 544 | $this->all_tracked[$id]['lastupdate'] = time(); |
| 432 | - if ($this->all_tracked[$id]['putinarchive']) $send = true; |
|
| 433 | - if ($globalDebug) echo $result."\n"; |
|
| 434 | - } elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
|
| 545 | + if ($this->all_tracked[$id]['putinarchive']) { |
|
| 546 | + $send = true; |
|
| 547 | + } |
|
| 548 | + if ($globalDebug) { |
|
| 549 | + echo $result."\n"; |
|
| 550 | + } |
|
| 551 | + } elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) { |
|
| 552 | + echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
|
| 553 | + } |
|
| 435 | 554 | //$this->del(); |
| 436 | 555 | |
| 437 | 556 | |
| 438 | 557 | if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) { |
| 439 | - if ($globalDebug) echo "---- Deleting Live Tracker data Not updated since 2 hour..."; |
|
| 558 | + if ($globalDebug) { |
|
| 559 | + echo "---- Deleting Live Tracker data Not updated since 2 hour..."; |
|
| 560 | + } |
|
| 440 | 561 | $TrackerLive = new TrackerLive($this->db); |
| 441 | 562 | $TrackerLive->deleteLiveTrackerDataNotUpdated(); |
| 442 | 563 | $TrackerLive->db = null; |
| 443 | 564 | //TrackerLive->deleteLiveTrackerData(); |
| 444 | - if ($globalDebug) echo " Done\n"; |
|
| 565 | + if ($globalDebug) { |
|
| 566 | + echo " Done\n"; |
|
| 567 | + } |
|
| 445 | 568 | $this->last_delete_hourly = time(); |
| 446 | 569 | } |
| 447 | 570 | |
@@ -449,7 +572,9 @@ discard block |
||
| 449 | 572 | //$ignoreImport = false; |
| 450 | 573 | } |
| 451 | 574 | //if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN); |
| 452 | - if ($send) return $this->all_tracked[$id]; |
|
| 575 | + if ($send) { |
|
| 576 | + return $this->all_tracked[$id]; |
|
| 577 | + } |
|
| 453 | 578 | } |
| 454 | 579 | } |
| 455 | 580 | } |
@@ -5,7 +5,7 @@ discard block |
||
| 5 | 5 | $Source = new Source(); |
| 6 | 6 | |
| 7 | 7 | if (isset($_GET['sourceid'])) { |
| 8 | - $sourceid = filter_input(INPUT_GET,'sourceid',FILTER_SANITIZE_NUMBER_INT); |
|
| 8 | + $sourceid = filter_input(INPUT_GET, 'sourceid', FILTER_SANITIZE_NUMBER_INT); |
|
| 9 | 9 | $source_data = $Source->getLocationInfoById($sourceid); |
| 10 | 10 | if (isset($source_data[0])) { |
| 11 | 11 | ?> |
@@ -34,8 +34,8 @@ discard block |
||
| 34 | 34 | print '</div>'; |
| 35 | 35 | |
| 36 | 36 | if ($spotter_item['city'] != '') print '<div><span>'._("City").'</span>'.$spotter_item['city'].'</div>'; |
| 37 | -if ($spotter_item['country'] !='') print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>'; |
|
| 38 | -print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'],3).', '.round($spotter_item['longitude'],3).'</div>'; |
|
| 37 | +if ($spotter_item['country'] != '') print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>'; |
|
| 38 | +print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'], 3).', '.round($spotter_item['longitude'], 3).'</div>'; |
|
| 39 | 39 | /* |
| 40 | 40 | if ($spotter_item['atc_range'] > 0) { |
| 41 | 41 | print '<div><span>'._("Range").'</span>'; |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | } |
| 45 | 45 | */ |
| 46 | 46 | if ($spotter_item['type'] == 'wx') { |
| 47 | - $weather = json_decode($spotter_item['description'],true); |
|
| 47 | + $weather = json_decode($spotter_item['description'], true); |
|
| 48 | 48 | //print_r($weather); |
| 49 | 49 | if (isset($weather['temp'])) print '<div><span>'._("Temperature").'</span>'.$weather['temp'].'°C</div>'; |
| 50 | 50 | if (isset($weather['pressure'])) print '<div><span>'._("Pressure").'</span>'.$weather['pressure'].'hPa</div>'; |
@@ -17,11 +17,17 @@ discard block |
||
| 17 | 17 | date_default_timezone_set('UTC'); |
| 18 | 18 | |
| 19 | 19 | print '<div class="top">'; |
| 20 | -if ($spotter_item['name'] != '') print '<div class="right"><div class="callsign-details"><div class="callsign">'.$spotter_item['name'].'</div>'; |
|
| 21 | -elseif ($spotter_item['location_id'] != 0) print '<div class="right"><div class="callsign-details"><div class="callsign">'.$spotter_item['location_id'].'</div>'; |
|
| 22 | -elseif ($spotter_item['type'] == 'lightning') print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Lightning").'</div>'; |
|
| 23 | -elseif ($spotter_item['type'] == 'wx') print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Weather Station").'</div>'; |
|
| 24 | -else print '<div class="right"><div class="callsign-details"><div class="callsign"></div>'; |
|
| 20 | +if ($spotter_item['name'] != '') { |
|
| 21 | + print '<div class="right"><div class="callsign-details"><div class="callsign">'.$spotter_item['name'].'</div>'; |
|
| 22 | +} elseif ($spotter_item['location_id'] != 0) { |
|
| 23 | + print '<div class="right"><div class="callsign-details"><div class="callsign">'.$spotter_item['location_id'].'</div>'; |
|
| 24 | +} elseif ($spotter_item['type'] == 'lightning') { |
|
| 25 | + print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Lightning").'</div>'; |
|
| 26 | +} elseif ($spotter_item['type'] == 'wx') { |
|
| 27 | + print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Weather Station").'</div>'; |
|
| 28 | +} else { |
|
| 29 | + print '<div class="right"><div class="callsign-details"><div class="callsign"></div>'; |
|
| 30 | +} |
|
| 25 | 31 | print '</div>'; |
| 26 | 32 | |
| 27 | 33 | print '</div></div>'; |
@@ -36,8 +42,12 @@ discard block |
||
| 36 | 42 | print $spotter_item['last_seen'].' UTC'; |
| 37 | 43 | print '</div>'; |
| 38 | 44 | |
| 39 | -if ($spotter_item['city'] != '') print '<div><span>'._("City").'</span>'.$spotter_item['city'].'</div>'; |
|
| 40 | -if ($spotter_item['country'] !='') print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>'; |
|
| 45 | +if ($spotter_item['city'] != '') { |
|
| 46 | + print '<div><span>'._("City").'</span>'.$spotter_item['city'].'</div>'; |
|
| 47 | +} |
|
| 48 | +if ($spotter_item['country'] !='') { |
|
| 49 | + print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>'; |
|
| 50 | +} |
|
| 41 | 51 | print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'],3).', '.round($spotter_item['longitude'],3).'</div>'; |
| 42 | 52 | /* |
| 43 | 53 | if ($spotter_item['atc_range'] > 0) { |
@@ -49,13 +59,27 @@ discard block |
||
| 49 | 59 | if ($spotter_item['type'] == 'wx') { |
| 50 | 60 | $weather = json_decode($spotter_item['description'],true); |
| 51 | 61 | //print_r($weather); |
| 52 | - if (isset($weather['temp'])) print '<div><span>'._("Temperature").'</span>'.$weather['temp'].'°C</div>'; |
|
| 53 | - if (isset($weather['pressure'])) print '<div><span>'._("Pressure").'</span>'.$weather['pressure'].'hPa</div>'; |
|
| 54 | - if (isset($weather['wind_gust'])) print '<div><span>'._("Wind Gust").'</span>'.$weather['wind_gust'].' km/h</div>'; |
|
| 55 | - if (isset($weather['humidity'])) print '<div><span>'._("Humidity").'</span>'.$weather['humidity'].'%</div>'; |
|
| 56 | - if (isset($weather['rain'])) print '<div><span>'._("Rain").'</span>'.$weather['rain'].' mm</div>'; |
|
| 57 | - if (isset($weather['precipitation'])) print '<div><span>'._("Precipitation 24H").'</span>'.$weather['precipitation'].' mm</div>'; |
|
| 58 | - if (isset($weather['precipitation24h'])) print '<div><span>'._("Precipitation Today").'</span>'.$weather['precipitation24h'].' mm</div>'; |
|
| 62 | + if (isset($weather['temp'])) { |
|
| 63 | + print '<div><span>'._("Temperature").'</span>'.$weather['temp'].'°C</div>'; |
|
| 64 | + } |
|
| 65 | + if (isset($weather['pressure'])) { |
|
| 66 | + print '<div><span>'._("Pressure").'</span>'.$weather['pressure'].'hPa</div>'; |
|
| 67 | + } |
|
| 68 | + if (isset($weather['wind_gust'])) { |
|
| 69 | + print '<div><span>'._("Wind Gust").'</span>'.$weather['wind_gust'].' km/h</div>'; |
|
| 70 | + } |
|
| 71 | + if (isset($weather['humidity'])) { |
|
| 72 | + print '<div><span>'._("Humidity").'</span>'.$weather['humidity'].'%</div>'; |
|
| 73 | + } |
|
| 74 | + if (isset($weather['rain'])) { |
|
| 75 | + print '<div><span>'._("Rain").'</span>'.$weather['rain'].' mm</div>'; |
|
| 76 | + } |
|
| 77 | + if (isset($weather['precipitation'])) { |
|
| 78 | + print '<div><span>'._("Precipitation 24H").'</span>'.$weather['precipitation'].' mm</div>'; |
|
| 79 | + } |
|
| 80 | + if (isset($weather['precipitation24h'])) { |
|
| 81 | + print '<div><span>'._("Precipitation Today").'</span>'.$weather['precipitation24h'].' mm</div>'; |
|
| 82 | + } |
|
| 59 | 83 | $spotter_item['description'] = $weather['comment']; |
| 60 | 84 | } |
| 61 | 85 | print '</div>'; |
@@ -16,8 +16,8 @@ discard block |
||
| 16 | 16 | require_once(dirname(__FILE__).'/../require/class.Common.php'); |
| 17 | 17 | if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php'); |
| 18 | 18 | if (isset($globalMarine) && $globalMarine) { |
| 19 | - require_once(dirname(__FILE__).'/../require/class.AIS.php'); |
|
| 20 | - require_once(dirname(__FILE__).'/../require/class.MarineImport.php'); |
|
| 19 | + require_once(dirname(__FILE__).'/../require/class.AIS.php'); |
|
| 20 | + require_once(dirname(__FILE__).'/../require/class.MarineImport.php'); |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | if (!isset($globalDebug)) $globalDebug = FALSE; |
@@ -25,42 +25,42 @@ discard block |
||
| 25 | 25 | // Check if schema is at latest version |
| 26 | 26 | $Connection = new Connection(); |
| 27 | 27 | if ($Connection->latest() === false) { |
| 28 | - echo "You MUST update to latest schema. Run install/index.php"; |
|
| 29 | - exit(); |
|
| 28 | + echo "You MUST update to latest schema. Run install/index.php"; |
|
| 29 | + exit(); |
|
| 30 | 30 | } |
| 31 | 31 | if (PHP_SAPI != 'cli') { |
| 32 | - echo "This script MUST be called from console, not a web browser."; |
|
| 32 | + echo "This script MUST be called from console, not a web browser."; |
|
| 33 | 33 | // exit(); |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | // This is to be compatible with old version of settings.php |
| 37 | 37 | if (!isset($globalSources)) { |
| 38 | - if (isset($globalSBS1Hosts)) { |
|
| 39 | - //$hosts = $globalSBS1Hosts; |
|
| 40 | - foreach ($globalSBS1Hosts as $host) { |
|
| 41 | - $globalSources[] = array('host' => $host); |
|
| 42 | - } |
|
| 43 | - } else { |
|
| 44 | - if (!isset($globalSBS1Host)) { |
|
| 45 | - echo '$globalSources MUST be defined !'; |
|
| 46 | - die; |
|
| 38 | + if (isset($globalSBS1Hosts)) { |
|
| 39 | + //$hosts = $globalSBS1Hosts; |
|
| 40 | + foreach ($globalSBS1Hosts as $host) { |
|
| 41 | + $globalSources[] = array('host' => $host); |
|
| 42 | + } |
|
| 43 | + } else { |
|
| 44 | + if (!isset($globalSBS1Host)) { |
|
| 45 | + echo '$globalSources MUST be defined !'; |
|
| 46 | + die; |
|
| 47 | 47 | } |
| 48 | 48 | //$hosts = array($globalSBS1Host.':'.$globalSBS1Port); |
| 49 | 49 | $globalSources[] = array('host' => $globalSBS1Host,'port' => $globalSBS1Port); |
| 50 | - } |
|
| 50 | + } |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | $options = getopt('s::',array('source::','server','nodaemon','idsource::','aprsserverssid::','aprsserverpass::','aprsserverhost::','aprsserverport::','format::','noaprsserver')); |
| 54 | 54 | //if (isset($options['s'])) $hosts = array($options['s']); |
| 55 | 55 | //elseif (isset($options['source'])) $hosts = array($options['source']); |
| 56 | 56 | if (isset($options['s'])) { |
| 57 | - $globalSources = array(); |
|
| 58 | - if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']); |
|
| 59 | - else $globalSources[] = array('host' => $options['s']); |
|
| 57 | + $globalSources = array(); |
|
| 58 | + if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']); |
|
| 59 | + else $globalSources[] = array('host' => $options['s']); |
|
| 60 | 60 | } elseif (isset($options['source'])) { |
| 61 | - $globalSources = array(); |
|
| 62 | - if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']); |
|
| 63 | - else $globalSources[] = array('host' => $options['source']); |
|
| 61 | + $globalSources = array(); |
|
| 62 | + if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']); |
|
| 63 | + else $globalSources[] = array('host' => $options['source']); |
|
| 64 | 64 | } |
| 65 | 65 | if (isset($options['aprsserverhost'])) { |
| 66 | 66 | $globalServerAPRS = TRUE; |
@@ -75,8 +75,8 @@ discard block |
||
| 75 | 75 | if (isset($options['idsource'])) $id_source = $options['idsource']; |
| 76 | 76 | else $id_source = 1; |
| 77 | 77 | if (isset($globalServer) && $globalServer) { |
| 78 | - if ($globalDebug) echo "Using Server Mode\n"; |
|
| 79 | - $SI=new SpotterServer(); |
|
| 78 | + if ($globalDebug) echo "Using Server Mode\n"; |
|
| 79 | + $SI=new SpotterServer(); |
|
| 80 | 80 | /* |
| 81 | 81 | require_once(dirname(__FILE__).'/../require/class.APRS.php'); |
| 82 | 82 | $SI = new adsb2aprs(); |
@@ -85,8 +85,8 @@ discard block |
||
| 85 | 85 | } else $SI=new SpotterImport($Connection->db); |
| 86 | 86 | if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db); |
| 87 | 87 | if (isset($globalMarine) && $globalMarine) { |
| 88 | - $AIS = new AIS(); |
|
| 89 | - $MI = new MarineImport($Connection->db); |
|
| 88 | + $AIS = new AIS(); |
|
| 89 | + $MI = new MarineImport($Connection->db); |
|
| 90 | 90 | } |
| 91 | 91 | //$APRS=new APRS($Connection->db); |
| 92 | 92 | $SBS=new SBS(); |
@@ -97,12 +97,12 @@ discard block |
||
| 97 | 97 | //$servertz = system('date +%Z'); |
| 98 | 98 | // signal handler - playing nice with sockets and dump1090 |
| 99 | 99 | if (function_exists('pcntl_fork')) { |
| 100 | - pcntl_signal(SIGINT, function() { |
|
| 101 | - global $sockets; |
|
| 102 | - echo "\n\nctrl-c or kill signal received. Tidying up ... "; |
|
| 103 | - die("Bye!\n"); |
|
| 104 | - }); |
|
| 105 | - pcntl_signal_dispatch(); |
|
| 100 | + pcntl_signal(SIGINT, function() { |
|
| 101 | + global $sockets; |
|
| 102 | + echo "\n\nctrl-c or kill signal received. Tidying up ... "; |
|
| 103 | + die("Bye!\n"); |
|
| 104 | + }); |
|
| 105 | + pcntl_signal_dispatch(); |
|
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | // let's try and connect |
@@ -112,36 +112,36 @@ discard block |
||
| 112 | 112 | $reset = 0; |
| 113 | 113 | |
| 114 | 114 | function connect_all($hosts) { |
| 115 | - //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs; |
|
| 116 | - global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context; |
|
| 117 | - $reset++; |
|
| 118 | - if ($globalDebug) echo 'Connect to all...'."\n"; |
|
| 119 | - foreach ($hosts as $id => $value) { |
|
| 115 | + //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs; |
|
| 116 | + global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context; |
|
| 117 | + $reset++; |
|
| 118 | + if ($globalDebug) echo 'Connect to all...'."\n"; |
|
| 119 | + foreach ($hosts as $id => $value) { |
|
| 120 | 120 | $host = $value['host']; |
| 121 | 121 | $globalSources[$id]['last_exec'] = 0; |
| 122 | 122 | // Here we check type of source(s) |
| 123 | 123 | if (filter_var($host,FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) { |
| 124 | - if (preg_match('/deltadb.txt$/i',$host)) { |
|
| 125 | - //$formats[$id] = 'deltadbtxt'; |
|
| 126 | - $globalSources[$id]['format'] = 'deltadbtxt'; |
|
| 127 | - //$last_exec['deltadbtxt'] = 0; |
|
| 128 | - if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n"; |
|
| 129 | - } else if (preg_match('/vatsim-data.txt$/i',$host)) { |
|
| 130 | - //$formats[$id] = 'vatsimtxt'; |
|
| 131 | - $globalSources[$id]['format'] = 'vatsimtxt'; |
|
| 132 | - //$last_exec['vatsimtxt'] = 0; |
|
| 133 | - if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n"; |
|
| 134 | - } else if (preg_match('/aircraftlist.json$/i',$host)) { |
|
| 135 | - //$formats[$id] = 'aircraftlistjson'; |
|
| 136 | - $globalSources[$id]['format'] = 'aircraftlistjson'; |
|
| 137 | - //$last_exec['aircraftlistjson'] = 0; |
|
| 138 | - if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n"; |
|
| 139 | - } else if (preg_match('/opensky/i',$host)) { |
|
| 140 | - //$formats[$id] = 'aircraftlistjson'; |
|
| 141 | - $globalSources[$id]['format'] = 'opensky'; |
|
| 142 | - //$last_exec['aircraftlistjson'] = 0; |
|
| 143 | - if ($globalDebug) echo "Connect to opensky source (".$host.")...\n"; |
|
| 144 | - /* |
|
| 124 | + if (preg_match('/deltadb.txt$/i',$host)) { |
|
| 125 | + //$formats[$id] = 'deltadbtxt'; |
|
| 126 | + $globalSources[$id]['format'] = 'deltadbtxt'; |
|
| 127 | + //$last_exec['deltadbtxt'] = 0; |
|
| 128 | + if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n"; |
|
| 129 | + } else if (preg_match('/vatsim-data.txt$/i',$host)) { |
|
| 130 | + //$formats[$id] = 'vatsimtxt'; |
|
| 131 | + $globalSources[$id]['format'] = 'vatsimtxt'; |
|
| 132 | + //$last_exec['vatsimtxt'] = 0; |
|
| 133 | + if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n"; |
|
| 134 | + } else if (preg_match('/aircraftlist.json$/i',$host)) { |
|
| 135 | + //$formats[$id] = 'aircraftlistjson'; |
|
| 136 | + $globalSources[$id]['format'] = 'aircraftlistjson'; |
|
| 137 | + //$last_exec['aircraftlistjson'] = 0; |
|
| 138 | + if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n"; |
|
| 139 | + } else if (preg_match('/opensky/i',$host)) { |
|
| 140 | + //$formats[$id] = 'aircraftlistjson'; |
|
| 141 | + $globalSources[$id]['format'] = 'opensky'; |
|
| 142 | + //$last_exec['aircraftlistjson'] = 0; |
|
| 143 | + if ($globalDebug) echo "Connect to opensky source (".$host.")...\n"; |
|
| 144 | + /* |
|
| 145 | 145 | // Disabled for now, site change source format |
| 146 | 146 | } else if (preg_match('/radarvirtuel.com\/list_aircrafts$/i',$host)) { |
| 147 | 147 | //$formats[$id] = 'radarvirtueljson'; |
@@ -153,121 +153,121 @@ discard block |
||
| 153 | 153 | exit(0); |
| 154 | 154 | } |
| 155 | 155 | */ |
| 156 | - } else if (preg_match('/planeUpdateFAA.php$/i',$host)) { |
|
| 157 | - //$formats[$id] = 'planeupdatefaa'; |
|
| 158 | - $globalSources[$id]['format'] = 'planeupdatefaa'; |
|
| 159 | - //$last_exec['planeupdatefaa'] = 0; |
|
| 160 | - if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n"; |
|
| 161 | - if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { |
|
| 162 | - echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
|
| 163 | - exit(0); |
|
| 164 | - } |
|
| 165 | - } else if (preg_match('/\/action.php\/acars\/data$/i',$host)) { |
|
| 166 | - //$formats[$id] = 'phpvmacars'; |
|
| 167 | - $globalSources[$id]['format'] = 'phpvmacars'; |
|
| 168 | - //$last_exec['phpvmacars'] = 0; |
|
| 169 | - if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n"; |
|
| 170 | - } else if (preg_match('/VAM-json.php$/i',$host)) { |
|
| 171 | - //$formats[$id] = 'phpvmacars'; |
|
| 172 | - $globalSources[$id]['format'] = 'vam'; |
|
| 173 | - if ($globalDebug) echo "Connect to Vam source (".$host.")...\n"; |
|
| 174 | - } else if (preg_match('/whazzup/i',$host)) { |
|
| 175 | - //$formats[$id] = 'whazzup'; |
|
| 176 | - $globalSources[$id]['format'] = 'whazzup'; |
|
| 177 | - //$last_exec['whazzup'] = 0; |
|
| 178 | - if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n"; |
|
| 179 | - } else if (preg_match('/blitzortung/i',$host)) { |
|
| 180 | - $globalSources[$id]['format'] = 'blitzortung'; |
|
| 181 | - if ($globalDebug) echo "Connect to blitzortung source (".$host.")...\n"; |
|
| 182 | - } else if (preg_match('/airwhere/i',$host)) { |
|
| 183 | - $globalSources[$id]['format'] = 'airwhere'; |
|
| 184 | - if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n"; |
|
| 185 | - } else if (preg_match('/recentpireps/i',$host)) { |
|
| 186 | - //$formats[$id] = 'pirepsjson'; |
|
| 187 | - $globalSources[$id]['format'] = 'pirepsjson'; |
|
| 188 | - //$last_exec['pirepsjson'] = 0; |
|
| 189 | - if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n"; |
|
| 190 | - } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) { |
|
| 191 | - //$formats[$id] = 'fr24json'; |
|
| 192 | - $globalSources[$id]['format'] = 'fr24json'; |
|
| 193 | - //$last_exec['fr24json'] = 0; |
|
| 194 | - if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n"; |
|
| 195 | - if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { |
|
| 196 | - echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
|
| 197 | - exit(0); |
|
| 198 | - } |
|
| 199 | - } else if (preg_match(':myshiptracking.com/:i',$host)) { |
|
| 200 | - //$formats[$id] = 'fr24json'; |
|
| 201 | - $globalSources[$id]['format'] = 'myshiptracking'; |
|
| 202 | - //$last_exec['fr24json'] = 0; |
|
| 203 | - if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n"; |
|
| 204 | - if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { |
|
| 205 | - echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
|
| 206 | - exit(0); |
|
| 207 | - } |
|
| 208 | - //} else if (preg_match('/10001/',$host)) { |
|
| 209 | - } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) { |
|
| 210 | - //$formats[$id] = 'tsv'; |
|
| 211 | - $globalSources[$id]['format'] = 'tsv'; |
|
| 212 | - if ($globalDebug) echo "Connect to tsv source (".$host.")...\n"; |
|
| 213 | - } |
|
| 214 | - } elseif (filter_var($host,FILTER_VALIDATE_URL)) { |
|
| 215 | - if ($globalSources[$id]['format'] == 'aisnmeahttp') { |
|
| 216 | - $idf = fopen($globalSources[$id]['host'],'r',false,$context); |
|
| 217 | - if ($idf !== false) { |
|
| 218 | - $httpfeeds[$id] = $idf; |
|
| 219 | - if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
|
| 220 | - } |
|
| 221 | - elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n"; |
|
| 222 | - } elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
|
| 223 | - } elseif (!filter_var($host,FILTER_VALIDATE_URL)) { |
|
| 224 | - $hostport = explode(':',$host); |
|
| 225 | - if (isset($hostport[1])) { |
|
| 156 | + } else if (preg_match('/planeUpdateFAA.php$/i',$host)) { |
|
| 157 | + //$formats[$id] = 'planeupdatefaa'; |
|
| 158 | + $globalSources[$id]['format'] = 'planeupdatefaa'; |
|
| 159 | + //$last_exec['planeupdatefaa'] = 0; |
|
| 160 | + if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n"; |
|
| 161 | + if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { |
|
| 162 | + echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
|
| 163 | + exit(0); |
|
| 164 | + } |
|
| 165 | + } else if (preg_match('/\/action.php\/acars\/data$/i',$host)) { |
|
| 166 | + //$formats[$id] = 'phpvmacars'; |
|
| 167 | + $globalSources[$id]['format'] = 'phpvmacars'; |
|
| 168 | + //$last_exec['phpvmacars'] = 0; |
|
| 169 | + if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n"; |
|
| 170 | + } else if (preg_match('/VAM-json.php$/i',$host)) { |
|
| 171 | + //$formats[$id] = 'phpvmacars'; |
|
| 172 | + $globalSources[$id]['format'] = 'vam'; |
|
| 173 | + if ($globalDebug) echo "Connect to Vam source (".$host.")...\n"; |
|
| 174 | + } else if (preg_match('/whazzup/i',$host)) { |
|
| 175 | + //$formats[$id] = 'whazzup'; |
|
| 176 | + $globalSources[$id]['format'] = 'whazzup'; |
|
| 177 | + //$last_exec['whazzup'] = 0; |
|
| 178 | + if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n"; |
|
| 179 | + } else if (preg_match('/blitzortung/i',$host)) { |
|
| 180 | + $globalSources[$id]['format'] = 'blitzortung'; |
|
| 181 | + if ($globalDebug) echo "Connect to blitzortung source (".$host.")...\n"; |
|
| 182 | + } else if (preg_match('/airwhere/i',$host)) { |
|
| 183 | + $globalSources[$id]['format'] = 'airwhere'; |
|
| 184 | + if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n"; |
|
| 185 | + } else if (preg_match('/recentpireps/i',$host)) { |
|
| 186 | + //$formats[$id] = 'pirepsjson'; |
|
| 187 | + $globalSources[$id]['format'] = 'pirepsjson'; |
|
| 188 | + //$last_exec['pirepsjson'] = 0; |
|
| 189 | + if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n"; |
|
| 190 | + } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) { |
|
| 191 | + //$formats[$id] = 'fr24json'; |
|
| 192 | + $globalSources[$id]['format'] = 'fr24json'; |
|
| 193 | + //$last_exec['fr24json'] = 0; |
|
| 194 | + if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n"; |
|
| 195 | + if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { |
|
| 196 | + echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
|
| 197 | + exit(0); |
|
| 198 | + } |
|
| 199 | + } else if (preg_match(':myshiptracking.com/:i',$host)) { |
|
| 200 | + //$formats[$id] = 'fr24json'; |
|
| 201 | + $globalSources[$id]['format'] = 'myshiptracking'; |
|
| 202 | + //$last_exec['fr24json'] = 0; |
|
| 203 | + if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n"; |
|
| 204 | + if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { |
|
| 205 | + echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
|
| 206 | + exit(0); |
|
| 207 | + } |
|
| 208 | + //} else if (preg_match('/10001/',$host)) { |
|
| 209 | + } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) { |
|
| 210 | + //$formats[$id] = 'tsv'; |
|
| 211 | + $globalSources[$id]['format'] = 'tsv'; |
|
| 212 | + if ($globalDebug) echo "Connect to tsv source (".$host.")...\n"; |
|
| 213 | + } |
|
| 214 | + } elseif (filter_var($host,FILTER_VALIDATE_URL)) { |
|
| 215 | + if ($globalSources[$id]['format'] == 'aisnmeahttp') { |
|
| 216 | + $idf = fopen($globalSources[$id]['host'],'r',false,$context); |
|
| 217 | + if ($idf !== false) { |
|
| 218 | + $httpfeeds[$id] = $idf; |
|
| 219 | + if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
|
| 220 | + } |
|
| 221 | + elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n"; |
|
| 222 | + } elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
|
| 223 | + } elseif (!filter_var($host,FILTER_VALIDATE_URL)) { |
|
| 224 | + $hostport = explode(':',$host); |
|
| 225 | + if (isset($hostport[1])) { |
|
| 226 | 226 | $port = $hostport[1]; |
| 227 | 227 | $hostn = $hostport[0]; |
| 228 | - } else { |
|
| 228 | + } else { |
|
| 229 | 229 | $port = $globalSources[$id]['port']; |
| 230 | 230 | $hostn = $globalSources[$id]['host']; |
| 231 | - } |
|
| 232 | - $Common = new Common(); |
|
| 233 | - if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) { |
|
| 234 | - $s = $Common->create_socket($hostn,$port, $errno, $errstr); |
|
| 235 | - } else { |
|
| 236 | - $s = $Common->create_socket_udp($hostn,$port, $errno, $errstr); |
|
| 237 | - } |
|
| 238 | - if ($s) { |
|
| 239 | - $sockets[$id] = $s; |
|
| 240 | - if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') { |
|
| 241 | - if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') { |
|
| 231 | + } |
|
| 232 | + $Common = new Common(); |
|
| 233 | + if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) { |
|
| 234 | + $s = $Common->create_socket($hostn,$port, $errno, $errstr); |
|
| 235 | + } else { |
|
| 236 | + $s = $Common->create_socket_udp($hostn,$port, $errno, $errstr); |
|
| 237 | + } |
|
| 238 | + if ($s) { |
|
| 239 | + $sockets[$id] = $s; |
|
| 240 | + if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') { |
|
| 241 | + if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') { |
|
| 242 | 242 | //$formats[$id] = 'aprs'; |
| 243 | 243 | $globalSources[$id]['format'] = 'aprs'; |
| 244 | 244 | //$aprs_connect = 0; |
| 245 | 245 | //$use_aprs = true; |
| 246 | - } elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') { |
|
| 246 | + } elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') { |
|
| 247 | 247 | $globalSources[$id]['format'] = 'vrstcp'; |
| 248 | - } elseif ($port == '10001') { |
|
| 249 | - //$formats[$id] = 'tsv'; |
|
| 250 | - $globalSources[$id]['format'] = 'tsv'; |
|
| 251 | - } elseif ($port == '30002') { |
|
| 252 | - //$formats[$id] = 'raw'; |
|
| 253 | - $globalSources[$id]['format'] = 'raw'; |
|
| 254 | - } elseif ($port == '5001') { |
|
| 255 | - //$formats[$id] = 'raw'; |
|
| 256 | - $globalSources[$id]['format'] = 'flightgearmp'; |
|
| 257 | - } elseif ($port == '30005') { |
|
| 248 | + } elseif ($port == '10001') { |
|
| 249 | + //$formats[$id] = 'tsv'; |
|
| 250 | + $globalSources[$id]['format'] = 'tsv'; |
|
| 251 | + } elseif ($port == '30002') { |
|
| 252 | + //$formats[$id] = 'raw'; |
|
| 253 | + $globalSources[$id]['format'] = 'raw'; |
|
| 254 | + } elseif ($port == '5001') { |
|
| 255 | + //$formats[$id] = 'raw'; |
|
| 256 | + $globalSources[$id]['format'] = 'flightgearmp'; |
|
| 257 | + } elseif ($port == '30005') { |
|
| 258 | 258 | // Not yet supported |
| 259 | - //$formats[$id] = 'beast'; |
|
| 260 | - $globalSources[$id]['format'] = 'beast'; |
|
| 261 | - //} else $formats[$id] = 'sbs'; |
|
| 262 | - } else $globalSources[$id]['format'] = 'sbs'; |
|
| 263 | - //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n"; |
|
| 259 | + //$formats[$id] = 'beast'; |
|
| 260 | + $globalSources[$id]['format'] = 'beast'; |
|
| 261 | + //} else $formats[$id] = 'sbs'; |
|
| 262 | + } else $globalSources[$id]['format'] = 'sbs'; |
|
| 263 | + //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n"; |
|
| 264 | 264 | } |
| 265 | 265 | if ($globalDebug) echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n"; |
| 266 | - } else { |
|
| 266 | + } else { |
|
| 267 | 267 | if ($globalDebug) echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n"; |
| 268 | - } |
|
| 269 | - } |
|
| 270 | - } |
|
| 268 | + } |
|
| 269 | + } |
|
| 270 | + } |
|
| 271 | 271 | } |
| 272 | 272 | if (!isset($globalMinFetch)) $globalMinFetch = 15; |
| 273 | 273 | |
@@ -290,9 +290,9 @@ discard block |
||
| 290 | 290 | //connect_all($globalSources); |
| 291 | 291 | |
| 292 | 292 | if (isset($globalProxy) && $globalProxy) { |
| 293 | - $context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true))); |
|
| 293 | + $context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true))); |
|
| 294 | 294 | } else { |
| 295 | - $context = stream_context_create(array('http' => array('timeout' => $timeout))); |
|
| 295 | + $context = stream_context_create(array('http' => array('timeout' => $timeout))); |
|
| 296 | 296 | } |
| 297 | 297 | |
| 298 | 298 | // APRS Configuration |
@@ -301,21 +301,21 @@ discard block |
||
| 301 | 301 | die; |
| 302 | 302 | } |
| 303 | 303 | foreach ($globalSources as $key => $source) { |
| 304 | - if (!isset($source['format'])) { |
|
| 305 | - $globalSources[$key]['format'] = 'auto'; |
|
| 306 | - } |
|
| 307 | - if (isset($source['callback']) && $source['callback'] === TRUE) { |
|
| 308 | - unset($globalSources[$key]); |
|
| 309 | - } |
|
| 304 | + if (!isset($source['format'])) { |
|
| 305 | + $globalSources[$key]['format'] = 'auto'; |
|
| 306 | + } |
|
| 307 | + if (isset($source['callback']) && $source['callback'] === TRUE) { |
|
| 308 | + unset($globalSources[$key]); |
|
| 309 | + } |
|
| 310 | 310 | } |
| 311 | 311 | connect_all($globalSources); |
| 312 | 312 | foreach ($globalSources as $key => $source) { |
| 313 | - if (isset($source['format']) && $source['format'] == 'aprs') { |
|
| 313 | + if (isset($source['format']) && $source['format'] == 'aprs') { |
|
| 314 | 314 | $aprs_connect = 0; |
| 315 | 315 | $use_aprs = true; |
| 316 | 316 | if (isset($source['port']) && $source['port'] == '10152') $aprs_full = true; |
| 317 | 317 | break; |
| 318 | - } |
|
| 318 | + } |
|
| 319 | 319 | } |
| 320 | 320 | |
| 321 | 321 | if ($use_aprs) { |
@@ -356,126 +356,126 @@ discard block |
||
| 356 | 356 | |
| 357 | 357 | // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time. |
| 358 | 358 | while ($i > 0) { |
| 359 | - if (!$globalDaemon) $i = $endtime-time(); |
|
| 360 | - // Delete old ATC |
|
| 361 | - if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) { |
|
| 359 | + if (!$globalDaemon) $i = $endtime-time(); |
|
| 360 | + // Delete old ATC |
|
| 361 | + if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) { |
|
| 362 | 362 | if ($globalDebug) echo 'Delete old ATC...'."\n"; |
| 363 | - $ATC->deleteOldATC(); |
|
| 364 | - } |
|
| 363 | + $ATC->deleteOldATC(); |
|
| 364 | + } |
|
| 365 | 365 | |
| 366 | - if (count($last_exec) == count($globalSources)) { |
|
| 366 | + if (count($last_exec) == count($globalSources)) { |
|
| 367 | 367 | $max = $globalMinFetch; |
| 368 | 368 | foreach ($last_exec as $last) { |
| 369 | - if ((time() - $last['last']) < $max) $max = time() - $last['last']; |
|
| 369 | + if ((time() - $last['last']) < $max) $max = time() - $last['last']; |
|
| 370 | 370 | } |
| 371 | 371 | if ($max != $globalMinFetch) { |
| 372 | - if ($globalDebug) echo 'Sleeping...'."\n"; |
|
| 373 | - sleep($globalMinFetch-$max+2); |
|
| 372 | + if ($globalDebug) echo 'Sleeping...'."\n"; |
|
| 373 | + sleep($globalMinFetch-$max+2); |
|
| 374 | + } |
|
| 374 | 375 | } |
| 375 | - } |
|
| 376 | 376 | |
| 377 | 377 | |
| 378 | - //foreach ($formats as $id => $value) { |
|
| 379 | - foreach ($globalSources as $id => $value) { |
|
| 378 | + //foreach ($formats as $id => $value) { |
|
| 379 | + foreach ($globalSources as $id => $value) { |
|
| 380 | 380 | date_default_timezone_set('UTC'); |
| 381 | 381 | //if ($globalDebug) echo 'Source host : '.$value['host'].' - Source format: '.$value['format']."\n"; |
| 382 | 382 | if (!isset($last_exec[$id]['last'])) $last_exec[$id]['last'] = 0; |
| 383 | 383 | if ($value['format'] == 'deltadbtxt' && |
| 384 | - ( |
|
| 384 | + ( |
|
| 385 | 385 | (isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || |
| 386 | 386 | (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch)) |
| 387 | - ) |
|
| 387 | + ) |
|
| 388 | 388 | ) { |
| 389 | - //$buffer = $Common->getData($hosts[$id]); |
|
| 390 | - $buffer = $Common->getData($value['host']); |
|
| 391 | - if ($buffer != '') $reset = 0; |
|
| 392 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 393 | - $buffer = explode('\n',$buffer); |
|
| 394 | - foreach ($buffer as $line) { |
|
| 395 | - if ($line != '' && count($line) > 7) { |
|
| 396 | - $line = explode(',', $line); |
|
| 397 | - $data = array(); |
|
| 398 | - $data['hex'] = $line[1]; // hex |
|
| 399 | - $data['ident'] = $line[2]; // ident |
|
| 400 | - if (isset($line[3])) $data['altitude'] = $line[3]; // altitude |
|
| 401 | - if (isset($line[4])) $data['speed'] = $line[4]; // speed |
|
| 402 | - if (isset($line[5])) $data['heading'] = $line[5]; // heading |
|
| 403 | - if (isset($line[6])) $data['latitude'] = $line[6]; // lat |
|
| 404 | - if (isset($line[7])) $data['longitude'] = $line[7]; // long |
|
| 405 | - $data['verticalrate'] = ''; // vertical rate |
|
| 406 | - //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk |
|
| 407 | - $data['emergency'] = ''; // emergency |
|
| 408 | - $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 409 | - $data['format_source'] = 'deltadbtxt'; |
|
| 410 | - $data['id_source'] = $id_source; |
|
| 411 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 412 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 413 | - if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats']; |
|
| 414 | - $SI->add($data); |
|
| 415 | - unset($data); |
|
| 416 | - } |
|
| 417 | - } |
|
| 418 | - $last_exec[$id]['last'] = time(); |
|
| 389 | + //$buffer = $Common->getData($hosts[$id]); |
|
| 390 | + $buffer = $Common->getData($value['host']); |
|
| 391 | + if ($buffer != '') $reset = 0; |
|
| 392 | + $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 393 | + $buffer = explode('\n',$buffer); |
|
| 394 | + foreach ($buffer as $line) { |
|
| 395 | + if ($line != '' && count($line) > 7) { |
|
| 396 | + $line = explode(',', $line); |
|
| 397 | + $data = array(); |
|
| 398 | + $data['hex'] = $line[1]; // hex |
|
| 399 | + $data['ident'] = $line[2]; // ident |
|
| 400 | + if (isset($line[3])) $data['altitude'] = $line[3]; // altitude |
|
| 401 | + if (isset($line[4])) $data['speed'] = $line[4]; // speed |
|
| 402 | + if (isset($line[5])) $data['heading'] = $line[5]; // heading |
|
| 403 | + if (isset($line[6])) $data['latitude'] = $line[6]; // lat |
|
| 404 | + if (isset($line[7])) $data['longitude'] = $line[7]; // long |
|
| 405 | + $data['verticalrate'] = ''; // vertical rate |
|
| 406 | + //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk |
|
| 407 | + $data['emergency'] = ''; // emergency |
|
| 408 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 409 | + $data['format_source'] = 'deltadbtxt'; |
|
| 410 | + $data['id_source'] = $id_source; |
|
| 411 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 412 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 413 | + if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats']; |
|
| 414 | + $SI->add($data); |
|
| 415 | + unset($data); |
|
| 416 | + } |
|
| 417 | + } |
|
| 418 | + $last_exec[$id]['last'] = time(); |
|
| 419 | 419 | } elseif ($value['format'] == 'aisnmeatxt' && |
| 420 | - ( |
|
| 420 | + ( |
|
| 421 | 421 | (isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || |
| 422 | 422 | (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) |
| 423 | - ) |
|
| 423 | + ) |
|
| 424 | 424 | ) { |
| 425 | - date_default_timezone_set('CET'); |
|
| 426 | - $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host'])); |
|
| 427 | - date_default_timezone_set('UTC'); |
|
| 428 | - if ($buffer != '') $reset = 0; |
|
| 429 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 430 | - $buffer = explode('\n',$buffer); |
|
| 431 | - foreach ($buffer as $line) { |
|
| 425 | + date_default_timezone_set('CET'); |
|
| 426 | + $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host'])); |
|
| 427 | + date_default_timezone_set('UTC'); |
|
| 428 | + if ($buffer != '') $reset = 0; |
|
| 429 | + $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 430 | + $buffer = explode('\n',$buffer); |
|
| 431 | + foreach ($buffer as $line) { |
|
| 432 | 432 | if ($line != '') { |
| 433 | - //echo "'".$line."'\n"; |
|
| 434 | - $add = false; |
|
| 435 | - $ais_data = $AIS->parse_line(trim($line)); |
|
| 436 | - $data = array(); |
|
| 437 | - if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident']; |
|
| 438 | - if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi']; |
|
| 439 | - if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed']; |
|
| 440 | - if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading']; |
|
| 441 | - if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude']; |
|
| 442 | - if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude']; |
|
| 443 | - if (isset($ais_data['status'])) $data['status'] = $ais_data['status']; |
|
| 444 | - if (isset($ais_data['type'])) $data['type'] = $ais_data['type']; |
|
| 445 | - if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
|
| 446 | - if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
|
| 447 | - if (isset($ais_data['timestamp'])) { |
|
| 433 | + //echo "'".$line."'\n"; |
|
| 434 | + $add = false; |
|
| 435 | + $ais_data = $AIS->parse_line(trim($line)); |
|
| 436 | + $data = array(); |
|
| 437 | + if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident']; |
|
| 438 | + if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi']; |
|
| 439 | + if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed']; |
|
| 440 | + if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading']; |
|
| 441 | + if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude']; |
|
| 442 | + if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude']; |
|
| 443 | + if (isset($ais_data['status'])) $data['status'] = $ais_data['status']; |
|
| 444 | + if (isset($ais_data['type'])) $data['type'] = $ais_data['type']; |
|
| 445 | + if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
|
| 446 | + if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
|
| 447 | + if (isset($ais_data['timestamp'])) { |
|
| 448 | 448 | $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
| 449 | 449 | if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) { |
| 450 | - $last_exec[$id]['timestamp'] = $ais_data['timestamp']; |
|
| 451 | - $add = true; |
|
| 450 | + $last_exec[$id]['timestamp'] = $ais_data['timestamp']; |
|
| 451 | + $add = true; |
|
| 452 | 452 | } |
| 453 | - } else { |
|
| 453 | + } else { |
|
| 454 | 454 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 455 | 455 | $add = true; |
| 456 | - } |
|
| 457 | - $data['format_source'] = 'aisnmeatxt'; |
|
| 458 | - $data['id_source'] = $id_source; |
|
| 459 | - //print_r($data); |
|
| 460 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 461 | - if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data); |
|
| 462 | - unset($data); |
|
| 456 | + } |
|
| 457 | + $data['format_source'] = 'aisnmeatxt'; |
|
| 458 | + $data['id_source'] = $id_source; |
|
| 459 | + //print_r($data); |
|
| 460 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 461 | + if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data); |
|
| 462 | + unset($data); |
|
| 463 | 463 | } |
| 464 | - } |
|
| 465 | - $last_exec[$id]['last'] = time(); |
|
| 464 | + } |
|
| 465 | + $last_exec[$id]['last'] = time(); |
|
| 466 | 466 | } elseif ($value['format'] == 'aisnmeahttp') { |
| 467 | - $arr = $httpfeeds; |
|
| 468 | - $w = $e = null; |
|
| 467 | + $arr = $httpfeeds; |
|
| 468 | + $w = $e = null; |
|
| 469 | 469 | |
| 470 | - if (isset($arr[$id])) { |
|
| 470 | + if (isset($arr[$id])) { |
|
| 471 | 471 | $nn = stream_select($arr,$w,$e,$timeout); |
| 472 | 472 | if ($nn > 0) { |
| 473 | - foreach ($httpfeeds as $feed) { |
|
| 473 | + foreach ($httpfeeds as $feed) { |
|
| 474 | 474 | $buffer = stream_get_line($feed,2000,"\n"); |
| 475 | 475 | $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
| 476 | 476 | $buffer = explode('\n',$buffer); |
| 477 | 477 | foreach ($buffer as $line) { |
| 478 | - if ($line != '') { |
|
| 478 | + if ($line != '') { |
|
| 479 | 479 | $ais_data = $AIS->parse_line(trim($line)); |
| 480 | 480 | $data = array(); |
| 481 | 481 | if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident']; |
@@ -493,111 +493,111 @@ discard block |
||
| 493 | 493 | if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination']; |
| 494 | 494 | if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); |
| 495 | 495 | if (isset($ais_data['timestamp'])) { |
| 496 | - $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
|
| 496 | + $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
|
| 497 | 497 | } else { |
| 498 | - $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 498 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 499 | 499 | } |
| 500 | 500 | $data['format_source'] = 'aisnmeahttp'; |
| 501 | 501 | $data['id_source'] = $id_source; |
| 502 | 502 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
| 503 | 503 | if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data); |
| 504 | 504 | unset($data); |
| 505 | - } |
|
| 505 | + } |
|
| 506 | + } |
|
| 506 | 507 | } |
| 507 | - } |
|
| 508 | 508 | } else { |
| 509 | - $format = $value['format']; |
|
| 510 | - if (isset($tt[$format])) $tt[$format]++; |
|
| 511 | - else $tt[$format] = 0; |
|
| 512 | - if ($tt[$format] > 30) { |
|
| 509 | + $format = $value['format']; |
|
| 510 | + if (isset($tt[$format])) $tt[$format]++; |
|
| 511 | + else $tt[$format] = 0; |
|
| 512 | + if ($tt[$format] > 30) { |
|
| 513 | 513 | if ($globalDebug) echo 'Reconnect...'."\n"; |
| 514 | 514 | sleep(2); |
| 515 | 515 | $sourceeen[] = $value; |
| 516 | 516 | connect_all($sourceeen); |
| 517 | 517 | $sourceeen = array(); |
| 518 | - } |
|
| 518 | + } |
|
| 519 | + } |
|
| 519 | 520 | } |
| 520 | - } |
|
| 521 | 521 | } elseif ($value['format'] == 'myshiptracking' && |
| 522 | - ( |
|
| 522 | + ( |
|
| 523 | 523 | (isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || |
| 524 | 524 | (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) |
| 525 | - ) |
|
| 525 | + ) |
|
| 526 | 526 | ) { |
| 527 | - $buffer = $Common->getData($value['host'],'get','','','','','20'); |
|
| 528 | - if ($buffer != '') { |
|
| 527 | + $buffer = $Common->getData($value['host'],'get','','','','','20'); |
|
| 528 | + if ($buffer != '') { |
|
| 529 | 529 | //echo $buffer; |
| 530 | 530 | $all_data = json_decode($buffer,true); |
| 531 | 531 | //print_r($all_data); |
| 532 | 532 | if (isset($all_data[0]['DATA'])) { |
| 533 | - foreach ($all_data[0]['DATA'] as $line) { |
|
| 533 | + foreach ($all_data[0]['DATA'] as $line) { |
|
| 534 | 534 | if ($line != '') { |
| 535 | - $data = array(); |
|
| 536 | - $data['ident'] = $line['NAME']; |
|
| 537 | - $data['mmsi'] = $line['MMSI']; |
|
| 538 | - $data['speed'] = $line['SOG']; |
|
| 539 | - $data['heading'] = $line['COG']; |
|
| 540 | - $data['latitude'] = $line['LAT']; |
|
| 541 | - $data['longitude'] = $line['LNG']; |
|
| 542 | - // if (isset($ais_data['type'])) $data['type'] = $ais_data['type']; |
|
| 543 | - $data['imo'] = $line['IMO']; |
|
| 544 | - //$data['arrival_code'] = $ais_data['destination']; |
|
| 545 | - $data['datetime'] = date('Y-m-d H:i:s',$line['T']); |
|
| 546 | - $data['format_source'] = 'myshiptracking'; |
|
| 547 | - $data['id_source'] = $id_source; |
|
| 548 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 549 | - $MI->add($data); |
|
| 550 | - unset($data); |
|
| 535 | + $data = array(); |
|
| 536 | + $data['ident'] = $line['NAME']; |
|
| 537 | + $data['mmsi'] = $line['MMSI']; |
|
| 538 | + $data['speed'] = $line['SOG']; |
|
| 539 | + $data['heading'] = $line['COG']; |
|
| 540 | + $data['latitude'] = $line['LAT']; |
|
| 541 | + $data['longitude'] = $line['LNG']; |
|
| 542 | + // if (isset($ais_data['type'])) $data['type'] = $ais_data['type']; |
|
| 543 | + $data['imo'] = $line['IMO']; |
|
| 544 | + //$data['arrival_code'] = $ais_data['destination']; |
|
| 545 | + $data['datetime'] = date('Y-m-d H:i:s',$line['T']); |
|
| 546 | + $data['format_source'] = 'myshiptracking'; |
|
| 547 | + $data['id_source'] = $id_source; |
|
| 548 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 549 | + $MI->add($data); |
|
| 550 | + unset($data); |
|
| 551 | + } |
|
| 551 | 552 | } |
| 552 | - } |
|
| 553 | 553 | } |
| 554 | - } |
|
| 555 | - $last_exec[$id]['last'] = time(); |
|
| 554 | + } |
|
| 555 | + $last_exec[$id]['last'] = time(); |
|
| 556 | 556 | } elseif ($value['format'] == 'boatbeaconapp' && |
| 557 | - ( |
|
| 557 | + ( |
|
| 558 | 558 | (isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || |
| 559 | 559 | (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) |
| 560 | - ) |
|
| 560 | + ) |
|
| 561 | 561 | ) { |
| 562 | - $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host'])); |
|
| 563 | - if ($buffer != '') { |
|
| 562 | + $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host'])); |
|
| 563 | + if ($buffer != '') { |
|
| 564 | 564 | $all_data = json_decode($buffer,true); |
| 565 | 565 | if (isset($all_data[0]['mmsi'])) { |
| 566 | - foreach ($all_data as $line) { |
|
| 566 | + foreach ($all_data as $line) { |
|
| 567 | 567 | if ($line != '') { |
| 568 | - $data = array(); |
|
| 569 | - $data['ident'] = $line['shipname']; |
|
| 570 | - $data['callsign'] = $line['callsign']; |
|
| 571 | - $data['mmsi'] = $line['mmsi']; |
|
| 572 | - $data['speed'] = $line['sog']; |
|
| 573 | - if ($line['heading'] != '511') $data['heading'] = $line['heading']; |
|
| 574 | - $data['latitude'] = $line['latitude']; |
|
| 575 | - $data['longitude'] = $line['longitude']; |
|
| 576 | - $data['type_id'] = $line['shiptype']; |
|
| 577 | - $data['arrival_code'] = $line['destination']; |
|
| 578 | - $data['datetime'] = $line['time']; |
|
| 579 | - $data['format_source'] = 'boatbeaconapp'; |
|
| 580 | - $data['id_source'] = $id_source; |
|
| 581 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 582 | - $MI->add($data); |
|
| 583 | - unset($data); |
|
| 568 | + $data = array(); |
|
| 569 | + $data['ident'] = $line['shipname']; |
|
| 570 | + $data['callsign'] = $line['callsign']; |
|
| 571 | + $data['mmsi'] = $line['mmsi']; |
|
| 572 | + $data['speed'] = $line['sog']; |
|
| 573 | + if ($line['heading'] != '511') $data['heading'] = $line['heading']; |
|
| 574 | + $data['latitude'] = $line['latitude']; |
|
| 575 | + $data['longitude'] = $line['longitude']; |
|
| 576 | + $data['type_id'] = $line['shiptype']; |
|
| 577 | + $data['arrival_code'] = $line['destination']; |
|
| 578 | + $data['datetime'] = $line['time']; |
|
| 579 | + $data['format_source'] = 'boatbeaconapp'; |
|
| 580 | + $data['id_source'] = $id_source; |
|
| 581 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 582 | + $MI->add($data); |
|
| 583 | + unset($data); |
|
| 584 | + } |
|
| 584 | 585 | } |
| 585 | - } |
|
| 586 | 586 | } |
| 587 | 587 | |
| 588 | - } |
|
| 589 | - $last_exec[$id]['last'] = time(); |
|
| 588 | + } |
|
| 589 | + $last_exec[$id]['last'] = time(); |
|
| 590 | 590 | } elseif ($value['format'] == 'boatnerd' && |
| 591 | - ( |
|
| 591 | + ( |
|
| 592 | 592 | (isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || |
| 593 | 593 | (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) |
| 594 | - ) |
|
| 594 | + ) |
|
| 595 | 595 | ) { |
| 596 | - $buffer = $Common->getData($value['host']); |
|
| 597 | - if ($buffer != '') { |
|
| 596 | + $buffer = $Common->getData($value['host']); |
|
| 597 | + if ($buffer != '') { |
|
| 598 | 598 | $all_data = json_decode($buffer,true); |
| 599 | 599 | if (isset($all_data['features'][0]['id'])) { |
| 600 | - foreach ($all_data['features'] as $line) { |
|
| 600 | + foreach ($all_data['features'] as $line) { |
|
| 601 | 601 | $data = array(); |
| 602 | 602 | if (isset($line['properties']['name'])) $data['ident'] = $line['properties']['name']; |
| 603 | 603 | if (isset($line['properties']['callsign'])) $data['callsign'] = $line['properties']['callsign']; |
@@ -616,78 +616,78 @@ discard block |
||
| 616 | 616 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
| 617 | 617 | if ($line['properties']['vesselType'] != 'Navigation Aid') $MI->add($data); |
| 618 | 618 | unset($data); |
| 619 | - } |
|
| 619 | + } |
|
| 620 | 620 | } |
| 621 | 621 | |
| 622 | - } |
|
| 623 | - $last_exec[$id]['last'] = time(); |
|
| 622 | + } |
|
| 623 | + $last_exec[$id]['last'] = time(); |
|
| 624 | 624 | } elseif ($value['format'] == 'shipplotter' && |
| 625 | - ( |
|
| 625 | + ( |
|
| 626 | 626 | (isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || |
| 627 | 627 | (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) |
| 628 | - ) |
|
| 628 | + ) |
|
| 629 | 629 | ) { |
| 630 | - echo 'download...'; |
|
| 631 | - $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter'); |
|
| 632 | - echo 'done !'."\n"; |
|
| 633 | - if ($buffer != '') $reset = 0; |
|
| 634 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 635 | - $buffer = explode('\n',$buffer); |
|
| 636 | - foreach ($buffer as $line) { |
|
| 630 | + echo 'download...'; |
|
| 631 | + $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter'); |
|
| 632 | + echo 'done !'."\n"; |
|
| 633 | + if ($buffer != '') $reset = 0; |
|
| 634 | + $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 635 | + $buffer = explode('\n',$buffer); |
|
| 636 | + foreach ($buffer as $line) { |
|
| 637 | 637 | if ($line != '') { |
| 638 | - $data = array(); |
|
| 639 | - $data['mmsi'] = (int)substr($line,0,9); |
|
| 640 | - $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10)); |
|
| 641 | - //$data['status'] = substr($line,21,2); |
|
| 642 | - //$data['type'] = substr($line,24,3); |
|
| 643 | - $data['latitude'] = substr($line,29,9); |
|
| 644 | - $data['longitude'] = substr($line,41,9); |
|
| 645 | - $data['speed'] = round(substr($line,51,5)); |
|
| 646 | - //$data['course'] = substr($line,57,5); |
|
| 647 | - $data['heading'] = round(substr($line,63,3)); |
|
| 648 | - //$data['draft'] = substr($line,67,4); |
|
| 649 | - //$data['length'] = substr($line,72,3); |
|
| 650 | - //$data['beam'] = substr($line,76,2); |
|
| 651 | - $data['ident'] = trim(utf8_encode(substr($line,79,20))); |
|
| 652 | - //$data['callsign'] = trim(substr($line,100,7); |
|
| 653 | - //$data['dest'] = substr($line,108,20); |
|
| 654 | - //$data['etaDate'] = substr($line,129,5); |
|
| 655 | - //$data['etaTime'] = substr($line,135,5); |
|
| 656 | - $data['format_source'] = 'shipplotter'; |
|
| 657 | - $data['id_source'] = $id_source; |
|
| 658 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 659 | - //print_r($data); |
|
| 660 | - echo 'Add...'."\n"; |
|
| 661 | - $MI->add($data); |
|
| 662 | - unset($data); |
|
| 638 | + $data = array(); |
|
| 639 | + $data['mmsi'] = (int)substr($line,0,9); |
|
| 640 | + $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10)); |
|
| 641 | + //$data['status'] = substr($line,21,2); |
|
| 642 | + //$data['type'] = substr($line,24,3); |
|
| 643 | + $data['latitude'] = substr($line,29,9); |
|
| 644 | + $data['longitude'] = substr($line,41,9); |
|
| 645 | + $data['speed'] = round(substr($line,51,5)); |
|
| 646 | + //$data['course'] = substr($line,57,5); |
|
| 647 | + $data['heading'] = round(substr($line,63,3)); |
|
| 648 | + //$data['draft'] = substr($line,67,4); |
|
| 649 | + //$data['length'] = substr($line,72,3); |
|
| 650 | + //$data['beam'] = substr($line,76,2); |
|
| 651 | + $data['ident'] = trim(utf8_encode(substr($line,79,20))); |
|
| 652 | + //$data['callsign'] = trim(substr($line,100,7); |
|
| 653 | + //$data['dest'] = substr($line,108,20); |
|
| 654 | + //$data['etaDate'] = substr($line,129,5); |
|
| 655 | + //$data['etaTime'] = substr($line,135,5); |
|
| 656 | + $data['format_source'] = 'shipplotter'; |
|
| 657 | + $data['id_source'] = $id_source; |
|
| 658 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 659 | + //print_r($data); |
|
| 660 | + echo 'Add...'."\n"; |
|
| 661 | + $MI->add($data); |
|
| 662 | + unset($data); |
|
| 663 | 663 | } |
| 664 | - } |
|
| 665 | - $last_exec[$id]['last'] = time(); |
|
| 664 | + } |
|
| 665 | + $last_exec[$id]['last'] = time(); |
|
| 666 | 666 | //} elseif (($value == 'whazzup' && (time() - $last_exec['whazzup'] > $globalMinFetch)) || ($value == 'vatsimtxt' && (time() - $last_exec['vatsimtxt'] > $globalMinFetch))) { |
| 667 | 667 | } elseif ( |
| 668 | - ( |
|
| 668 | + ( |
|
| 669 | 669 | $value['format'] == 'whazzup' && |
| 670 | 670 | ( |
| 671 | - (isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || |
|
| 672 | - (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch)) |
|
| 671 | + (isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || |
|
| 672 | + (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch)) |
|
| 673 | 673 | ) |
| 674 | - ) || ( |
|
| 674 | + ) || ( |
|
| 675 | 675 | $value['format'] == 'vatsimtxt' && |
| 676 | 676 | ( |
| 677 | - (isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || |
|
| 678 | - (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch)) |
|
| 677 | + (isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || |
|
| 678 | + (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch)) |
|
| 679 | + ) |
|
| 679 | 680 | ) |
| 680 | - ) |
|
| 681 | 681 | ) { |
| 682 | - //$buffer = $Common->getData($hosts[$id]); |
|
| 683 | - $buffer = $Common->getData($value['host']); |
|
| 684 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 685 | - $buffer = explode('\n',$buffer); |
|
| 686 | - $reset = 0; |
|
| 687 | - foreach ($buffer as $line) { |
|
| 688 | - if ($line != '') { |
|
| 689 | - $line = explode(':', $line); |
|
| 690 | - if (count($line) > 30 && $line[0] != 'callsign') { |
|
| 682 | + //$buffer = $Common->getData($hosts[$id]); |
|
| 683 | + $buffer = $Common->getData($value['host']); |
|
| 684 | + $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 685 | + $buffer = explode('\n',$buffer); |
|
| 686 | + $reset = 0; |
|
| 687 | + foreach ($buffer as $line) { |
|
| 688 | + if ($line != '') { |
|
| 689 | + $line = explode(':', $line); |
|
| 690 | + if (count($line) > 30 && $line[0] != 'callsign') { |
|
| 691 | 691 | $data = array(); |
| 692 | 692 | if (isset($line[37]) && $line[37] != '') $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37]; |
| 693 | 693 | else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0]; |
@@ -700,37 +700,37 @@ discard block |
||
| 700 | 700 | if (isset($line[45])) $data['heading'] = $line[45]; // heading |
| 701 | 701 | elseif (isset($line[38])) $data['heading'] = $line[38]; // heading |
| 702 | 702 | $data['latitude'] = $line[5]; // lat |
| 703 | - $data['longitude'] = $line[6]; // long |
|
| 704 | - $data['verticalrate'] = ''; // vertical rate |
|
| 705 | - $data['squawk'] = ''; // squawk |
|
| 706 | - $data['emergency'] = ''; // emergency |
|
| 707 | - $data['waypoints'] = $line[30]; |
|
| 703 | + $data['longitude'] = $line[6]; // long |
|
| 704 | + $data['verticalrate'] = ''; // vertical rate |
|
| 705 | + $data['squawk'] = ''; // squawk |
|
| 706 | + $data['emergency'] = ''; // emergency |
|
| 707 | + $data['waypoints'] = $line[30]; |
|
| 708 | 708 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 709 | 709 | //$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37])); |
| 710 | 710 | //if (isset($line[37])) $data['last_update'] = $line[37]; |
| 711 | - $data['departure_airport_icao'] = $line[11]; |
|
| 712 | - $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':'); |
|
| 713 | - $data['arrival_airport_icao'] = $line[13]; |
|
| 711 | + $data['departure_airport_icao'] = $line[11]; |
|
| 712 | + $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':'); |
|
| 713 | + $data['arrival_airport_icao'] = $line[13]; |
|
| 714 | 714 | $data['frequency'] = $line[4]; |
| 715 | 715 | $data['type'] = $line[18]; |
| 716 | 716 | $data['range'] = $line[19]; |
| 717 | 717 | if (isset($line[35])) $data['info'] = $line[35]; |
| 718 | - $data['id_source'] = $id_source; |
|
| 719 | - //$data['arrival_airport_time'] = ; |
|
| 720 | - if ($line[9] != '') { |
|
| 721 | - $aircraft_data = explode('/',$line[9]); |
|
| 722 | - if (isset($aircraft_data[1])) { |
|
| 723 | - $data['aircraft_icao'] = $aircraft_data[1]; |
|
| 724 | - } |
|
| 725 | - } |
|
| 726 | - /* |
|
| 718 | + $data['id_source'] = $id_source; |
|
| 719 | + //$data['arrival_airport_time'] = ; |
|
| 720 | + if ($line[9] != '') { |
|
| 721 | + $aircraft_data = explode('/',$line[9]); |
|
| 722 | + if (isset($aircraft_data[1])) { |
|
| 723 | + $data['aircraft_icao'] = $aircraft_data[1]; |
|
| 724 | + } |
|
| 725 | + } |
|
| 726 | + /* |
|
| 727 | 727 | if ($value == 'whazzup') $data['format_source'] = 'whazzup'; |
| 728 | 728 | elseif ($value == 'vatsimtxt') $data['format_source'] = 'vatsimtxt'; |
| 729 | 729 | */ |
| 730 | - $data['format_source'] = $value['format']; |
|
| 730 | + $data['format_source'] = $value['format']; |
|
| 731 | 731 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
| 732 | 732 | if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
| 733 | - if ($line[3] == 'PILOT') $SI->add($data); |
|
| 733 | + if ($line[3] == 'PILOT') $SI->add($data); |
|
| 734 | 734 | elseif ($line[3] == 'ATC') { |
| 735 | 735 | //print_r($data); |
| 736 | 736 | $data['info'] = str_replace('^§','<br />',$data['info']); |
@@ -751,21 +751,21 @@ discard block |
||
| 751 | 751 | else echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']); |
| 752 | 752 | } |
| 753 | 753 | } |
| 754 | - unset($data); |
|
| 755 | - } |
|
| 756 | - } |
|
| 757 | - } |
|
| 758 | - //if ($value == 'whazzup') $last_exec['whazzup'] = time(); |
|
| 759 | - //elseif ($value == 'vatsimtxt') $last_exec['vatsimtxt'] = time(); |
|
| 760 | - $last_exec[$id]['last'] = time(); |
|
| 761 | - } elseif ($value['format'] == 'airwhere' && |
|
| 762 | - ( |
|
| 763 | - (isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || |
|
| 764 | - (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch)) |
|
| 765 | - ) |
|
| 766 | - ) { |
|
| 767 | - $buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php','get','','','','','20'); |
|
| 768 | - if ($buffer != '') { |
|
| 754 | + unset($data); |
|
| 755 | + } |
|
| 756 | + } |
|
| 757 | + } |
|
| 758 | + //if ($value == 'whazzup') $last_exec['whazzup'] = time(); |
|
| 759 | + //elseif ($value == 'vatsimtxt') $last_exec['vatsimtxt'] = time(); |
|
| 760 | + $last_exec[$id]['last'] = time(); |
|
| 761 | + } elseif ($value['format'] == 'airwhere' && |
|
| 762 | + ( |
|
| 763 | + (isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || |
|
| 764 | + (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch)) |
|
| 765 | + ) |
|
| 766 | + ) { |
|
| 767 | + $buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php','get','','','','','20'); |
|
| 768 | + if ($buffer != '') { |
|
| 769 | 769 | $all_data = simplexml_load_string($buffer); |
| 770 | 770 | foreach($all_data->children() as $childdata) { |
| 771 | 771 | $data = array(); |
@@ -787,10 +787,10 @@ discard block |
||
| 787 | 787 | $SI->add($data); |
| 788 | 788 | unset($data); |
| 789 | 789 | } |
| 790 | - } |
|
| 791 | - $Source->deleteOldLocationByType('gs'); |
|
| 792 | - $buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php','get','','','','','20'); |
|
| 793 | - if ($buffer != '') { |
|
| 790 | + } |
|
| 791 | + $Source->deleteOldLocationByType('gs'); |
|
| 792 | + $buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php','get','','','','','20'); |
|
| 793 | + if ($buffer != '') { |
|
| 794 | 794 | $all_data = simplexml_load_string($buffer); |
| 795 | 795 | foreach($all_data->children() as $childdata) { |
| 796 | 796 | $data = array(); |
@@ -808,8 +808,8 @@ discard block |
||
| 808 | 808 | } |
| 809 | 809 | unset($data); |
| 810 | 810 | } |
| 811 | - } |
|
| 812 | - $last_exec[$id]['last'] = time(); |
|
| 811 | + } |
|
| 812 | + $last_exec[$id]['last'] = time(); |
|
| 813 | 813 | /* |
| 814 | 814 | } if ($value['format'] == 'aircraftlistjson') { |
| 815 | 815 | print_r($globalSources); |
@@ -817,17 +817,17 @@ discard block |
||
| 817 | 817 | echo $globalMinFetch; |
| 818 | 818 | */ |
| 819 | 819 | } elseif ($value['format'] == 'aircraftlistjson' && |
| 820 | - ( |
|
| 820 | + ( |
|
| 821 | 821 | (isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || |
| 822 | 822 | (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch)) |
| 823 | - ) |
|
| 823 | + ) |
|
| 824 | 824 | ) { |
| 825 | - $buffer = $Common->getData($value['host'],'get','','','','','20'); |
|
| 826 | - if ($buffer != '') { |
|
| 827 | - $all_data = json_decode($buffer,true); |
|
| 825 | + $buffer = $Common->getData($value['host'],'get','','','','','20'); |
|
| 826 | + if ($buffer != '') { |
|
| 827 | + $all_data = json_decode($buffer,true); |
|
| 828 | 828 | if (isset($all_data['acList'])) { |
| 829 | - $reset = 0; |
|
| 830 | - foreach ($all_data['acList'] as $line) { |
|
| 829 | + $reset = 0; |
|
| 830 | + foreach ($all_data['acList'] as $line) { |
|
| 831 | 831 | $data = array(); |
| 832 | 832 | $data['hex'] = $line['Icao']; // hex |
| 833 | 833 | if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident |
@@ -850,10 +850,10 @@ discard block |
||
| 850 | 850 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
| 851 | 851 | if (isset($data['latitude'])) $SI->add($data); |
| 852 | 852 | unset($data); |
| 853 | - } |
|
| 853 | + } |
|
| 854 | 854 | } elseif (is_array($all_data)) { |
| 855 | - $reset = 0; |
|
| 856 | - foreach ($all_data as $line) { |
|
| 855 | + $reset = 0; |
|
| 856 | + foreach ($all_data as $line) { |
|
| 857 | 857 | $data = array(); |
| 858 | 858 | $data['hex'] = $line['hex']; // hex |
| 859 | 859 | $data['ident'] = $line['flight']; // ident |
@@ -873,218 +873,218 @@ discard block |
||
| 873 | 873 | if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
| 874 | 874 | $SI->add($data); |
| 875 | 875 | unset($data); |
| 876 | - } |
|
| 876 | + } |
|
| 877 | 877 | } |
| 878 | - } elseif ($globalDebug) echo 'No data'."\n"; |
|
| 879 | - //$last_exec['aircraftlistjson'] = time(); |
|
| 880 | - $last_exec[$id]['last'] = time(); |
|
| 881 | - //} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) { |
|
| 882 | - } elseif ($value['format'] == 'planeupdatefaa' && |
|
| 883 | - ( |
|
| 884 | - (isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || |
|
| 885 | - (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch)) |
|
| 886 | - ) |
|
| 887 | - ) { |
|
| 888 | - $buffer = $Common->getData($value['host']); |
|
| 889 | - $all_data = json_decode($buffer,true); |
|
| 890 | - if (isset($all_data['planes'])) { |
|
| 878 | + } elseif ($globalDebug) echo 'No data'."\n"; |
|
| 879 | + //$last_exec['aircraftlistjson'] = time(); |
|
| 880 | + $last_exec[$id]['last'] = time(); |
|
| 881 | + //} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) { |
|
| 882 | + } elseif ($value['format'] == 'planeupdatefaa' && |
|
| 883 | + ( |
|
| 884 | + (isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || |
|
| 885 | + (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch)) |
|
| 886 | + ) |
|
| 887 | + ) { |
|
| 888 | + $buffer = $Common->getData($value['host']); |
|
| 889 | + $all_data = json_decode($buffer,true); |
|
| 890 | + if (isset($all_data['planes'])) { |
|
| 891 | 891 | $reset = 0; |
| 892 | 892 | foreach ($all_data['planes'] as $key => $line) { |
| 893 | - $data = array(); |
|
| 894 | - $data['hex'] = $key; // hex |
|
| 895 | - $data['ident'] = $line[3]; // ident |
|
| 896 | - $data['altitude'] = $line[6]; // altitude |
|
| 897 | - $data['speed'] = $line[8]; // speed |
|
| 898 | - $data['heading'] = $line[7]; // heading |
|
| 899 | - $data['latitude'] = $line[4]; // lat |
|
| 900 | - $data['longitude'] = $line[5]; // long |
|
| 901 | - //$data['verticalrate'] = $line[]; // verticale rate |
|
| 902 | - $data['squawk'] = $line[10]; // squawk |
|
| 903 | - $data['emergency'] = ''; // emergency |
|
| 904 | - $data['registration'] = $line[2]; |
|
| 905 | - $data['aircraft_icao'] = $line[0]; |
|
| 906 | - $deparr = explode('-',$line[1]); |
|
| 907 | - if (count($deparr) == 2) { |
|
| 893 | + $data = array(); |
|
| 894 | + $data['hex'] = $key; // hex |
|
| 895 | + $data['ident'] = $line[3]; // ident |
|
| 896 | + $data['altitude'] = $line[6]; // altitude |
|
| 897 | + $data['speed'] = $line[8]; // speed |
|
| 898 | + $data['heading'] = $line[7]; // heading |
|
| 899 | + $data['latitude'] = $line[4]; // lat |
|
| 900 | + $data['longitude'] = $line[5]; // long |
|
| 901 | + //$data['verticalrate'] = $line[]; // verticale rate |
|
| 902 | + $data['squawk'] = $line[10]; // squawk |
|
| 903 | + $data['emergency'] = ''; // emergency |
|
| 904 | + $data['registration'] = $line[2]; |
|
| 905 | + $data['aircraft_icao'] = $line[0]; |
|
| 906 | + $deparr = explode('-',$line[1]); |
|
| 907 | + if (count($deparr) == 2) { |
|
| 908 | 908 | $data['departure_airport_icao'] = $deparr[0]; |
| 909 | 909 | $data['arrival_airport_icao'] = $deparr[1]; |
| 910 | - } |
|
| 911 | - $data['datetime'] = date('Y-m-d H:i:s',$line[9]); |
|
| 912 | - $data['format_source'] = 'planeupdatefaa'; |
|
| 913 | - $data['id_source'] = $id_source; |
|
| 914 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 915 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 916 | - $SI->add($data); |
|
| 917 | - unset($data); |
|
| 910 | + } |
|
| 911 | + $data['datetime'] = date('Y-m-d H:i:s',$line[9]); |
|
| 912 | + $data['format_source'] = 'planeupdatefaa'; |
|
| 913 | + $data['id_source'] = $id_source; |
|
| 914 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 915 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 916 | + $SI->add($data); |
|
| 917 | + unset($data); |
|
| 918 | + } |
|
| 918 | 919 | } |
| 919 | - } |
|
| 920 | - //$last_exec['planeupdatefaa'] = time(); |
|
| 921 | - $last_exec[$id]['last'] = time(); |
|
| 920 | + //$last_exec['planeupdatefaa'] = time(); |
|
| 921 | + $last_exec[$id]['last'] = time(); |
|
| 922 | 922 | } elseif ($value['format'] == 'opensky' && |
| 923 | - ( |
|
| 923 | + ( |
|
| 924 | 924 | (isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || |
| 925 | 925 | (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch)) |
| 926 | - ) |
|
| 926 | + ) |
|
| 927 | 927 | ) { |
| 928 | - $buffer = $Common->getData($value['host']); |
|
| 929 | - $all_data = json_decode($buffer,true); |
|
| 930 | - if (isset($all_data['states'])) { |
|
| 928 | + $buffer = $Common->getData($value['host']); |
|
| 929 | + $all_data = json_decode($buffer,true); |
|
| 930 | + if (isset($all_data['states'])) { |
|
| 931 | 931 | $reset = 0; |
| 932 | 932 | foreach ($all_data['states'] as $key => $line) { |
| 933 | - $data = array(); |
|
| 934 | - $data['hex'] = $line[0]; // hex |
|
| 935 | - $data['ident'] = trim($line[1]); // ident |
|
| 936 | - $data['altitude'] = round($line[7]*3.28084); // altitude |
|
| 937 | - $data['speed'] = round($line[9]*1.94384); // speed |
|
| 938 | - $data['heading'] = round($line[10]); // heading |
|
| 939 | - $data['latitude'] = $line[6]; // lat |
|
| 940 | - $data['longitude'] = $line[5]; // long |
|
| 941 | - $data['verticalrate'] = $line[11]; // verticale rate |
|
| 942 | - //$data['squawk'] = $line[10]; // squawk |
|
| 943 | - //$data['emergency'] = ''; // emergency |
|
| 944 | - //$data['registration'] = $line[2]; |
|
| 945 | - //$data['aircraft_icao'] = $line[0]; |
|
| 946 | - $data['datetime'] = date('Y-m-d H:i:s',$line[3]); |
|
| 947 | - $data['format_source'] = 'opensky'; |
|
| 948 | - $data['id_source'] = $id_source; |
|
| 949 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 950 | - $SI->add($data); |
|
| 951 | - unset($data); |
|
| 933 | + $data = array(); |
|
| 934 | + $data['hex'] = $line[0]; // hex |
|
| 935 | + $data['ident'] = trim($line[1]); // ident |
|
| 936 | + $data['altitude'] = round($line[7]*3.28084); // altitude |
|
| 937 | + $data['speed'] = round($line[9]*1.94384); // speed |
|
| 938 | + $data['heading'] = round($line[10]); // heading |
|
| 939 | + $data['latitude'] = $line[6]; // lat |
|
| 940 | + $data['longitude'] = $line[5]; // long |
|
| 941 | + $data['verticalrate'] = $line[11]; // verticale rate |
|
| 942 | + //$data['squawk'] = $line[10]; // squawk |
|
| 943 | + //$data['emergency'] = ''; // emergency |
|
| 944 | + //$data['registration'] = $line[2]; |
|
| 945 | + //$data['aircraft_icao'] = $line[0]; |
|
| 946 | + $data['datetime'] = date('Y-m-d H:i:s',$line[3]); |
|
| 947 | + $data['format_source'] = 'opensky'; |
|
| 948 | + $data['id_source'] = $id_source; |
|
| 949 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 950 | + $SI->add($data); |
|
| 951 | + unset($data); |
|
| 952 | 952 | } |
| 953 | - } |
|
| 954 | - //$last_exec['planeupdatefaa'] = time(); |
|
| 955 | - $last_exec[$id]['last'] = time(); |
|
| 953 | + } |
|
| 954 | + //$last_exec['planeupdatefaa'] = time(); |
|
| 955 | + $last_exec[$id]['last'] = time(); |
|
| 956 | 956 | //} elseif ($value == 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) { |
| 957 | 957 | } elseif ($value['format'] == 'fr24json' && |
| 958 | - ( |
|
| 958 | + ( |
|
| 959 | 959 | (isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || |
| 960 | 960 | (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch)) |
| 961 | - ) |
|
| 961 | + ) |
|
| 962 | 962 | ) { |
| 963 | - //$buffer = $Common->getData($hosts[$id]); |
|
| 964 | - $buffer = $Common->getData($value['host']); |
|
| 965 | - $all_data = json_decode($buffer,true); |
|
| 966 | - if (!empty($all_data)) $reset = 0; |
|
| 967 | - foreach ($all_data as $key => $line) { |
|
| 963 | + //$buffer = $Common->getData($hosts[$id]); |
|
| 964 | + $buffer = $Common->getData($value['host']); |
|
| 965 | + $all_data = json_decode($buffer,true); |
|
| 966 | + if (!empty($all_data)) $reset = 0; |
|
| 967 | + foreach ($all_data as $key => $line) { |
|
| 968 | 968 | if ($key != 'full_count' && $key != 'version' && $key != 'stats') { |
| 969 | - $data = array(); |
|
| 970 | - $data['hex'] = $line[0]; |
|
| 971 | - $data['ident'] = $line[16]; //$line[13] |
|
| 972 | - $data['altitude'] = $line[4]; // altitude |
|
| 973 | - $data['speed'] = $line[5]; // speed |
|
| 974 | - $data['heading'] = $line[3]; // heading |
|
| 975 | - $data['latitude'] = $line[1]; // lat |
|
| 976 | - $data['longitude'] = $line[2]; // long |
|
| 977 | - $data['verticalrate'] = $line[15]; // verticale rate |
|
| 978 | - $data['squawk'] = $line[6]; // squawk |
|
| 979 | - $data['aircraft_icao'] = $line[8]; |
|
| 980 | - $data['registration'] = $line[9]; |
|
| 981 | - $data['departure_airport_iata'] = $line[11]; |
|
| 982 | - $data['arrival_airport_iata'] = $line[12]; |
|
| 983 | - $data['emergency'] = ''; // emergency |
|
| 984 | - $data['datetime'] = date('Y-m-d H:i:s'); //$line[10] |
|
| 985 | - $data['format_source'] = 'fr24json'; |
|
| 986 | - $data['id_source'] = $id_source; |
|
| 987 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 988 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 989 | - $SI->add($data); |
|
| 990 | - unset($data); |
|
| 969 | + $data = array(); |
|
| 970 | + $data['hex'] = $line[0]; |
|
| 971 | + $data['ident'] = $line[16]; //$line[13] |
|
| 972 | + $data['altitude'] = $line[4]; // altitude |
|
| 973 | + $data['speed'] = $line[5]; // speed |
|
| 974 | + $data['heading'] = $line[3]; // heading |
|
| 975 | + $data['latitude'] = $line[1]; // lat |
|
| 976 | + $data['longitude'] = $line[2]; // long |
|
| 977 | + $data['verticalrate'] = $line[15]; // verticale rate |
|
| 978 | + $data['squawk'] = $line[6]; // squawk |
|
| 979 | + $data['aircraft_icao'] = $line[8]; |
|
| 980 | + $data['registration'] = $line[9]; |
|
| 981 | + $data['departure_airport_iata'] = $line[11]; |
|
| 982 | + $data['arrival_airport_iata'] = $line[12]; |
|
| 983 | + $data['emergency'] = ''; // emergency |
|
| 984 | + $data['datetime'] = date('Y-m-d H:i:s'); //$line[10] |
|
| 985 | + $data['format_source'] = 'fr24json'; |
|
| 986 | + $data['id_source'] = $id_source; |
|
| 987 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 988 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 989 | + $SI->add($data); |
|
| 990 | + unset($data); |
|
| 991 | 991 | } |
| 992 | - } |
|
| 993 | - //$last_exec['fr24json'] = time(); |
|
| 994 | - $last_exec[$id]['last'] = time(); |
|
| 992 | + } |
|
| 993 | + //$last_exec['fr24json'] = time(); |
|
| 994 | + $last_exec[$id]['last'] = time(); |
|
| 995 | 995 | //} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) { |
| 996 | 996 | } elseif ($value['format'] == 'radarvirtueljson' && |
| 997 | - ( |
|
| 997 | + ( |
|
| 998 | 998 | (isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || |
| 999 | 999 | (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch)) |
| 1000 | - ) |
|
| 1000 | + ) |
|
| 1001 | 1001 | ) { |
| 1002 | - //$buffer = $Common->getData($hosts[$id],'get','','','','','150'); |
|
| 1003 | - $buffer = $Common->getData($value['host'],'get','','','','','150'); |
|
| 1004 | - //echo $buffer; |
|
| 1005 | - $buffer = str_replace(array("\n","\r"),"",$buffer); |
|
| 1006 | - $buffer = preg_replace('/,"num":(.+)/','}',$buffer); |
|
| 1007 | - $all_data = json_decode($buffer,true); |
|
| 1008 | - if (json_last_error() != JSON_ERROR_NONE) { |
|
| 1002 | + //$buffer = $Common->getData($hosts[$id],'get','','','','','150'); |
|
| 1003 | + $buffer = $Common->getData($value['host'],'get','','','','','150'); |
|
| 1004 | + //echo $buffer; |
|
| 1005 | + $buffer = str_replace(array("\n","\r"),"",$buffer); |
|
| 1006 | + $buffer = preg_replace('/,"num":(.+)/','}',$buffer); |
|
| 1007 | + $all_data = json_decode($buffer,true); |
|
| 1008 | + if (json_last_error() != JSON_ERROR_NONE) { |
|
| 1009 | 1009 | die(json_last_error_msg()); |
| 1010 | - } |
|
| 1011 | - if (isset($all_data['mrkrs'])) { |
|
| 1010 | + } |
|
| 1011 | + if (isset($all_data['mrkrs'])) { |
|
| 1012 | 1012 | $reset = 0; |
| 1013 | 1013 | foreach ($all_data['mrkrs'] as $key => $line) { |
| 1014 | - if (isset($line['inf'])) { |
|
| 1014 | + if (isset($line['inf'])) { |
|
| 1015 | 1015 | $data = array(); |
| 1016 | 1016 | $data['hex'] = $line['inf']['ia']; |
| 1017 | 1017 | if (isset($line['inf']['cs'])) $data['ident'] = $line['inf']['cs']; //$line[13] |
| 1018 | - $data['altitude'] = round($line['inf']['al']*3.28084); // altitude |
|
| 1019 | - if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed |
|
| 1020 | - if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading |
|
| 1021 | - $data['latitude'] = $line['pt'][0]; // lat |
|
| 1022 | - $data['longitude'] = $line['pt'][1]; // long |
|
| 1023 | - //if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate |
|
| 1024 | - if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk |
|
| 1025 | - //$data['aircraft_icao'] = $line[8]; |
|
| 1026 | - if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc']; |
|
| 1018 | + $data['altitude'] = round($line['inf']['al']*3.28084); // altitude |
|
| 1019 | + if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed |
|
| 1020 | + if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading |
|
| 1021 | + $data['latitude'] = $line['pt'][0]; // lat |
|
| 1022 | + $data['longitude'] = $line['pt'][1]; // long |
|
| 1023 | + //if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate |
|
| 1024 | + if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk |
|
| 1025 | + //$data['aircraft_icao'] = $line[8]; |
|
| 1026 | + if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc']; |
|
| 1027 | 1027 | //$data['departure_airport_iata'] = $line[11]; |
| 1028 | 1028 | //$data['arrival_airport_iata'] = $line[12]; |
| 1029 | - //$data['emergency'] = ''; // emergency |
|
| 1029 | + //$data['emergency'] = ''; // emergency |
|
| 1030 | 1030 | $data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10] |
| 1031 | - $data['format_source'] = 'radarvirtueljson'; |
|
| 1032 | - $data['id_source'] = $id_source; |
|
| 1031 | + $data['format_source'] = 'radarvirtueljson'; |
|
| 1032 | + $data['id_source'] = $id_source; |
|
| 1033 | 1033 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
| 1034 | 1034 | if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
| 1035 | 1035 | $SI->add($data); |
| 1036 | 1036 | unset($data); |
| 1037 | - } |
|
| 1037 | + } |
|
| 1038 | + } |
|
| 1038 | 1039 | } |
| 1039 | - } |
|
| 1040 | - //$last_exec['radarvirtueljson'] = time(); |
|
| 1041 | - $last_exec[$id]['last'] = time(); |
|
| 1040 | + //$last_exec['radarvirtueljson'] = time(); |
|
| 1041 | + $last_exec[$id]['last'] = time(); |
|
| 1042 | 1042 | //} elseif ($value == 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) { |
| 1043 | 1043 | } elseif ($value['format'] == 'pirepsjson' && |
| 1044 | - ( |
|
| 1044 | + ( |
|
| 1045 | 1045 | (isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || |
| 1046 | 1046 | (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch)) |
| 1047 | - ) |
|
| 1047 | + ) |
|
| 1048 | 1048 | ) { |
| 1049 | - //$buffer = $Common->getData($hosts[$id]); |
|
| 1050 | - $buffer = $Common->getData($value['host'].'?'.time()); |
|
| 1051 | - $all_data = json_decode(utf8_encode($buffer),true); |
|
| 1049 | + //$buffer = $Common->getData($hosts[$id]); |
|
| 1050 | + $buffer = $Common->getData($value['host'].'?'.time()); |
|
| 1051 | + $all_data = json_decode(utf8_encode($buffer),true); |
|
| 1052 | 1052 | |
| 1053 | - if (isset($all_data['pireps'])) { |
|
| 1053 | + if (isset($all_data['pireps'])) { |
|
| 1054 | 1054 | $reset = 0; |
| 1055 | - foreach ($all_data['pireps'] as $line) { |
|
| 1056 | - $data = array(); |
|
| 1057 | - $data['id'] = $line['id']; |
|
| 1058 | - $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6); |
|
| 1059 | - $data['ident'] = $line['callsign']; // ident |
|
| 1060 | - if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id |
|
| 1061 | - if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name |
|
| 1062 | - if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude |
|
| 1063 | - if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed |
|
| 1064 | - if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading |
|
| 1065 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 1066 | - $data['latitude'] = $line['lat']; // lat |
|
| 1067 | - $data['longitude'] = $line['lon']; // long |
|
| 1068 | - //$data['verticalrate'] = $line['vrt']; // verticale rate |
|
| 1069 | - //$data['squawk'] = $line['squawk']; // squawk |
|
| 1070 | - //$data['emergency'] = ''; // emergency |
|
| 1071 | - if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao']; |
|
| 1072 | - if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime']; |
|
| 1073 | - if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao']; |
|
| 1074 | - //$data['arrival_airport_time'] = $line['arrtime']; |
|
| 1075 | - if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft']; |
|
| 1076 | - if (isset($line['transponder'])) $data['squawk'] = $line['transponder']; |
|
| 1077 | - if (isset($line['atis'])) $data['info'] = $line['atis']; |
|
| 1078 | - else $data['info'] = ''; |
|
| 1079 | - $data['format_source'] = 'pireps'; |
|
| 1080 | - $data['id_source'] = $id_source; |
|
| 1081 | - $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1082 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1083 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1084 | - if ($line['icon'] == 'plane') { |
|
| 1055 | + foreach ($all_data['pireps'] as $line) { |
|
| 1056 | + $data = array(); |
|
| 1057 | + $data['id'] = $line['id']; |
|
| 1058 | + $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6); |
|
| 1059 | + $data['ident'] = $line['callsign']; // ident |
|
| 1060 | + if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id |
|
| 1061 | + if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name |
|
| 1062 | + if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude |
|
| 1063 | + if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed |
|
| 1064 | + if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading |
|
| 1065 | + if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 1066 | + $data['latitude'] = $line['lat']; // lat |
|
| 1067 | + $data['longitude'] = $line['lon']; // long |
|
| 1068 | + //$data['verticalrate'] = $line['vrt']; // verticale rate |
|
| 1069 | + //$data['squawk'] = $line['squawk']; // squawk |
|
| 1070 | + //$data['emergency'] = ''; // emergency |
|
| 1071 | + if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao']; |
|
| 1072 | + if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime']; |
|
| 1073 | + if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao']; |
|
| 1074 | + //$data['arrival_airport_time'] = $line['arrtime']; |
|
| 1075 | + if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft']; |
|
| 1076 | + if (isset($line['transponder'])) $data['squawk'] = $line['transponder']; |
|
| 1077 | + if (isset($line['atis'])) $data['info'] = $line['atis']; |
|
| 1078 | + else $data['info'] = ''; |
|
| 1079 | + $data['format_source'] = 'pireps'; |
|
| 1080 | + $data['id_source'] = $id_source; |
|
| 1081 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1082 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1083 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1084 | + if ($line['icon'] == 'plane') { |
|
| 1085 | 1085 | $SI->add($data); |
| 1086 | - // print_r($data); |
|
| 1087 | - } elseif ($line['icon'] == 'ct') { |
|
| 1086 | + // print_r($data); |
|
| 1087 | + } elseif ($line['icon'] == 'ct') { |
|
| 1088 | 1088 | $data['info'] = str_replace('^§','<br />',$data['info']); |
| 1089 | 1089 | $data['info'] = str_replace('&sect;','',$data['info']); |
| 1090 | 1090 | $typec = substr($data['ident'],-3); |
@@ -1099,148 +1099,148 @@ discard block |
||
| 1099 | 1099 | elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre'; |
| 1100 | 1100 | else $data['type'] = 'Observer'; |
| 1101 | 1101 | if (isset($ATC)) echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']); |
| 1102 | - } |
|
| 1103 | - unset($data); |
|
| 1102 | + } |
|
| 1103 | + unset($data); |
|
| 1104 | + } |
|
| 1104 | 1105 | } |
| 1105 | - } |
|
| 1106 | - //$last_exec['pirepsjson'] = time(); |
|
| 1107 | - $last_exec[$id]['last'] = time(); |
|
| 1106 | + //$last_exec['pirepsjson'] = time(); |
|
| 1107 | + $last_exec[$id]['last'] = time(); |
|
| 1108 | 1108 | //} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) { |
| 1109 | 1109 | } elseif ($value['format'] == 'phpvmacars' && |
| 1110 | - ( |
|
| 1110 | + ( |
|
| 1111 | 1111 | (isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || |
| 1112 | 1112 | (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch)) |
| 1113 | - ) |
|
| 1113 | + ) |
|
| 1114 | 1114 | ) { |
| 1115 | - //$buffer = $Common->getData($hosts[$id]); |
|
| 1116 | - if ($globalDebug) echo 'Get Data...'."\n"; |
|
| 1117 | - $buffer = $Common->getData($value['host']); |
|
| 1118 | - $all_data = json_decode($buffer,true); |
|
| 1119 | - if ($buffer != '' && is_array($all_data)) { |
|
| 1115 | + //$buffer = $Common->getData($hosts[$id]); |
|
| 1116 | + if ($globalDebug) echo 'Get Data...'."\n"; |
|
| 1117 | + $buffer = $Common->getData($value['host']); |
|
| 1118 | + $all_data = json_decode($buffer,true); |
|
| 1119 | + if ($buffer != '' && is_array($all_data)) { |
|
| 1120 | 1120 | $reset = 0; |
| 1121 | 1121 | foreach ($all_data as $line) { |
| 1122 | - $data = array(); |
|
| 1123 | - //$data['id'] = $line['id']; // id not usable |
|
| 1124 | - if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum']; |
|
| 1125 | - $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex |
|
| 1126 | - if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname']; |
|
| 1127 | - if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; |
|
| 1128 | - $data['ident'] = $line['flightnum']; // ident |
|
| 1129 | - $data['altitude'] = $line['alt']; // altitude |
|
| 1130 | - $data['speed'] = $line['gs']; // speed |
|
| 1131 | - $data['heading'] = $line['heading']; // heading |
|
| 1132 | - $data['latitude'] = $line['lat']; // lat |
|
| 1133 | - $data['longitude'] = $line['lng']; // long |
|
| 1134 | - $data['verticalrate'] = ''; // verticale rate |
|
| 1135 | - $data['squawk'] = ''; // squawk |
|
| 1136 | - $data['emergency'] = ''; // emergency |
|
| 1137 | - //$data['datetime'] = $line['lastupdate']; |
|
| 1138 | - //$data['last_update'] = $line['lastupdate']; |
|
| 1139 | - if (isset($value['timezone'])) { |
|
| 1140 | - $datetime = new DateTime($line['lastupdate'],new DateTimeZone($value['timezone'])); |
|
| 1141 | - $datetime->setTimeZone(new DateTimeZone('UTC')); |
|
| 1142 | - $data['datetime'] = $datetime->format('Y-m-d H:i:s'); |
|
| 1143 | - } else $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1144 | - $data['departure_airport_icao'] = $line['depicao']; |
|
| 1145 | - $data['departure_airport_time'] = $line['deptime']; |
|
| 1146 | - $data['arrival_airport_icao'] = $line['arricao']; |
|
| 1147 | - $data['arrival_airport_time'] = $line['arrtime']; |
|
| 1148 | - $data['registration'] = $line['aircraft']; |
|
| 1149 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1150 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 1151 | - if (isset($line['aircraftname'])) { |
|
| 1122 | + $data = array(); |
|
| 1123 | + //$data['id'] = $line['id']; // id not usable |
|
| 1124 | + if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum']; |
|
| 1125 | + $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex |
|
| 1126 | + if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname']; |
|
| 1127 | + if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; |
|
| 1128 | + $data['ident'] = $line['flightnum']; // ident |
|
| 1129 | + $data['altitude'] = $line['alt']; // altitude |
|
| 1130 | + $data['speed'] = $line['gs']; // speed |
|
| 1131 | + $data['heading'] = $line['heading']; // heading |
|
| 1132 | + $data['latitude'] = $line['lat']; // lat |
|
| 1133 | + $data['longitude'] = $line['lng']; // long |
|
| 1134 | + $data['verticalrate'] = ''; // verticale rate |
|
| 1135 | + $data['squawk'] = ''; // squawk |
|
| 1136 | + $data['emergency'] = ''; // emergency |
|
| 1137 | + //$data['datetime'] = $line['lastupdate']; |
|
| 1138 | + //$data['last_update'] = $line['lastupdate']; |
|
| 1139 | + if (isset($value['timezone'])) { |
|
| 1140 | + $datetime = new DateTime($line['lastupdate'],new DateTimeZone($value['timezone'])); |
|
| 1141 | + $datetime->setTimeZone(new DateTimeZone('UTC')); |
|
| 1142 | + $data['datetime'] = $datetime->format('Y-m-d H:i:s'); |
|
| 1143 | + } else $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1144 | + $data['departure_airport_icao'] = $line['depicao']; |
|
| 1145 | + $data['departure_airport_time'] = $line['deptime']; |
|
| 1146 | + $data['arrival_airport_icao'] = $line['arricao']; |
|
| 1147 | + $data['arrival_airport_time'] = $line['arrtime']; |
|
| 1148 | + $data['registration'] = $line['aircraft']; |
|
| 1149 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1150 | + if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 1151 | + if (isset($line['aircraftname'])) { |
|
| 1152 | 1152 | $line['aircraftname'] = strtoupper($line['aircraftname']); |
| 1153 | 1153 | $line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']); |
| 1154 | - $aircraft_data = explode('-',$line['aircraftname']); |
|
| 1155 | - if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0]; |
|
| 1156 | - elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1]; |
|
| 1157 | - else { |
|
| 1158 | - $aircraft_data = explode(' ',$line['aircraftname']); |
|
| 1159 | - if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]); |
|
| 1160 | - else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']); |
|
| 1161 | - } |
|
| 1162 | - } |
|
| 1163 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; |
|
| 1164 | - $data['id_source'] = $id_source; |
|
| 1165 | - $data['format_source'] = 'phpvmacars'; |
|
| 1166 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1167 | - $SI->add($data); |
|
| 1168 | - unset($data); |
|
| 1154 | + $aircraft_data = explode('-',$line['aircraftname']); |
|
| 1155 | + if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0]; |
|
| 1156 | + elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1]; |
|
| 1157 | + else { |
|
| 1158 | + $aircraft_data = explode(' ',$line['aircraftname']); |
|
| 1159 | + if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]); |
|
| 1160 | + else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']); |
|
| 1161 | + } |
|
| 1162 | + } |
|
| 1163 | + if (isset($line['route'])) $data['waypoints'] = $line['route']; |
|
| 1164 | + $data['id_source'] = $id_source; |
|
| 1165 | + $data['format_source'] = 'phpvmacars'; |
|
| 1166 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1167 | + $SI->add($data); |
|
| 1168 | + unset($data); |
|
| 1169 | 1169 | } |
| 1170 | 1170 | if ($globalDebug) echo 'No more data...'."\n"; |
| 1171 | 1171 | unset($buffer); |
| 1172 | 1172 | unset($all_data); |
| 1173 | - } |
|
| 1174 | - //$last_exec['phpvmacars'] = time(); |
|
| 1175 | - $last_exec[$id]['last'] = time(); |
|
| 1173 | + } |
|
| 1174 | + //$last_exec['phpvmacars'] = time(); |
|
| 1175 | + $last_exec[$id]['last'] = time(); |
|
| 1176 | 1176 | } elseif ($value['format'] == 'vam' && |
| 1177 | - ( |
|
| 1177 | + ( |
|
| 1178 | 1178 | (isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || |
| 1179 | 1179 | (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch)) |
| 1180 | - ) |
|
| 1180 | + ) |
|
| 1181 | 1181 | ) { |
| 1182 | - //$buffer = $Common->getData($hosts[$id]); |
|
| 1183 | - if ($globalDebug) echo 'Get Data...'."\n"; |
|
| 1184 | - $buffer = $Common->getData($value['host']); |
|
| 1185 | - $all_data = json_decode($buffer,true); |
|
| 1186 | - if ($buffer != '' && is_array($all_data)) { |
|
| 1182 | + //$buffer = $Common->getData($hosts[$id]); |
|
| 1183 | + if ($globalDebug) echo 'Get Data...'."\n"; |
|
| 1184 | + $buffer = $Common->getData($value['host']); |
|
| 1185 | + $all_data = json_decode($buffer,true); |
|
| 1186 | + if ($buffer != '' && is_array($all_data)) { |
|
| 1187 | 1187 | $reset = 0; |
| 1188 | 1188 | foreach ($all_data as $line) { |
| 1189 | - $data = array(); |
|
| 1190 | - //$data['id'] = $line['id']; // id not usable |
|
| 1191 | - $data['id'] = trim($line['flight_id']); |
|
| 1192 | - $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex |
|
| 1193 | - $data['pilot_name'] = $line['pilot_name']; |
|
| 1194 | - $data['pilot_id'] = $line['pilot_id']; |
|
| 1195 | - $data['ident'] = trim($line['callsign']); // ident |
|
| 1196 | - $data['altitude'] = $line['altitude']; // altitude |
|
| 1197 | - $data['speed'] = $line['gs']; // speed |
|
| 1198 | - $data['heading'] = $line['heading']; // heading |
|
| 1199 | - $data['latitude'] = $line['latitude']; // lat |
|
| 1200 | - $data['longitude'] = $line['longitude']; // long |
|
| 1201 | - $data['verticalrate'] = ''; // verticale rate |
|
| 1202 | - $data['squawk'] = ''; // squawk |
|
| 1203 | - $data['emergency'] = ''; // emergency |
|
| 1204 | - //$data['datetime'] = $line['lastupdate']; |
|
| 1205 | - $data['last_update'] = $line['last_update']; |
|
| 1206 | - $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1207 | - $data['departure_airport_icao'] = $line['departure']; |
|
| 1208 | - //$data['departure_airport_time'] = $line['departure_time']; |
|
| 1209 | - $data['arrival_airport_icao'] = $line['arrival']; |
|
| 1210 | - //$data['arrival_airport_time'] = $line['arrival_time']; |
|
| 1211 | - //$data['registration'] = $line['aircraft']; |
|
| 1212 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 1213 | - $data['aircraft_icao'] = $line['plane_type']; |
|
| 1214 | - $data['id_source'] = $id_source; |
|
| 1215 | - $data['format_source'] = 'vam'; |
|
| 1216 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1217 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1218 | - $SI->add($data); |
|
| 1219 | - unset($data); |
|
| 1189 | + $data = array(); |
|
| 1190 | + //$data['id'] = $line['id']; // id not usable |
|
| 1191 | + $data['id'] = trim($line['flight_id']); |
|
| 1192 | + $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex |
|
| 1193 | + $data['pilot_name'] = $line['pilot_name']; |
|
| 1194 | + $data['pilot_id'] = $line['pilot_id']; |
|
| 1195 | + $data['ident'] = trim($line['callsign']); // ident |
|
| 1196 | + $data['altitude'] = $line['altitude']; // altitude |
|
| 1197 | + $data['speed'] = $line['gs']; // speed |
|
| 1198 | + $data['heading'] = $line['heading']; // heading |
|
| 1199 | + $data['latitude'] = $line['latitude']; // lat |
|
| 1200 | + $data['longitude'] = $line['longitude']; // long |
|
| 1201 | + $data['verticalrate'] = ''; // verticale rate |
|
| 1202 | + $data['squawk'] = ''; // squawk |
|
| 1203 | + $data['emergency'] = ''; // emergency |
|
| 1204 | + //$data['datetime'] = $line['lastupdate']; |
|
| 1205 | + $data['last_update'] = $line['last_update']; |
|
| 1206 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1207 | + $data['departure_airport_icao'] = $line['departure']; |
|
| 1208 | + //$data['departure_airport_time'] = $line['departure_time']; |
|
| 1209 | + $data['arrival_airport_icao'] = $line['arrival']; |
|
| 1210 | + //$data['arrival_airport_time'] = $line['arrival_time']; |
|
| 1211 | + //$data['registration'] = $line['aircraft']; |
|
| 1212 | + if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 1213 | + $data['aircraft_icao'] = $line['plane_type']; |
|
| 1214 | + $data['id_source'] = $id_source; |
|
| 1215 | + $data['format_source'] = 'vam'; |
|
| 1216 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1217 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1218 | + $SI->add($data); |
|
| 1219 | + unset($data); |
|
| 1220 | 1220 | } |
| 1221 | 1221 | if ($globalDebug) echo 'No more data...'."\n"; |
| 1222 | 1222 | unset($buffer); |
| 1223 | 1223 | unset($all_data); |
| 1224 | - } |
|
| 1225 | - //$last_exec['phpvmacars'] = time(); |
|
| 1226 | - $last_exec[$id]['last'] = time(); |
|
| 1224 | + } |
|
| 1225 | + //$last_exec['phpvmacars'] = time(); |
|
| 1226 | + $last_exec[$id]['last'] = time(); |
|
| 1227 | 1227 | } elseif ($value['format'] == 'blitzortung' && |
| 1228 | - ( |
|
| 1228 | + ( |
|
| 1229 | 1229 | (isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || |
| 1230 | 1230 | (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch)) |
| 1231 | - ) |
|
| 1231 | + ) |
|
| 1232 | 1232 | ) { |
| 1233 | - //$buffer = $Common->getData($hosts[$id]); |
|
| 1234 | - if ($globalDebug) echo 'Get Data...'."\n"; |
|
| 1235 | - $buffer = $Common->getData($value['host']); |
|
| 1236 | - $all_data = json_decode($buffer,true); |
|
| 1237 | - if ($buffer != '') { |
|
| 1233 | + //$buffer = $Common->getData($hosts[$id]); |
|
| 1234 | + if ($globalDebug) echo 'Get Data...'."\n"; |
|
| 1235 | + $buffer = $Common->getData($value['host']); |
|
| 1236 | + $all_data = json_decode($buffer,true); |
|
| 1237 | + if ($buffer != '') { |
|
| 1238 | 1238 | $Source->deleteLocationBySource('blitzortung'); |
| 1239 | 1239 | $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
| 1240 | 1240 | $buffer = explode('\n',$buffer); |
| 1241 | 1241 | foreach ($buffer as $buffer_line) { |
| 1242 | - $line = json_decode($buffer_line,true); |
|
| 1243 | - if (isset($line['time'])) { |
|
| 1242 | + $line = json_decode($buffer_line,true); |
|
| 1243 | + if (isset($line['time'])) { |
|
| 1244 | 1244 | $data = array(); |
| 1245 | 1245 | $data['altitude'] = $line['alt']; // altitude |
| 1246 | 1246 | $data['latitude'] = $line['lat']; // lat |
@@ -1252,94 +1252,94 @@ discard block |
||
| 1252 | 1252 | if ($globalDebug) echo '☈ Lightning added'."\n"; |
| 1253 | 1253 | $Source->addLocation('',$data['latitude'],$data['longitude'],0,'','','blitzortung','weather/thunderstorm.png','lightning',$id,0,$data['datetime']); |
| 1254 | 1254 | unset($data); |
| 1255 | - } |
|
| 1255 | + } |
|
| 1256 | 1256 | } |
| 1257 | 1257 | if ($globalDebug) echo 'No more data...'."\n"; |
| 1258 | 1258 | unset($buffer); |
| 1259 | - } |
|
| 1260 | - $last_exec[$id]['last'] = time(); |
|
| 1259 | + } |
|
| 1260 | + $last_exec[$id]['last'] = time(); |
|
| 1261 | 1261 | //} elseif ($value == 'sbs' || $value == 'tsv' || $value == 'raw' || $value == 'aprs' || $value == 'beast') { |
| 1262 | 1262 | } elseif ($value['format'] == 'sbs' || $value['format'] == 'tsv' || $value['format'] == 'raw' || $value['format'] == 'aprs' || $value['format'] == 'famaprs' || $value['format'] == 'beast' || $value['format'] == 'flightgearmp' || $value['format'] == 'flightgearsp' || $value['format'] == 'acars' || $value['format'] == 'acarssbs3' || $value['format'] == 'ais' || $value['format'] == 'vrstcp') { |
| 1263 | - if (function_exists('pcntl_fork')) pcntl_signal_dispatch(); |
|
| 1264 | - //$last_exec[$id]['last'] = time(); |
|
| 1263 | + if (function_exists('pcntl_fork')) pcntl_signal_dispatch(); |
|
| 1264 | + //$last_exec[$id]['last'] = time(); |
|
| 1265 | 1265 | |
| 1266 | - //$read = array( $sockets[$id] ); |
|
| 1267 | - $read = $sockets; |
|
| 1268 | - $write = NULL; |
|
| 1269 | - $e = NULL; |
|
| 1270 | - $n = socket_select($read, $write, $e, $timeout); |
|
| 1271 | - if ($e != NULL) var_dump($e); |
|
| 1272 | - if ($n > 0) { |
|
| 1266 | + //$read = array( $sockets[$id] ); |
|
| 1267 | + $read = $sockets; |
|
| 1268 | + $write = NULL; |
|
| 1269 | + $e = NULL; |
|
| 1270 | + $n = socket_select($read, $write, $e, $timeout); |
|
| 1271 | + if ($e != NULL) var_dump($e); |
|
| 1272 | + if ($n > 0) { |
|
| 1273 | 1273 | $reset = 0; |
| 1274 | 1274 | foreach ($read as $nb => $r) { |
| 1275 | - //$value = $formats[$nb]; |
|
| 1276 | - $format = $globalSources[$nb]['format']; |
|
| 1277 | - if ($format == 'sbs' || $format == 'aprs' || $format == 'famaprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') { |
|
| 1275 | + //$value = $formats[$nb]; |
|
| 1276 | + $format = $globalSources[$nb]['format']; |
|
| 1277 | + if ($format == 'sbs' || $format == 'aprs' || $format == 'famaprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') { |
|
| 1278 | 1278 | $buffer = @socket_read($r, 6000,PHP_NORMAL_READ); |
| 1279 | - } elseif ($format == 'vrstcp') { |
|
| 1279 | + } elseif ($format == 'vrstcp') { |
|
| 1280 | 1280 | $buffer = @socket_read($r, 6000); |
| 1281 | - } else { |
|
| 1281 | + } else { |
|
| 1282 | 1282 | $az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port); |
| 1283 | - } |
|
| 1284 | - //$buffer = socket_read($r, 60000,PHP_NORMAL_READ); |
|
| 1285 | - //echo $buffer."\n"; |
|
| 1286 | - // lets play nice and handle signals such as ctrl-c/kill properly |
|
| 1287 | - //if (function_exists('pcntl_fork')) pcntl_signal_dispatch(); |
|
| 1288 | - $error = false; |
|
| 1289 | - //$SI::del(); |
|
| 1290 | - if ($format == 'vrstcp') { |
|
| 1283 | + } |
|
| 1284 | + //$buffer = socket_read($r, 60000,PHP_NORMAL_READ); |
|
| 1285 | + //echo $buffer."\n"; |
|
| 1286 | + // lets play nice and handle signals such as ctrl-c/kill properly |
|
| 1287 | + //if (function_exists('pcntl_fork')) pcntl_signal_dispatch(); |
|
| 1288 | + $error = false; |
|
| 1289 | + //$SI::del(); |
|
| 1290 | + if ($format == 'vrstcp') { |
|
| 1291 | 1291 | $buffer = explode('},{',$buffer); |
| 1292 | - } else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer)); |
|
| 1293 | - // SBS format is CSV format |
|
| 1294 | - if ($buffer !== FALSE && $buffer != '') { |
|
| 1292 | + } else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer)); |
|
| 1293 | + // SBS format is CSV format |
|
| 1294 | + if ($buffer !== FALSE && $buffer != '') { |
|
| 1295 | 1295 | $tt[$format] = 0; |
| 1296 | 1296 | if ($format == 'acarssbs3') { |
| 1297 | - if ($globalDebug) echo 'ACARS : '.$buffer."\n"; |
|
| 1298 | - $ACARS->add(trim($buffer)); |
|
| 1299 | - $ACARS->deleteLiveAcarsData(); |
|
| 1297 | + if ($globalDebug) echo 'ACARS : '.$buffer."\n"; |
|
| 1298 | + $ACARS->add(trim($buffer)); |
|
| 1299 | + $ACARS->deleteLiveAcarsData(); |
|
| 1300 | 1300 | } elseif ($format == 'raw') { |
| 1301 | - // AVR format |
|
| 1302 | - $data = $SBS->parse($buffer); |
|
| 1303 | - if (is_array($data)) { |
|
| 1301 | + // AVR format |
|
| 1302 | + $data = $SBS->parse($buffer); |
|
| 1303 | + if (is_array($data)) { |
|
| 1304 | 1304 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 1305 | 1305 | $data['format_source'] = 'raw'; |
| 1306 | 1306 | if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
| 1307 | 1307 | if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
| 1308 | 1308 | if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
| 1309 | 1309 | if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
| 1310 | - } |
|
| 1310 | + } |
|
| 1311 | 1311 | } elseif ($format == 'ais') { |
| 1312 | - $ais_data = $AIS->parse_line(trim($buffer)); |
|
| 1313 | - $data = array(); |
|
| 1314 | - if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident']; |
|
| 1315 | - if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi']; |
|
| 1316 | - if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed']; |
|
| 1317 | - if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading']; |
|
| 1318 | - if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude']; |
|
| 1319 | - if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude']; |
|
| 1320 | - if (isset($ais_data['status'])) $data['status'] = $ais_data['status']; |
|
| 1321 | - if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid']; |
|
| 1322 | - if (isset($ais_data['type'])) $data['type'] = $ais_data['type']; |
|
| 1323 | - if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
|
| 1324 | - if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
|
| 1325 | - if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination']; |
|
| 1326 | - if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); |
|
| 1327 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1328 | - if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
|
| 1329 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1312 | + $ais_data = $AIS->parse_line(trim($buffer)); |
|
| 1313 | + $data = array(); |
|
| 1314 | + if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident']; |
|
| 1315 | + if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi']; |
|
| 1316 | + if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed']; |
|
| 1317 | + if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading']; |
|
| 1318 | + if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude']; |
|
| 1319 | + if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude']; |
|
| 1320 | + if (isset($ais_data['status'])) $data['status'] = $ais_data['status']; |
|
| 1321 | + if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid']; |
|
| 1322 | + if (isset($ais_data['type'])) $data['type'] = $ais_data['type']; |
|
| 1323 | + if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
|
| 1324 | + if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
|
| 1325 | + if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination']; |
|
| 1326 | + if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); |
|
| 1327 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1328 | + if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
|
| 1329 | + if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1330 | 1330 | |
| 1331 | - if (isset($ais_data['timestamp'])) { |
|
| 1331 | + if (isset($ais_data['timestamp'])) { |
|
| 1332 | 1332 | $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
| 1333 | - } else { |
|
| 1333 | + } else { |
|
| 1334 | 1334 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 1335 | - } |
|
| 1336 | - $data['format_source'] = 'aisnmea'; |
|
| 1337 | - $data['id_source'] = $id_source; |
|
| 1338 | - if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data); |
|
| 1339 | - unset($data); |
|
| 1340 | - } elseif ($format == 'flightgearsp') { |
|
| 1341 | - //echo $buffer."\n"; |
|
| 1342 | - if (strlen($buffer) > 5) { |
|
| 1335 | + } |
|
| 1336 | + $data['format_source'] = 'aisnmea'; |
|
| 1337 | + $data['id_source'] = $id_source; |
|
| 1338 | + if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data); |
|
| 1339 | + unset($data); |
|
| 1340 | + } elseif ($format == 'flightgearsp') { |
|
| 1341 | + //echo $buffer."\n"; |
|
| 1342 | + if (strlen($buffer) > 5) { |
|
| 1343 | 1343 | $line = explode(',',$buffer); |
| 1344 | 1344 | $data = array(); |
| 1345 | 1345 | //XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p |
@@ -1356,38 +1356,38 @@ discard block |
||
| 1356 | 1356 | if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
| 1357 | 1357 | if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
| 1358 | 1358 | //$send = @ socket_send( $r , $data_aprs , strlen($data_aprs) , 0 ); |
| 1359 | - } |
|
| 1360 | - } elseif ($format == 'acars') { |
|
| 1361 | - if ($globalDebug) echo 'ACARS : '.$buffer."\n"; |
|
| 1362 | - $ACARS->add(trim($buffer)); |
|
| 1363 | - socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port); |
|
| 1364 | - $ACARS->deleteLiveAcarsData(); |
|
| 1359 | + } |
|
| 1360 | + } elseif ($format == 'acars') { |
|
| 1361 | + if ($globalDebug) echo 'ACARS : '.$buffer."\n"; |
|
| 1362 | + $ACARS->add(trim($buffer)); |
|
| 1363 | + socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port); |
|
| 1364 | + $ACARS->deleteLiveAcarsData(); |
|
| 1365 | 1365 | } elseif ($format == 'flightgearmp') { |
| 1366 | - if (substr($buffer,0,1) != '#') { |
|
| 1366 | + if (substr($buffer,0,1) != '#') { |
|
| 1367 | 1367 | $data = array(); |
| 1368 | 1368 | //echo $buffer."\n"; |
| 1369 | 1369 | $line = explode(' ',$buffer); |
| 1370 | 1370 | if (count($line) == 11) { |
| 1371 | - $userserver = explode('@',$line[0]); |
|
| 1372 | - $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex |
|
| 1373 | - $data['ident'] = $userserver[0]; |
|
| 1374 | - $data['registration'] = $userserver[0]; |
|
| 1375 | - $data['latitude'] = $line[4]; |
|
| 1376 | - $data['longitude'] = $line[5]; |
|
| 1377 | - $data['altitude'] = $line[6]; |
|
| 1378 | - $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1379 | - $aircraft_type = $line[10]; |
|
| 1380 | - $aircraft_type = preg_split(':/:',$aircraft_type); |
|
| 1381 | - $data['aircraft_name'] = substr(end($aircraft_type),0,-4); |
|
| 1382 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1383 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
|
| 1371 | + $userserver = explode('@',$line[0]); |
|
| 1372 | + $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex |
|
| 1373 | + $data['ident'] = $userserver[0]; |
|
| 1374 | + $data['registration'] = $userserver[0]; |
|
| 1375 | + $data['latitude'] = $line[4]; |
|
| 1376 | + $data['longitude'] = $line[5]; |
|
| 1377 | + $data['altitude'] = $line[6]; |
|
| 1378 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1379 | + $aircraft_type = $line[10]; |
|
| 1380 | + $aircraft_type = preg_split(':/:',$aircraft_type); |
|
| 1381 | + $data['aircraft_name'] = substr(end($aircraft_type),0,-4); |
|
| 1382 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1383 | + if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
|
| 1384 | + } |
|
| 1384 | 1385 | } |
| 1385 | - } |
|
| 1386 | 1386 | } elseif ($format == 'beast') { |
| 1387 | - echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n"; |
|
| 1388 | - die; |
|
| 1387 | + echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n"; |
|
| 1388 | + die; |
|
| 1389 | 1389 | } elseif ($format == 'vrstcp') { |
| 1390 | - foreach($buffer as $all_data) { |
|
| 1390 | + foreach($buffer as $all_data) { |
|
| 1391 | 1391 | $line = json_decode('{'.$all_data.'}',true); |
| 1392 | 1392 | $data = array(); |
| 1393 | 1393 | if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex |
@@ -1407,148 +1407,148 @@ discard block |
||
| 1407 | 1407 | */ |
| 1408 | 1408 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 1409 | 1409 | if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type']; |
| 1410 | - $data['format_source'] = 'vrstcp'; |
|
| 1410 | + $data['format_source'] = 'vrstcp'; |
|
| 1411 | 1411 | $data['id_source'] = $id_source; |
| 1412 | 1412 | if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
| 1413 | 1413 | if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
| 1414 | 1414 | if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data); |
| 1415 | 1415 | unset($data); |
| 1416 | - } |
|
| 1416 | + } |
|
| 1417 | 1417 | } elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') { |
| 1418 | - $line = explode("\t", $buffer); |
|
| 1419 | - for($k = 0; $k < count($line); $k=$k+2) { |
|
| 1418 | + $line = explode("\t", $buffer); |
|
| 1419 | + for($k = 0; $k < count($line); $k=$k+2) { |
|
| 1420 | 1420 | $key = $line[$k]; |
| 1421 | - $lined[$key] = $line[$k+1]; |
|
| 1422 | - } |
|
| 1423 | - if (count($lined) > 3) { |
|
| 1424 | - $data['hex'] = $lined['hexid']; |
|
| 1425 | - //$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));; |
|
| 1426 | - $data['datetime'] = date('Y-m-d H:i:s');; |
|
| 1427 | - if (isset($lined['ident'])) $data['ident'] = $lined['ident']; |
|
| 1428 | - if (isset($lined['lat'])) $data['latitude'] = $lined['lat']; |
|
| 1429 | - if (isset($lined['lon'])) $data['longitude'] = $lined['lon']; |
|
| 1430 | - if (isset($lined['speed'])) $data['speed'] = $lined['speed']; |
|
| 1431 | - if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk']; |
|
| 1432 | - if (isset($lined['alt'])) $data['altitude'] = $lined['alt']; |
|
| 1433 | - if (isset($lined['heading'])) $data['heading'] = $lined['heading']; |
|
| 1434 | - $data['id_source'] = $id_source; |
|
| 1435 | - $data['format_source'] = 'tsv'; |
|
| 1436 | - if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
|
| 1437 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1421 | + $lined[$key] = $line[$k+1]; |
|
| 1422 | + } |
|
| 1423 | + if (count($lined) > 3) { |
|
| 1424 | + $data['hex'] = $lined['hexid']; |
|
| 1425 | + //$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));; |
|
| 1426 | + $data['datetime'] = date('Y-m-d H:i:s');; |
|
| 1427 | + if (isset($lined['ident'])) $data['ident'] = $lined['ident']; |
|
| 1428 | + if (isset($lined['lat'])) $data['latitude'] = $lined['lat']; |
|
| 1429 | + if (isset($lined['lon'])) $data['longitude'] = $lined['lon']; |
|
| 1430 | + if (isset($lined['speed'])) $data['speed'] = $lined['speed']; |
|
| 1431 | + if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk']; |
|
| 1432 | + if (isset($lined['alt'])) $data['altitude'] = $lined['alt']; |
|
| 1433 | + if (isset($lined['heading'])) $data['heading'] = $lined['heading']; |
|
| 1434 | + $data['id_source'] = $id_source; |
|
| 1435 | + $data['format_source'] = 'tsv'; |
|
| 1436 | + if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
|
| 1437 | + if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1438 | 1438 | if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
| 1439 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
|
| 1440 | - unset($lined); |
|
| 1441 | - unset($data); |
|
| 1442 | - } else $error = true; |
|
| 1439 | + if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
|
| 1440 | + unset($lined); |
|
| 1441 | + unset($data); |
|
| 1442 | + } else $error = true; |
|
| 1443 | 1443 | } elseif ($format == 'aprs' && $use_aprs) { |
| 1444 | - if ($aprs_connect == 0) { |
|
| 1444 | + if ($aprs_connect == 0) { |
|
| 1445 | 1445 | $send = @ socket_send( $r , $aprs_login , strlen($aprs_login) , 0 ); |
| 1446 | 1446 | $aprs_connect = 1; |
| 1447 | - } |
|
| 1447 | + } |
|
| 1448 | 1448 | |
| 1449 | - if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) { |
|
| 1449 | + if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) { |
|
| 1450 | 1450 | $aprs_last_tx = time(); |
| 1451 | 1451 | $data_aprs = "# Keep alive"; |
| 1452 | 1452 | $send = @ socket_send( $r , $data_aprs , strlen($data_aprs) , 0 ); |
| 1453 | - } |
|
| 1453 | + } |
|
| 1454 | 1454 | |
| 1455 | - //echo 'Connect : '.$aprs_connect.' '.$buffer."\n"; |
|
| 1456 | - //echo 'APRS data : '.$buffer."\n"; |
|
| 1457 | - $buffer = str_replace('APRS <- ','',$buffer); |
|
| 1458 | - $buffer = str_replace('APRS -> ','',$buffer); |
|
| 1459 | - //echo $buffer."\n"; |
|
| 1460 | - if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') { |
|
| 1455 | + //echo 'Connect : '.$aprs_connect.' '.$buffer."\n"; |
|
| 1456 | + //echo 'APRS data : '.$buffer."\n"; |
|
| 1457 | + $buffer = str_replace('APRS <- ','',$buffer); |
|
| 1458 | + $buffer = str_replace('APRS -> ','',$buffer); |
|
| 1459 | + //echo $buffer."\n"; |
|
| 1460 | + if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') { |
|
| 1461 | 1461 | $line = $APRS->parse($buffer); |
| 1462 | 1462 | //if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) { |
| 1463 | 1463 | if (is_array($line) && isset($line['latitude']) && isset($line['longitude']) && (isset($line['ident']) || isset($line['address']) || isset($line['mmsi']))) { |
| 1464 | - $aprs_last_tx = time(); |
|
| 1465 | - $data = array(); |
|
| 1466 | - //print_r($line); |
|
| 1467 | - if (isset($line['address'])) $data['hex'] = $line['address']; |
|
| 1468 | - if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi']; |
|
| 1469 | - if (isset($line['imo'])) $data['imo'] = $line['imo']; |
|
| 1470 | - if (isset($line['squawk'])) $data['squawk'] = $line['squawk']; |
|
| 1471 | - if (isset($line['arrival_code'])) $data['arrical_code'] = $line['arrival_code']; |
|
| 1472 | - if (isset($line['arrival_date'])) $data['arrical_date'] = $line['arrival_date']; |
|
| 1473 | - if (isset($line['type_id'])) $data['type_id'] = $line['typeid']; |
|
| 1474 | - if (isset($line['status_id'])) $data['status_id'] = $line['statusid']; |
|
| 1475 | - if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']); |
|
| 1476 | - else $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1477 | - //$data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1478 | - if (isset($line['ident'])) $data['ident'] = $line['ident']; |
|
| 1479 | - $data['latitude'] = $line['latitude']; |
|
| 1480 | - $data['longitude'] = $line['longitude']; |
|
| 1481 | - //$data['verticalrate'] = $line[16]; |
|
| 1482 | - if (isset($line['speed'])) $data['speed'] = $line['speed']; |
|
| 1483 | - //else $data['speed'] = 0; |
|
| 1484 | - if (isset($line['altitude'])) $data['altitude'] = $line['altitude']; |
|
| 1485 | - if (isset($line['comment'])) $data['comment'] = $line['comment']; |
|
| 1486 | - if (isset($line['symbol'])) $data['type'] = $line['symbol']; |
|
| 1487 | - if (isset($line['heading'])) $data['heading'] = $line['heading']; |
|
| 1488 | - //else $data['heading'] = 0; |
|
| 1489 | - if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth']; |
|
| 1490 | - //if (!isset($line['source_type']) && (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE))) $data['noarchive'] = true; |
|
| 1491 | - if (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE) $data['noarchive'] = true; |
|
| 1492 | - elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) $data['noarchive'] = false; |
|
| 1493 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1494 | - elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) $data['noarchive'] = false; |
|
| 1495 | - $data['id_source'] = $id_source; |
|
| 1496 | - if (isset($line['format_source'])) $data['format_source'] = $line['format_source']; |
|
| 1497 | - else $data['format_source'] = 'aprs'; |
|
| 1498 | - $data['source_name'] = $line['source']; |
|
| 1499 | - if (isset($line['source_type'])) $data['source_type'] = $line['source_type']; |
|
| 1500 | - else $data['source_type'] = 'flarm'; |
|
| 1501 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1502 | - $currentdate = date('Y-m-d H:i:s'); |
|
| 1503 | - $aprsdate = strtotime($data['datetime']); |
|
| 1504 | - if ($data['source_type'] != 'modes' && $data['source_type'] != 'ais') $data['altitude_relative'] = 'AMSL'; |
|
| 1505 | - // Accept data if time <= system time + 20s |
|
| 1506 | - //if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) { |
|
| 1507 | - if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) { |
|
| 1464 | + $aprs_last_tx = time(); |
|
| 1465 | + $data = array(); |
|
| 1466 | + //print_r($line); |
|
| 1467 | + if (isset($line['address'])) $data['hex'] = $line['address']; |
|
| 1468 | + if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi']; |
|
| 1469 | + if (isset($line['imo'])) $data['imo'] = $line['imo']; |
|
| 1470 | + if (isset($line['squawk'])) $data['squawk'] = $line['squawk']; |
|
| 1471 | + if (isset($line['arrival_code'])) $data['arrical_code'] = $line['arrival_code']; |
|
| 1472 | + if (isset($line['arrival_date'])) $data['arrical_date'] = $line['arrival_date']; |
|
| 1473 | + if (isset($line['type_id'])) $data['type_id'] = $line['typeid']; |
|
| 1474 | + if (isset($line['status_id'])) $data['status_id'] = $line['statusid']; |
|
| 1475 | + if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']); |
|
| 1476 | + else $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1477 | + //$data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1478 | + if (isset($line['ident'])) $data['ident'] = $line['ident']; |
|
| 1479 | + $data['latitude'] = $line['latitude']; |
|
| 1480 | + $data['longitude'] = $line['longitude']; |
|
| 1481 | + //$data['verticalrate'] = $line[16]; |
|
| 1482 | + if (isset($line['speed'])) $data['speed'] = $line['speed']; |
|
| 1483 | + //else $data['speed'] = 0; |
|
| 1484 | + if (isset($line['altitude'])) $data['altitude'] = $line['altitude']; |
|
| 1485 | + if (isset($line['comment'])) $data['comment'] = $line['comment']; |
|
| 1486 | + if (isset($line['symbol'])) $data['type'] = $line['symbol']; |
|
| 1487 | + if (isset($line['heading'])) $data['heading'] = $line['heading']; |
|
| 1488 | + //else $data['heading'] = 0; |
|
| 1489 | + if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth']; |
|
| 1490 | + //if (!isset($line['source_type']) && (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE))) $data['noarchive'] = true; |
|
| 1491 | + if (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE) $data['noarchive'] = true; |
|
| 1492 | + elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) $data['noarchive'] = false; |
|
| 1493 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1494 | + elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) $data['noarchive'] = false; |
|
| 1495 | + $data['id_source'] = $id_source; |
|
| 1496 | + if (isset($line['format_source'])) $data['format_source'] = $line['format_source']; |
|
| 1497 | + else $data['format_source'] = 'aprs'; |
|
| 1498 | + $data['source_name'] = $line['source']; |
|
| 1499 | + if (isset($line['source_type'])) $data['source_type'] = $line['source_type']; |
|
| 1500 | + else $data['source_type'] = 'flarm'; |
|
| 1501 | + if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1502 | + $currentdate = date('Y-m-d H:i:s'); |
|
| 1503 | + $aprsdate = strtotime($data['datetime']); |
|
| 1504 | + if ($data['source_type'] != 'modes' && $data['source_type'] != 'ais') $data['altitude_relative'] = 'AMSL'; |
|
| 1505 | + // Accept data if time <= system time + 20s |
|
| 1506 | + //if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) { |
|
| 1507 | + if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) { |
|
| 1508 | 1508 | $send = $SI->add($data); |
| 1509 | - } elseif ($data['source_type'] == 'ais') { |
|
| 1509 | + } elseif ($data['source_type'] == 'ais') { |
|
| 1510 | 1510 | if (isset($globalMarine) && $globalMarine) $send = $MI->add($data); |
| 1511 | - } elseif (isset($line['stealth'])) { |
|
| 1511 | + } elseif (isset($line['stealth'])) { |
|
| 1512 | 1512 | if ($line['stealth'] != 0) echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n"; |
| 1513 | 1513 | else echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n"; |
| 1514 | - } elseif (isset($globalAircraft) && $globalAircraft && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && ( |
|
| 1515 | - //$line['symbol'] == 'Balloon' || |
|
| 1516 | - $line['symbol'] == 'Glider' || |
|
| 1517 | - $line['symbol'] == 'Aircraft (small)' || $line['symbol'] == 'Helicopter')) { |
|
| 1518 | - if ($line['symbol'] == 'Ballon') $data['aircraft_icao'] = 'BALL'; |
|
| 1519 | - if ($line['symbol'] == 'Glider') $data['aircraft_icao'] = 'PARAGLIDER'; |
|
| 1520 | - $send = $SI->add($data); |
|
| 1521 | - } elseif (isset($globalMarine) && $globalMarine && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && ( |
|
| 1522 | - $line['symbol'] == 'Yacht (Sail)' || |
|
| 1523 | - $line['symbol'] == 'Ship (Power Boat)')) { |
|
| 1524 | - $send = $MI->add($data); |
|
| 1525 | - } elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && ( |
|
| 1526 | - $line['symbol'] == 'Car' || |
|
| 1527 | - $line['symbol'] == 'Ambulance' || |
|
| 1528 | - $line['symbol'] == 'Van' || |
|
| 1529 | - $line['symbol'] == 'Truck' || $line['symbol'] == 'Truck (18 Wheeler)' || |
|
| 1530 | - $line['symbol'] == 'Motorcycle' || |
|
| 1531 | - $line['symbol'] == 'Tractor' || |
|
| 1532 | - $line['symbol'] == 'Police' || |
|
| 1533 | - $line['symbol'] == 'Bike' || |
|
| 1534 | - $line['symbol'] == 'Jogger' || |
|
| 1535 | - $line['symbol'] == 'Horse' || |
|
| 1536 | - $line['symbol'] == 'Bus' || |
|
| 1537 | - $line['symbol'] == 'Jeep' || |
|
| 1538 | - $line['symbol'] == 'Recreational Vehicle' || |
|
| 1539 | - $line['symbol'] == 'Yacht (Sail)' || |
|
| 1540 | - $line['symbol'] == 'Ship (Power Boat)' || |
|
| 1541 | - $line['symbol'] == 'Firetruck' || |
|
| 1542 | - $line['symbol'] == 'Balloon' || $line['symbol'] == 'Glider' || |
|
| 1543 | - $line['symbol'] == 'Aircraft (small)' || $line['symbol'] == 'Helicopter' || |
|
| 1544 | - $line['symbol'] == 'SUV' || |
|
| 1545 | - $line['symbol'] == 'Snowmobile' || |
|
| 1546 | - $line['symbol'] == 'Mobile Satellite Station')) { |
|
| 1547 | - //} elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && isset($line['speed']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') { |
|
| 1514 | + } elseif (isset($globalAircraft) && $globalAircraft && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && ( |
|
| 1515 | + //$line['symbol'] == 'Balloon' || |
|
| 1516 | + $line['symbol'] == 'Glider' || |
|
| 1517 | + $line['symbol'] == 'Aircraft (small)' || $line['symbol'] == 'Helicopter')) { |
|
| 1518 | + if ($line['symbol'] == 'Ballon') $data['aircraft_icao'] = 'BALL'; |
|
| 1519 | + if ($line['symbol'] == 'Glider') $data['aircraft_icao'] = 'PARAGLIDER'; |
|
| 1520 | + $send = $SI->add($data); |
|
| 1521 | + } elseif (isset($globalMarine) && $globalMarine && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && ( |
|
| 1522 | + $line['symbol'] == 'Yacht (Sail)' || |
|
| 1523 | + $line['symbol'] == 'Ship (Power Boat)')) { |
|
| 1524 | + $send = $MI->add($data); |
|
| 1525 | + } elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && ( |
|
| 1526 | + $line['symbol'] == 'Car' || |
|
| 1527 | + $line['symbol'] == 'Ambulance' || |
|
| 1528 | + $line['symbol'] == 'Van' || |
|
| 1529 | + $line['symbol'] == 'Truck' || $line['symbol'] == 'Truck (18 Wheeler)' || |
|
| 1530 | + $line['symbol'] == 'Motorcycle' || |
|
| 1531 | + $line['symbol'] == 'Tractor' || |
|
| 1532 | + $line['symbol'] == 'Police' || |
|
| 1533 | + $line['symbol'] == 'Bike' || |
|
| 1534 | + $line['symbol'] == 'Jogger' || |
|
| 1535 | + $line['symbol'] == 'Horse' || |
|
| 1536 | + $line['symbol'] == 'Bus' || |
|
| 1537 | + $line['symbol'] == 'Jeep' || |
|
| 1538 | + $line['symbol'] == 'Recreational Vehicle' || |
|
| 1539 | + $line['symbol'] == 'Yacht (Sail)' || |
|
| 1540 | + $line['symbol'] == 'Ship (Power Boat)' || |
|
| 1541 | + $line['symbol'] == 'Firetruck' || |
|
| 1542 | + $line['symbol'] == 'Balloon' || $line['symbol'] == 'Glider' || |
|
| 1543 | + $line['symbol'] == 'Aircraft (small)' || $line['symbol'] == 'Helicopter' || |
|
| 1544 | + $line['symbol'] == 'SUV' || |
|
| 1545 | + $line['symbol'] == 'Snowmobile' || |
|
| 1546 | + $line['symbol'] == 'Mobile Satellite Station')) { |
|
| 1547 | + //} elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && isset($line['speed']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') { |
|
| 1548 | 1548 | // } elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') { |
| 1549 | 1549 | //echo '!!!!!!!!!!!!!!!! SEND !!!!!!!!!!!!!!!!!!!!'."\n"; |
| 1550 | 1550 | if (isset($globalTracker) && $globalTracker) $send = $TI->add($data); |
| 1551 | - } elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident']) && isset($data['altitude'])) { |
|
| 1551 | + } elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident']) && isset($data['altitude'])) { |
|
| 1552 | 1552 | if (!isset($data['altitude'])) $data['altitude'] = 0; |
| 1553 | 1553 | $Source->deleteOldLocationByType('gs'); |
| 1554 | 1554 | if (count($Source->getLocationInfoByNameType($data['ident'],'gs')) > 0) { |
@@ -1556,7 +1556,7 @@ discard block |
||
| 1556 | 1556 | } else { |
| 1557 | 1557 | $Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']); |
| 1558 | 1558 | } |
| 1559 | - } elseif (isset($line['symbol']) && $line['symbol'] == 'Weather Station') { |
|
| 1559 | + } elseif (isset($line['symbol']) && $line['symbol'] == 'Weather Station') { |
|
| 1560 | 1560 | //if ($globalDebug) echo '!! Weather Station not yet supported'."\n"; |
| 1561 | 1561 | if ($globalDebug) echo '# Weather Station added'."\n"; |
| 1562 | 1562 | $Source->deleteOldLocationByType('wx'); |
@@ -1566,7 +1566,7 @@ discard block |
||
| 1566 | 1566 | } else { |
| 1567 | 1567 | $Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'wx.png','wx',$id,0,$data['datetime'],$weather_data); |
| 1568 | 1568 | } |
| 1569 | - } elseif (isset($line['symbol']) && $line['symbol'] == 'Lightning') { |
|
| 1569 | + } elseif (isset($line['symbol']) && $line['symbol'] == 'Lightning') { |
|
| 1570 | 1570 | //if ($globalDebug) echo '!! Weather Station not yet supported'."\n"; |
| 1571 | 1571 | if ($globalDebug) echo '☈ Lightning added'."\n"; |
| 1572 | 1572 | $Source->deleteOldLocationByType('lightning'); |
@@ -1575,11 +1575,11 @@ discard block |
||
| 1575 | 1575 | } else { |
| 1576 | 1576 | $Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'weather/thunderstorm.png','lightning',$id,0,$data['datetime'],$data['comment']); |
| 1577 | 1577 | } |
| 1578 | - } elseif ($globalDebug) { |
|
| 1579 | - echo '/!\ Not added: '.$buffer."\n"; |
|
| 1580 | - print_r($line); |
|
| 1581 | - } |
|
| 1582 | - unset($data); |
|
| 1578 | + } elseif ($globalDebug) { |
|
| 1579 | + echo '/!\ Not added: '.$buffer."\n"; |
|
| 1580 | + print_r($line); |
|
| 1581 | + } |
|
| 1582 | + unset($data); |
|
| 1583 | 1583 | } |
| 1584 | 1584 | elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') { |
| 1585 | 1585 | $Source->updateLocationDescByName($line['ident'],$line['source'],$id,$line['comment']); |
@@ -1598,12 +1598,12 @@ discard block |
||
| 1598 | 1598 | } elseif (!isset($globalSources[$nb]['last_weather_clean'])) { |
| 1599 | 1599 | $globalSources[$nb]['last_weather_clean'] = time(); |
| 1600 | 1600 | } |
| 1601 | - } |
|
| 1601 | + } |
|
| 1602 | 1602 | } else { |
| 1603 | - $line = explode(',', $buffer); |
|
| 1604 | - if (count($line) > 20) { |
|
| 1605 | - $data['hex'] = $line[4]; |
|
| 1606 | - /* |
|
| 1603 | + $line = explode(',', $buffer); |
|
| 1604 | + if (count($line) > 20) { |
|
| 1605 | + $data['hex'] = $line[4]; |
|
| 1606 | + /* |
|
| 1607 | 1607 | $data['datetime'] = $line[6].' '.$line[7]; |
| 1608 | 1608 | date_default_timezone_set($globalTimezone); |
| 1609 | 1609 | $datetime = new DateTime($data['datetime']); |
@@ -1611,30 +1611,30 @@ discard block |
||
| 1611 | 1611 | $data['datetime'] = $datetime->format('Y-m-d H:i:s'); |
| 1612 | 1612 | date_default_timezone_set('UTC'); |
| 1613 | 1613 | */ |
| 1614 | - // Force datetime to current UTC datetime |
|
| 1615 | - date_default_timezone_set('UTC'); |
|
| 1616 | - $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1617 | - $data['ident'] = trim($line[10]); |
|
| 1618 | - $data['latitude'] = $line[14]; |
|
| 1619 | - $data['longitude'] = $line[15]; |
|
| 1620 | - $data['verticalrate'] = $line[16]; |
|
| 1621 | - $data['emergency'] = $line[20]; |
|
| 1622 | - $data['speed'] = $line[12]; |
|
| 1623 | - $data['squawk'] = $line[17]; |
|
| 1624 | - $data['altitude'] = $line[11]; |
|
| 1625 | - $data['heading'] = $line[13]; |
|
| 1626 | - $data['ground'] = $line[21]; |
|
| 1627 | - $data['emergency'] = $line[19]; |
|
| 1628 | - $data['format_source'] = 'sbs'; |
|
| 1614 | + // Force datetime to current UTC datetime |
|
| 1615 | + date_default_timezone_set('UTC'); |
|
| 1616 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1617 | + $data['ident'] = trim($line[10]); |
|
| 1618 | + $data['latitude'] = $line[14]; |
|
| 1619 | + $data['longitude'] = $line[15]; |
|
| 1620 | + $data['verticalrate'] = $line[16]; |
|
| 1621 | + $data['emergency'] = $line[20]; |
|
| 1622 | + $data['speed'] = $line[12]; |
|
| 1623 | + $data['squawk'] = $line[17]; |
|
| 1624 | + $data['altitude'] = $line[11]; |
|
| 1625 | + $data['heading'] = $line[13]; |
|
| 1626 | + $data['ground'] = $line[21]; |
|
| 1627 | + $data['emergency'] = $line[19]; |
|
| 1628 | + $data['format_source'] = 'sbs'; |
|
| 1629 | 1629 | if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
| 1630 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1630 | + if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1631 | 1631 | if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
| 1632 | - $data['id_source'] = $id_source; |
|
| 1633 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data); |
|
| 1634 | - else $error = true; |
|
| 1635 | - unset($data); |
|
| 1636 | - } else $error = true; |
|
| 1637 | - if ($error) { |
|
| 1632 | + $data['id_source'] = $id_source; |
|
| 1633 | + if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data); |
|
| 1634 | + else $error = true; |
|
| 1635 | + unset($data); |
|
| 1636 | + } else $error = true; |
|
| 1637 | + if ($error) { |
|
| 1638 | 1638 | if (count($line) > 1 && ($line[0] == 'STA' || $line[0] == 'AIR' || $line[0] == 'SEL' || $line[0] == 'ID' || $line[0] == 'CLK')) { |
| 1639 | 1639 | if ($globalDebug) echo "Not a message. Ignoring... \n"; |
| 1640 | 1640 | } else { |
@@ -1650,13 +1650,13 @@ discard block |
||
| 1650 | 1650 | connect_all($sourceer); |
| 1651 | 1651 | $sourceer = array(); |
| 1652 | 1652 | } |
| 1653 | - } |
|
| 1653 | + } |
|
| 1654 | 1654 | } |
| 1655 | 1655 | // Sleep for xxx microseconds |
| 1656 | 1656 | if (isset($globalSBSSleep)) usleep($globalSBSSleep); |
| 1657 | - } else { |
|
| 1657 | + } else { |
|
| 1658 | 1658 | if ($format == 'flightgearmp') { |
| 1659 | - if ($globalDebug) echo "Reconnect FlightGear MP..."; |
|
| 1659 | + if ($globalDebug) echo "Reconnect FlightGear MP..."; |
|
| 1660 | 1660 | //@socket_close($r); |
| 1661 | 1661 | sleep($globalMinFetch); |
| 1662 | 1662 | $sourcefg[$nb] = $globalSources[$nb]; |
@@ -1665,9 +1665,9 @@ discard block |
||
| 1665 | 1665 | break; |
| 1666 | 1666 | |
| 1667 | 1667 | } elseif ($format != 'acars' && $format != 'flightgearsp') { |
| 1668 | - if (isset($tt[$format])) $tt[$format]++; |
|
| 1669 | - else $tt[$format] = 0; |
|
| 1670 | - if ($tt[$format] > 30) { |
|
| 1668 | + if (isset($tt[$format])) $tt[$format]++; |
|
| 1669 | + else $tt[$format] = 0; |
|
| 1670 | + if ($tt[$format] > 30) { |
|
| 1671 | 1671 | if ($globalDebug) echo "ERROR : Reconnect ".$format."..."; |
| 1672 | 1672 | //@socket_close($r); |
| 1673 | 1673 | sleep(2); |
@@ -1678,23 +1678,23 @@ discard block |
||
| 1678 | 1678 | //connect_all($globalSources); |
| 1679 | 1679 | $tt[$format]=0; |
| 1680 | 1680 | break; |
| 1681 | - } |
|
| 1681 | + } |
|
| 1682 | + } |
|
| 1682 | 1683 | } |
| 1683 | - } |
|
| 1684 | 1684 | } |
| 1685 | - } else { |
|
| 1685 | + } else { |
|
| 1686 | 1686 | $error = socket_strerror(socket_last_error()); |
| 1687 | 1687 | if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) { |
| 1688 | 1688 | if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n"; |
| 1689 | 1689 | if (isset($globalDebug)) echo "Restarting...\n"; |
| 1690 | 1690 | // Restart the script if possible |
| 1691 | 1691 | if (is_array($sockets)) { |
| 1692 | - if ($globalDebug) echo "Shutdown all sockets..."; |
|
| 1692 | + if ($globalDebug) echo "Shutdown all sockets..."; |
|
| 1693 | 1693 | |
| 1694 | - foreach ($sockets as $sock) { |
|
| 1694 | + foreach ($sockets as $sock) { |
|
| 1695 | 1695 | @socket_shutdown($sock,2); |
| 1696 | 1696 | @socket_close($sock); |
| 1697 | - } |
|
| 1697 | + } |
|
| 1698 | 1698 | |
| 1699 | 1699 | } |
| 1700 | 1700 | if ($globalDebug) echo "Waiting..."; |
@@ -1709,15 +1709,15 @@ discard block |
||
| 1709 | 1709 | if ($globalDebug) echo "Restart all connections..."; |
| 1710 | 1710 | connect_all($globalSources); |
| 1711 | 1711 | } |
| 1712 | - } |
|
| 1712 | + } |
|
| 1713 | 1713 | } |
| 1714 | 1714 | if ($globalDaemon === false) { |
| 1715 | - if ($globalDebug) echo 'Check all...'."\n"; |
|
| 1716 | - if (isset($SI)) $SI->checkAll(); |
|
| 1717 | - if (isset($TI)) $TI->checkAll(); |
|
| 1718 | - if (isset($MI)) $MI->checkAll(); |
|
| 1715 | + if ($globalDebug) echo 'Check all...'."\n"; |
|
| 1716 | + if (isset($SI)) $SI->checkAll(); |
|
| 1717 | + if (isset($TI)) $TI->checkAll(); |
|
| 1718 | + if (isset($MI)) $MI->checkAll(); |
|
| 1719 | + } |
|
| 1719 | 1720 | } |
| 1720 | - } |
|
| 1721 | 1721 | } |
| 1722 | 1722 | |
| 1723 | 1723 | ?> |
@@ -46,20 +46,20 @@ discard block |
||
| 46 | 46 | die; |
| 47 | 47 | } |
| 48 | 48 | //$hosts = array($globalSBS1Host.':'.$globalSBS1Port); |
| 49 | - $globalSources[] = array('host' => $globalSBS1Host,'port' => $globalSBS1Port); |
|
| 49 | + $globalSources[] = array('host' => $globalSBS1Host, 'port' => $globalSBS1Port); |
|
| 50 | 50 | } |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | -$options = getopt('s::',array('source::','server','nodaemon','idsource::','aprsserverssid::','aprsserverpass::','aprsserverhost::','aprsserverport::','format::','noaprsserver')); |
|
| 53 | +$options = getopt('s::', array('source::', 'server', 'nodaemon', 'idsource::', 'aprsserverssid::', 'aprsserverpass::', 'aprsserverhost::', 'aprsserverport::', 'format::', 'noaprsserver')); |
|
| 54 | 54 | //if (isset($options['s'])) $hosts = array($options['s']); |
| 55 | 55 | //elseif (isset($options['source'])) $hosts = array($options['source']); |
| 56 | 56 | if (isset($options['s'])) { |
| 57 | 57 | $globalSources = array(); |
| 58 | - if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']); |
|
| 58 | + if (isset($options['format'])) $globalSources[] = array('host' => $options['s'], 'format' => $options['format']); |
|
| 59 | 59 | else $globalSources[] = array('host' => $options['s']); |
| 60 | 60 | } elseif (isset($options['source'])) { |
| 61 | 61 | $globalSources = array(); |
| 62 | - if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']); |
|
| 62 | + if (isset($options['format'])) $globalSources[] = array('host' => $options['source'], 'format' => $options['format']); |
|
| 63 | 63 | else $globalSources[] = array('host' => $options['source']); |
| 64 | 64 | } |
| 65 | 65 | if (isset($options['aprsserverhost'])) { |
@@ -76,28 +76,28 @@ discard block |
||
| 76 | 76 | else $id_source = 1; |
| 77 | 77 | if (isset($globalServer) && $globalServer) { |
| 78 | 78 | if ($globalDebug) echo "Using Server Mode\n"; |
| 79 | - $SI=new SpotterServer(); |
|
| 79 | + $SI = new SpotterServer(); |
|
| 80 | 80 | /* |
| 81 | 81 | require_once(dirname(__FILE__).'/../require/class.APRS.php'); |
| 82 | 82 | $SI = new adsb2aprs(); |
| 83 | 83 | $SI->connect(); |
| 84 | 84 | */ |
| 85 | -} else $SI=new SpotterImport($Connection->db); |
|
| 85 | +} else $SI = new SpotterImport($Connection->db); |
|
| 86 | 86 | if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db); |
| 87 | 87 | if (isset($globalMarine) && $globalMarine) { |
| 88 | 88 | $AIS = new AIS(); |
| 89 | 89 | $MI = new MarineImport($Connection->db); |
| 90 | 90 | } |
| 91 | 91 | //$APRS=new APRS($Connection->db); |
| 92 | -$SBS=new SBS(); |
|
| 93 | -$ACARS=new ACARS($Connection->db); |
|
| 94 | -$Source=new Source($Connection->db); |
|
| 95 | -$Common=new Common(); |
|
| 92 | +$SBS = new SBS(); |
|
| 93 | +$ACARS = new ACARS($Connection->db); |
|
| 94 | +$Source = new Source($Connection->db); |
|
| 95 | +$Common = new Common(); |
|
| 96 | 96 | date_default_timezone_set('UTC'); |
| 97 | 97 | //$servertz = system('date +%Z'); |
| 98 | 98 | // signal handler - playing nice with sockets and dump1090 |
| 99 | 99 | if (function_exists('pcntl_fork')) { |
| 100 | - pcntl_signal(SIGINT, function() { |
|
| 100 | + pcntl_signal(SIGINT, function() { |
|
| 101 | 101 | global $sockets; |
| 102 | 102 | echo "\n\nctrl-c or kill signal received. Tidying up ... "; |
| 103 | 103 | die("Bye!\n"); |
@@ -113,30 +113,30 @@ discard block |
||
| 113 | 113 | |
| 114 | 114 | function connect_all($hosts) { |
| 115 | 115 | //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs; |
| 116 | - global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context; |
|
| 116 | + global $sockets, $httpfeeds, $globalSources, $globalDebug, $aprs_connect, $last_exec, $globalSourcesRights, $use_aprs, $reset, $context; |
|
| 117 | 117 | $reset++; |
| 118 | 118 | if ($globalDebug) echo 'Connect to all...'."\n"; |
| 119 | 119 | foreach ($hosts as $id => $value) { |
| 120 | 120 | $host = $value['host']; |
| 121 | 121 | $globalSources[$id]['last_exec'] = 0; |
| 122 | 122 | // Here we check type of source(s) |
| 123 | - if (filter_var($host,FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) { |
|
| 124 | - if (preg_match('/deltadb.txt$/i',$host)) { |
|
| 123 | + if (filter_var($host, FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) { |
|
| 124 | + if (preg_match('/deltadb.txt$/i', $host)) { |
|
| 125 | 125 | //$formats[$id] = 'deltadbtxt'; |
| 126 | 126 | $globalSources[$id]['format'] = 'deltadbtxt'; |
| 127 | 127 | //$last_exec['deltadbtxt'] = 0; |
| 128 | 128 | if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n"; |
| 129 | - } else if (preg_match('/vatsim-data.txt$/i',$host)) { |
|
| 129 | + } else if (preg_match('/vatsim-data.txt$/i', $host)) { |
|
| 130 | 130 | //$formats[$id] = 'vatsimtxt'; |
| 131 | 131 | $globalSources[$id]['format'] = 'vatsimtxt'; |
| 132 | 132 | //$last_exec['vatsimtxt'] = 0; |
| 133 | 133 | if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n"; |
| 134 | - } else if (preg_match('/aircraftlist.json$/i',$host)) { |
|
| 134 | + } else if (preg_match('/aircraftlist.json$/i', $host)) { |
|
| 135 | 135 | //$formats[$id] = 'aircraftlistjson'; |
| 136 | 136 | $globalSources[$id]['format'] = 'aircraftlistjson'; |
| 137 | 137 | //$last_exec['aircraftlistjson'] = 0; |
| 138 | 138 | if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n"; |
| 139 | - } else if (preg_match('/opensky/i',$host)) { |
|
| 139 | + } else if (preg_match('/opensky/i', $host)) { |
|
| 140 | 140 | //$formats[$id] = 'aircraftlistjson'; |
| 141 | 141 | $globalSources[$id]['format'] = 'opensky'; |
| 142 | 142 | //$last_exec['aircraftlistjson'] = 0; |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | exit(0); |
| 154 | 154 | } |
| 155 | 155 | */ |
| 156 | - } else if (preg_match('/planeUpdateFAA.php$/i',$host)) { |
|
| 156 | + } else if (preg_match('/planeUpdateFAA.php$/i', $host)) { |
|
| 157 | 157 | //$formats[$id] = 'planeupdatefaa'; |
| 158 | 158 | $globalSources[$id]['format'] = 'planeupdatefaa'; |
| 159 | 159 | //$last_exec['planeupdatefaa'] = 0; |
@@ -162,32 +162,32 @@ discard block |
||
| 162 | 162 | echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
| 163 | 163 | exit(0); |
| 164 | 164 | } |
| 165 | - } else if (preg_match('/\/action.php\/acars\/data$/i',$host)) { |
|
| 165 | + } else if (preg_match('/\/action.php\/acars\/data$/i', $host)) { |
|
| 166 | 166 | //$formats[$id] = 'phpvmacars'; |
| 167 | 167 | $globalSources[$id]['format'] = 'phpvmacars'; |
| 168 | 168 | //$last_exec['phpvmacars'] = 0; |
| 169 | 169 | if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n"; |
| 170 | - } else if (preg_match('/VAM-json.php$/i',$host)) { |
|
| 170 | + } else if (preg_match('/VAM-json.php$/i', $host)) { |
|
| 171 | 171 | //$formats[$id] = 'phpvmacars'; |
| 172 | 172 | $globalSources[$id]['format'] = 'vam'; |
| 173 | 173 | if ($globalDebug) echo "Connect to Vam source (".$host.")...\n"; |
| 174 | - } else if (preg_match('/whazzup/i',$host)) { |
|
| 174 | + } else if (preg_match('/whazzup/i', $host)) { |
|
| 175 | 175 | //$formats[$id] = 'whazzup'; |
| 176 | 176 | $globalSources[$id]['format'] = 'whazzup'; |
| 177 | 177 | //$last_exec['whazzup'] = 0; |
| 178 | 178 | if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n"; |
| 179 | - } else if (preg_match('/blitzortung/i',$host)) { |
|
| 179 | + } else if (preg_match('/blitzortung/i', $host)) { |
|
| 180 | 180 | $globalSources[$id]['format'] = 'blitzortung'; |
| 181 | 181 | if ($globalDebug) echo "Connect to blitzortung source (".$host.")...\n"; |
| 182 | - } else if (preg_match('/airwhere/i',$host)) { |
|
| 182 | + } else if (preg_match('/airwhere/i', $host)) { |
|
| 183 | 183 | $globalSources[$id]['format'] = 'airwhere'; |
| 184 | 184 | if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n"; |
| 185 | - } else if (preg_match('/recentpireps/i',$host)) { |
|
| 185 | + } else if (preg_match('/recentpireps/i', $host)) { |
|
| 186 | 186 | //$formats[$id] = 'pirepsjson'; |
| 187 | 187 | $globalSources[$id]['format'] = 'pirepsjson'; |
| 188 | 188 | //$last_exec['pirepsjson'] = 0; |
| 189 | 189 | if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n"; |
| 190 | - } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) { |
|
| 190 | + } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i', $host)) { |
|
| 191 | 191 | //$formats[$id] = 'fr24json'; |
| 192 | 192 | $globalSources[$id]['format'] = 'fr24json'; |
| 193 | 193 | //$last_exec['fr24json'] = 0; |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
| 197 | 197 | exit(0); |
| 198 | 198 | } |
| 199 | - } else if (preg_match(':myshiptracking.com/:i',$host)) { |
|
| 199 | + } else if (preg_match(':myshiptracking.com/:i', $host)) { |
|
| 200 | 200 | //$formats[$id] = 'fr24json'; |
| 201 | 201 | $globalSources[$id]['format'] = 'myshiptracking'; |
| 202 | 202 | //$last_exec['fr24json'] = 0; |
@@ -206,22 +206,22 @@ discard block |
||
| 206 | 206 | exit(0); |
| 207 | 207 | } |
| 208 | 208 | //} else if (preg_match('/10001/',$host)) { |
| 209 | - } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) { |
|
| 209 | + } else if (preg_match('/10001/', $host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) { |
|
| 210 | 210 | //$formats[$id] = 'tsv'; |
| 211 | 211 | $globalSources[$id]['format'] = 'tsv'; |
| 212 | 212 | if ($globalDebug) echo "Connect to tsv source (".$host.")...\n"; |
| 213 | 213 | } |
| 214 | - } elseif (filter_var($host,FILTER_VALIDATE_URL)) { |
|
| 214 | + } elseif (filter_var($host, FILTER_VALIDATE_URL)) { |
|
| 215 | 215 | if ($globalSources[$id]['format'] == 'aisnmeahttp') { |
| 216 | - $idf = fopen($globalSources[$id]['host'],'r',false,$context); |
|
| 216 | + $idf = fopen($globalSources[$id]['host'], 'r', false, $context); |
|
| 217 | 217 | if ($idf !== false) { |
| 218 | 218 | $httpfeeds[$id] = $idf; |
| 219 | 219 | if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
| 220 | 220 | } |
| 221 | 221 | elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n"; |
| 222 | 222 | } elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
| 223 | - } elseif (!filter_var($host,FILTER_VALIDATE_URL)) { |
|
| 224 | - $hostport = explode(':',$host); |
|
| 223 | + } elseif (!filter_var($host, FILTER_VALIDATE_URL)) { |
|
| 224 | + $hostport = explode(':', $host); |
|
| 225 | 225 | if (isset($hostport[1])) { |
| 226 | 226 | $port = $hostport[1]; |
| 227 | 227 | $hostn = $hostport[0]; |
@@ -231,19 +231,19 @@ discard block |
||
| 231 | 231 | } |
| 232 | 232 | $Common = new Common(); |
| 233 | 233 | if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) { |
| 234 | - $s = $Common->create_socket($hostn,$port, $errno, $errstr); |
|
| 234 | + $s = $Common->create_socket($hostn, $port, $errno, $errstr); |
|
| 235 | 235 | } else { |
| 236 | - $s = $Common->create_socket_udp($hostn,$port, $errno, $errstr); |
|
| 236 | + $s = $Common->create_socket_udp($hostn, $port, $errno, $errstr); |
|
| 237 | 237 | } |
| 238 | 238 | if ($s) { |
| 239 | 239 | $sockets[$id] = $s; |
| 240 | 240 | if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') { |
| 241 | - if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') { |
|
| 241 | + if (preg_match('/aprs/', $hostn) || $port == '10152' || $port == '14580') { |
|
| 242 | 242 | //$formats[$id] = 'aprs'; |
| 243 | 243 | $globalSources[$id]['format'] = 'aprs'; |
| 244 | 244 | //$aprs_connect = 0; |
| 245 | 245 | //$use_aprs = true; |
| 246 | - } elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') { |
|
| 246 | + } elseif (preg_match('/pub-vrs/', $hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') { |
|
| 247 | 247 | $globalSources[$id]['format'] = 'vrstcp'; |
| 248 | 248 | } elseif ($port == '10001') { |
| 249 | 249 | //$formats[$id] = 'tsv'; |
@@ -282,7 +282,7 @@ discard block |
||
| 282 | 282 | else if (isset($globalSBS1TimeOut)) $timeout = $globalSBS1TimeOut; |
| 283 | 283 | else $timeout = 20; |
| 284 | 284 | $errno = ''; |
| 285 | -$errstr=''; |
|
| 285 | +$errstr = ''; |
|
| 286 | 286 | |
| 287 | 287 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 288 | 288 | /* Initiate connections to all the hosts simultaneously */ |
@@ -290,7 +290,7 @@ discard block |
||
| 290 | 290 | //connect_all($globalSources); |
| 291 | 291 | |
| 292 | 292 | if (isset($globalProxy) && $globalProxy) { |
| 293 | - $context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true))); |
|
| 293 | + $context = stream_context_create(array('http' => array('timeout' => $timeout, 'proxy' => $globalProxy, 'request_fulluri' => true))); |
|
| 294 | 294 | } else { |
| 295 | 295 | $context = stream_context_create(array('http' => array('timeout' => $timeout))); |
| 296 | 296 | } |
@@ -320,16 +320,16 @@ discard block |
||
| 320 | 320 | |
| 321 | 321 | if ($use_aprs) { |
| 322 | 322 | require_once(dirname(__FILE__).'/../require/class.APRS.php'); |
| 323 | - $APRS=new APRS(); |
|
| 323 | + $APRS = new APRS(); |
|
| 324 | 324 | $aprs_connect = 0; |
| 325 | 325 | $aprs_keep = 120; |
| 326 | 326 | $aprs_last_tx = time(); |
| 327 | 327 | if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion; |
| 328 | - else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName); |
|
| 328 | + else $aprs_version = 'FlightAirMap '.str_replace(' ', '_', $globalName); |
|
| 329 | 329 | if (isset($globalAPRSssid)) $aprs_ssid = $globalAPRSssid; |
| 330 | - else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8); |
|
| 330 | + else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ', '_', $globalName)), 0, 8); |
|
| 331 | 331 | if (isset($globalAPRSfilter)) $aprs_filter = $globalAPRSfilter; |
| 332 | - else $aprs_filter = 'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0'; |
|
| 332 | + else $aprs_filter = 'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0'; |
|
| 333 | 333 | if ($aprs_full) $aprs_filter = ''; |
| 334 | 334 | if (isset($globalAPRSpass)) $aprs_pass = $globalAPRSpass; |
| 335 | 335 | else $aprs_pass = '-1'; |
@@ -343,12 +343,12 @@ discard block |
||
| 343 | 343 | sleep(1); |
| 344 | 344 | if ($globalDebug) echo "SCAN MODE \n\n"; |
| 345 | 345 | if (!isset($globalCronEnd)) $globalCronEnd = 60; |
| 346 | -$endtime = time()+$globalCronEnd; |
|
| 346 | +$endtime = time() + $globalCronEnd; |
|
| 347 | 347 | $i = 1; |
| 348 | 348 | $tt = array(); |
| 349 | 349 | // Delete all ATC |
| 350 | 350 | if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM)) { |
| 351 | - $ATC=new ATC($Connection->db); |
|
| 351 | + $ATC = new ATC($Connection->db); |
|
| 352 | 352 | } |
| 353 | 353 | if (!$globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) { |
| 354 | 354 | $ATC->deleteAll(); |
@@ -356,7 +356,7 @@ discard block |
||
| 356 | 356 | |
| 357 | 357 | // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time. |
| 358 | 358 | while ($i > 0) { |
| 359 | - if (!$globalDaemon) $i = $endtime-time(); |
|
| 359 | + if (!$globalDaemon) $i = $endtime - time(); |
|
| 360 | 360 | // Delete old ATC |
| 361 | 361 | if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) { |
| 362 | 362 | if ($globalDebug) echo 'Delete old ATC...'."\n"; |
@@ -370,7 +370,7 @@ discard block |
||
| 370 | 370 | } |
| 371 | 371 | if ($max != $globalMinFetch) { |
| 372 | 372 | if ($globalDebug) echo 'Sleeping...'."\n"; |
| 373 | - sleep($globalMinFetch-$max+2); |
|
| 373 | + sleep($globalMinFetch - $max + 2); |
|
| 374 | 374 | } |
| 375 | 375 | } |
| 376 | 376 | |
@@ -389,8 +389,8 @@ discard block |
||
| 389 | 389 | //$buffer = $Common->getData($hosts[$id]); |
| 390 | 390 | $buffer = $Common->getData($value['host']); |
| 391 | 391 | if ($buffer != '') $reset = 0; |
| 392 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 393 | - $buffer = explode('\n',$buffer); |
|
| 392 | + $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer)); |
|
| 393 | + $buffer = explode('\n', $buffer); |
|
| 394 | 394 | foreach ($buffer as $line) { |
| 395 | 395 | if ($line != '' && count($line) > 7) { |
| 396 | 396 | $line = explode(',', $line); |
@@ -423,11 +423,11 @@ discard block |
||
| 423 | 423 | ) |
| 424 | 424 | ) { |
| 425 | 425 | date_default_timezone_set('CET'); |
| 426 | - $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host'])); |
|
| 426 | + $buffer = $Common->getData(str_replace('{date}', date('Ymd'), $value['host'])); |
|
| 427 | 427 | date_default_timezone_set('UTC'); |
| 428 | 428 | if ($buffer != '') $reset = 0; |
| 429 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 430 | - $buffer = explode('\n',$buffer); |
|
| 429 | + $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer)); |
|
| 430 | + $buffer = explode('\n', $buffer); |
|
| 431 | 431 | foreach ($buffer as $line) { |
| 432 | 432 | if ($line != '') { |
| 433 | 433 | //echo "'".$line."'\n"; |
@@ -445,7 +445,7 @@ discard block |
||
| 445 | 445 | if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
| 446 | 446 | if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
| 447 | 447 | if (isset($ais_data['timestamp'])) { |
| 448 | - $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
|
| 448 | + $data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']); |
|
| 449 | 449 | if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) { |
| 450 | 450 | $last_exec[$id]['timestamp'] = $ais_data['timestamp']; |
| 451 | 451 | $add = true; |
@@ -468,12 +468,12 @@ discard block |
||
| 468 | 468 | $w = $e = null; |
| 469 | 469 | |
| 470 | 470 | if (isset($arr[$id])) { |
| 471 | - $nn = stream_select($arr,$w,$e,$timeout); |
|
| 471 | + $nn = stream_select($arr, $w, $e, $timeout); |
|
| 472 | 472 | if ($nn > 0) { |
| 473 | 473 | foreach ($httpfeeds as $feed) { |
| 474 | - $buffer = stream_get_line($feed,2000,"\n"); |
|
| 475 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 476 | - $buffer = explode('\n',$buffer); |
|
| 474 | + $buffer = stream_get_line($feed, 2000, "\n"); |
|
| 475 | + $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer)); |
|
| 476 | + $buffer = explode('\n', $buffer); |
|
| 477 | 477 | foreach ($buffer as $line) { |
| 478 | 478 | if ($line != '') { |
| 479 | 479 | $ais_data = $AIS->parse_line(trim($line)); |
@@ -491,9 +491,9 @@ discard block |
||
| 491 | 491 | if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
| 492 | 492 | if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
| 493 | 493 | if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination']; |
| 494 | - if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); |
|
| 494 | + if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s', $ais_data['eta_ts']); |
|
| 495 | 495 | if (isset($ais_data['timestamp'])) { |
| 496 | - $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
|
| 496 | + $data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']); |
|
| 497 | 497 | } else { |
| 498 | 498 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 499 | 499 | } |
@@ -524,10 +524,10 @@ discard block |
||
| 524 | 524 | (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) |
| 525 | 525 | ) |
| 526 | 526 | ) { |
| 527 | - $buffer = $Common->getData($value['host'],'get','','','','','20'); |
|
| 527 | + $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20'); |
|
| 528 | 528 | if ($buffer != '') { |
| 529 | 529 | //echo $buffer; |
| 530 | - $all_data = json_decode($buffer,true); |
|
| 530 | + $all_data = json_decode($buffer, true); |
|
| 531 | 531 | //print_r($all_data); |
| 532 | 532 | if (isset($all_data[0]['DATA'])) { |
| 533 | 533 | foreach ($all_data[0]['DATA'] as $line) { |
@@ -542,7 +542,7 @@ discard block |
||
| 542 | 542 | // if (isset($ais_data['type'])) $data['type'] = $ais_data['type']; |
| 543 | 543 | $data['imo'] = $line['IMO']; |
| 544 | 544 | //$data['arrival_code'] = $ais_data['destination']; |
| 545 | - $data['datetime'] = date('Y-m-d H:i:s',$line['T']); |
|
| 545 | + $data['datetime'] = date('Y-m-d H:i:s', $line['T']); |
|
| 546 | 546 | $data['format_source'] = 'myshiptracking'; |
| 547 | 547 | $data['id_source'] = $id_source; |
| 548 | 548 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
@@ -559,9 +559,9 @@ discard block |
||
| 559 | 559 | (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) |
| 560 | 560 | ) |
| 561 | 561 | ) { |
| 562 | - $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host'])); |
|
| 562 | + $buffer = $Common->getData(str_replace('{timestamp}', time(), $value['host'])); |
|
| 563 | 563 | if ($buffer != '') { |
| 564 | - $all_data = json_decode($buffer,true); |
|
| 564 | + $all_data = json_decode($buffer, true); |
|
| 565 | 565 | if (isset($all_data[0]['mmsi'])) { |
| 566 | 566 | foreach ($all_data as $line) { |
| 567 | 567 | if ($line != '') { |
@@ -595,7 +595,7 @@ discard block |
||
| 595 | 595 | ) { |
| 596 | 596 | $buffer = $Common->getData($value['host']); |
| 597 | 597 | if ($buffer != '') { |
| 598 | - $all_data = json_decode($buffer,true); |
|
| 598 | + $all_data = json_decode($buffer, true); |
|
| 599 | 599 | if (isset($all_data['features'][0]['id'])) { |
| 600 | 600 | foreach ($all_data['features'] as $line) { |
| 601 | 601 | $data = array(); |
@@ -628,27 +628,27 @@ discard block |
||
| 628 | 628 | ) |
| 629 | 629 | ) { |
| 630 | 630 | echo 'download...'; |
| 631 | - $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter'); |
|
| 631 | + $buffer = $Common->getData($value['host'], 'post', $value['post'], '', '', '', '', 'ShipPlotter'); |
|
| 632 | 632 | echo 'done !'."\n"; |
| 633 | 633 | if ($buffer != '') $reset = 0; |
| 634 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 635 | - $buffer = explode('\n',$buffer); |
|
| 634 | + $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer)); |
|
| 635 | + $buffer = explode('\n', $buffer); |
|
| 636 | 636 | foreach ($buffer as $line) { |
| 637 | 637 | if ($line != '') { |
| 638 | 638 | $data = array(); |
| 639 | - $data['mmsi'] = (int)substr($line,0,9); |
|
| 640 | - $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10)); |
|
| 639 | + $data['mmsi'] = (int) substr($line, 0, 9); |
|
| 640 | + $data['datetime'] = date('Y-m-d H:i:s', substr($line, 10, 10)); |
|
| 641 | 641 | //$data['status'] = substr($line,21,2); |
| 642 | 642 | //$data['type'] = substr($line,24,3); |
| 643 | - $data['latitude'] = substr($line,29,9); |
|
| 644 | - $data['longitude'] = substr($line,41,9); |
|
| 645 | - $data['speed'] = round(substr($line,51,5)); |
|
| 643 | + $data['latitude'] = substr($line, 29, 9); |
|
| 644 | + $data['longitude'] = substr($line, 41, 9); |
|
| 645 | + $data['speed'] = round(substr($line, 51, 5)); |
|
| 646 | 646 | //$data['course'] = substr($line,57,5); |
| 647 | - $data['heading'] = round(substr($line,63,3)); |
|
| 647 | + $data['heading'] = round(substr($line, 63, 3)); |
|
| 648 | 648 | //$data['draft'] = substr($line,67,4); |
| 649 | 649 | //$data['length'] = substr($line,72,3); |
| 650 | 650 | //$data['beam'] = substr($line,76,2); |
| 651 | - $data['ident'] = trim(utf8_encode(substr($line,79,20))); |
|
| 651 | + $data['ident'] = trim(utf8_encode(substr($line, 79, 20))); |
|
| 652 | 652 | //$data['callsign'] = trim(substr($line,100,7); |
| 653 | 653 | //$data['dest'] = substr($line,108,20); |
| 654 | 654 | //$data['etaDate'] = substr($line,129,5); |
@@ -681,8 +681,8 @@ discard block |
||
| 681 | 681 | ) { |
| 682 | 682 | //$buffer = $Common->getData($hosts[$id]); |
| 683 | 683 | $buffer = $Common->getData($value['host']); |
| 684 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 685 | - $buffer = explode('\n',$buffer); |
|
| 684 | + $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer)); |
|
| 685 | + $buffer = explode('\n', $buffer); |
|
| 686 | 686 | $reset = 0; |
| 687 | 687 | foreach ($buffer as $line) { |
| 688 | 688 | if ($line != '') { |
@@ -693,7 +693,7 @@ discard block |
||
| 693 | 693 | else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0]; |
| 694 | 694 | $data['pilot_id'] = $line[1]; |
| 695 | 695 | $data['pilot_name'] = $line[2]; |
| 696 | - $data['hex'] = str_pad(dechex($Common->str2int($line[1])),6,'000000',STR_PAD_LEFT); |
|
| 696 | + $data['hex'] = str_pad(dechex($Common->str2int($line[1])), 6, '000000', STR_PAD_LEFT); |
|
| 697 | 697 | $data['ident'] = $line[0]; // ident |
| 698 | 698 | if ($line[7] != '' && $line[7] != 0) $data['altitude'] = $line[7]; // altitude |
| 699 | 699 | $data['speed'] = $line[8]; // speed |
@@ -709,7 +709,7 @@ discard block |
||
| 709 | 709 | //$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37])); |
| 710 | 710 | //if (isset($line[37])) $data['last_update'] = $line[37]; |
| 711 | 711 | $data['departure_airport_icao'] = $line[11]; |
| 712 | - $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':'); |
|
| 712 | + $data['departure_airport_time'] = rtrim(chunk_split($line[22], 2, ':'), ':'); |
|
| 713 | 713 | $data['arrival_airport_icao'] = $line[13]; |
| 714 | 714 | $data['frequency'] = $line[4]; |
| 715 | 715 | $data['type'] = $line[18]; |
@@ -718,7 +718,7 @@ discard block |
||
| 718 | 718 | $data['id_source'] = $id_source; |
| 719 | 719 | //$data['arrival_airport_time'] = ; |
| 720 | 720 | if ($line[9] != '') { |
| 721 | - $aircraft_data = explode('/',$line[9]); |
|
| 721 | + $aircraft_data = explode('/', $line[9]); |
|
| 722 | 722 | if (isset($aircraft_data[1])) { |
| 723 | 723 | $data['aircraft_icao'] = $aircraft_data[1]; |
| 724 | 724 | } |
@@ -733,9 +733,9 @@ discard block |
||
| 733 | 733 | if ($line[3] == 'PILOT') $SI->add($data); |
| 734 | 734 | elseif ($line[3] == 'ATC') { |
| 735 | 735 | //print_r($data); |
| 736 | - $data['info'] = str_replace('^§','<br />',$data['info']); |
|
| 737 | - $data['info'] = str_replace('&sect;','',$data['info']); |
|
| 738 | - $typec = substr($data['ident'],-3); |
|
| 736 | + $data['info'] = str_replace('^§', '<br />', $data['info']); |
|
| 737 | + $data['info'] = str_replace('&sect;', '', $data['info']); |
|
| 738 | + $typec = substr($data['ident'], -3); |
|
| 739 | 739 | if ($typec == 'APP') $data['type'] = 'Approach'; |
| 740 | 740 | elseif ($typec == 'TWR') $data['type'] = 'Tower'; |
| 741 | 741 | elseif ($typec == 'OBS') $data['type'] = 'Observer'; |
@@ -747,8 +747,8 @@ discard block |
||
| 747 | 747 | elseif ($data['type'] == '') $data['type'] = 'Observer'; |
| 748 | 748 | if (!isset($data['source_name'])) $data['source_name'] = ''; |
| 749 | 749 | if (isset($ATC)) { |
| 750 | - if (count($ATC->getByIdent($data['ident'],$data['format_source'])) > 0) echo $ATC->update($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']); |
|
| 751 | - else echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']); |
|
| 750 | + if (count($ATC->getByIdent($data['ident'], $data['format_source'])) > 0) echo $ATC->update($data['ident'], $data['frequency'], $data['latitude'], $data['longitude'], $data['range'], $data['info'], $data['datetime'], $data['type'], $data['pilot_id'], $data['pilot_name'], $data['format_source'], $data['source_name']); |
|
| 751 | + else echo $ATC->add($data['ident'], $data['frequency'], $data['latitude'], $data['longitude'], $data['range'], $data['info'], $data['datetime'], $data['type'], $data['pilot_id'], $data['pilot_name'], $data['format_source'], $data['source_name']); |
|
| 752 | 752 | } |
| 753 | 753 | } |
| 754 | 754 | unset($data); |
@@ -764,24 +764,24 @@ discard block |
||
| 764 | 764 | (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch)) |
| 765 | 765 | ) |
| 766 | 766 | ) { |
| 767 | - $buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php','get','','','','','20'); |
|
| 767 | + $buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php', 'get', '', '', '', '', '20'); |
|
| 768 | 768 | if ($buffer != '') { |
| 769 | 769 | $all_data = simplexml_load_string($buffer); |
| 770 | - foreach($all_data->children() as $childdata) { |
|
| 770 | + foreach ($all_data->children() as $childdata) { |
|
| 771 | 771 | $data = array(); |
| 772 | 772 | $line = $childdata; |
| 773 | 773 | //$data['hex'] = str_pad(dechex((int)$line['pktPilotID']),6,'000000',STR_PAD_LEFT); |
| 774 | - $data['id'] = date('Ymd').(int)$line['pktPilotID']; |
|
| 775 | - $data['datetime'] = date('Y-m-d H:i:s',strtotime((string)$line['entryTime'].' BST')); |
|
| 776 | - $data['latitude'] = (float)$line['pktLatitude']; |
|
| 777 | - $data['longitude'] = (float)$line['pktLongitude']; |
|
| 778 | - if ((float)$line['pktTrack'] != 0) $data['heading'] = (float)$line['pktTrack']; |
|
| 779 | - if ((int)$line['pktSpeed'] != 0) $data['speed'] = (int)$line['pktSpeed']; |
|
| 780 | - $data['altitude'] = round((int)$line['pktAltitude']*3.28084); |
|
| 774 | + $data['id'] = date('Ymd').(int) $line['pktPilotID']; |
|
| 775 | + $data['datetime'] = date('Y-m-d H:i:s', strtotime((string) $line['entryTime'].' BST')); |
|
| 776 | + $data['latitude'] = (float) $line['pktLatitude']; |
|
| 777 | + $data['longitude'] = (float) $line['pktLongitude']; |
|
| 778 | + if ((float) $line['pktTrack'] != 0) $data['heading'] = (float) $line['pktTrack']; |
|
| 779 | + if ((int) $line['pktSpeed'] != 0) $data['speed'] = (int) $line['pktSpeed']; |
|
| 780 | + $data['altitude'] = round((int) $line['pktAltitude']*3.28084); |
|
| 781 | 781 | $data['altitude_relative'] = 'AMSL'; |
| 782 | - $data['pilot_id'] = (int)$line['pktPilotID']; |
|
| 782 | + $data['pilot_id'] = (int) $line['pktPilotID']; |
|
| 783 | 783 | $data['aircraft_icao'] = 'PARAGLIDER'; |
| 784 | - $pilot_data = explode(',',$Common->getData('http://www.airwhere.co.uk/pilotdetails.php?pilot='.$data['pilot_id'])); |
|
| 784 | + $pilot_data = explode(',', $Common->getData('http://www.airwhere.co.uk/pilotdetails.php?pilot='.$data['pilot_id'])); |
|
| 785 | 785 | if (isset($pilot_data[4])) $data['pilot_name'] = $pilot_data[4]; |
| 786 | 786 | $data['format_source'] = $value['format']; |
| 787 | 787 | $SI->add($data); |
@@ -789,22 +789,22 @@ discard block |
||
| 789 | 789 | } |
| 790 | 790 | } |
| 791 | 791 | $Source->deleteOldLocationByType('gs'); |
| 792 | - $buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php','get','','','','','20'); |
|
| 792 | + $buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php', 'get', '', '', '', '', '20'); |
|
| 793 | 793 | if ($buffer != '') { |
| 794 | 794 | $all_data = simplexml_load_string($buffer); |
| 795 | - foreach($all_data->children() as $childdata) { |
|
| 795 | + foreach ($all_data->children() as $childdata) { |
|
| 796 | 796 | $data = array(); |
| 797 | 797 | $line = $childdata; |
| 798 | - $data['id'] = (int)$line['gsID']; |
|
| 799 | - $data['latitude'] = (float)$line['gsLatitude']; |
|
| 800 | - $data['longitude'] = (float)$line['gsLongitude']; |
|
| 801 | - $data['altitude'] = round((int)$line['gsHeight']*3.28084); |
|
| 798 | + $data['id'] = (int) $line['gsID']; |
|
| 799 | + $data['latitude'] = (float) $line['gsLatitude']; |
|
| 800 | + $data['longitude'] = (float) $line['gsLongitude']; |
|
| 801 | + $data['altitude'] = round((int) $line['gsHeight']*3.28084); |
|
| 802 | 802 | $data['altitude_relative'] = 'AMSL'; |
| 803 | - $data['datetime'] = date('Y-m-d H:i:s',strtotime((string)$line['gsLastUpdate'].' BST')); |
|
| 803 | + $data['datetime'] = date('Y-m-d H:i:s', strtotime((string) $line['gsLastUpdate'].' BST')); |
|
| 804 | 804 | if (count($Source->getLocationInfoByLocationID($data['id'])) > 0) { |
| 805 | - $Source->updateLocationByLocationID('',$data['latitude'],$data['longitude'],$data['altitude'],'','','airwhere','antenna.png','gs',$id,$data['id'],$data['datetime']); |
|
| 805 | + $Source->updateLocationByLocationID('', $data['latitude'], $data['longitude'], $data['altitude'], '', '', 'airwhere', 'antenna.png', 'gs', $id, $data['id'], $data['datetime']); |
|
| 806 | 806 | } else { |
| 807 | - $Source->addLocation('',$data['latitude'],$data['longitude'],$data['altitude'],'','','airwhere','antenna.png','gs',$id,$data['id'],$data['datetime']); |
|
| 807 | + $Source->addLocation('', $data['latitude'], $data['longitude'], $data['altitude'], '', '', 'airwhere', 'antenna.png', 'gs', $id, $data['id'], $data['datetime']); |
|
| 808 | 808 | } |
| 809 | 809 | unset($data); |
| 810 | 810 | } |
@@ -822,9 +822,9 @@ discard block |
||
| 822 | 822 | (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch)) |
| 823 | 823 | ) |
| 824 | 824 | ) { |
| 825 | - $buffer = $Common->getData($value['host'],'get','','','','','20'); |
|
| 825 | + $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20'); |
|
| 826 | 826 | if ($buffer != '') { |
| 827 | - $all_data = json_decode($buffer,true); |
|
| 827 | + $all_data = json_decode($buffer, true); |
|
| 828 | 828 | if (isset($all_data['acList'])) { |
| 829 | 829 | $reset = 0; |
| 830 | 830 | foreach ($all_data['acList'] as $line) { |
@@ -840,7 +840,7 @@ discard block |
||
| 840 | 840 | if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk |
| 841 | 841 | $data['emergency'] = ''; // emergency |
| 842 | 842 | if (isset($line['Reg'])) $data['registration'] = $line['Reg']; |
| 843 | - if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); |
|
| 843 | + if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s', round($line['PosTime']/1000)); |
|
| 844 | 844 | else $data['datetime'] = date('Y-m-d H:i:s'); |
| 845 | 845 | //$data['datetime'] = date('Y-m-d H:i:s'); |
| 846 | 846 | if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type']; |
@@ -865,7 +865,7 @@ discard block |
||
| 865 | 865 | $data['verticalrate'] = $line['vrt']; // verticale rate |
| 866 | 866 | $data['squawk'] = $line['squawk']; // squawk |
| 867 | 867 | $data['emergency'] = ''; // emergency |
| 868 | - if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); |
|
| 868 | + if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s', round($line['PosTime']/1000)); |
|
| 869 | 869 | else $data['datetime'] = date('Y-m-d H:i:s'); |
| 870 | 870 | $data['format_source'] = 'aircraftlistjson'; |
| 871 | 871 | $data['id_source'] = $id_source; |
@@ -886,7 +886,7 @@ discard block |
||
| 886 | 886 | ) |
| 887 | 887 | ) { |
| 888 | 888 | $buffer = $Common->getData($value['host']); |
| 889 | - $all_data = json_decode($buffer,true); |
|
| 889 | + $all_data = json_decode($buffer, true); |
|
| 890 | 890 | if (isset($all_data['planes'])) { |
| 891 | 891 | $reset = 0; |
| 892 | 892 | foreach ($all_data['planes'] as $key => $line) { |
@@ -903,12 +903,12 @@ discard block |
||
| 903 | 903 | $data['emergency'] = ''; // emergency |
| 904 | 904 | $data['registration'] = $line[2]; |
| 905 | 905 | $data['aircraft_icao'] = $line[0]; |
| 906 | - $deparr = explode('-',$line[1]); |
|
| 906 | + $deparr = explode('-', $line[1]); |
|
| 907 | 907 | if (count($deparr) == 2) { |
| 908 | 908 | $data['departure_airport_icao'] = $deparr[0]; |
| 909 | 909 | $data['arrival_airport_icao'] = $deparr[1]; |
| 910 | 910 | } |
| 911 | - $data['datetime'] = date('Y-m-d H:i:s',$line[9]); |
|
| 911 | + $data['datetime'] = date('Y-m-d H:i:s', $line[9]); |
|
| 912 | 912 | $data['format_source'] = 'planeupdatefaa'; |
| 913 | 913 | $data['id_source'] = $id_source; |
| 914 | 914 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
@@ -926,7 +926,7 @@ discard block |
||
| 926 | 926 | ) |
| 927 | 927 | ) { |
| 928 | 928 | $buffer = $Common->getData($value['host']); |
| 929 | - $all_data = json_decode($buffer,true); |
|
| 929 | + $all_data = json_decode($buffer, true); |
|
| 930 | 930 | if (isset($all_data['states'])) { |
| 931 | 931 | $reset = 0; |
| 932 | 932 | foreach ($all_data['states'] as $key => $line) { |
@@ -943,7 +943,7 @@ discard block |
||
| 943 | 943 | //$data['emergency'] = ''; // emergency |
| 944 | 944 | //$data['registration'] = $line[2]; |
| 945 | 945 | //$data['aircraft_icao'] = $line[0]; |
| 946 | - $data['datetime'] = date('Y-m-d H:i:s',$line[3]); |
|
| 946 | + $data['datetime'] = date('Y-m-d H:i:s', $line[3]); |
|
| 947 | 947 | $data['format_source'] = 'opensky'; |
| 948 | 948 | $data['id_source'] = $id_source; |
| 949 | 949 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
@@ -962,7 +962,7 @@ discard block |
||
| 962 | 962 | ) { |
| 963 | 963 | //$buffer = $Common->getData($hosts[$id]); |
| 964 | 964 | $buffer = $Common->getData($value['host']); |
| 965 | - $all_data = json_decode($buffer,true); |
|
| 965 | + $all_data = json_decode($buffer, true); |
|
| 966 | 966 | if (!empty($all_data)) $reset = 0; |
| 967 | 967 | foreach ($all_data as $key => $line) { |
| 968 | 968 | if ($key != 'full_count' && $key != 'version' && $key != 'stats') { |
@@ -1000,11 +1000,11 @@ discard block |
||
| 1000 | 1000 | ) |
| 1001 | 1001 | ) { |
| 1002 | 1002 | //$buffer = $Common->getData($hosts[$id],'get','','','','','150'); |
| 1003 | - $buffer = $Common->getData($value['host'],'get','','','','','150'); |
|
| 1003 | + $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '150'); |
|
| 1004 | 1004 | //echo $buffer; |
| 1005 | - $buffer = str_replace(array("\n","\r"),"",$buffer); |
|
| 1006 | - $buffer = preg_replace('/,"num":(.+)/','}',$buffer); |
|
| 1007 | - $all_data = json_decode($buffer,true); |
|
| 1005 | + $buffer = str_replace(array("\n", "\r"), "", $buffer); |
|
| 1006 | + $buffer = preg_replace('/,"num":(.+)/', '}', $buffer); |
|
| 1007 | + $all_data = json_decode($buffer, true); |
|
| 1008 | 1008 | if (json_last_error() != JSON_ERROR_NONE) { |
| 1009 | 1009 | die(json_last_error_msg()); |
| 1010 | 1010 | } |
@@ -1027,7 +1027,7 @@ discard block |
||
| 1027 | 1027 | //$data['departure_airport_iata'] = $line[11]; |
| 1028 | 1028 | //$data['arrival_airport_iata'] = $line[12]; |
| 1029 | 1029 | //$data['emergency'] = ''; // emergency |
| 1030 | - $data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10] |
|
| 1030 | + $data['datetime'] = date('Y-m-d H:i:s', $line['inf']['dt']); //$line[10] |
|
| 1031 | 1031 | $data['format_source'] = 'radarvirtueljson'; |
| 1032 | 1032 | $data['id_source'] = $id_source; |
| 1033 | 1033 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
@@ -1048,14 +1048,14 @@ discard block |
||
| 1048 | 1048 | ) { |
| 1049 | 1049 | //$buffer = $Common->getData($hosts[$id]); |
| 1050 | 1050 | $buffer = $Common->getData($value['host'].'?'.time()); |
| 1051 | - $all_data = json_decode(utf8_encode($buffer),true); |
|
| 1051 | + $all_data = json_decode(utf8_encode($buffer), true); |
|
| 1052 | 1052 | |
| 1053 | 1053 | if (isset($all_data['pireps'])) { |
| 1054 | 1054 | $reset = 0; |
| 1055 | 1055 | foreach ($all_data['pireps'] as $line) { |
| 1056 | 1056 | $data = array(); |
| 1057 | 1057 | $data['id'] = $line['id']; |
| 1058 | - $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6); |
|
| 1058 | + $data['hex'] = substr(str_pad(dechex($line['id']), 6, '000000', STR_PAD_LEFT), 0, 6); |
|
| 1059 | 1059 | $data['ident'] = $line['callsign']; // ident |
| 1060 | 1060 | if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id |
| 1061 | 1061 | if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name |
@@ -1085,9 +1085,9 @@ discard block |
||
| 1085 | 1085 | $SI->add($data); |
| 1086 | 1086 | // print_r($data); |
| 1087 | 1087 | } elseif ($line['icon'] == 'ct') { |
| 1088 | - $data['info'] = str_replace('^§','<br />',$data['info']); |
|
| 1089 | - $data['info'] = str_replace('&sect;','',$data['info']); |
|
| 1090 | - $typec = substr($data['ident'],-3); |
|
| 1088 | + $data['info'] = str_replace('^§', '<br />', $data['info']); |
|
| 1089 | + $data['info'] = str_replace('&sect;', '', $data['info']); |
|
| 1090 | + $typec = substr($data['ident'], -3); |
|
| 1091 | 1091 | $data['type'] = ''; |
| 1092 | 1092 | if ($typec == 'APP') $data['type'] = 'Approach'; |
| 1093 | 1093 | elseif ($typec == 'TWR') $data['type'] = 'Tower'; |
@@ -1098,7 +1098,7 @@ discard block |
||
| 1098 | 1098 | elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station'; |
| 1099 | 1099 | elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre'; |
| 1100 | 1100 | else $data['type'] = 'Observer'; |
| 1101 | - if (isset($ATC)) echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']); |
|
| 1101 | + if (isset($ATC)) echo $ATC->add($data['ident'], '', $data['latitude'], $data['longitude'], '0', $data['info'], $data['datetime'], $data['type'], $data['pilot_id'], $data['pilot_name'], $data['format_source']); |
|
| 1102 | 1102 | } |
| 1103 | 1103 | unset($data); |
| 1104 | 1104 | } |
@@ -1115,14 +1115,14 @@ discard block |
||
| 1115 | 1115 | //$buffer = $Common->getData($hosts[$id]); |
| 1116 | 1116 | if ($globalDebug) echo 'Get Data...'."\n"; |
| 1117 | 1117 | $buffer = $Common->getData($value['host']); |
| 1118 | - $all_data = json_decode($buffer,true); |
|
| 1118 | + $all_data = json_decode($buffer, true); |
|
| 1119 | 1119 | if ($buffer != '' && is_array($all_data)) { |
| 1120 | 1120 | $reset = 0; |
| 1121 | 1121 | foreach ($all_data as $line) { |
| 1122 | 1122 | $data = array(); |
| 1123 | 1123 | //$data['id'] = $line['id']; // id not usable |
| 1124 | 1124 | if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum']; |
| 1125 | - $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex |
|
| 1125 | + $data['hex'] = substr(str_pad(bin2hex($line['flightnum']), 6, '000000', STR_PAD_LEFT), -6); // hex |
|
| 1126 | 1126 | if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname']; |
| 1127 | 1127 | if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; |
| 1128 | 1128 | $data['ident'] = $line['flightnum']; // ident |
@@ -1137,7 +1137,7 @@ discard block |
||
| 1137 | 1137 | //$data['datetime'] = $line['lastupdate']; |
| 1138 | 1138 | //$data['last_update'] = $line['lastupdate']; |
| 1139 | 1139 | if (isset($value['timezone'])) { |
| 1140 | - $datetime = new DateTime($line['lastupdate'],new DateTimeZone($value['timezone'])); |
|
| 1140 | + $datetime = new DateTime($line['lastupdate'], new DateTimeZone($value['timezone'])); |
|
| 1141 | 1141 | $datetime->setTimeZone(new DateTimeZone('UTC')); |
| 1142 | 1142 | $data['datetime'] = $datetime->format('Y-m-d H:i:s'); |
| 1143 | 1143 | } else $data['datetime'] = date('Y-m-d H:i:s'); |
@@ -1150,14 +1150,14 @@ discard block |
||
| 1150 | 1150 | if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
| 1151 | 1151 | if (isset($line['aircraftname'])) { |
| 1152 | 1152 | $line['aircraftname'] = strtoupper($line['aircraftname']); |
| 1153 | - $line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']); |
|
| 1154 | - $aircraft_data = explode('-',$line['aircraftname']); |
|
| 1153 | + $line['aircraftname'] = str_replace('BOEING ', 'B', $line['aircraftname']); |
|
| 1154 | + $aircraft_data = explode('-', $line['aircraftname']); |
|
| 1155 | 1155 | if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0]; |
| 1156 | 1156 | elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1]; |
| 1157 | 1157 | else { |
| 1158 | - $aircraft_data = explode(' ',$line['aircraftname']); |
|
| 1159 | - if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]); |
|
| 1160 | - else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']); |
|
| 1158 | + $aircraft_data = explode(' ', $line['aircraftname']); |
|
| 1159 | + if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-', '', $aircraft_data[1]); |
|
| 1160 | + else $data['aircraft_icao'] = str_replace('-', '', $line['aircraftname']); |
|
| 1161 | 1161 | } |
| 1162 | 1162 | } |
| 1163 | 1163 | if (isset($line['route'])) $data['waypoints'] = $line['route']; |
@@ -1182,14 +1182,14 @@ discard block |
||
| 1182 | 1182 | //$buffer = $Common->getData($hosts[$id]); |
| 1183 | 1183 | if ($globalDebug) echo 'Get Data...'."\n"; |
| 1184 | 1184 | $buffer = $Common->getData($value['host']); |
| 1185 | - $all_data = json_decode($buffer,true); |
|
| 1185 | + $all_data = json_decode($buffer, true); |
|
| 1186 | 1186 | if ($buffer != '' && is_array($all_data)) { |
| 1187 | 1187 | $reset = 0; |
| 1188 | 1188 | foreach ($all_data as $line) { |
| 1189 | 1189 | $data = array(); |
| 1190 | 1190 | //$data['id'] = $line['id']; // id not usable |
| 1191 | 1191 | $data['id'] = trim($line['flight_id']); |
| 1192 | - $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex |
|
| 1192 | + $data['hex'] = substr(str_pad(bin2hex($line['callsign']), 6, '000000', STR_PAD_LEFT), -6); // hex |
|
| 1193 | 1193 | $data['pilot_name'] = $line['pilot_name']; |
| 1194 | 1194 | $data['pilot_id'] = $line['pilot_id']; |
| 1195 | 1195 | $data['ident'] = trim($line['callsign']); // ident |
@@ -1233,24 +1233,24 @@ discard block |
||
| 1233 | 1233 | //$buffer = $Common->getData($hosts[$id]); |
| 1234 | 1234 | if ($globalDebug) echo 'Get Data...'."\n"; |
| 1235 | 1235 | $buffer = $Common->getData($value['host']); |
| 1236 | - $all_data = json_decode($buffer,true); |
|
| 1236 | + $all_data = json_decode($buffer, true); |
|
| 1237 | 1237 | if ($buffer != '') { |
| 1238 | 1238 | $Source->deleteLocationBySource('blitzortung'); |
| 1239 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 1240 | - $buffer = explode('\n',$buffer); |
|
| 1239 | + $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer)); |
|
| 1240 | + $buffer = explode('\n', $buffer); |
|
| 1241 | 1241 | foreach ($buffer as $buffer_line) { |
| 1242 | - $line = json_decode($buffer_line,true); |
|
| 1242 | + $line = json_decode($buffer_line, true); |
|
| 1243 | 1243 | if (isset($line['time'])) { |
| 1244 | 1244 | $data = array(); |
| 1245 | 1245 | $data['altitude'] = $line['alt']; // altitude |
| 1246 | 1246 | $data['latitude'] = $line['lat']; // lat |
| 1247 | 1247 | $data['longitude'] = $line['lon']; // long |
| 1248 | - $data['datetime'] = date('Y-m-d H:i:s',substr($line['time'],0,10)); |
|
| 1248 | + $data['datetime'] = date('Y-m-d H:i:s', substr($line['time'], 0, 10)); |
|
| 1249 | 1249 | $data['id_source'] = $id_source; |
| 1250 | 1250 | $data['format_source'] = 'blitzortung'; |
| 1251 | 1251 | $SI->add($data); |
| 1252 | 1252 | if ($globalDebug) echo '☈ Lightning added'."\n"; |
| 1253 | - $Source->addLocation('',$data['latitude'],$data['longitude'],0,'','','blitzortung','weather/thunderstorm.png','lightning',$id,0,$data['datetime']); |
|
| 1253 | + $Source->addLocation('', $data['latitude'], $data['longitude'], 0, '', '', 'blitzortung', 'weather/thunderstorm.png', 'lightning', $id, 0, $data['datetime']); |
|
| 1254 | 1254 | unset($data); |
| 1255 | 1255 | } |
| 1256 | 1256 | } |
@@ -1275,11 +1275,11 @@ discard block |
||
| 1275 | 1275 | //$value = $formats[$nb]; |
| 1276 | 1276 | $format = $globalSources[$nb]['format']; |
| 1277 | 1277 | if ($format == 'sbs' || $format == 'aprs' || $format == 'famaprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') { |
| 1278 | - $buffer = @socket_read($r, 6000,PHP_NORMAL_READ); |
|
| 1278 | + $buffer = @socket_read($r, 6000, PHP_NORMAL_READ); |
|
| 1279 | 1279 | } elseif ($format == 'vrstcp') { |
| 1280 | 1280 | $buffer = @socket_read($r, 6000); |
| 1281 | 1281 | } else { |
| 1282 | - $az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port); |
|
| 1282 | + $az = socket_recvfrom($r, $buffer, 6000, 0, $remote_ip, $remote_port); |
|
| 1283 | 1283 | } |
| 1284 | 1284 | //$buffer = socket_read($r, 60000,PHP_NORMAL_READ); |
| 1285 | 1285 | //echo $buffer."\n"; |
@@ -1288,8 +1288,8 @@ discard block |
||
| 1288 | 1288 | $error = false; |
| 1289 | 1289 | //$SI::del(); |
| 1290 | 1290 | if ($format == 'vrstcp') { |
| 1291 | - $buffer = explode('},{',$buffer); |
|
| 1292 | - } else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer)); |
|
| 1291 | + $buffer = explode('},{', $buffer); |
|
| 1292 | + } else $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '', $buffer)); |
|
| 1293 | 1293 | // SBS format is CSV format |
| 1294 | 1294 | if ($buffer !== FALSE && $buffer != '') { |
| 1295 | 1295 | $tt[$format] = 0; |
@@ -1323,13 +1323,13 @@ discard block |
||
| 1323 | 1323 | if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
| 1324 | 1324 | if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
| 1325 | 1325 | if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination']; |
| 1326 | - if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); |
|
| 1326 | + if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s', $ais_data['eta_ts']); |
|
| 1327 | 1327 | if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
| 1328 | 1328 | if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
| 1329 | 1329 | if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
| 1330 | 1330 | |
| 1331 | 1331 | if (isset($ais_data['timestamp'])) { |
| 1332 | - $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
|
| 1332 | + $data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']); |
|
| 1333 | 1333 | } else { |
| 1334 | 1334 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 1335 | 1335 | } |
@@ -1340,10 +1340,10 @@ discard block |
||
| 1340 | 1340 | } elseif ($format == 'flightgearsp') { |
| 1341 | 1341 | //echo $buffer."\n"; |
| 1342 | 1342 | if (strlen($buffer) > 5) { |
| 1343 | - $line = explode(',',$buffer); |
|
| 1343 | + $line = explode(',', $buffer); |
|
| 1344 | 1344 | $data = array(); |
| 1345 | 1345 | //XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p |
| 1346 | - $data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]),6,'000000',STR_PAD_LEFT),0,6); |
|
| 1346 | + $data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]), 6, '000000', STR_PAD_LEFT), 0, 6); |
|
| 1347 | 1347 | $data['ident'] = $line[6]; |
| 1348 | 1348 | $data['aircraft_name'] = $line[7]; |
| 1349 | 1349 | $data['longitude'] = $line[1]; |
@@ -1360,16 +1360,16 @@ discard block |
||
| 1360 | 1360 | } elseif ($format == 'acars') { |
| 1361 | 1361 | if ($globalDebug) echo 'ACARS : '.$buffer."\n"; |
| 1362 | 1362 | $ACARS->add(trim($buffer)); |
| 1363 | - socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port); |
|
| 1363 | + socket_sendto($r, "OK ".$buffer, 100, 0, $remote_ip, $remote_port); |
|
| 1364 | 1364 | $ACARS->deleteLiveAcarsData(); |
| 1365 | 1365 | } elseif ($format == 'flightgearmp') { |
| 1366 | - if (substr($buffer,0,1) != '#') { |
|
| 1366 | + if (substr($buffer, 0, 1) != '#') { |
|
| 1367 | 1367 | $data = array(); |
| 1368 | 1368 | //echo $buffer."\n"; |
| 1369 | - $line = explode(' ',$buffer); |
|
| 1369 | + $line = explode(' ', $buffer); |
|
| 1370 | 1370 | if (count($line) == 11) { |
| 1371 | - $userserver = explode('@',$line[0]); |
|
| 1372 | - $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex |
|
| 1371 | + $userserver = explode('@', $line[0]); |
|
| 1372 | + $data['hex'] = substr(str_pad(bin2hex($line[0]), 6, '000000', STR_PAD_LEFT), 0, 6); // hex |
|
| 1373 | 1373 | $data['ident'] = $userserver[0]; |
| 1374 | 1374 | $data['registration'] = $userserver[0]; |
| 1375 | 1375 | $data['latitude'] = $line[4]; |
@@ -1377,8 +1377,8 @@ discard block |
||
| 1377 | 1377 | $data['altitude'] = $line[6]; |
| 1378 | 1378 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 1379 | 1379 | $aircraft_type = $line[10]; |
| 1380 | - $aircraft_type = preg_split(':/:',$aircraft_type); |
|
| 1381 | - $data['aircraft_name'] = substr(end($aircraft_type),0,-4); |
|
| 1380 | + $aircraft_type = preg_split(':/:', $aircraft_type); |
|
| 1381 | + $data['aircraft_name'] = substr(end($aircraft_type), 0, -4); |
|
| 1382 | 1382 | if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
| 1383 | 1383 | if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
| 1384 | 1384 | } |
@@ -1387,8 +1387,8 @@ discard block |
||
| 1387 | 1387 | echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n"; |
| 1388 | 1388 | die; |
| 1389 | 1389 | } elseif ($format == 'vrstcp') { |
| 1390 | - foreach($buffer as $all_data) { |
|
| 1391 | - $line = json_decode('{'.$all_data.'}',true); |
|
| 1390 | + foreach ($buffer as $all_data) { |
|
| 1391 | + $line = json_decode('{'.$all_data.'}', true); |
|
| 1392 | 1392 | $data = array(); |
| 1393 | 1393 | if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex |
| 1394 | 1394 | if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident |
@@ -1414,16 +1414,16 @@ discard block |
||
| 1414 | 1414 | if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data); |
| 1415 | 1415 | unset($data); |
| 1416 | 1416 | } |
| 1417 | - } elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') { |
|
| 1417 | + } elseif ($format == 'tsv' || substr($buffer, 0, 4) == 'clock') { |
|
| 1418 | 1418 | $line = explode("\t", $buffer); |
| 1419 | - for($k = 0; $k < count($line); $k=$k+2) { |
|
| 1419 | + for ($k = 0; $k < count($line); $k = $k + 2) { |
|
| 1420 | 1420 | $key = $line[$k]; |
| 1421 | - $lined[$key] = $line[$k+1]; |
|
| 1421 | + $lined[$key] = $line[$k + 1]; |
|
| 1422 | 1422 | } |
| 1423 | 1423 | if (count($lined) > 3) { |
| 1424 | 1424 | $data['hex'] = $lined['hexid']; |
| 1425 | 1425 | //$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));; |
| 1426 | - $data['datetime'] = date('Y-m-d H:i:s');; |
|
| 1426 | + $data['datetime'] = date('Y-m-d H:i:s'); ; |
|
| 1427 | 1427 | if (isset($lined['ident'])) $data['ident'] = $lined['ident']; |
| 1428 | 1428 | if (isset($lined['lat'])) $data['latitude'] = $lined['lat']; |
| 1429 | 1429 | if (isset($lined['lon'])) $data['longitude'] = $lined['lon']; |
@@ -1442,22 +1442,22 @@ discard block |
||
| 1442 | 1442 | } else $error = true; |
| 1443 | 1443 | } elseif ($format == 'aprs' && $use_aprs) { |
| 1444 | 1444 | if ($aprs_connect == 0) { |
| 1445 | - $send = @ socket_send( $r , $aprs_login , strlen($aprs_login) , 0 ); |
|
| 1445 | + $send = @ socket_send($r, $aprs_login, strlen($aprs_login), 0); |
|
| 1446 | 1446 | $aprs_connect = 1; |
| 1447 | 1447 | } |
| 1448 | 1448 | |
| 1449 | - if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) { |
|
| 1449 | + if ($aprs_keep > 60 && time() - $aprs_last_tx > $aprs_keep) { |
|
| 1450 | 1450 | $aprs_last_tx = time(); |
| 1451 | 1451 | $data_aprs = "# Keep alive"; |
| 1452 | - $send = @ socket_send( $r , $data_aprs , strlen($data_aprs) , 0 ); |
|
| 1452 | + $send = @ socket_send($r, $data_aprs, strlen($data_aprs), 0); |
|
| 1453 | 1453 | } |
| 1454 | 1454 | |
| 1455 | 1455 | //echo 'Connect : '.$aprs_connect.' '.$buffer."\n"; |
| 1456 | 1456 | //echo 'APRS data : '.$buffer."\n"; |
| 1457 | - $buffer = str_replace('APRS <- ','',$buffer); |
|
| 1458 | - $buffer = str_replace('APRS -> ','',$buffer); |
|
| 1457 | + $buffer = str_replace('APRS <- ', '', $buffer); |
|
| 1458 | + $buffer = str_replace('APRS -> ', '', $buffer); |
|
| 1459 | 1459 | //echo $buffer."\n"; |
| 1460 | - if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') { |
|
| 1460 | + if (substr($buffer, 0, 1) != '#' && substr($buffer, 0, 1) != '@' && substr($buffer, 0, 5) != 'APRS ') { |
|
| 1461 | 1461 | $line = $APRS->parse($buffer); |
| 1462 | 1462 | //if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) { |
| 1463 | 1463 | if (is_array($line) && isset($line['latitude']) && isset($line['longitude']) && (isset($line['ident']) || isset($line['address']) || isset($line['mmsi']))) { |
@@ -1472,7 +1472,7 @@ discard block |
||
| 1472 | 1472 | if (isset($line['arrival_date'])) $data['arrical_date'] = $line['arrival_date']; |
| 1473 | 1473 | if (isset($line['type_id'])) $data['type_id'] = $line['typeid']; |
| 1474 | 1474 | if (isset($line['status_id'])) $data['status_id'] = $line['statusid']; |
| 1475 | - if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']); |
|
| 1475 | + if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s', $line['timestamp']); |
|
| 1476 | 1476 | else $data['datetime'] = date('Y-m-d H:i:s'); |
| 1477 | 1477 | //$data['datetime'] = date('Y-m-d H:i:s'); |
| 1478 | 1478 | if (isset($line['ident'])) $data['ident'] = $line['ident']; |
@@ -1551,29 +1551,29 @@ discard block |
||
| 1551 | 1551 | } elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident']) && isset($data['altitude'])) { |
| 1552 | 1552 | if (!isset($data['altitude'])) $data['altitude'] = 0; |
| 1553 | 1553 | $Source->deleteOldLocationByType('gs'); |
| 1554 | - if (count($Source->getLocationInfoByNameType($data['ident'],'gs')) > 0) { |
|
| 1555 | - $Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']); |
|
| 1554 | + if (count($Source->getLocationInfoByNameType($data['ident'], 'gs')) > 0) { |
|
| 1555 | + $Source->updateLocation($data['ident'], $data['latitude'], $data['longitude'], $data['altitude'], '', '', $data['source_name'], 'antenna.png', 'gs', $id, 0, $data['datetime']); |
|
| 1556 | 1556 | } else { |
| 1557 | - $Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']); |
|
| 1557 | + $Source->addLocation($data['ident'], $data['latitude'], $data['longitude'], $data['altitude'], '', '', $data['source_name'], 'antenna.png', 'gs', $id, 0, $data['datetime']); |
|
| 1558 | 1558 | } |
| 1559 | 1559 | } elseif (isset($line['symbol']) && $line['symbol'] == 'Weather Station') { |
| 1560 | 1560 | //if ($globalDebug) echo '!! Weather Station not yet supported'."\n"; |
| 1561 | 1561 | if ($globalDebug) echo '# Weather Station added'."\n"; |
| 1562 | 1562 | $Source->deleteOldLocationByType('wx'); |
| 1563 | 1563 | $weather_data = json_encode($line); |
| 1564 | - if (count($Source->getLocationInfoByNameType($data['ident'],'wx')) > 0) { |
|
| 1565 | - $Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'wx.png','wx',$id,0,$data['datetime'],$weather_data); |
|
| 1564 | + if (count($Source->getLocationInfoByNameType($data['ident'], 'wx')) > 0) { |
|
| 1565 | + $Source->updateLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'wx.png', 'wx', $id, 0, $data['datetime'], $weather_data); |
|
| 1566 | 1566 | } else { |
| 1567 | - $Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'wx.png','wx',$id,0,$data['datetime'],$weather_data); |
|
| 1567 | + $Source->addLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'wx.png', 'wx', $id, 0, $data['datetime'], $weather_data); |
|
| 1568 | 1568 | } |
| 1569 | 1569 | } elseif (isset($line['symbol']) && $line['symbol'] == 'Lightning') { |
| 1570 | 1570 | //if ($globalDebug) echo '!! Weather Station not yet supported'."\n"; |
| 1571 | 1571 | if ($globalDebug) echo '☈ Lightning added'."\n"; |
| 1572 | 1572 | $Source->deleteOldLocationByType('lightning'); |
| 1573 | - if (count($Source->getLocationInfoByNameType($data['ident'],'lightning')) > 0) { |
|
| 1574 | - $Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'weather/thunderstorm.png','lightning',$id,0,$data['datetime'],$data['comment']); |
|
| 1573 | + if (count($Source->getLocationInfoByNameType($data['ident'], 'lightning')) > 0) { |
|
| 1574 | + $Source->updateLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'weather/thunderstorm.png', 'lightning', $id, 0, $data['datetime'], $data['comment']); |
|
| 1575 | 1575 | } else { |
| 1576 | - $Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'weather/thunderstorm.png','lightning',$id,0,$data['datetime'],$data['comment']); |
|
| 1576 | + $Source->addLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'weather/thunderstorm.png', 'lightning', $id, 0, $data['datetime'], $data['comment']); |
|
| 1577 | 1577 | } |
| 1578 | 1578 | } elseif ($globalDebug) { |
| 1579 | 1579 | echo '/!\ Not added: '.$buffer."\n"; |
@@ -1582,7 +1582,7 @@ discard block |
||
| 1582 | 1582 | unset($data); |
| 1583 | 1583 | } |
| 1584 | 1584 | elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') { |
| 1585 | - $Source->updateLocationDescByName($line['ident'],$line['source'],$id,$line['comment']); |
|
| 1585 | + $Source->updateLocationDescByName($line['ident'], $line['source'], $id, $line['comment']); |
|
| 1586 | 1586 | } |
| 1587 | 1587 | /* |
| 1588 | 1588 | elseif (is_array($line) && $globalDebug && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && ($line['symbol'] == 'Car' || $line['symbol'] == 'Ambulance' || $line['symbol'] == 'Van' || $line['symbol'] == 'Truck' || $line['symbol'] == 'Truck (18 Wheeler)' || $line['symbol'] == 'Motorcycle')) { |
@@ -1591,7 +1591,7 @@ discard block |
||
| 1591 | 1591 | */ |
| 1592 | 1592 | //elseif ($line == false && $globalDebug) echo 'Ignored ('.$buffer.")\n"; |
| 1593 | 1593 | elseif ($line == true && $globalDebug) echo '!! Failed : '.$buffer."!!\n"; |
| 1594 | - if (isset($globalSources[$nb]['last_weather_clean']) && time()-$globalSources[$nb]['last_weather_clean'] > 60*5) { |
|
| 1594 | + if (isset($globalSources[$nb]['last_weather_clean']) && time() - $globalSources[$nb]['last_weather_clean'] > 60*5) { |
|
| 1595 | 1595 | $Source->deleteOldLocationByType('lightning'); |
| 1596 | 1596 | $Source->deleteOldLocationByType('wx'); |
| 1597 | 1597 | $globalSources[$nb]['last_weather_clean'] = time(); |
@@ -1676,7 +1676,7 @@ discard block |
||
| 1676 | 1676 | connect_all($sourceee); |
| 1677 | 1677 | $sourceee = array(); |
| 1678 | 1678 | //connect_all($globalSources); |
| 1679 | - $tt[$format]=0; |
|
| 1679 | + $tt[$format] = 0; |
|
| 1680 | 1680 | break; |
| 1681 | 1681 | } |
| 1682 | 1682 | } |
@@ -1685,14 +1685,14 @@ discard block |
||
| 1685 | 1685 | } else { |
| 1686 | 1686 | $error = socket_strerror(socket_last_error()); |
| 1687 | 1687 | if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) { |
| 1688 | - if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n"; |
|
| 1688 | + if ($globalDebug) echo "ERROR : socket_select give this error ".$error."\n"; |
|
| 1689 | 1689 | if (isset($globalDebug)) echo "Restarting...\n"; |
| 1690 | 1690 | // Restart the script if possible |
| 1691 | 1691 | if (is_array($sockets)) { |
| 1692 | 1692 | if ($globalDebug) echo "Shutdown all sockets..."; |
| 1693 | 1693 | |
| 1694 | 1694 | foreach ($sockets as $sock) { |
| 1695 | - @socket_shutdown($sock,2); |
|
| 1695 | + @socket_shutdown($sock, 2); |
|
| 1696 | 1696 | @socket_close($sock); |
| 1697 | 1697 | } |
| 1698 | 1698 | |
@@ -14,13 +14,17 @@ discard block |
||
| 14 | 14 | require_once(dirname(__FILE__).'/../require/class.Source.php'); |
| 15 | 15 | require_once(dirname(__FILE__).'/../require/class.Connection.php'); |
| 16 | 16 | require_once(dirname(__FILE__).'/../require/class.Common.php'); |
| 17 | -if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php'); |
|
| 17 | +if (isset($globalTracker) && $globalTracker) { |
|
| 18 | + require_once(dirname(__FILE__).'/../require/class.TrackerImport.php'); |
|
| 19 | +} |
|
| 18 | 20 | if (isset($globalMarine) && $globalMarine) { |
| 19 | 21 | require_once(dirname(__FILE__).'/../require/class.AIS.php'); |
| 20 | 22 | require_once(dirname(__FILE__).'/../require/class.MarineImport.php'); |
| 21 | 23 | } |
| 22 | 24 | |
| 23 | -if (!isset($globalDebug)) $globalDebug = FALSE; |
|
| 25 | +if (!isset($globalDebug)) { |
|
| 26 | + $globalDebug = FALSE; |
|
| 27 | +} |
|
| 24 | 28 | |
| 25 | 29 | // Check if schema is at latest version |
| 26 | 30 | $Connection = new Connection(); |
@@ -55,35 +59,62 @@ discard block |
||
| 55 | 59 | //elseif (isset($options['source'])) $hosts = array($options['source']); |
| 56 | 60 | if (isset($options['s'])) { |
| 57 | 61 | $globalSources = array(); |
| 58 | - if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']); |
|
| 59 | - else $globalSources[] = array('host' => $options['s']); |
|
| 60 | -} elseif (isset($options['source'])) { |
|
| 62 | + if (isset($options['format'])) { |
|
| 63 | + $globalSources[] = array('host' => $options['s'],'format' => $options['format']); |
|
| 64 | + } else { |
|
| 65 | + $globalSources[] = array('host' => $options['s']); |
|
| 66 | + } |
|
| 67 | + } elseif (isset($options['source'])) { |
|
| 61 | 68 | $globalSources = array(); |
| 62 | - if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']); |
|
| 63 | - else $globalSources[] = array('host' => $options['source']); |
|
| 64 | -} |
|
| 69 | + if (isset($options['format'])) { |
|
| 70 | + $globalSources[] = array('host' => $options['source'],'format' => $options['format']); |
|
| 71 | + } else { |
|
| 72 | + $globalSources[] = array('host' => $options['source']); |
|
| 73 | + } |
|
| 74 | + } |
|
| 65 | 75 | if (isset($options['aprsserverhost'])) { |
| 66 | 76 | $globalServerAPRS = TRUE; |
| 67 | 77 | $globalServerAPRShost = $options['aprsserverhost']; |
| 68 | 78 | } |
| 69 | -if (isset($options['aprsserverport'])) $globalServerAPRSport = $options['aprsserverport']; |
|
| 70 | -if (isset($options['aprsserverssid'])) $globalServerAPRSssid = $options['aprsserverssid']; |
|
| 71 | -if (isset($options['aprsserverpass'])) $globalServerAPRSpass = $options['aprsserverpass']; |
|
| 72 | -if (isset($options['noaprsserver'])) $globalServerAPRS = FALSE; |
|
| 73 | -if (isset($options['nodaemon'])) $globalDaemon = FALSE; |
|
| 74 | -if (isset($options['server'])) $globalServer = TRUE; |
|
| 75 | -if (isset($options['idsource'])) $id_source = $options['idsource']; |
|
| 76 | -else $id_source = 1; |
|
| 79 | +if (isset($options['aprsserverport'])) { |
|
| 80 | + $globalServerAPRSport = $options['aprsserverport']; |
|
| 81 | +} |
|
| 82 | +if (isset($options['aprsserverssid'])) { |
|
| 83 | + $globalServerAPRSssid = $options['aprsserverssid']; |
|
| 84 | +} |
|
| 85 | +if (isset($options['aprsserverpass'])) { |
|
| 86 | + $globalServerAPRSpass = $options['aprsserverpass']; |
|
| 87 | +} |
|
| 88 | +if (isset($options['noaprsserver'])) { |
|
| 89 | + $globalServerAPRS = FALSE; |
|
| 90 | +} |
|
| 91 | +if (isset($options['nodaemon'])) { |
|
| 92 | + $globalDaemon = FALSE; |
|
| 93 | +} |
|
| 94 | +if (isset($options['server'])) { |
|
| 95 | + $globalServer = TRUE; |
|
| 96 | +} |
|
| 97 | +if (isset($options['idsource'])) { |
|
| 98 | + $id_source = $options['idsource']; |
|
| 99 | +} else { |
|
| 100 | + $id_source = 1; |
|
| 101 | +} |
|
| 77 | 102 | if (isset($globalServer) && $globalServer) { |
| 78 | - if ($globalDebug) echo "Using Server Mode\n"; |
|
| 103 | + if ($globalDebug) { |
|
| 104 | + echo "Using Server Mode\n"; |
|
| 105 | + } |
|
| 79 | 106 | $SI=new SpotterServer(); |
| 80 | 107 | /* |
| 81 | 108 | require_once(dirname(__FILE__).'/../require/class.APRS.php'); |
| 82 | 109 | $SI = new adsb2aprs(); |
| 83 | 110 | $SI->connect(); |
| 84 | 111 | */ |
| 85 | -} else $SI=new SpotterImport($Connection->db); |
|
| 86 | -if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db); |
|
| 112 | +} else { |
|
| 113 | + $SI=new SpotterImport($Connection->db); |
|
| 114 | +} |
|
| 115 | +if (isset($globalTracker) && $globalTracker) { |
|
| 116 | + $TI = new TrackerImport($Connection->db); |
|
| 117 | +} |
|
| 87 | 118 | if (isset($globalMarine) && $globalMarine) { |
| 88 | 119 | $AIS = new AIS(); |
| 89 | 120 | $MI = new MarineImport($Connection->db); |
@@ -106,7 +137,9 @@ discard block |
||
| 106 | 137 | } |
| 107 | 138 | |
| 108 | 139 | // let's try and connect |
| 109 | -if ($globalDebug) echo "Connecting...\n"; |
|
| 140 | +if ($globalDebug) { |
|
| 141 | + echo "Connecting...\n"; |
|
| 142 | +} |
|
| 110 | 143 | $use_aprs = false; |
| 111 | 144 | $aprs_full = false; |
| 112 | 145 | $reset = 0; |
@@ -115,7 +148,9 @@ discard block |
||
| 115 | 148 | //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs; |
| 116 | 149 | global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context; |
| 117 | 150 | $reset++; |
| 118 | - if ($globalDebug) echo 'Connect to all...'."\n"; |
|
| 151 | + if ($globalDebug) { |
|
| 152 | + echo 'Connect to all...'."\n"; |
|
| 153 | + } |
|
| 119 | 154 | foreach ($hosts as $id => $value) { |
| 120 | 155 | $host = $value['host']; |
| 121 | 156 | $globalSources[$id]['last_exec'] = 0; |
@@ -125,22 +160,30 @@ discard block |
||
| 125 | 160 | //$formats[$id] = 'deltadbtxt'; |
| 126 | 161 | $globalSources[$id]['format'] = 'deltadbtxt'; |
| 127 | 162 | //$last_exec['deltadbtxt'] = 0; |
| 128 | - if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n"; |
|
| 163 | + if ($globalDebug) { |
|
| 164 | + echo "Connect to deltadb source (".$host.")...\n"; |
|
| 165 | + } |
|
| 129 | 166 | } else if (preg_match('/vatsim-data.txt$/i',$host)) { |
| 130 | 167 | //$formats[$id] = 'vatsimtxt'; |
| 131 | 168 | $globalSources[$id]['format'] = 'vatsimtxt'; |
| 132 | 169 | //$last_exec['vatsimtxt'] = 0; |
| 133 | - if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n"; |
|
| 170 | + if ($globalDebug) { |
|
| 171 | + echo "Connect to vatsim source (".$host.")...\n"; |
|
| 172 | + } |
|
| 134 | 173 | } else if (preg_match('/aircraftlist.json$/i',$host)) { |
| 135 | 174 | //$formats[$id] = 'aircraftlistjson'; |
| 136 | 175 | $globalSources[$id]['format'] = 'aircraftlistjson'; |
| 137 | 176 | //$last_exec['aircraftlistjson'] = 0; |
| 138 | - if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n"; |
|
| 177 | + if ($globalDebug) { |
|
| 178 | + echo "Connect to aircraftlist.json source (".$host.")...\n"; |
|
| 179 | + } |
|
| 139 | 180 | } else if (preg_match('/opensky/i',$host)) { |
| 140 | 181 | //$formats[$id] = 'aircraftlistjson'; |
| 141 | 182 | $globalSources[$id]['format'] = 'opensky'; |
| 142 | 183 | //$last_exec['aircraftlistjson'] = 0; |
| 143 | - if ($globalDebug) echo "Connect to opensky source (".$host.")...\n"; |
|
| 184 | + if ($globalDebug) { |
|
| 185 | + echo "Connect to opensky source (".$host.")...\n"; |
|
| 186 | + } |
|
| 144 | 187 | /* |
| 145 | 188 | // Disabled for now, site change source format |
| 146 | 189 | } else if (preg_match('/radarvirtuel.com\/list_aircrafts$/i',$host)) { |
@@ -157,7 +200,9 @@ discard block |
||
| 157 | 200 | //$formats[$id] = 'planeupdatefaa'; |
| 158 | 201 | $globalSources[$id]['format'] = 'planeupdatefaa'; |
| 159 | 202 | //$last_exec['planeupdatefaa'] = 0; |
| 160 | - if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n"; |
|
| 203 | + if ($globalDebug) { |
|
| 204 | + echo "Connect to planeUpdateFAA.php source (".$host.")...\n"; |
|
| 205 | + } |
|
| 161 | 206 | if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { |
| 162 | 207 | echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
| 163 | 208 | exit(0); |
@@ -166,32 +211,46 @@ discard block |
||
| 166 | 211 | //$formats[$id] = 'phpvmacars'; |
| 167 | 212 | $globalSources[$id]['format'] = 'phpvmacars'; |
| 168 | 213 | //$last_exec['phpvmacars'] = 0; |
| 169 | - if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n"; |
|
| 214 | + if ($globalDebug) { |
|
| 215 | + echo "Connect to phpvmacars source (".$host.")...\n"; |
|
| 216 | + } |
|
| 170 | 217 | } else if (preg_match('/VAM-json.php$/i',$host)) { |
| 171 | 218 | //$formats[$id] = 'phpvmacars'; |
| 172 | 219 | $globalSources[$id]['format'] = 'vam'; |
| 173 | - if ($globalDebug) echo "Connect to Vam source (".$host.")...\n"; |
|
| 220 | + if ($globalDebug) { |
|
| 221 | + echo "Connect to Vam source (".$host.")...\n"; |
|
| 222 | + } |
|
| 174 | 223 | } else if (preg_match('/whazzup/i',$host)) { |
| 175 | 224 | //$formats[$id] = 'whazzup'; |
| 176 | 225 | $globalSources[$id]['format'] = 'whazzup'; |
| 177 | 226 | //$last_exec['whazzup'] = 0; |
| 178 | - if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n"; |
|
| 227 | + if ($globalDebug) { |
|
| 228 | + echo "Connect to whazzup source (".$host.")...\n"; |
|
| 229 | + } |
|
| 179 | 230 | } else if (preg_match('/blitzortung/i',$host)) { |
| 180 | 231 | $globalSources[$id]['format'] = 'blitzortung'; |
| 181 | - if ($globalDebug) echo "Connect to blitzortung source (".$host.")...\n"; |
|
| 232 | + if ($globalDebug) { |
|
| 233 | + echo "Connect to blitzortung source (".$host.")...\n"; |
|
| 234 | + } |
|
| 182 | 235 | } else if (preg_match('/airwhere/i',$host)) { |
| 183 | 236 | $globalSources[$id]['format'] = 'airwhere'; |
| 184 | - if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n"; |
|
| 237 | + if ($globalDebug) { |
|
| 238 | + echo "Connect to airwhere source (".$host.")...\n"; |
|
| 239 | + } |
|
| 185 | 240 | } else if (preg_match('/recentpireps/i',$host)) { |
| 186 | 241 | //$formats[$id] = 'pirepsjson'; |
| 187 | 242 | $globalSources[$id]['format'] = 'pirepsjson'; |
| 188 | 243 | //$last_exec['pirepsjson'] = 0; |
| 189 | - if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n"; |
|
| 244 | + if ($globalDebug) { |
|
| 245 | + echo "Connect to pirepsjson source (".$host.")...\n"; |
|
| 246 | + } |
|
| 190 | 247 | } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) { |
| 191 | 248 | //$formats[$id] = 'fr24json'; |
| 192 | 249 | $globalSources[$id]['format'] = 'fr24json'; |
| 193 | 250 | //$last_exec['fr24json'] = 0; |
| 194 | - if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n"; |
|
| 251 | + if ($globalDebug) { |
|
| 252 | + echo "Connect to fr24 source (".$host.")...\n"; |
|
| 253 | + } |
|
| 195 | 254 | if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { |
| 196 | 255 | echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
| 197 | 256 | exit(0); |
@@ -200,7 +259,9 @@ discard block |
||
| 200 | 259 | //$formats[$id] = 'fr24json'; |
| 201 | 260 | $globalSources[$id]['format'] = 'myshiptracking'; |
| 202 | 261 | //$last_exec['fr24json'] = 0; |
| 203 | - if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n"; |
|
| 262 | + if ($globalDebug) { |
|
| 263 | + echo "Connect to myshiptracking source (".$host.")...\n"; |
|
| 264 | + } |
|
| 204 | 265 | if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { |
| 205 | 266 | echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
| 206 | 267 | exit(0); |
@@ -209,17 +270,24 @@ discard block |
||
| 209 | 270 | } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) { |
| 210 | 271 | //$formats[$id] = 'tsv'; |
| 211 | 272 | $globalSources[$id]['format'] = 'tsv'; |
| 212 | - if ($globalDebug) echo "Connect to tsv source (".$host.")...\n"; |
|
| 273 | + if ($globalDebug) { |
|
| 274 | + echo "Connect to tsv source (".$host.")...\n"; |
|
| 275 | + } |
|
| 213 | 276 | } |
| 214 | 277 | } elseif (filter_var($host,FILTER_VALIDATE_URL)) { |
| 215 | 278 | if ($globalSources[$id]['format'] == 'aisnmeahttp') { |
| 216 | 279 | $idf = fopen($globalSources[$id]['host'],'r',false,$context); |
| 217 | 280 | if ($idf !== false) { |
| 218 | 281 | $httpfeeds[$id] = $idf; |
| 219 | - if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
|
| 282 | + if ($globalDebug) { |
|
| 283 | + echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
|
| 284 | + } |
|
| 285 | + } elseif ($globalDebug) { |
|
| 286 | + echo "Can't connect to ".$globalSources[$id]['host']."\n"; |
|
| 220 | 287 | } |
| 221 | - elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n"; |
|
| 222 | - } elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
|
| 288 | + } elseif ($globalDebug) { |
|
| 289 | + echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
|
| 290 | + } |
|
| 223 | 291 | } elseif (!filter_var($host,FILTER_VALIDATE_URL)) { |
| 224 | 292 | $hostport = explode(':',$host); |
| 225 | 293 | if (isset($hostport[1])) { |
@@ -259,17 +327,25 @@ discard block |
||
| 259 | 327 | //$formats[$id] = 'beast'; |
| 260 | 328 | $globalSources[$id]['format'] = 'beast'; |
| 261 | 329 | //} else $formats[$id] = 'sbs'; |
| 262 | - } else $globalSources[$id]['format'] = 'sbs'; |
|
| 330 | + } else { |
|
| 331 | + $globalSources[$id]['format'] = 'sbs'; |
|
| 332 | + } |
|
| 263 | 333 | //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n"; |
| 264 | 334 | } |
| 265 | - if ($globalDebug) echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n"; |
|
| 335 | + if ($globalDebug) { |
|
| 336 | + echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n"; |
|
| 337 | + } |
|
| 266 | 338 | } else { |
| 267 | - if ($globalDebug) echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n"; |
|
| 339 | + if ($globalDebug) { |
|
| 340 | + echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n"; |
|
| 341 | + } |
|
| 268 | 342 | } |
| 269 | 343 | } |
| 270 | 344 | } |
| 271 | 345 | } |
| 272 | -if (!isset($globalMinFetch)) $globalMinFetch = 15; |
|
| 346 | +if (!isset($globalMinFetch)) { |
|
| 347 | + $globalMinFetch = 15; |
|
| 348 | +} |
|
| 273 | 349 | |
| 274 | 350 | // Initialize all |
| 275 | 351 | $status = array(); |
@@ -278,13 +354,19 @@ discard block |
||
| 278 | 354 | $formats = array(); |
| 279 | 355 | $last_exec = array(); |
| 280 | 356 | $time = time(); |
| 281 | -if (isset($globalSourcesTimeout)) $timeout = $globalSourcesTimeOut; |
|
| 282 | -else if (isset($globalSBS1TimeOut)) $timeout = $globalSBS1TimeOut; |
|
| 283 | -else $timeout = 20; |
|
| 357 | +if (isset($globalSourcesTimeout)) { |
|
| 358 | + $timeout = $globalSourcesTimeOut; |
|
| 359 | +} else if (isset($globalSBS1TimeOut)) { |
|
| 360 | + $timeout = $globalSBS1TimeOut; |
|
| 361 | +} else { |
|
| 362 | + $timeout = 20; |
|
| 363 | +} |
|
| 284 | 364 | $errno = ''; |
| 285 | 365 | $errstr=''; |
| 286 | 366 | |
| 287 | -if (!isset($globalDaemon)) $globalDaemon = TRUE; |
|
| 367 | +if (!isset($globalDaemon)) { |
|
| 368 | + $globalDaemon = TRUE; |
|
| 369 | +} |
|
| 288 | 370 | /* Initiate connections to all the hosts simultaneously */ |
| 289 | 371 | //connect_all($hosts); |
| 290 | 372 | //connect_all($globalSources); |
@@ -313,7 +395,9 @@ discard block |
||
| 313 | 395 | if (isset($source['format']) && $source['format'] == 'aprs') { |
| 314 | 396 | $aprs_connect = 0; |
| 315 | 397 | $use_aprs = true; |
| 316 | - if (isset($source['port']) && $source['port'] == '10152') $aprs_full = true; |
|
| 398 | + if (isset($source['port']) && $source['port'] == '10152') { |
|
| 399 | + $aprs_full = true; |
|
| 400 | + } |
|
| 317 | 401 | break; |
| 318 | 402 | } |
| 319 | 403 | } |
@@ -324,25 +408,48 @@ discard block |
||
| 324 | 408 | $aprs_connect = 0; |
| 325 | 409 | $aprs_keep = 120; |
| 326 | 410 | $aprs_last_tx = time(); |
| 327 | - if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion; |
|
| 328 | - else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName); |
|
| 329 | - if (isset($globalAPRSssid)) $aprs_ssid = $globalAPRSssid; |
|
| 330 | - else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8); |
|
| 331 | - if (isset($globalAPRSfilter)) $aprs_filter = $globalAPRSfilter; |
|
| 332 | - else $aprs_filter = 'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0'; |
|
| 333 | - if ($aprs_full) $aprs_filter = ''; |
|
| 334 | - if (isset($globalAPRSpass)) $aprs_pass = $globalAPRSpass; |
|
| 335 | - else $aprs_pass = '-1'; |
|
| 411 | + if (isset($globalAPRSversion)) { |
|
| 412 | + $aprs_version = $globalAPRSversion; |
|
| 413 | + } else { |
|
| 414 | + $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName); |
|
| 415 | + } |
|
| 416 | + if (isset($globalAPRSssid)) { |
|
| 417 | + $aprs_ssid = $globalAPRSssid; |
|
| 418 | + } else { |
|
| 419 | + $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8); |
|
| 420 | + } |
|
| 421 | + if (isset($globalAPRSfilter)) { |
|
| 422 | + $aprs_filter = $globalAPRSfilter; |
|
| 423 | + } else { |
|
| 424 | + $aprs_filter = 'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0'; |
|
| 425 | + } |
|
| 426 | + if ($aprs_full) { |
|
| 427 | + $aprs_filter = ''; |
|
| 428 | + } |
|
| 429 | + if (isset($globalAPRSpass)) { |
|
| 430 | + $aprs_pass = $globalAPRSpass; |
|
| 431 | + } else { |
|
| 432 | + $aprs_pass = '-1'; |
|
| 433 | + } |
|
| 336 | 434 | |
| 337 | - if ($aprs_filter != '') $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version} filter {$aprs_filter}\n"; |
|
| 338 | - else $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n"; |
|
| 339 | -} |
|
| 435 | + if ($aprs_filter != '') { |
|
| 436 | + $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version} filter {$aprs_filter}\n"; |
|
| 437 | + } else { |
|
| 438 | + $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n"; |
|
| 439 | + } |
|
| 440 | + } |
|
| 340 | 441 | |
| 341 | 442 | // connected - lets do some work |
| 342 | -if ($globalDebug) echo "Connected!\n"; |
|
| 443 | +if ($globalDebug) { |
|
| 444 | + echo "Connected!\n"; |
|
| 445 | +} |
|
| 343 | 446 | sleep(1); |
| 344 | -if ($globalDebug) echo "SCAN MODE \n\n"; |
|
| 345 | -if (!isset($globalCronEnd)) $globalCronEnd = 60; |
|
| 447 | +if ($globalDebug) { |
|
| 448 | + echo "SCAN MODE \n\n"; |
|
| 449 | +} |
|
| 450 | +if (!isset($globalCronEnd)) { |
|
| 451 | + $globalCronEnd = 60; |
|
| 452 | +} |
|
| 346 | 453 | $endtime = time()+$globalCronEnd; |
| 347 | 454 | $i = 1; |
| 348 | 455 | $tt = array(); |
@@ -356,20 +463,28 @@ discard block |
||
| 356 | 463 | |
| 357 | 464 | // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time. |
| 358 | 465 | while ($i > 0) { |
| 359 | - if (!$globalDaemon) $i = $endtime-time(); |
|
| 466 | + if (!$globalDaemon) { |
|
| 467 | + $i = $endtime-time(); |
|
| 468 | + } |
|
| 360 | 469 | // Delete old ATC |
| 361 | 470 | if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) { |
| 362 | - if ($globalDebug) echo 'Delete old ATC...'."\n"; |
|
| 471 | + if ($globalDebug) { |
|
| 472 | + echo 'Delete old ATC...'."\n"; |
|
| 473 | + } |
|
| 363 | 474 | $ATC->deleteOldATC(); |
| 364 | 475 | } |
| 365 | 476 | |
| 366 | 477 | if (count($last_exec) == count($globalSources)) { |
| 367 | 478 | $max = $globalMinFetch; |
| 368 | 479 | foreach ($last_exec as $last) { |
| 369 | - if ((time() - $last['last']) < $max) $max = time() - $last['last']; |
|
| 480 | + if ((time() - $last['last']) < $max) { |
|
| 481 | + $max = time() - $last['last']; |
|
| 482 | + } |
|
| 370 | 483 | } |
| 371 | 484 | if ($max != $globalMinFetch) { |
| 372 | - if ($globalDebug) echo 'Sleeping...'."\n"; |
|
| 485 | + if ($globalDebug) { |
|
| 486 | + echo 'Sleeping...'."\n"; |
|
| 487 | + } |
|
| 373 | 488 | sleep($globalMinFetch-$max+2); |
| 374 | 489 | } |
| 375 | 490 | } |
@@ -379,7 +494,9 @@ discard block |
||
| 379 | 494 | foreach ($globalSources as $id => $value) { |
| 380 | 495 | date_default_timezone_set('UTC'); |
| 381 | 496 | //if ($globalDebug) echo 'Source host : '.$value['host'].' - Source format: '.$value['format']."\n"; |
| 382 | - if (!isset($last_exec[$id]['last'])) $last_exec[$id]['last'] = 0; |
|
| 497 | + if (!isset($last_exec[$id]['last'])) { |
|
| 498 | + $last_exec[$id]['last'] = 0; |
|
| 499 | + } |
|
| 383 | 500 | if ($value['format'] == 'deltadbtxt' && |
| 384 | 501 | ( |
| 385 | 502 | (isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || |
@@ -388,7 +505,9 @@ discard block |
||
| 388 | 505 | ) { |
| 389 | 506 | //$buffer = $Common->getData($hosts[$id]); |
| 390 | 507 | $buffer = $Common->getData($value['host']); |
| 391 | - if ($buffer != '') $reset = 0; |
|
| 508 | + if ($buffer != '') { |
|
| 509 | + $reset = 0; |
|
| 510 | + } |
|
| 392 | 511 | $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
| 393 | 512 | $buffer = explode('\n',$buffer); |
| 394 | 513 | foreach ($buffer as $line) { |
@@ -397,20 +516,41 @@ discard block |
||
| 397 | 516 | $data = array(); |
| 398 | 517 | $data['hex'] = $line[1]; // hex |
| 399 | 518 | $data['ident'] = $line[2]; // ident |
| 400 | - if (isset($line[3])) $data['altitude'] = $line[3]; // altitude |
|
| 401 | - if (isset($line[4])) $data['speed'] = $line[4]; // speed |
|
| 402 | - if (isset($line[5])) $data['heading'] = $line[5]; // heading |
|
| 403 | - if (isset($line[6])) $data['latitude'] = $line[6]; // lat |
|
| 404 | - if (isset($line[7])) $data['longitude'] = $line[7]; // long |
|
| 519 | + if (isset($line[3])) { |
|
| 520 | + $data['altitude'] = $line[3]; |
|
| 521 | + } |
|
| 522 | + // altitude |
|
| 523 | + if (isset($line[4])) { |
|
| 524 | + $data['speed'] = $line[4]; |
|
| 525 | + } |
|
| 526 | + // speed |
|
| 527 | + if (isset($line[5])) { |
|
| 528 | + $data['heading'] = $line[5]; |
|
| 529 | + } |
|
| 530 | + // heading |
|
| 531 | + if (isset($line[6])) { |
|
| 532 | + $data['latitude'] = $line[6]; |
|
| 533 | + } |
|
| 534 | + // lat |
|
| 535 | + if (isset($line[7])) { |
|
| 536 | + $data['longitude'] = $line[7]; |
|
| 537 | + } |
|
| 538 | + // long |
|
| 405 | 539 | $data['verticalrate'] = ''; // vertical rate |
| 406 | 540 | //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk |
| 407 | 541 | $data['emergency'] = ''; // emergency |
| 408 | 542 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 409 | 543 | $data['format_source'] = 'deltadbtxt'; |
| 410 | 544 | $data['id_source'] = $id_source; |
| 411 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 412 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 413 | - if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats']; |
|
| 545 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 546 | + $data['source_name'] = $value['name']; |
|
| 547 | + } |
|
| 548 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 549 | + $data['noarchive'] = true; |
|
| 550 | + } |
|
| 551 | + if (isset($value['sourcestats'])) { |
|
| 552 | + $data['sourcestats'] = $value['sourcestats']; |
|
| 553 | + } |
|
| 414 | 554 | $SI->add($data); |
| 415 | 555 | unset($data); |
| 416 | 556 | } |
@@ -425,7 +565,9 @@ discard block |
||
| 425 | 565 | date_default_timezone_set('CET'); |
| 426 | 566 | $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host'])); |
| 427 | 567 | date_default_timezone_set('UTC'); |
| 428 | - if ($buffer != '') $reset = 0; |
|
| 568 | + if ($buffer != '') { |
|
| 569 | + $reset = 0; |
|
| 570 | + } |
|
| 429 | 571 | $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
| 430 | 572 | $buffer = explode('\n',$buffer); |
| 431 | 573 | foreach ($buffer as $line) { |
@@ -434,16 +576,36 @@ discard block |
||
| 434 | 576 | $add = false; |
| 435 | 577 | $ais_data = $AIS->parse_line(trim($line)); |
| 436 | 578 | $data = array(); |
| 437 | - if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident']; |
|
| 438 | - if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi']; |
|
| 439 | - if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed']; |
|
| 440 | - if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading']; |
|
| 441 | - if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude']; |
|
| 442 | - if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude']; |
|
| 443 | - if (isset($ais_data['status'])) $data['status'] = $ais_data['status']; |
|
| 444 | - if (isset($ais_data['type'])) $data['type'] = $ais_data['type']; |
|
| 445 | - if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
|
| 446 | - if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
|
| 579 | + if (isset($ais_data['ident'])) { |
|
| 580 | + $data['ident'] = $ais_data['ident']; |
|
| 581 | + } |
|
| 582 | + if (isset($ais_data['mmsi'])) { |
|
| 583 | + $data['mmsi'] = $ais_data['mmsi']; |
|
| 584 | + } |
|
| 585 | + if (isset($ais_data['speed'])) { |
|
| 586 | + $data['speed'] = $ais_data['speed']; |
|
| 587 | + } |
|
| 588 | + if (isset($ais_data['heading'])) { |
|
| 589 | + $data['heading'] = $ais_data['heading']; |
|
| 590 | + } |
|
| 591 | + if (isset($ais_data['latitude'])) { |
|
| 592 | + $data['latitude'] = $ais_data['latitude']; |
|
| 593 | + } |
|
| 594 | + if (isset($ais_data['longitude'])) { |
|
| 595 | + $data['longitude'] = $ais_data['longitude']; |
|
| 596 | + } |
|
| 597 | + if (isset($ais_data['status'])) { |
|
| 598 | + $data['status'] = $ais_data['status']; |
|
| 599 | + } |
|
| 600 | + if (isset($ais_data['type'])) { |
|
| 601 | + $data['type'] = $ais_data['type']; |
|
| 602 | + } |
|
| 603 | + if (isset($ais_data['imo'])) { |
|
| 604 | + $data['imo'] = $ais_data['imo']; |
|
| 605 | + } |
|
| 606 | + if (isset($ais_data['callsign'])) { |
|
| 607 | + $data['callsign'] = $ais_data['callsign']; |
|
| 608 | + } |
|
| 447 | 609 | if (isset($ais_data['timestamp'])) { |
| 448 | 610 | $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
| 449 | 611 | if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) { |
@@ -457,8 +619,12 @@ discard block |
||
| 457 | 619 | $data['format_source'] = 'aisnmeatxt'; |
| 458 | 620 | $data['id_source'] = $id_source; |
| 459 | 621 | //print_r($data); |
| 460 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 461 | - if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data); |
|
| 622 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 623 | + $data['noarchive'] = true; |
|
| 624 | + } |
|
| 625 | + if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') { |
|
| 626 | + $MI->add($data); |
|
| 627 | + } |
|
| 462 | 628 | unset($data); |
| 463 | 629 | } |
| 464 | 630 | } |
@@ -478,20 +644,48 @@ discard block |
||
| 478 | 644 | if ($line != '') { |
| 479 | 645 | $ais_data = $AIS->parse_line(trim($line)); |
| 480 | 646 | $data = array(); |
| 481 | - if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident']; |
|
| 482 | - if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi']; |
|
| 483 | - if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed']; |
|
| 484 | - if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading']; |
|
| 485 | - if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude']; |
|
| 486 | - if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude']; |
|
| 487 | - if (isset($ais_data['status'])) $data['status'] = $ais_data['status']; |
|
| 488 | - if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid']; |
|
| 489 | - if (isset($ais_data['type'])) $data['type'] = $ais_data['type']; |
|
| 490 | - if (isset($ais_data['typeid'])) $data['type_id'] = $ais_data['typeid']; |
|
| 491 | - if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
|
| 492 | - if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
|
| 493 | - if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination']; |
|
| 494 | - if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); |
|
| 647 | + if (isset($ais_data['ident'])) { |
|
| 648 | + $data['ident'] = $ais_data['ident']; |
|
| 649 | + } |
|
| 650 | + if (isset($ais_data['mmsi'])) { |
|
| 651 | + $data['mmsi'] = $ais_data['mmsi']; |
|
| 652 | + } |
|
| 653 | + if (isset($ais_data['speed'])) { |
|
| 654 | + $data['speed'] = $ais_data['speed']; |
|
| 655 | + } |
|
| 656 | + if (isset($ais_data['heading'])) { |
|
| 657 | + $data['heading'] = $ais_data['heading']; |
|
| 658 | + } |
|
| 659 | + if (isset($ais_data['latitude'])) { |
|
| 660 | + $data['latitude'] = $ais_data['latitude']; |
|
| 661 | + } |
|
| 662 | + if (isset($ais_data['longitude'])) { |
|
| 663 | + $data['longitude'] = $ais_data['longitude']; |
|
| 664 | + } |
|
| 665 | + if (isset($ais_data['status'])) { |
|
| 666 | + $data['status'] = $ais_data['status']; |
|
| 667 | + } |
|
| 668 | + if (isset($ais_data['statusid'])) { |
|
| 669 | + $data['status_id'] = $ais_data['statusid']; |
|
| 670 | + } |
|
| 671 | + if (isset($ais_data['type'])) { |
|
| 672 | + $data['type'] = $ais_data['type']; |
|
| 673 | + } |
|
| 674 | + if (isset($ais_data['typeid'])) { |
|
| 675 | + $data['type_id'] = $ais_data['typeid']; |
|
| 676 | + } |
|
| 677 | + if (isset($ais_data['imo'])) { |
|
| 678 | + $data['imo'] = $ais_data['imo']; |
|
| 679 | + } |
|
| 680 | + if (isset($ais_data['callsign'])) { |
|
| 681 | + $data['callsign'] = $ais_data['callsign']; |
|
| 682 | + } |
|
| 683 | + if (isset($ais_data['destination'])) { |
|
| 684 | + $data['arrival_code'] = $ais_data['destination']; |
|
| 685 | + } |
|
| 686 | + if (isset($ais_data['eta_ts'])) { |
|
| 687 | + $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); |
|
| 688 | + } |
|
| 495 | 689 | if (isset($ais_data['timestamp'])) { |
| 496 | 690 | $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
| 497 | 691 | } else { |
@@ -499,18 +693,27 @@ discard block |
||
| 499 | 693 | } |
| 500 | 694 | $data['format_source'] = 'aisnmeahttp'; |
| 501 | 695 | $data['id_source'] = $id_source; |
| 502 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 503 | - if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data); |
|
| 696 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 697 | + $data['noarchive'] = true; |
|
| 698 | + } |
|
| 699 | + if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') { |
|
| 700 | + $MI->add($data); |
|
| 701 | + } |
|
| 504 | 702 | unset($data); |
| 505 | 703 | } |
| 506 | 704 | } |
| 507 | 705 | } |
| 508 | 706 | } else { |
| 509 | 707 | $format = $value['format']; |
| 510 | - if (isset($tt[$format])) $tt[$format]++; |
|
| 511 | - else $tt[$format] = 0; |
|
| 708 | + if (isset($tt[$format])) { |
|
| 709 | + $tt[$format]++; |
|
| 710 | + } else { |
|
| 711 | + $tt[$format] = 0; |
|
| 712 | + } |
|
| 512 | 713 | if ($tt[$format] > 30) { |
| 513 | - if ($globalDebug) echo 'Reconnect...'."\n"; |
|
| 714 | + if ($globalDebug) { |
|
| 715 | + echo 'Reconnect...'."\n"; |
|
| 716 | + } |
|
| 514 | 717 | sleep(2); |
| 515 | 718 | $sourceeen[] = $value; |
| 516 | 719 | connect_all($sourceeen); |
@@ -545,7 +748,9 @@ discard block |
||
| 545 | 748 | $data['datetime'] = date('Y-m-d H:i:s',$line['T']); |
| 546 | 749 | $data['format_source'] = 'myshiptracking'; |
| 547 | 750 | $data['id_source'] = $id_source; |
| 548 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 751 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 752 | + $data['noarchive'] = true; |
|
| 753 | + } |
|
| 549 | 754 | $MI->add($data); |
| 550 | 755 | unset($data); |
| 551 | 756 | } |
@@ -570,7 +775,9 @@ discard block |
||
| 570 | 775 | $data['callsign'] = $line['callsign']; |
| 571 | 776 | $data['mmsi'] = $line['mmsi']; |
| 572 | 777 | $data['speed'] = $line['sog']; |
| 573 | - if ($line['heading'] != '511') $data['heading'] = $line['heading']; |
|
| 778 | + if ($line['heading'] != '511') { |
|
| 779 | + $data['heading'] = $line['heading']; |
|
| 780 | + } |
|
| 574 | 781 | $data['latitude'] = $line['latitude']; |
| 575 | 782 | $data['longitude'] = $line['longitude']; |
| 576 | 783 | $data['type_id'] = $line['shiptype']; |
@@ -578,7 +785,9 @@ discard block |
||
| 578 | 785 | $data['datetime'] = $line['time']; |
| 579 | 786 | $data['format_source'] = 'boatbeaconapp'; |
| 580 | 787 | $data['id_source'] = $id_source; |
| 581 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 788 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 789 | + $data['noarchive'] = true; |
|
| 790 | + } |
|
| 582 | 791 | $MI->add($data); |
| 583 | 792 | unset($data); |
| 584 | 793 | } |
@@ -599,22 +808,44 @@ discard block |
||
| 599 | 808 | if (isset($all_data['features'][0]['id'])) { |
| 600 | 809 | foreach ($all_data['features'] as $line) { |
| 601 | 810 | $data = array(); |
| 602 | - if (isset($line['properties']['name'])) $data['ident'] = $line['properties']['name']; |
|
| 603 | - if (isset($line['properties']['callsign'])) $data['callsign'] = $line['properties']['callsign']; |
|
| 604 | - if (isset($line['properties']['mmsi'])) $data['mmsi'] = $line['properties']['mmsi']; |
|
| 605 | - if (isset($line['properties']['imo'])) $data['mmsi'] = $line['properties']['imo']; |
|
| 606 | - if (isset($line['properties']['speed'])) $data['speed'] = $line['properties']['speed']; |
|
| 607 | - if (isset($line['properties']['heading'])) $data['heading'] = $line['properties']['heading']; |
|
| 811 | + if (isset($line['properties']['name'])) { |
|
| 812 | + $data['ident'] = $line['properties']['name']; |
|
| 813 | + } |
|
| 814 | + if (isset($line['properties']['callsign'])) { |
|
| 815 | + $data['callsign'] = $line['properties']['callsign']; |
|
| 816 | + } |
|
| 817 | + if (isset($line['properties']['mmsi'])) { |
|
| 818 | + $data['mmsi'] = $line['properties']['mmsi']; |
|
| 819 | + } |
|
| 820 | + if (isset($line['properties']['imo'])) { |
|
| 821 | + $data['mmsi'] = $line['properties']['imo']; |
|
| 822 | + } |
|
| 823 | + if (isset($line['properties']['speed'])) { |
|
| 824 | + $data['speed'] = $line['properties']['speed']; |
|
| 825 | + } |
|
| 826 | + if (isset($line['properties']['heading'])) { |
|
| 827 | + $data['heading'] = $line['properties']['heading']; |
|
| 828 | + } |
|
| 608 | 829 | $data['latitude'] = $line['geometry']['coordinates'][1]; |
| 609 | 830 | $data['longitude'] = $line['geometry']['coordinates'][0]; |
| 610 | - if (isset($line['properties']['vesselType'])) $data['type'] = $line['properties']['vesselType']; |
|
| 611 | - if (isset($line['properties']['destination'])) $data['arrival_code'] = $line['properties']['destination']; |
|
| 612 | - if (isset($line['properties']['eta']) && $line['properties']['eta'] != '') $data['arrival_date'] = $line['properties']['eta']; |
|
| 831 | + if (isset($line['properties']['vesselType'])) { |
|
| 832 | + $data['type'] = $line['properties']['vesselType']; |
|
| 833 | + } |
|
| 834 | + if (isset($line['properties']['destination'])) { |
|
| 835 | + $data['arrival_code'] = $line['properties']['destination']; |
|
| 836 | + } |
|
| 837 | + if (isset($line['properties']['eta']) && $line['properties']['eta'] != '') { |
|
| 838 | + $data['arrival_date'] = $line['properties']['eta']; |
|
| 839 | + } |
|
| 613 | 840 | $data['format_source'] = 'boatnerd'; |
| 614 | 841 | $data['id_source'] = $id_source; |
| 615 | 842 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 616 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 617 | - if ($line['properties']['vesselType'] != 'Navigation Aid') $MI->add($data); |
|
| 843 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 844 | + $data['noarchive'] = true; |
|
| 845 | + } |
|
| 846 | + if ($line['properties']['vesselType'] != 'Navigation Aid') { |
|
| 847 | + $MI->add($data); |
|
| 848 | + } |
|
| 618 | 849 | unset($data); |
| 619 | 850 | } |
| 620 | 851 | } |
@@ -630,7 +861,9 @@ discard block |
||
| 630 | 861 | echo 'download...'; |
| 631 | 862 | $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter'); |
| 632 | 863 | echo 'done !'."\n"; |
| 633 | - if ($buffer != '') $reset = 0; |
|
| 864 | + if ($buffer != '') { |
|
| 865 | + $reset = 0; |
|
| 866 | + } |
|
| 634 | 867 | $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
| 635 | 868 | $buffer = explode('\n',$buffer); |
| 636 | 869 | foreach ($buffer as $line) { |
@@ -655,7 +888,9 @@ discard block |
||
| 655 | 888 | //$data['etaTime'] = substr($line,135,5); |
| 656 | 889 | $data['format_source'] = 'shipplotter'; |
| 657 | 890 | $data['id_source'] = $id_source; |
| 658 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 891 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 892 | + $data['noarchive'] = true; |
|
| 893 | + } |
|
| 659 | 894 | //print_r($data); |
| 660 | 895 | echo 'Add...'."\n"; |
| 661 | 896 | $MI->add($data); |
@@ -689,16 +924,28 @@ discard block |
||
| 689 | 924 | $line = explode(':', $line); |
| 690 | 925 | if (count($line) > 30 && $line[0] != 'callsign') { |
| 691 | 926 | $data = array(); |
| 692 | - if (isset($line[37]) && $line[37] != '') $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37]; |
|
| 693 | - else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0]; |
|
| 927 | + if (isset($line[37]) && $line[37] != '') { |
|
| 928 | + $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37]; |
|
| 929 | + } else { |
|
| 930 | + $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0]; |
|
| 931 | + } |
|
| 694 | 932 | $data['pilot_id'] = $line[1]; |
| 695 | 933 | $data['pilot_name'] = $line[2]; |
| 696 | 934 | $data['hex'] = str_pad(dechex($Common->str2int($line[1])),6,'000000',STR_PAD_LEFT); |
| 697 | 935 | $data['ident'] = $line[0]; // ident |
| 698 | - if ($line[7] != '' && $line[7] != 0) $data['altitude'] = $line[7]; // altitude |
|
| 936 | + if ($line[7] != '' && $line[7] != 0) { |
|
| 937 | + $data['altitude'] = $line[7]; |
|
| 938 | + } |
|
| 939 | + // altitude |
|
| 699 | 940 | $data['speed'] = $line[8]; // speed |
| 700 | - if (isset($line[45])) $data['heading'] = $line[45]; // heading |
|
| 701 | - elseif (isset($line[38])) $data['heading'] = $line[38]; // heading |
|
| 941 | + if (isset($line[45])) { |
|
| 942 | + $data['heading'] = $line[45]; |
|
| 943 | + } |
|
| 944 | + // heading |
|
| 945 | + elseif (isset($line[38])) { |
|
| 946 | + $data['heading'] = $line[38]; |
|
| 947 | + } |
|
| 948 | + // heading |
|
| 702 | 949 | $data['latitude'] = $line[5]; // lat |
| 703 | 950 | $data['longitude'] = $line[6]; // long |
| 704 | 951 | $data['verticalrate'] = ''; // vertical rate |
@@ -714,7 +961,9 @@ discard block |
||
| 714 | 961 | $data['frequency'] = $line[4]; |
| 715 | 962 | $data['type'] = $line[18]; |
| 716 | 963 | $data['range'] = $line[19]; |
| 717 | - if (isset($line[35])) $data['info'] = $line[35]; |
|
| 964 | + if (isset($line[35])) { |
|
| 965 | + $data['info'] = $line[35]; |
|
| 966 | + } |
|
| 718 | 967 | $data['id_source'] = $id_source; |
| 719 | 968 | //$data['arrival_airport_time'] = ; |
| 720 | 969 | if ($line[9] != '') { |
@@ -728,27 +977,47 @@ discard block |
||
| 728 | 977 | elseif ($value == 'vatsimtxt') $data['format_source'] = 'vatsimtxt'; |
| 729 | 978 | */ |
| 730 | 979 | $data['format_source'] = $value['format']; |
| 731 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 732 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 733 | - if ($line[3] == 'PILOT') $SI->add($data); |
|
| 734 | - elseif ($line[3] == 'ATC') { |
|
| 980 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 981 | + $data['noarchive'] = true; |
|
| 982 | + } |
|
| 983 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 984 | + $data['source_name'] = $value['name']; |
|
| 985 | + } |
|
| 986 | + if ($line[3] == 'PILOT') { |
|
| 987 | + $SI->add($data); |
|
| 988 | + } elseif ($line[3] == 'ATC') { |
|
| 735 | 989 | //print_r($data); |
| 736 | 990 | $data['info'] = str_replace('^§','<br />',$data['info']); |
| 737 | 991 | $data['info'] = str_replace('&sect;','',$data['info']); |
| 738 | 992 | $typec = substr($data['ident'],-3); |
| 739 | - if ($typec == 'APP') $data['type'] = 'Approach'; |
|
| 740 | - elseif ($typec == 'TWR') $data['type'] = 'Tower'; |
|
| 741 | - elseif ($typec == 'OBS') $data['type'] = 'Observer'; |
|
| 742 | - elseif ($typec == 'GND') $data['type'] = 'Ground'; |
|
| 743 | - elseif ($typec == 'DEL') $data['type'] = 'Delivery'; |
|
| 744 | - elseif ($typec == 'DEP') $data['type'] = 'Departure'; |
|
| 745 | - elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station'; |
|
| 746 | - elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre'; |
|
| 747 | - elseif ($data['type'] == '') $data['type'] = 'Observer'; |
|
| 748 | - if (!isset($data['source_name'])) $data['source_name'] = ''; |
|
| 993 | + if ($typec == 'APP') { |
|
| 994 | + $data['type'] = 'Approach'; |
|
| 995 | + } elseif ($typec == 'TWR') { |
|
| 996 | + $data['type'] = 'Tower'; |
|
| 997 | + } elseif ($typec == 'OBS') { |
|
| 998 | + $data['type'] = 'Observer'; |
|
| 999 | + } elseif ($typec == 'GND') { |
|
| 1000 | + $data['type'] = 'Ground'; |
|
| 1001 | + } elseif ($typec == 'DEL') { |
|
| 1002 | + $data['type'] = 'Delivery'; |
|
| 1003 | + } elseif ($typec == 'DEP') { |
|
| 1004 | + $data['type'] = 'Departure'; |
|
| 1005 | + } elseif ($typec == 'FSS') { |
|
| 1006 | + $data['type'] = 'Flight Service Station'; |
|
| 1007 | + } elseif ($typec == 'CTR') { |
|
| 1008 | + $data['type'] = 'Control Radar or Centre'; |
|
| 1009 | + } elseif ($data['type'] == '') { |
|
| 1010 | + $data['type'] = 'Observer'; |
|
| 1011 | + } |
|
| 1012 | + if (!isset($data['source_name'])) { |
|
| 1013 | + $data['source_name'] = ''; |
|
| 1014 | + } |
|
| 749 | 1015 | if (isset($ATC)) { |
| 750 | - if (count($ATC->getByIdent($data['ident'],$data['format_source'])) > 0) echo $ATC->update($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']); |
|
| 751 | - else echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']); |
|
| 1016 | + if (count($ATC->getByIdent($data['ident'],$data['format_source'])) > 0) { |
|
| 1017 | + echo $ATC->update($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']); |
|
| 1018 | + } else { |
|
| 1019 | + echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']); |
|
| 1020 | + } |
|
| 752 | 1021 | } |
| 753 | 1022 | } |
| 754 | 1023 | unset($data); |
@@ -775,14 +1044,20 @@ discard block |
||
| 775 | 1044 | $data['datetime'] = date('Y-m-d H:i:s',strtotime((string)$line['entryTime'].' BST')); |
| 776 | 1045 | $data['latitude'] = (float)$line['pktLatitude']; |
| 777 | 1046 | $data['longitude'] = (float)$line['pktLongitude']; |
| 778 | - if ((float)$line['pktTrack'] != 0) $data['heading'] = (float)$line['pktTrack']; |
|
| 779 | - if ((int)$line['pktSpeed'] != 0) $data['speed'] = (int)$line['pktSpeed']; |
|
| 1047 | + if ((float)$line['pktTrack'] != 0) { |
|
| 1048 | + $data['heading'] = (float)$line['pktTrack']; |
|
| 1049 | + } |
|
| 1050 | + if ((int)$line['pktSpeed'] != 0) { |
|
| 1051 | + $data['speed'] = (int)$line['pktSpeed']; |
|
| 1052 | + } |
|
| 780 | 1053 | $data['altitude'] = round((int)$line['pktAltitude']*3.28084); |
| 781 | 1054 | $data['altitude_relative'] = 'AMSL'; |
| 782 | 1055 | $data['pilot_id'] = (int)$line['pktPilotID']; |
| 783 | 1056 | $data['aircraft_icao'] = 'PARAGLIDER'; |
| 784 | 1057 | $pilot_data = explode(',',$Common->getData('http://www.airwhere.co.uk/pilotdetails.php?pilot='.$data['pilot_id'])); |
| 785 | - if (isset($pilot_data[4])) $data['pilot_name'] = $pilot_data[4]; |
|
| 1058 | + if (isset($pilot_data[4])) { |
|
| 1059 | + $data['pilot_name'] = $pilot_data[4]; |
|
| 1060 | + } |
|
| 786 | 1061 | $data['format_source'] = $value['format']; |
| 787 | 1062 | $SI->add($data); |
| 788 | 1063 | unset($data); |
@@ -830,25 +1105,59 @@ discard block |
||
| 830 | 1105 | foreach ($all_data['acList'] as $line) { |
| 831 | 1106 | $data = array(); |
| 832 | 1107 | $data['hex'] = $line['Icao']; // hex |
| 833 | - if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident |
|
| 834 | - if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude |
|
| 835 | - if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed |
|
| 836 | - if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading |
|
| 837 | - if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat |
|
| 838 | - if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long |
|
| 1108 | + if (isset($line['Call'])) { |
|
| 1109 | + $data['ident'] = $line['Call']; |
|
| 1110 | + } |
|
| 1111 | + // ident |
|
| 1112 | + if (isset($line['Alt'])) { |
|
| 1113 | + $data['altitude'] = $line['Alt']; |
|
| 1114 | + } |
|
| 1115 | + // altitude |
|
| 1116 | + if (isset($line['Spd'])) { |
|
| 1117 | + $data['speed'] = $line['Spd']; |
|
| 1118 | + } |
|
| 1119 | + // speed |
|
| 1120 | + if (isset($line['Trak'])) { |
|
| 1121 | + $data['heading'] = $line['Trak']; |
|
| 1122 | + } |
|
| 1123 | + // heading |
|
| 1124 | + if (isset($line['Lat'])) { |
|
| 1125 | + $data['latitude'] = $line['Lat']; |
|
| 1126 | + } |
|
| 1127 | + // lat |
|
| 1128 | + if (isset($line['Long'])) { |
|
| 1129 | + $data['longitude'] = $line['Long']; |
|
| 1130 | + } |
|
| 1131 | + // long |
|
| 839 | 1132 | //$data['verticalrate'] = $line['']; // verticale rate |
| 840 | - if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk |
|
| 1133 | + if (isset($line['Sqk'])) { |
|
| 1134 | + $data['squawk'] = $line['Sqk']; |
|
| 1135 | + } |
|
| 1136 | + // squawk |
|
| 841 | 1137 | $data['emergency'] = ''; // emergency |
| 842 | - if (isset($line['Reg'])) $data['registration'] = $line['Reg']; |
|
| 843 | - if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); |
|
| 844 | - else $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1138 | + if (isset($line['Reg'])) { |
|
| 1139 | + $data['registration'] = $line['Reg']; |
|
| 1140 | + } |
|
| 1141 | + if (isset($line['PosTime'])) { |
|
| 1142 | + $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); |
|
| 1143 | + } else { |
|
| 1144 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1145 | + } |
|
| 845 | 1146 | //$data['datetime'] = date('Y-m-d H:i:s'); |
| 846 | - if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type']; |
|
| 1147 | + if (isset($line['Type'])) { |
|
| 1148 | + $data['aircraft_icao'] = $line['Type']; |
|
| 1149 | + } |
|
| 847 | 1150 | $data['format_source'] = 'aircraftlistjson'; |
| 848 | 1151 | $data['id_source'] = $id_source; |
| 849 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 850 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 851 | - if (isset($data['latitude'])) $SI->add($data); |
|
| 1152 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 1153 | + $data['source_name'] = $value['name']; |
|
| 1154 | + } |
|
| 1155 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 1156 | + $data['noarchive'] = true; |
|
| 1157 | + } |
|
| 1158 | + if (isset($data['latitude'])) { |
|
| 1159 | + $SI->add($data); |
|
| 1160 | + } |
|
| 852 | 1161 | unset($data); |
| 853 | 1162 | } |
| 854 | 1163 | } elseif (is_array($all_data)) { |
@@ -865,17 +1174,26 @@ discard block |
||
| 865 | 1174 | $data['verticalrate'] = $line['vrt']; // verticale rate |
| 866 | 1175 | $data['squawk'] = $line['squawk']; // squawk |
| 867 | 1176 | $data['emergency'] = ''; // emergency |
| 868 | - if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); |
|
| 869 | - else $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1177 | + if (isset($line['PosTime'])) { |
|
| 1178 | + $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); |
|
| 1179 | + } else { |
|
| 1180 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1181 | + } |
|
| 870 | 1182 | $data['format_source'] = 'aircraftlistjson'; |
| 871 | 1183 | $data['id_source'] = $id_source; |
| 872 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 873 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1184 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 1185 | + $data['noarchive'] = true; |
|
| 1186 | + } |
|
| 1187 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 1188 | + $data['source_name'] = $value['name']; |
|
| 1189 | + } |
|
| 874 | 1190 | $SI->add($data); |
| 875 | 1191 | unset($data); |
| 876 | 1192 | } |
| 877 | 1193 | } |
| 878 | - } elseif ($globalDebug) echo 'No data'."\n"; |
|
| 1194 | + } elseif ($globalDebug) { |
|
| 1195 | + echo 'No data'."\n"; |
|
| 1196 | + } |
|
| 879 | 1197 | //$last_exec['aircraftlistjson'] = time(); |
| 880 | 1198 | $last_exec[$id]['last'] = time(); |
| 881 | 1199 | //} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) { |
@@ -911,8 +1229,12 @@ discard block |
||
| 911 | 1229 | $data['datetime'] = date('Y-m-d H:i:s',$line[9]); |
| 912 | 1230 | $data['format_source'] = 'planeupdatefaa'; |
| 913 | 1231 | $data['id_source'] = $id_source; |
| 914 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 915 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1232 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 1233 | + $data['noarchive'] = true; |
|
| 1234 | + } |
|
| 1235 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 1236 | + $data['source_name'] = $value['name']; |
|
| 1237 | + } |
|
| 916 | 1238 | $SI->add($data); |
| 917 | 1239 | unset($data); |
| 918 | 1240 | } |
@@ -946,7 +1268,9 @@ discard block |
||
| 946 | 1268 | $data['datetime'] = date('Y-m-d H:i:s',$line[3]); |
| 947 | 1269 | $data['format_source'] = 'opensky'; |
| 948 | 1270 | $data['id_source'] = $id_source; |
| 949 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1271 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 1272 | + $data['noarchive'] = true; |
|
| 1273 | + } |
|
| 950 | 1274 | $SI->add($data); |
| 951 | 1275 | unset($data); |
| 952 | 1276 | } |
@@ -963,7 +1287,9 @@ discard block |
||
| 963 | 1287 | //$buffer = $Common->getData($hosts[$id]); |
| 964 | 1288 | $buffer = $Common->getData($value['host']); |
| 965 | 1289 | $all_data = json_decode($buffer,true); |
| 966 | - if (!empty($all_data)) $reset = 0; |
|
| 1290 | + if (!empty($all_data)) { |
|
| 1291 | + $reset = 0; |
|
| 1292 | + } |
|
| 967 | 1293 | foreach ($all_data as $key => $line) { |
| 968 | 1294 | if ($key != 'full_count' && $key != 'version' && $key != 'stats') { |
| 969 | 1295 | $data = array(); |
@@ -984,8 +1310,12 @@ discard block |
||
| 984 | 1310 | $data['datetime'] = date('Y-m-d H:i:s'); //$line[10] |
| 985 | 1311 | $data['format_source'] = 'fr24json'; |
| 986 | 1312 | $data['id_source'] = $id_source; |
| 987 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 988 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1313 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 1314 | + $data['noarchive'] = true; |
|
| 1315 | + } |
|
| 1316 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 1317 | + $data['source_name'] = $value['name']; |
|
| 1318 | + } |
|
| 989 | 1319 | $SI->add($data); |
| 990 | 1320 | unset($data); |
| 991 | 1321 | } |
@@ -1014,24 +1344,42 @@ discard block |
||
| 1014 | 1344 | if (isset($line['inf'])) { |
| 1015 | 1345 | $data = array(); |
| 1016 | 1346 | $data['hex'] = $line['inf']['ia']; |
| 1017 | - if (isset($line['inf']['cs'])) $data['ident'] = $line['inf']['cs']; //$line[13] |
|
| 1347 | + if (isset($line['inf']['cs'])) { |
|
| 1348 | + $data['ident'] = $line['inf']['cs']; |
|
| 1349 | + } |
|
| 1350 | + //$line[13] |
|
| 1018 | 1351 | $data['altitude'] = round($line['inf']['al']*3.28084); // altitude |
| 1019 | - if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed |
|
| 1020 | - if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading |
|
| 1352 | + if (isset($line['inf']['gs'])) { |
|
| 1353 | + $data['speed'] = round($line['inf']['gs']*0.539957); |
|
| 1354 | + } |
|
| 1355 | + // speed |
|
| 1356 | + if (isset($line['inf']['tr'])) { |
|
| 1357 | + $data['heading'] = $line['inf']['tr']; |
|
| 1358 | + } |
|
| 1359 | + // heading |
|
| 1021 | 1360 | $data['latitude'] = $line['pt'][0]; // lat |
| 1022 | 1361 | $data['longitude'] = $line['pt'][1]; // long |
| 1023 | 1362 | //if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate |
| 1024 | - if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk |
|
| 1363 | + if (isset($line['inf']['sq'])) { |
|
| 1364 | + $data['squawk'] = $line['inf']['sq']; |
|
| 1365 | + } |
|
| 1366 | + // squawk |
|
| 1025 | 1367 | //$data['aircraft_icao'] = $line[8]; |
| 1026 | - if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc']; |
|
| 1368 | + if (isset($line['inf']['rc'])) { |
|
| 1369 | + $data['registration'] = $line['inf']['rc']; |
|
| 1370 | + } |
|
| 1027 | 1371 | //$data['departure_airport_iata'] = $line[11]; |
| 1028 | 1372 | //$data['arrival_airport_iata'] = $line[12]; |
| 1029 | 1373 | //$data['emergency'] = ''; // emergency |
| 1030 | 1374 | $data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10] |
| 1031 | 1375 | $data['format_source'] = 'radarvirtueljson'; |
| 1032 | 1376 | $data['id_source'] = $id_source; |
| 1033 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1034 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1377 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 1378 | + $data['noarchive'] = true; |
|
| 1379 | + } |
|
| 1380 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 1381 | + $data['source_name'] = $value['name']; |
|
| 1382 | + } |
|
| 1035 | 1383 | $SI->add($data); |
| 1036 | 1384 | unset($data); |
| 1037 | 1385 | } |
@@ -1057,30 +1405,65 @@ discard block |
||
| 1057 | 1405 | $data['id'] = $line['id']; |
| 1058 | 1406 | $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6); |
| 1059 | 1407 | $data['ident'] = $line['callsign']; // ident |
| 1060 | - if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id |
|
| 1061 | - if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name |
|
| 1062 | - if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude |
|
| 1063 | - if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed |
|
| 1064 | - if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading |
|
| 1065 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 1408 | + if (isset($line['pilotid'])) { |
|
| 1409 | + $data['pilot_id'] = $line['pilotid']; |
|
| 1410 | + } |
|
| 1411 | + // pilot id |
|
| 1412 | + if (isset($line['name'])) { |
|
| 1413 | + $data['pilot_name'] = $line['name']; |
|
| 1414 | + } |
|
| 1415 | + // pilot name |
|
| 1416 | + if (isset($line['alt'])) { |
|
| 1417 | + $data['altitude'] = $line['alt']; |
|
| 1418 | + } |
|
| 1419 | + // altitude |
|
| 1420 | + if (isset($line['gs'])) { |
|
| 1421 | + $data['speed'] = $line['gs']; |
|
| 1422 | + } |
|
| 1423 | + // speed |
|
| 1424 | + if (isset($line['heading'])) { |
|
| 1425 | + $data['heading'] = $line['heading']; |
|
| 1426 | + } |
|
| 1427 | + // heading |
|
| 1428 | + if (isset($line['route'])) { |
|
| 1429 | + $data['waypoints'] = $line['route']; |
|
| 1430 | + } |
|
| 1431 | + // route |
|
| 1066 | 1432 | $data['latitude'] = $line['lat']; // lat |
| 1067 | 1433 | $data['longitude'] = $line['lon']; // long |
| 1068 | 1434 | //$data['verticalrate'] = $line['vrt']; // verticale rate |
| 1069 | 1435 | //$data['squawk'] = $line['squawk']; // squawk |
| 1070 | 1436 | //$data['emergency'] = ''; // emergency |
| 1071 | - if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao']; |
|
| 1072 | - if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime']; |
|
| 1073 | - if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao']; |
|
| 1437 | + if (isset($line['depicao'])) { |
|
| 1438 | + $data['departure_airport_icao'] = $line['depicao']; |
|
| 1439 | + } |
|
| 1440 | + if (isset($line['deptime'])) { |
|
| 1441 | + $data['departure_airport_time'] = $line['deptime']; |
|
| 1442 | + } |
|
| 1443 | + if (isset($line['arricao'])) { |
|
| 1444 | + $data['arrival_airport_icao'] = $line['arricao']; |
|
| 1445 | + } |
|
| 1074 | 1446 | //$data['arrival_airport_time'] = $line['arrtime']; |
| 1075 | - if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft']; |
|
| 1076 | - if (isset($line['transponder'])) $data['squawk'] = $line['transponder']; |
|
| 1077 | - if (isset($line['atis'])) $data['info'] = $line['atis']; |
|
| 1078 | - else $data['info'] = ''; |
|
| 1447 | + if (isset($line['aircraft'])) { |
|
| 1448 | + $data['aircraft_icao'] = $line['aircraft']; |
|
| 1449 | + } |
|
| 1450 | + if (isset($line['transponder'])) { |
|
| 1451 | + $data['squawk'] = $line['transponder']; |
|
| 1452 | + } |
|
| 1453 | + if (isset($line['atis'])) { |
|
| 1454 | + $data['info'] = $line['atis']; |
|
| 1455 | + } else { |
|
| 1456 | + $data['info'] = ''; |
|
| 1457 | + } |
|
| 1079 | 1458 | $data['format_source'] = 'pireps'; |
| 1080 | 1459 | $data['id_source'] = $id_source; |
| 1081 | 1460 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 1082 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1083 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1461 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 1462 | + $data['noarchive'] = true; |
|
| 1463 | + } |
|
| 1464 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 1465 | + $data['source_name'] = $value['name']; |
|
| 1466 | + } |
|
| 1084 | 1467 | if ($line['icon'] == 'plane') { |
| 1085 | 1468 | $SI->add($data); |
| 1086 | 1469 | // print_r($data); |
@@ -1089,16 +1472,28 @@ discard block |
||
| 1089 | 1472 | $data['info'] = str_replace('&sect;','',$data['info']); |
| 1090 | 1473 | $typec = substr($data['ident'],-3); |
| 1091 | 1474 | $data['type'] = ''; |
| 1092 | - if ($typec == 'APP') $data['type'] = 'Approach'; |
|
| 1093 | - elseif ($typec == 'TWR') $data['type'] = 'Tower'; |
|
| 1094 | - elseif ($typec == 'OBS') $data['type'] = 'Observer'; |
|
| 1095 | - elseif ($typec == 'GND') $data['type'] = 'Ground'; |
|
| 1096 | - elseif ($typec == 'DEL') $data['type'] = 'Delivery'; |
|
| 1097 | - elseif ($typec == 'DEP') $data['type'] = 'Departure'; |
|
| 1098 | - elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station'; |
|
| 1099 | - elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre'; |
|
| 1100 | - else $data['type'] = 'Observer'; |
|
| 1101 | - if (isset($ATC)) echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']); |
|
| 1475 | + if ($typec == 'APP') { |
|
| 1476 | + $data['type'] = 'Approach'; |
|
| 1477 | + } elseif ($typec == 'TWR') { |
|
| 1478 | + $data['type'] = 'Tower'; |
|
| 1479 | + } elseif ($typec == 'OBS') { |
|
| 1480 | + $data['type'] = 'Observer'; |
|
| 1481 | + } elseif ($typec == 'GND') { |
|
| 1482 | + $data['type'] = 'Ground'; |
|
| 1483 | + } elseif ($typec == 'DEL') { |
|
| 1484 | + $data['type'] = 'Delivery'; |
|
| 1485 | + } elseif ($typec == 'DEP') { |
|
| 1486 | + $data['type'] = 'Departure'; |
|
| 1487 | + } elseif ($typec == 'FSS') { |
|
| 1488 | + $data['type'] = 'Flight Service Station'; |
|
| 1489 | + } elseif ($typec == 'CTR') { |
|
| 1490 | + $data['type'] = 'Control Radar or Centre'; |
|
| 1491 | + } else { |
|
| 1492 | + $data['type'] = 'Observer'; |
|
| 1493 | + } |
|
| 1494 | + if (isset($ATC)) { |
|
| 1495 | + echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']); |
|
| 1496 | + } |
|
| 1102 | 1497 | } |
| 1103 | 1498 | unset($data); |
| 1104 | 1499 | } |
@@ -1113,7 +1508,9 @@ discard block |
||
| 1113 | 1508 | ) |
| 1114 | 1509 | ) { |
| 1115 | 1510 | //$buffer = $Common->getData($hosts[$id]); |
| 1116 | - if ($globalDebug) echo 'Get Data...'."\n"; |
|
| 1511 | + if ($globalDebug) { |
|
| 1512 | + echo 'Get Data...'."\n"; |
|
| 1513 | + } |
|
| 1117 | 1514 | $buffer = $Common->getData($value['host']); |
| 1118 | 1515 | $all_data = json_decode($buffer,true); |
| 1119 | 1516 | if ($buffer != '' && is_array($all_data)) { |
@@ -1121,10 +1518,16 @@ discard block |
||
| 1121 | 1518 | foreach ($all_data as $line) { |
| 1122 | 1519 | $data = array(); |
| 1123 | 1520 | //$data['id'] = $line['id']; // id not usable |
| 1124 | - if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum']; |
|
| 1521 | + if (isset($line['pilotid'])) { |
|
| 1522 | + $data['id'] = $line['pilotid'].$line['flightnum']; |
|
| 1523 | + } |
|
| 1125 | 1524 | $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex |
| 1126 | - if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname']; |
|
| 1127 | - if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; |
|
| 1525 | + if (isset($line['pilotname'])) { |
|
| 1526 | + $data['pilot_name'] = $line['pilotname']; |
|
| 1527 | + } |
|
| 1528 | + if (isset($line['pilotid'])) { |
|
| 1529 | + $data['pilot_id'] = $line['pilotid']; |
|
| 1530 | + } |
|
| 1128 | 1531 | $data['ident'] = $line['flightnum']; // ident |
| 1129 | 1532 | $data['altitude'] = $line['alt']; // altitude |
| 1130 | 1533 | $data['speed'] = $line['gs']; // speed |
@@ -1140,34 +1543,52 @@ discard block |
||
| 1140 | 1543 | $datetime = new DateTime($line['lastupdate'],new DateTimeZone($value['timezone'])); |
| 1141 | 1544 | $datetime->setTimeZone(new DateTimeZone('UTC')); |
| 1142 | 1545 | $data['datetime'] = $datetime->format('Y-m-d H:i:s'); |
| 1143 | - } else $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1546 | + } else { |
|
| 1547 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1548 | + } |
|
| 1144 | 1549 | $data['departure_airport_icao'] = $line['depicao']; |
| 1145 | 1550 | $data['departure_airport_time'] = $line['deptime']; |
| 1146 | 1551 | $data['arrival_airport_icao'] = $line['arricao']; |
| 1147 | 1552 | $data['arrival_airport_time'] = $line['arrtime']; |
| 1148 | 1553 | $data['registration'] = $line['aircraft']; |
| 1149 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1150 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 1554 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 1555 | + $data['noarchive'] = true; |
|
| 1556 | + } |
|
| 1557 | + if (isset($line['route'])) { |
|
| 1558 | + $data['waypoints'] = $line['route']; |
|
| 1559 | + } |
|
| 1560 | + // route |
|
| 1151 | 1561 | if (isset($line['aircraftname'])) { |
| 1152 | 1562 | $line['aircraftname'] = strtoupper($line['aircraftname']); |
| 1153 | 1563 | $line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']); |
| 1154 | 1564 | $aircraft_data = explode('-',$line['aircraftname']); |
| 1155 | - if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0]; |
|
| 1156 | - elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1]; |
|
| 1157 | - else { |
|
| 1565 | + if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) { |
|
| 1566 | + $data['aircraft_icao'] = $aircraft_data[0]; |
|
| 1567 | + } elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) { |
|
| 1568 | + $data['aircraft_icao'] = $aircraft_data[1]; |
|
| 1569 | + } else { |
|
| 1158 | 1570 | $aircraft_data = explode(' ',$line['aircraftname']); |
| 1159 | - if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]); |
|
| 1160 | - else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']); |
|
| 1571 | + if (isset($aircraft_data[1])) { |
|
| 1572 | + $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]); |
|
| 1573 | + } else { |
|
| 1574 | + $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']); |
|
| 1575 | + } |
|
| 1161 | 1576 | } |
| 1162 | 1577 | } |
| 1163 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; |
|
| 1578 | + if (isset($line['route'])) { |
|
| 1579 | + $data['waypoints'] = $line['route']; |
|
| 1580 | + } |
|
| 1164 | 1581 | $data['id_source'] = $id_source; |
| 1165 | 1582 | $data['format_source'] = 'phpvmacars'; |
| 1166 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1583 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 1584 | + $data['source_name'] = $value['name']; |
|
| 1585 | + } |
|
| 1167 | 1586 | $SI->add($data); |
| 1168 | 1587 | unset($data); |
| 1169 | 1588 | } |
| 1170 | - if ($globalDebug) echo 'No more data...'."\n"; |
|
| 1589 | + if ($globalDebug) { |
|
| 1590 | + echo 'No more data...'."\n"; |
|
| 1591 | + } |
|
| 1171 | 1592 | unset($buffer); |
| 1172 | 1593 | unset($all_data); |
| 1173 | 1594 | } |
@@ -1180,7 +1601,9 @@ discard block |
||
| 1180 | 1601 | ) |
| 1181 | 1602 | ) { |
| 1182 | 1603 | //$buffer = $Common->getData($hosts[$id]); |
| 1183 | - if ($globalDebug) echo 'Get Data...'."\n"; |
|
| 1604 | + if ($globalDebug) { |
|
| 1605 | + echo 'Get Data...'."\n"; |
|
| 1606 | + } |
|
| 1184 | 1607 | $buffer = $Common->getData($value['host']); |
| 1185 | 1608 | $all_data = json_decode($buffer,true); |
| 1186 | 1609 | if ($buffer != '' && is_array($all_data)) { |
@@ -1209,16 +1632,25 @@ discard block |
||
| 1209 | 1632 | $data['arrival_airport_icao'] = $line['arrival']; |
| 1210 | 1633 | //$data['arrival_airport_time'] = $line['arrival_time']; |
| 1211 | 1634 | //$data['registration'] = $line['aircraft']; |
| 1212 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 1635 | + if (isset($line['route'])) { |
|
| 1636 | + $data['waypoints'] = $line['route']; |
|
| 1637 | + } |
|
| 1638 | + // route |
|
| 1213 | 1639 | $data['aircraft_icao'] = $line['plane_type']; |
| 1214 | 1640 | $data['id_source'] = $id_source; |
| 1215 | 1641 | $data['format_source'] = 'vam'; |
| 1216 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1217 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1642 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 1643 | + $data['noarchive'] = true; |
|
| 1644 | + } |
|
| 1645 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 1646 | + $data['source_name'] = $value['name']; |
|
| 1647 | + } |
|
| 1218 | 1648 | $SI->add($data); |
| 1219 | 1649 | unset($data); |
| 1220 | 1650 | } |
| 1221 | - if ($globalDebug) echo 'No more data...'."\n"; |
|
| 1651 | + if ($globalDebug) { |
|
| 1652 | + echo 'No more data...'."\n"; |
|
| 1653 | + } |
|
| 1222 | 1654 | unset($buffer); |
| 1223 | 1655 | unset($all_data); |
| 1224 | 1656 | } |
@@ -1231,7 +1663,9 @@ discard block |
||
| 1231 | 1663 | ) |
| 1232 | 1664 | ) { |
| 1233 | 1665 | //$buffer = $Common->getData($hosts[$id]); |
| 1234 | - if ($globalDebug) echo 'Get Data...'."\n"; |
|
| 1666 | + if ($globalDebug) { |
|
| 1667 | + echo 'Get Data...'."\n"; |
|
| 1668 | + } |
|
| 1235 | 1669 | $buffer = $Common->getData($value['host']); |
| 1236 | 1670 | $all_data = json_decode($buffer,true); |
| 1237 | 1671 | if ($buffer != '') { |
@@ -1249,18 +1683,24 @@ discard block |
||
| 1249 | 1683 | $data['id_source'] = $id_source; |
| 1250 | 1684 | $data['format_source'] = 'blitzortung'; |
| 1251 | 1685 | $SI->add($data); |
| 1252 | - if ($globalDebug) echo '☈ Lightning added'."\n"; |
|
| 1686 | + if ($globalDebug) { |
|
| 1687 | + echo '☈ Lightning added'."\n"; |
|
| 1688 | + } |
|
| 1253 | 1689 | $Source->addLocation('',$data['latitude'],$data['longitude'],0,'','','blitzortung','weather/thunderstorm.png','lightning',$id,0,$data['datetime']); |
| 1254 | 1690 | unset($data); |
| 1255 | 1691 | } |
| 1256 | 1692 | } |
| 1257 | - if ($globalDebug) echo 'No more data...'."\n"; |
|
| 1693 | + if ($globalDebug) { |
|
| 1694 | + echo 'No more data...'."\n"; |
|
| 1695 | + } |
|
| 1258 | 1696 | unset($buffer); |
| 1259 | 1697 | } |
| 1260 | 1698 | $last_exec[$id]['last'] = time(); |
| 1261 | 1699 | //} elseif ($value == 'sbs' || $value == 'tsv' || $value == 'raw' || $value == 'aprs' || $value == 'beast') { |
| 1262 | 1700 | } elseif ($value['format'] == 'sbs' || $value['format'] == 'tsv' || $value['format'] == 'raw' || $value['format'] == 'aprs' || $value['format'] == 'famaprs' || $value['format'] == 'beast' || $value['format'] == 'flightgearmp' || $value['format'] == 'flightgearsp' || $value['format'] == 'acars' || $value['format'] == 'acarssbs3' || $value['format'] == 'ais' || $value['format'] == 'vrstcp') { |
| 1263 | - if (function_exists('pcntl_fork')) pcntl_signal_dispatch(); |
|
| 1701 | + if (function_exists('pcntl_fork')) { |
|
| 1702 | + pcntl_signal_dispatch(); |
|
| 1703 | + } |
|
| 1264 | 1704 | //$last_exec[$id]['last'] = time(); |
| 1265 | 1705 | |
| 1266 | 1706 | //$read = array( $sockets[$id] ); |
@@ -1268,7 +1708,9 @@ discard block |
||
| 1268 | 1708 | $write = NULL; |
| 1269 | 1709 | $e = NULL; |
| 1270 | 1710 | $n = socket_select($read, $write, $e, $timeout); |
| 1271 | - if ($e != NULL) var_dump($e); |
|
| 1711 | + if ($e != NULL) { |
|
| 1712 | + var_dump($e); |
|
| 1713 | + } |
|
| 1272 | 1714 | if ($n > 0) { |
| 1273 | 1715 | $reset = 0; |
| 1274 | 1716 | foreach ($read as $nb => $r) { |
@@ -1289,12 +1731,16 @@ discard block |
||
| 1289 | 1731 | //$SI::del(); |
| 1290 | 1732 | if ($format == 'vrstcp') { |
| 1291 | 1733 | $buffer = explode('},{',$buffer); |
| 1292 | - } else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer)); |
|
| 1734 | + } else { |
|
| 1735 | + $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer)); |
|
| 1736 | + } |
|
| 1293 | 1737 | // SBS format is CSV format |
| 1294 | 1738 | if ($buffer !== FALSE && $buffer != '') { |
| 1295 | 1739 | $tt[$format] = 0; |
| 1296 | 1740 | if ($format == 'acarssbs3') { |
| 1297 | - if ($globalDebug) echo 'ACARS : '.$buffer."\n"; |
|
| 1741 | + if ($globalDebug) { |
|
| 1742 | + echo 'ACARS : '.$buffer."\n"; |
|
| 1743 | + } |
|
| 1298 | 1744 | $ACARS->add(trim($buffer)); |
| 1299 | 1745 | $ACARS->deleteLiveAcarsData(); |
| 1300 | 1746 | } elseif ($format == 'raw') { |
@@ -1303,30 +1749,70 @@ discard block |
||
| 1303 | 1749 | if (is_array($data)) { |
| 1304 | 1750 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 1305 | 1751 | $data['format_source'] = 'raw'; |
| 1306 | - if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
|
| 1307 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1308 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1309 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
|
| 1752 | + if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') { |
|
| 1753 | + $data['source_name'] = $globalSources[$nb]['name']; |
|
| 1754 | + } |
|
| 1755 | + if (isset($globalSources[$nb]['sourcestats'])) { |
|
| 1756 | + $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1757 | + } |
|
| 1758 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) { |
|
| 1759 | + $data['noarchive'] = true; |
|
| 1760 | + } |
|
| 1761 | + if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) { |
|
| 1762 | + $SI->add($data); |
|
| 1763 | + } |
|
| 1310 | 1764 | } |
| 1311 | 1765 | } elseif ($format == 'ais') { |
| 1312 | 1766 | $ais_data = $AIS->parse_line(trim($buffer)); |
| 1313 | 1767 | $data = array(); |
| 1314 | - if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident']; |
|
| 1315 | - if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi']; |
|
| 1316 | - if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed']; |
|
| 1317 | - if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading']; |
|
| 1318 | - if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude']; |
|
| 1319 | - if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude']; |
|
| 1320 | - if (isset($ais_data['status'])) $data['status'] = $ais_data['status']; |
|
| 1321 | - if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid']; |
|
| 1322 | - if (isset($ais_data['type'])) $data['type'] = $ais_data['type']; |
|
| 1323 | - if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
|
| 1324 | - if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
|
| 1325 | - if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination']; |
|
| 1326 | - if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); |
|
| 1327 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1328 | - if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
|
| 1329 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1768 | + if (isset($ais_data['ident'])) { |
|
| 1769 | + $data['ident'] = $ais_data['ident']; |
|
| 1770 | + } |
|
| 1771 | + if (isset($ais_data['mmsi'])) { |
|
| 1772 | + $data['mmsi'] = $ais_data['mmsi']; |
|
| 1773 | + } |
|
| 1774 | + if (isset($ais_data['speed'])) { |
|
| 1775 | + $data['speed'] = $ais_data['speed']; |
|
| 1776 | + } |
|
| 1777 | + if (isset($ais_data['heading'])) { |
|
| 1778 | + $data['heading'] = $ais_data['heading']; |
|
| 1779 | + } |
|
| 1780 | + if (isset($ais_data['latitude'])) { |
|
| 1781 | + $data['latitude'] = $ais_data['latitude']; |
|
| 1782 | + } |
|
| 1783 | + if (isset($ais_data['longitude'])) { |
|
| 1784 | + $data['longitude'] = $ais_data['longitude']; |
|
| 1785 | + } |
|
| 1786 | + if (isset($ais_data['status'])) { |
|
| 1787 | + $data['status'] = $ais_data['status']; |
|
| 1788 | + } |
|
| 1789 | + if (isset($ais_data['statusid'])) { |
|
| 1790 | + $data['status_id'] = $ais_data['statusid']; |
|
| 1791 | + } |
|
| 1792 | + if (isset($ais_data['type'])) { |
|
| 1793 | + $data['type'] = $ais_data['type']; |
|
| 1794 | + } |
|
| 1795 | + if (isset($ais_data['imo'])) { |
|
| 1796 | + $data['imo'] = $ais_data['imo']; |
|
| 1797 | + } |
|
| 1798 | + if (isset($ais_data['callsign'])) { |
|
| 1799 | + $data['callsign'] = $ais_data['callsign']; |
|
| 1800 | + } |
|
| 1801 | + if (isset($ais_data['destination'])) { |
|
| 1802 | + $data['arrival_code'] = $ais_data['destination']; |
|
| 1803 | + } |
|
| 1804 | + if (isset($ais_data['eta_ts'])) { |
|
| 1805 | + $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); |
|
| 1806 | + } |
|
| 1807 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) { |
|
| 1808 | + $data['noarchive'] = true; |
|
| 1809 | + } |
|
| 1810 | + if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') { |
|
| 1811 | + $data['source_name'] = $globalSources[$nb]['name']; |
|
| 1812 | + } |
|
| 1813 | + if (isset($globalSources[$nb]['sourcestats'])) { |
|
| 1814 | + $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1815 | + } |
|
| 1330 | 1816 | |
| 1331 | 1817 | if (isset($ais_data['timestamp'])) { |
| 1332 | 1818 | $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
@@ -1335,7 +1821,9 @@ discard block |
||
| 1335 | 1821 | } |
| 1336 | 1822 | $data['format_source'] = 'aisnmea'; |
| 1337 | 1823 | $data['id_source'] = $id_source; |
| 1338 | - if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data); |
|
| 1824 | + if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') { |
|
| 1825 | + $MI->add($data); |
|
| 1826 | + } |
|
| 1339 | 1827 | unset($data); |
| 1340 | 1828 | } elseif ($format == 'flightgearsp') { |
| 1341 | 1829 | //echo $buffer."\n"; |
@@ -1353,12 +1841,18 @@ discard block |
||
| 1353 | 1841 | $data['speed'] = round($line[5]*1.94384); |
| 1354 | 1842 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 1355 | 1843 | $data['format_source'] = 'flightgearsp'; |
| 1356 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1357 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
|
| 1844 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) { |
|
| 1845 | + $data['noarchive'] = true; |
|
| 1846 | + } |
|
| 1847 | + if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) { |
|
| 1848 | + $SI->add($data); |
|
| 1849 | + } |
|
| 1358 | 1850 | //$send = @ socket_send( $r , $data_aprs , strlen($data_aprs) , 0 ); |
| 1359 | 1851 | } |
| 1360 | 1852 | } elseif ($format == 'acars') { |
| 1361 | - if ($globalDebug) echo 'ACARS : '.$buffer."\n"; |
|
| 1853 | + if ($globalDebug) { |
|
| 1854 | + echo 'ACARS : '.$buffer."\n"; |
|
| 1855 | + } |
|
| 1362 | 1856 | $ACARS->add(trim($buffer)); |
| 1363 | 1857 | socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port); |
| 1364 | 1858 | $ACARS->deleteLiveAcarsData(); |
@@ -1379,8 +1873,12 @@ discard block |
||
| 1379 | 1873 | $aircraft_type = $line[10]; |
| 1380 | 1874 | $aircraft_type = preg_split(':/:',$aircraft_type); |
| 1381 | 1875 | $data['aircraft_name'] = substr(end($aircraft_type),0,-4); |
| 1382 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1383 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
|
| 1876 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) { |
|
| 1877 | + $data['noarchive'] = true; |
|
| 1878 | + } |
|
| 1879 | + if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) { |
|
| 1880 | + $SI->add($data); |
|
| 1881 | + } |
|
| 1384 | 1882 | } |
| 1385 | 1883 | } |
| 1386 | 1884 | } elseif ($format == 'beast') { |
@@ -1390,28 +1888,62 @@ discard block |
||
| 1390 | 1888 | foreach($buffer as $all_data) { |
| 1391 | 1889 | $line = json_decode('{'.$all_data.'}',true); |
| 1392 | 1890 | $data = array(); |
| 1393 | - if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex |
|
| 1394 | - if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident |
|
| 1395 | - if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude |
|
| 1396 | - if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed |
|
| 1397 | - if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading |
|
| 1398 | - if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat |
|
| 1399 | - if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long |
|
| 1891 | + if (isset($line['Icao'])) { |
|
| 1892 | + $data['hex'] = $line['Icao']; |
|
| 1893 | + } |
|
| 1894 | + // hex |
|
| 1895 | + if (isset($line['Call'])) { |
|
| 1896 | + $data['ident'] = $line['Call']; |
|
| 1897 | + } |
|
| 1898 | + // ident |
|
| 1899 | + if (isset($line['Alt'])) { |
|
| 1900 | + $data['altitude'] = $line['Alt']; |
|
| 1901 | + } |
|
| 1902 | + // altitude |
|
| 1903 | + if (isset($line['Spd'])) { |
|
| 1904 | + $data['speed'] = $line['Spd']; |
|
| 1905 | + } |
|
| 1906 | + // speed |
|
| 1907 | + if (isset($line['Trak'])) { |
|
| 1908 | + $data['heading'] = $line['Trak']; |
|
| 1909 | + } |
|
| 1910 | + // heading |
|
| 1911 | + if (isset($line['Lat'])) { |
|
| 1912 | + $data['latitude'] = $line['Lat']; |
|
| 1913 | + } |
|
| 1914 | + // lat |
|
| 1915 | + if (isset($line['Long'])) { |
|
| 1916 | + $data['longitude'] = $line['Long']; |
|
| 1917 | + } |
|
| 1918 | + // long |
|
| 1400 | 1919 | //$data['verticalrate'] = $line['']; // verticale rate |
| 1401 | - if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk |
|
| 1920 | + if (isset($line['Sqk'])) { |
|
| 1921 | + $data['squawk'] = $line['Sqk']; |
|
| 1922 | + } |
|
| 1923 | + // squawk |
|
| 1402 | 1924 | $data['emergency'] = ''; // emergency |
| 1403 | - if (isset($line['Reg'])) $data['registration'] = $line['Reg']; |
|
| 1925 | + if (isset($line['Reg'])) { |
|
| 1926 | + $data['registration'] = $line['Reg']; |
|
| 1927 | + } |
|
| 1404 | 1928 | /* |
| 1405 | 1929 | if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',$line['PosTime']/1000); |
| 1406 | 1930 | else $data['datetime'] = date('Y-m-d H:i:s'); |
| 1407 | 1931 | */ |
| 1408 | 1932 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 1409 | - if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type']; |
|
| 1933 | + if (isset($line['Type'])) { |
|
| 1934 | + $data['aircraft_icao'] = $line['Type']; |
|
| 1935 | + } |
|
| 1410 | 1936 | $data['format_source'] = 'vrstcp'; |
| 1411 | 1937 | $data['id_source'] = $id_source; |
| 1412 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1413 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1414 | - if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data); |
|
| 1938 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) { |
|
| 1939 | + $data['noarchive'] = true; |
|
| 1940 | + } |
|
| 1941 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 1942 | + $data['source_name'] = $value['name']; |
|
| 1943 | + } |
|
| 1944 | + if (isset($data['latitude']) && isset($data['hex'])) { |
|
| 1945 | + $SI->add($data); |
|
| 1946 | + } |
|
| 1415 | 1947 | unset($data); |
| 1416 | 1948 | } |
| 1417 | 1949 | } elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') { |
@@ -1424,22 +1956,46 @@ discard block |
||
| 1424 | 1956 | $data['hex'] = $lined['hexid']; |
| 1425 | 1957 | //$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));; |
| 1426 | 1958 | $data['datetime'] = date('Y-m-d H:i:s');; |
| 1427 | - if (isset($lined['ident'])) $data['ident'] = $lined['ident']; |
|
| 1428 | - if (isset($lined['lat'])) $data['latitude'] = $lined['lat']; |
|
| 1429 | - if (isset($lined['lon'])) $data['longitude'] = $lined['lon']; |
|
| 1430 | - if (isset($lined['speed'])) $data['speed'] = $lined['speed']; |
|
| 1431 | - if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk']; |
|
| 1432 | - if (isset($lined['alt'])) $data['altitude'] = $lined['alt']; |
|
| 1433 | - if (isset($lined['heading'])) $data['heading'] = $lined['heading']; |
|
| 1959 | + if (isset($lined['ident'])) { |
|
| 1960 | + $data['ident'] = $lined['ident']; |
|
| 1961 | + } |
|
| 1962 | + if (isset($lined['lat'])) { |
|
| 1963 | + $data['latitude'] = $lined['lat']; |
|
| 1964 | + } |
|
| 1965 | + if (isset($lined['lon'])) { |
|
| 1966 | + $data['longitude'] = $lined['lon']; |
|
| 1967 | + } |
|
| 1968 | + if (isset($lined['speed'])) { |
|
| 1969 | + $data['speed'] = $lined['speed']; |
|
| 1970 | + } |
|
| 1971 | + if (isset($lined['squawk'])) { |
|
| 1972 | + $data['squawk'] = $lined['squawk']; |
|
| 1973 | + } |
|
| 1974 | + if (isset($lined['alt'])) { |
|
| 1975 | + $data['altitude'] = $lined['alt']; |
|
| 1976 | + } |
|
| 1977 | + if (isset($lined['heading'])) { |
|
| 1978 | + $data['heading'] = $lined['heading']; |
|
| 1979 | + } |
|
| 1434 | 1980 | $data['id_source'] = $id_source; |
| 1435 | 1981 | $data['format_source'] = 'tsv'; |
| 1436 | - if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
|
| 1437 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1438 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1439 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
|
| 1982 | + if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') { |
|
| 1983 | + $data['source_name'] = $globalSources[$nb]['name']; |
|
| 1984 | + } |
|
| 1985 | + if (isset($globalSources[$nb]['sourcestats'])) { |
|
| 1986 | + $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1987 | + } |
|
| 1988 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) { |
|
| 1989 | + $data['noarchive'] = true; |
|
| 1990 | + } |
|
| 1991 | + if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) { |
|
| 1992 | + $SI->add($data); |
|
| 1993 | + } |
|
| 1440 | 1994 | unset($lined); |
| 1441 | 1995 | unset($data); |
| 1442 | - } else $error = true; |
|
| 1996 | + } else { |
|
| 1997 | + $error = true; |
|
| 1998 | + } |
|
| 1443 | 1999 | } elseif ($format == 'aprs' && $use_aprs) { |
| 1444 | 2000 | if ($aprs_connect == 0) { |
| 1445 | 2001 | $send = @ socket_send( $r , $aprs_login , strlen($aprs_login) , 0 ); |
@@ -1464,59 +2020,117 @@ discard block |
||
| 1464 | 2020 | $aprs_last_tx = time(); |
| 1465 | 2021 | $data = array(); |
| 1466 | 2022 | //print_r($line); |
| 1467 | - if (isset($line['address'])) $data['hex'] = $line['address']; |
|
| 1468 | - if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi']; |
|
| 1469 | - if (isset($line['imo'])) $data['imo'] = $line['imo']; |
|
| 1470 | - if (isset($line['squawk'])) $data['squawk'] = $line['squawk']; |
|
| 1471 | - if (isset($line['arrival_code'])) $data['arrical_code'] = $line['arrival_code']; |
|
| 1472 | - if (isset($line['arrival_date'])) $data['arrical_date'] = $line['arrival_date']; |
|
| 1473 | - if (isset($line['type_id'])) $data['type_id'] = $line['typeid']; |
|
| 1474 | - if (isset($line['status_id'])) $data['status_id'] = $line['statusid']; |
|
| 1475 | - if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']); |
|
| 1476 | - else $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 2023 | + if (isset($line['address'])) { |
|
| 2024 | + $data['hex'] = $line['address']; |
|
| 2025 | + } |
|
| 2026 | + if (isset($line['mmsi'])) { |
|
| 2027 | + $data['mmsi'] = $line['mmsi']; |
|
| 2028 | + } |
|
| 2029 | + if (isset($line['imo'])) { |
|
| 2030 | + $data['imo'] = $line['imo']; |
|
| 2031 | + } |
|
| 2032 | + if (isset($line['squawk'])) { |
|
| 2033 | + $data['squawk'] = $line['squawk']; |
|
| 2034 | + } |
|
| 2035 | + if (isset($line['arrival_code'])) { |
|
| 2036 | + $data['arrical_code'] = $line['arrival_code']; |
|
| 2037 | + } |
|
| 2038 | + if (isset($line['arrival_date'])) { |
|
| 2039 | + $data['arrical_date'] = $line['arrival_date']; |
|
| 2040 | + } |
|
| 2041 | + if (isset($line['type_id'])) { |
|
| 2042 | + $data['type_id'] = $line['typeid']; |
|
| 2043 | + } |
|
| 2044 | + if (isset($line['status_id'])) { |
|
| 2045 | + $data['status_id'] = $line['statusid']; |
|
| 2046 | + } |
|
| 2047 | + if (isset($line['timestamp'])) { |
|
| 2048 | + $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']); |
|
| 2049 | + } else { |
|
| 2050 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 2051 | + } |
|
| 1477 | 2052 | //$data['datetime'] = date('Y-m-d H:i:s'); |
| 1478 | - if (isset($line['ident'])) $data['ident'] = $line['ident']; |
|
| 2053 | + if (isset($line['ident'])) { |
|
| 2054 | + $data['ident'] = $line['ident']; |
|
| 2055 | + } |
|
| 1479 | 2056 | $data['latitude'] = $line['latitude']; |
| 1480 | 2057 | $data['longitude'] = $line['longitude']; |
| 1481 | 2058 | //$data['verticalrate'] = $line[16]; |
| 1482 | - if (isset($line['speed'])) $data['speed'] = $line['speed']; |
|
| 2059 | + if (isset($line['speed'])) { |
|
| 2060 | + $data['speed'] = $line['speed']; |
|
| 2061 | + } |
|
| 1483 | 2062 | //else $data['speed'] = 0; |
| 1484 | - if (isset($line['altitude'])) $data['altitude'] = $line['altitude']; |
|
| 1485 | - if (isset($line['comment'])) $data['comment'] = $line['comment']; |
|
| 1486 | - if (isset($line['symbol'])) $data['type'] = $line['symbol']; |
|
| 1487 | - if (isset($line['heading'])) $data['heading'] = $line['heading']; |
|
| 2063 | + if (isset($line['altitude'])) { |
|
| 2064 | + $data['altitude'] = $line['altitude']; |
|
| 2065 | + } |
|
| 2066 | + if (isset($line['comment'])) { |
|
| 2067 | + $data['comment'] = $line['comment']; |
|
| 2068 | + } |
|
| 2069 | + if (isset($line['symbol'])) { |
|
| 2070 | + $data['type'] = $line['symbol']; |
|
| 2071 | + } |
|
| 2072 | + if (isset($line['heading'])) { |
|
| 2073 | + $data['heading'] = $line['heading']; |
|
| 2074 | + } |
|
| 1488 | 2075 | //else $data['heading'] = 0; |
| 1489 | - if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth']; |
|
| 2076 | + if (isset($line['stealth'])) { |
|
| 2077 | + $data['aircraft_type'] = $line['stealth']; |
|
| 2078 | + } |
|
| 1490 | 2079 | //if (!isset($line['source_type']) && (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE))) $data['noarchive'] = true; |
| 1491 | - if (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE) $data['noarchive'] = true; |
|
| 1492 | - elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) $data['noarchive'] = false; |
|
| 1493 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1494 | - elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) $data['noarchive'] = false; |
|
| 2080 | + if (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE) { |
|
| 2081 | + $data['noarchive'] = true; |
|
| 2082 | + } elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) { |
|
| 2083 | + $data['noarchive'] = false; |
|
| 2084 | + } |
|
| 2085 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) { |
|
| 2086 | + $data['noarchive'] = true; |
|
| 2087 | + } elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) { |
|
| 2088 | + $data['noarchive'] = false; |
|
| 2089 | + } |
|
| 1495 | 2090 | $data['id_source'] = $id_source; |
| 1496 | - if (isset($line['format_source'])) $data['format_source'] = $line['format_source']; |
|
| 1497 | - else $data['format_source'] = 'aprs'; |
|
| 2091 | + if (isset($line['format_source'])) { |
|
| 2092 | + $data['format_source'] = $line['format_source']; |
|
| 2093 | + } else { |
|
| 2094 | + $data['format_source'] = 'aprs'; |
|
| 2095 | + } |
|
| 1498 | 2096 | $data['source_name'] = $line['source']; |
| 1499 | - if (isset($line['source_type'])) $data['source_type'] = $line['source_type']; |
|
| 1500 | - else $data['source_type'] = 'flarm'; |
|
| 1501 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 2097 | + if (isset($line['source_type'])) { |
|
| 2098 | + $data['source_type'] = $line['source_type']; |
|
| 2099 | + } else { |
|
| 2100 | + $data['source_type'] = 'flarm'; |
|
| 2101 | + } |
|
| 2102 | + if (isset($globalSources[$nb]['sourcestats'])) { |
|
| 2103 | + $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 2104 | + } |
|
| 1502 | 2105 | $currentdate = date('Y-m-d H:i:s'); |
| 1503 | 2106 | $aprsdate = strtotime($data['datetime']); |
| 1504 | - if ($data['source_type'] != 'modes' && $data['source_type'] != 'ais') $data['altitude_relative'] = 'AMSL'; |
|
| 2107 | + if ($data['source_type'] != 'modes' && $data['source_type'] != 'ais') { |
|
| 2108 | + $data['altitude_relative'] = 'AMSL'; |
|
| 2109 | + } |
|
| 1505 | 2110 | // Accept data if time <= system time + 20s |
| 1506 | 2111 | //if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) { |
| 1507 | 2112 | if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) { |
| 1508 | 2113 | $send = $SI->add($data); |
| 1509 | 2114 | } elseif ($data['source_type'] == 'ais') { |
| 1510 | - if (isset($globalMarine) && $globalMarine) $send = $MI->add($data); |
|
| 2115 | + if (isset($globalMarine) && $globalMarine) { |
|
| 2116 | + $send = $MI->add($data); |
|
| 2117 | + } |
|
| 1511 | 2118 | } elseif (isset($line['stealth'])) { |
| 1512 | - if ($line['stealth'] != 0) echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n"; |
|
| 1513 | - else echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n"; |
|
| 2119 | + if ($line['stealth'] != 0) { |
|
| 2120 | + echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n"; |
|
| 2121 | + } else { |
|
| 2122 | + echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n"; |
|
| 2123 | + } |
|
| 1514 | 2124 | } elseif (isset($globalAircraft) && $globalAircraft && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && ( |
| 1515 | 2125 | //$line['symbol'] == 'Balloon' || |
| 1516 | 2126 | $line['symbol'] == 'Glider' || |
| 1517 | 2127 | $line['symbol'] == 'Aircraft (small)' || $line['symbol'] == 'Helicopter')) { |
| 1518 | - if ($line['symbol'] == 'Ballon') $data['aircraft_icao'] = 'BALL'; |
|
| 1519 | - if ($line['symbol'] == 'Glider') $data['aircraft_icao'] = 'PARAGLIDER'; |
|
| 2128 | + if ($line['symbol'] == 'Ballon') { |
|
| 2129 | + $data['aircraft_icao'] = 'BALL'; |
|
| 2130 | + } |
|
| 2131 | + if ($line['symbol'] == 'Glider') { |
|
| 2132 | + $data['aircraft_icao'] = 'PARAGLIDER'; |
|
| 2133 | + } |
|
| 1520 | 2134 | $send = $SI->add($data); |
| 1521 | 2135 | } elseif (isset($globalMarine) && $globalMarine && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && ( |
| 1522 | 2136 | $line['symbol'] == 'Yacht (Sail)' || |
@@ -1547,9 +2161,13 @@ discard block |
||
| 1547 | 2161 | //} elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && isset($line['speed']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') { |
| 1548 | 2162 | // } elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') { |
| 1549 | 2163 | //echo '!!!!!!!!!!!!!!!! SEND !!!!!!!!!!!!!!!!!!!!'."\n"; |
| 1550 | - if (isset($globalTracker) && $globalTracker) $send = $TI->add($data); |
|
| 2164 | + if (isset($globalTracker) && $globalTracker) { |
|
| 2165 | + $send = $TI->add($data); |
|
| 2166 | + } |
|
| 1551 | 2167 | } elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident']) && isset($data['altitude'])) { |
| 1552 | - if (!isset($data['altitude'])) $data['altitude'] = 0; |
|
| 2168 | + if (!isset($data['altitude'])) { |
|
| 2169 | + $data['altitude'] = 0; |
|
| 2170 | + } |
|
| 1553 | 2171 | $Source->deleteOldLocationByType('gs'); |
| 1554 | 2172 | if (count($Source->getLocationInfoByNameType($data['ident'],'gs')) > 0) { |
| 1555 | 2173 | $Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']); |
@@ -1558,7 +2176,9 @@ discard block |
||
| 1558 | 2176 | } |
| 1559 | 2177 | } elseif (isset($line['symbol']) && $line['symbol'] == 'Weather Station') { |
| 1560 | 2178 | //if ($globalDebug) echo '!! Weather Station not yet supported'."\n"; |
| 1561 | - if ($globalDebug) echo '# Weather Station added'."\n"; |
|
| 2179 | + if ($globalDebug) { |
|
| 2180 | + echo '# Weather Station added'."\n"; |
|
| 2181 | + } |
|
| 1562 | 2182 | $Source->deleteOldLocationByType('wx'); |
| 1563 | 2183 | $weather_data = json_encode($line); |
| 1564 | 2184 | if (count($Source->getLocationInfoByNameType($data['ident'],'wx')) > 0) { |
@@ -1568,7 +2188,9 @@ discard block |
||
| 1568 | 2188 | } |
| 1569 | 2189 | } elseif (isset($line['symbol']) && $line['symbol'] == 'Lightning') { |
| 1570 | 2190 | //if ($globalDebug) echo '!! Weather Station not yet supported'."\n"; |
| 1571 | - if ($globalDebug) echo '☈ Lightning added'."\n"; |
|
| 2191 | + if ($globalDebug) { |
|
| 2192 | + echo '☈ Lightning added'."\n"; |
|
| 2193 | + } |
|
| 1572 | 2194 | $Source->deleteOldLocationByType('lightning'); |
| 1573 | 2195 | if (count($Source->getLocationInfoByNameType($data['ident'],'lightning')) > 0) { |
| 1574 | 2196 | $Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'weather/thunderstorm.png','lightning',$id,0,$data['datetime'],$data['comment']); |
@@ -1580,8 +2202,7 @@ discard block |
||
| 1580 | 2202 | print_r($line); |
| 1581 | 2203 | } |
| 1582 | 2204 | unset($data); |
| 1583 | - } |
|
| 1584 | - elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') { |
|
| 2205 | + } elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') { |
|
| 1585 | 2206 | $Source->updateLocationDescByName($line['ident'],$line['source'],$id,$line['comment']); |
| 1586 | 2207 | } |
| 1587 | 2208 | /* |
@@ -1590,7 +2211,9 @@ discard block |
||
| 1590 | 2211 | } |
| 1591 | 2212 | */ |
| 1592 | 2213 | //elseif ($line == false && $globalDebug) echo 'Ignored ('.$buffer.")\n"; |
| 1593 | - elseif ($line == true && $globalDebug) echo '!! Failed : '.$buffer."!!\n"; |
|
| 2214 | + elseif ($line == true && $globalDebug) { |
|
| 2215 | + echo '!! Failed : '.$buffer."!!\n"; |
|
| 2216 | + } |
|
| 1594 | 2217 | if (isset($globalSources[$nb]['last_weather_clean']) && time()-$globalSources[$nb]['last_weather_clean'] > 60*5) { |
| 1595 | 2218 | $Source->deleteOldLocationByType('lightning'); |
| 1596 | 2219 | $Source->deleteOldLocationByType('wx'); |
@@ -1626,26 +2249,45 @@ discard block |
||
| 1626 | 2249 | $data['ground'] = $line[21]; |
| 1627 | 2250 | $data['emergency'] = $line[19]; |
| 1628 | 2251 | $data['format_source'] = 'sbs'; |
| 1629 | - if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
|
| 1630 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1631 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 2252 | + if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') { |
|
| 2253 | + $data['source_name'] = $globalSources[$nb]['name']; |
|
| 2254 | + } |
|
| 2255 | + if (isset($globalSources[$nb]['sourcestats'])) { |
|
| 2256 | + $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 2257 | + } |
|
| 2258 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) { |
|
| 2259 | + $data['noarchive'] = true; |
|
| 2260 | + } |
|
| 1632 | 2261 | $data['id_source'] = $id_source; |
| 1633 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data); |
|
| 1634 | - else $error = true; |
|
| 2262 | + if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) { |
|
| 2263 | + $send = $SI->add($data); |
|
| 2264 | + } else { |
|
| 2265 | + $error = true; |
|
| 2266 | + } |
|
| 1635 | 2267 | unset($data); |
| 1636 | - } else $error = true; |
|
| 2268 | + } else { |
|
| 2269 | + $error = true; |
|
| 2270 | + } |
|
| 1637 | 2271 | if ($error) { |
| 1638 | 2272 | if (count($line) > 1 && ($line[0] == 'STA' || $line[0] == 'AIR' || $line[0] == 'SEL' || $line[0] == 'ID' || $line[0] == 'CLK')) { |
| 1639 | - if ($globalDebug) echo "Not a message. Ignoring... \n"; |
|
| 2273 | + if ($globalDebug) { |
|
| 2274 | + echo "Not a message. Ignoring... \n"; |
|
| 2275 | + } |
|
| 1640 | 2276 | } else { |
| 1641 | - if ($globalDebug) echo "Wrong line format. Ignoring... \n"; |
|
| 2277 | + if ($globalDebug) { |
|
| 2278 | + echo "Wrong line format. Ignoring... \n"; |
|
| 2279 | + } |
|
| 1642 | 2280 | if ($globalDebug) { |
| 1643 | 2281 | echo $buffer; |
| 1644 | 2282 | //print_r($line); |
| 1645 | 2283 | } |
| 1646 | 2284 | //socket_close($r); |
| 1647 | - if ($globalDebug) echo "Reconnect after an error...\n"; |
|
| 1648 | - if ($format == 'aprs') $aprs_connect = 0; |
|
| 2285 | + if ($globalDebug) { |
|
| 2286 | + echo "Reconnect after an error...\n"; |
|
| 2287 | + } |
|
| 2288 | + if ($format == 'aprs') { |
|
| 2289 | + $aprs_connect = 0; |
|
| 2290 | + } |
|
| 1649 | 2291 | $sourceer[$nb] = $globalSources[$nb]; |
| 1650 | 2292 | connect_all($sourceer); |
| 1651 | 2293 | $sourceer = array(); |
@@ -1653,10 +2295,14 @@ discard block |
||
| 1653 | 2295 | } |
| 1654 | 2296 | } |
| 1655 | 2297 | // Sleep for xxx microseconds |
| 1656 | - if (isset($globalSBSSleep)) usleep($globalSBSSleep); |
|
| 2298 | + if (isset($globalSBSSleep)) { |
|
| 2299 | + usleep($globalSBSSleep); |
|
| 2300 | + } |
|
| 1657 | 2301 | } else { |
| 1658 | 2302 | if ($format == 'flightgearmp') { |
| 1659 | - if ($globalDebug) echo "Reconnect FlightGear MP..."; |
|
| 2303 | + if ($globalDebug) { |
|
| 2304 | + echo "Reconnect FlightGear MP..."; |
|
| 2305 | + } |
|
| 1660 | 2306 | //@socket_close($r); |
| 1661 | 2307 | sleep($globalMinFetch); |
| 1662 | 2308 | $sourcefg[$nb] = $globalSources[$nb]; |
@@ -1665,10 +2311,15 @@ discard block |
||
| 1665 | 2311 | break; |
| 1666 | 2312 | |
| 1667 | 2313 | } elseif ($format != 'acars' && $format != 'flightgearsp') { |
| 1668 | - if (isset($tt[$format])) $tt[$format]++; |
|
| 1669 | - else $tt[$format] = 0; |
|
| 2314 | + if (isset($tt[$format])) { |
|
| 2315 | + $tt[$format]++; |
|
| 2316 | + } else { |
|
| 2317 | + $tt[$format] = 0; |
|
| 2318 | + } |
|
| 1670 | 2319 | if ($tt[$format] > 30) { |
| 1671 | - if ($globalDebug) echo "ERROR : Reconnect ".$format."..."; |
|
| 2320 | + if ($globalDebug) { |
|
| 2321 | + echo "ERROR : Reconnect ".$format."..."; |
|
| 2322 | + } |
|
| 1672 | 2323 | //@socket_close($r); |
| 1673 | 2324 | sleep(2); |
| 1674 | 2325 | $aprs_connect = 0; |
@@ -1685,11 +2336,17 @@ discard block |
||
| 1685 | 2336 | } else { |
| 1686 | 2337 | $error = socket_strerror(socket_last_error()); |
| 1687 | 2338 | if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) { |
| 1688 | - if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n"; |
|
| 1689 | - if (isset($globalDebug)) echo "Restarting...\n"; |
|
| 2339 | + if ($globalDebug) { |
|
| 2340 | + echo "ERROR : socket_select give this error ".$error . "\n"; |
|
| 2341 | + } |
|
| 2342 | + if (isset($globalDebug)) { |
|
| 2343 | + echo "Restarting...\n"; |
|
| 2344 | + } |
|
| 1690 | 2345 | // Restart the script if possible |
| 1691 | 2346 | if (is_array($sockets)) { |
| 1692 | - if ($globalDebug) echo "Shutdown all sockets..."; |
|
| 2347 | + if ($globalDebug) { |
|
| 2348 | + echo "Shutdown all sockets..."; |
|
| 2349 | + } |
|
| 1693 | 2350 | |
| 1694 | 2351 | foreach ($sockets as $sock) { |
| 1695 | 2352 | @socket_shutdown($sock,2); |
@@ -1697,25 +2354,45 @@ discard block |
||
| 1697 | 2354 | } |
| 1698 | 2355 | |
| 1699 | 2356 | } |
| 1700 | - if ($globalDebug) echo "Waiting..."; |
|
| 2357 | + if ($globalDebug) { |
|
| 2358 | + echo "Waiting..."; |
|
| 2359 | + } |
|
| 1701 | 2360 | sleep(2); |
| 1702 | 2361 | $time = time(); |
| 1703 | 2362 | //connect_all($hosts); |
| 1704 | 2363 | $aprs_connect = 0; |
| 1705 | - if ($reset%5 == 0) sleep(20); |
|
| 1706 | - if ($reset%10 == 0) sleep(100); |
|
| 1707 | - if ($reset%20 == 0) sleep(200); |
|
| 1708 | - if ($reset > 100) exit('Too many attempts...'); |
|
| 1709 | - if ($globalDebug) echo "Restart all connections..."; |
|
| 2364 | + if ($reset%5 == 0) { |
|
| 2365 | + sleep(20); |
|
| 2366 | + } |
|
| 2367 | + if ($reset%10 == 0) { |
|
| 2368 | + sleep(100); |
|
| 2369 | + } |
|
| 2370 | + if ($reset%20 == 0) { |
|
| 2371 | + sleep(200); |
|
| 2372 | + } |
|
| 2373 | + if ($reset > 100) { |
|
| 2374 | + exit('Too many attempts...'); |
|
| 2375 | + } |
|
| 2376 | + if ($globalDebug) { |
|
| 2377 | + echo "Restart all connections..."; |
|
| 2378 | + } |
|
| 1710 | 2379 | connect_all($globalSources); |
| 1711 | 2380 | } |
| 1712 | 2381 | } |
| 1713 | 2382 | } |
| 1714 | 2383 | if ($globalDaemon === false) { |
| 1715 | - if ($globalDebug) echo 'Check all...'."\n"; |
|
| 1716 | - if (isset($SI)) $SI->checkAll(); |
|
| 1717 | - if (isset($TI)) $TI->checkAll(); |
|
| 1718 | - if (isset($MI)) $MI->checkAll(); |
|
| 2384 | + if ($globalDebug) { |
|
| 2385 | + echo 'Check all...'."\n"; |
|
| 2386 | + } |
|
| 2387 | + if (isset($SI)) { |
|
| 2388 | + $SI->checkAll(); |
|
| 2389 | + } |
|
| 2390 | + if (isset($TI)) { |
|
| 2391 | + $TI->checkAll(); |
|
| 2392 | + } |
|
| 2393 | + if (isset($MI)) { |
|
| 2394 | + $MI->checkAll(); |
|
| 2395 | + } |
|
| 1719 | 2396 | } |
| 1720 | 2397 | } |
| 1721 | 2398 | } |
@@ -58,6 +58,10 @@ discard block |
||
| 58 | 58 | } else return $ident; |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | + /** |
|
| 62 | + * @param string $correct_ident |
|
| 63 | + * @param string $source |
|
| 64 | + */ |
|
| 61 | 65 | public function addOperator($ident,$correct_ident,$source) { |
| 62 | 66 | $query = "INSERT INTO translation (Operator,Operator_correct,Source) VALUES (:ident,:correct_ident,:source)"; |
| 63 | 67 | $query_values = array(':ident' => $ident,':correct_ident' => $correct_ident, ':source' => $source); |
@@ -69,6 +73,10 @@ discard block |
||
| 69 | 73 | } |
| 70 | 74 | } |
| 71 | 75 | |
| 76 | + /** |
|
| 77 | + * @param string $correct_ident |
|
| 78 | + * @param string $source |
|
| 79 | + */ |
|
| 72 | 80 | public function updateOperator($ident,$correct_ident,$source) { |
| 73 | 81 | $query = "UPDATE translation SET Operator_correct = :correct_ident,Source = :source WHERE Operator = :ident"; |
| 74 | 82 | $query_values = array(':ident' => $ident,':correct_ident' => $correct_ident, ':source' => $source); |
@@ -15,11 +15,11 @@ |
||
| 15 | 15 | |
| 16 | 16 | |
| 17 | 17 | /** |
| 18 | - * Change IATA to ICAO value for ident |
|
| 19 | - * |
|
| 20 | - * @param String $ident ident |
|
| 21 | - * @return String the icao |
|
| 22 | - */ |
|
| 18 | + * Change IATA to ICAO value for ident |
|
| 19 | + * |
|
| 20 | + * @param String $ident ident |
|
| 21 | + * @return String the icao |
|
| 22 | + */ |
|
| 23 | 23 | public function ident2icao($ident) { |
| 24 | 24 | $Spotter = new Spotter(); |
| 25 | 25 | if (!is_numeric(substr($ident, 0, 3))) { |
@@ -31,12 +31,12 @@ discard block |
||
| 31 | 31 | } else return $ident; |
| 32 | 32 | } else return $ident; |
| 33 | 33 | if ($airline_icao == 'AF') { |
| 34 | - if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident; |
|
| 35 | - else $icao = 'AFR'.ltrim(substr($ident,2),'0'); |
|
| 34 | + if (filter_var(substr($ident, 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident; |
|
| 35 | + else $icao = 'AFR'.ltrim(substr($ident, 2), '0'); |
|
| 36 | 36 | } else { |
| 37 | 37 | $identicao = $Spotter->getAllAirlineInfo($airline_icao); |
| 38 | 38 | if (isset($identicao[0])) { |
| 39 | - $icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0'); |
|
| 39 | + $icao = $identicao[0]['icao'].ltrim(substr($ident, 2), '0'); |
|
| 40 | 40 | } else $icao = $ident; |
| 41 | 41 | } |
| 42 | 42 | return $icao; |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | try { |
| 49 | 49 | $sth = $this->db->prepare($query); |
| 50 | 50 | $sth->execute($query_values); |
| 51 | - } catch(PDOException $e) { |
|
| 51 | + } catch (PDOException $e) { |
|
| 52 | 52 | return "error : ".$e->getMessage(); |
| 53 | 53 | } |
| 54 | 54 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -58,29 +58,29 @@ discard block |
||
| 58 | 58 | } else return $ident; |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | - public function addOperator($ident,$correct_ident,$source) { |
|
| 61 | + public function addOperator($ident, $correct_ident, $source) { |
|
| 62 | 62 | $query = "INSERT INTO translation (Operator,Operator_correct,Source) VALUES (:ident,:correct_ident,:source)"; |
| 63 | - $query_values = array(':ident' => $ident,':correct_ident' => $correct_ident, ':source' => $source); |
|
| 63 | + $query_values = array(':ident' => $ident, ':correct_ident' => $correct_ident, ':source' => $source); |
|
| 64 | 64 | try { |
| 65 | 65 | $sth = $this->db->prepare($query); |
| 66 | 66 | $sth->execute($query_values); |
| 67 | - } catch(PDOException $e) { |
|
| 67 | + } catch (PDOException $e) { |
|
| 68 | 68 | return "error : ".$e->getMessage(); |
| 69 | 69 | } |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | - public function updateOperator($ident,$correct_ident,$source) { |
|
| 72 | + public function updateOperator($ident, $correct_ident, $source) { |
|
| 73 | 73 | $query = "UPDATE translation SET Operator_correct = :correct_ident,Source = :source WHERE Operator = :ident"; |
| 74 | - $query_values = array(':ident' => $ident,':correct_ident' => $correct_ident, ':source' => $source); |
|
| 74 | + $query_values = array(':ident' => $ident, ':correct_ident' => $correct_ident, ':source' => $source); |
|
| 75 | 75 | try { |
| 76 | 76 | $sth = $this->db->prepare($query); |
| 77 | 77 | $sth->execute($query_values); |
| 78 | - } catch(PDOException $e) { |
|
| 78 | + } catch (PDOException $e) { |
|
| 79 | 79 | return "error : ".$e->getMessage(); |
| 80 | 80 | } |
| 81 | 81 | } |
| 82 | 82 | |
| 83 | - public function checkTranslation($ident,$web = false) { |
|
| 83 | + public function checkTranslation($ident, $web = false) { |
|
| 84 | 84 | global $globalTranslationSources, $globalTranslationFetch; |
| 85 | 85 | //if (!isset($globalTranslationSources)) $globalTranslationSources = array('planefinder'); |
| 86 | 86 | $globalTranslationSources = array(); |
@@ -28,16 +28,25 @@ discard block |
||
| 28 | 28 | } elseif (is_numeric(substr(substr($ident, 0, 4), -1, 1))) { |
| 29 | 29 | //$airline_icao = substr($ident, 0, 3); |
| 30 | 30 | return $ident; |
| 31 | - } else return $ident; |
|
| 32 | - } else return $ident; |
|
| 31 | + } else { |
|
| 32 | + return $ident; |
|
| 33 | + } |
|
| 34 | + } else { |
|
| 35 | + return $ident; |
|
| 36 | + } |
|
| 33 | 37 | if ($airline_icao == 'AF') { |
| 34 | - if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident; |
|
| 35 | - else $icao = 'AFR'.ltrim(substr($ident,2),'0'); |
|
| 38 | + if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) { |
|
| 39 | + $icao = $ident; |
|
| 40 | + } else { |
|
| 41 | + $icao = 'AFR'.ltrim(substr($ident,2),'0'); |
|
| 42 | + } |
|
| 36 | 43 | } else { |
| 37 | 44 | $identicao = $Spotter->getAllAirlineInfo($airline_icao); |
| 38 | 45 | if (isset($identicao[0])) { |
| 39 | 46 | $icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0'); |
| 40 | - } else $icao = $ident; |
|
| 47 | + } else { |
|
| 48 | + $icao = $ident; |
|
| 49 | + } |
|
| 41 | 50 | } |
| 42 | 51 | return $icao; |
| 43 | 52 | } |
@@ -55,7 +64,9 @@ discard block |
||
| 55 | 64 | $sth->closeCursor(); |
| 56 | 65 | if (count($row) > 0) { |
| 57 | 66 | return $row['operator_correct']; |
| 58 | - } else return $ident; |
|
| 67 | + } else { |
|
| 68 | + return $ident; |
|
| 69 | + } |
|
| 59 | 70 | } |
| 60 | 71 | |
| 61 | 72 | public function addOperator($ident,$correct_ident,$source) { |
@@ -84,7 +95,9 @@ discard block |
||
| 84 | 95 | global $globalTranslationSources, $globalTranslationFetch; |
| 85 | 96 | //if (!isset($globalTranslationSources)) $globalTranslationSources = array('planefinder'); |
| 86 | 97 | $globalTranslationSources = array(); |
| 87 | - if (!isset($globalTranslationFetch)) $globalTranslationFetch = TRUE; |
|
| 98 | + if (!isset($globalTranslationFetch)) { |
|
| 99 | + $globalTranslationFetch = TRUE; |
|
| 100 | + } |
|
| 88 | 101 | //echo "Check Translation for ".$ident."..."; |
| 89 | 102 | $correct = $this->getOperator($ident); |
| 90 | 103 | if ($correct != '' && $correct != $ident) { |
@@ -11,12 +11,12 @@ discard block |
||
| 11 | 11 | |
| 12 | 12 | function __construct($dbs = null) { |
| 13 | 13 | if ($dbs === null) { |
| 14 | - $Connection = new Connection(null,'server'); |
|
| 14 | + $Connection = new Connection(null, 'server'); |
|
| 15 | 15 | $this->dbs = $Connection->dbs; |
| 16 | 16 | $query = "CREATE TABLE IF NOT EXISTS `spotter_temp` ( `id_data` INT NOT NULL AUTO_INCREMENT , `id_user` INT NOT NULL , `datetime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP , `hex` VARCHAR(20) NOT NULL , `ident` VARCHAR(20) NULL , `latitude` FLOAT NULL , `longitude` FLOAT NULL , `verticalrate` INT NULL , `speed` INT NULL , `squawk` INT NULL , `altitude` INT NULL , `heading` INT NULL , `registration` VARCHAR(10) NULL , `aircraft_icao` VARCHAR(10) NULL , `waypoints` VARCHAR(255) NULL , `noarchive` BOOLEAN NOT NULL DEFAULT FALSE, `id_source` INT NOT NULL DEFAULT '1', `format_source` VARCHAR(25) NULL, `source_name` VARCHAR(25) NULL, `over_country` VARCHAR(255) NULL, PRIMARY KEY (`id_data`) ) ENGINE = MEMORY;"; |
| 17 | 17 | try { |
| 18 | 18 | $sth = $this->dbs['server']->exec($query); |
| 19 | - } catch(PDOException $e) { |
|
| 19 | + } catch (PDOException $e) { |
|
| 20 | 20 | return "error : ".$e->getMessage(); |
| 21 | 21 | } |
| 22 | 22 | } |
@@ -31,10 +31,10 @@ discard block |
||
| 31 | 31 | date_default_timezone_set('UTC'); |
| 32 | 32 | //if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'aprs')) { |
| 33 | 33 | if (isset($line['format_source'])) { |
| 34 | - if(is_array($line) && isset($line['hex'])) { |
|
| 34 | + if (is_array($line) && isset($line['hex'])) { |
|
| 35 | 35 | if ($line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6) { |
| 36 | 36 | $data['hex'] = trim($line['hex']); |
| 37 | - if (preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
|
| 37 | + if (preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/', $line['datetime'])) { |
|
| 38 | 38 | $data['datetime'] = $line['datetime']; |
| 39 | 39 | } else $data['datetime'] = date('Y-m-d H:i:s'); |
| 40 | 40 | if (!isset($line['aircraft_icao'])) { |
@@ -110,11 +110,11 @@ discard block |
||
| 110 | 110 | if ($id_user == NULL) $id_user = 1; |
| 111 | 111 | if (!isset($id_source)) $id_source = 1; |
| 112 | 112 | $query = 'INSERT INTO spotter_temp (id_user,datetime,hex,ident,latitude,longitude,verticalrate,speed,squawk,altitude,heading,registration,aircraft_icao,waypoints,id_source,noarchive,format_source,source_name,over_country) VALUES (:id_user,:datetime,:hex,:ident,:latitude,:longitude,:verticalrate,:speed,:squawk,:altitude,:heading,:registration,:aircraft_icao,:waypoints,:id_source,:noarchive, :format_source, :source_name, :over_country)'; |
| 113 | - $query_values = array(':id_user' => $id_user,':datetime' => $data['datetime'],':hex' => $data['hex'],':ident' => $data['ident'],':latitude' => $data['latitude'],':longitude' => $data['longitude'],':verticalrate' => $data['verticalrate'],':speed' => $data['speed'],':squawk' => $data['squawk'],':altitude' => $data['altitude'],':heading' => $data['heading'],':registration' => $data['registration'],':aircraft_icao' => $data['aircraft_icao'],':waypoints' => $data['waypoints'],':id_source' => $id_source,':noarchive' => $data['noarchive'], ':format_source' => $data['format_source'], ':source_name' => $data['source_name'],':over_country' => $data['over_country']); |
|
| 113 | + $query_values = array(':id_user' => $id_user, ':datetime' => $data['datetime'], ':hex' => $data['hex'], ':ident' => $data['ident'], ':latitude' => $data['latitude'], ':longitude' => $data['longitude'], ':verticalrate' => $data['verticalrate'], ':speed' => $data['speed'], ':squawk' => $data['squawk'], ':altitude' => $data['altitude'], ':heading' => $data['heading'], ':registration' => $data['registration'], ':aircraft_icao' => $data['aircraft_icao'], ':waypoints' => $data['waypoints'], ':id_source' => $id_source, ':noarchive' => $data['noarchive'], ':format_source' => $data['format_source'], ':source_name' => $data['source_name'], ':over_country' => $data['over_country']); |
|
| 114 | 114 | try { |
| 115 | 115 | $sth = $this->dbs['server']->prepare($query); |
| 116 | 116 | $sth->execute($query_values); |
| 117 | - } catch(PDOException $e) { |
|
| 117 | + } catch (PDOException $e) { |
|
| 118 | 118 | return "error : ".$e->getMessage(); |
| 119 | 119 | } |
| 120 | 120 | } |
@@ -36,79 +36,126 @@ |
||
| 36 | 36 | $data['hex'] = trim($line['hex']); |
| 37 | 37 | if (preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
| 38 | 38 | $data['datetime'] = $line['datetime']; |
| 39 | - } else $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 39 | + } else { |
|
| 40 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 41 | + } |
|
| 40 | 42 | if (!isset($line['aircraft_icao'])) { |
| 41 | 43 | $Spotter = new Spotter(); |
| 42 | 44 | $aircraft_icao = $Spotter->getAllAircraftType($data['hex']); |
| 43 | 45 | $Spotter->db = null; |
| 44 | 46 | if ($aircraft_icao == '' && isset($line['aircraft_type'])) { |
| 45 | - if ($line['aircraft_type'] == 'PARA_GLIDER') $aircraft_icao = 'GLID'; |
|
| 46 | - elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL'; |
|
| 47 | - elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE'; |
|
| 48 | - elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC'; |
|
| 47 | + if ($line['aircraft_type'] == 'PARA_GLIDER') { |
|
| 48 | + $aircraft_icao = 'GLID'; |
|
| 49 | + } elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') { |
|
| 50 | + $aircraft_icao = 'UHEL'; |
|
| 51 | + } elseif ($line['aircraft_type'] == 'TOW_PLANE') { |
|
| 52 | + $aircraft_icao = 'TOWPLANE'; |
|
| 53 | + } elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') { |
|
| 54 | + $aircraft_icao = 'POWAIRC'; |
|
| 55 | + } |
|
| 49 | 56 | } |
| 50 | 57 | $data['aircraft_icao'] = $aircraft_icao; |
| 51 | - } else $data['aircraft_icao'] = $line['aircraft_icao']; |
|
| 58 | + } else { |
|
| 59 | + $data['aircraft_icao'] = $line['aircraft_icao']; |
|
| 60 | + } |
|
| 52 | 61 | //if ($globalDebug) echo "*********** New aircraft hex : ".$data['hex']." ***********\n"; |
| 53 | 62 | } |
| 54 | 63 | if (isset($line['registration']) && $line['registration'] != '') { |
| 55 | 64 | $data['registration'] = $line['registration']; |
| 56 | - } else $data['registration'] = null; |
|
| 65 | + } else { |
|
| 66 | + $data['registration'] = null; |
|
| 67 | + } |
|
| 57 | 68 | if (isset($line['waypoints']) && $line['waypoints'] != '') { |
| 58 | 69 | $data['waypoints'] = $line['waypoints']; |
| 59 | - } else $data['waypoints'] = null; |
|
| 70 | + } else { |
|
| 71 | + $data['waypoints'] = null; |
|
| 72 | + } |
|
| 60 | 73 | if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && preg_match('/^[a-zA-Z0-9]+$/', $line['ident'])) { |
| 61 | 74 | $data['ident'] = trim($line['ident']); |
| 62 | - } else $data['ident'] = null; |
|
| 75 | + } else { |
|
| 76 | + $data['ident'] = null; |
|
| 77 | + } |
|
| 63 | 78 | if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '') { |
| 64 | 79 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 65 | 80 | $data['latitude'] = $line['latitude']; |
| 66 | - } else $data['latitude'] = null; |
|
| 81 | + } else { |
|
| 82 | + $data['latitude'] = null; |
|
| 83 | + } |
|
| 67 | 84 | if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) { |
| 68 | - if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 85 | + if ($line['longitude'] > 180) { |
|
| 86 | + $line['longitude'] = $line['longitude'] - 360; |
|
| 87 | + } |
|
| 69 | 88 | $data['longitude'] = $line['longitude']; |
| 70 | - } else $data['longitude'] = null; |
|
| 89 | + } else { |
|
| 90 | + $data['longitude'] = null; |
|
| 91 | + } |
|
| 71 | 92 | } else { |
| 72 | 93 | $data['latitude'] = null; |
| 73 | 94 | $data['longitude'] = null; |
| 74 | 95 | } |
| 75 | 96 | if (isset($line['verticalrate']) && $line['verticalrate'] != '') { |
| 76 | 97 | $data['verticalrate'] = $line['verticalrate']; |
| 77 | - } else $data['verticalrate'] = null; |
|
| 98 | + } else { |
|
| 99 | + $data['verticalrate'] = null; |
|
| 100 | + } |
|
| 78 | 101 | if (isset($line['emergency']) && $line['emergency'] != '') { |
| 79 | 102 | $data['emergency'] = $line['emergency']; |
| 80 | - } else $data['emergency'] = null; |
|
| 103 | + } else { |
|
| 104 | + $data['emergency'] = null; |
|
| 105 | + } |
|
| 81 | 106 | if (isset($line['ground']) && $line['ground'] != '') { |
| 82 | 107 | $data['ground'] = $line['ground']; |
| 83 | - } else $data['ground'] = null; |
|
| 108 | + } else { |
|
| 109 | + $data['ground'] = null; |
|
| 110 | + } |
|
| 84 | 111 | if (isset($line['speed']) && $line['speed'] != '') { |
| 85 | 112 | $data['speed'] = round($line['speed']); |
| 86 | - } else $data['speed'] = null; |
|
| 113 | + } else { |
|
| 114 | + $data['speed'] = null; |
|
| 115 | + } |
|
| 87 | 116 | if (isset($line['squawk']) && $line['squawk'] != '') { |
| 88 | 117 | $data['squawk'] = $line['squawk']; |
| 89 | - } else $data['squawk'] = null; |
|
| 118 | + } else { |
|
| 119 | + $data['squawk'] = null; |
|
| 120 | + } |
|
| 90 | 121 | if (isset($line['altitude']) && $line['altitude'] != '') { |
| 91 | 122 | $data['altitude'] = round($line['altitude']); |
| 92 | - } else $data['altitude'] = null; |
|
| 123 | + } else { |
|
| 124 | + $data['altitude'] = null; |
|
| 125 | + } |
|
| 93 | 126 | if (isset($line['heading']) && $line['heading'] != '') { |
| 94 | 127 | $data['heading'] = round($line['heading']); |
| 95 | - } else $data['heading'] = null; |
|
| 128 | + } else { |
|
| 129 | + $data['heading'] = null; |
|
| 130 | + } |
|
| 96 | 131 | if (isset($line['source_name']) && $line['source_name'] != '') { |
| 97 | 132 | $data['source_name'] = $line['source_name']; |
| 98 | - } else $data['source_name'] = null; |
|
| 133 | + } else { |
|
| 134 | + $data['source_name'] = null; |
|
| 135 | + } |
|
| 99 | 136 | if (isset($line['over_country']) && $line['over_country'] != '') { |
| 100 | 137 | $data['over_country'] = $line['over_country']; |
| 101 | - } else $data['over_country'] = null; |
|
| 138 | + } else { |
|
| 139 | + $data['over_country'] = null; |
|
| 140 | + } |
|
| 102 | 141 | if (isset($line['noarchive']) && $line['noarchive']) { |
| 103 | 142 | $data['noarchive'] = true; |
| 104 | - } else $data['noarchive'] = false; |
|
| 143 | + } else { |
|
| 144 | + $data['noarchive'] = false; |
|
| 145 | + } |
|
| 105 | 146 | $data['format_source'] = $line['format_source']; |
| 106 | - if (isset($line['id_source'])) $id_source = $line['id_source']; |
|
| 147 | + if (isset($line['id_source'])) { |
|
| 148 | + $id_source = $line['id_source']; |
|
| 149 | + } |
|
| 107 | 150 | if (isset($data['hex'])) { |
| 108 | 151 | echo '.'; |
| 109 | 152 | $id_user = $globalServerUserID; |
| 110 | - if ($id_user == NULL) $id_user = 1; |
|
| 111 | - if (!isset($id_source)) $id_source = 1; |
|
| 153 | + if ($id_user == NULL) { |
|
| 154 | + $id_user = 1; |
|
| 155 | + } |
|
| 156 | + if (!isset($id_source)) { |
|
| 157 | + $id_source = 1; |
|
| 158 | + } |
|
| 112 | 159 | $query = 'INSERT INTO spotter_temp (id_user,datetime,hex,ident,latitude,longitude,verticalrate,speed,squawk,altitude,heading,registration,aircraft_icao,waypoints,id_source,noarchive,format_source,source_name,over_country) VALUES (:id_user,:datetime,:hex,:ident,:latitude,:longitude,:verticalrate,:speed,:squawk,:altitude,:heading,:registration,:aircraft_icao,:waypoints,:id_source,:noarchive, :format_source, :source_name, :over_country)'; |
| 113 | 160 | $query_values = array(':id_user' => $id_user,':datetime' => $data['datetime'],':hex' => $data['hex'],':ident' => $data['ident'],':latitude' => $data['latitude'],':longitude' => $data['longitude'],':verticalrate' => $data['verticalrate'],':speed' => $data['speed'],':squawk' => $data['squawk'],':altitude' => $data['altitude'],':heading' => $data['heading'],':registration' => $data['registration'],':aircraft_icao' => $data['aircraft_icao'],':waypoints' => $data['waypoints'],':id_source' => $id_source,':noarchive' => $data['noarchive'], ':format_source' => $data['format_source'], ':source_name' => $data['source_name'],':over_country' => $data['over_country']); |
| 114 | 161 | try { |
@@ -7,13 +7,13 @@ discard block |
||
| 7 | 7 | die(); |
| 8 | 8 | } |
| 9 | 9 | $Spotter = new Spotter(); |
| 10 | -$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
|
| 11 | -$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING); |
|
| 12 | -$spotter_array = $Spotter->getSpotterDataByIdent($ident,"0,1", $sort); |
|
| 10 | +$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING); |
|
| 11 | +$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING); |
|
| 12 | +$spotter_array = $Spotter->getSpotterDataByIdent($ident, "0,1", $sort); |
|
| 13 | 13 | |
| 14 | 14 | if (!empty($spotter_array)) |
| 15 | 15 | { |
| 16 | - $title = sprintf(_("Most Common Time of Day of %s"),$spotter_array[0]['ident']); |
|
| 16 | + $title = sprintf(_("Most Common Time of Day of %s"), $spotter_array[0]['ident']); |
|
| 17 | 17 | require_once('header.php'); |
| 18 | 18 | print '<div class="info column">'; |
| 19 | 19 | print '<h1>'.$spotter_array[0]['ident'].'</h1>'; |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | include('ident-sub-menu.php'); |
| 25 | 25 | print '<div class="column">'; |
| 26 | 26 | print '<h2>'._("Most Common Time of Day").'</h2>'; |
| 27 | - print '<p>'.sprintf(_("The statistic below shows the most common time of day of flights with the ident/callsign <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>'; |
|
| 27 | + print '<p>'.sprintf(_("The statistic below shows the most common time of day of flights with the ident/callsign <strong>%s</strong>."), $spotter_array[0]['ident']).'</p>'; |
|
| 28 | 28 | $hour_array = $Spotter->countAllHoursByIdent($ident); |
| 29 | 29 | print '<link href="'.$globalURL.'/css/c3.min.css" rel="stylesheet" type="text/css">'; |
| 30 | 30 | print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>'; |
@@ -33,9 +33,9 @@ discard block |
||
| 33 | 33 | $hour_data = ''; |
| 34 | 34 | $hour_cnt = ''; |
| 35 | 35 | $last = 0; |
| 36 | - foreach($hour_array as $hour_item) |
|
| 36 | + foreach ($hour_array as $hour_item) |
|
| 37 | 37 | { |
| 38 | - while($last != $hour_item['hour_name']) { |
|
| 38 | + while ($last != $hour_item['hour_name']) { |
|
| 39 | 39 | $hour_data .= '"'.$last.':00",'; |
| 40 | 40 | $hour_cnt .= '0,'; |
| 41 | 41 | $last++; |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | $hour_cnt .= $hour_item['hour_count'].','; |
| 46 | 46 | } |
| 47 | 47 | $hour_data = "['x',".substr($hour_data, 0, -1)."]"; |
| 48 | - $hour_cnt = "['flights',".substr($hour_cnt,0,-1)."]"; |
|
| 48 | + $hour_cnt = "['flights',".substr($hour_cnt, 0, -1)."]"; |
|
| 49 | 49 | print 'c3.generate({ |
| 50 | 50 | bindto: "#chartHour", |
| 51 | 51 | data: { |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | print '</thead>'; |
| 71 | 71 | print '<tbody>'; |
| 72 | 72 | $i = 1; |
| 73 | - foreach($hour_array as $hour_item) |
|
| 73 | + foreach ($hour_array as $hour_item) |
|
| 74 | 74 | { |
| 75 | 75 | print '<tr>'; |
| 76 | 76 | print '<td>'.$hour_item['hour_name'].':00</td>'; |
