Ysurac /
FlightAirMap
@@ -3,8 +3,8 @@ discard block |
||
| 3 | 3 | require_once('require/class.Spotter.php'); |
| 4 | 4 | require_once('require/class.Language.php'); |
| 5 | 5 | if (!isset($_GET['country'])) { |
| 6 | - header('Location: '.$globalURL.'/country'); |
|
| 7 | - die(); |
|
| 6 | + header('Location: '.$globalURL.'/country'); |
|
| 7 | + die(); |
|
| 8 | 8 | } |
| 9 | 9 | $Spotter = new Spotter(); |
| 10 | 10 | $country = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING))); |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | include('country-sub-menu.php'); |
| 52 | 52 | print '<div class="column">'; |
| 53 | 53 | print '<h2>'._("Most Common Arrival Airports by Country").'</h2>'; |
| 54 | - print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights of airports & airlines from <strong>%s</strong>."),$country).'</p>'; |
|
| 54 | + print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights of airports & airlines from <strong>%s</strong>."),$country).'</p>'; |
|
| 55 | 55 | |
| 56 | 56 | $airport_country_array = $Spotter->countAllArrivalAirportCountriesByCountry($country); |
| 57 | 57 | print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>'; |
@@ -7,8 +7,8 @@ discard block |
||
| 7 | 7 | die(); |
| 8 | 8 | } |
| 9 | 9 | $Spotter = new Spotter(); |
| 10 | -$country = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING))); |
|
| 11 | -$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
|
| 10 | +$country = ucwords(str_replace("-", " ", filter_input(INPUT_GET, 'country', FILTER_SANITIZE_STRING))); |
|
| 11 | +$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING); |
|
| 12 | 12 | |
| 13 | 13 | if (isset($_GET['sort'])) { |
| 14 | 14 | $spotter_array = $Spotter->getSpotterDataByCountry($country, "0,1", $sort); |
@@ -18,16 +18,16 @@ discard block |
||
| 18 | 18 | |
| 19 | 19 | if (!empty($spotter_array)) |
| 20 | 20 | { |
| 21 | - $title = sprintf(_("Most Common Arrival Airports by Country from %s"),$country); |
|
| 21 | + $title = sprintf(_("Most Common Arrival Airports by Country from %s"), $country); |
|
| 22 | 22 | require_once('header.php'); |
| 23 | 23 | print '<div class="select-item">'; |
| 24 | 24 | print '<form action="'.$globalURL.'/country" method="post">'; |
| 25 | 25 | print '<select name="country" class="selectpicker" data-live-search="true">'; |
| 26 | 26 | print '<option></option>'; |
| 27 | 27 | $all_countries = $Spotter->getAllCountries(); |
| 28 | - foreach($all_countries as $all_country) |
|
| 28 | + foreach ($all_countries as $all_country) |
|
| 29 | 29 | { |
| 30 | - if($country == $all_country['country']) |
|
| 30 | + if ($country == $all_country['country']) |
|
| 31 | 31 | { |
| 32 | 32 | print '<option value="'.strtolower(str_replace(" ", "-", $all_country['country'])).'" selected="selected">'.$all_country['country'].'</option>'; |
| 33 | 33 | } else { |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | if ($_GET['country'] != "NA") |
| 43 | 43 | { |
| 44 | 44 | print '<div class="info column">'; |
| 45 | - print '<h1>'.sprintf(_("Airports & Airlines from %s"),$country).'</h1>'; |
|
| 45 | + print '<h1>'.sprintf(_("Airports & Airlines from %s"), $country).'</h1>'; |
|
| 46 | 46 | print '</div>'; |
| 47 | 47 | } else { |
| 48 | 48 | print '<div class="alert alert-warning">'._("This special country profile shows all flights that do <u>not</u> have a country of a airline or departure/arrival airport associated with them.").'</div>'; |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | include('country-sub-menu.php'); |
| 52 | 52 | print '<div class="column">'; |
| 53 | 53 | print '<h2>'._("Most Common Arrival Airports by Country").'</h2>'; |
| 54 | - print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights of airports & airlines from <strong>%s</strong>."),$country).'</p>'; |
|
| 54 | + print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights of airports & airlines from <strong>%s</strong>."), $country).'</p>'; |
|
| 55 | 55 | |
| 56 | 56 | $airport_country_array = $Spotter->countAllArrivalAirportCountriesByCountry($country); |
| 57 | 57 | print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>'; |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | print '<div id="chartCountry" class="chart" width="100%"></div><script>'; |
| 62 | 62 | print 'var series = ['; |
| 63 | 63 | $country_data = ''; |
| 64 | - foreach($airport_country_array as $airport_item) |
|
| 64 | + foreach ($airport_country_array as $airport_item) |
|
| 65 | 65 | { |
| 66 | 66 | $country_data .= '[ "'.$airport_item['arrival_airport_country_iso3'].'",'.$airport_item['airport_arrival_country_count'].'],'; |
| 67 | 67 | } |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | print '</thead>'; |
| 110 | 110 | print '<tbody>'; |
| 111 | 111 | $i = 1; |
| 112 | - foreach($airport_country_array as $airport_item) |
|
| 112 | + foreach ($airport_country_array as $airport_item) |
|
| 113 | 113 | { |
| 114 | 114 | print '<tr>'; |
| 115 | 115 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -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 Departure Airports by Country on %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))); |
|
| 12 | + $title = sprintf(_("Most Common Departure Airports by Country 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 Departure Airports by Country").'</h2>'; |
| 36 | - print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin 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 departure airports by Country of origin of flights on <strong>%s</strong>."), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>'; |
|
| 37 | 37 | $airport_country_array = $Spotter->countAllDepartureAirportCountriesByDate($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>'; |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | print '<div id="chartCountry" class="chart" width="100%"></div><script>'; |
| 42 | 42 | print 'var series = ['; |
| 43 | 43 | $country_data = ''; |
| 44 | - foreach($airport_country_array as $airport_item) |
|
| 44 | + foreach ($airport_country_array as $airport_item) |
|
| 45 | 45 | { |
| 46 | 46 | $country_data .= '[ "'.$airport_item['departure_airport_country_iso3'].'",'.$airport_item['airport_departure_country_count'].'],'; |
| 47 | 47 | } |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | print '</thead>'; |
| 90 | 90 | print '<tbody>'; |
| 91 | 91 | $i = 1; |
| 92 | - foreach($airport_country_array as $airport_item) |
|
| 92 | + foreach ($airport_country_array as $airport_item) |
|
| 93 | 93 | { |
| 94 | 94 | print '<tr>'; |
| 95 | 95 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -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 by Country on %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))); |
|
| 12 | + $title = sprintf(_("Most Common Arrival Airports by Country on %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))); |
|
| 13 | 13 | require_once('header.php'); |
| 14 | 14 | print '<div class="select-item">'; |
| 15 | 15 | print '<form action="'.$globalURL.'/date" method="post" class="form-inline">'; |
@@ -26,13 +26,13 @@ discard block |
||
| 26 | 26 | print '<script type="text/javascript">$(function () { $("#datepicker").datetimepicker({ format: "YYYY-MM-DD", defaultDate: "'.$date.'" }); }); </script>'; |
| 27 | 27 | print '<br />'; |
| 28 | 28 | print '<div class="info column">'; |
| 29 | - print '<h1>'.sprintf(_("Flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>'; |
|
| 29 | + print '<h1>'.sprintf(_("Flights from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>'; |
|
| 30 | 30 | print '</div>'; |
| 31 | 31 | |
| 32 | 32 | include('date-sub-menu.php'); |
| 33 | 33 | print '<div class="column">'; |
| 34 | 34 | print '<h2>'._("Most Common Arrival Airports by Country").'</h2>'; |
| 35 | - print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights on <strong>%s</strong>."),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>'; |
|
| 35 | + print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights on <strong>%s</strong>."), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>'; |
|
| 36 | 36 | |
| 37 | 37 | $airport_country_array = $Spotter->countAllArrivalAirportCountriesByDate($date); |
| 38 | 38 | //print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>'; |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | */ |
| 74 | 74 | print 'var series = ['; |
| 75 | 75 | $country_data = ''; |
| 76 | - foreach($airport_country_array as $airport_item) |
|
| 76 | + foreach ($airport_country_array as $airport_item) |
|
| 77 | 77 | { |
| 78 | 78 | $country_data .= '[ "'.$airport_item['arrival_airport_country_iso3'].'",'.$airport_item['airport_arrival_country_count'].'],'; |
| 79 | 79 | } |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | print '</thead>'; |
| 122 | 122 | print '<tbody>'; |
| 123 | 123 | $i = 1; |
| 124 | - foreach($airport_country_array as $airport_item) |
|
| 124 | + foreach ($airport_country_array as $airport_item) |
|
| 125 | 125 | { |
| 126 | 126 | print '<tr>'; |
| 127 | 127 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -3,9 +3,9 @@ discard block |
||
| 3 | 3 | </span> |
| 4 | 4 | <div class="sub-menu sub-menu-container"> |
| 5 | 5 | <ul class="nav nav-pills"> |
| 6 | - <li><a href="<?php print $globalURL; ?>/manufacturer/<?php print $manufacturer; ?>" <?php if (strtolower($current_page) == "manufacturer-detailed"){ print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li> |
|
| 6 | + <li><a href="<?php print $globalURL; ?>/manufacturer/<?php print $manufacturer; ?>" <?php if (strtolower($current_page) == "manufacturer-detailed") { print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li> |
|
| 7 | 7 | <li class="dropdown"> |
| 8 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "manufacturer-statistics-aircraft" || strtolower($current_page) == "manufacturer-statistics-registration"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 8 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "manufacturer-statistics-aircraft" || strtolower($current_page) == "manufacturer-statistics-registration") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 9 | 9 | <?php echo _("Aircraft"); ?> <span class="caret"></span> |
| 10 | 10 | </a> |
| 11 | 11 | <ul class="dropdown-menu" role="menu"> |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | </ul> |
| 15 | 15 | </li> |
| 16 | 16 | <li class="dropdown"> |
| 17 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "manufacturer-statistics-airline" || strtolower($current_page) == "manufacturer-statistics-airline-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 17 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "manufacturer-statistics-airline" || strtolower($current_page) == "manufacturer-statistics-airline-country") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 18 | 18 | <?php echo _("Airline"); ?> <span class="caret"></span> |
| 19 | 19 | </a> |
| 20 | 20 | <ul class="dropdown-menu" role="menu"> |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | </ul> |
| 24 | 24 | </li> |
| 25 | 25 | <li class="dropdown"> |
| 26 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "manufacturer-statistics-departure-airport" || strtolower($current_page) == "manufacturer-statistics-departure-airport-country" || strtolower($current_page) == "manufacturer-statistics-arrival-airport" || strtolower($current_page) == "manufacturer-statistics-arrival-airport-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 26 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "manufacturer-statistics-departure-airport" || strtolower($current_page) == "manufacturer-statistics-departure-airport-country" || strtolower($current_page) == "manufacturer-statistics-arrival-airport" || strtolower($current_page) == "manufacturer-statistics-arrival-airport-country") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 27 | 27 | <?php echo _("Airport"); ?> <span class="caret"></span> |
| 28 | 28 | </a> |
| 29 | 29 | <ul class="dropdown-menu" role="menu"> |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | <li><a href="<?php print $globalURL; ?>/manufacturer/statistics/arrival-airport-country/<?php print $manufacturer; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li> |
| 34 | 34 | </ul> |
| 35 | 35 | </li> |
| 36 | - <li><a href="<?php print $globalURL; ?>/manufacturer/statistics/route/<?php print $manufacturer; ?>" <?php if (strtolower($current_page) == "manufacturer-statistics-route"){ print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li> |
|
| 37 | - <li><a href="<?php print $globalURL; ?>/manufacturer/statistics/time/<?php print $manufacturer; ?>" <?php if (strtolower($current_page) == "manufacturer-statistics-time"){ print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li> |
|
| 36 | + <li><a href="<?php print $globalURL; ?>/manufacturer/statistics/route/<?php print $manufacturer; ?>" <?php if (strtolower($current_page) == "manufacturer-statistics-route") { print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li> |
|
| 37 | + <li><a href="<?php print $globalURL; ?>/manufacturer/statistics/time/<?php print $manufacturer; ?>" <?php if (strtolower($current_page) == "manufacturer-statistics-time") { print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li> |
|
| 38 | 38 | </ul> |
| 39 | 39 | </div> |
| 40 | 40 | \ No newline at end of file |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | date_default_timezone_set('UTC'); |
| 28 | 28 | //waypoint plotting |
| 29 | 29 | $output .= '{"type": "Feature",'; |
| 30 | - $output .= '"properties": {'; |
|
| 30 | + $output .= '"properties": {'; |
|
| 31 | 31 | $output .= '"name": "'.str_replace('"',"'",$spotter_item['name']).'",'; |
| 32 | 32 | $output .= '"city": "'.str_replace('"',"'",$spotter_item['city']).'",'; |
| 33 | 33 | $output .= '"country": "'.$spotter_item['country'].'",'; |
@@ -50,13 +50,13 @@ discard block |
||
| 50 | 50 | $output .= '"homepage": "'.$spotter_item['home_link'].'",'; |
| 51 | 51 | $output .= '"image_thumb": "'.$spotter_item['image_thumb'].'"'; |
| 52 | 52 | // $output .= '"photo": "'.$spotter_item['image_thumbnail'].'",'; |
| 53 | - $output .= '},'; |
|
| 54 | - $output .= '"geometry": {'; |
|
| 53 | + $output .= '},'; |
|
| 54 | + $output .= '"geometry": {'; |
|
| 55 | 55 | $output .= '"type": "Point",'; |
| 56 | 56 | $output .= '"coordinates": ['; |
| 57 | - $output .= $spotter_item['longitude'].', '.$spotter_item['latitude']; |
|
| 57 | + $output .= $spotter_item['longitude'].', '.$spotter_item['latitude']; |
|
| 58 | 58 | $output .= ']'; |
| 59 | - $output .= '}'; |
|
| 59 | + $output .= '}'; |
|
| 60 | 60 | $output .= '},'; |
| 61 | 61 | } |
| 62 | 62 | $output = substr($output, 0, -1); |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | |
| 12 | 12 | if (isset($_GET['coord'])) |
| 13 | 13 | { |
| 14 | - $coords = explode(',',$_GET['coord']); |
|
| 14 | + $coords = explode(',', $_GET['coord']); |
|
| 15 | 15 | $spotter_array = $Spotter->getAllAirportInfobyCoord($coords); |
| 16 | 16 | } else { |
| 17 | 17 | $spotter_array = $Spotter->getAllAirportInfo(); |
@@ -22,17 +22,17 @@ discard block |
||
| 22 | 22 | |
| 23 | 23 | if (!empty($spotter_array)) |
| 24 | 24 | { |
| 25 | - foreach($spotter_array as $spotter_item) |
|
| 25 | + foreach ($spotter_array as $spotter_item) |
|
| 26 | 26 | { |
| 27 | 27 | date_default_timezone_set('UTC'); |
| 28 | 28 | //waypoint plotting |
| 29 | 29 | $output .= '{"type": "Feature",'; |
| 30 | 30 | $output .= '"properties": {'; |
| 31 | - $output .= '"name": "'.str_replace('"',"'",$spotter_item['name']).'",'; |
|
| 32 | - $output .= '"city": "'.str_replace('"',"'",$spotter_item['city']).'",'; |
|
| 31 | + $output .= '"name": "'.str_replace('"', "'", $spotter_item['name']).'",'; |
|
| 32 | + $output .= '"city": "'.str_replace('"', "'", $spotter_item['city']).'",'; |
|
| 33 | 33 | $output .= '"country": "'.$spotter_item['country'].'",'; |
| 34 | 34 | $output .= '"altitude": "'.$spotter_item['altitude'].'",'; |
| 35 | - $output .= '"popupContent": "'.str_replace('"',"'",$spotter_item['name']).' : '.str_replace('"',"'",$spotter_item['city']).', '.$spotter_item['country'].'",'; |
|
| 35 | + $output .= '"popupContent": "'.str_replace('"', "'", $spotter_item['name']).' : '.str_replace('"', "'", $spotter_item['city']).', '.$spotter_item['country'].'",'; |
|
| 36 | 36 | if ($spotter_item['type'] == 'large_airport') { |
| 37 | 37 | $output .= '"icon": "'.$globalURL.'/images/airport.png",'; |
| 38 | 38 | } elseif ($spotter_item['type'] == 'heliport') { |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | $output .= '}'; |
| 60 | 60 | $output .= '},'; |
| 61 | 61 | } |
| 62 | - $output = substr($output, 0, -1); |
|
| 62 | + $output = substr($output, 0, -1); |
|
| 63 | 63 | } |
| 64 | 64 | $output .= ']}'; |
| 65 | 65 | print $output; |
@@ -8,18 +8,18 @@ discard block |
||
| 8 | 8 | class update_schema { |
| 9 | 9 | |
| 10 | 10 | public static function update_schedule() { |
| 11 | - $Connection = new Connection(); |
|
| 12 | - $Schedule = new Schedule(); |
|
| 13 | - $query = "SELECT * FROM schedule"; |
|
| 14 | - try { |
|
| 15 | - $sth = $Connection->db->prepare($query); |
|
| 11 | + $Connection = new Connection(); |
|
| 12 | + $Schedule = new Schedule(); |
|
| 13 | + $query = "SELECT * FROM schedule"; |
|
| 14 | + try { |
|
| 15 | + $sth = $Connection->db->prepare($query); |
|
| 16 | 16 | $sth->execute(); |
| 17 | - } catch(PDOException $e) { |
|
| 17 | + } catch(PDOException $e) { |
|
| 18 | 18 | return "error : ".$e->getMessage()."\n"; |
| 19 | - } |
|
| 20 | - while ($row = $sth->fetch(PDO::FETCH_ASSOC)) { |
|
| 21 | - $Schedule->addSchedule($row['ident'],$row['departure_airport_icao'],$row['departure_airport_time'],$row['arrival_airport_icao'],$row['arrival_airport_time']); |
|
| 22 | - } |
|
| 19 | + } |
|
| 20 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) { |
|
| 21 | + $Schedule->addSchedule($row['ident'],$row['departure_airport_icao'],$row['departure_airport_time'],$row['arrival_airport_icao'],$row['arrival_airport_time']); |
|
| 22 | + } |
|
| 23 | 23 | |
| 24 | 24 | } |
| 25 | 25 | /* |
@@ -43,198 +43,198 @@ discard block |
||
| 43 | 43 | } |
| 44 | 44 | */ |
| 45 | 45 | private static function update_from_1() { |
| 46 | - $Connection = new Connection(); |
|
| 47 | - // Add new column to routes table |
|
| 48 | - //$query = "ALTER TABLE `routes` ADD `FromAirport_Time` VARCHAR(10),`ToAirport_Time` VARCHAR(10),`Source` VARCHAR(255),`date_added` DATETIME DEFAULT CURRENT TIMESTAMP,`date_modified` DATETIME,`date_lastseen` DATETIME"; |
|
| 46 | + $Connection = new Connection(); |
|
| 47 | + // Add new column to routes table |
|
| 48 | + //$query = "ALTER TABLE `routes` ADD `FromAirport_Time` VARCHAR(10),`ToAirport_Time` VARCHAR(10),`Source` VARCHAR(255),`date_added` DATETIME DEFAULT CURRENT TIMESTAMP,`date_modified` DATETIME,`date_lastseen` DATETIME"; |
|
| 49 | 49 | $query = "ALTER TABLE `routes` ADD `FromAirport_Time` VARCHAR(10) NULL , ADD `ToAirport_Time` VARCHAR(10) NULL , ADD `Source` VARCHAR(255) NULL, ADD `date_added` timestamp DEFAULT CURRENT_TIMESTAMP, ADD `date_modified` timestamp NULL, ADD `date_lastseen` timestamp NULL"; |
| 50 | - try { |
|
| 51 | - $sth = $Connection->db->prepare($query); |
|
| 52 | - $sth->execute(); |
|
| 53 | - } catch(PDOException $e) { |
|
| 54 | - return "error (add new columns to routes table) : ".$e->getMessage()."\n"; |
|
| 55 | - } |
|
| 56 | - // Copy schedules data to routes table |
|
| 57 | - self::update_schedule(); |
|
| 58 | - // Delete schedule table |
|
| 50 | + try { |
|
| 51 | + $sth = $Connection->db->prepare($query); |
|
| 52 | + $sth->execute(); |
|
| 53 | + } catch(PDOException $e) { |
|
| 54 | + return "error (add new columns to routes table) : ".$e->getMessage()."\n"; |
|
| 55 | + } |
|
| 56 | + // Copy schedules data to routes table |
|
| 57 | + self::update_schedule(); |
|
| 58 | + // Delete schedule table |
|
| 59 | 59 | $query = "DROP TABLE `schedule`"; |
| 60 | - try { |
|
| 61 | - $sth = $Connection->db->prepare($query); |
|
| 62 | - $sth->execute(); |
|
| 63 | - } catch(PDOException $e) { |
|
| 64 | - return "error (delete schedule table) : ".$e->getMessage()."\n"; |
|
| 65 | - } |
|
| 66 | - // Add source column |
|
| 67 | - $query = "ALTER TABLE `aircraft_modes` ADD `Source` VARCHAR(255) NULL"; |
|
| 68 | - try { |
|
| 69 | - $sth = $Connection->db->prepare($query); |
|
| 70 | - $sth->execute(); |
|
| 71 | - } catch(PDOException $e) { |
|
| 72 | - return "error (add source column to aircraft_modes) : ".$e->getMessage()."\n"; |
|
| 73 | - } |
|
| 60 | + try { |
|
| 61 | + $sth = $Connection->db->prepare($query); |
|
| 62 | + $sth->execute(); |
|
| 63 | + } catch(PDOException $e) { |
|
| 64 | + return "error (delete schedule table) : ".$e->getMessage()."\n"; |
|
| 65 | + } |
|
| 66 | + // Add source column |
|
| 67 | + $query = "ALTER TABLE `aircraft_modes` ADD `Source` VARCHAR(255) NULL"; |
|
| 68 | + try { |
|
| 69 | + $sth = $Connection->db->prepare($query); |
|
| 70 | + $sth->execute(); |
|
| 71 | + } catch(PDOException $e) { |
|
| 72 | + return "error (add source column to aircraft_modes) : ".$e->getMessage()."\n"; |
|
| 73 | + } |
|
| 74 | 74 | // Delete unused column |
| 75 | 75 | $query = "ALTER TABLE `aircraft_modes` DROP `SerialNo`, DROP `OperatorFlagCode`, DROP `Manufacturer`, DROP `Type`, DROP `FirstRegDate`, DROP `CurrentRegDate`, DROP `Country`, DROP `PreviousID`, DROP `DeRegDate`, DROP `Status`, DROP `PopularName`, DROP `GenericName`, DROP `AircraftClass`, DROP `Engines`, DROP `OwnershipStatus`, DROP `RegisteredOwners`, DROP `MTOW`, DROP `TotalHours`, DROP `YearBuilt`, DROP `CofACategory`, DROP `CofAExpiry`, DROP `UserNotes`, DROP `Interested`, DROP `UserTag`, DROP `InfoUrl`, DROP `PictureUrl1`, DROP `PictureUrl2`, DROP `PictureUrl3`, DROP `UserBool1`, DROP `UserBool2`, DROP `UserBool3`, DROP `UserBool4`, DROP `UserBool5`, DROP `UserString1`, DROP `UserString2`, DROP `UserString3`, DROP `UserString4`, DROP `UserString5`, DROP `UserInt1`, DROP `UserInt2`, DROP `UserInt3`, DROP `UserInt4`, DROP `UserInt5`"; |
| 76 | - try { |
|
| 77 | - $sth = $Connection->db->prepare($query); |
|
| 78 | - $sth->execute(); |
|
| 79 | - } catch(PDOException $e) { |
|
| 80 | - return "error (Delete unused column of aircraft_modes) : ".$e->getMessage()."\n"; |
|
| 81 | - } |
|
| 76 | + try { |
|
| 77 | + $sth = $Connection->db->prepare($query); |
|
| 78 | + $sth->execute(); |
|
| 79 | + } catch(PDOException $e) { |
|
| 80 | + return "error (Delete unused column of aircraft_modes) : ".$e->getMessage()."\n"; |
|
| 81 | + } |
|
| 82 | 82 | // Add ModeS column |
| 83 | 83 | $query = "ALTER TABLE `spotter_output` ADD `ModeS` VARCHAR(255) NULL"; |
| 84 | - try { |
|
| 85 | - $sth = $Connection->db->prepare($query); |
|
| 86 | - $sth->execute(); |
|
| 87 | - } catch(PDOException $e) { |
|
| 88 | - return "error (Add ModeS column in spotter_output) : ".$e->getMessage()."\n"; |
|
| 89 | - } |
|
| 84 | + try { |
|
| 85 | + $sth = $Connection->db->prepare($query); |
|
| 86 | + $sth->execute(); |
|
| 87 | + } catch(PDOException $e) { |
|
| 88 | + return "error (Add ModeS column in spotter_output) : ".$e->getMessage()."\n"; |
|
| 89 | + } |
|
| 90 | 90 | $query = "ALTER TABLE `spotter_live` ADD `ModeS` VARCHAR(255)"; |
| 91 | - try { |
|
| 92 | - $sth = $Connection->db->prepare($query); |
|
| 93 | - $sth->execute(); |
|
| 94 | - } catch(PDOException $e) { |
|
| 95 | - return "error (Add ModeS column in spotter_live) : ".$e->getMessage()."\n"; |
|
| 96 | - } |
|
| 97 | - // Add auto_increment for aircraft_modes |
|
| 98 | - $query = "ALTER TABLE `aircraft_modes` CHANGE `AircraftID` `AircraftID` INT(11) NOT NULL AUTO_INCREMENT"; |
|
| 99 | - try { |
|
| 100 | - $sth = $Connection->db->prepare($query); |
|
| 101 | - $sth->execute(); |
|
| 102 | - } catch(PDOException $e) { |
|
| 103 | - return "error (Add Auto increment in aircraft_modes) : ".$e->getMessage()."\n"; |
|
| 104 | - } |
|
| 105 | - $error = ''; |
|
| 91 | + try { |
|
| 92 | + $sth = $Connection->db->prepare($query); |
|
| 93 | + $sth->execute(); |
|
| 94 | + } catch(PDOException $e) { |
|
| 95 | + return "error (Add ModeS column in spotter_live) : ".$e->getMessage()."\n"; |
|
| 96 | + } |
|
| 97 | + // Add auto_increment for aircraft_modes |
|
| 98 | + $query = "ALTER TABLE `aircraft_modes` CHANGE `AircraftID` `AircraftID` INT(11) NOT NULL AUTO_INCREMENT"; |
|
| 99 | + try { |
|
| 100 | + $sth = $Connection->db->prepare($query); |
|
| 101 | + $sth->execute(); |
|
| 102 | + } catch(PDOException $e) { |
|
| 103 | + return "error (Add Auto increment in aircraft_modes) : ".$e->getMessage()."\n"; |
|
| 104 | + } |
|
| 105 | + $error = ''; |
|
| 106 | 106 | $error .= create_db::import_file('../db/acars_live.sql'); |
| 107 | 107 | $error .= create_db::import_file('../db/config.sql'); |
| 108 | 108 | // Update schema_version to 2 |
| 109 | 109 | $query = "UPDATE `config` SET `value` = '2' WHERE `name` = 'schema_version'"; |
| 110 | - try { |
|
| 111 | - $sth = $Connection->db->prepare($query); |
|
| 112 | - $sth->execute(); |
|
| 113 | - } catch(PDOException $e) { |
|
| 114 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 115 | - } |
|
| 110 | + try { |
|
| 111 | + $sth = $Connection->db->prepare($query); |
|
| 112 | + $sth->execute(); |
|
| 113 | + } catch(PDOException $e) { |
|
| 114 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 115 | + } |
|
| 116 | 116 | return $error; |
| 117 | - } |
|
| 117 | + } |
|
| 118 | 118 | |
| 119 | 119 | private static function update_from_2() { |
| 120 | - $Connection = new Connection(); |
|
| 121 | - // Add new column decode to acars_live table |
|
| 120 | + $Connection = new Connection(); |
|
| 121 | + // Add new column decode to acars_live table |
|
| 122 | 122 | $query = "ALTER TABLE `acars_live` ADD `decode` TEXT"; |
| 123 | - try { |
|
| 124 | - $sth = $Connection->db->prepare($query); |
|
| 125 | - $sth->execute(); |
|
| 126 | - } catch(PDOException $e) { |
|
| 127 | - return "error (add new columns to routes table) : ".$e->getMessage()."\n"; |
|
| 128 | - } |
|
| 129 | - $error = ''; |
|
| 130 | - // Create table acars_archive |
|
| 123 | + try { |
|
| 124 | + $sth = $Connection->db->prepare($query); |
|
| 125 | + $sth->execute(); |
|
| 126 | + } catch(PDOException $e) { |
|
| 127 | + return "error (add new columns to routes table) : ".$e->getMessage()."\n"; |
|
| 128 | + } |
|
| 129 | + $error = ''; |
|
| 130 | + // Create table acars_archive |
|
| 131 | 131 | $error .= create_db::import_file('../db/acars_archive.sql'); |
| 132 | 132 | // Update schema_version to 3 |
| 133 | 133 | $query = "UPDATE `config` SET `value` = '3' WHERE `name` = 'schema_version'"; |
| 134 | - try { |
|
| 135 | - $sth = $Connection->db->prepare($query); |
|
| 136 | - $sth->execute(); |
|
| 137 | - } catch(PDOException $e) { |
|
| 138 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 139 | - } |
|
| 134 | + try { |
|
| 135 | + $sth = $Connection->db->prepare($query); |
|
| 136 | + $sth->execute(); |
|
| 137 | + } catch(PDOException $e) { |
|
| 138 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 139 | + } |
|
| 140 | 140 | return $error; |
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | private static function update_from_3() { |
| 144 | - $Connection = new Connection(); |
|
| 145 | - // Add default CURRENT_TIMESTAMP to aircraft_modes column FirstCreated |
|
| 144 | + $Connection = new Connection(); |
|
| 145 | + // Add default CURRENT_TIMESTAMP to aircraft_modes column FirstCreated |
|
| 146 | 146 | $query = "ALTER TABLE `aircraft_modes` CHANGE `FirstCreated` `FirstCreated` timestamp DEFAULT CURRENT_TIMESTAMP"; |
| 147 | - try { |
|
| 148 | - $sth = $Connection->db->prepare($query); |
|
| 149 | - $sth->execute(); |
|
| 150 | - } catch(PDOException $e) { |
|
| 151 | - return "error (add new columns to aircraft_modes) : ".$e->getMessage()."\n"; |
|
| 152 | - } |
|
| 153 | - // Add image_source_website column to spotter_image |
|
| 147 | + try { |
|
| 148 | + $sth = $Connection->db->prepare($query); |
|
| 149 | + $sth->execute(); |
|
| 150 | + } catch(PDOException $e) { |
|
| 151 | + return "error (add new columns to aircraft_modes) : ".$e->getMessage()."\n"; |
|
| 152 | + } |
|
| 153 | + // Add image_source_website column to spotter_image |
|
| 154 | 154 | $query = "ALTER TABLE `spotter_image` ADD `image_source_website` VARCHAR(999) NULL"; |
| 155 | - try { |
|
| 156 | - $sth = $Connection->db->prepare($query); |
|
| 157 | - $sth->execute(); |
|
| 158 | - } catch(PDOException $e) { |
|
| 159 | - return "error (add new columns to spotter_image) : ".$e->getMessage()."\n"; |
|
| 160 | - } |
|
| 161 | - $error = ''; |
|
| 155 | + try { |
|
| 156 | + $sth = $Connection->db->prepare($query); |
|
| 157 | + $sth->execute(); |
|
| 158 | + } catch(PDOException $e) { |
|
| 159 | + return "error (add new columns to spotter_image) : ".$e->getMessage()."\n"; |
|
| 160 | + } |
|
| 161 | + $error = ''; |
|
| 162 | 162 | // Update schema_version to 4 |
| 163 | 163 | $query = "UPDATE `config` SET `value` = '4' WHERE `name` = 'schema_version'"; |
| 164 | - try { |
|
| 165 | - $sth = $Connection->db->prepare($query); |
|
| 166 | - $sth->execute(); |
|
| 167 | - } catch(PDOException $e) { |
|
| 168 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 169 | - } |
|
| 164 | + try { |
|
| 165 | + $sth = $Connection->db->prepare($query); |
|
| 166 | + $sth->execute(); |
|
| 167 | + } catch(PDOException $e) { |
|
| 168 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 169 | + } |
|
| 170 | 170 | return $error; |
| 171 | 171 | } |
| 172 | 172 | |
| 173 | 173 | private static function update_from_4() { |
| 174 | - $Connection = new Connection(); |
|
| 174 | + $Connection = new Connection(); |
|
| 175 | 175 | |
| 176 | - $error = ''; |
|
| 177 | - // Create table acars_label |
|
| 176 | + $error = ''; |
|
| 177 | + // Create table acars_label |
|
| 178 | 178 | $error .= create_db::import_file('../db/acars_label.sql'); |
| 179 | 179 | if ($error == '') { |
| 180 | - // Update schema_version to 5 |
|
| 181 | - $query = "UPDATE `config` SET `value` = '5' WHERE `name` = 'schema_version'"; |
|
| 182 | - try { |
|
| 183 | - $sth = $Connection->db->prepare($query); |
|
| 180 | + // Update schema_version to 5 |
|
| 181 | + $query = "UPDATE `config` SET `value` = '5' WHERE `name` = 'schema_version'"; |
|
| 182 | + try { |
|
| 183 | + $sth = $Connection->db->prepare($query); |
|
| 184 | 184 | $sth->execute(); |
| 185 | - } catch(PDOException $e) { |
|
| 185 | + } catch(PDOException $e) { |
|
| 186 | 186 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 187 | - } |
|
| 188 | - } |
|
| 187 | + } |
|
| 188 | + } |
|
| 189 | 189 | return $error; |
| 190 | 190 | } |
| 191 | 191 | |
| 192 | 192 | private static function update_from_5() { |
| 193 | - $Connection = new Connection(); |
|
| 194 | - // Add columns to translation |
|
| 193 | + $Connection = new Connection(); |
|
| 194 | + // Add columns to translation |
|
| 195 | 195 | $query = "ALTER TABLE `translation` ADD `Source` VARCHAR(255) NULL, ADD `date_added` timestamp DEFAULT CURRENT_TIMESTAMP , ADD `date_modified` timestamp DEFAULT CURRENT_TIMESTAMP ;"; |
| 196 | - try { |
|
| 197 | - $sth = $Connection->db->prepare($query); |
|
| 198 | - $sth->execute(); |
|
| 199 | - } catch(PDOException $e) { |
|
| 200 | - return "error (add new columns to translation) : ".$e->getMessage()."\n"; |
|
| 201 | - } |
|
| 202 | - // Add aircraft_shadow column to aircraft |
|
| 203 | - $query = "ALTER TABLE `aircraft` ADD `aircraft_shadow` VARCHAR(255) NULL"; |
|
| 204 | - try { |
|
| 205 | - $sth = $Connection->db->prepare($query); |
|
| 206 | - $sth->execute(); |
|
| 207 | - } catch(PDOException $e) { |
|
| 208 | - return "error (add new column to aircraft) : ".$e->getMessage()."\n"; |
|
| 209 | - } |
|
| 210 | - // Add aircraft_shadow column to spotter_live |
|
| 211 | - $query = "ALTER TABLE `spotter_live` ADD `aircraft_shadow` VARCHAR(255) NULL"; |
|
| 212 | - try { |
|
| 213 | - $sth = $Connection->db->prepare($query); |
|
| 214 | - $sth->execute(); |
|
| 215 | - } catch(PDOException $e) { |
|
| 216 | - return "error (add new column to spotter_live) : ".$e->getMessage()."\n"; |
|
| 217 | - } |
|
| 218 | - $error = ''; |
|
| 219 | - // Update table aircraft |
|
| 196 | + try { |
|
| 197 | + $sth = $Connection->db->prepare($query); |
|
| 198 | + $sth->execute(); |
|
| 199 | + } catch(PDOException $e) { |
|
| 200 | + return "error (add new columns to translation) : ".$e->getMessage()."\n"; |
|
| 201 | + } |
|
| 202 | + // Add aircraft_shadow column to aircraft |
|
| 203 | + $query = "ALTER TABLE `aircraft` ADD `aircraft_shadow` VARCHAR(255) NULL"; |
|
| 204 | + try { |
|
| 205 | + $sth = $Connection->db->prepare($query); |
|
| 206 | + $sth->execute(); |
|
| 207 | + } catch(PDOException $e) { |
|
| 208 | + return "error (add new column to aircraft) : ".$e->getMessage()."\n"; |
|
| 209 | + } |
|
| 210 | + // Add aircraft_shadow column to spotter_live |
|
| 211 | + $query = "ALTER TABLE `spotter_live` ADD `aircraft_shadow` VARCHAR(255) NULL"; |
|
| 212 | + try { |
|
| 213 | + $sth = $Connection->db->prepare($query); |
|
| 214 | + $sth->execute(); |
|
| 215 | + } catch(PDOException $e) { |
|
| 216 | + return "error (add new column to spotter_live) : ".$e->getMessage()."\n"; |
|
| 217 | + } |
|
| 218 | + $error = ''; |
|
| 219 | + // Update table aircraft |
|
| 220 | 220 | $error .= create_db::import_file('../db/aircraft.sql'); |
| 221 | 221 | $error .= create_db::import_file('../db/spotter_archive.sql'); |
| 222 | 222 | |
| 223 | 223 | // Update schema_version to 6 |
| 224 | 224 | $query = "UPDATE `config` SET `value` = '6' WHERE `name` = 'schema_version'"; |
| 225 | - try { |
|
| 226 | - $sth = $Connection->db->prepare($query); |
|
| 227 | - $sth->execute(); |
|
| 228 | - } catch(PDOException $e) { |
|
| 229 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 230 | - } |
|
| 225 | + try { |
|
| 226 | + $sth = $Connection->db->prepare($query); |
|
| 227 | + $sth->execute(); |
|
| 228 | + } catch(PDOException $e) { |
|
| 229 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 230 | + } |
|
| 231 | 231 | return $error; |
| 232 | 232 | } |
| 233 | 233 | |
| 234 | 234 | private static function update_from_6() { |
| 235 | - $Connection = new Connection(); |
|
| 236 | - if (!$Connection->indexExists('spotter_output','flightaware_id')) { |
|
| 237 | - $query = "ALTER TABLE spotter_output ADD INDEX(flightaware_id); |
|
| 235 | + $Connection = new Connection(); |
|
| 236 | + if (!$Connection->indexExists('spotter_output','flightaware_id')) { |
|
| 237 | + $query = "ALTER TABLE spotter_output ADD INDEX(flightaware_id); |
|
| 238 | 238 | ALTER TABLE spotter_output ADD INDEX(date); |
| 239 | 239 | ALTER TABLE spotter_output ADD INDEX(ident); |
| 240 | 240 | ALTER TABLE spotter_live ADD INDEX(flightaware_id); |
@@ -247,147 +247,147 @@ discard block |
||
| 247 | 247 | ALTER TABLE aircraft ADD INDEX(icao); |
| 248 | 248 | ALTER TABLE airport ADD INDEX(icao); |
| 249 | 249 | ALTER TABLE translation ADD INDEX(Operator);"; |
| 250 | - try { |
|
| 251 | - $sth = $Connection->db->prepare($query); |
|
| 250 | + try { |
|
| 251 | + $sth = $Connection->db->prepare($query); |
|
| 252 | 252 | $sth->execute(); |
| 253 | - } catch(PDOException $e) { |
|
| 253 | + } catch(PDOException $e) { |
|
| 254 | 254 | return "error (add some indexes) : ".$e->getMessage()."\n"; |
| 255 | - } |
|
| 256 | - } |
|
| 257 | - $error = ''; |
|
| 258 | - // Update table countries |
|
| 259 | - if ($Connection->tableExists('airspace')) { |
|
| 260 | - $error .= update_db::update_countries(); |
|
| 261 | - if ($error != '') return $error; |
|
| 255 | + } |
|
| 256 | + } |
|
| 257 | + $error = ''; |
|
| 258 | + // Update table countries |
|
| 259 | + if ($Connection->tableExists('airspace')) { |
|
| 260 | + $error .= update_db::update_countries(); |
|
| 261 | + if ($error != '') return $error; |
|
| 262 | 262 | } |
| 263 | 263 | // Update schema_version to 7 |
| 264 | 264 | $query = "UPDATE `config` SET `value` = '7' WHERE `name` = 'schema_version'"; |
| 265 | - try { |
|
| 266 | - $sth = $Connection->db->prepare($query); |
|
| 267 | - $sth->execute(); |
|
| 268 | - } catch(PDOException $e) { |
|
| 269 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 270 | - } |
|
| 265 | + try { |
|
| 266 | + $sth = $Connection->db->prepare($query); |
|
| 267 | + $sth->execute(); |
|
| 268 | + } catch(PDOException $e) { |
|
| 269 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 270 | + } |
|
| 271 | 271 | return $error; |
| 272 | - } |
|
| 272 | + } |
|
| 273 | 273 | |
| 274 | 274 | private static function update_from_7() { |
| 275 | 275 | global $globalDBname, $globalDBdriver; |
| 276 | - $Connection = new Connection(); |
|
| 277 | - $query="ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL; |
|
| 276 | + $Connection = new Connection(); |
|
| 277 | + $query="ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL; |
|
| 278 | 278 | ALTER TABLE spotter_output ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;"; |
| 279 | - try { |
|
| 280 | - $sth = $Connection->db->prepare($query); |
|
| 281 | - $sth->execute(); |
|
| 282 | - } catch(PDOException $e) { |
|
| 283 | - return "error (add pilot column to spotter_live and spotter_output) : ".$e->getMessage()."\n"; |
|
| 284 | - } |
|
| 285 | - if ($globalDBdriver == 'mysql') { |
|
| 286 | - $query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'"; |
|
| 287 | - try { |
|
| 288 | - $sth = $Connection->db->prepare($query); |
|
| 289 | - $sth->execute(); |
|
| 290 | - } catch(PDOException $e) { |
|
| 279 | + try { |
|
| 280 | + $sth = $Connection->db->prepare($query); |
|
| 281 | + $sth->execute(); |
|
| 282 | + } catch(PDOException $e) { |
|
| 283 | + return "error (add pilot column to spotter_live and spotter_output) : ".$e->getMessage()."\n"; |
|
| 284 | + } |
|
| 285 | + if ($globalDBdriver == 'mysql') { |
|
| 286 | + $query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'"; |
|
| 287 | + try { |
|
| 288 | + $sth = $Connection->db->prepare($query); |
|
| 289 | + $sth->execute(); |
|
| 290 | + } catch(PDOException $e) { |
|
| 291 | 291 | return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n"; |
| 292 | - } |
|
| 293 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 294 | - if ($row['engine'] == 'ARCHIVE') { |
|
| 292 | + } |
|
| 293 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 294 | + if ($row['engine'] == 'ARCHIVE') { |
|
| 295 | 295 | $query = "CREATE TABLE copy LIKE spotter_archive; |
| 296 | 296 | ALTER TABLE copy ENGINE=ARCHIVE; |
| 297 | 297 | ALTER TABLE copy ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL; |
| 298 | 298 | INSERT INTO copy SELECT *, '' as pilot_name, '' as pilot_id FROM spotter_archive ORDER BY `spotter_archive_id`; |
| 299 | 299 | DROP TABLE spotter_archive; |
| 300 | 300 | RENAME TABLE copy TO spotter_archive;"; |
| 301 | - } else { |
|
| 302 | - $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL"; |
|
| 303 | - } |
|
| 304 | - } else { |
|
| 305 | - $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL"; |
|
| 306 | - } |
|
| 307 | - try { |
|
| 308 | - $sth = $Connection->db->prepare($query); |
|
| 309 | - $sth->execute(); |
|
| 310 | - } catch(PDOException $e) { |
|
| 311 | - return "error (add pilot column to spotter_archive) : ".$e->getMessage()."\n"; |
|
| 312 | - } |
|
| 301 | + } else { |
|
| 302 | + $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL"; |
|
| 303 | + } |
|
| 304 | + } else { |
|
| 305 | + $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL"; |
|
| 306 | + } |
|
| 307 | + try { |
|
| 308 | + $sth = $Connection->db->prepare($query); |
|
| 309 | + $sth->execute(); |
|
| 310 | + } catch(PDOException $e) { |
|
| 311 | + return "error (add pilot column to spotter_archive) : ".$e->getMessage()."\n"; |
|
| 312 | + } |
|
| 313 | 313 | |
| 314 | - $error = ''; |
|
| 315 | - // Update table aircraft |
|
| 314 | + $error = ''; |
|
| 315 | + // Update table aircraft |
|
| 316 | 316 | $error .= create_db::import_file('../db/source_location.sql'); |
| 317 | 317 | if ($error != '') return $error; |
| 318 | 318 | // Update schema_version to 6 |
| 319 | 319 | $query = "UPDATE `config` SET `value` = '8' WHERE `name` = 'schema_version'"; |
| 320 | - try { |
|
| 321 | - $sth = $Connection->db->prepare($query); |
|
| 322 | - $sth->execute(); |
|
| 323 | - } catch(PDOException $e) { |
|
| 324 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 325 | - } |
|
| 320 | + try { |
|
| 321 | + $sth = $Connection->db->prepare($query); |
|
| 322 | + $sth->execute(); |
|
| 323 | + } catch(PDOException $e) { |
|
| 324 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 325 | + } |
|
| 326 | 326 | return $error; |
| 327 | 327 | } |
| 328 | 328 | |
| 329 | 329 | private static function update_from_8() { |
| 330 | - $Connection = new Connection(); |
|
| 331 | - $error = ''; |
|
| 332 | - // Update table aircraft |
|
| 330 | + $Connection = new Connection(); |
|
| 331 | + $error = ''; |
|
| 332 | + // Update table aircraft |
|
| 333 | 333 | $error .= create_db::import_file('../db/notam.sql'); |
| 334 | 334 | if ($error != '') return $error; |
| 335 | 335 | $query = "DELETE FROM config WHERE name = 'last_update_db'; |
| 336 | 336 | INSERT INTO config (name,value) VALUES ('last_update_db',NOW()); |
| 337 | 337 | DELETE FROM config WHERE name = 'last_update_notam_db'; |
| 338 | 338 | INSERT INTO config (name,value) VALUES ('last_update_notam_db',NOW());"; |
| 339 | - try { |
|
| 340 | - $sth = $Connection->db->prepare($query); |
|
| 341 | - $sth->execute(); |
|
| 342 | - } catch(PDOException $e) { |
|
| 343 | - return "error (insert last_update values) : ".$e->getMessage()."\n"; |
|
| 344 | - } |
|
| 339 | + try { |
|
| 340 | + $sth = $Connection->db->prepare($query); |
|
| 341 | + $sth->execute(); |
|
| 342 | + } catch(PDOException $e) { |
|
| 343 | + return "error (insert last_update values) : ".$e->getMessage()."\n"; |
|
| 344 | + } |
|
| 345 | 345 | $query = "UPDATE `config` SET `value` = '9' WHERE `name` = 'schema_version'"; |
| 346 | - try { |
|
| 347 | - $sth = $Connection->db->prepare($query); |
|
| 348 | - $sth->execute(); |
|
| 349 | - } catch(PDOException $e) { |
|
| 350 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 351 | - } |
|
| 346 | + try { |
|
| 347 | + $sth = $Connection->db->prepare($query); |
|
| 348 | + $sth->execute(); |
|
| 349 | + } catch(PDOException $e) { |
|
| 350 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 351 | + } |
|
| 352 | 352 | return $error; |
| 353 | 353 | } |
| 354 | 354 | |
| 355 | 355 | private static function update_from_9() { |
| 356 | - $Connection = new Connection(); |
|
| 357 | - $query="ALTER TABLE spotter_live ADD verticalrate INT(11) NULL; |
|
| 356 | + $Connection = new Connection(); |
|
| 357 | + $query="ALTER TABLE spotter_live ADD verticalrate INT(11) NULL; |
|
| 358 | 358 | ALTER TABLE spotter_output ADD verticalrate INT(11) NULL;"; |
| 359 | - try { |
|
| 360 | - $sth = $Connection->db->prepare($query); |
|
| 361 | - $sth->execute(); |
|
| 362 | - } catch(PDOException $e) { |
|
| 363 | - return "error (add verticalrate column to spotter_live and spotter_output) : ".$e->getMessage()."\n"; |
|
| 364 | - } |
|
| 359 | + try { |
|
| 360 | + $sth = $Connection->db->prepare($query); |
|
| 361 | + $sth->execute(); |
|
| 362 | + } catch(PDOException $e) { |
|
| 363 | + return "error (add verticalrate column to spotter_live and spotter_output) : ".$e->getMessage()."\n"; |
|
| 364 | + } |
|
| 365 | 365 | $error = ''; |
| 366 | - // Update table atc |
|
| 366 | + // Update table atc |
|
| 367 | 367 | $error .= create_db::import_file('../db/atc.sql'); |
| 368 | 368 | if ($error != '') return $error; |
| 369 | 369 | |
| 370 | 370 | $query = "UPDATE `config` SET `value` = '10' WHERE `name` = 'schema_version'"; |
| 371 | - try { |
|
| 372 | - $sth = $Connection->db->prepare($query); |
|
| 373 | - $sth->execute(); |
|
| 374 | - } catch(PDOException $e) { |
|
| 375 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 376 | - } |
|
| 371 | + try { |
|
| 372 | + $sth = $Connection->db->prepare($query); |
|
| 373 | + $sth->execute(); |
|
| 374 | + } catch(PDOException $e) { |
|
| 375 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 376 | + } |
|
| 377 | 377 | return $error; |
| 378 | 378 | } |
| 379 | 379 | |
| 380 | 380 | private static function update_from_10() { |
| 381 | - $Connection = new Connection(); |
|
| 382 | - $query="ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL"; |
|
| 383 | - try { |
|
| 384 | - $sth = $Connection->db->prepare($query); |
|
| 385 | - $sth->execute(); |
|
| 386 | - } catch(PDOException $e) { |
|
| 387 | - return "error (add new enum to ATC table) : ".$e->getMessage()."\n"; |
|
| 388 | - } |
|
| 381 | + $Connection = new Connection(); |
|
| 382 | + $query="ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL"; |
|
| 383 | + try { |
|
| 384 | + $sth = $Connection->db->prepare($query); |
|
| 385 | + $sth->execute(); |
|
| 386 | + } catch(PDOException $e) { |
|
| 387 | + return "error (add new enum to ATC table) : ".$e->getMessage()."\n"; |
|
| 388 | + } |
|
| 389 | 389 | $error = ''; |
| 390 | - // Add tables |
|
| 390 | + // Add tables |
|
| 391 | 391 | $error .= create_db::import_file('../db/aircraft_owner.sql'); |
| 392 | 392 | if ($error != '') return $error; |
| 393 | 393 | $error .= create_db::import_file('../db/metar.sql'); |
@@ -398,76 +398,76 @@ discard block |
||
| 398 | 398 | if ($error != '') return $error; |
| 399 | 399 | |
| 400 | 400 | $query = "UPDATE `config` SET `value` = '11' WHERE `name` = 'schema_version'"; |
| 401 | - try { |
|
| 402 | - $sth = $Connection->db->prepare($query); |
|
| 403 | - $sth->execute(); |
|
| 404 | - } catch(PDOException $e) { |
|
| 405 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 406 | - } |
|
| 401 | + try { |
|
| 402 | + $sth = $Connection->db->prepare($query); |
|
| 403 | + $sth->execute(); |
|
| 404 | + } catch(PDOException $e) { |
|
| 405 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 406 | + } |
|
| 407 | 407 | return $error; |
| 408 | 408 | } |
| 409 | 409 | |
| 410 | 410 | private static function update_from_11() { |
| 411 | 411 | global $globalDBdriver, $globalDBname; |
| 412 | - $Connection = new Connection(); |
|
| 413 | - $query="ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)"; |
|
| 414 | - try { |
|
| 415 | - $sth = $Connection->db->prepare($query); |
|
| 416 | - $sth->execute(); |
|
| 417 | - } catch(PDOException $e) { |
|
| 418 | - return "error (add owner_name & format_source column to spotter_output) : ".$e->getMessage()."\n"; |
|
| 419 | - } |
|
| 420 | - $query="ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 421 | - try { |
|
| 422 | - $sth = $Connection->db->prepare($query); |
|
| 423 | - $sth->execute(); |
|
| 424 | - } catch(PDOException $e) { |
|
| 425 | - return "error (format_source column to spotter_live) : ".$e->getMessage()."\n"; |
|
| 426 | - } |
|
| 427 | - if ($globalDBdriver == 'mysql') { |
|
| 428 | - $query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'"; |
|
| 429 | - try { |
|
| 430 | - $sth = $Connection->db->prepare($query); |
|
| 431 | - $sth->execute(); |
|
| 432 | - } catch(PDOException $e) { |
|
| 412 | + $Connection = new Connection(); |
|
| 413 | + $query="ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)"; |
|
| 414 | + try { |
|
| 415 | + $sth = $Connection->db->prepare($query); |
|
| 416 | + $sth->execute(); |
|
| 417 | + } catch(PDOException $e) { |
|
| 418 | + return "error (add owner_name & format_source column to spotter_output) : ".$e->getMessage()."\n"; |
|
| 419 | + } |
|
| 420 | + $query="ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 421 | + try { |
|
| 422 | + $sth = $Connection->db->prepare($query); |
|
| 423 | + $sth->execute(); |
|
| 424 | + } catch(PDOException $e) { |
|
| 425 | + return "error (format_source column to spotter_live) : ".$e->getMessage()."\n"; |
|
| 426 | + } |
|
| 427 | + if ($globalDBdriver == 'mysql') { |
|
| 428 | + $query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'"; |
|
| 429 | + try { |
|
| 430 | + $sth = $Connection->db->prepare($query); |
|
| 431 | + $sth->execute(); |
|
| 432 | + } catch(PDOException $e) { |
|
| 433 | 433 | return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n"; |
| 434 | - } |
|
| 435 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 436 | - if ($row['engine'] == 'ARCHIVE') { |
|
| 434 | + } |
|
| 435 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 436 | + if ($row['engine'] == 'ARCHIVE') { |
|
| 437 | 437 | $query = "CREATE TABLE copy LIKE spotter_archive; |
| 438 | 438 | ALTER TABLE copy ENGINE=ARCHIVE; |
| 439 | 439 | ALTER TABLE copy ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE; |
| 440 | 440 | INSERT INTO copy SELECT *, '' as verticalrate, '' as format_source, '0' as ground FROM spotter_archive ORDER BY `spotter_archive_id`; |
| 441 | 441 | DROP TABLE spotter_archive; |
| 442 | 442 | RENAME TABLE copy TO spotter_archive;"; |
| 443 | - } else { |
|
| 444 | - $query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 445 | - } |
|
| 446 | - } else { |
|
| 447 | - $query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 448 | - } |
|
| 449 | - try { |
|
| 450 | - $sth = $Connection->db->prepare($query); |
|
| 451 | - $sth->execute(); |
|
| 452 | - } catch(PDOException $e) { |
|
| 453 | - return "error (add columns to spotter_archive) : ".$e->getMessage()."\n"; |
|
| 454 | - } |
|
| 443 | + } else { |
|
| 444 | + $query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 445 | + } |
|
| 446 | + } else { |
|
| 447 | + $query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 448 | + } |
|
| 449 | + try { |
|
| 450 | + $sth = $Connection->db->prepare($query); |
|
| 451 | + $sth->execute(); |
|
| 452 | + } catch(PDOException $e) { |
|
| 453 | + return "error (add columns to spotter_archive) : ".$e->getMessage()."\n"; |
|
| 454 | + } |
|
| 455 | 455 | |
| 456 | 456 | $error = ''; |
| 457 | 457 | |
| 458 | 458 | $query = "UPDATE `config` SET `value` = '12' WHERE `name` = 'schema_version'"; |
| 459 | - try { |
|
| 460 | - $sth = $Connection->db->prepare($query); |
|
| 461 | - $sth->execute(); |
|
| 462 | - } catch(PDOException $e) { |
|
| 463 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 464 | - } |
|
| 459 | + try { |
|
| 460 | + $sth = $Connection->db->prepare($query); |
|
| 461 | + $sth->execute(); |
|
| 462 | + } catch(PDOException $e) { |
|
| 463 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 464 | + } |
|
| 465 | 465 | return $error; |
| 466 | 466 | } |
| 467 | 467 | private static function update_from_12() { |
| 468 | - $Connection = new Connection(); |
|
| 468 | + $Connection = new Connection(); |
|
| 469 | 469 | $error = ''; |
| 470 | - // Add tables |
|
| 470 | + // Add tables |
|
| 471 | 471 | $error .= create_db::import_file('../db/stats.sql'); |
| 472 | 472 | if ($error != '') return $error; |
| 473 | 473 | $error .= create_db::import_file('../db/stats_aircraft.sql'); |
@@ -484,166 +484,166 @@ discard block |
||
| 484 | 484 | if ($error != '') return $error; |
| 485 | 485 | |
| 486 | 486 | $query = "UPDATE `config` SET `value` = '13' WHERE `name` = 'schema_version'"; |
| 487 | - try { |
|
| 488 | - $sth = $Connection->db->prepare($query); |
|
| 489 | - $sth->execute(); |
|
| 490 | - } catch(PDOException $e) { |
|
| 491 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 492 | - } |
|
| 487 | + try { |
|
| 488 | + $sth = $Connection->db->prepare($query); |
|
| 489 | + $sth->execute(); |
|
| 490 | + } catch(PDOException $e) { |
|
| 491 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 492 | + } |
|
| 493 | 493 | return $error; |
| 494 | 494 | } |
| 495 | 495 | |
| 496 | 496 | private static function update_from_13() { |
| 497 | - $Connection = new Connection(); |
|
| 498 | - if (!$Connection->checkColumnName('spotter_archive_output','real_departure_airport_icao')) { |
|
| 499 | - $query="ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)"; |
|
| 497 | + $Connection = new Connection(); |
|
| 498 | + if (!$Connection->checkColumnName('spotter_archive_output','real_departure_airport_icao')) { |
|
| 499 | + $query="ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)"; |
|
| 500 | 500 | try { |
| 501 | 501 | $sth = $Connection->db->prepare($query); |
| 502 | 502 | $sth->execute(); |
| 503 | - } catch(PDOException $e) { |
|
| 503 | + } catch(PDOException $e) { |
|
| 504 | 504 | return "error (update spotter_archive_output) : ".$e->getMessage()."\n"; |
| 505 | - } |
|
| 505 | + } |
|
| 506 | 506 | } |
| 507 | - $error = ''; |
|
| 507 | + $error = ''; |
|
| 508 | 508 | $query = "UPDATE `config` SET `value` = '14' WHERE `name` = 'schema_version'"; |
| 509 | - try { |
|
| 510 | - $sth = $Connection->db->prepare($query); |
|
| 511 | - $sth->execute(); |
|
| 512 | - } catch(PDOException $e) { |
|
| 513 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 514 | - } |
|
| 509 | + try { |
|
| 510 | + $sth = $Connection->db->prepare($query); |
|
| 511 | + $sth->execute(); |
|
| 512 | + } catch(PDOException $e) { |
|
| 513 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 514 | + } |
|
| 515 | 515 | return $error; |
| 516 | 516 | } |
| 517 | 517 | |
| 518 | 518 | private static function update_from_14() { |
| 519 | - $Connection = new Connection(); |
|
| 519 | + $Connection = new Connection(); |
|
| 520 | 520 | $error = ''; |
| 521 | - // Add tables |
|
| 522 | - if (!$Connection->tableExists('stats_flight')) { |
|
| 521 | + // Add tables |
|
| 522 | + if (!$Connection->tableExists('stats_flight')) { |
|
| 523 | 523 | $error .= create_db::import_file('../db/stats_flight.sql'); |
| 524 | 524 | if ($error != '') return $error; |
| 525 | 525 | } |
| 526 | 526 | $query = "UPDATE `config` SET `value` = '15' WHERE `name` = 'schema_version'"; |
| 527 | - try { |
|
| 528 | - $sth = $Connection->db->prepare($query); |
|
| 529 | - $sth->execute(); |
|
| 530 | - } catch(PDOException $e) { |
|
| 531 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 532 | - } |
|
| 527 | + try { |
|
| 528 | + $sth = $Connection->db->prepare($query); |
|
| 529 | + $sth->execute(); |
|
| 530 | + } catch(PDOException $e) { |
|
| 531 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 532 | + } |
|
| 533 | 533 | return $error; |
| 534 | 534 | } |
| 535 | 535 | |
| 536 | 536 | |
| 537 | 537 | private static function update_from_15() { |
| 538 | - $Connection = new Connection(); |
|
| 538 | + $Connection = new Connection(); |
|
| 539 | 539 | $error = ''; |
| 540 | - // Add tables |
|
| 541 | - $query="ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP"; |
|
| 542 | - try { |
|
| 543 | - $sth = $Connection->db->prepare($query); |
|
| 544 | - $sth->execute(); |
|
| 545 | - } catch(PDOException $e) { |
|
| 546 | - return "error (update stats) : ".$e->getMessage()."\n"; |
|
| 547 | - } |
|
| 540 | + // Add tables |
|
| 541 | + $query="ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP"; |
|
| 542 | + try { |
|
| 543 | + $sth = $Connection->db->prepare($query); |
|
| 544 | + $sth->execute(); |
|
| 545 | + } catch(PDOException $e) { |
|
| 546 | + return "error (update stats) : ".$e->getMessage()."\n"; |
|
| 547 | + } |
|
| 548 | 548 | if ($error != '') return $error; |
| 549 | 549 | $query = "UPDATE `config` SET `value` = '16' WHERE `name` = 'schema_version'"; |
| 550 | - try { |
|
| 551 | - $sth = $Connection->db->prepare($query); |
|
| 552 | - $sth->execute(); |
|
| 553 | - } catch(PDOException $e) { |
|
| 554 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 555 | - } |
|
| 550 | + try { |
|
| 551 | + $sth = $Connection->db->prepare($query); |
|
| 552 | + $sth->execute(); |
|
| 553 | + } catch(PDOException $e) { |
|
| 554 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 555 | + } |
|
| 556 | 556 | return $error; |
| 557 | 557 | } |
| 558 | 558 | |
| 559 | 559 | private static function update_from_16() { |
| 560 | - $Connection = new Connection(); |
|
| 560 | + $Connection = new Connection(); |
|
| 561 | 561 | $error = ''; |
| 562 | - // Add tables |
|
| 563 | - if (!$Connection->tableExists('stats_registration')) { |
|
| 562 | + // Add tables |
|
| 563 | + if (!$Connection->tableExists('stats_registration')) { |
|
| 564 | 564 | $error .= create_db::import_file('../db/stats_registration.sql'); |
| 565 | 565 | } |
| 566 | - if (!$Connection->tableExists('stats_callsign')) { |
|
| 566 | + if (!$Connection->tableExists('stats_callsign')) { |
|
| 567 | 567 | $error .= create_db::import_file('../db/stats_callsign.sql'); |
| 568 | 568 | } |
| 569 | 569 | if ($error != '') return $error; |
| 570 | 570 | $query = "UPDATE `config` SET `value` = '17' WHERE `name` = 'schema_version'"; |
| 571 | - try { |
|
| 572 | - $sth = $Connection->db->prepare($query); |
|
| 573 | - $sth->execute(); |
|
| 574 | - } catch(PDOException $e) { |
|
| 575 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 576 | - } |
|
| 571 | + try { |
|
| 572 | + $sth = $Connection->db->prepare($query); |
|
| 573 | + $sth->execute(); |
|
| 574 | + } catch(PDOException $e) { |
|
| 575 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 576 | + } |
|
| 577 | 577 | return $error; |
| 578 | 578 | } |
| 579 | 579 | |
| 580 | 580 | private static function update_from_17() { |
| 581 | - $Connection = new Connection(); |
|
| 581 | + $Connection = new Connection(); |
|
| 582 | 582 | $error = ''; |
| 583 | - // Add tables |
|
| 584 | - if (!$Connection->tableExists('stats_country')) { |
|
| 583 | + // Add tables |
|
| 584 | + if (!$Connection->tableExists('stats_country')) { |
|
| 585 | 585 | $error .= create_db::import_file('../db/stats_country.sql'); |
| 586 | 586 | } |
| 587 | 587 | if ($error != '') return $error; |
| 588 | 588 | $query = "UPDATE `config` SET `value` = '18' WHERE `name` = 'schema_version'"; |
| 589 | - try { |
|
| 590 | - $sth = $Connection->db->prepare($query); |
|
| 591 | - $sth->execute(); |
|
| 592 | - } catch(PDOException $e) { |
|
| 593 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 594 | - } |
|
| 589 | + try { |
|
| 590 | + $sth = $Connection->db->prepare($query); |
|
| 591 | + $sth->execute(); |
|
| 592 | + } catch(PDOException $e) { |
|
| 593 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 594 | + } |
|
| 595 | 595 | return $error; |
| 596 | 596 | } |
| 597 | 597 | private static function update_from_18() { |
| 598 | - $Connection = new Connection(); |
|
| 598 | + $Connection = new Connection(); |
|
| 599 | 599 | $error = ''; |
| 600 | - // Modify stats_airport table |
|
| 601 | - if (!$Connection->checkColumnName('stats_airport','airport_name')) { |
|
| 602 | - $query = "ALTER TABLE `stats_airport` ADD `stats_type` VARCHAR(50) NOT NULL DEFAULT 'yearly', ADD `airport_name` VARCHAR(255) NOT NULL, ADD `date` DATE NULL DEFAULT NULL, DROP INDEX `airport_icao`, ADD UNIQUE `airport_icao` (`airport_icao`, `type`, `date`)"; |
|
| 603 | - try { |
|
| 604 | - $sth = $Connection->db->prepare($query); |
|
| 605 | - $sth->execute(); |
|
| 606 | - } catch(PDOException $e) { |
|
| 607 | - return "error (update stats) : ".$e->getMessage()."\n"; |
|
| 608 | - } |
|
| 609 | - } |
|
| 600 | + // Modify stats_airport table |
|
| 601 | + if (!$Connection->checkColumnName('stats_airport','airport_name')) { |
|
| 602 | + $query = "ALTER TABLE `stats_airport` ADD `stats_type` VARCHAR(50) NOT NULL DEFAULT 'yearly', ADD `airport_name` VARCHAR(255) NOT NULL, ADD `date` DATE NULL DEFAULT NULL, DROP INDEX `airport_icao`, ADD UNIQUE `airport_icao` (`airport_icao`, `type`, `date`)"; |
|
| 603 | + try { |
|
| 604 | + $sth = $Connection->db->prepare($query); |
|
| 605 | + $sth->execute(); |
|
| 606 | + } catch(PDOException $e) { |
|
| 607 | + return "error (update stats) : ".$e->getMessage()."\n"; |
|
| 608 | + } |
|
| 609 | + } |
|
| 610 | 610 | if ($error != '') return $error; |
| 611 | 611 | $query = "UPDATE `config` SET `value` = '19' WHERE `name` = 'schema_version'"; |
| 612 | - try { |
|
| 613 | - $sth = $Connection->db->prepare($query); |
|
| 614 | - $sth->execute(); |
|
| 615 | - } catch(PDOException $e) { |
|
| 616 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 617 | - } |
|
| 612 | + try { |
|
| 613 | + $sth = $Connection->db->prepare($query); |
|
| 614 | + $sth->execute(); |
|
| 615 | + } catch(PDOException $e) { |
|
| 616 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 617 | + } |
|
| 618 | 618 | return $error; |
| 619 | 619 | } |
| 620 | 620 | |
| 621 | 621 | private static function update_from_19() { |
| 622 | - $Connection = new Connection(); |
|
| 622 | + $Connection = new Connection(); |
|
| 623 | 623 | $error = ''; |
| 624 | - // Update airport table |
|
| 624 | + // Update airport table |
|
| 625 | 625 | $error .= create_db::import_file('../db/airport.sql'); |
| 626 | 626 | if ($error != '') return 'Import airport.sql : '.$error; |
| 627 | 627 | // Remove primary key on Spotter_Archive |
| 628 | 628 | $query = "alter table spotter_archive drop spotter_archive_id"; |
| 629 | - try { |
|
| 630 | - $sth = $Connection->db->prepare($query); |
|
| 631 | - $sth->execute(); |
|
| 632 | - } catch(PDOException $e) { |
|
| 633 | - return "error (remove primary key on spotter_archive) : ".$e->getMessage()."\n"; |
|
| 634 | - } |
|
| 629 | + try { |
|
| 630 | + $sth = $Connection->db->prepare($query); |
|
| 631 | + $sth->execute(); |
|
| 632 | + } catch(PDOException $e) { |
|
| 633 | + return "error (remove primary key on spotter_archive) : ".$e->getMessage()."\n"; |
|
| 634 | + } |
|
| 635 | 635 | $query = "alter table spotter_archive add spotter_archive_id INT(11)"; |
| 636 | - try { |
|
| 637 | - $sth = $Connection->db->prepare($query); |
|
| 638 | - $sth->execute(); |
|
| 639 | - } catch(PDOException $e) { |
|
| 640 | - return "error (add id again on spotter_archive) : ".$e->getMessage()."\n"; |
|
| 641 | - } |
|
| 636 | + try { |
|
| 637 | + $sth = $Connection->db->prepare($query); |
|
| 638 | + $sth->execute(); |
|
| 639 | + } catch(PDOException $e) { |
|
| 640 | + return "error (add id again on spotter_archive) : ".$e->getMessage()."\n"; |
|
| 641 | + } |
|
| 642 | 642 | if (!$Connection->checkColumnName('spotter_archive','over_country')) { |
| 643 | 643 | // Add column over_country |
| 644 | - $query = "ALTER TABLE `spotter_archive` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL"; |
|
| 644 | + $query = "ALTER TABLE `spotter_archive` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL"; |
|
| 645 | 645 | try { |
| 646 | - $sth = $Connection->db->prepare($query); |
|
| 646 | + $sth = $Connection->db->prepare($query); |
|
| 647 | 647 | $sth->execute(); |
| 648 | 648 | } catch(PDOException $e) { |
| 649 | 649 | return "error (add over_country) : ".$e->getMessage()."\n"; |
@@ -651,9 +651,9 @@ discard block |
||
| 651 | 651 | } |
| 652 | 652 | if (!$Connection->checkColumnName('spotter_live','over_country')) { |
| 653 | 653 | // Add column over_country |
| 654 | - $query = "ALTER TABLE `spotter_live` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL"; |
|
| 654 | + $query = "ALTER TABLE `spotter_live` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL"; |
|
| 655 | 655 | try { |
| 656 | - $sth = $Connection->db->prepare($query); |
|
| 656 | + $sth = $Connection->db->prepare($query); |
|
| 657 | 657 | $sth->execute(); |
| 658 | 658 | } catch(PDOException $e) { |
| 659 | 659 | return "error (add over_country) : ".$e->getMessage()."\n"; |
@@ -661,74 +661,74 @@ discard block |
||
| 661 | 661 | } |
| 662 | 662 | if (!$Connection->checkColumnName('spotter_output','source_name')) { |
| 663 | 663 | // Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output |
| 664 | - $query = "ALTER TABLE `spotter_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`"; |
|
| 664 | + $query = "ALTER TABLE `spotter_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`"; |
|
| 665 | 665 | try { |
| 666 | 666 | $sth = $Connection->db->prepare($query); |
| 667 | 667 | $sth->execute(); |
| 668 | 668 | } catch(PDOException $e) { |
| 669 | 669 | return "error (add source_name column) : ".$e->getMessage()."\n"; |
| 670 | - } |
|
| 671 | - } |
|
| 670 | + } |
|
| 671 | + } |
|
| 672 | 672 | if (!$Connection->checkColumnName('spotter_live','source_name')) { |
| 673 | 673 | // Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output |
| 674 | - $query = "ALTER TABLE `spotter_live` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`"; |
|
| 674 | + $query = "ALTER TABLE `spotter_live` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`"; |
|
| 675 | 675 | try { |
| 676 | 676 | $sth = $Connection->db->prepare($query); |
| 677 | 677 | $sth->execute(); |
| 678 | 678 | } catch(PDOException $e) { |
| 679 | 679 | return "error (add source_name column) : ".$e->getMessage()."\n"; |
| 680 | - } |
|
| 681 | - } |
|
| 680 | + } |
|
| 681 | + } |
|
| 682 | 682 | if (!$Connection->checkColumnName('spotter_archive_output','source_name')) { |
| 683 | 683 | // Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output |
| 684 | - $query = "ALTER TABLE `spotter_archive_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`"; |
|
| 684 | + $query = "ALTER TABLE `spotter_archive_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`"; |
|
| 685 | 685 | try { |
| 686 | 686 | $sth = $Connection->db->prepare($query); |
| 687 | 687 | $sth->execute(); |
| 688 | 688 | } catch(PDOException $e) { |
| 689 | 689 | return "error (add source_name column) : ".$e->getMessage()."\n"; |
| 690 | - } |
|
| 691 | - } |
|
| 690 | + } |
|
| 691 | + } |
|
| 692 | 692 | if (!$Connection->checkColumnName('spotter_archive','source_name')) { |
| 693 | 693 | // Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output |
| 694 | - $query = "ALTER TABLE `spotter_archive` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`;"; |
|
| 694 | + $query = "ALTER TABLE `spotter_archive` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`;"; |
|
| 695 | 695 | try { |
| 696 | 696 | $sth = $Connection->db->prepare($query); |
| 697 | 697 | $sth->execute(); |
| 698 | 698 | } catch(PDOException $e) { |
| 699 | 699 | return "error (add source_name column) : ".$e->getMessage()."\n"; |
| 700 | - } |
|
| 701 | - } |
|
| 700 | + } |
|
| 701 | + } |
|
| 702 | 702 | if ($error != '') return $error; |
| 703 | 703 | $query = "UPDATE `config` SET `value` = '20' WHERE `name` = 'schema_version'"; |
| 704 | - try { |
|
| 705 | - $sth = $Connection->db->prepare($query); |
|
| 706 | - $sth->execute(); |
|
| 707 | - } catch(PDOException $e) { |
|
| 708 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 709 | - } |
|
| 704 | + try { |
|
| 705 | + $sth = $Connection->db->prepare($query); |
|
| 706 | + $sth->execute(); |
|
| 707 | + } catch(PDOException $e) { |
|
| 708 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 709 | + } |
|
| 710 | 710 | return $error; |
| 711 | 711 | } |
| 712 | 712 | |
| 713 | 713 | private static function update_from_20() { |
| 714 | 714 | global $globalIVAO, $globalVATSIM, $globalphpVMS; |
| 715 | - $Connection = new Connection(); |
|
| 715 | + $Connection = new Connection(); |
|
| 716 | 716 | $error = ''; |
| 717 | - // Update airline table |
|
| 718 | - if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) { |
|
| 717 | + // Update airline table |
|
| 718 | + if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) { |
|
| 719 | 719 | $error .= create_db::import_file('../db/airlines.sql'); |
| 720 | 720 | if ($error != '') return 'Import airlines.sql : '.$error; |
| 721 | 721 | } |
| 722 | 722 | if (!$Connection->checkColumnName('aircraft_modes','type_flight')) { |
| 723 | 723 | // Add column over_country |
| 724 | - $query = "ALTER TABLE `aircraft_modes` ADD `type_flight` VARCHAR(50) NULL DEFAULT NULL;"; |
|
| 725 | - try { |
|
| 724 | + $query = "ALTER TABLE `aircraft_modes` ADD `type_flight` VARCHAR(50) NULL DEFAULT NULL;"; |
|
| 725 | + try { |
|
| 726 | 726 | $sth = $Connection->db->prepare($query); |
| 727 | 727 | $sth->execute(); |
| 728 | 728 | } catch(PDOException $e) { |
| 729 | 729 | return "error (add over_country) : ".$e->getMessage()."\n"; |
| 730 | - } |
|
| 731 | - } |
|
| 730 | + } |
|
| 731 | + } |
|
| 732 | 732 | if ($error != '') return $error; |
| 733 | 733 | /* |
| 734 | 734 | if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) { |
@@ -738,12 +738,12 @@ discard block |
||
| 738 | 738 | } |
| 739 | 739 | */ |
| 740 | 740 | $query = "UPDATE `config` SET `value` = '21' WHERE `name` = 'schema_version'"; |
| 741 | - try { |
|
| 742 | - $sth = $Connection->db->prepare($query); |
|
| 743 | - $sth->execute(); |
|
| 744 | - } catch(PDOException $e) { |
|
| 745 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 746 | - } |
|
| 741 | + try { |
|
| 742 | + $sth = $Connection->db->prepare($query); |
|
| 743 | + $sth->execute(); |
|
| 744 | + } catch(PDOException $e) { |
|
| 745 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 746 | + } |
|
| 747 | 747 | return $error; |
| 748 | 748 | } |
| 749 | 749 | |
@@ -762,35 +762,35 @@ discard block |
||
| 762 | 762 | if ($error != '') return $error; |
| 763 | 763 | } |
| 764 | 764 | $query = "UPDATE `config` SET `value` = '22' WHERE `name` = 'schema_version'"; |
| 765 | - try { |
|
| 766 | - $sth = $Connection->db->prepare($query); |
|
| 767 | - $sth->execute(); |
|
| 768 | - } catch(PDOException $e) { |
|
| 769 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 770 | - } |
|
| 765 | + try { |
|
| 766 | + $sth = $Connection->db->prepare($query); |
|
| 767 | + $sth->execute(); |
|
| 768 | + } catch(PDOException $e) { |
|
| 769 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 770 | + } |
|
| 771 | 771 | return $error; |
| 772 | 772 | } |
| 773 | 773 | |
| 774 | 774 | private static function update_from_22() { |
| 775 | 775 | global $globalDBdriver; |
| 776 | - $Connection = new Connection(); |
|
| 776 | + $Connection = new Connection(); |
|
| 777 | 777 | $error = ''; |
| 778 | 778 | // Add table stats polar |
| 779 | - if (!$Connection->tableExists('stats_source')) { |
|
| 779 | + if (!$Connection->tableExists('stats_source')) { |
|
| 780 | 780 | if ($globalDBdriver == 'mysql') { |
| 781 | - $error .= create_db::import_file('../db/stats_source.sql'); |
|
| 781 | + $error .= create_db::import_file('../db/stats_source.sql'); |
|
| 782 | 782 | } else { |
| 783 | 783 | $error .= create_db::import_file('../db/pgsql/stats_source.sql'); |
| 784 | 784 | } |
| 785 | 785 | if ($error != '') return $error; |
| 786 | 786 | } |
| 787 | 787 | $query = "UPDATE config SET value = '23' WHERE name = 'schema_version'"; |
| 788 | - try { |
|
| 789 | - $sth = $Connection->db->prepare($query); |
|
| 790 | - $sth->execute(); |
|
| 791 | - } catch(PDOException $e) { |
|
| 792 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 793 | - } |
|
| 788 | + try { |
|
| 789 | + $sth = $Connection->db->prepare($query); |
|
| 790 | + $sth->execute(); |
|
| 791 | + } catch(PDOException $e) { |
|
| 792 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 793 | + } |
|
| 794 | 794 | return $error; |
| 795 | 795 | } |
| 796 | 796 | |
@@ -821,14 +821,14 @@ discard block |
||
| 821 | 821 | } |
| 822 | 822 | if (!$Connection->checkColumnName('stats_aircraft','aircraft_manufacturer')) { |
| 823 | 823 | // Add aircraft_manufacturer to stats_aircraft |
| 824 | - $query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL"; |
|
| 824 | + $query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL"; |
|
| 825 | 825 | try { |
| 826 | 826 | $sth = $Connection->db->prepare($query); |
| 827 | 827 | $sth->execute(); |
| 828 | 828 | } catch(PDOException $e) { |
| 829 | 829 | return "error (add aircraft_manufacturer column) : ".$e->getMessage()."\n"; |
| 830 | - } |
|
| 831 | - } |
|
| 830 | + } |
|
| 831 | + } |
|
| 832 | 832 | |
| 833 | 833 | $query = "UPDATE config SET value = '24' WHERE name = 'schema_version'"; |
| 834 | 834 | try { |
@@ -1176,7 +1176,7 @@ discard block |
||
| 1176 | 1176 | } catch(PDOException $e) { |
| 1177 | 1177 | return "error (add index latitude,longitude on spotter_live) : ".$e->getMessage()."\n"; |
| 1178 | 1178 | } |
| 1179 | - } |
|
| 1179 | + } |
|
| 1180 | 1180 | if (!$Connection->checkColumnName('aircraft','mfr')) { |
| 1181 | 1181 | // Add mfr to aircraft |
| 1182 | 1182 | $query = "ALTER TABLE aircraft ADD mfr VARCHAR(255) NULL"; |
@@ -1250,7 +1250,7 @@ discard block |
||
| 1250 | 1250 | } catch(PDOException $e) { |
| 1251 | 1251 | return "error (add index ref on notam) : ".$e->getMessage()."\n"; |
| 1252 | 1252 | } |
| 1253 | - } |
|
| 1253 | + } |
|
| 1254 | 1254 | if (!$Connection->indexExists('accidents','registration_idx')) { |
| 1255 | 1255 | // Add index key |
| 1256 | 1256 | $query = "create index registration_idx on accidents (registration)"; |
@@ -1260,7 +1260,7 @@ discard block |
||
| 1260 | 1260 | } catch(PDOException $e) { |
| 1261 | 1261 | return "error (add index registration on accidents) : ".$e->getMessage()."\n"; |
| 1262 | 1262 | } |
| 1263 | - } |
|
| 1263 | + } |
|
| 1264 | 1264 | if (!$Connection->indexExists('accidents','rdts')) { |
| 1265 | 1265 | // Add index key |
| 1266 | 1266 | $query = "create index rdts on accidents (registration,date,type,source)"; |
@@ -1270,7 +1270,7 @@ discard block |
||
| 1270 | 1270 | } catch(PDOException $e) { |
| 1271 | 1271 | return "error (add index registration, date, type & source on accidents) : ".$e->getMessage()."\n"; |
| 1272 | 1272 | } |
| 1273 | - } |
|
| 1273 | + } |
|
| 1274 | 1274 | |
| 1275 | 1275 | $query = "UPDATE config SET value = '31' WHERE name = 'schema_version'"; |
| 1276 | 1276 | try { |
@@ -1562,7 +1562,7 @@ discard block |
||
| 1562 | 1562 | } catch(PDOException $e) { |
| 1563 | 1563 | return "error (add index type on accidents) : ".$e->getMessage()."\n"; |
| 1564 | 1564 | } |
| 1565 | - } |
|
| 1565 | + } |
|
| 1566 | 1566 | $query = "UPDATE config SET value = '36' WHERE name = 'schema_version'"; |
| 1567 | 1567 | try { |
| 1568 | 1568 | $sth = $Connection->db->prepare($query); |
@@ -1700,7 +1700,7 @@ discard block |
||
| 1700 | 1700 | } catch(PDOException $e) { |
| 1701 | 1701 | return "error (add index flightaware_id, date on spotter_archive) : ".$e->getMessage()."\n"; |
| 1702 | 1702 | } |
| 1703 | - } |
|
| 1703 | + } |
|
| 1704 | 1704 | $query = "UPDATE config SET value = '38' WHERE name = 'schema_version'"; |
| 1705 | 1705 | try { |
| 1706 | 1706 | $sth = $Connection->db->prepare($query); |
@@ -1712,177 +1712,177 @@ discard block |
||
| 1712 | 1712 | } |
| 1713 | 1713 | |
| 1714 | 1714 | |
| 1715 | - public static function check_version($update = false) { |
|
| 1716 | - global $globalDBname; |
|
| 1717 | - $version = 0; |
|
| 1718 | - $Connection = new Connection(); |
|
| 1719 | - if ($Connection->tableExists('aircraft')) { |
|
| 1720 | - if (!$Connection->tableExists('config')) { |
|
| 1721 | - $version = '1'; |
|
| 1722 | - if ($update) return self::update_from_1(); |
|
| 1723 | - else return $version; |
|
| 1715 | + public static function check_version($update = false) { |
|
| 1716 | + global $globalDBname; |
|
| 1717 | + $version = 0; |
|
| 1718 | + $Connection = new Connection(); |
|
| 1719 | + if ($Connection->tableExists('aircraft')) { |
|
| 1720 | + if (!$Connection->tableExists('config')) { |
|
| 1721 | + $version = '1'; |
|
| 1722 | + if ($update) return self::update_from_1(); |
|
| 1723 | + else return $version; |
|
| 1724 | 1724 | } else { |
| 1725 | - $Connection = new Connection(); |
|
| 1726 | - $query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1"; |
|
| 1727 | - try { |
|
| 1728 | - $sth = $Connection->db->prepare($query); |
|
| 1729 | - $sth->execute(); |
|
| 1730 | - } catch(PDOException $e) { |
|
| 1725 | + $Connection = new Connection(); |
|
| 1726 | + $query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1"; |
|
| 1727 | + try { |
|
| 1728 | + $sth = $Connection->db->prepare($query); |
|
| 1729 | + $sth->execute(); |
|
| 1730 | + } catch(PDOException $e) { |
|
| 1731 | 1731 | return "error : ".$e->getMessage()."\n"; |
| 1732 | - } |
|
| 1733 | - $result = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 1734 | - if ($update) { |
|
| 1735 | - if ($result['value'] == '2') { |
|
| 1736 | - $error = self::update_from_2(); |
|
| 1737 | - if ($error != '') return $error; |
|
| 1738 | - else return self::check_version(true); |
|
| 1739 | - } elseif ($result['value'] == '3') { |
|
| 1740 | - $error = self::update_from_3(); |
|
| 1741 | - if ($error != '') return $error; |
|
| 1742 | - else return self::check_version(true); |
|
| 1743 | - } elseif ($result['value'] == '4') { |
|
| 1744 | - $error = self::update_from_4(); |
|
| 1745 | - if ($error != '') return $error; |
|
| 1746 | - else return self::check_version(true); |
|
| 1747 | - } elseif ($result['value'] == '5') { |
|
| 1748 | - $error = self::update_from_5(); |
|
| 1749 | - if ($error != '') return $error; |
|
| 1750 | - else return self::check_version(true); |
|
| 1751 | - } elseif ($result['value'] == '6') { |
|
| 1752 | - $error = self::update_from_6(); |
|
| 1753 | - if ($error != '') return $error; |
|
| 1754 | - else return self::check_version(true); |
|
| 1755 | - } elseif ($result['value'] == '7') { |
|
| 1756 | - $error = self::update_from_7(); |
|
| 1757 | - if ($error != '') return $error; |
|
| 1758 | - else return self::check_version(true); |
|
| 1759 | - } elseif ($result['value'] == '8') { |
|
| 1760 | - $error = self::update_from_8(); |
|
| 1761 | - if ($error != '') return $error; |
|
| 1762 | - else return self::check_version(true); |
|
| 1763 | - } elseif ($result['value'] == '9') { |
|
| 1764 | - $error = self::update_from_9(); |
|
| 1765 | - if ($error != '') return $error; |
|
| 1766 | - else return self::check_version(true); |
|
| 1767 | - } elseif ($result['value'] == '10') { |
|
| 1768 | - $error = self::update_from_10(); |
|
| 1769 | - if ($error != '') return $error; |
|
| 1770 | - else return self::check_version(true); |
|
| 1771 | - } elseif ($result['value'] == '11') { |
|
| 1772 | - $error = self::update_from_11(); |
|
| 1773 | - if ($error != '') return $error; |
|
| 1774 | - else return self::check_version(true); |
|
| 1775 | - } elseif ($result['value'] == '12') { |
|
| 1776 | - $error = self::update_from_12(); |
|
| 1777 | - if ($error != '') return $error; |
|
| 1778 | - else return self::check_version(true); |
|
| 1779 | - } elseif ($result['value'] == '13') { |
|
| 1780 | - $error = self::update_from_13(); |
|
| 1781 | - if ($error != '') return $error; |
|
| 1782 | - else return self::check_version(true); |
|
| 1783 | - } elseif ($result['value'] == '14') { |
|
| 1784 | - $error = self::update_from_14(); |
|
| 1785 | - if ($error != '') return $error; |
|
| 1786 | - else return self::check_version(true); |
|
| 1787 | - } elseif ($result['value'] == '15') { |
|
| 1788 | - $error = self::update_from_15(); |
|
| 1789 | - if ($error != '') return $error; |
|
| 1790 | - else return self::check_version(true); |
|
| 1791 | - } elseif ($result['value'] == '16') { |
|
| 1792 | - $error = self::update_from_16(); |
|
| 1793 | - if ($error != '') return $error; |
|
| 1794 | - else return self::check_version(true); |
|
| 1795 | - } elseif ($result['value'] == '17') { |
|
| 1796 | - $error = self::update_from_17(); |
|
| 1797 | - if ($error != '') return $error; |
|
| 1798 | - else return self::check_version(true); |
|
| 1799 | - } elseif ($result['value'] == '18') { |
|
| 1800 | - $error = self::update_from_18(); |
|
| 1801 | - if ($error != '') return $error; |
|
| 1802 | - else return self::check_version(true); |
|
| 1803 | - } elseif ($result['value'] == '19') { |
|
| 1804 | - $error = self::update_from_19(); |
|
| 1805 | - if ($error != '') return $error; |
|
| 1806 | - else return self::check_version(true); |
|
| 1807 | - } elseif ($result['value'] == '20') { |
|
| 1808 | - $error = self::update_from_20(); |
|
| 1809 | - if ($error != '') return $error; |
|
| 1810 | - else return self::check_version(true); |
|
| 1811 | - } elseif ($result['value'] == '21') { |
|
| 1812 | - $error = self::update_from_21(); |
|
| 1813 | - if ($error != '') return $error; |
|
| 1814 | - else return self::check_version(true); |
|
| 1815 | - } elseif ($result['value'] == '22') { |
|
| 1816 | - $error = self::update_from_22(); |
|
| 1817 | - if ($error != '') return $error; |
|
| 1818 | - else return self::check_version(true); |
|
| 1819 | - } elseif ($result['value'] == '23') { |
|
| 1820 | - $error = self::update_from_23(); |
|
| 1821 | - if ($error != '') return $error; |
|
| 1822 | - else return self::check_version(true); |
|
| 1823 | - } elseif ($result['value'] == '24') { |
|
| 1824 | - $error = self::update_from_24(); |
|
| 1825 | - if ($error != '') return $error; |
|
| 1826 | - else return self::check_version(true); |
|
| 1827 | - } elseif ($result['value'] == '25') { |
|
| 1828 | - $error = self::update_from_25(); |
|
| 1829 | - if ($error != '') return $error; |
|
| 1830 | - else return self::check_version(true); |
|
| 1831 | - } elseif ($result['value'] == '26') { |
|
| 1832 | - $error = self::update_from_26(); |
|
| 1833 | - if ($error != '') return $error; |
|
| 1834 | - else return self::check_version(true); |
|
| 1835 | - } elseif ($result['value'] == '27') { |
|
| 1836 | - $error = self::update_from_27(); |
|
| 1837 | - if ($error != '') return $error; |
|
| 1838 | - else return self::check_version(true); |
|
| 1839 | - } elseif ($result['value'] == '28') { |
|
| 1840 | - $error = self::update_from_28(); |
|
| 1841 | - if ($error != '') return $error; |
|
| 1842 | - else return self::check_version(true); |
|
| 1843 | - } elseif ($result['value'] == '29') { |
|
| 1844 | - $error = self::update_from_29(); |
|
| 1845 | - if ($error != '') return $error; |
|
| 1846 | - else return self::check_version(true); |
|
| 1847 | - } elseif ($result['value'] == '30') { |
|
| 1848 | - $error = self::update_from_30(); |
|
| 1849 | - if ($error != '') return $error; |
|
| 1850 | - else return self::check_version(true); |
|
| 1851 | - } elseif ($result['value'] == '31') { |
|
| 1852 | - $error = self::update_from_31(); |
|
| 1853 | - if ($error != '') return $error; |
|
| 1854 | - else return self::check_version(true); |
|
| 1855 | - } elseif ($result['value'] == '32') { |
|
| 1856 | - $error = self::update_from_32(); |
|
| 1857 | - if ($error != '') return $error; |
|
| 1858 | - else return self::check_version(true); |
|
| 1859 | - } elseif ($result['value'] == '33') { |
|
| 1860 | - $error = self::update_from_33(); |
|
| 1861 | - if ($error != '') return $error; |
|
| 1862 | - else return self::check_version(true); |
|
| 1863 | - } elseif ($result['value'] == '34') { |
|
| 1864 | - $error = self::update_from_34(); |
|
| 1865 | - if ($error != '') return $error; |
|
| 1866 | - else return self::check_version(true); |
|
| 1867 | - } elseif ($result['value'] == '35') { |
|
| 1868 | - $error = self::update_from_35(); |
|
| 1869 | - if ($error != '') return $error; |
|
| 1870 | - else return self::check_version(true); |
|
| 1871 | - } elseif ($result['value'] == '36') { |
|
| 1872 | - $error = self::update_from_36(); |
|
| 1873 | - if ($error != '') return $error; |
|
| 1874 | - else return self::check_version(true); |
|
| 1875 | - } elseif ($result['value'] == '37') { |
|
| 1876 | - $error = self::update_from_37(); |
|
| 1877 | - if ($error != '') return $error; |
|
| 1878 | - else return self::check_version(true); |
|
| 1879 | - } else return ''; |
|
| 1880 | - } |
|
| 1881 | - else return $result['value']; |
|
| 1732 | + } |
|
| 1733 | + $result = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 1734 | + if ($update) { |
|
| 1735 | + if ($result['value'] == '2') { |
|
| 1736 | + $error = self::update_from_2(); |
|
| 1737 | + if ($error != '') return $error; |
|
| 1738 | + else return self::check_version(true); |
|
| 1739 | + } elseif ($result['value'] == '3') { |
|
| 1740 | + $error = self::update_from_3(); |
|
| 1741 | + if ($error != '') return $error; |
|
| 1742 | + else return self::check_version(true); |
|
| 1743 | + } elseif ($result['value'] == '4') { |
|
| 1744 | + $error = self::update_from_4(); |
|
| 1745 | + if ($error != '') return $error; |
|
| 1746 | + else return self::check_version(true); |
|
| 1747 | + } elseif ($result['value'] == '5') { |
|
| 1748 | + $error = self::update_from_5(); |
|
| 1749 | + if ($error != '') return $error; |
|
| 1750 | + else return self::check_version(true); |
|
| 1751 | + } elseif ($result['value'] == '6') { |
|
| 1752 | + $error = self::update_from_6(); |
|
| 1753 | + if ($error != '') return $error; |
|
| 1754 | + else return self::check_version(true); |
|
| 1755 | + } elseif ($result['value'] == '7') { |
|
| 1756 | + $error = self::update_from_7(); |
|
| 1757 | + if ($error != '') return $error; |
|
| 1758 | + else return self::check_version(true); |
|
| 1759 | + } elseif ($result['value'] == '8') { |
|
| 1760 | + $error = self::update_from_8(); |
|
| 1761 | + if ($error != '') return $error; |
|
| 1762 | + else return self::check_version(true); |
|
| 1763 | + } elseif ($result['value'] == '9') { |
|
| 1764 | + $error = self::update_from_9(); |
|
| 1765 | + if ($error != '') return $error; |
|
| 1766 | + else return self::check_version(true); |
|
| 1767 | + } elseif ($result['value'] == '10') { |
|
| 1768 | + $error = self::update_from_10(); |
|
| 1769 | + if ($error != '') return $error; |
|
| 1770 | + else return self::check_version(true); |
|
| 1771 | + } elseif ($result['value'] == '11') { |
|
| 1772 | + $error = self::update_from_11(); |
|
| 1773 | + if ($error != '') return $error; |
|
| 1774 | + else return self::check_version(true); |
|
| 1775 | + } elseif ($result['value'] == '12') { |
|
| 1776 | + $error = self::update_from_12(); |
|
| 1777 | + if ($error != '') return $error; |
|
| 1778 | + else return self::check_version(true); |
|
| 1779 | + } elseif ($result['value'] == '13') { |
|
| 1780 | + $error = self::update_from_13(); |
|
| 1781 | + if ($error != '') return $error; |
|
| 1782 | + else return self::check_version(true); |
|
| 1783 | + } elseif ($result['value'] == '14') { |
|
| 1784 | + $error = self::update_from_14(); |
|
| 1785 | + if ($error != '') return $error; |
|
| 1786 | + else return self::check_version(true); |
|
| 1787 | + } elseif ($result['value'] == '15') { |
|
| 1788 | + $error = self::update_from_15(); |
|
| 1789 | + if ($error != '') return $error; |
|
| 1790 | + else return self::check_version(true); |
|
| 1791 | + } elseif ($result['value'] == '16') { |
|
| 1792 | + $error = self::update_from_16(); |
|
| 1793 | + if ($error != '') return $error; |
|
| 1794 | + else return self::check_version(true); |
|
| 1795 | + } elseif ($result['value'] == '17') { |
|
| 1796 | + $error = self::update_from_17(); |
|
| 1797 | + if ($error != '') return $error; |
|
| 1798 | + else return self::check_version(true); |
|
| 1799 | + } elseif ($result['value'] == '18') { |
|
| 1800 | + $error = self::update_from_18(); |
|
| 1801 | + if ($error != '') return $error; |
|
| 1802 | + else return self::check_version(true); |
|
| 1803 | + } elseif ($result['value'] == '19') { |
|
| 1804 | + $error = self::update_from_19(); |
|
| 1805 | + if ($error != '') return $error; |
|
| 1806 | + else return self::check_version(true); |
|
| 1807 | + } elseif ($result['value'] == '20') { |
|
| 1808 | + $error = self::update_from_20(); |
|
| 1809 | + if ($error != '') return $error; |
|
| 1810 | + else return self::check_version(true); |
|
| 1811 | + } elseif ($result['value'] == '21') { |
|
| 1812 | + $error = self::update_from_21(); |
|
| 1813 | + if ($error != '') return $error; |
|
| 1814 | + else return self::check_version(true); |
|
| 1815 | + } elseif ($result['value'] == '22') { |
|
| 1816 | + $error = self::update_from_22(); |
|
| 1817 | + if ($error != '') return $error; |
|
| 1818 | + else return self::check_version(true); |
|
| 1819 | + } elseif ($result['value'] == '23') { |
|
| 1820 | + $error = self::update_from_23(); |
|
| 1821 | + if ($error != '') return $error; |
|
| 1822 | + else return self::check_version(true); |
|
| 1823 | + } elseif ($result['value'] == '24') { |
|
| 1824 | + $error = self::update_from_24(); |
|
| 1825 | + if ($error != '') return $error; |
|
| 1826 | + else return self::check_version(true); |
|
| 1827 | + } elseif ($result['value'] == '25') { |
|
| 1828 | + $error = self::update_from_25(); |
|
| 1829 | + if ($error != '') return $error; |
|
| 1830 | + else return self::check_version(true); |
|
| 1831 | + } elseif ($result['value'] == '26') { |
|
| 1832 | + $error = self::update_from_26(); |
|
| 1833 | + if ($error != '') return $error; |
|
| 1834 | + else return self::check_version(true); |
|
| 1835 | + } elseif ($result['value'] == '27') { |
|
| 1836 | + $error = self::update_from_27(); |
|
| 1837 | + if ($error != '') return $error; |
|
| 1838 | + else return self::check_version(true); |
|
| 1839 | + } elseif ($result['value'] == '28') { |
|
| 1840 | + $error = self::update_from_28(); |
|
| 1841 | + if ($error != '') return $error; |
|
| 1842 | + else return self::check_version(true); |
|
| 1843 | + } elseif ($result['value'] == '29') { |
|
| 1844 | + $error = self::update_from_29(); |
|
| 1845 | + if ($error != '') return $error; |
|
| 1846 | + else return self::check_version(true); |
|
| 1847 | + } elseif ($result['value'] == '30') { |
|
| 1848 | + $error = self::update_from_30(); |
|
| 1849 | + if ($error != '') return $error; |
|
| 1850 | + else return self::check_version(true); |
|
| 1851 | + } elseif ($result['value'] == '31') { |
|
| 1852 | + $error = self::update_from_31(); |
|
| 1853 | + if ($error != '') return $error; |
|
| 1854 | + else return self::check_version(true); |
|
| 1855 | + } elseif ($result['value'] == '32') { |
|
| 1856 | + $error = self::update_from_32(); |
|
| 1857 | + if ($error != '') return $error; |
|
| 1858 | + else return self::check_version(true); |
|
| 1859 | + } elseif ($result['value'] == '33') { |
|
| 1860 | + $error = self::update_from_33(); |
|
| 1861 | + if ($error != '') return $error; |
|
| 1862 | + else return self::check_version(true); |
|
| 1863 | + } elseif ($result['value'] == '34') { |
|
| 1864 | + $error = self::update_from_34(); |
|
| 1865 | + if ($error != '') return $error; |
|
| 1866 | + else return self::check_version(true); |
|
| 1867 | + } elseif ($result['value'] == '35') { |
|
| 1868 | + $error = self::update_from_35(); |
|
| 1869 | + if ($error != '') return $error; |
|
| 1870 | + else return self::check_version(true); |
|
| 1871 | + } elseif ($result['value'] == '36') { |
|
| 1872 | + $error = self::update_from_36(); |
|
| 1873 | + if ($error != '') return $error; |
|
| 1874 | + else return self::check_version(true); |
|
| 1875 | + } elseif ($result['value'] == '37') { |
|
| 1876 | + $error = self::update_from_37(); |
|
| 1877 | + if ($error != '') return $error; |
|
| 1878 | + else return self::check_version(true); |
|
| 1879 | + } else return ''; |
|
| 1880 | + } |
|
| 1881 | + else return $result['value']; |
|
| 1882 | 1882 | } |
| 1883 | 1883 | |
| 1884 | - } else return $version; |
|
| 1885 | - } |
|
| 1884 | + } else return $version; |
|
| 1885 | + } |
|
| 1886 | 1886 | |
| 1887 | 1887 | } |
| 1888 | 1888 | //echo update_schema::check_version(); |
@@ -14,11 +14,11 @@ discard block |
||
| 14 | 14 | try { |
| 15 | 15 | $sth = $Connection->db->prepare($query); |
| 16 | 16 | $sth->execute(); |
| 17 | - } catch(PDOException $e) { |
|
| 17 | + } catch (PDOException $e) { |
|
| 18 | 18 | return "error : ".$e->getMessage()."\n"; |
| 19 | 19 | } |
| 20 | 20 | while ($row = $sth->fetch(PDO::FETCH_ASSOC)) { |
| 21 | - $Schedule->addSchedule($row['ident'],$row['departure_airport_icao'],$row['departure_airport_time'],$row['arrival_airport_icao'],$row['arrival_airport_time']); |
|
| 21 | + $Schedule->addSchedule($row['ident'], $row['departure_airport_icao'], $row['departure_airport_time'], $row['arrival_airport_icao'], $row['arrival_airport_time']); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | } |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | try { |
| 51 | 51 | $sth = $Connection->db->prepare($query); |
| 52 | 52 | $sth->execute(); |
| 53 | - } catch(PDOException $e) { |
|
| 53 | + } catch (PDOException $e) { |
|
| 54 | 54 | return "error (add new columns to routes table) : ".$e->getMessage()."\n"; |
| 55 | 55 | } |
| 56 | 56 | // Copy schedules data to routes table |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | try { |
| 61 | 61 | $sth = $Connection->db->prepare($query); |
| 62 | 62 | $sth->execute(); |
| 63 | - } catch(PDOException $e) { |
|
| 63 | + } catch (PDOException $e) { |
|
| 64 | 64 | return "error (delete schedule table) : ".$e->getMessage()."\n"; |
| 65 | 65 | } |
| 66 | 66 | // Add source column |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | try { |
| 69 | 69 | $sth = $Connection->db->prepare($query); |
| 70 | 70 | $sth->execute(); |
| 71 | - } catch(PDOException $e) { |
|
| 71 | + } catch (PDOException $e) { |
|
| 72 | 72 | return "error (add source column to aircraft_modes) : ".$e->getMessage()."\n"; |
| 73 | 73 | } |
| 74 | 74 | // Delete unused column |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | try { |
| 77 | 77 | $sth = $Connection->db->prepare($query); |
| 78 | 78 | $sth->execute(); |
| 79 | - } catch(PDOException $e) { |
|
| 79 | + } catch (PDOException $e) { |
|
| 80 | 80 | return "error (Delete unused column of aircraft_modes) : ".$e->getMessage()."\n"; |
| 81 | 81 | } |
| 82 | 82 | // Add ModeS column |
@@ -84,14 +84,14 @@ discard block |
||
| 84 | 84 | try { |
| 85 | 85 | $sth = $Connection->db->prepare($query); |
| 86 | 86 | $sth->execute(); |
| 87 | - } catch(PDOException $e) { |
|
| 87 | + } catch (PDOException $e) { |
|
| 88 | 88 | return "error (Add ModeS column in spotter_output) : ".$e->getMessage()."\n"; |
| 89 | 89 | } |
| 90 | 90 | $query = "ALTER TABLE `spotter_live` ADD `ModeS` VARCHAR(255)"; |
| 91 | 91 | try { |
| 92 | 92 | $sth = $Connection->db->prepare($query); |
| 93 | 93 | $sth->execute(); |
| 94 | - } catch(PDOException $e) { |
|
| 94 | + } catch (PDOException $e) { |
|
| 95 | 95 | return "error (Add ModeS column in spotter_live) : ".$e->getMessage()."\n"; |
| 96 | 96 | } |
| 97 | 97 | // Add auto_increment for aircraft_modes |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | try { |
| 100 | 100 | $sth = $Connection->db->prepare($query); |
| 101 | 101 | $sth->execute(); |
| 102 | - } catch(PDOException $e) { |
|
| 102 | + } catch (PDOException $e) { |
|
| 103 | 103 | return "error (Add Auto increment in aircraft_modes) : ".$e->getMessage()."\n"; |
| 104 | 104 | } |
| 105 | 105 | $error = ''; |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | try { |
| 111 | 111 | $sth = $Connection->db->prepare($query); |
| 112 | 112 | $sth->execute(); |
| 113 | - } catch(PDOException $e) { |
|
| 113 | + } catch (PDOException $e) { |
|
| 114 | 114 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 115 | 115 | } |
| 116 | 116 | return $error; |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | try { |
| 124 | 124 | $sth = $Connection->db->prepare($query); |
| 125 | 125 | $sth->execute(); |
| 126 | - } catch(PDOException $e) { |
|
| 126 | + } catch (PDOException $e) { |
|
| 127 | 127 | return "error (add new columns to routes table) : ".$e->getMessage()."\n"; |
| 128 | 128 | } |
| 129 | 129 | $error = ''; |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | try { |
| 135 | 135 | $sth = $Connection->db->prepare($query); |
| 136 | 136 | $sth->execute(); |
| 137 | - } catch(PDOException $e) { |
|
| 137 | + } catch (PDOException $e) { |
|
| 138 | 138 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 139 | 139 | } |
| 140 | 140 | return $error; |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | try { |
| 148 | 148 | $sth = $Connection->db->prepare($query); |
| 149 | 149 | $sth->execute(); |
| 150 | - } catch(PDOException $e) { |
|
| 150 | + } catch (PDOException $e) { |
|
| 151 | 151 | return "error (add new columns to aircraft_modes) : ".$e->getMessage()."\n"; |
| 152 | 152 | } |
| 153 | 153 | // Add image_source_website column to spotter_image |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | try { |
| 156 | 156 | $sth = $Connection->db->prepare($query); |
| 157 | 157 | $sth->execute(); |
| 158 | - } catch(PDOException $e) { |
|
| 158 | + } catch (PDOException $e) { |
|
| 159 | 159 | return "error (add new columns to spotter_image) : ".$e->getMessage()."\n"; |
| 160 | 160 | } |
| 161 | 161 | $error = ''; |
@@ -164,7 +164,7 @@ discard block |
||
| 164 | 164 | try { |
| 165 | 165 | $sth = $Connection->db->prepare($query); |
| 166 | 166 | $sth->execute(); |
| 167 | - } catch(PDOException $e) { |
|
| 167 | + } catch (PDOException $e) { |
|
| 168 | 168 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 169 | 169 | } |
| 170 | 170 | return $error; |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | try { |
| 183 | 183 | $sth = $Connection->db->prepare($query); |
| 184 | 184 | $sth->execute(); |
| 185 | - } catch(PDOException $e) { |
|
| 185 | + } catch (PDOException $e) { |
|
| 186 | 186 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 187 | 187 | } |
| 188 | 188 | } |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | try { |
| 197 | 197 | $sth = $Connection->db->prepare($query); |
| 198 | 198 | $sth->execute(); |
| 199 | - } catch(PDOException $e) { |
|
| 199 | + } catch (PDOException $e) { |
|
| 200 | 200 | return "error (add new columns to translation) : ".$e->getMessage()."\n"; |
| 201 | 201 | } |
| 202 | 202 | // Add aircraft_shadow column to aircraft |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | try { |
| 205 | 205 | $sth = $Connection->db->prepare($query); |
| 206 | 206 | $sth->execute(); |
| 207 | - } catch(PDOException $e) { |
|
| 207 | + } catch (PDOException $e) { |
|
| 208 | 208 | return "error (add new column to aircraft) : ".$e->getMessage()."\n"; |
| 209 | 209 | } |
| 210 | 210 | // Add aircraft_shadow column to spotter_live |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | try { |
| 213 | 213 | $sth = $Connection->db->prepare($query); |
| 214 | 214 | $sth->execute(); |
| 215 | - } catch(PDOException $e) { |
|
| 215 | + } catch (PDOException $e) { |
|
| 216 | 216 | return "error (add new column to spotter_live) : ".$e->getMessage()."\n"; |
| 217 | 217 | } |
| 218 | 218 | $error = ''; |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | try { |
| 226 | 226 | $sth = $Connection->db->prepare($query); |
| 227 | 227 | $sth->execute(); |
| 228 | - } catch(PDOException $e) { |
|
| 228 | + } catch (PDOException $e) { |
|
| 229 | 229 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 230 | 230 | } |
| 231 | 231 | return $error; |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | |
| 234 | 234 | private static function update_from_6() { |
| 235 | 235 | $Connection = new Connection(); |
| 236 | - if (!$Connection->indexExists('spotter_output','flightaware_id')) { |
|
| 236 | + if (!$Connection->indexExists('spotter_output', 'flightaware_id')) { |
|
| 237 | 237 | $query = "ALTER TABLE spotter_output ADD INDEX(flightaware_id); |
| 238 | 238 | ALTER TABLE spotter_output ADD INDEX(date); |
| 239 | 239 | ALTER TABLE spotter_output ADD INDEX(ident); |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | try { |
| 251 | 251 | $sth = $Connection->db->prepare($query); |
| 252 | 252 | $sth->execute(); |
| 253 | - } catch(PDOException $e) { |
|
| 253 | + } catch (PDOException $e) { |
|
| 254 | 254 | return "error (add some indexes) : ".$e->getMessage()."\n"; |
| 255 | 255 | } |
| 256 | 256 | } |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | try { |
| 266 | 266 | $sth = $Connection->db->prepare($query); |
| 267 | 267 | $sth->execute(); |
| 268 | - } catch(PDOException $e) { |
|
| 268 | + } catch (PDOException $e) { |
|
| 269 | 269 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 270 | 270 | } |
| 271 | 271 | return $error; |
@@ -274,12 +274,12 @@ discard block |
||
| 274 | 274 | private static function update_from_7() { |
| 275 | 275 | global $globalDBname, $globalDBdriver; |
| 276 | 276 | $Connection = new Connection(); |
| 277 | - $query="ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL; |
|
| 277 | + $query = "ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL; |
|
| 278 | 278 | ALTER TABLE spotter_output ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;"; |
| 279 | 279 | try { |
| 280 | 280 | $sth = $Connection->db->prepare($query); |
| 281 | 281 | $sth->execute(); |
| 282 | - } catch(PDOException $e) { |
|
| 282 | + } catch (PDOException $e) { |
|
| 283 | 283 | return "error (add pilot column to spotter_live and spotter_output) : ".$e->getMessage()."\n"; |
| 284 | 284 | } |
| 285 | 285 | if ($globalDBdriver == 'mysql') { |
@@ -287,7 +287,7 @@ discard block |
||
| 287 | 287 | try { |
| 288 | 288 | $sth = $Connection->db->prepare($query); |
| 289 | 289 | $sth->execute(); |
| 290 | - } catch(PDOException $e) { |
|
| 290 | + } catch (PDOException $e) { |
|
| 291 | 291 | return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n"; |
| 292 | 292 | } |
| 293 | 293 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -299,15 +299,15 @@ discard block |
||
| 299 | 299 | DROP TABLE spotter_archive; |
| 300 | 300 | RENAME TABLE copy TO spotter_archive;"; |
| 301 | 301 | } else { |
| 302 | - $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL"; |
|
| 302 | + $query = "ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL"; |
|
| 303 | 303 | } |
| 304 | 304 | } else { |
| 305 | - $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL"; |
|
| 305 | + $query = "ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL"; |
|
| 306 | 306 | } |
| 307 | 307 | try { |
| 308 | 308 | $sth = $Connection->db->prepare($query); |
| 309 | 309 | $sth->execute(); |
| 310 | - } catch(PDOException $e) { |
|
| 310 | + } catch (PDOException $e) { |
|
| 311 | 311 | return "error (add pilot column to spotter_archive) : ".$e->getMessage()."\n"; |
| 312 | 312 | } |
| 313 | 313 | |
@@ -320,7 +320,7 @@ discard block |
||
| 320 | 320 | try { |
| 321 | 321 | $sth = $Connection->db->prepare($query); |
| 322 | 322 | $sth->execute(); |
| 323 | - } catch(PDOException $e) { |
|
| 323 | + } catch (PDOException $e) { |
|
| 324 | 324 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 325 | 325 | } |
| 326 | 326 | return $error; |
@@ -339,14 +339,14 @@ discard block |
||
| 339 | 339 | try { |
| 340 | 340 | $sth = $Connection->db->prepare($query); |
| 341 | 341 | $sth->execute(); |
| 342 | - } catch(PDOException $e) { |
|
| 342 | + } catch (PDOException $e) { |
|
| 343 | 343 | return "error (insert last_update values) : ".$e->getMessage()."\n"; |
| 344 | 344 | } |
| 345 | 345 | $query = "UPDATE `config` SET `value` = '9' WHERE `name` = 'schema_version'"; |
| 346 | 346 | try { |
| 347 | 347 | $sth = $Connection->db->prepare($query); |
| 348 | 348 | $sth->execute(); |
| 349 | - } catch(PDOException $e) { |
|
| 349 | + } catch (PDOException $e) { |
|
| 350 | 350 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 351 | 351 | } |
| 352 | 352 | return $error; |
@@ -354,12 +354,12 @@ discard block |
||
| 354 | 354 | |
| 355 | 355 | private static function update_from_9() { |
| 356 | 356 | $Connection = new Connection(); |
| 357 | - $query="ALTER TABLE spotter_live ADD verticalrate INT(11) NULL; |
|
| 357 | + $query = "ALTER TABLE spotter_live ADD verticalrate INT(11) NULL; |
|
| 358 | 358 | ALTER TABLE spotter_output ADD verticalrate INT(11) NULL;"; |
| 359 | 359 | try { |
| 360 | 360 | $sth = $Connection->db->prepare($query); |
| 361 | 361 | $sth->execute(); |
| 362 | - } catch(PDOException $e) { |
|
| 362 | + } catch (PDOException $e) { |
|
| 363 | 363 | return "error (add verticalrate column to spotter_live and spotter_output) : ".$e->getMessage()."\n"; |
| 364 | 364 | } |
| 365 | 365 | $error = ''; |
@@ -371,7 +371,7 @@ discard block |
||
| 371 | 371 | try { |
| 372 | 372 | $sth = $Connection->db->prepare($query); |
| 373 | 373 | $sth->execute(); |
| 374 | - } catch(PDOException $e) { |
|
| 374 | + } catch (PDOException $e) { |
|
| 375 | 375 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 376 | 376 | } |
| 377 | 377 | return $error; |
@@ -379,11 +379,11 @@ discard block |
||
| 379 | 379 | |
| 380 | 380 | private static function update_from_10() { |
| 381 | 381 | $Connection = new Connection(); |
| 382 | - $query="ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL"; |
|
| 382 | + $query = "ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL"; |
|
| 383 | 383 | try { |
| 384 | 384 | $sth = $Connection->db->prepare($query); |
| 385 | 385 | $sth->execute(); |
| 386 | - } catch(PDOException $e) { |
|
| 386 | + } catch (PDOException $e) { |
|
| 387 | 387 | return "error (add new enum to ATC table) : ".$e->getMessage()."\n"; |
| 388 | 388 | } |
| 389 | 389 | $error = ''; |
@@ -401,7 +401,7 @@ discard block |
||
| 401 | 401 | try { |
| 402 | 402 | $sth = $Connection->db->prepare($query); |
| 403 | 403 | $sth->execute(); |
| 404 | - } catch(PDOException $e) { |
|
| 404 | + } catch (PDOException $e) { |
|
| 405 | 405 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 406 | 406 | } |
| 407 | 407 | return $error; |
@@ -410,18 +410,18 @@ discard block |
||
| 410 | 410 | private static function update_from_11() { |
| 411 | 411 | global $globalDBdriver, $globalDBname; |
| 412 | 412 | $Connection = new Connection(); |
| 413 | - $query="ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)"; |
|
| 413 | + $query = "ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)"; |
|
| 414 | 414 | try { |
| 415 | 415 | $sth = $Connection->db->prepare($query); |
| 416 | 416 | $sth->execute(); |
| 417 | - } catch(PDOException $e) { |
|
| 417 | + } catch (PDOException $e) { |
|
| 418 | 418 | return "error (add owner_name & format_source column to spotter_output) : ".$e->getMessage()."\n"; |
| 419 | 419 | } |
| 420 | - $query="ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 420 | + $query = "ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 421 | 421 | try { |
| 422 | 422 | $sth = $Connection->db->prepare($query); |
| 423 | 423 | $sth->execute(); |
| 424 | - } catch(PDOException $e) { |
|
| 424 | + } catch (PDOException $e) { |
|
| 425 | 425 | return "error (format_source column to spotter_live) : ".$e->getMessage()."\n"; |
| 426 | 426 | } |
| 427 | 427 | if ($globalDBdriver == 'mysql') { |
@@ -429,7 +429,7 @@ discard block |
||
| 429 | 429 | try { |
| 430 | 430 | $sth = $Connection->db->prepare($query); |
| 431 | 431 | $sth->execute(); |
| 432 | - } catch(PDOException $e) { |
|
| 432 | + } catch (PDOException $e) { |
|
| 433 | 433 | return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n"; |
| 434 | 434 | } |
| 435 | 435 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -441,15 +441,15 @@ discard block |
||
| 441 | 441 | DROP TABLE spotter_archive; |
| 442 | 442 | RENAME TABLE copy TO spotter_archive;"; |
| 443 | 443 | } else { |
| 444 | - $query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 444 | + $query = "ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 445 | 445 | } |
| 446 | 446 | } else { |
| 447 | - $query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 447 | + $query = "ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 448 | 448 | } |
| 449 | 449 | try { |
| 450 | 450 | $sth = $Connection->db->prepare($query); |
| 451 | 451 | $sth->execute(); |
| 452 | - } catch(PDOException $e) { |
|
| 452 | + } catch (PDOException $e) { |
|
| 453 | 453 | return "error (add columns to spotter_archive) : ".$e->getMessage()."\n"; |
| 454 | 454 | } |
| 455 | 455 | |
@@ -459,7 +459,7 @@ discard block |
||
| 459 | 459 | try { |
| 460 | 460 | $sth = $Connection->db->prepare($query); |
| 461 | 461 | $sth->execute(); |
| 462 | - } catch(PDOException $e) { |
|
| 462 | + } catch (PDOException $e) { |
|
| 463 | 463 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 464 | 464 | } |
| 465 | 465 | return $error; |
@@ -487,7 +487,7 @@ discard block |
||
| 487 | 487 | try { |
| 488 | 488 | $sth = $Connection->db->prepare($query); |
| 489 | 489 | $sth->execute(); |
| 490 | - } catch(PDOException $e) { |
|
| 490 | + } catch (PDOException $e) { |
|
| 491 | 491 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 492 | 492 | } |
| 493 | 493 | return $error; |
@@ -495,12 +495,12 @@ discard block |
||
| 495 | 495 | |
| 496 | 496 | private static function update_from_13() { |
| 497 | 497 | $Connection = new Connection(); |
| 498 | - if (!$Connection->checkColumnName('spotter_archive_output','real_departure_airport_icao')) { |
|
| 499 | - $query="ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)"; |
|
| 498 | + if (!$Connection->checkColumnName('spotter_archive_output', 'real_departure_airport_icao')) { |
|
| 499 | + $query = "ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)"; |
|
| 500 | 500 | try { |
| 501 | 501 | $sth = $Connection->db->prepare($query); |
| 502 | 502 | $sth->execute(); |
| 503 | - } catch(PDOException $e) { |
|
| 503 | + } catch (PDOException $e) { |
|
| 504 | 504 | return "error (update spotter_archive_output) : ".$e->getMessage()."\n"; |
| 505 | 505 | } |
| 506 | 506 | } |
@@ -509,7 +509,7 @@ discard block |
||
| 509 | 509 | try { |
| 510 | 510 | $sth = $Connection->db->prepare($query); |
| 511 | 511 | $sth->execute(); |
| 512 | - } catch(PDOException $e) { |
|
| 512 | + } catch (PDOException $e) { |
|
| 513 | 513 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 514 | 514 | } |
| 515 | 515 | return $error; |
@@ -527,7 +527,7 @@ discard block |
||
| 527 | 527 | try { |
| 528 | 528 | $sth = $Connection->db->prepare($query); |
| 529 | 529 | $sth->execute(); |
| 530 | - } catch(PDOException $e) { |
|
| 530 | + } catch (PDOException $e) { |
|
| 531 | 531 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 532 | 532 | } |
| 533 | 533 | return $error; |
@@ -538,11 +538,11 @@ discard block |
||
| 538 | 538 | $Connection = new Connection(); |
| 539 | 539 | $error = ''; |
| 540 | 540 | // Add tables |
| 541 | - $query="ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP"; |
|
| 541 | + $query = "ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP"; |
|
| 542 | 542 | try { |
| 543 | 543 | $sth = $Connection->db->prepare($query); |
| 544 | 544 | $sth->execute(); |
| 545 | - } catch(PDOException $e) { |
|
| 545 | + } catch (PDOException $e) { |
|
| 546 | 546 | return "error (update stats) : ".$e->getMessage()."\n"; |
| 547 | 547 | } |
| 548 | 548 | if ($error != '') return $error; |
@@ -550,7 +550,7 @@ discard block |
||
| 550 | 550 | try { |
| 551 | 551 | $sth = $Connection->db->prepare($query); |
| 552 | 552 | $sth->execute(); |
| 553 | - } catch(PDOException $e) { |
|
| 553 | + } catch (PDOException $e) { |
|
| 554 | 554 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 555 | 555 | } |
| 556 | 556 | return $error; |
@@ -571,7 +571,7 @@ discard block |
||
| 571 | 571 | try { |
| 572 | 572 | $sth = $Connection->db->prepare($query); |
| 573 | 573 | $sth->execute(); |
| 574 | - } catch(PDOException $e) { |
|
| 574 | + } catch (PDOException $e) { |
|
| 575 | 575 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 576 | 576 | } |
| 577 | 577 | return $error; |
@@ -589,7 +589,7 @@ discard block |
||
| 589 | 589 | try { |
| 590 | 590 | $sth = $Connection->db->prepare($query); |
| 591 | 591 | $sth->execute(); |
| 592 | - } catch(PDOException $e) { |
|
| 592 | + } catch (PDOException $e) { |
|
| 593 | 593 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 594 | 594 | } |
| 595 | 595 | return $error; |
@@ -598,12 +598,12 @@ discard block |
||
| 598 | 598 | $Connection = new Connection(); |
| 599 | 599 | $error = ''; |
| 600 | 600 | // Modify stats_airport table |
| 601 | - if (!$Connection->checkColumnName('stats_airport','airport_name')) { |
|
| 601 | + if (!$Connection->checkColumnName('stats_airport', 'airport_name')) { |
|
| 602 | 602 | $query = "ALTER TABLE `stats_airport` ADD `stats_type` VARCHAR(50) NOT NULL DEFAULT 'yearly', ADD `airport_name` VARCHAR(255) NOT NULL, ADD `date` DATE NULL DEFAULT NULL, DROP INDEX `airport_icao`, ADD UNIQUE `airport_icao` (`airport_icao`, `type`, `date`)"; |
| 603 | 603 | try { |
| 604 | 604 | $sth = $Connection->db->prepare($query); |
| 605 | 605 | $sth->execute(); |
| 606 | - } catch(PDOException $e) { |
|
| 606 | + } catch (PDOException $e) { |
|
| 607 | 607 | return "error (update stats) : ".$e->getMessage()."\n"; |
| 608 | 608 | } |
| 609 | 609 | } |
@@ -612,7 +612,7 @@ discard block |
||
| 612 | 612 | try { |
| 613 | 613 | $sth = $Connection->db->prepare($query); |
| 614 | 614 | $sth->execute(); |
| 615 | - } catch(PDOException $e) { |
|
| 615 | + } catch (PDOException $e) { |
|
| 616 | 616 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 617 | 617 | } |
| 618 | 618 | return $error; |
@@ -629,73 +629,73 @@ discard block |
||
| 629 | 629 | try { |
| 630 | 630 | $sth = $Connection->db->prepare($query); |
| 631 | 631 | $sth->execute(); |
| 632 | - } catch(PDOException $e) { |
|
| 632 | + } catch (PDOException $e) { |
|
| 633 | 633 | return "error (remove primary key on spotter_archive) : ".$e->getMessage()."\n"; |
| 634 | 634 | } |
| 635 | 635 | $query = "alter table spotter_archive add spotter_archive_id INT(11)"; |
| 636 | 636 | try { |
| 637 | 637 | $sth = $Connection->db->prepare($query); |
| 638 | 638 | $sth->execute(); |
| 639 | - } catch(PDOException $e) { |
|
| 639 | + } catch (PDOException $e) { |
|
| 640 | 640 | return "error (add id again on spotter_archive) : ".$e->getMessage()."\n"; |
| 641 | 641 | } |
| 642 | - if (!$Connection->checkColumnName('spotter_archive','over_country')) { |
|
| 642 | + if (!$Connection->checkColumnName('spotter_archive', 'over_country')) { |
|
| 643 | 643 | // Add column over_country |
| 644 | 644 | $query = "ALTER TABLE `spotter_archive` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL"; |
| 645 | 645 | try { |
| 646 | 646 | $sth = $Connection->db->prepare($query); |
| 647 | 647 | $sth->execute(); |
| 648 | - } catch(PDOException $e) { |
|
| 648 | + } catch (PDOException $e) { |
|
| 649 | 649 | return "error (add over_country) : ".$e->getMessage()."\n"; |
| 650 | 650 | } |
| 651 | 651 | } |
| 652 | - if (!$Connection->checkColumnName('spotter_live','over_country')) { |
|
| 652 | + if (!$Connection->checkColumnName('spotter_live', 'over_country')) { |
|
| 653 | 653 | // Add column over_country |
| 654 | 654 | $query = "ALTER TABLE `spotter_live` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL"; |
| 655 | 655 | try { |
| 656 | 656 | $sth = $Connection->db->prepare($query); |
| 657 | 657 | $sth->execute(); |
| 658 | - } catch(PDOException $e) { |
|
| 658 | + } catch (PDOException $e) { |
|
| 659 | 659 | return "error (add over_country) : ".$e->getMessage()."\n"; |
| 660 | 660 | } |
| 661 | 661 | } |
| 662 | - if (!$Connection->checkColumnName('spotter_output','source_name')) { |
|
| 662 | + if (!$Connection->checkColumnName('spotter_output', 'source_name')) { |
|
| 663 | 663 | // Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output |
| 664 | 664 | $query = "ALTER TABLE `spotter_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`"; |
| 665 | 665 | try { |
| 666 | 666 | $sth = $Connection->db->prepare($query); |
| 667 | 667 | $sth->execute(); |
| 668 | - } catch(PDOException $e) { |
|
| 668 | + } catch (PDOException $e) { |
|
| 669 | 669 | return "error (add source_name column) : ".$e->getMessage()."\n"; |
| 670 | 670 | } |
| 671 | 671 | } |
| 672 | - if (!$Connection->checkColumnName('spotter_live','source_name')) { |
|
| 672 | + if (!$Connection->checkColumnName('spotter_live', 'source_name')) { |
|
| 673 | 673 | // Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output |
| 674 | 674 | $query = "ALTER TABLE `spotter_live` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`"; |
| 675 | 675 | try { |
| 676 | 676 | $sth = $Connection->db->prepare($query); |
| 677 | 677 | $sth->execute(); |
| 678 | - } catch(PDOException $e) { |
|
| 678 | + } catch (PDOException $e) { |
|
| 679 | 679 | return "error (add source_name column) : ".$e->getMessage()."\n"; |
| 680 | 680 | } |
| 681 | 681 | } |
| 682 | - if (!$Connection->checkColumnName('spotter_archive_output','source_name')) { |
|
| 682 | + if (!$Connection->checkColumnName('spotter_archive_output', 'source_name')) { |
|
| 683 | 683 | // Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output |
| 684 | 684 | $query = "ALTER TABLE `spotter_archive_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`"; |
| 685 | 685 | try { |
| 686 | 686 | $sth = $Connection->db->prepare($query); |
| 687 | 687 | $sth->execute(); |
| 688 | - } catch(PDOException $e) { |
|
| 688 | + } catch (PDOException $e) { |
|
| 689 | 689 | return "error (add source_name column) : ".$e->getMessage()."\n"; |
| 690 | 690 | } |
| 691 | 691 | } |
| 692 | - if (!$Connection->checkColumnName('spotter_archive','source_name')) { |
|
| 692 | + if (!$Connection->checkColumnName('spotter_archive', 'source_name')) { |
|
| 693 | 693 | // Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output |
| 694 | 694 | $query = "ALTER TABLE `spotter_archive` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`;"; |
| 695 | 695 | try { |
| 696 | 696 | $sth = $Connection->db->prepare($query); |
| 697 | 697 | $sth->execute(); |
| 698 | - } catch(PDOException $e) { |
|
| 698 | + } catch (PDOException $e) { |
|
| 699 | 699 | return "error (add source_name column) : ".$e->getMessage()."\n"; |
| 700 | 700 | } |
| 701 | 701 | } |
@@ -704,7 +704,7 @@ discard block |
||
| 704 | 704 | try { |
| 705 | 705 | $sth = $Connection->db->prepare($query); |
| 706 | 706 | $sth->execute(); |
| 707 | - } catch(PDOException $e) { |
|
| 707 | + } catch (PDOException $e) { |
|
| 708 | 708 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 709 | 709 | } |
| 710 | 710 | return $error; |
@@ -719,13 +719,13 @@ discard block |
||
| 719 | 719 | $error .= create_db::import_file('../db/airlines.sql'); |
| 720 | 720 | if ($error != '') return 'Import airlines.sql : '.$error; |
| 721 | 721 | } |
| 722 | - if (!$Connection->checkColumnName('aircraft_modes','type_flight')) { |
|
| 722 | + if (!$Connection->checkColumnName('aircraft_modes', 'type_flight')) { |
|
| 723 | 723 | // Add column over_country |
| 724 | 724 | $query = "ALTER TABLE `aircraft_modes` ADD `type_flight` VARCHAR(50) NULL DEFAULT NULL;"; |
| 725 | 725 | try { |
| 726 | 726 | $sth = $Connection->db->prepare($query); |
| 727 | 727 | $sth->execute(); |
| 728 | - } catch(PDOException $e) { |
|
| 728 | + } catch (PDOException $e) { |
|
| 729 | 729 | return "error (add over_country) : ".$e->getMessage()."\n"; |
| 730 | 730 | } |
| 731 | 731 | } |
@@ -741,7 +741,7 @@ discard block |
||
| 741 | 741 | try { |
| 742 | 742 | $sth = $Connection->db->prepare($query); |
| 743 | 743 | $sth->execute(); |
| 744 | - } catch(PDOException $e) { |
|
| 744 | + } catch (PDOException $e) { |
|
| 745 | 745 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 746 | 746 | } |
| 747 | 747 | return $error; |
@@ -750,13 +750,13 @@ discard block |
||
| 750 | 750 | private static function update_from_21() { |
| 751 | 751 | $Connection = new Connection(); |
| 752 | 752 | $error = ''; |
| 753 | - if (!$Connection->checkColumnName('stats_airport','stats_type')) { |
|
| 753 | + if (!$Connection->checkColumnName('stats_airport', 'stats_type')) { |
|
| 754 | 754 | // Rename type to stats_type |
| 755 | 755 | $query = "ALTER TABLE `stats_airport` CHANGE `type` `stats_type` VARCHAR(50);ALTER TABLE `stats` CHANGE `type` `stats_type` VARCHAR(50);ALTER TABLE `stats_flight` CHANGE `type` `stats_type` VARCHAR(50);"; |
| 756 | 756 | try { |
| 757 | 757 | $sth = $Connection->db->prepare($query); |
| 758 | 758 | $sth->execute(); |
| 759 | - } catch(PDOException $e) { |
|
| 759 | + } catch (PDOException $e) { |
|
| 760 | 760 | return "error (rename type to stats_type on stats*) : ".$e->getMessage()."\n"; |
| 761 | 761 | } |
| 762 | 762 | if ($error != '') return $error; |
@@ -765,7 +765,7 @@ discard block |
||
| 765 | 765 | try { |
| 766 | 766 | $sth = $Connection->db->prepare($query); |
| 767 | 767 | $sth->execute(); |
| 768 | - } catch(PDOException $e) { |
|
| 768 | + } catch (PDOException $e) { |
|
| 769 | 769 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 770 | 770 | } |
| 771 | 771 | return $error; |
@@ -788,7 +788,7 @@ discard block |
||
| 788 | 788 | try { |
| 789 | 789 | $sth = $Connection->db->prepare($query); |
| 790 | 790 | $sth->execute(); |
| 791 | - } catch(PDOException $e) { |
|
| 791 | + } catch (PDOException $e) { |
|
| 792 | 792 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 793 | 793 | } |
| 794 | 794 | return $error; |
@@ -815,17 +815,17 @@ discard block |
||
| 815 | 815 | try { |
| 816 | 816 | $sth = $Connection->db->prepare($query); |
| 817 | 817 | $sth->execute(); |
| 818 | - } catch(PDOException $e) { |
|
| 818 | + } catch (PDOException $e) { |
|
| 819 | 819 | return "error (create index on spotter_archive) : ".$e->getMessage()."\n"; |
| 820 | 820 | } |
| 821 | 821 | } |
| 822 | - if (!$Connection->checkColumnName('stats_aircraft','aircraft_manufacturer')) { |
|
| 822 | + if (!$Connection->checkColumnName('stats_aircraft', 'aircraft_manufacturer')) { |
|
| 823 | 823 | // Add aircraft_manufacturer to stats_aircraft |
| 824 | 824 | $query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL"; |
| 825 | 825 | try { |
| 826 | 826 | $sth = $Connection->db->prepare($query); |
| 827 | 827 | $sth->execute(); |
| 828 | - } catch(PDOException $e) { |
|
| 828 | + } catch (PDOException $e) { |
|
| 829 | 829 | return "error (add aircraft_manufacturer column) : ".$e->getMessage()."\n"; |
| 830 | 830 | } |
| 831 | 831 | } |
@@ -834,7 +834,7 @@ discard block |
||
| 834 | 834 | try { |
| 835 | 835 | $sth = $Connection->db->prepare($query); |
| 836 | 836 | $sth->execute(); |
| 837 | - } catch(PDOException $e) { |
|
| 837 | + } catch (PDOException $e) { |
|
| 838 | 838 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 839 | 839 | } |
| 840 | 840 | return $error; |
@@ -850,23 +850,23 @@ discard block |
||
| 850 | 850 | $error .= create_db::import_file('../db/pgsql/airlines.sql'); |
| 851 | 851 | } |
| 852 | 852 | if ($error != '') return 'Import airlines.sql : '.$error; |
| 853 | - if (!$Connection->checkColumnName('airlines','forsource')) { |
|
| 853 | + if (!$Connection->checkColumnName('airlines', 'forsource')) { |
|
| 854 | 854 | // Add forsource to airlines |
| 855 | 855 | $query = "ALTER TABLE airlines ADD forsource VARCHAR(255) NULL DEFAULT NULL"; |
| 856 | 856 | try { |
| 857 | 857 | $sth = $Connection->db->prepare($query); |
| 858 | 858 | $sth->execute(); |
| 859 | - } catch(PDOException $e) { |
|
| 859 | + } catch (PDOException $e) { |
|
| 860 | 860 | return "error (add forsource column) : ".$e->getMessage()."\n"; |
| 861 | 861 | } |
| 862 | 862 | } |
| 863 | - if (!$Connection->checkColumnName('stats_aircraft','stats_airline')) { |
|
| 863 | + if (!$Connection->checkColumnName('stats_aircraft', 'stats_airline')) { |
|
| 864 | 864 | // Add forsource to airlines |
| 865 | 865 | $query = "ALTER TABLE stats_aircraft ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 866 | 866 | try { |
| 867 | 867 | $sth = $Connection->db->prepare($query); |
| 868 | 868 | $sth->execute(); |
| 869 | - } catch(PDOException $e) { |
|
| 869 | + } catch (PDOException $e) { |
|
| 870 | 870 | return "error (add stats_airline & filter_name column in stats_aircraft) : ".$e->getMessage()."\n"; |
| 871 | 871 | } |
| 872 | 872 | // Add unique key |
@@ -878,17 +878,17 @@ discard block |
||
| 878 | 878 | try { |
| 879 | 879 | $sth = $Connection->db->prepare($query); |
| 880 | 880 | $sth->execute(); |
| 881 | - } catch(PDOException $e) { |
|
| 881 | + } catch (PDOException $e) { |
|
| 882 | 882 | return "error (add unique key in stats_aircraft) : ".$e->getMessage()."\n"; |
| 883 | 883 | } |
| 884 | 884 | } |
| 885 | - if (!$Connection->checkColumnName('stats_airport','stats_airline')) { |
|
| 885 | + if (!$Connection->checkColumnName('stats_airport', 'stats_airline')) { |
|
| 886 | 886 | // Add forsource to airlines |
| 887 | 887 | $query = "ALTER TABLE stats_airport ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 888 | 888 | try { |
| 889 | 889 | $sth = $Connection->db->prepare($query); |
| 890 | 890 | $sth->execute(); |
| 891 | - } catch(PDOException $e) { |
|
| 891 | + } catch (PDOException $e) { |
|
| 892 | 892 | return "error (add filter_name column in stats_airport) : ".$e->getMessage()."\n"; |
| 893 | 893 | } |
| 894 | 894 | // Add unique key |
@@ -900,17 +900,17 @@ discard block |
||
| 900 | 900 | try { |
| 901 | 901 | $sth = $Connection->db->prepare($query); |
| 902 | 902 | $sth->execute(); |
| 903 | - } catch(PDOException $e) { |
|
| 903 | + } catch (PDOException $e) { |
|
| 904 | 904 | return "error (add unique key in stats_airport) : ".$e->getMessage()."\n"; |
| 905 | 905 | } |
| 906 | 906 | } |
| 907 | - if (!$Connection->checkColumnName('stats_country','stats_airline')) { |
|
| 907 | + if (!$Connection->checkColumnName('stats_country', 'stats_airline')) { |
|
| 908 | 908 | // Add forsource to airlines |
| 909 | 909 | $query = "ALTER TABLE stats_country ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 910 | 910 | try { |
| 911 | 911 | $sth = $Connection->db->prepare($query); |
| 912 | 912 | $sth->execute(); |
| 913 | - } catch(PDOException $e) { |
|
| 913 | + } catch (PDOException $e) { |
|
| 914 | 914 | return "error (add stats_airline & filter_name column in stats_country) : ".$e->getMessage()."\n"; |
| 915 | 915 | } |
| 916 | 916 | // Add unique key |
@@ -922,36 +922,36 @@ discard block |
||
| 922 | 922 | try { |
| 923 | 923 | $sth = $Connection->db->prepare($query); |
| 924 | 924 | $sth->execute(); |
| 925 | - } catch(PDOException $e) { |
|
| 925 | + } catch (PDOException $e) { |
|
| 926 | 926 | return "error (add unique key in stats_airline) : ".$e->getMessage()."\n"; |
| 927 | 927 | } |
| 928 | 928 | } |
| 929 | - if (!$Connection->checkColumnName('stats_flight','stats_airline')) { |
|
| 929 | + if (!$Connection->checkColumnName('stats_flight', 'stats_airline')) { |
|
| 930 | 930 | // Add forsource to airlines |
| 931 | 931 | $query = "ALTER TABLE stats_flight ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 932 | 932 | try { |
| 933 | 933 | $sth = $Connection->db->prepare($query); |
| 934 | 934 | $sth->execute(); |
| 935 | - } catch(PDOException $e) { |
|
| 935 | + } catch (PDOException $e) { |
|
| 936 | 936 | return "error (add stats_airline & filter_name column in stats_flight) : ".$e->getMessage()."\n"; |
| 937 | 937 | } |
| 938 | 938 | } |
| 939 | - if (!$Connection->checkColumnName('stats','stats_airline')) { |
|
| 939 | + if (!$Connection->checkColumnName('stats', 'stats_airline')) { |
|
| 940 | 940 | // Add forsource to airlines |
| 941 | 941 | $query = "ALTER TABLE stats ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 942 | 942 | try { |
| 943 | 943 | $sth = $Connection->db->prepare($query); |
| 944 | 944 | $sth->execute(); |
| 945 | - } catch(PDOException $e) { |
|
| 945 | + } catch (PDOException $e) { |
|
| 946 | 946 | return "error (add stats_airline & filter_name column in stats) : ".$e->getMessage()."\n"; |
| 947 | 947 | } |
| 948 | - if ($globalDBdriver == 'mysql' && $Connection->indexExists('stats','type')) { |
|
| 948 | + if ($globalDBdriver == 'mysql' && $Connection->indexExists('stats', 'type')) { |
|
| 949 | 949 | // Add unique key |
| 950 | 950 | $query = "drop index type on stats;ALTER TABLE stats ADD UNIQUE stats_type (stats_type,stats_date,stats_airline,filter_name);"; |
| 951 | 951 | try { |
| 952 | 952 | $sth = $Connection->db->prepare($query); |
| 953 | 953 | $sth->execute(); |
| 954 | - } catch(PDOException $e) { |
|
| 954 | + } catch (PDOException $e) { |
|
| 955 | 955 | return "error (add unique key in stats) : ".$e->getMessage()."\n"; |
| 956 | 956 | } |
| 957 | 957 | } else { |
@@ -964,18 +964,18 @@ discard block |
||
| 964 | 964 | try { |
| 965 | 965 | $sth = $Connection->db->prepare($query); |
| 966 | 966 | $sth->execute(); |
| 967 | - } catch(PDOException $e) { |
|
| 967 | + } catch (PDOException $e) { |
|
| 968 | 968 | return "error (add unique key in stats) : ".$e->getMessage()."\n"; |
| 969 | 969 | } |
| 970 | 970 | } |
| 971 | 971 | } |
| 972 | - if (!$Connection->checkColumnName('stats_registration','stats_airline')) { |
|
| 972 | + if (!$Connection->checkColumnName('stats_registration', 'stats_airline')) { |
|
| 973 | 973 | // Add forsource to airlines |
| 974 | 974 | $query = "ALTER TABLE stats_registration ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 975 | 975 | try { |
| 976 | 976 | $sth = $Connection->db->prepare($query); |
| 977 | 977 | $sth->execute(); |
| 978 | - } catch(PDOException $e) { |
|
| 978 | + } catch (PDOException $e) { |
|
| 979 | 979 | return "error (add stats_airline & filter_name column in stats_registration) : ".$e->getMessage()."\n"; |
| 980 | 980 | } |
| 981 | 981 | // Add unique key |
@@ -987,17 +987,17 @@ discard block |
||
| 987 | 987 | try { |
| 988 | 988 | $sth = $Connection->db->prepare($query); |
| 989 | 989 | $sth->execute(); |
| 990 | - } catch(PDOException $e) { |
|
| 990 | + } catch (PDOException $e) { |
|
| 991 | 991 | return "error (add unique key in stats_registration) : ".$e->getMessage()."\n"; |
| 992 | 992 | } |
| 993 | 993 | } |
| 994 | - if (!$Connection->checkColumnName('stats_callsign','filter_name')) { |
|
| 994 | + if (!$Connection->checkColumnName('stats_callsign', 'filter_name')) { |
|
| 995 | 995 | // Add forsource to airlines |
| 996 | 996 | $query = "ALTER TABLE stats_callsign ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 997 | 997 | try { |
| 998 | 998 | $sth = $Connection->db->prepare($query); |
| 999 | 999 | $sth->execute(); |
| 1000 | - } catch(PDOException $e) { |
|
| 1000 | + } catch (PDOException $e) { |
|
| 1001 | 1001 | return "error (add filter_name column in stats_callsign) : ".$e->getMessage()."\n"; |
| 1002 | 1002 | } |
| 1003 | 1003 | // Add unique key |
@@ -1009,17 +1009,17 @@ discard block |
||
| 1009 | 1009 | try { |
| 1010 | 1010 | $sth = $Connection->db->prepare($query); |
| 1011 | 1011 | $sth->execute(); |
| 1012 | - } catch(PDOException $e) { |
|
| 1012 | + } catch (PDOException $e) { |
|
| 1013 | 1013 | return "error (add unique key in stats_callsign) : ".$e->getMessage()."\n"; |
| 1014 | 1014 | } |
| 1015 | 1015 | } |
| 1016 | - if (!$Connection->checkColumnName('stats_airline','filter_name')) { |
|
| 1016 | + if (!$Connection->checkColumnName('stats_airline', 'filter_name')) { |
|
| 1017 | 1017 | // Add forsource to airlines |
| 1018 | 1018 | $query = "ALTER TABLE stats_airline ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 1019 | 1019 | try { |
| 1020 | 1020 | $sth = $Connection->db->prepare($query); |
| 1021 | 1021 | $sth->execute(); |
| 1022 | - } catch(PDOException $e) { |
|
| 1022 | + } catch (PDOException $e) { |
|
| 1023 | 1023 | return "error (add filter_name column in stats_airline) : ".$e->getMessage()."\n"; |
| 1024 | 1024 | } |
| 1025 | 1025 | // Add unique key |
@@ -1031,7 +1031,7 @@ discard block |
||
| 1031 | 1031 | try { |
| 1032 | 1032 | $sth = $Connection->db->prepare($query); |
| 1033 | 1033 | $sth->execute(); |
| 1034 | - } catch(PDOException $e) { |
|
| 1034 | + } catch (PDOException $e) { |
|
| 1035 | 1035 | return "error (add unique key in stats_callsign) : ".$e->getMessage()."\n"; |
| 1036 | 1036 | } |
| 1037 | 1037 | } |
@@ -1040,7 +1040,7 @@ discard block |
||
| 1040 | 1040 | try { |
| 1041 | 1041 | $sth = $Connection->db->prepare($query); |
| 1042 | 1042 | $sth->execute(); |
| 1043 | - } catch(PDOException $e) { |
|
| 1043 | + } catch (PDOException $e) { |
|
| 1044 | 1044 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1045 | 1045 | } |
| 1046 | 1046 | return $error; |
@@ -1050,13 +1050,13 @@ discard block |
||
| 1050 | 1050 | global $globalDBdriver; |
| 1051 | 1051 | $Connection = new Connection(); |
| 1052 | 1052 | $error = ''; |
| 1053 | - if (!$Connection->checkColumnName('stats_owner','stats_airline')) { |
|
| 1053 | + if (!$Connection->checkColumnName('stats_owner', 'stats_airline')) { |
|
| 1054 | 1054 | // Add forsource to airlines |
| 1055 | 1055 | $query = "ALTER TABLE stats_owner ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 1056 | 1056 | try { |
| 1057 | 1057 | $sth = $Connection->db->prepare($query); |
| 1058 | 1058 | $sth->execute(); |
| 1059 | - } catch(PDOException $e) { |
|
| 1059 | + } catch (PDOException $e) { |
|
| 1060 | 1060 | return "error (add stats_airline & filter_name column in stats_owner) : ".$e->getMessage()."\n"; |
| 1061 | 1061 | } |
| 1062 | 1062 | // Add unique key |
@@ -1068,17 +1068,17 @@ discard block |
||
| 1068 | 1068 | try { |
| 1069 | 1069 | $sth = $Connection->db->prepare($query); |
| 1070 | 1070 | $sth->execute(); |
| 1071 | - } catch(PDOException $e) { |
|
| 1071 | + } catch (PDOException $e) { |
|
| 1072 | 1072 | return "error (add unique key in stats_owner) : ".$e->getMessage()."\n"; |
| 1073 | 1073 | } |
| 1074 | 1074 | } |
| 1075 | - if (!$Connection->checkColumnName('stats_pilot','stats_airline')) { |
|
| 1075 | + if (!$Connection->checkColumnName('stats_pilot', 'stats_airline')) { |
|
| 1076 | 1076 | // Add forsource to airlines |
| 1077 | 1077 | $query = "ALTER TABLE stats_pilot ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 1078 | 1078 | try { |
| 1079 | 1079 | $sth = $Connection->db->prepare($query); |
| 1080 | 1080 | $sth->execute(); |
| 1081 | - } catch(PDOException $e) { |
|
| 1081 | + } catch (PDOException $e) { |
|
| 1082 | 1082 | return "error (add stats_airline & filter_name column in stats_pilot) : ".$e->getMessage()."\n"; |
| 1083 | 1083 | } |
| 1084 | 1084 | // Add unique key |
@@ -1090,7 +1090,7 @@ discard block |
||
| 1090 | 1090 | try { |
| 1091 | 1091 | $sth = $Connection->db->prepare($query); |
| 1092 | 1092 | $sth->execute(); |
| 1093 | - } catch(PDOException $e) { |
|
| 1093 | + } catch (PDOException $e) { |
|
| 1094 | 1094 | return "error (add unique key in stats_pilot) : ".$e->getMessage()."\n"; |
| 1095 | 1095 | } |
| 1096 | 1096 | } |
@@ -1098,7 +1098,7 @@ discard block |
||
| 1098 | 1098 | try { |
| 1099 | 1099 | $sth = $Connection->db->prepare($query); |
| 1100 | 1100 | $sth->execute(); |
| 1101 | - } catch(PDOException $e) { |
|
| 1101 | + } catch (PDOException $e) { |
|
| 1102 | 1102 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1103 | 1103 | } |
| 1104 | 1104 | return $error; |
@@ -1108,12 +1108,12 @@ discard block |
||
| 1108 | 1108 | global $globalDBdriver; |
| 1109 | 1109 | $Connection = new Connection(); |
| 1110 | 1110 | $error = ''; |
| 1111 | - if (!$Connection->checkColumnName('atc','format_source')) { |
|
| 1111 | + if (!$Connection->checkColumnName('atc', 'format_source')) { |
|
| 1112 | 1112 | $query = "ALTER TABLE atc ADD format_source VARCHAR(255) DEFAULT NULL, ADD source_name VARCHAR(255) DEFAULT NULL"; |
| 1113 | 1113 | try { |
| 1114 | 1114 | $sth = $Connection->db->prepare($query); |
| 1115 | 1115 | $sth->execute(); |
| 1116 | - } catch(PDOException $e) { |
|
| 1116 | + } catch (PDOException $e) { |
|
| 1117 | 1117 | return "error (add format_source & source_name column in atc) : ".$e->getMessage()."\n"; |
| 1118 | 1118 | } |
| 1119 | 1119 | } |
@@ -1121,7 +1121,7 @@ discard block |
||
| 1121 | 1121 | try { |
| 1122 | 1122 | $sth = $Connection->db->prepare($query); |
| 1123 | 1123 | $sth->execute(); |
| 1124 | - } catch(PDOException $e) { |
|
| 1124 | + } catch (PDOException $e) { |
|
| 1125 | 1125 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1126 | 1126 | } |
| 1127 | 1127 | return $error; |
@@ -1131,13 +1131,13 @@ discard block |
||
| 1131 | 1131 | global $globalDBdriver; |
| 1132 | 1132 | $Connection = new Connection(); |
| 1133 | 1133 | $error = ''; |
| 1134 | - if (!$Connection->checkColumnName('stats_pilot','format_source')) { |
|
| 1134 | + if (!$Connection->checkColumnName('stats_pilot', 'format_source')) { |
|
| 1135 | 1135 | // Add forsource to airlines |
| 1136 | 1136 | $query = "ALTER TABLE stats_pilot ADD format_source VARCHAR(255) NULL DEFAULT ''"; |
| 1137 | 1137 | try { |
| 1138 | 1138 | $sth = $Connection->db->prepare($query); |
| 1139 | 1139 | $sth->execute(); |
| 1140 | - } catch(PDOException $e) { |
|
| 1140 | + } catch (PDOException $e) { |
|
| 1141 | 1141 | return "error (add format_source column in stats_pilot) : ".$e->getMessage()."\n"; |
| 1142 | 1142 | } |
| 1143 | 1143 | // Add unique key |
@@ -1149,7 +1149,7 @@ discard block |
||
| 1149 | 1149 | try { |
| 1150 | 1150 | $sth = $Connection->db->prepare($query); |
| 1151 | 1151 | $sth->execute(); |
| 1152 | - } catch(PDOException $e) { |
|
| 1152 | + } catch (PDOException $e) { |
|
| 1153 | 1153 | return "error (modify unique key in stats_pilot) : ".$e->getMessage()."\n"; |
| 1154 | 1154 | } |
| 1155 | 1155 | } |
@@ -1157,7 +1157,7 @@ discard block |
||
| 1157 | 1157 | try { |
| 1158 | 1158 | $sth = $Connection->db->prepare($query); |
| 1159 | 1159 | $sth->execute(); |
| 1160 | - } catch(PDOException $e) { |
|
| 1160 | + } catch (PDOException $e) { |
|
| 1161 | 1161 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1162 | 1162 | } |
| 1163 | 1163 | return $error; |
@@ -1167,23 +1167,23 @@ discard block |
||
| 1167 | 1167 | global $globalDBdriver; |
| 1168 | 1168 | $Connection = new Connection(); |
| 1169 | 1169 | $error = ''; |
| 1170 | - if ($globalDBdriver == 'mysql' && !$Connection->indexExists('spotter_live','latitude')) { |
|
| 1170 | + if ($globalDBdriver == 'mysql' && !$Connection->indexExists('spotter_live', 'latitude')) { |
|
| 1171 | 1171 | // Add unique key |
| 1172 | 1172 | $query = "alter table spotter_live add index(latitude,longitude)"; |
| 1173 | 1173 | try { |
| 1174 | 1174 | $sth = $Connection->db->prepare($query); |
| 1175 | 1175 | $sth->execute(); |
| 1176 | - } catch(PDOException $e) { |
|
| 1176 | + } catch (PDOException $e) { |
|
| 1177 | 1177 | return "error (add index latitude,longitude on spotter_live) : ".$e->getMessage()."\n"; |
| 1178 | 1178 | } |
| 1179 | 1179 | } |
| 1180 | - if (!$Connection->checkColumnName('aircraft','mfr')) { |
|
| 1180 | + if (!$Connection->checkColumnName('aircraft', 'mfr')) { |
|
| 1181 | 1181 | // Add mfr to aircraft |
| 1182 | 1182 | $query = "ALTER TABLE aircraft ADD mfr VARCHAR(255) NULL"; |
| 1183 | 1183 | try { |
| 1184 | 1184 | $sth = $Connection->db->prepare($query); |
| 1185 | 1185 | $sth->execute(); |
| 1186 | - } catch(PDOException $e) { |
|
| 1186 | + } catch (PDOException $e) { |
|
| 1187 | 1187 | return "error (add mfr column in aircraft) : ".$e->getMessage()."\n"; |
| 1188 | 1188 | } |
| 1189 | 1189 | } |
@@ -1199,7 +1199,7 @@ discard block |
||
| 1199 | 1199 | try { |
| 1200 | 1200 | $sth = $Connection->db->prepare($query); |
| 1201 | 1201 | $sth->execute(); |
| 1202 | - } catch(PDOException $e) { |
|
| 1202 | + } catch (PDOException $e) { |
|
| 1203 | 1203 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1204 | 1204 | } |
| 1205 | 1205 | return $error; |
@@ -1209,13 +1209,13 @@ discard block |
||
| 1209 | 1209 | global $globalDBdriver; |
| 1210 | 1210 | $Connection = new Connection(); |
| 1211 | 1211 | $error = ''; |
| 1212 | - if ($Connection->checkColumnName('aircraft','mfr')) { |
|
| 1212 | + if ($Connection->checkColumnName('aircraft', 'mfr')) { |
|
| 1213 | 1213 | // drop mfr to aircraft |
| 1214 | 1214 | $query = "ALTER TABLE aircraft DROP COLUMN mfr"; |
| 1215 | 1215 | try { |
| 1216 | 1216 | $sth = $Connection->db->prepare($query); |
| 1217 | 1217 | $sth->execute(); |
| 1218 | - } catch(PDOException $e) { |
|
| 1218 | + } catch (PDOException $e) { |
|
| 1219 | 1219 | return "error (drop mfr column in aircraft) : ".$e->getMessage()."\n"; |
| 1220 | 1220 | } |
| 1221 | 1221 | } |
@@ -1231,7 +1231,7 @@ discard block |
||
| 1231 | 1231 | try { |
| 1232 | 1232 | $sth = $Connection->db->prepare($query); |
| 1233 | 1233 | $sth->execute(); |
| 1234 | - } catch(PDOException $e) { |
|
| 1234 | + } catch (PDOException $e) { |
|
| 1235 | 1235 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1236 | 1236 | } |
| 1237 | 1237 | return $error; |
@@ -1241,33 +1241,33 @@ discard block |
||
| 1241 | 1241 | global $globalDBdriver; |
| 1242 | 1242 | $Connection = new Connection(); |
| 1243 | 1243 | $error = ''; |
| 1244 | - if (!$Connection->indexExists('notam','ref_idx')) { |
|
| 1244 | + if (!$Connection->indexExists('notam', 'ref_idx')) { |
|
| 1245 | 1245 | // Add index key |
| 1246 | 1246 | $query = "create index ref_idx on notam (ref)"; |
| 1247 | 1247 | try { |
| 1248 | 1248 | $sth = $Connection->db->prepare($query); |
| 1249 | 1249 | $sth->execute(); |
| 1250 | - } catch(PDOException $e) { |
|
| 1250 | + } catch (PDOException $e) { |
|
| 1251 | 1251 | return "error (add index ref on notam) : ".$e->getMessage()."\n"; |
| 1252 | 1252 | } |
| 1253 | 1253 | } |
| 1254 | - if (!$Connection->indexExists('accidents','registration_idx')) { |
|
| 1254 | + if (!$Connection->indexExists('accidents', 'registration_idx')) { |
|
| 1255 | 1255 | // Add index key |
| 1256 | 1256 | $query = "create index registration_idx on accidents (registration)"; |
| 1257 | 1257 | try { |
| 1258 | 1258 | $sth = $Connection->db->prepare($query); |
| 1259 | 1259 | $sth->execute(); |
| 1260 | - } catch(PDOException $e) { |
|
| 1260 | + } catch (PDOException $e) { |
|
| 1261 | 1261 | return "error (add index registration on accidents) : ".$e->getMessage()."\n"; |
| 1262 | 1262 | } |
| 1263 | 1263 | } |
| 1264 | - if (!$Connection->indexExists('accidents','rdts')) { |
|
| 1264 | + if (!$Connection->indexExists('accidents', 'rdts')) { |
|
| 1265 | 1265 | // Add index key |
| 1266 | 1266 | $query = "create index rdts on accidents (registration,date,type,source)"; |
| 1267 | 1267 | try { |
| 1268 | 1268 | $sth = $Connection->db->prepare($query); |
| 1269 | 1269 | $sth->execute(); |
| 1270 | - } catch(PDOException $e) { |
|
| 1270 | + } catch (PDOException $e) { |
|
| 1271 | 1271 | return "error (add index registration, date, type & source on accidents) : ".$e->getMessage()."\n"; |
| 1272 | 1272 | } |
| 1273 | 1273 | } |
@@ -1276,7 +1276,7 @@ discard block |
||
| 1276 | 1276 | try { |
| 1277 | 1277 | $sth = $Connection->db->prepare($query); |
| 1278 | 1278 | $sth->execute(); |
| 1279 | - } catch(PDOException $e) { |
|
| 1279 | + } catch (PDOException $e) { |
|
| 1280 | 1280 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1281 | 1281 | } |
| 1282 | 1282 | return $error; |
@@ -1286,23 +1286,23 @@ discard block |
||
| 1286 | 1286 | global $globalDBdriver; |
| 1287 | 1287 | $Connection = new Connection(); |
| 1288 | 1288 | $error = ''; |
| 1289 | - if (!$Connection->checkColumnName('accidents','airline_name')) { |
|
| 1289 | + if (!$Connection->checkColumnName('accidents', 'airline_name')) { |
|
| 1290 | 1290 | // Add airline_name to accidents |
| 1291 | 1291 | $query = "ALTER TABLE accidents ADD airline_name VARCHAR(255) NULL"; |
| 1292 | 1292 | try { |
| 1293 | 1293 | $sth = $Connection->db->prepare($query); |
| 1294 | 1294 | $sth->execute(); |
| 1295 | - } catch(PDOException $e) { |
|
| 1295 | + } catch (PDOException $e) { |
|
| 1296 | 1296 | return "error (add airline_name column in accidents) : ".$e->getMessage()."\n"; |
| 1297 | 1297 | } |
| 1298 | 1298 | } |
| 1299 | - if (!$Connection->checkColumnName('accidents','airline_icao')) { |
|
| 1299 | + if (!$Connection->checkColumnName('accidents', 'airline_icao')) { |
|
| 1300 | 1300 | // Add airline_icao to accidents |
| 1301 | 1301 | $query = "ALTER TABLE accidents ADD airline_icao VARCHAR(10) NULL"; |
| 1302 | 1302 | try { |
| 1303 | 1303 | $sth = $Connection->db->prepare($query); |
| 1304 | 1304 | $sth->execute(); |
| 1305 | - } catch(PDOException $e) { |
|
| 1305 | + } catch (PDOException $e) { |
|
| 1306 | 1306 | return "error (add airline_icao column in accidents) : ".$e->getMessage()."\n"; |
| 1307 | 1307 | } |
| 1308 | 1308 | } |
@@ -1310,7 +1310,7 @@ discard block |
||
| 1310 | 1310 | try { |
| 1311 | 1311 | $sth = $Connection->db->prepare($query); |
| 1312 | 1312 | $sth->execute(); |
| 1313 | - } catch(PDOException $e) { |
|
| 1313 | + } catch (PDOException $e) { |
|
| 1314 | 1314 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1315 | 1315 | } |
| 1316 | 1316 | return $error; |
@@ -1320,13 +1320,13 @@ discard block |
||
| 1320 | 1320 | global $globalDBdriver, $globalVATSIM, $globalIVAO; |
| 1321 | 1321 | $Connection = new Connection(); |
| 1322 | 1322 | $error = ''; |
| 1323 | - if (!$Connection->checkColumnName('airlines','alliance')) { |
|
| 1323 | + if (!$Connection->checkColumnName('airlines', 'alliance')) { |
|
| 1324 | 1324 | // Add alliance to airlines |
| 1325 | 1325 | $query = "ALTER TABLE airlines ADD alliance VARCHAR(255) NULL"; |
| 1326 | 1326 | try { |
| 1327 | 1327 | $sth = $Connection->db->prepare($query); |
| 1328 | 1328 | $sth->execute(); |
| 1329 | - } catch(PDOException $e) { |
|
| 1329 | + } catch (PDOException $e) { |
|
| 1330 | 1330 | return "error (add alliance column in airlines) : ".$e->getMessage()."\n"; |
| 1331 | 1331 | } |
| 1332 | 1332 | } |
@@ -1353,7 +1353,7 @@ discard block |
||
| 1353 | 1353 | try { |
| 1354 | 1354 | $sth = $Connection->db->prepare($query); |
| 1355 | 1355 | $sth->execute(); |
| 1356 | - } catch(PDOException $e) { |
|
| 1356 | + } catch (PDOException $e) { |
|
| 1357 | 1357 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1358 | 1358 | } |
| 1359 | 1359 | return $error; |
@@ -1363,13 +1363,13 @@ discard block |
||
| 1363 | 1363 | global $globalDBdriver, $globalVATSIM, $globalIVAO; |
| 1364 | 1364 | $Connection = new Connection(); |
| 1365 | 1365 | $error = ''; |
| 1366 | - if (!$Connection->checkColumnName('airlines','ban_eu')) { |
|
| 1366 | + if (!$Connection->checkColumnName('airlines', 'ban_eu')) { |
|
| 1367 | 1367 | // Add ban_eu to airlines |
| 1368 | 1368 | $query = "ALTER TABLE airlines ADD ban_eu INTEGER NOT NULL DEFAULT '0'"; |
| 1369 | 1369 | try { |
| 1370 | 1370 | $sth = $Connection->db->prepare($query); |
| 1371 | 1371 | $sth->execute(); |
| 1372 | - } catch(PDOException $e) { |
|
| 1372 | + } catch (PDOException $e) { |
|
| 1373 | 1373 | return "error (add ban_eu column in airlines) : ".$e->getMessage()."\n"; |
| 1374 | 1374 | } |
| 1375 | 1375 | } |
@@ -1377,7 +1377,7 @@ discard block |
||
| 1377 | 1377 | try { |
| 1378 | 1378 | $sth = $Connection->db->prepare($query); |
| 1379 | 1379 | $sth->execute(); |
| 1380 | - } catch(PDOException $e) { |
|
| 1380 | + } catch (PDOException $e) { |
|
| 1381 | 1381 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1382 | 1382 | } |
| 1383 | 1383 | return $error; |
@@ -1388,19 +1388,19 @@ discard block |
||
| 1388 | 1388 | $Connection = new Connection(); |
| 1389 | 1389 | $error = ''; |
| 1390 | 1390 | if ($globalDBdriver == 'mysql') { |
| 1391 | - if ($Connection->getColumnType('spotter_output','date') == 'TIMESTAMP' && $Connection->getColumnType('spotter_output','last_seen') != 'TIMESTAMP') { |
|
| 1391 | + if ($Connection->getColumnType('spotter_output', 'date') == 'TIMESTAMP' && $Connection->getColumnType('spotter_output', 'last_seen') != 'TIMESTAMP') { |
|
| 1392 | 1392 | $query = "ALTER TABLE spotter_output CHANGE date date TIMESTAMP NULL DEFAULT NULL"; |
| 1393 | 1393 | try { |
| 1394 | 1394 | $sth = $Connection->db->prepare($query); |
| 1395 | 1395 | $sth->execute(); |
| 1396 | - } catch(PDOException $e) { |
|
| 1396 | + } catch (PDOException $e) { |
|
| 1397 | 1397 | return "error (delete default timestamp spotter_output) : ".$e->getMessage()."\n"; |
| 1398 | 1398 | } |
| 1399 | 1399 | $query = "ALTER TABLE spotter_output MODIFY COLUMN last_seen timestamp not null default current_timestamp()"; |
| 1400 | 1400 | try { |
| 1401 | 1401 | $sth = $Connection->db->prepare($query); |
| 1402 | 1402 | $sth->execute(); |
| 1403 | - } catch(PDOException $e) { |
|
| 1403 | + } catch (PDOException $e) { |
|
| 1404 | 1404 | return "error (convert spotter_output last_seen to timestamp) : ".$e->getMessage()."\n"; |
| 1405 | 1405 | } |
| 1406 | 1406 | |
@@ -1408,7 +1408,7 @@ discard block |
||
| 1408 | 1408 | try { |
| 1409 | 1409 | $sth = $Connection->db->prepare($query); |
| 1410 | 1410 | $sth->execute(); |
| 1411 | - } catch(PDOException $e) { |
|
| 1411 | + } catch (PDOException $e) { |
|
| 1412 | 1412 | return "error (delete default timestamp spotter_output) : ".$e->getMessage()."\n"; |
| 1413 | 1413 | } |
| 1414 | 1414 | /*$query = "SELECT date,last_seen FROM spotter_output WHERE last_seen < date ORDER BY date DESC LIMIT 150"; |
@@ -1459,7 +1459,7 @@ discard block |
||
| 1459 | 1459 | try { |
| 1460 | 1460 | $sth = $Connection->db->prepare($query); |
| 1461 | 1461 | $sth->execute(); |
| 1462 | - } catch(PDOException $e) { |
|
| 1462 | + } catch (PDOException $e) { |
|
| 1463 | 1463 | return "error (fix date) : ".$e->getMessage()."\n"; |
| 1464 | 1464 | } |
| 1465 | 1465 | } |
@@ -1544,7 +1544,7 @@ discard block |
||
| 1544 | 1544 | try { |
| 1545 | 1545 | $sth = $Connection->db->prepare($query); |
| 1546 | 1546 | $sth->execute(); |
| 1547 | - } catch(PDOException $e) { |
|
| 1547 | + } catch (PDOException $e) { |
|
| 1548 | 1548 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1549 | 1549 | } |
| 1550 | 1550 | return $error; |
@@ -1553,13 +1553,13 @@ discard block |
||
| 1553 | 1553 | global $globalDBdriver; |
| 1554 | 1554 | $Connection = new Connection(); |
| 1555 | 1555 | $error = ''; |
| 1556 | - if (!$Connection->indexExists('accidents','type')) { |
|
| 1556 | + if (!$Connection->indexExists('accidents', 'type')) { |
|
| 1557 | 1557 | // Add index key |
| 1558 | 1558 | $query = "create index type on accidents (type,date)"; |
| 1559 | 1559 | try { |
| 1560 | 1560 | $sth = $Connection->db->prepare($query); |
| 1561 | 1561 | $sth->execute(); |
| 1562 | - } catch(PDOException $e) { |
|
| 1562 | + } catch (PDOException $e) { |
|
| 1563 | 1563 | return "error (add index type on accidents) : ".$e->getMessage()."\n"; |
| 1564 | 1564 | } |
| 1565 | 1565 | } |
@@ -1567,7 +1567,7 @@ discard block |
||
| 1567 | 1567 | try { |
| 1568 | 1568 | $sth = $Connection->db->prepare($query); |
| 1569 | 1569 | $sth->execute(); |
| 1570 | - } catch(PDOException $e) { |
|
| 1570 | + } catch (PDOException $e) { |
|
| 1571 | 1571 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1572 | 1572 | } |
| 1573 | 1573 | return $error; |
@@ -1577,12 +1577,12 @@ discard block |
||
| 1577 | 1577 | global $globalDBdriver; |
| 1578 | 1578 | $Connection = new Connection(); |
| 1579 | 1579 | $error = ''; |
| 1580 | - if (!$Connection->checkColumnName('aircraft_modes','source_type')) { |
|
| 1580 | + if (!$Connection->checkColumnName('aircraft_modes', 'source_type')) { |
|
| 1581 | 1581 | $query = "ALTER TABLE aircraft_modes ADD source_type VARCHAR(255) DEFAULT 'modes'"; |
| 1582 | 1582 | try { |
| 1583 | 1583 | $sth = $Connection->db->prepare($query); |
| 1584 | 1584 | $sth->execute(); |
| 1585 | - } catch(PDOException $e) { |
|
| 1585 | + } catch (PDOException $e) { |
|
| 1586 | 1586 | return "error (add source_type column in aircraft_modes) : ".$e->getMessage()."\n"; |
| 1587 | 1587 | } |
| 1588 | 1588 | } |
@@ -1648,7 +1648,7 @@ discard block |
||
| 1648 | 1648 | try { |
| 1649 | 1649 | $sth = $Connection->db->prepare($query); |
| 1650 | 1650 | $sth->execute(); |
| 1651 | - } catch(PDOException $e) { |
|
| 1651 | + } catch (PDOException $e) { |
|
| 1652 | 1652 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1653 | 1653 | } |
| 1654 | 1654 | return $error; |
@@ -1691,13 +1691,13 @@ discard block |
||
| 1691 | 1691 | $error .= create_db::import_file('../db/pgsql/tracker_archive_output.sql'); |
| 1692 | 1692 | if ($error != '') return $error; |
| 1693 | 1693 | } |
| 1694 | - if (!$Connection->indexExists('spotter_archive','flightaware_id_date_idx') && !$Connection->indexExists('spotter_archive','flightaware_id')) { |
|
| 1694 | + if (!$Connection->indexExists('spotter_archive', 'flightaware_id_date_idx') && !$Connection->indexExists('spotter_archive', 'flightaware_id')) { |
|
| 1695 | 1695 | // Add index key |
| 1696 | 1696 | $query = "create index flightaware_id_date_idx on spotter_archive (flightaware_id,date)"; |
| 1697 | 1697 | try { |
| 1698 | 1698 | $sth = $Connection->db->prepare($query); |
| 1699 | 1699 | $sth->execute(); |
| 1700 | - } catch(PDOException $e) { |
|
| 1700 | + } catch (PDOException $e) { |
|
| 1701 | 1701 | return "error (add index flightaware_id, date on spotter_archive) : ".$e->getMessage()."\n"; |
| 1702 | 1702 | } |
| 1703 | 1703 | } |
@@ -1705,7 +1705,7 @@ discard block |
||
| 1705 | 1705 | try { |
| 1706 | 1706 | $sth = $Connection->db->prepare($query); |
| 1707 | 1707 | $sth->execute(); |
| 1708 | - } catch(PDOException $e) { |
|
| 1708 | + } catch (PDOException $e) { |
|
| 1709 | 1709 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1710 | 1710 | } |
| 1711 | 1711 | return $error; |
@@ -1727,7 +1727,7 @@ discard block |
||
| 1727 | 1727 | try { |
| 1728 | 1728 | $sth = $Connection->db->prepare($query); |
| 1729 | 1729 | $sth->execute(); |
| 1730 | - } catch(PDOException $e) { |
|
| 1730 | + } catch (PDOException $e) { |
|
| 1731 | 1731 | return "error : ".$e->getMessage()."\n"; |
| 1732 | 1732 | } |
| 1733 | 1733 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -258,7 +258,9 @@ discard block |
||
| 258 | 258 | // Update table countries |
| 259 | 259 | if ($Connection->tableExists('airspace')) { |
| 260 | 260 | $error .= update_db::update_countries(); |
| 261 | - if ($error != '') return $error; |
|
| 261 | + if ($error != '') { |
|
| 262 | + return $error; |
|
| 263 | + } |
|
| 262 | 264 | } |
| 263 | 265 | // Update schema_version to 7 |
| 264 | 266 | $query = "UPDATE `config` SET `value` = '7' WHERE `name` = 'schema_version'"; |
@@ -314,7 +316,9 @@ discard block |
||
| 314 | 316 | $error = ''; |
| 315 | 317 | // Update table aircraft |
| 316 | 318 | $error .= create_db::import_file('../db/source_location.sql'); |
| 317 | - if ($error != '') return $error; |
|
| 319 | + if ($error != '') { |
|
| 320 | + return $error; |
|
| 321 | + } |
|
| 318 | 322 | // Update schema_version to 6 |
| 319 | 323 | $query = "UPDATE `config` SET `value` = '8' WHERE `name` = 'schema_version'"; |
| 320 | 324 | try { |
@@ -331,7 +335,9 @@ discard block |
||
| 331 | 335 | $error = ''; |
| 332 | 336 | // Update table aircraft |
| 333 | 337 | $error .= create_db::import_file('../db/notam.sql'); |
| 334 | - if ($error != '') return $error; |
|
| 338 | + if ($error != '') { |
|
| 339 | + return $error; |
|
| 340 | + } |
|
| 335 | 341 | $query = "DELETE FROM config WHERE name = 'last_update_db'; |
| 336 | 342 | INSERT INTO config (name,value) VALUES ('last_update_db',NOW()); |
| 337 | 343 | DELETE FROM config WHERE name = 'last_update_notam_db'; |
@@ -365,7 +371,9 @@ discard block |
||
| 365 | 371 | $error = ''; |
| 366 | 372 | // Update table atc |
| 367 | 373 | $error .= create_db::import_file('../db/atc.sql'); |
| 368 | - if ($error != '') return $error; |
|
| 374 | + if ($error != '') { |
|
| 375 | + return $error; |
|
| 376 | + } |
|
| 369 | 377 | |
| 370 | 378 | $query = "UPDATE `config` SET `value` = '10' WHERE `name` = 'schema_version'"; |
| 371 | 379 | try { |
@@ -389,13 +397,21 @@ discard block |
||
| 389 | 397 | $error = ''; |
| 390 | 398 | // Add tables |
| 391 | 399 | $error .= create_db::import_file('../db/aircraft_owner.sql'); |
| 392 | - if ($error != '') return $error; |
|
| 400 | + if ($error != '') { |
|
| 401 | + return $error; |
|
| 402 | + } |
|
| 393 | 403 | $error .= create_db::import_file('../db/metar.sql'); |
| 394 | - if ($error != '') return $error; |
|
| 404 | + if ($error != '') { |
|
| 405 | + return $error; |
|
| 406 | + } |
|
| 395 | 407 | $error .= create_db::import_file('../db/taf.sql'); |
| 396 | - if ($error != '') return $error; |
|
| 408 | + if ($error != '') { |
|
| 409 | + return $error; |
|
| 410 | + } |
|
| 397 | 411 | $error .= create_db::import_file('../db/airport.sql'); |
| 398 | - if ($error != '') return $error; |
|
| 412 | + if ($error != '') { |
|
| 413 | + return $error; |
|
| 414 | + } |
|
| 399 | 415 | |
| 400 | 416 | $query = "UPDATE `config` SET `value` = '11' WHERE `name` = 'schema_version'"; |
| 401 | 417 | try { |
@@ -469,19 +485,33 @@ discard block |
||
| 469 | 485 | $error = ''; |
| 470 | 486 | // Add tables |
| 471 | 487 | $error .= create_db::import_file('../db/stats.sql'); |
| 472 | - if ($error != '') return $error; |
|
| 488 | + if ($error != '') { |
|
| 489 | + return $error; |
|
| 490 | + } |
|
| 473 | 491 | $error .= create_db::import_file('../db/stats_aircraft.sql'); |
| 474 | - if ($error != '') return $error; |
|
| 492 | + if ($error != '') { |
|
| 493 | + return $error; |
|
| 494 | + } |
|
| 475 | 495 | $error .= create_db::import_file('../db/stats_airline.sql'); |
| 476 | - if ($error != '') return $error; |
|
| 496 | + if ($error != '') { |
|
| 497 | + return $error; |
|
| 498 | + } |
|
| 477 | 499 | $error .= create_db::import_file('../db/stats_airport.sql'); |
| 478 | - if ($error != '') return $error; |
|
| 500 | + if ($error != '') { |
|
| 501 | + return $error; |
|
| 502 | + } |
|
| 479 | 503 | $error .= create_db::import_file('../db/stats_owner.sql'); |
| 480 | - if ($error != '') return $error; |
|
| 504 | + if ($error != '') { |
|
| 505 | + return $error; |
|
| 506 | + } |
|
| 481 | 507 | $error .= create_db::import_file('../db/stats_pilot.sql'); |
| 482 | - if ($error != '') return $error; |
|
| 508 | + if ($error != '') { |
|
| 509 | + return $error; |
|
| 510 | + } |
|
| 483 | 511 | $error .= create_db::import_file('../db/spotter_archive_output.sql'); |
| 484 | - if ($error != '') return $error; |
|
| 512 | + if ($error != '') { |
|
| 513 | + return $error; |
|
| 514 | + } |
|
| 485 | 515 | |
| 486 | 516 | $query = "UPDATE `config` SET `value` = '13' WHERE `name` = 'schema_version'"; |
| 487 | 517 | try { |
@@ -521,7 +551,9 @@ discard block |
||
| 521 | 551 | // Add tables |
| 522 | 552 | if (!$Connection->tableExists('stats_flight')) { |
| 523 | 553 | $error .= create_db::import_file('../db/stats_flight.sql'); |
| 524 | - if ($error != '') return $error; |
|
| 554 | + if ($error != '') { |
|
| 555 | + return $error; |
|
| 556 | + } |
|
| 525 | 557 | } |
| 526 | 558 | $query = "UPDATE `config` SET `value` = '15' WHERE `name` = 'schema_version'"; |
| 527 | 559 | try { |
@@ -545,7 +577,9 @@ discard block |
||
| 545 | 577 | } catch(PDOException $e) { |
| 546 | 578 | return "error (update stats) : ".$e->getMessage()."\n"; |
| 547 | 579 | } |
| 548 | - if ($error != '') return $error; |
|
| 580 | + if ($error != '') { |
|
| 581 | + return $error; |
|
| 582 | + } |
|
| 549 | 583 | $query = "UPDATE `config` SET `value` = '16' WHERE `name` = 'schema_version'"; |
| 550 | 584 | try { |
| 551 | 585 | $sth = $Connection->db->prepare($query); |
@@ -566,7 +600,9 @@ discard block |
||
| 566 | 600 | if (!$Connection->tableExists('stats_callsign')) { |
| 567 | 601 | $error .= create_db::import_file('../db/stats_callsign.sql'); |
| 568 | 602 | } |
| 569 | - if ($error != '') return $error; |
|
| 603 | + if ($error != '') { |
|
| 604 | + return $error; |
|
| 605 | + } |
|
| 570 | 606 | $query = "UPDATE `config` SET `value` = '17' WHERE `name` = 'schema_version'"; |
| 571 | 607 | try { |
| 572 | 608 | $sth = $Connection->db->prepare($query); |
@@ -584,7 +620,9 @@ discard block |
||
| 584 | 620 | if (!$Connection->tableExists('stats_country')) { |
| 585 | 621 | $error .= create_db::import_file('../db/stats_country.sql'); |
| 586 | 622 | } |
| 587 | - if ($error != '') return $error; |
|
| 623 | + if ($error != '') { |
|
| 624 | + return $error; |
|
| 625 | + } |
|
| 588 | 626 | $query = "UPDATE `config` SET `value` = '18' WHERE `name` = 'schema_version'"; |
| 589 | 627 | try { |
| 590 | 628 | $sth = $Connection->db->prepare($query); |
@@ -607,7 +645,9 @@ discard block |
||
| 607 | 645 | return "error (update stats) : ".$e->getMessage()."\n"; |
| 608 | 646 | } |
| 609 | 647 | } |
| 610 | - if ($error != '') return $error; |
|
| 648 | + if ($error != '') { |
|
| 649 | + return $error; |
|
| 650 | + } |
|
| 611 | 651 | $query = "UPDATE `config` SET `value` = '19' WHERE `name` = 'schema_version'"; |
| 612 | 652 | try { |
| 613 | 653 | $sth = $Connection->db->prepare($query); |
@@ -623,7 +663,9 @@ discard block |
||
| 623 | 663 | $error = ''; |
| 624 | 664 | // Update airport table |
| 625 | 665 | $error .= create_db::import_file('../db/airport.sql'); |
| 626 | - if ($error != '') return 'Import airport.sql : '.$error; |
|
| 666 | + if ($error != '') { |
|
| 667 | + return 'Import airport.sql : '.$error; |
|
| 668 | + } |
|
| 627 | 669 | // Remove primary key on Spotter_Archive |
| 628 | 670 | $query = "alter table spotter_archive drop spotter_archive_id"; |
| 629 | 671 | try { |
@@ -699,7 +741,9 @@ discard block |
||
| 699 | 741 | return "error (add source_name column) : ".$e->getMessage()."\n"; |
| 700 | 742 | } |
| 701 | 743 | } |
| 702 | - if ($error != '') return $error; |
|
| 744 | + if ($error != '') { |
|
| 745 | + return $error; |
|
| 746 | + } |
|
| 703 | 747 | $query = "UPDATE `config` SET `value` = '20' WHERE `name` = 'schema_version'"; |
| 704 | 748 | try { |
| 705 | 749 | $sth = $Connection->db->prepare($query); |
@@ -717,7 +761,9 @@ discard block |
||
| 717 | 761 | // Update airline table |
| 718 | 762 | if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) { |
| 719 | 763 | $error .= create_db::import_file('../db/airlines.sql'); |
| 720 | - if ($error != '') return 'Import airlines.sql : '.$error; |
|
| 764 | + if ($error != '') { |
|
| 765 | + return 'Import airlines.sql : '.$error; |
|
| 766 | + } |
|
| 721 | 767 | } |
| 722 | 768 | if (!$Connection->checkColumnName('aircraft_modes','type_flight')) { |
| 723 | 769 | // Add column over_country |
@@ -729,7 +775,9 @@ discard block |
||
| 729 | 775 | return "error (add over_country) : ".$e->getMessage()."\n"; |
| 730 | 776 | } |
| 731 | 777 | } |
| 732 | - if ($error != '') return $error; |
|
| 778 | + if ($error != '') { |
|
| 779 | + return $error; |
|
| 780 | + } |
|
| 733 | 781 | /* |
| 734 | 782 | if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) { |
| 735 | 783 | // Force update ModeS (this will put type_flight data |
@@ -759,7 +807,9 @@ discard block |
||
| 759 | 807 | } catch(PDOException $e) { |
| 760 | 808 | return "error (rename type to stats_type on stats*) : ".$e->getMessage()."\n"; |
| 761 | 809 | } |
| 762 | - if ($error != '') return $error; |
|
| 810 | + if ($error != '') { |
|
| 811 | + return $error; |
|
| 812 | + } |
|
| 763 | 813 | } |
| 764 | 814 | $query = "UPDATE `config` SET `value` = '22' WHERE `name` = 'schema_version'"; |
| 765 | 815 | try { |
@@ -782,7 +832,9 @@ discard block |
||
| 782 | 832 | } else { |
| 783 | 833 | $error .= create_db::import_file('../db/pgsql/stats_source.sql'); |
| 784 | 834 | } |
| 785 | - if ($error != '') return $error; |
|
| 835 | + if ($error != '') { |
|
| 836 | + return $error; |
|
| 837 | + } |
|
| 786 | 838 | } |
| 787 | 839 | $query = "UPDATE config SET value = '23' WHERE name = 'schema_version'"; |
| 788 | 840 | try { |
@@ -804,12 +856,16 @@ discard block |
||
| 804 | 856 | if ($globalDBdriver == 'mysql') { |
| 805 | 857 | if (!$Connection->tableExists('tle')) { |
| 806 | 858 | $error .= create_db::import_file('../db/tle.sql'); |
| 807 | - if ($error != '') return $error; |
|
| 859 | + if ($error != '') { |
|
| 860 | + return $error; |
|
| 861 | + } |
|
| 808 | 862 | } |
| 809 | 863 | } else { |
| 810 | 864 | if (!$Connection->tableExists('tle')) { |
| 811 | 865 | $error .= create_db::import_file('../db/pgsql/tle.sql'); |
| 812 | - if ($error != '') return $error; |
|
| 866 | + if ($error != '') { |
|
| 867 | + return $error; |
|
| 868 | + } |
|
| 813 | 869 | } |
| 814 | 870 | $query = "create index flightaware_id_idx ON spotter_archive USING btree(flightaware_id)"; |
| 815 | 871 | try { |
@@ -849,7 +905,9 @@ discard block |
||
| 849 | 905 | } else { |
| 850 | 906 | $error .= create_db::import_file('../db/pgsql/airlines.sql'); |
| 851 | 907 | } |
| 852 | - if ($error != '') return 'Import airlines.sql : '.$error; |
|
| 908 | + if ($error != '') { |
|
| 909 | + return 'Import airlines.sql : '.$error; |
|
| 910 | + } |
|
| 853 | 911 | if (!$Connection->checkColumnName('airlines','forsource')) { |
| 854 | 912 | // Add forsource to airlines |
| 855 | 913 | $query = "ALTER TABLE airlines ADD forsource VARCHAR(255) NULL DEFAULT NULL"; |
@@ -1332,20 +1390,28 @@ discard block |
||
| 1332 | 1390 | } |
| 1333 | 1391 | if ($globalDBdriver == 'mysql') { |
| 1334 | 1392 | $error .= create_db::import_file('../db/airlines.sql'); |
| 1335 | - if ($error != '') return $error; |
|
| 1393 | + if ($error != '') { |
|
| 1394 | + return $error; |
|
| 1395 | + } |
|
| 1336 | 1396 | } else { |
| 1337 | 1397 | $error .= create_db::import_file('../db/pgsql/airlines.sql'); |
| 1338 | - if ($error != '') return $error; |
|
| 1398 | + if ($error != '') { |
|
| 1399 | + return $error; |
|
| 1400 | + } |
|
| 1339 | 1401 | } |
| 1340 | 1402 | if ((isset($globalVATSIM) && $globalVATSIM) || (isset($globalIVAO) && $globalIVAO)) { |
| 1341 | 1403 | include_once(dirname(__FILE__).'/class.update_db.php'); |
| 1342 | 1404 | if (isset($globalVATSIM) && $globalVATSIM) { |
| 1343 | 1405 | $error .= update_db::update_vatsim(); |
| 1344 | - if ($error != '') return $error; |
|
| 1406 | + if ($error != '') { |
|
| 1407 | + return $error; |
|
| 1408 | + } |
|
| 1345 | 1409 | } |
| 1346 | 1410 | if (isset($globalIVAO) && $globalIVAO && file_exists('tmp/ivae_feb2013.zip')) { |
| 1347 | 1411 | $error .= update_db::update_IVAO(); |
| 1348 | - if ($error != '') return $error; |
|
| 1412 | + if ($error != '') { |
|
| 1413 | + return $error; |
|
| 1414 | + } |
|
| 1349 | 1415 | } |
| 1350 | 1416 | } |
| 1351 | 1417 | |
@@ -1608,41 +1674,65 @@ discard block |
||
| 1608 | 1674 | if ($globalDBdriver == 'mysql') { |
| 1609 | 1675 | if (!$Connection->tableExists('tracker_output')) { |
| 1610 | 1676 | $error .= create_db::import_file('../db/tracker_output.sql'); |
| 1611 | - if ($error != '') return $error; |
|
| 1677 | + if ($error != '') { |
|
| 1678 | + return $error; |
|
| 1679 | + } |
|
| 1612 | 1680 | } |
| 1613 | 1681 | if (!$Connection->tableExists('tracker_live')) { |
| 1614 | 1682 | $error .= create_db::import_file('../db/tracker_live.sql'); |
| 1615 | - if ($error != '') return $error; |
|
| 1683 | + if ($error != '') { |
|
| 1684 | + return $error; |
|
| 1685 | + } |
|
| 1616 | 1686 | } |
| 1617 | 1687 | if (!$Connection->tableExists('marine_output')) { |
| 1618 | 1688 | $error .= create_db::import_file('../db/marine_output.sql'); |
| 1619 | - if ($error != '') return $error; |
|
| 1689 | + if ($error != '') { |
|
| 1690 | + return $error; |
|
| 1691 | + } |
|
| 1620 | 1692 | } |
| 1621 | 1693 | if (!$Connection->tableExists('marine_live')) { |
| 1622 | 1694 | $error .= create_db::import_file('../db/marine_live.sql'); |
| 1623 | - if ($error != '') return $error; |
|
| 1695 | + if ($error != '') { |
|
| 1696 | + return $error; |
|
| 1697 | + } |
|
| 1624 | 1698 | } |
| 1625 | 1699 | if (!$Connection->tableExists('marine_identity')) { |
| 1626 | 1700 | $error .= create_db::import_file('../db/marine_identity.sql'); |
| 1627 | - if ($error != '') return $error; |
|
| 1701 | + if ($error != '') { |
|
| 1702 | + return $error; |
|
| 1703 | + } |
|
| 1628 | 1704 | } |
| 1629 | 1705 | if (!$Connection->tableExists('marine_mid')) { |
| 1630 | 1706 | $error .= create_db::import_file('../db/marine_mid.sql'); |
| 1631 | - if ($error != '') return $error; |
|
| 1707 | + if ($error != '') { |
|
| 1708 | + return $error; |
|
| 1709 | + } |
|
| 1632 | 1710 | } |
| 1633 | 1711 | } else { |
| 1634 | 1712 | $error .= create_db::import_file('../db/pgsql/tracker_output.sql'); |
| 1635 | - if ($error != '') return $error; |
|
| 1713 | + if ($error != '') { |
|
| 1714 | + return $error; |
|
| 1715 | + } |
|
| 1636 | 1716 | $error .= create_db::import_file('../db/pgsql/tracker_live.sql'); |
| 1637 | - if ($error != '') return $error; |
|
| 1717 | + if ($error != '') { |
|
| 1718 | + return $error; |
|
| 1719 | + } |
|
| 1638 | 1720 | $error .= create_db::import_file('../db/pgsql/marine_output.sql'); |
| 1639 | - if ($error != '') return $error; |
|
| 1721 | + if ($error != '') { |
|
| 1722 | + return $error; |
|
| 1723 | + } |
|
| 1640 | 1724 | $error .= create_db::import_file('../db/pgsql/marine_live.sql'); |
| 1641 | - if ($error != '') return $error; |
|
| 1725 | + if ($error != '') { |
|
| 1726 | + return $error; |
|
| 1727 | + } |
|
| 1642 | 1728 | $error .= create_db::import_file('../db/pgsql/marine_identity.sql'); |
| 1643 | - if ($error != '') return $error; |
|
| 1729 | + if ($error != '') { |
|
| 1730 | + return $error; |
|
| 1731 | + } |
|
| 1644 | 1732 | $error .= create_db::import_file('../db/pgsql/marine_mid.sql'); |
| 1645 | - if ($error != '') return $error; |
|
| 1733 | + if ($error != '') { |
|
| 1734 | + return $error; |
|
| 1735 | + } |
|
| 1646 | 1736 | } |
| 1647 | 1737 | $query = "UPDATE config SET value = '37' WHERE name = 'schema_version'"; |
| 1648 | 1738 | try { |
@@ -1661,35 +1751,55 @@ discard block |
||
| 1661 | 1751 | if ($globalDBdriver == 'mysql') { |
| 1662 | 1752 | if (!$Connection->tableExists('marine_image')) { |
| 1663 | 1753 | $error .= create_db::import_file('../db/marine_image.sql'); |
| 1664 | - if ($error != '') return $error; |
|
| 1754 | + if ($error != '') { |
|
| 1755 | + return $error; |
|
| 1756 | + } |
|
| 1665 | 1757 | } |
| 1666 | 1758 | if (!$Connection->tableExists('marine_archive')) { |
| 1667 | 1759 | $error .= create_db::import_file('../db/marine_archive.sql'); |
| 1668 | - if ($error != '') return $error; |
|
| 1760 | + if ($error != '') { |
|
| 1761 | + return $error; |
|
| 1762 | + } |
|
| 1669 | 1763 | } |
| 1670 | 1764 | if (!$Connection->tableExists('marine_archive_output')) { |
| 1671 | 1765 | $error .= create_db::import_file('../db/marine_archive_output.sql'); |
| 1672 | - if ($error != '') return $error; |
|
| 1766 | + if ($error != '') { |
|
| 1767 | + return $error; |
|
| 1768 | + } |
|
| 1673 | 1769 | } |
| 1674 | 1770 | if (!$Connection->tableExists('tracker_archive')) { |
| 1675 | 1771 | $error .= create_db::import_file('../db/tracker_archive.sql'); |
| 1676 | - if ($error != '') return $error; |
|
| 1772 | + if ($error != '') { |
|
| 1773 | + return $error; |
|
| 1774 | + } |
|
| 1677 | 1775 | } |
| 1678 | 1776 | if (!$Connection->tableExists('marine_archive_output')) { |
| 1679 | 1777 | $error .= create_db::import_file('../db/tracker_archive_output.sql'); |
| 1680 | - if ($error != '') return $error; |
|
| 1778 | + if ($error != '') { |
|
| 1779 | + return $error; |
|
| 1780 | + } |
|
| 1681 | 1781 | } |
| 1682 | 1782 | } else { |
| 1683 | 1783 | $error .= create_db::import_file('../db/pgsql/marine_image.sql'); |
| 1684 | - if ($error != '') return $error; |
|
| 1784 | + if ($error != '') { |
|
| 1785 | + return $error; |
|
| 1786 | + } |
|
| 1685 | 1787 | $error .= create_db::import_file('../db/pgsql/marine_archive.sql'); |
| 1686 | - if ($error != '') return $error; |
|
| 1788 | + if ($error != '') { |
|
| 1789 | + return $error; |
|
| 1790 | + } |
|
| 1687 | 1791 | $error .= create_db::import_file('../db/pgsql/marine_archive_output.sql'); |
| 1688 | - if ($error != '') return $error; |
|
| 1792 | + if ($error != '') { |
|
| 1793 | + return $error; |
|
| 1794 | + } |
|
| 1689 | 1795 | $error .= create_db::import_file('../db/pgsql/tracker_archive.sql'); |
| 1690 | - if ($error != '') return $error; |
|
| 1796 | + if ($error != '') { |
|
| 1797 | + return $error; |
|
| 1798 | + } |
|
| 1691 | 1799 | $error .= create_db::import_file('../db/pgsql/tracker_archive_output.sql'); |
| 1692 | - if ($error != '') return $error; |
|
| 1800 | + if ($error != '') { |
|
| 1801 | + return $error; |
|
| 1802 | + } |
|
| 1693 | 1803 | } |
| 1694 | 1804 | if (!$Connection->indexExists('spotter_archive','flightaware_id_date_idx') && !$Connection->indexExists('spotter_archive','flightaware_id')) { |
| 1695 | 1805 | // Add index key |
@@ -1719,8 +1829,11 @@ discard block |
||
| 1719 | 1829 | if ($Connection->tableExists('aircraft')) { |
| 1720 | 1830 | if (!$Connection->tableExists('config')) { |
| 1721 | 1831 | $version = '1'; |
| 1722 | - if ($update) return self::update_from_1(); |
|
| 1723 | - else return $version; |
|
| 1832 | + if ($update) { |
|
| 1833 | + return self::update_from_1(); |
|
| 1834 | + } else { |
|
| 1835 | + return $version; |
|
| 1836 | + } |
|
| 1724 | 1837 | } else { |
| 1725 | 1838 | $Connection = new Connection(); |
| 1726 | 1839 | $query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1"; |
@@ -1734,154 +1847,267 @@ discard block |
||
| 1734 | 1847 | if ($update) { |
| 1735 | 1848 | if ($result['value'] == '2') { |
| 1736 | 1849 | $error = self::update_from_2(); |
| 1737 | - if ($error != '') return $error; |
|
| 1738 | - else return self::check_version(true); |
|
| 1850 | + if ($error != '') { |
|
| 1851 | + return $error; |
|
| 1852 | + } else { |
|
| 1853 | + return self::check_version(true); |
|
| 1854 | + } |
|
| 1739 | 1855 | } elseif ($result['value'] == '3') { |
| 1740 | 1856 | $error = self::update_from_3(); |
| 1741 | - if ($error != '') return $error; |
|
| 1742 | - else return self::check_version(true); |
|
| 1857 | + if ($error != '') { |
|
| 1858 | + return $error; |
|
| 1859 | + } else { |
|
| 1860 | + return self::check_version(true); |
|
| 1861 | + } |
|
| 1743 | 1862 | } elseif ($result['value'] == '4') { |
| 1744 | 1863 | $error = self::update_from_4(); |
| 1745 | - if ($error != '') return $error; |
|
| 1746 | - else return self::check_version(true); |
|
| 1864 | + if ($error != '') { |
|
| 1865 | + return $error; |
|
| 1866 | + } else { |
|
| 1867 | + return self::check_version(true); |
|
| 1868 | + } |
|
| 1747 | 1869 | } elseif ($result['value'] == '5') { |
| 1748 | 1870 | $error = self::update_from_5(); |
| 1749 | - if ($error != '') return $error; |
|
| 1750 | - else return self::check_version(true); |
|
| 1871 | + if ($error != '') { |
|
| 1872 | + return $error; |
|
| 1873 | + } else { |
|
| 1874 | + return self::check_version(true); |
|
| 1875 | + } |
|
| 1751 | 1876 | } elseif ($result['value'] == '6') { |
| 1752 | 1877 | $error = self::update_from_6(); |
| 1753 | - if ($error != '') return $error; |
|
| 1754 | - else return self::check_version(true); |
|
| 1878 | + if ($error != '') { |
|
| 1879 | + return $error; |
|
| 1880 | + } else { |
|
| 1881 | + return self::check_version(true); |
|
| 1882 | + } |
|
| 1755 | 1883 | } elseif ($result['value'] == '7') { |
| 1756 | 1884 | $error = self::update_from_7(); |
| 1757 | - if ($error != '') return $error; |
|
| 1758 | - else return self::check_version(true); |
|
| 1885 | + if ($error != '') { |
|
| 1886 | + return $error; |
|
| 1887 | + } else { |
|
| 1888 | + return self::check_version(true); |
|
| 1889 | + } |
|
| 1759 | 1890 | } elseif ($result['value'] == '8') { |
| 1760 | 1891 | $error = self::update_from_8(); |
| 1761 | - if ($error != '') return $error; |
|
| 1762 | - else return self::check_version(true); |
|
| 1892 | + if ($error != '') { |
|
| 1893 | + return $error; |
|
| 1894 | + } else { |
|
| 1895 | + return self::check_version(true); |
|
| 1896 | + } |
|
| 1763 | 1897 | } elseif ($result['value'] == '9') { |
| 1764 | 1898 | $error = self::update_from_9(); |
| 1765 | - if ($error != '') return $error; |
|
| 1766 | - else return self::check_version(true); |
|
| 1899 | + if ($error != '') { |
|
| 1900 | + return $error; |
|
| 1901 | + } else { |
|
| 1902 | + return self::check_version(true); |
|
| 1903 | + } |
|
| 1767 | 1904 | } elseif ($result['value'] == '10') { |
| 1768 | 1905 | $error = self::update_from_10(); |
| 1769 | - if ($error != '') return $error; |
|
| 1770 | - else return self::check_version(true); |
|
| 1906 | + if ($error != '') { |
|
| 1907 | + return $error; |
|
| 1908 | + } else { |
|
| 1909 | + return self::check_version(true); |
|
| 1910 | + } |
|
| 1771 | 1911 | } elseif ($result['value'] == '11') { |
| 1772 | 1912 | $error = self::update_from_11(); |
| 1773 | - if ($error != '') return $error; |
|
| 1774 | - else return self::check_version(true); |
|
| 1913 | + if ($error != '') { |
|
| 1914 | + return $error; |
|
| 1915 | + } else { |
|
| 1916 | + return self::check_version(true); |
|
| 1917 | + } |
|
| 1775 | 1918 | } elseif ($result['value'] == '12') { |
| 1776 | 1919 | $error = self::update_from_12(); |
| 1777 | - if ($error != '') return $error; |
|
| 1778 | - else return self::check_version(true); |
|
| 1920 | + if ($error != '') { |
|
| 1921 | + return $error; |
|
| 1922 | + } else { |
|
| 1923 | + return self::check_version(true); |
|
| 1924 | + } |
|
| 1779 | 1925 | } elseif ($result['value'] == '13') { |
| 1780 | 1926 | $error = self::update_from_13(); |
| 1781 | - if ($error != '') return $error; |
|
| 1782 | - else return self::check_version(true); |
|
| 1927 | + if ($error != '') { |
|
| 1928 | + return $error; |
|
| 1929 | + } else { |
|
| 1930 | + return self::check_version(true); |
|
| 1931 | + } |
|
| 1783 | 1932 | } elseif ($result['value'] == '14') { |
| 1784 | 1933 | $error = self::update_from_14(); |
| 1785 | - if ($error != '') return $error; |
|
| 1786 | - else return self::check_version(true); |
|
| 1934 | + if ($error != '') { |
|
| 1935 | + return $error; |
|
| 1936 | + } else { |
|
| 1937 | + return self::check_version(true); |
|
| 1938 | + } |
|
| 1787 | 1939 | } elseif ($result['value'] == '15') { |
| 1788 | 1940 | $error = self::update_from_15(); |
| 1789 | - if ($error != '') return $error; |
|
| 1790 | - else return self::check_version(true); |
|
| 1941 | + if ($error != '') { |
|
| 1942 | + return $error; |
|
| 1943 | + } else { |
|
| 1944 | + return self::check_version(true); |
|
| 1945 | + } |
|
| 1791 | 1946 | } elseif ($result['value'] == '16') { |
| 1792 | 1947 | $error = self::update_from_16(); |
| 1793 | - if ($error != '') return $error; |
|
| 1794 | - else return self::check_version(true); |
|
| 1948 | + if ($error != '') { |
|
| 1949 | + return $error; |
|
| 1950 | + } else { |
|
| 1951 | + return self::check_version(true); |
|
| 1952 | + } |
|
| 1795 | 1953 | } elseif ($result['value'] == '17') { |
| 1796 | 1954 | $error = self::update_from_17(); |
| 1797 | - if ($error != '') return $error; |
|
| 1798 | - else return self::check_version(true); |
|
| 1955 | + if ($error != '') { |
|
| 1956 | + return $error; |
|
| 1957 | + } else { |
|
| 1958 | + return self::check_version(true); |
|
| 1959 | + } |
|
| 1799 | 1960 | } elseif ($result['value'] == '18') { |
| 1800 | 1961 | $error = self::update_from_18(); |
| 1801 | - if ($error != '') return $error; |
|
| 1802 | - else return self::check_version(true); |
|
| 1962 | + if ($error != '') { |
|
| 1963 | + return $error; |
|
| 1964 | + } else { |
|
| 1965 | + return self::check_version(true); |
|
| 1966 | + } |
|
| 1803 | 1967 | } elseif ($result['value'] == '19') { |
| 1804 | 1968 | $error = self::update_from_19(); |
| 1805 | - if ($error != '') return $error; |
|
| 1806 | - else return self::check_version(true); |
|
| 1969 | + if ($error != '') { |
|
| 1970 | + return $error; |
|
| 1971 | + } else { |
|
| 1972 | + return self::check_version(true); |
|
| 1973 | + } |
|
| 1807 | 1974 | } elseif ($result['value'] == '20') { |
| 1808 | 1975 | $error = self::update_from_20(); |
| 1809 | - if ($error != '') return $error; |
|
| 1810 | - else return self::check_version(true); |
|
| 1976 | + if ($error != '') { |
|
| 1977 | + return $error; |
|
| 1978 | + } else { |
|
| 1979 | + return self::check_version(true); |
|
| 1980 | + } |
|
| 1811 | 1981 | } elseif ($result['value'] == '21') { |
| 1812 | 1982 | $error = self::update_from_21(); |
| 1813 | - if ($error != '') return $error; |
|
| 1814 | - else return self::check_version(true); |
|
| 1983 | + if ($error != '') { |
|
| 1984 | + return $error; |
|
| 1985 | + } else { |
|
| 1986 | + return self::check_version(true); |
|
| 1987 | + } |
|
| 1815 | 1988 | } elseif ($result['value'] == '22') { |
| 1816 | 1989 | $error = self::update_from_22(); |
| 1817 | - if ($error != '') return $error; |
|
| 1818 | - else return self::check_version(true); |
|
| 1990 | + if ($error != '') { |
|
| 1991 | + return $error; |
|
| 1992 | + } else { |
|
| 1993 | + return self::check_version(true); |
|
| 1994 | + } |
|
| 1819 | 1995 | } elseif ($result['value'] == '23') { |
| 1820 | 1996 | $error = self::update_from_23(); |
| 1821 | - if ($error != '') return $error; |
|
| 1822 | - else return self::check_version(true); |
|
| 1997 | + if ($error != '') { |
|
| 1998 | + return $error; |
|
| 1999 | + } else { |
|
| 2000 | + return self::check_version(true); |
|
| 2001 | + } |
|
| 1823 | 2002 | } elseif ($result['value'] == '24') { |
| 1824 | 2003 | $error = self::update_from_24(); |
| 1825 | - if ($error != '') return $error; |
|
| 1826 | - else return self::check_version(true); |
|
| 2004 | + if ($error != '') { |
|
| 2005 | + return $error; |
|
| 2006 | + } else { |
|
| 2007 | + return self::check_version(true); |
|
| 2008 | + } |
|
| 1827 | 2009 | } elseif ($result['value'] == '25') { |
| 1828 | 2010 | $error = self::update_from_25(); |
| 1829 | - if ($error != '') return $error; |
|
| 1830 | - else return self::check_version(true); |
|
| 2011 | + if ($error != '') { |
|
| 2012 | + return $error; |
|
| 2013 | + } else { |
|
| 2014 | + return self::check_version(true); |
|
| 2015 | + } |
|
| 1831 | 2016 | } elseif ($result['value'] == '26') { |
| 1832 | 2017 | $error = self::update_from_26(); |
| 1833 | - if ($error != '') return $error; |
|
| 1834 | - else return self::check_version(true); |
|
| 2018 | + if ($error != '') { |
|
| 2019 | + return $error; |
|
| 2020 | + } else { |
|
| 2021 | + return self::check_version(true); |
|
| 2022 | + } |
|
| 1835 | 2023 | } elseif ($result['value'] == '27') { |
| 1836 | 2024 | $error = self::update_from_27(); |
| 1837 | - if ($error != '') return $error; |
|
| 1838 | - else return self::check_version(true); |
|
| 2025 | + if ($error != '') { |
|
| 2026 | + return $error; |
|
| 2027 | + } else { |
|
| 2028 | + return self::check_version(true); |
|
| 2029 | + } |
|
| 1839 | 2030 | } elseif ($result['value'] == '28') { |
| 1840 | 2031 | $error = self::update_from_28(); |
| 1841 | - if ($error != '') return $error; |
|
| 1842 | - else return self::check_version(true); |
|
| 2032 | + if ($error != '') { |
|
| 2033 | + return $error; |
|
| 2034 | + } else { |
|
| 2035 | + return self::check_version(true); |
|
| 2036 | + } |
|
| 1843 | 2037 | } elseif ($result['value'] == '29') { |
| 1844 | 2038 | $error = self::update_from_29(); |
| 1845 | - if ($error != '') return $error; |
|
| 1846 | - else return self::check_version(true); |
|
| 2039 | + if ($error != '') { |
|
| 2040 | + return $error; |
|
| 2041 | + } else { |
|
| 2042 | + return self::check_version(true); |
|
| 2043 | + } |
|
| 1847 | 2044 | } elseif ($result['value'] == '30') { |
| 1848 | 2045 | $error = self::update_from_30(); |
| 1849 | - if ($error != '') return $error; |
|
| 1850 | - else return self::check_version(true); |
|
| 2046 | + if ($error != '') { |
|
| 2047 | + return $error; |
|
| 2048 | + } else { |
|
| 2049 | + return self::check_version(true); |
|
| 2050 | + } |
|
| 1851 | 2051 | } elseif ($result['value'] == '31') { |
| 1852 | 2052 | $error = self::update_from_31(); |
| 1853 | - if ($error != '') return $error; |
|
| 1854 | - else return self::check_version(true); |
|
| 2053 | + if ($error != '') { |
|
| 2054 | + return $error; |
|
| 2055 | + } else { |
|
| 2056 | + return self::check_version(true); |
|
| 2057 | + } |
|
| 1855 | 2058 | } elseif ($result['value'] == '32') { |
| 1856 | 2059 | $error = self::update_from_32(); |
| 1857 | - if ($error != '') return $error; |
|
| 1858 | - else return self::check_version(true); |
|
| 2060 | + if ($error != '') { |
|
| 2061 | + return $error; |
|
| 2062 | + } else { |
|
| 2063 | + return self::check_version(true); |
|
| 2064 | + } |
|
| 1859 | 2065 | } elseif ($result['value'] == '33') { |
| 1860 | 2066 | $error = self::update_from_33(); |
| 1861 | - if ($error != '') return $error; |
|
| 1862 | - else return self::check_version(true); |
|
| 2067 | + if ($error != '') { |
|
| 2068 | + return $error; |
|
| 2069 | + } else { |
|
| 2070 | + return self::check_version(true); |
|
| 2071 | + } |
|
| 1863 | 2072 | } elseif ($result['value'] == '34') { |
| 1864 | 2073 | $error = self::update_from_34(); |
| 1865 | - if ($error != '') return $error; |
|
| 1866 | - else return self::check_version(true); |
|
| 2074 | + if ($error != '') { |
|
| 2075 | + return $error; |
|
| 2076 | + } else { |
|
| 2077 | + return self::check_version(true); |
|
| 2078 | + } |
|
| 1867 | 2079 | } elseif ($result['value'] == '35') { |
| 1868 | 2080 | $error = self::update_from_35(); |
| 1869 | - if ($error != '') return $error; |
|
| 1870 | - else return self::check_version(true); |
|
| 2081 | + if ($error != '') { |
|
| 2082 | + return $error; |
|
| 2083 | + } else { |
|
| 2084 | + return self::check_version(true); |
|
| 2085 | + } |
|
| 1871 | 2086 | } elseif ($result['value'] == '36') { |
| 1872 | 2087 | $error = self::update_from_36(); |
| 1873 | - if ($error != '') return $error; |
|
| 1874 | - else return self::check_version(true); |
|
| 2088 | + if ($error != '') { |
|
| 2089 | + return $error; |
|
| 2090 | + } else { |
|
| 2091 | + return self::check_version(true); |
|
| 2092 | + } |
|
| 1875 | 2093 | } elseif ($result['value'] == '37') { |
| 1876 | 2094 | $error = self::update_from_37(); |
| 1877 | - if ($error != '') return $error; |
|
| 1878 | - else return self::check_version(true); |
|
| 1879 | - } else return ''; |
|
| 2095 | + if ($error != '') { |
|
| 2096 | + return $error; |
|
| 2097 | + } else { |
|
| 2098 | + return self::check_version(true); |
|
| 2099 | + } |
|
| 2100 | + } else { |
|
| 2101 | + return ''; |
|
| 2102 | + } |
|
| 2103 | + } else { |
|
| 2104 | + return $result['value']; |
|
| 1880 | 2105 | } |
| 1881 | - else return $result['value']; |
|
| 1882 | 2106 | } |
| 1883 | 2107 | |
| 1884 | - } else return $version; |
|
| 2108 | + } else { |
|
| 2109 | + return $version; |
|
| 2110 | + } |
|
| 1885 | 2111 | } |
| 1886 | 2112 | |
| 1887 | 2113 | } |
@@ -15,8 +15,8 @@ discard block |
||
| 15 | 15 | require_once(dirname(__FILE__).'/../require/class.Common.php'); |
| 16 | 16 | if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php'); |
| 17 | 17 | if (isset($globalMarine) && $globalMarine) { |
| 18 | - require_once(dirname(__FILE__).'/../require/class.AIS.php'); |
|
| 19 | - require_once(dirname(__FILE__).'/../require/class.MarineImport.php'); |
|
| 18 | + require_once(dirname(__FILE__).'/../require/class.AIS.php'); |
|
| 19 | + require_once(dirname(__FILE__).'/../require/class.MarineImport.php'); |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | if (!isset($globalDebug)) $globalDebug = FALSE; |
@@ -24,42 +24,42 @@ discard block |
||
| 24 | 24 | // Check if schema is at latest version |
| 25 | 25 | $Connection = new Connection(); |
| 26 | 26 | if ($Connection->latest() === false) { |
| 27 | - echo "You MUST update to latest schema. Run install/index.php"; |
|
| 28 | - exit(); |
|
| 27 | + echo "You MUST update to latest schema. Run install/index.php"; |
|
| 28 | + exit(); |
|
| 29 | 29 | } |
| 30 | 30 | if (PHP_SAPI != 'cli') { |
| 31 | - echo "This script MUST be called from console, not a web browser."; |
|
| 31 | + echo "This script MUST be called from console, not a web browser."; |
|
| 32 | 32 | // exit(); |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | // This is to be compatible with old version of settings.php |
| 36 | 36 | if (!isset($globalSources)) { |
| 37 | - if (isset($globalSBS1Hosts)) { |
|
| 38 | - //$hosts = $globalSBS1Hosts; |
|
| 39 | - foreach ($globalSBS1Hosts as $host) { |
|
| 40 | - $globalSources[] = array('host' => $host); |
|
| 41 | - } |
|
| 42 | - } else { |
|
| 43 | - if (!isset($globalSBS1Host)) { |
|
| 44 | - echo '$globalSources MUST be defined !'; |
|
| 45 | - die; |
|
| 37 | + if (isset($globalSBS1Hosts)) { |
|
| 38 | + //$hosts = $globalSBS1Hosts; |
|
| 39 | + foreach ($globalSBS1Hosts as $host) { |
|
| 40 | + $globalSources[] = array('host' => $host); |
|
| 41 | + } |
|
| 42 | + } else { |
|
| 43 | + if (!isset($globalSBS1Host)) { |
|
| 44 | + echo '$globalSources MUST be defined !'; |
|
| 45 | + die; |
|
| 46 | 46 | } |
| 47 | 47 | //$hosts = array($globalSBS1Host.':'.$globalSBS1Port); |
| 48 | 48 | $globalSources[] = array('host' => $globalSBS1Host,'port' => $globalSBS1Port); |
| 49 | - } |
|
| 49 | + } |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | $options = getopt('s::',array('source::','server','nodaemon','idsource::','aprsserverssid::','aprsserverpass::','aprsserverhost::','aprsserverport::','format::','noaprsserver')); |
| 53 | 53 | //if (isset($options['s'])) $hosts = array($options['s']); |
| 54 | 54 | //elseif (isset($options['source'])) $hosts = array($options['source']); |
| 55 | 55 | if (isset($options['s'])) { |
| 56 | - $globalSources = array(); |
|
| 57 | - if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']); |
|
| 58 | - else $globalSources[] = array('host' => $options['s']); |
|
| 56 | + $globalSources = array(); |
|
| 57 | + if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']); |
|
| 58 | + else $globalSources[] = array('host' => $options['s']); |
|
| 59 | 59 | } elseif (isset($options['source'])) { |
| 60 | - $globalSources = array(); |
|
| 61 | - if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']); |
|
| 62 | - else $globalSources[] = array('host' => $options['source']); |
|
| 60 | + $globalSources = array(); |
|
| 61 | + if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']); |
|
| 62 | + else $globalSources[] = array('host' => $options['source']); |
|
| 63 | 63 | } |
| 64 | 64 | if (isset($options['aprsserverhost'])) { |
| 65 | 65 | $globalServerAPRS = TRUE; |
@@ -74,8 +74,8 @@ discard block |
||
| 74 | 74 | if (isset($options['idsource'])) $id_source = $options['idsource']; |
| 75 | 75 | else $id_source = 1; |
| 76 | 76 | if (isset($globalServer) && $globalServer) { |
| 77 | - if ($globalDebug) echo "Using Server Mode\n"; |
|
| 78 | - $SI=new SpotterServer(); |
|
| 77 | + if ($globalDebug) echo "Using Server Mode\n"; |
|
| 78 | + $SI=new SpotterServer(); |
|
| 79 | 79 | /* |
| 80 | 80 | require_once(dirname(__FILE__).'/../require/class.APRS.php'); |
| 81 | 81 | $SI = new adsb2aprs(); |
@@ -84,8 +84,8 @@ discard block |
||
| 84 | 84 | } else $SI=new SpotterImport($Connection->db); |
| 85 | 85 | if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db); |
| 86 | 86 | if (isset($globalMarine) && $globalMarine) { |
| 87 | - $AIS = new AIS(); |
|
| 88 | - $MI = new MarineImport($Connection->db); |
|
| 87 | + $AIS = new AIS(); |
|
| 88 | + $MI = new MarineImport($Connection->db); |
|
| 89 | 89 | } |
| 90 | 90 | //$APRS=new APRS($Connection->db); |
| 91 | 91 | $SBS=new SBS(); |
@@ -95,12 +95,12 @@ discard block |
||
| 95 | 95 | //$servertz = system('date +%Z'); |
| 96 | 96 | // signal handler - playing nice with sockets and dump1090 |
| 97 | 97 | if (function_exists('pcntl_fork')) { |
| 98 | - pcntl_signal(SIGINT, function() { |
|
| 99 | - global $sockets; |
|
| 100 | - echo "\n\nctrl-c or kill signal received. Tidying up ... "; |
|
| 101 | - die("Bye!\n"); |
|
| 102 | - }); |
|
| 103 | - pcntl_signal_dispatch(); |
|
| 98 | + pcntl_signal(SIGINT, function() { |
|
| 99 | + global $sockets; |
|
| 100 | + echo "\n\nctrl-c or kill signal received. Tidying up ... "; |
|
| 101 | + die("Bye!\n"); |
|
| 102 | + }); |
|
| 103 | + pcntl_signal_dispatch(); |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | // let's try and connect |
@@ -110,153 +110,153 @@ discard block |
||
| 110 | 110 | $reset = 0; |
| 111 | 111 | |
| 112 | 112 | function connect_all($hosts) { |
| 113 | - //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs; |
|
| 114 | - global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context; |
|
| 115 | - $reset++; |
|
| 116 | - if ($globalDebug) echo 'Connect to all...'."\n"; |
|
| 117 | - foreach ($hosts as $id => $value) { |
|
| 113 | + //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs; |
|
| 114 | + global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context; |
|
| 115 | + $reset++; |
|
| 116 | + if ($globalDebug) echo 'Connect to all...'."\n"; |
|
| 117 | + foreach ($hosts as $id => $value) { |
|
| 118 | 118 | $host = $value['host']; |
| 119 | 119 | $globalSources[$id]['last_exec'] = 0; |
| 120 | 120 | // Here we check type of source(s) |
| 121 | 121 | if (filter_var($host,FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) { |
| 122 | - if (preg_match('/deltadb.txt$/i',$host)) { |
|
| 123 | - //$formats[$id] = 'deltadbtxt'; |
|
| 124 | - $globalSources[$id]['format'] = 'deltadbtxt'; |
|
| 125 | - //$last_exec['deltadbtxt'] = 0; |
|
| 126 | - if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n"; |
|
| 127 | - } else if (preg_match('/vatsim-data.txt$/i',$host)) { |
|
| 128 | - //$formats[$id] = 'vatsimtxt'; |
|
| 129 | - $globalSources[$id]['format'] = 'vatsimtxt'; |
|
| 130 | - //$last_exec['vatsimtxt'] = 0; |
|
| 131 | - if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n"; |
|
| 132 | - } else if (preg_match('/aircraftlist.json$/i',$host)) { |
|
| 133 | - //$formats[$id] = 'aircraftlistjson'; |
|
| 134 | - $globalSources[$id]['format'] = 'aircraftlistjson'; |
|
| 135 | - //$last_exec['aircraftlistjson'] = 0; |
|
| 136 | - if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n"; |
|
| 137 | - } else if (preg_match('/opensky/i',$host)) { |
|
| 138 | - //$formats[$id] = 'aircraftlistjson'; |
|
| 139 | - $globalSources[$id]['format'] = 'opensky'; |
|
| 140 | - //$last_exec['aircraftlistjson'] = 0; |
|
| 141 | - if ($globalDebug) echo "Connect to opensky source (".$host.")...\n"; |
|
| 142 | - } else if (preg_match('/radarvirtuel.com\/file.json$/i',$host)) { |
|
| 143 | - //$formats[$id] = 'radarvirtueljson'; |
|
| 144 | - $globalSources[$id]['format'] = 'radarvirtueljson'; |
|
| 145 | - //$last_exec['radarvirtueljson'] = 0; |
|
| 146 | - if ($globalDebug) echo "Connect to radarvirtuel.com/file.json source (".$host.")...\n"; |
|
| 147 | - if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { |
|
| 148 | - echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
|
| 149 | - exit(0); |
|
| 150 | - } |
|
| 151 | - } else if (preg_match('/planeUpdateFAA.php$/i',$host)) { |
|
| 152 | - //$formats[$id] = 'planeupdatefaa'; |
|
| 153 | - $globalSources[$id]['format'] = 'planeupdatefaa'; |
|
| 154 | - //$last_exec['planeupdatefaa'] = 0; |
|
| 155 | - if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n"; |
|
| 156 | - if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { |
|
| 157 | - echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
|
| 158 | - exit(0); |
|
| 159 | - } |
|
| 160 | - } else if (preg_match('/\/action.php\/acars\/data$/i',$host)) { |
|
| 161 | - //$formats[$id] = 'phpvmacars'; |
|
| 162 | - $globalSources[$id]['format'] = 'phpvmacars'; |
|
| 163 | - //$last_exec['phpvmacars'] = 0; |
|
| 164 | - if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n"; |
|
| 165 | - } else if (preg_match('/VAM-json.php$/i',$host)) { |
|
| 166 | - //$formats[$id] = 'phpvmacars'; |
|
| 167 | - $globalSources[$id]['format'] = 'vam'; |
|
| 168 | - if ($globalDebug) echo "Connect to Vam source (".$host.")...\n"; |
|
| 169 | - } else if (preg_match('/whazzup/i',$host)) { |
|
| 170 | - //$formats[$id] = 'whazzup'; |
|
| 171 | - $globalSources[$id]['format'] = 'whazzup'; |
|
| 172 | - //$last_exec['whazzup'] = 0; |
|
| 173 | - if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n"; |
|
| 174 | - } else if (preg_match('/recentpireps/i',$host)) { |
|
| 175 | - //$formats[$id] = 'pirepsjson'; |
|
| 176 | - $globalSources[$id]['format'] = 'pirepsjson'; |
|
| 177 | - //$last_exec['pirepsjson'] = 0; |
|
| 178 | - if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n"; |
|
| 179 | - } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) { |
|
| 180 | - //$formats[$id] = 'fr24json'; |
|
| 181 | - $globalSources[$id]['format'] = 'fr24json'; |
|
| 182 | - //$last_exec['fr24json'] = 0; |
|
| 183 | - if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n"; |
|
| 184 | - if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { |
|
| 185 | - echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
|
| 186 | - exit(0); |
|
| 187 | - } |
|
| 188 | - } else if (preg_match(':myshiptracking.com/:i',$host)) { |
|
| 189 | - //$formats[$id] = 'fr24json'; |
|
| 190 | - $globalSources[$id]['format'] = 'myshiptracking'; |
|
| 191 | - //$last_exec['fr24json'] = 0; |
|
| 192 | - if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n"; |
|
| 193 | - if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { |
|
| 194 | - echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
|
| 195 | - exit(0); |
|
| 196 | - } |
|
| 197 | - //} else if (preg_match('/10001/',$host)) { |
|
| 198 | - } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) { |
|
| 199 | - //$formats[$id] = 'tsv'; |
|
| 200 | - $globalSources[$id]['format'] = 'tsv'; |
|
| 201 | - if ($globalDebug) echo "Connect to tsv source (".$host.")...\n"; |
|
| 202 | - } |
|
| 203 | - } elseif (filter_var($host,FILTER_VALIDATE_URL)) { |
|
| 204 | - if ($globalSources[$id]['format'] == 'aisnmeahttp') { |
|
| 205 | - $idf = fopen($globalSources[$id]['host'],'r',false,$context); |
|
| 206 | - if ($idf !== false) { |
|
| 207 | - $httpfeeds[$id] = $idf; |
|
| 208 | - if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
|
| 209 | - } |
|
| 210 | - elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n"; |
|
| 211 | - } elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
|
| 212 | - } elseif (!filter_var($host,FILTER_VALIDATE_URL)) { |
|
| 213 | - $hostport = explode(':',$host); |
|
| 214 | - if (isset($hostport[1])) { |
|
| 122 | + if (preg_match('/deltadb.txt$/i',$host)) { |
|
| 123 | + //$formats[$id] = 'deltadbtxt'; |
|
| 124 | + $globalSources[$id]['format'] = 'deltadbtxt'; |
|
| 125 | + //$last_exec['deltadbtxt'] = 0; |
|
| 126 | + if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n"; |
|
| 127 | + } else if (preg_match('/vatsim-data.txt$/i',$host)) { |
|
| 128 | + //$formats[$id] = 'vatsimtxt'; |
|
| 129 | + $globalSources[$id]['format'] = 'vatsimtxt'; |
|
| 130 | + //$last_exec['vatsimtxt'] = 0; |
|
| 131 | + if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n"; |
|
| 132 | + } else if (preg_match('/aircraftlist.json$/i',$host)) { |
|
| 133 | + //$formats[$id] = 'aircraftlistjson'; |
|
| 134 | + $globalSources[$id]['format'] = 'aircraftlistjson'; |
|
| 135 | + //$last_exec['aircraftlistjson'] = 0; |
|
| 136 | + if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n"; |
|
| 137 | + } else if (preg_match('/opensky/i',$host)) { |
|
| 138 | + //$formats[$id] = 'aircraftlistjson'; |
|
| 139 | + $globalSources[$id]['format'] = 'opensky'; |
|
| 140 | + //$last_exec['aircraftlistjson'] = 0; |
|
| 141 | + if ($globalDebug) echo "Connect to opensky source (".$host.")...\n"; |
|
| 142 | + } else if (preg_match('/radarvirtuel.com\/file.json$/i',$host)) { |
|
| 143 | + //$formats[$id] = 'radarvirtueljson'; |
|
| 144 | + $globalSources[$id]['format'] = 'radarvirtueljson'; |
|
| 145 | + //$last_exec['radarvirtueljson'] = 0; |
|
| 146 | + if ($globalDebug) echo "Connect to radarvirtuel.com/file.json source (".$host.")...\n"; |
|
| 147 | + if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { |
|
| 148 | + echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
|
| 149 | + exit(0); |
|
| 150 | + } |
|
| 151 | + } else if (preg_match('/planeUpdateFAA.php$/i',$host)) { |
|
| 152 | + //$formats[$id] = 'planeupdatefaa'; |
|
| 153 | + $globalSources[$id]['format'] = 'planeupdatefaa'; |
|
| 154 | + //$last_exec['planeupdatefaa'] = 0; |
|
| 155 | + if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n"; |
|
| 156 | + if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { |
|
| 157 | + echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
|
| 158 | + exit(0); |
|
| 159 | + } |
|
| 160 | + } else if (preg_match('/\/action.php\/acars\/data$/i',$host)) { |
|
| 161 | + //$formats[$id] = 'phpvmacars'; |
|
| 162 | + $globalSources[$id]['format'] = 'phpvmacars'; |
|
| 163 | + //$last_exec['phpvmacars'] = 0; |
|
| 164 | + if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n"; |
|
| 165 | + } else if (preg_match('/VAM-json.php$/i',$host)) { |
|
| 166 | + //$formats[$id] = 'phpvmacars'; |
|
| 167 | + $globalSources[$id]['format'] = 'vam'; |
|
| 168 | + if ($globalDebug) echo "Connect to Vam source (".$host.")...\n"; |
|
| 169 | + } else if (preg_match('/whazzup/i',$host)) { |
|
| 170 | + //$formats[$id] = 'whazzup'; |
|
| 171 | + $globalSources[$id]['format'] = 'whazzup'; |
|
| 172 | + //$last_exec['whazzup'] = 0; |
|
| 173 | + if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n"; |
|
| 174 | + } else if (preg_match('/recentpireps/i',$host)) { |
|
| 175 | + //$formats[$id] = 'pirepsjson'; |
|
| 176 | + $globalSources[$id]['format'] = 'pirepsjson'; |
|
| 177 | + //$last_exec['pirepsjson'] = 0; |
|
| 178 | + if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n"; |
|
| 179 | + } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) { |
|
| 180 | + //$formats[$id] = 'fr24json'; |
|
| 181 | + $globalSources[$id]['format'] = 'fr24json'; |
|
| 182 | + //$last_exec['fr24json'] = 0; |
|
| 183 | + if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n"; |
|
| 184 | + if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { |
|
| 185 | + echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
|
| 186 | + exit(0); |
|
| 187 | + } |
|
| 188 | + } else if (preg_match(':myshiptracking.com/:i',$host)) { |
|
| 189 | + //$formats[$id] = 'fr24json'; |
|
| 190 | + $globalSources[$id]['format'] = 'myshiptracking'; |
|
| 191 | + //$last_exec['fr24json'] = 0; |
|
| 192 | + if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n"; |
|
| 193 | + if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { |
|
| 194 | + echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
|
| 195 | + exit(0); |
|
| 196 | + } |
|
| 197 | + //} else if (preg_match('/10001/',$host)) { |
|
| 198 | + } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) { |
|
| 199 | + //$formats[$id] = 'tsv'; |
|
| 200 | + $globalSources[$id]['format'] = 'tsv'; |
|
| 201 | + if ($globalDebug) echo "Connect to tsv source (".$host.")...\n"; |
|
| 202 | + } |
|
| 203 | + } elseif (filter_var($host,FILTER_VALIDATE_URL)) { |
|
| 204 | + if ($globalSources[$id]['format'] == 'aisnmeahttp') { |
|
| 205 | + $idf = fopen($globalSources[$id]['host'],'r',false,$context); |
|
| 206 | + if ($idf !== false) { |
|
| 207 | + $httpfeeds[$id] = $idf; |
|
| 208 | + if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
|
| 209 | + } |
|
| 210 | + elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n"; |
|
| 211 | + } elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
|
| 212 | + } elseif (!filter_var($host,FILTER_VALIDATE_URL)) { |
|
| 213 | + $hostport = explode(':',$host); |
|
| 214 | + if (isset($hostport[1])) { |
|
| 215 | 215 | $port = $hostport[1]; |
| 216 | 216 | $hostn = $hostport[0]; |
| 217 | - } else { |
|
| 217 | + } else { |
|
| 218 | 218 | $port = $globalSources[$id]['port']; |
| 219 | 219 | $hostn = $globalSources[$id]['host']; |
| 220 | - } |
|
| 221 | - $Common = new Common(); |
|
| 222 | - if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) { |
|
| 223 | - $s = $Common->create_socket($hostn,$port, $errno, $errstr); |
|
| 224 | - } else { |
|
| 225 | - $s = $Common->create_socket_udp($hostn,$port, $errno, $errstr); |
|
| 226 | - } |
|
| 227 | - if ($s) { |
|
| 228 | - $sockets[$id] = $s; |
|
| 229 | - if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') { |
|
| 230 | - if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') { |
|
| 220 | + } |
|
| 221 | + $Common = new Common(); |
|
| 222 | + if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) { |
|
| 223 | + $s = $Common->create_socket($hostn,$port, $errno, $errstr); |
|
| 224 | + } else { |
|
| 225 | + $s = $Common->create_socket_udp($hostn,$port, $errno, $errstr); |
|
| 226 | + } |
|
| 227 | + if ($s) { |
|
| 228 | + $sockets[$id] = $s; |
|
| 229 | + if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') { |
|
| 230 | + if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') { |
|
| 231 | 231 | //$formats[$id] = 'aprs'; |
| 232 | 232 | $globalSources[$id]['format'] = 'aprs'; |
| 233 | 233 | //$aprs_connect = 0; |
| 234 | 234 | //$use_aprs = true; |
| 235 | - } elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') { |
|
| 235 | + } elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') { |
|
| 236 | 236 | $globalSources[$id]['format'] = 'vrstcp'; |
| 237 | - } elseif ($port == '10001') { |
|
| 238 | - //$formats[$id] = 'tsv'; |
|
| 239 | - $globalSources[$id]['format'] = 'tsv'; |
|
| 240 | - } elseif ($port == '30002') { |
|
| 241 | - //$formats[$id] = 'raw'; |
|
| 242 | - $globalSources[$id]['format'] = 'raw'; |
|
| 243 | - } elseif ($port == '5001') { |
|
| 244 | - //$formats[$id] = 'raw'; |
|
| 245 | - $globalSources[$id]['format'] = 'flightgearmp'; |
|
| 246 | - } elseif ($port == '30005') { |
|
| 237 | + } elseif ($port == '10001') { |
|
| 238 | + //$formats[$id] = 'tsv'; |
|
| 239 | + $globalSources[$id]['format'] = 'tsv'; |
|
| 240 | + } elseif ($port == '30002') { |
|
| 241 | + //$formats[$id] = 'raw'; |
|
| 242 | + $globalSources[$id]['format'] = 'raw'; |
|
| 243 | + } elseif ($port == '5001') { |
|
| 244 | + //$formats[$id] = 'raw'; |
|
| 245 | + $globalSources[$id]['format'] = 'flightgearmp'; |
|
| 246 | + } elseif ($port == '30005') { |
|
| 247 | 247 | // Not yet supported |
| 248 | - //$formats[$id] = 'beast'; |
|
| 249 | - $globalSources[$id]['format'] = 'beast'; |
|
| 250 | - //} else $formats[$id] = 'sbs'; |
|
| 251 | - } else $globalSources[$id]['format'] = 'sbs'; |
|
| 252 | - //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n"; |
|
| 248 | + //$formats[$id] = 'beast'; |
|
| 249 | + $globalSources[$id]['format'] = 'beast'; |
|
| 250 | + //} else $formats[$id] = 'sbs'; |
|
| 251 | + } else $globalSources[$id]['format'] = 'sbs'; |
|
| 252 | + //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n"; |
|
| 253 | 253 | } |
| 254 | 254 | if ($globalDebug) echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n"; |
| 255 | - } else { |
|
| 255 | + } else { |
|
| 256 | 256 | if ($globalDebug) echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n"; |
| 257 | - } |
|
| 258 | - } |
|
| 259 | - } |
|
| 257 | + } |
|
| 258 | + } |
|
| 259 | + } |
|
| 260 | 260 | } |
| 261 | 261 | if (!isset($globalMinFetch)) $globalMinFetch = 15; |
| 262 | 262 | |
@@ -279,9 +279,9 @@ discard block |
||
| 279 | 279 | //connect_all($globalSources); |
| 280 | 280 | |
| 281 | 281 | if (isset($globalProxy) && $globalProxy) { |
| 282 | - $context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true))); |
|
| 282 | + $context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true))); |
|
| 283 | 283 | } else { |
| 284 | - $context = stream_context_create(array('http' => array('timeout' => $timeout))); |
|
| 284 | + $context = stream_context_create(array('http' => array('timeout' => $timeout))); |
|
| 285 | 285 | } |
| 286 | 286 | |
| 287 | 287 | // APRS Configuration |
@@ -290,18 +290,18 @@ discard block |
||
| 290 | 290 | die; |
| 291 | 291 | } |
| 292 | 292 | foreach ($globalSources as $key => $source) { |
| 293 | - if (!isset($source['format'])) { |
|
| 294 | - $globalSources[$key]['format'] = 'auto'; |
|
| 295 | - } |
|
| 293 | + if (!isset($source['format'])) { |
|
| 294 | + $globalSources[$key]['format'] = 'auto'; |
|
| 295 | + } |
|
| 296 | 296 | } |
| 297 | 297 | connect_all($globalSources); |
| 298 | 298 | foreach ($globalSources as $key => $source) { |
| 299 | - if (isset($source['format']) && $source['format'] == 'aprs') { |
|
| 299 | + if (isset($source['format']) && $source['format'] == 'aprs') { |
|
| 300 | 300 | $aprs_connect = 0; |
| 301 | 301 | $use_aprs = true; |
| 302 | 302 | if (isset($source['port']) && $source['port'] == '10152') $aprs_full = true; |
| 303 | 303 | break; |
| 304 | - } |
|
| 304 | + } |
|
| 305 | 305 | } |
| 306 | 306 | |
| 307 | 307 | if ($use_aprs) { |
@@ -342,117 +342,117 @@ discard block |
||
| 342 | 342 | |
| 343 | 343 | // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time. |
| 344 | 344 | while ($i > 0) { |
| 345 | - if (!$globalDaemon) $i = $endtime-time(); |
|
| 346 | - // Delete old ATC |
|
| 347 | - if ($globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) { |
|
| 345 | + if (!$globalDaemon) $i = $endtime-time(); |
|
| 346 | + // Delete old ATC |
|
| 347 | + if ($globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) { |
|
| 348 | 348 | if ($globalDebug) echo 'Delete old ATC...'."\n"; |
| 349 | - $ATC->deleteOldATC(); |
|
| 350 | - } |
|
| 349 | + $ATC->deleteOldATC(); |
|
| 350 | + } |
|
| 351 | 351 | |
| 352 | - //if (count($last_exec) > 0) { |
|
| 353 | - if (count($last_exec) == count($globalSources)) { |
|
| 352 | + //if (count($last_exec) > 0) { |
|
| 353 | + if (count($last_exec) == count($globalSources)) { |
|
| 354 | 354 | $max = $globalMinFetch; |
| 355 | 355 | foreach ($last_exec as $last) { |
| 356 | - if ((time() - $last['last']) < $max) $max = time() - $last['last']; |
|
| 356 | + if ((time() - $last['last']) < $max) $max = time() - $last['last']; |
|
| 357 | 357 | } |
| 358 | 358 | if ($max != $globalMinFetch) { |
| 359 | - if ($globalDebug) echo 'Sleeping...'."\n"; |
|
| 360 | - sleep($globalMinFetch-$max+2); |
|
| 359 | + if ($globalDebug) echo 'Sleeping...'."\n"; |
|
| 360 | + sleep($globalMinFetch-$max+2); |
|
| 361 | + } |
|
| 361 | 362 | } |
| 362 | - } |
|
| 363 | 363 | |
| 364 | 364 | |
| 365 | - //foreach ($formats as $id => $value) { |
|
| 366 | - foreach ($globalSources as $id => $value) { |
|
| 365 | + //foreach ($formats as $id => $value) { |
|
| 366 | + foreach ($globalSources as $id => $value) { |
|
| 367 | 367 | date_default_timezone_set('UTC'); |
| 368 | 368 | if (!isset($last_exec[$id]['last'])) $last_exec[$id]['last'] = 0; |
| 369 | 369 | if ($value['format'] == 'deltadbtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 370 | - //$buffer = $Common->getData($hosts[$id]); |
|
| 371 | - $buffer = $Common->getData($value['host']); |
|
| 372 | - if ($buffer != '') $reset = 0; |
|
| 373 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 374 | - $buffer = explode('\n',$buffer); |
|
| 375 | - foreach ($buffer as $line) { |
|
| 376 | - if ($line != '' && count($line) > 7) { |
|
| 377 | - $line = explode(',', $line); |
|
| 378 | - $data = array(); |
|
| 379 | - $data['hex'] = $line[1]; // hex |
|
| 380 | - $data['ident'] = $line[2]; // ident |
|
| 381 | - if (isset($line[3])) $data['altitude'] = $line[3]; // altitude |
|
| 382 | - if (isset($line[4])) $data['speed'] = $line[4]; // speed |
|
| 383 | - if (isset($line[5])) $data['heading'] = $line[5]; // heading |
|
| 384 | - if (isset($line[6])) $data['latitude'] = $line[6]; // lat |
|
| 385 | - if (isset($line[7])) $data['longitude'] = $line[7]; // long |
|
| 386 | - $data['verticalrate'] = ''; // vertical rate |
|
| 387 | - //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk |
|
| 388 | - $data['emergency'] = ''; // emergency |
|
| 389 | - $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 390 | - $data['format_source'] = 'deltadbtxt'; |
|
| 391 | - $data['id_source'] = $id_source; |
|
| 392 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 393 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 394 | - if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats']; |
|
| 395 | - $SI->add($data); |
|
| 396 | - unset($data); |
|
| 397 | - } |
|
| 398 | - } |
|
| 399 | - $last_exec[$id]['last'] = time(); |
|
| 370 | + //$buffer = $Common->getData($hosts[$id]); |
|
| 371 | + $buffer = $Common->getData($value['host']); |
|
| 372 | + if ($buffer != '') $reset = 0; |
|
| 373 | + $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 374 | + $buffer = explode('\n',$buffer); |
|
| 375 | + foreach ($buffer as $line) { |
|
| 376 | + if ($line != '' && count($line) > 7) { |
|
| 377 | + $line = explode(',', $line); |
|
| 378 | + $data = array(); |
|
| 379 | + $data['hex'] = $line[1]; // hex |
|
| 380 | + $data['ident'] = $line[2]; // ident |
|
| 381 | + if (isset($line[3])) $data['altitude'] = $line[3]; // altitude |
|
| 382 | + if (isset($line[4])) $data['speed'] = $line[4]; // speed |
|
| 383 | + if (isset($line[5])) $data['heading'] = $line[5]; // heading |
|
| 384 | + if (isset($line[6])) $data['latitude'] = $line[6]; // lat |
|
| 385 | + if (isset($line[7])) $data['longitude'] = $line[7]; // long |
|
| 386 | + $data['verticalrate'] = ''; // vertical rate |
|
| 387 | + //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk |
|
| 388 | + $data['emergency'] = ''; // emergency |
|
| 389 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 390 | + $data['format_source'] = 'deltadbtxt'; |
|
| 391 | + $data['id_source'] = $id_source; |
|
| 392 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 393 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 394 | + if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats']; |
|
| 395 | + $SI->add($data); |
|
| 396 | + unset($data); |
|
| 397 | + } |
|
| 398 | + } |
|
| 399 | + $last_exec[$id]['last'] = time(); |
|
| 400 | 400 | } elseif ($value['format'] == 'aisnmeatxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) { |
| 401 | - date_default_timezone_set('CET'); |
|
| 402 | - $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host'])); |
|
| 403 | - date_default_timezone_set('UTC'); |
|
| 404 | - if ($buffer != '') $reset = 0; |
|
| 405 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 406 | - $buffer = explode('\n',$buffer); |
|
| 407 | - foreach ($buffer as $line) { |
|
| 401 | + date_default_timezone_set('CET'); |
|
| 402 | + $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host'])); |
|
| 403 | + date_default_timezone_set('UTC'); |
|
| 404 | + if ($buffer != '') $reset = 0; |
|
| 405 | + $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 406 | + $buffer = explode('\n',$buffer); |
|
| 407 | + foreach ($buffer as $line) { |
|
| 408 | 408 | if ($line != '') { |
| 409 | - echo "'".$line."'\n"; |
|
| 410 | - $add = false; |
|
| 411 | - $ais_data = $AIS->parse_line(trim($line)); |
|
| 412 | - $data = array(); |
|
| 413 | - if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident']; |
|
| 414 | - if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi']; |
|
| 415 | - if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed']; |
|
| 416 | - if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading']; |
|
| 417 | - if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude']; |
|
| 418 | - if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude']; |
|
| 419 | - if (isset($ais_data['status'])) $data['status'] = $ais_data['status']; |
|
| 420 | - if (isset($ais_data['type'])) $data['type'] = $ais_data['type']; |
|
| 421 | - if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
|
| 422 | - if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
|
| 423 | - if (isset($ais_data['timestamp'])) { |
|
| 409 | + echo "'".$line."'\n"; |
|
| 410 | + $add = false; |
|
| 411 | + $ais_data = $AIS->parse_line(trim($line)); |
|
| 412 | + $data = array(); |
|
| 413 | + if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident']; |
|
| 414 | + if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi']; |
|
| 415 | + if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed']; |
|
| 416 | + if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading']; |
|
| 417 | + if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude']; |
|
| 418 | + if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude']; |
|
| 419 | + if (isset($ais_data['status'])) $data['status'] = $ais_data['status']; |
|
| 420 | + if (isset($ais_data['type'])) $data['type'] = $ais_data['type']; |
|
| 421 | + if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
|
| 422 | + if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
|
| 423 | + if (isset($ais_data['timestamp'])) { |
|
| 424 | 424 | $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
| 425 | 425 | if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) { |
| 426 | - $last_exec[$id]['timestamp'] = $ais_data['timestamp']; |
|
| 427 | - $add = true; |
|
| 426 | + $last_exec[$id]['timestamp'] = $ais_data['timestamp']; |
|
| 427 | + $add = true; |
|
| 428 | 428 | } |
| 429 | - } else { |
|
| 429 | + } else { |
|
| 430 | 430 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 431 | 431 | $add = true; |
| 432 | - } |
|
| 433 | - $data['format_source'] = 'aisnmeatxt'; |
|
| 434 | - $data['id_source'] = $id_source; |
|
| 435 | - //print_r($data); |
|
| 436 | - echo 'Add...'."\n"; |
|
| 437 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 438 | - if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data); |
|
| 439 | - unset($data); |
|
| 432 | + } |
|
| 433 | + $data['format_source'] = 'aisnmeatxt'; |
|
| 434 | + $data['id_source'] = $id_source; |
|
| 435 | + //print_r($data); |
|
| 436 | + echo 'Add...'."\n"; |
|
| 437 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 438 | + if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data); |
|
| 439 | + unset($data); |
|
| 440 | 440 | } |
| 441 | - } |
|
| 442 | - $last_exec[$id]['last'] = time(); |
|
| 441 | + } |
|
| 442 | + $last_exec[$id]['last'] = time(); |
|
| 443 | 443 | } elseif ($value['format'] == 'aisnmeahttp') { |
| 444 | - $arr = $httpfeeds; |
|
| 445 | - $w = $e = null; |
|
| 444 | + $arr = $httpfeeds; |
|
| 445 | + $w = $e = null; |
|
| 446 | 446 | |
| 447 | - if (isset($arr[$id])) { |
|
| 447 | + if (isset($arr[$id])) { |
|
| 448 | 448 | $nn = stream_select($arr,$w,$e,$timeout); |
| 449 | 449 | if ($nn > 0) { |
| 450 | - foreach ($httpfeeds as $feed) { |
|
| 450 | + foreach ($httpfeeds as $feed) { |
|
| 451 | 451 | $buffer = stream_get_line($feed,2000,"\n"); |
| 452 | 452 | $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
| 453 | 453 | $buffer = explode('\n',$buffer); |
| 454 | 454 | foreach ($buffer as $line) { |
| 455 | - if ($line != '') { |
|
| 455 | + if ($line != '') { |
|
| 456 | 456 | $ais_data = $AIS->parse_line(trim($line)); |
| 457 | 457 | $data = array(); |
| 458 | 458 | if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident']; |
@@ -468,39 +468,39 @@ discard block |
||
| 468 | 468 | if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination']; |
| 469 | 469 | if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); |
| 470 | 470 | if (isset($ais_data['timestamp'])) { |
| 471 | - $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
|
| 471 | + $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
|
| 472 | 472 | } else { |
| 473 | - $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 473 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 474 | 474 | } |
| 475 | 475 | $data['format_source'] = 'aisnmeahttp'; |
| 476 | 476 | $data['id_source'] = $id_source; |
| 477 | 477 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
| 478 | 478 | if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data); |
| 479 | 479 | unset($data); |
| 480 | - } |
|
| 480 | + } |
|
| 481 | + } |
|
| 481 | 482 | } |
| 482 | - } |
|
| 483 | 483 | } else { |
| 484 | - $format = $value['format']; |
|
| 485 | - if (isset($tt[$format])) $tt[$format]++; |
|
| 486 | - else $tt[$format] = 0; |
|
| 487 | - if ($tt[$format] > 30) { |
|
| 484 | + $format = $value['format']; |
|
| 485 | + if (isset($tt[$format])) $tt[$format]++; |
|
| 486 | + else $tt[$format] = 0; |
|
| 487 | + if ($tt[$format] > 30) { |
|
| 488 | 488 | sleep(2); |
| 489 | 489 | $sourceeen[] = $value; |
| 490 | 490 | connect_all($sourceeen); |
| 491 | 491 | $sourceeen = array(); |
| 492 | - } |
|
| 492 | + } |
|
| 493 | + } |
|
| 493 | 494 | } |
| 494 | - } |
|
| 495 | 495 | } elseif ($value['format'] == 'myshiptracking' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) { |
| 496 | - $buffer = $Common->getData($value['host'],'get','','','','','20'); |
|
| 497 | - if ($buffer != '') { |
|
| 496 | + $buffer = $Common->getData($value['host'],'get','','','','','20'); |
|
| 497 | + if ($buffer != '') { |
|
| 498 | 498 | //echo $buffer; |
| 499 | 499 | $all_data = json_decode($buffer,true); |
| 500 | 500 | //print_r($all_data); |
| 501 | 501 | if (isset($all_data[0]['DATA'])) { |
| 502 | 502 | foreach ($all_data[0]['DATA'] as $line) { |
| 503 | - if ($line != '') { |
|
| 503 | + if ($line != '') { |
|
| 504 | 504 | $data = array(); |
| 505 | 505 | $data['ident'] = $line['NAME']; |
| 506 | 506 | $data['mmsi'] = $line['MMSI']; |
@@ -517,89 +517,89 @@ discard block |
||
| 517 | 517 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
| 518 | 518 | $MI->add($data); |
| 519 | 519 | unset($data); |
| 520 | - } |
|
| 520 | + } |
|
| 521 | 521 | } |
| 522 | 522 | } |
| 523 | 523 | |
| 524 | - } |
|
| 525 | - $last_exec[$id]['last'] = time(); |
|
| 524 | + } |
|
| 525 | + $last_exec[$id]['last'] = time(); |
|
| 526 | 526 | } elseif ($value['format'] == 'boatbeaconapp' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) { |
| 527 | - $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host'])); |
|
| 528 | - if ($buffer != '') { |
|
| 527 | + $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host'])); |
|
| 528 | + if ($buffer != '') { |
|
| 529 | 529 | $all_data = json_decode($buffer,true); |
| 530 | 530 | if (isset($all_data[0]['mmsi'])) { |
| 531 | - foreach ($all_data as $line) { |
|
| 531 | + foreach ($all_data as $line) { |
|
| 532 | 532 | if ($line != '') { |
| 533 | - $data = array(); |
|
| 534 | - $data['ident'] = $line['shipname']; |
|
| 535 | - $data['callsign'] = $line['callsign']; |
|
| 536 | - $data['mmsi'] = $line['mmsi']; |
|
| 537 | - $data['speed'] = $line['sog']; |
|
| 538 | - if ($line['heading'] != '511') $data['heading'] = $line['heading']; |
|
| 539 | - $data['latitude'] = $line['latitude']; |
|
| 540 | - $data['longitude'] = $line['longitude']; |
|
| 541 | - $data['type_id'] = $line['shiptype']; |
|
| 542 | - $data['arrival_code'] = $line['destination']; |
|
| 543 | - $data['datetime'] = $line['time']; |
|
| 544 | - $data['format_source'] = 'boatbeaconapp'; |
|
| 545 | - $data['id_source'] = $id_source; |
|
| 546 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 547 | - $MI->add($data); |
|
| 548 | - unset($data); |
|
| 533 | + $data = array(); |
|
| 534 | + $data['ident'] = $line['shipname']; |
|
| 535 | + $data['callsign'] = $line['callsign']; |
|
| 536 | + $data['mmsi'] = $line['mmsi']; |
|
| 537 | + $data['speed'] = $line['sog']; |
|
| 538 | + if ($line['heading'] != '511') $data['heading'] = $line['heading']; |
|
| 539 | + $data['latitude'] = $line['latitude']; |
|
| 540 | + $data['longitude'] = $line['longitude']; |
|
| 541 | + $data['type_id'] = $line['shiptype']; |
|
| 542 | + $data['arrival_code'] = $line['destination']; |
|
| 543 | + $data['datetime'] = $line['time']; |
|
| 544 | + $data['format_source'] = 'boatbeaconapp'; |
|
| 545 | + $data['id_source'] = $id_source; |
|
| 546 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 547 | + $MI->add($data); |
|
| 548 | + unset($data); |
|
| 549 | + } |
|
| 549 | 550 | } |
| 550 | - } |
|
| 551 | 551 | } |
| 552 | 552 | |
| 553 | - } |
|
| 554 | - $last_exec[$id]['last'] = time(); |
|
| 553 | + } |
|
| 554 | + $last_exec[$id]['last'] = time(); |
|
| 555 | 555 | } elseif ($value['format'] == 'shipplotter' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) { |
| 556 | - echo 'download...'; |
|
| 557 | - $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter'); |
|
| 558 | - echo 'done !'."\n"; |
|
| 559 | - if ($buffer != '') $reset = 0; |
|
| 560 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 561 | - $buffer = explode('\n',$buffer); |
|
| 562 | - foreach ($buffer as $line) { |
|
| 556 | + echo 'download...'; |
|
| 557 | + $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter'); |
|
| 558 | + echo 'done !'."\n"; |
|
| 559 | + if ($buffer != '') $reset = 0; |
|
| 560 | + $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 561 | + $buffer = explode('\n',$buffer); |
|
| 562 | + foreach ($buffer as $line) { |
|
| 563 | 563 | if ($line != '') { |
| 564 | - $data = array(); |
|
| 565 | - $data['mmsi'] = (int)substr($line,0,9); |
|
| 566 | - $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10)); |
|
| 567 | - //$data['status'] = substr($line,21,2); |
|
| 568 | - //$data['type'] = substr($line,24,3); |
|
| 569 | - $data['latitude'] = substr($line,29,9); |
|
| 570 | - $data['longitude'] = substr($line,41,9); |
|
| 571 | - $data['speed'] = round(substr($line,51,5)); |
|
| 572 | - //$data['course'] = substr($line,57,5); |
|
| 573 | - $data['heading'] = round(substr($line,63,3)); |
|
| 574 | - //$data['draft'] = substr($line,67,4); |
|
| 575 | - //$data['length'] = substr($line,72,3); |
|
| 576 | - //$data['beam'] = substr($line,76,2); |
|
| 577 | - $data['ident'] = trim(utf8_encode(substr($line,79,20))); |
|
| 578 | - //$data['callsign'] = trim(substr($line,100,7); |
|
| 579 | - //$data['dest'] = substr($line,108,20); |
|
| 580 | - //$data['etaDate'] = substr($line,129,5); |
|
| 581 | - //$data['etaTime'] = substr($line,135,5); |
|
| 582 | - $data['format_source'] = 'shipplotter'; |
|
| 583 | - $data['id_source'] = $id_source; |
|
| 584 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 585 | - //print_r($data); |
|
| 586 | - echo 'Add...'."\n"; |
|
| 587 | - $MI->add($data); |
|
| 588 | - unset($data); |
|
| 564 | + $data = array(); |
|
| 565 | + $data['mmsi'] = (int)substr($line,0,9); |
|
| 566 | + $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10)); |
|
| 567 | + //$data['status'] = substr($line,21,2); |
|
| 568 | + //$data['type'] = substr($line,24,3); |
|
| 569 | + $data['latitude'] = substr($line,29,9); |
|
| 570 | + $data['longitude'] = substr($line,41,9); |
|
| 571 | + $data['speed'] = round(substr($line,51,5)); |
|
| 572 | + //$data['course'] = substr($line,57,5); |
|
| 573 | + $data['heading'] = round(substr($line,63,3)); |
|
| 574 | + //$data['draft'] = substr($line,67,4); |
|
| 575 | + //$data['length'] = substr($line,72,3); |
|
| 576 | + //$data['beam'] = substr($line,76,2); |
|
| 577 | + $data['ident'] = trim(utf8_encode(substr($line,79,20))); |
|
| 578 | + //$data['callsign'] = trim(substr($line,100,7); |
|
| 579 | + //$data['dest'] = substr($line,108,20); |
|
| 580 | + //$data['etaDate'] = substr($line,129,5); |
|
| 581 | + //$data['etaTime'] = substr($line,135,5); |
|
| 582 | + $data['format_source'] = 'shipplotter'; |
|
| 583 | + $data['id_source'] = $id_source; |
|
| 584 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 585 | + //print_r($data); |
|
| 586 | + echo 'Add...'."\n"; |
|
| 587 | + $MI->add($data); |
|
| 588 | + unset($data); |
|
| 589 | 589 | } |
| 590 | - } |
|
| 591 | - $last_exec[$id]['last'] = time(); |
|
| 590 | + } |
|
| 591 | + $last_exec[$id]['last'] = time(); |
|
| 592 | 592 | //} elseif (($value == 'whazzup' && (time() - $last_exec['whazzup'] > $globalMinFetch)) || ($value == 'vatsimtxt' && (time() - $last_exec['vatsimtxt'] > $globalMinFetch))) { |
| 593 | 593 | } elseif (($value['format'] == 'whazzup' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) || ($value['format'] == 'vatsimtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch))) { |
| 594 | - //$buffer = $Common->getData($hosts[$id]); |
|
| 595 | - $buffer = $Common->getData($value['host']); |
|
| 596 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 597 | - $buffer = explode('\n',$buffer); |
|
| 598 | - $reset = 0; |
|
| 599 | - foreach ($buffer as $line) { |
|
| 600 | - if ($line != '') { |
|
| 601 | - $line = explode(':', $line); |
|
| 602 | - if (count($line) > 30 && $line[0] != 'callsign') { |
|
| 594 | + //$buffer = $Common->getData($hosts[$id]); |
|
| 595 | + $buffer = $Common->getData($value['host']); |
|
| 596 | + $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 597 | + $buffer = explode('\n',$buffer); |
|
| 598 | + $reset = 0; |
|
| 599 | + foreach ($buffer as $line) { |
|
| 600 | + if ($line != '') { |
|
| 601 | + $line = explode(':', $line); |
|
| 602 | + if (count($line) > 30 && $line[0] != 'callsign') { |
|
| 603 | 603 | $data = array(); |
| 604 | 604 | if (isset($line[37]) && $line[37] != '') $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37]; |
| 605 | 605 | else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0]; |
@@ -612,37 +612,37 @@ discard block |
||
| 612 | 612 | if (isset($line[45])) $data['heading'] = $line[45]; // heading |
| 613 | 613 | elseif (isset($line[38])) $data['heading'] = $line[38]; // heading |
| 614 | 614 | $data['latitude'] = $line[5]; // lat |
| 615 | - $data['longitude'] = $line[6]; // long |
|
| 616 | - $data['verticalrate'] = ''; // vertical rate |
|
| 617 | - $data['squawk'] = ''; // squawk |
|
| 618 | - $data['emergency'] = ''; // emergency |
|
| 619 | - $data['waypoints'] = $line[30]; |
|
| 615 | + $data['longitude'] = $line[6]; // long |
|
| 616 | + $data['verticalrate'] = ''; // vertical rate |
|
| 617 | + $data['squawk'] = ''; // squawk |
|
| 618 | + $data['emergency'] = ''; // emergency |
|
| 619 | + $data['waypoints'] = $line[30]; |
|
| 620 | 620 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 621 | 621 | //$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37])); |
| 622 | 622 | //if (isset($line[37])) $data['last_update'] = $line[37]; |
| 623 | - $data['departure_airport_icao'] = $line[11]; |
|
| 624 | - $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':'); |
|
| 625 | - $data['arrival_airport_icao'] = $line[13]; |
|
| 623 | + $data['departure_airport_icao'] = $line[11]; |
|
| 624 | + $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':'); |
|
| 625 | + $data['arrival_airport_icao'] = $line[13]; |
|
| 626 | 626 | $data['frequency'] = $line[4]; |
| 627 | 627 | $data['type'] = $line[18]; |
| 628 | 628 | $data['range'] = $line[19]; |
| 629 | 629 | if (isset($line[35])) $data['info'] = $line[35]; |
| 630 | - $data['id_source'] = $id_source; |
|
| 631 | - //$data['arrival_airport_time'] = ; |
|
| 632 | - if ($line[9] != '') { |
|
| 633 | - $aircraft_data = explode('/',$line[9]); |
|
| 634 | - if (isset($aircraft_data[1])) { |
|
| 635 | - $data['aircraft_icao'] = $aircraft_data[1]; |
|
| 636 | - } |
|
| 637 | - } |
|
| 638 | - /* |
|
| 630 | + $data['id_source'] = $id_source; |
|
| 631 | + //$data['arrival_airport_time'] = ; |
|
| 632 | + if ($line[9] != '') { |
|
| 633 | + $aircraft_data = explode('/',$line[9]); |
|
| 634 | + if (isset($aircraft_data[1])) { |
|
| 635 | + $data['aircraft_icao'] = $aircraft_data[1]; |
|
| 636 | + } |
|
| 637 | + } |
|
| 638 | + /* |
|
| 639 | 639 | if ($value == 'whazzup') $data['format_source'] = 'whazzup'; |
| 640 | 640 | elseif ($value == 'vatsimtxt') $data['format_source'] = 'vatsimtxt'; |
| 641 | 641 | */ |
| 642 | - $data['format_source'] = $value['format']; |
|
| 642 | + $data['format_source'] = $value['format']; |
|
| 643 | 643 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
| 644 | 644 | if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
| 645 | - if ($line[3] == 'PILOT') $SI->add($data); |
|
| 645 | + if ($line[3] == 'PILOT') $SI->add($data); |
|
| 646 | 646 | elseif ($line[3] == 'ATC') { |
| 647 | 647 | //print_r($data); |
| 648 | 648 | $data['info'] = str_replace('^§','<br />',$data['info']); |
@@ -660,255 +660,255 @@ discard block |
||
| 660 | 660 | if (!isset($data['source_name'])) $data['source_name'] = ''; |
| 661 | 661 | if (isset($ATC)) 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']); |
| 662 | 662 | } |
| 663 | - unset($data); |
|
| 664 | - } |
|
| 665 | - } |
|
| 666 | - } |
|
| 667 | - //if ($value == 'whazzup') $last_exec['whazzup'] = time(); |
|
| 668 | - //elseif ($value == 'vatsimtxt') $last_exec['vatsimtxt'] = time(); |
|
| 669 | - $last_exec[$id]['last'] = time(); |
|
| 670 | - //} elseif ($value == 'aircraftlistjson' && (time() - $last_exec['aircraftlistjson'] > $globalMinFetch)) { |
|
| 671 | - } elseif ($value['format'] == 'aircraftlistjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 672 | - $buffer = $Common->getData($value['host'],'get','','','','','20'); |
|
| 673 | - if ($buffer != '') { |
|
| 674 | - $all_data = json_decode($buffer,true); |
|
| 675 | - if (isset($all_data['acList'])) { |
|
| 663 | + unset($data); |
|
| 664 | + } |
|
| 665 | + } |
|
| 666 | + } |
|
| 667 | + //if ($value == 'whazzup') $last_exec['whazzup'] = time(); |
|
| 668 | + //elseif ($value == 'vatsimtxt') $last_exec['vatsimtxt'] = time(); |
|
| 669 | + $last_exec[$id]['last'] = time(); |
|
| 670 | + //} elseif ($value == 'aircraftlistjson' && (time() - $last_exec['aircraftlistjson'] > $globalMinFetch)) { |
|
| 671 | + } elseif ($value['format'] == 'aircraftlistjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 672 | + $buffer = $Common->getData($value['host'],'get','','','','','20'); |
|
| 673 | + if ($buffer != '') { |
|
| 674 | + $all_data = json_decode($buffer,true); |
|
| 675 | + if (isset($all_data['acList'])) { |
|
| 676 | 676 | $reset = 0; |
| 677 | 677 | foreach ($all_data['acList'] as $line) { |
| 678 | - $data = array(); |
|
| 679 | - $data['hex'] = $line['Icao']; // hex |
|
| 680 | - if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident |
|
| 681 | - if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude |
|
| 682 | - if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed |
|
| 683 | - if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading |
|
| 684 | - if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat |
|
| 685 | - if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long |
|
| 686 | - //$data['verticalrate'] = $line['']; // verticale rate |
|
| 687 | - if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk |
|
| 688 | - $data['emergency'] = ''; // emergency |
|
| 689 | - if (isset($line['Reg'])) $data['registration'] = $line['Reg']; |
|
| 678 | + $data = array(); |
|
| 679 | + $data['hex'] = $line['Icao']; // hex |
|
| 680 | + if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident |
|
| 681 | + if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude |
|
| 682 | + if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed |
|
| 683 | + if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading |
|
| 684 | + if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat |
|
| 685 | + if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long |
|
| 686 | + //$data['verticalrate'] = $line['']; // verticale rate |
|
| 687 | + if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk |
|
| 688 | + $data['emergency'] = ''; // emergency |
|
| 689 | + if (isset($line['Reg'])) $data['registration'] = $line['Reg']; |
|
| 690 | 690 | |
| 691 | - if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); |
|
| 692 | - else $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 691 | + if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); |
|
| 692 | + else $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 693 | 693 | |
| 694 | - //$data['datetime'] = date('Y-m-d H:i:s'); |
|
| 695 | - if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type']; |
|
| 696 | - $data['format_source'] = 'aircraftlistjson'; |
|
| 697 | - $data['id_source'] = $id_source; |
|
| 698 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 699 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 700 | - if (isset($data['latitude'])) $SI->add($data); |
|
| 701 | - unset($data); |
|
| 694 | + //$data['datetime'] = date('Y-m-d H:i:s'); |
|
| 695 | + if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type']; |
|
| 696 | + $data['format_source'] = 'aircraftlistjson'; |
|
| 697 | + $data['id_source'] = $id_source; |
|
| 698 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 699 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 700 | + if (isset($data['latitude'])) $SI->add($data); |
|
| 701 | + unset($data); |
|
| 702 | 702 | } |
| 703 | - } elseif (is_array($all_data)) { |
|
| 703 | + } elseif (is_array($all_data)) { |
|
| 704 | 704 | $reset = 0; |
| 705 | 705 | foreach ($all_data as $line) { |
| 706 | - $data = array(); |
|
| 707 | - $data['hex'] = $line['hex']; // hex |
|
| 708 | - $data['ident'] = $line['flight']; // ident |
|
| 709 | - $data['altitude'] = $line['altitude']; // altitude |
|
| 710 | - $data['speed'] = $line['speed']; // speed |
|
| 711 | - $data['heading'] = $line['track']; // heading |
|
| 712 | - $data['latitude'] = $line['lat']; // lat |
|
| 713 | - $data['longitude'] = $line['lon']; // long |
|
| 714 | - $data['verticalrate'] = $line['vrt']; // verticale rate |
|
| 715 | - $data['squawk'] = $line['squawk']; // squawk |
|
| 716 | - $data['emergency'] = ''; // emergency |
|
| 717 | - if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); |
|
| 718 | - else $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 719 | - $data['format_source'] = 'aircraftlistjson'; |
|
| 720 | - $data['id_source'] = $id_source; |
|
| 721 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 722 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 723 | - $SI->add($data); |
|
| 724 | - unset($data); |
|
| 706 | + $data = array(); |
|
| 707 | + $data['hex'] = $line['hex']; // hex |
|
| 708 | + $data['ident'] = $line['flight']; // ident |
|
| 709 | + $data['altitude'] = $line['altitude']; // altitude |
|
| 710 | + $data['speed'] = $line['speed']; // speed |
|
| 711 | + $data['heading'] = $line['track']; // heading |
|
| 712 | + $data['latitude'] = $line['lat']; // lat |
|
| 713 | + $data['longitude'] = $line['lon']; // long |
|
| 714 | + $data['verticalrate'] = $line['vrt']; // verticale rate |
|
| 715 | + $data['squawk'] = $line['squawk']; // squawk |
|
| 716 | + $data['emergency'] = ''; // emergency |
|
| 717 | + if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); |
|
| 718 | + else $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 719 | + $data['format_source'] = 'aircraftlistjson'; |
|
| 720 | + $data['id_source'] = $id_source; |
|
| 721 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 722 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 723 | + $SI->add($data); |
|
| 724 | + unset($data); |
|
| 725 | + } |
|
| 725 | 726 | } |
| 726 | - } |
|
| 727 | - } |
|
| 728 | - //$last_exec['aircraftlistjson'] = time(); |
|
| 729 | - $last_exec[$id]['last'] = time(); |
|
| 730 | - //} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) { |
|
| 731 | - } elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 732 | - $buffer = $Common->getData($value['host']); |
|
| 733 | - $all_data = json_decode($buffer,true); |
|
| 734 | - if (isset($all_data['planes'])) { |
|
| 727 | + } |
|
| 728 | + //$last_exec['aircraftlistjson'] = time(); |
|
| 729 | + $last_exec[$id]['last'] = time(); |
|
| 730 | + //} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) { |
|
| 731 | + } elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 732 | + $buffer = $Common->getData($value['host']); |
|
| 733 | + $all_data = json_decode($buffer,true); |
|
| 734 | + if (isset($all_data['planes'])) { |
|
| 735 | 735 | $reset = 0; |
| 736 | 736 | foreach ($all_data['planes'] as $key => $line) { |
| 737 | - $data = array(); |
|
| 738 | - $data['hex'] = $key; // hex |
|
| 739 | - $data['ident'] = $line[3]; // ident |
|
| 740 | - $data['altitude'] = $line[6]; // altitude |
|
| 741 | - $data['speed'] = $line[8]; // speed |
|
| 742 | - $data['heading'] = $line[7]; // heading |
|
| 743 | - $data['latitude'] = $line[4]; // lat |
|
| 744 | - $data['longitude'] = $line[5]; // long |
|
| 745 | - //$data['verticalrate'] = $line[]; // verticale rate |
|
| 746 | - $data['squawk'] = $line[10]; // squawk |
|
| 747 | - $data['emergency'] = ''; // emergency |
|
| 748 | - $data['registration'] = $line[2]; |
|
| 749 | - $data['aircraft_icao'] = $line[0]; |
|
| 750 | - $deparr = explode('-',$line[1]); |
|
| 751 | - if (count($deparr) == 2) { |
|
| 737 | + $data = array(); |
|
| 738 | + $data['hex'] = $key; // hex |
|
| 739 | + $data['ident'] = $line[3]; // ident |
|
| 740 | + $data['altitude'] = $line[6]; // altitude |
|
| 741 | + $data['speed'] = $line[8]; // speed |
|
| 742 | + $data['heading'] = $line[7]; // heading |
|
| 743 | + $data['latitude'] = $line[4]; // lat |
|
| 744 | + $data['longitude'] = $line[5]; // long |
|
| 745 | + //$data['verticalrate'] = $line[]; // verticale rate |
|
| 746 | + $data['squawk'] = $line[10]; // squawk |
|
| 747 | + $data['emergency'] = ''; // emergency |
|
| 748 | + $data['registration'] = $line[2]; |
|
| 749 | + $data['aircraft_icao'] = $line[0]; |
|
| 750 | + $deparr = explode('-',$line[1]); |
|
| 751 | + if (count($deparr) == 2) { |
|
| 752 | 752 | $data['departure_airport_icao'] = $deparr[0]; |
| 753 | 753 | $data['arrival_airport_icao'] = $deparr[1]; |
| 754 | - } |
|
| 755 | - $data['datetime'] = date('Y-m-d H:i:s',$line[9]); |
|
| 756 | - $data['format_source'] = 'planeupdatefaa'; |
|
| 757 | - $data['id_source'] = $id_source; |
|
| 758 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 759 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 760 | - $SI->add($data); |
|
| 761 | - unset($data); |
|
| 754 | + } |
|
| 755 | + $data['datetime'] = date('Y-m-d H:i:s',$line[9]); |
|
| 756 | + $data['format_source'] = 'planeupdatefaa'; |
|
| 757 | + $data['id_source'] = $id_source; |
|
| 758 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 759 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 760 | + $SI->add($data); |
|
| 761 | + unset($data); |
|
| 762 | + } |
|
| 762 | 763 | } |
| 763 | - } |
|
| 764 | - //$last_exec['planeupdatefaa'] = time(); |
|
| 765 | - $last_exec[$id]['last'] = time(); |
|
| 766 | - } elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 767 | - $buffer = $Common->getData($value['host']); |
|
| 768 | - $all_data = json_decode($buffer,true); |
|
| 769 | - if (isset($all_data['states'])) { |
|
| 764 | + //$last_exec['planeupdatefaa'] = time(); |
|
| 765 | + $last_exec[$id]['last'] = time(); |
|
| 766 | + } elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 767 | + $buffer = $Common->getData($value['host']); |
|
| 768 | + $all_data = json_decode($buffer,true); |
|
| 769 | + if (isset($all_data['states'])) { |
|
| 770 | 770 | $reset = 0; |
| 771 | 771 | foreach ($all_data['states'] as $key => $line) { |
| 772 | - $data = array(); |
|
| 773 | - $data['hex'] = $line[0]; // hex |
|
| 774 | - $data['ident'] = trim($line[1]); // ident |
|
| 775 | - $data['altitude'] = round($line[7]*3.28084); // altitude |
|
| 776 | - $data['speed'] = round($line[9]*1.94384); // speed |
|
| 777 | - $data['heading'] = round($line[10]); // heading |
|
| 778 | - $data['latitude'] = $line[5]; // lat |
|
| 779 | - $data['longitude'] = $line[6]; // long |
|
| 780 | - $data['verticalrate'] = $line[11]; // verticale rate |
|
| 781 | - //$data['squawk'] = $line[10]; // squawk |
|
| 782 | - //$data['emergency'] = ''; // emergency |
|
| 783 | - //$data['registration'] = $line[2]; |
|
| 784 | - //$data['aircraft_icao'] = $line[0]; |
|
| 785 | - $data['datetime'] = date('Y-m-d H:i:s',$line[3]); |
|
| 786 | - $data['format_source'] = 'opensky'; |
|
| 787 | - $data['id_source'] = $id_source; |
|
| 788 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 789 | - $SI->add($data); |
|
| 790 | - unset($data); |
|
| 772 | + $data = array(); |
|
| 773 | + $data['hex'] = $line[0]; // hex |
|
| 774 | + $data['ident'] = trim($line[1]); // ident |
|
| 775 | + $data['altitude'] = round($line[7]*3.28084); // altitude |
|
| 776 | + $data['speed'] = round($line[9]*1.94384); // speed |
|
| 777 | + $data['heading'] = round($line[10]); // heading |
|
| 778 | + $data['latitude'] = $line[5]; // lat |
|
| 779 | + $data['longitude'] = $line[6]; // long |
|
| 780 | + $data['verticalrate'] = $line[11]; // verticale rate |
|
| 781 | + //$data['squawk'] = $line[10]; // squawk |
|
| 782 | + //$data['emergency'] = ''; // emergency |
|
| 783 | + //$data['registration'] = $line[2]; |
|
| 784 | + //$data['aircraft_icao'] = $line[0]; |
|
| 785 | + $data['datetime'] = date('Y-m-d H:i:s',$line[3]); |
|
| 786 | + $data['format_source'] = 'opensky'; |
|
| 787 | + $data['id_source'] = $id_source; |
|
| 788 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 789 | + $SI->add($data); |
|
| 790 | + unset($data); |
|
| 791 | + } |
|
| 791 | 792 | } |
| 792 | - } |
|
| 793 | - //$last_exec['planeupdatefaa'] = time(); |
|
| 794 | - $last_exec[$id]['last'] = time(); |
|
| 795 | - //} elseif ($value == 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) { |
|
| 796 | - } elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 797 | - //$buffer = $Common->getData($hosts[$id]); |
|
| 798 | - $buffer = $Common->getData($value['host']); |
|
| 799 | - $all_data = json_decode($buffer,true); |
|
| 800 | - if (!empty($all_data)) $reset = 0; |
|
| 801 | - foreach ($all_data as $key => $line) { |
|
| 793 | + //$last_exec['planeupdatefaa'] = time(); |
|
| 794 | + $last_exec[$id]['last'] = time(); |
|
| 795 | + //} elseif ($value == 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) { |
|
| 796 | + } elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 797 | + //$buffer = $Common->getData($hosts[$id]); |
|
| 798 | + $buffer = $Common->getData($value['host']); |
|
| 799 | + $all_data = json_decode($buffer,true); |
|
| 800 | + if (!empty($all_data)) $reset = 0; |
|
| 801 | + foreach ($all_data as $key => $line) { |
|
| 802 | 802 | if ($key != 'full_count' && $key != 'version' && $key != 'stats') { |
| 803 | - $data = array(); |
|
| 804 | - $data['hex'] = $line[0]; |
|
| 805 | - $data['ident'] = $line[16]; //$line[13] |
|
| 806 | - $data['altitude'] = $line[4]; // altitude |
|
| 807 | - $data['speed'] = $line[5]; // speed |
|
| 808 | - $data['heading'] = $line[3]; // heading |
|
| 809 | - $data['latitude'] = $line[1]; // lat |
|
| 810 | - $data['longitude'] = $line[2]; // long |
|
| 811 | - $data['verticalrate'] = $line[15]; // verticale rate |
|
| 812 | - $data['squawk'] = $line[6]; // squawk |
|
| 813 | - $data['aircraft_icao'] = $line[8]; |
|
| 814 | - $data['registration'] = $line[9]; |
|
| 815 | - $data['departure_airport_iata'] = $line[11]; |
|
| 816 | - $data['arrival_airport_iata'] = $line[12]; |
|
| 817 | - $data['emergency'] = ''; // emergency |
|
| 818 | - $data['datetime'] = date('Y-m-d H:i:s'); //$line[10] |
|
| 819 | - $data['format_source'] = 'fr24json'; |
|
| 820 | - $data['id_source'] = $id_source; |
|
| 821 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 822 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 823 | - $SI->add($data); |
|
| 824 | - unset($data); |
|
| 803 | + $data = array(); |
|
| 804 | + $data['hex'] = $line[0]; |
|
| 805 | + $data['ident'] = $line[16]; //$line[13] |
|
| 806 | + $data['altitude'] = $line[4]; // altitude |
|
| 807 | + $data['speed'] = $line[5]; // speed |
|
| 808 | + $data['heading'] = $line[3]; // heading |
|
| 809 | + $data['latitude'] = $line[1]; // lat |
|
| 810 | + $data['longitude'] = $line[2]; // long |
|
| 811 | + $data['verticalrate'] = $line[15]; // verticale rate |
|
| 812 | + $data['squawk'] = $line[6]; // squawk |
|
| 813 | + $data['aircraft_icao'] = $line[8]; |
|
| 814 | + $data['registration'] = $line[9]; |
|
| 815 | + $data['departure_airport_iata'] = $line[11]; |
|
| 816 | + $data['arrival_airport_iata'] = $line[12]; |
|
| 817 | + $data['emergency'] = ''; // emergency |
|
| 818 | + $data['datetime'] = date('Y-m-d H:i:s'); //$line[10] |
|
| 819 | + $data['format_source'] = 'fr24json'; |
|
| 820 | + $data['id_source'] = $id_source; |
|
| 821 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 822 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 823 | + $SI->add($data); |
|
| 824 | + unset($data); |
|
| 825 | + } |
|
| 825 | 826 | } |
| 826 | - } |
|
| 827 | - //$last_exec['fr24json'] = time(); |
|
| 828 | - $last_exec[$id]['last'] = time(); |
|
| 829 | - //} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) { |
|
| 830 | - } elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 831 | - //$buffer = $Common->getData($hosts[$id],'get','','','','','150'); |
|
| 832 | - $buffer = $Common->getData($value['host'],'get','','','','','150'); |
|
| 833 | - //echo $buffer; |
|
| 834 | - $buffer = str_replace(array("\n","\r"),"",$buffer); |
|
| 835 | - $buffer = preg_replace('/,"num":(.+)/','}',$buffer); |
|
| 836 | - $all_data = json_decode($buffer,true); |
|
| 837 | - if (json_last_error() != JSON_ERROR_NONE) { |
|
| 827 | + //$last_exec['fr24json'] = time(); |
|
| 828 | + $last_exec[$id]['last'] = time(); |
|
| 829 | + //} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) { |
|
| 830 | + } elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 831 | + //$buffer = $Common->getData($hosts[$id],'get','','','','','150'); |
|
| 832 | + $buffer = $Common->getData($value['host'],'get','','','','','150'); |
|
| 833 | + //echo $buffer; |
|
| 834 | + $buffer = str_replace(array("\n","\r"),"",$buffer); |
|
| 835 | + $buffer = preg_replace('/,"num":(.+)/','}',$buffer); |
|
| 836 | + $all_data = json_decode($buffer,true); |
|
| 837 | + if (json_last_error() != JSON_ERROR_NONE) { |
|
| 838 | 838 | die(json_last_error_msg()); |
| 839 | - } |
|
| 840 | - if (isset($all_data['mrkrs'])) { |
|
| 839 | + } |
|
| 840 | + if (isset($all_data['mrkrs'])) { |
|
| 841 | 841 | $reset = 0; |
| 842 | 842 | foreach ($all_data['mrkrs'] as $key => $line) { |
| 843 | - if (isset($line['inf'])) { |
|
| 843 | + if (isset($line['inf'])) { |
|
| 844 | 844 | $data = array(); |
| 845 | 845 | $data['hex'] = $line['inf']['ia']; |
| 846 | 846 | if (isset($line['inf']['cs'])) $data['ident'] = $line['inf']['cs']; //$line[13] |
| 847 | - $data['altitude'] = round($line['inf']['al']*3.28084); // altitude |
|
| 848 | - if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed |
|
| 849 | - if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading |
|
| 850 | - $data['latitude'] = $line['pt'][0]; // lat |
|
| 851 | - $data['longitude'] = $line['pt'][1]; // long |
|
| 852 | - //if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate |
|
| 853 | - if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk |
|
| 854 | - //$data['aircraft_icao'] = $line[8]; |
|
| 855 | - if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc']; |
|
| 847 | + $data['altitude'] = round($line['inf']['al']*3.28084); // altitude |
|
| 848 | + if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed |
|
| 849 | + if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading |
|
| 850 | + $data['latitude'] = $line['pt'][0]; // lat |
|
| 851 | + $data['longitude'] = $line['pt'][1]; // long |
|
| 852 | + //if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate |
|
| 853 | + if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk |
|
| 854 | + //$data['aircraft_icao'] = $line[8]; |
|
| 855 | + if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc']; |
|
| 856 | 856 | //$data['departure_airport_iata'] = $line[11]; |
| 857 | 857 | //$data['arrival_airport_iata'] = $line[12]; |
| 858 | - //$data['emergency'] = ''; // emergency |
|
| 858 | + //$data['emergency'] = ''; // emergency |
|
| 859 | 859 | $data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10] |
| 860 | - $data['format_source'] = 'radarvirtueljson'; |
|
| 861 | - $data['id_source'] = $id_source; |
|
| 860 | + $data['format_source'] = 'radarvirtueljson'; |
|
| 861 | + $data['id_source'] = $id_source; |
|
| 862 | 862 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
| 863 | 863 | if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
| 864 | 864 | $SI->add($data); |
| 865 | 865 | unset($data); |
| 866 | - } |
|
| 866 | + } |
|
| 867 | + } |
|
| 867 | 868 | } |
| 868 | - } |
|
| 869 | - //$last_exec['radarvirtueljson'] = time(); |
|
| 870 | - $last_exec[$id]['last'] = time(); |
|
| 871 | - //} elseif ($value == 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) { |
|
| 872 | - } elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 873 | - //$buffer = $Common->getData($hosts[$id]); |
|
| 874 | - $buffer = $Common->getData($value['host'].'?'.time()); |
|
| 875 | - $all_data = json_decode(utf8_encode($buffer),true); |
|
| 869 | + //$last_exec['radarvirtueljson'] = time(); |
|
| 870 | + $last_exec[$id]['last'] = time(); |
|
| 871 | + //} elseif ($value == 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) { |
|
| 872 | + } elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 873 | + //$buffer = $Common->getData($hosts[$id]); |
|
| 874 | + $buffer = $Common->getData($value['host'].'?'.time()); |
|
| 875 | + $all_data = json_decode(utf8_encode($buffer),true); |
|
| 876 | 876 | |
| 877 | - if (isset($all_data['pireps'])) { |
|
| 877 | + if (isset($all_data['pireps'])) { |
|
| 878 | 878 | $reset = 0; |
| 879 | - foreach ($all_data['pireps'] as $line) { |
|
| 880 | - $data = array(); |
|
| 881 | - $data['id'] = $line['id']; |
|
| 882 | - $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6); |
|
| 883 | - $data['ident'] = $line['callsign']; // ident |
|
| 884 | - if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id |
|
| 885 | - if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name |
|
| 886 | - if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude |
|
| 887 | - if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed |
|
| 888 | - if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading |
|
| 889 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 890 | - $data['latitude'] = $line['lat']; // lat |
|
| 891 | - $data['longitude'] = $line['lon']; // long |
|
| 892 | - //$data['verticalrate'] = $line['vrt']; // verticale rate |
|
| 893 | - //$data['squawk'] = $line['squawk']; // squawk |
|
| 894 | - //$data['emergency'] = ''; // emergency |
|
| 895 | - if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao']; |
|
| 896 | - if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime']; |
|
| 897 | - if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao']; |
|
| 898 | - //$data['arrival_airport_time'] = $line['arrtime']; |
|
| 899 | - if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft']; |
|
| 900 | - if (isset($line['transponder'])) $data['squawk'] = $line['transponder']; |
|
| 901 | - if (isset($line['atis'])) $data['info'] = $line['atis']; |
|
| 902 | - else $data['info'] = ''; |
|
| 903 | - $data['format_source'] = 'pireps'; |
|
| 904 | - $data['id_source'] = $id_source; |
|
| 905 | - $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 906 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 907 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 908 | - if ($line['icon'] == 'plane') { |
|
| 879 | + foreach ($all_data['pireps'] as $line) { |
|
| 880 | + $data = array(); |
|
| 881 | + $data['id'] = $line['id']; |
|
| 882 | + $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6); |
|
| 883 | + $data['ident'] = $line['callsign']; // ident |
|
| 884 | + if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id |
|
| 885 | + if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name |
|
| 886 | + if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude |
|
| 887 | + if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed |
|
| 888 | + if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading |
|
| 889 | + if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 890 | + $data['latitude'] = $line['lat']; // lat |
|
| 891 | + $data['longitude'] = $line['lon']; // long |
|
| 892 | + //$data['verticalrate'] = $line['vrt']; // verticale rate |
|
| 893 | + //$data['squawk'] = $line['squawk']; // squawk |
|
| 894 | + //$data['emergency'] = ''; // emergency |
|
| 895 | + if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao']; |
|
| 896 | + if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime']; |
|
| 897 | + if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao']; |
|
| 898 | + //$data['arrival_airport_time'] = $line['arrtime']; |
|
| 899 | + if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft']; |
|
| 900 | + if (isset($line['transponder'])) $data['squawk'] = $line['transponder']; |
|
| 901 | + if (isset($line['atis'])) $data['info'] = $line['atis']; |
|
| 902 | + else $data['info'] = ''; |
|
| 903 | + $data['format_source'] = 'pireps'; |
|
| 904 | + $data['id_source'] = $id_source; |
|
| 905 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 906 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 907 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 908 | + if ($line['icon'] == 'plane') { |
|
| 909 | 909 | $SI->add($data); |
| 910 | - // print_r($data); |
|
| 911 | - } elseif ($line['icon'] == 'ct') { |
|
| 910 | + // print_r($data); |
|
| 911 | + } elseif ($line['icon'] == 'ct') { |
|
| 912 | 912 | $data['info'] = str_replace('^§','<br />',$data['info']); |
| 913 | 913 | $data['info'] = str_replace('&sect;','',$data['info']); |
| 914 | 914 | $typec = substr($data['ident'],-3); |
@@ -923,196 +923,196 @@ discard block |
||
| 923 | 923 | elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre'; |
| 924 | 924 | else $data['type'] = 'Observer'; |
| 925 | 925 | 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']); |
| 926 | - } |
|
| 927 | - unset($data); |
|
| 926 | + } |
|
| 927 | + unset($data); |
|
| 928 | 928 | } |
| 929 | - } |
|
| 930 | - //$last_exec['pirepsjson'] = time(); |
|
| 931 | - $last_exec[$id]['last'] = time(); |
|
| 932 | - //} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) { |
|
| 933 | - } elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 934 | - //$buffer = $Common->getData($hosts[$id]); |
|
| 935 | - if ($globalDebug) echo 'Get Data...'."\n"; |
|
| 936 | - $buffer = $Common->getData($value['host']); |
|
| 937 | - $all_data = json_decode($buffer,true); |
|
| 938 | - if ($buffer != '' && is_array($all_data)) { |
|
| 929 | + } |
|
| 930 | + //$last_exec['pirepsjson'] = time(); |
|
| 931 | + $last_exec[$id]['last'] = time(); |
|
| 932 | + //} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) { |
|
| 933 | + } elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 934 | + //$buffer = $Common->getData($hosts[$id]); |
|
| 935 | + if ($globalDebug) echo 'Get Data...'."\n"; |
|
| 936 | + $buffer = $Common->getData($value['host']); |
|
| 937 | + $all_data = json_decode($buffer,true); |
|
| 938 | + if ($buffer != '' && is_array($all_data)) { |
|
| 939 | 939 | $reset = 0; |
| 940 | 940 | foreach ($all_data as $line) { |
| 941 | - $data = array(); |
|
| 942 | - //$data['id'] = $line['id']; // id not usable |
|
| 943 | - if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum']; |
|
| 944 | - $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex |
|
| 945 | - if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname']; |
|
| 946 | - if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; |
|
| 947 | - $data['ident'] = $line['flightnum']; // ident |
|
| 948 | - $data['altitude'] = $line['alt']; // altitude |
|
| 949 | - $data['speed'] = $line['gs']; // speed |
|
| 950 | - $data['heading'] = $line['heading']; // heading |
|
| 951 | - $data['latitude'] = $line['lat']; // lat |
|
| 952 | - $data['longitude'] = $line['lng']; // long |
|
| 953 | - $data['verticalrate'] = ''; // verticale rate |
|
| 954 | - $data['squawk'] = ''; // squawk |
|
| 955 | - $data['emergency'] = ''; // emergency |
|
| 956 | - //$data['datetime'] = $line['lastupdate']; |
|
| 957 | - $data['last_update'] = $line['lastupdate']; |
|
| 958 | - $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 959 | - $data['departure_airport_icao'] = $line['depicao']; |
|
| 960 | - $data['departure_airport_time'] = $line['deptime']; |
|
| 961 | - $data['arrival_airport_icao'] = $line['arricao']; |
|
| 962 | - $data['arrival_airport_time'] = $line['arrtime']; |
|
| 963 | - $data['registration'] = $line['aircraft']; |
|
| 964 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 965 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 966 | - if (isset($line['aircraftname'])) { |
|
| 941 | + $data = array(); |
|
| 942 | + //$data['id'] = $line['id']; // id not usable |
|
| 943 | + if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum']; |
|
| 944 | + $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex |
|
| 945 | + if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname']; |
|
| 946 | + if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; |
|
| 947 | + $data['ident'] = $line['flightnum']; // ident |
|
| 948 | + $data['altitude'] = $line['alt']; // altitude |
|
| 949 | + $data['speed'] = $line['gs']; // speed |
|
| 950 | + $data['heading'] = $line['heading']; // heading |
|
| 951 | + $data['latitude'] = $line['lat']; // lat |
|
| 952 | + $data['longitude'] = $line['lng']; // long |
|
| 953 | + $data['verticalrate'] = ''; // verticale rate |
|
| 954 | + $data['squawk'] = ''; // squawk |
|
| 955 | + $data['emergency'] = ''; // emergency |
|
| 956 | + //$data['datetime'] = $line['lastupdate']; |
|
| 957 | + $data['last_update'] = $line['lastupdate']; |
|
| 958 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 959 | + $data['departure_airport_icao'] = $line['depicao']; |
|
| 960 | + $data['departure_airport_time'] = $line['deptime']; |
|
| 961 | + $data['arrival_airport_icao'] = $line['arricao']; |
|
| 962 | + $data['arrival_airport_time'] = $line['arrtime']; |
|
| 963 | + $data['registration'] = $line['aircraft']; |
|
| 964 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 965 | + if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 966 | + if (isset($line['aircraftname'])) { |
|
| 967 | 967 | $line['aircraftname'] = strtoupper($line['aircraftname']); |
| 968 | 968 | $line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']); |
| 969 | - $aircraft_data = explode('-',$line['aircraftname']); |
|
| 970 | - if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0]; |
|
| 971 | - elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1]; |
|
| 972 | - else { |
|
| 973 | - $aircraft_data = explode(' ',$line['aircraftname']); |
|
| 974 | - if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]); |
|
| 975 | - else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']); |
|
| 976 | - } |
|
| 977 | - } |
|
| 978 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; |
|
| 979 | - $data['id_source'] = $id_source; |
|
| 980 | - $data['format_source'] = 'phpvmacars'; |
|
| 981 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 982 | - $SI->add($data); |
|
| 983 | - unset($data); |
|
| 969 | + $aircraft_data = explode('-',$line['aircraftname']); |
|
| 970 | + if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0]; |
|
| 971 | + elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1]; |
|
| 972 | + else { |
|
| 973 | + $aircraft_data = explode(' ',$line['aircraftname']); |
|
| 974 | + if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]); |
|
| 975 | + else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']); |
|
| 976 | + } |
|
| 977 | + } |
|
| 978 | + if (isset($line['route'])) $data['waypoints'] = $line['route']; |
|
| 979 | + $data['id_source'] = $id_source; |
|
| 980 | + $data['format_source'] = 'phpvmacars'; |
|
| 981 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 982 | + $SI->add($data); |
|
| 983 | + unset($data); |
|
| 984 | 984 | } |
| 985 | 985 | if ($globalDebug) echo 'No more data...'."\n"; |
| 986 | 986 | unset($buffer); |
| 987 | 987 | unset($all_data); |
| 988 | - } |
|
| 989 | - //$last_exec['phpvmacars'] = time(); |
|
| 990 | - $last_exec[$id]['last'] = time(); |
|
| 991 | - } elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 992 | - //$buffer = $Common->getData($hosts[$id]); |
|
| 993 | - if ($globalDebug) echo 'Get Data...'."\n"; |
|
| 994 | - $buffer = $Common->getData($value['host']); |
|
| 995 | - $all_data = json_decode($buffer,true); |
|
| 996 | - if ($buffer != '' && is_array($all_data)) { |
|
| 988 | + } |
|
| 989 | + //$last_exec['phpvmacars'] = time(); |
|
| 990 | + $last_exec[$id]['last'] = time(); |
|
| 991 | + } elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 992 | + //$buffer = $Common->getData($hosts[$id]); |
|
| 993 | + if ($globalDebug) echo 'Get Data...'."\n"; |
|
| 994 | + $buffer = $Common->getData($value['host']); |
|
| 995 | + $all_data = json_decode($buffer,true); |
|
| 996 | + if ($buffer != '' && is_array($all_data)) { |
|
| 997 | 997 | $reset = 0; |
| 998 | 998 | foreach ($all_data as $line) { |
| 999 | - $data = array(); |
|
| 1000 | - //$data['id'] = $line['id']; // id not usable |
|
| 1001 | - $data['id'] = trim($line['flight_id']); |
|
| 1002 | - $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex |
|
| 1003 | - $data['pilot_name'] = $line['pilot_name']; |
|
| 1004 | - $data['pilot_id'] = $line['pilot_id']; |
|
| 1005 | - $data['ident'] = trim($line['callsign']); // ident |
|
| 1006 | - $data['altitude'] = $line['altitude']; // altitude |
|
| 1007 | - $data['speed'] = $line['gs']; // speed |
|
| 1008 | - $data['heading'] = $line['heading']; // heading |
|
| 1009 | - $data['latitude'] = $line['latitude']; // lat |
|
| 1010 | - $data['longitude'] = $line['longitude']; // long |
|
| 1011 | - $data['verticalrate'] = ''; // verticale rate |
|
| 1012 | - $data['squawk'] = ''; // squawk |
|
| 1013 | - $data['emergency'] = ''; // emergency |
|
| 1014 | - //$data['datetime'] = $line['lastupdate']; |
|
| 1015 | - $data['last_update'] = $line['last_update']; |
|
| 1016 | - $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1017 | - $data['departure_airport_icao'] = $line['departure']; |
|
| 1018 | - //$data['departure_airport_time'] = $line['departure_time']; |
|
| 1019 | - $data['arrival_airport_icao'] = $line['arrival']; |
|
| 1020 | - //$data['arrival_airport_time'] = $line['arrival_time']; |
|
| 1021 | - //$data['registration'] = $line['aircraft']; |
|
| 1022 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 1023 | - $data['aircraft_icao'] = $line['plane_type']; |
|
| 1024 | - $data['id_source'] = $id_source; |
|
| 1025 | - $data['format_source'] = 'vam'; |
|
| 1026 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1027 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1028 | - $SI->add($data); |
|
| 1029 | - unset($data); |
|
| 999 | + $data = array(); |
|
| 1000 | + //$data['id'] = $line['id']; // id not usable |
|
| 1001 | + $data['id'] = trim($line['flight_id']); |
|
| 1002 | + $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex |
|
| 1003 | + $data['pilot_name'] = $line['pilot_name']; |
|
| 1004 | + $data['pilot_id'] = $line['pilot_id']; |
|
| 1005 | + $data['ident'] = trim($line['callsign']); // ident |
|
| 1006 | + $data['altitude'] = $line['altitude']; // altitude |
|
| 1007 | + $data['speed'] = $line['gs']; // speed |
|
| 1008 | + $data['heading'] = $line['heading']; // heading |
|
| 1009 | + $data['latitude'] = $line['latitude']; // lat |
|
| 1010 | + $data['longitude'] = $line['longitude']; // long |
|
| 1011 | + $data['verticalrate'] = ''; // verticale rate |
|
| 1012 | + $data['squawk'] = ''; // squawk |
|
| 1013 | + $data['emergency'] = ''; // emergency |
|
| 1014 | + //$data['datetime'] = $line['lastupdate']; |
|
| 1015 | + $data['last_update'] = $line['last_update']; |
|
| 1016 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1017 | + $data['departure_airport_icao'] = $line['departure']; |
|
| 1018 | + //$data['departure_airport_time'] = $line['departure_time']; |
|
| 1019 | + $data['arrival_airport_icao'] = $line['arrival']; |
|
| 1020 | + //$data['arrival_airport_time'] = $line['arrival_time']; |
|
| 1021 | + //$data['registration'] = $line['aircraft']; |
|
| 1022 | + if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 1023 | + $data['aircraft_icao'] = $line['plane_type']; |
|
| 1024 | + $data['id_source'] = $id_source; |
|
| 1025 | + $data['format_source'] = 'vam'; |
|
| 1026 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1027 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1028 | + $SI->add($data); |
|
| 1029 | + unset($data); |
|
| 1030 | 1030 | } |
| 1031 | 1031 | if ($globalDebug) echo 'No more data...'."\n"; |
| 1032 | 1032 | unset($buffer); |
| 1033 | 1033 | unset($all_data); |
| 1034 | - } |
|
| 1035 | - //$last_exec['phpvmacars'] = time(); |
|
| 1036 | - $last_exec[$id]['last'] = time(); |
|
| 1034 | + } |
|
| 1035 | + //$last_exec['phpvmacars'] = time(); |
|
| 1036 | + $last_exec[$id]['last'] = time(); |
|
| 1037 | 1037 | //} elseif ($value == 'sbs' || $value == 'tsv' || $value == 'raw' || $value == 'aprs' || $value == 'beast') { |
| 1038 | 1038 | } elseif ($value['format'] == 'sbs' || $value['format'] == 'tsv' || $value['format'] == 'raw' || $value['format'] == 'aprs' || $value['format'] == 'beast' || $value['format'] == 'flightgearmp' || $value['format'] == 'flightgearsp' || $value['format'] == 'acars' || $value['format'] == 'acarssbs3' || $value['format'] == 'ais' || $value['format'] == 'vrstcp') { |
| 1039 | - if (function_exists('pcntl_fork')) pcntl_signal_dispatch(); |
|
| 1040 | - //$last_exec[$id]['last'] = time(); |
|
| 1039 | + if (function_exists('pcntl_fork')) pcntl_signal_dispatch(); |
|
| 1040 | + //$last_exec[$id]['last'] = time(); |
|
| 1041 | 1041 | |
| 1042 | - //$read = array( $sockets[$id] ); |
|
| 1043 | - $read = $sockets; |
|
| 1044 | - $write = NULL; |
|
| 1045 | - $e = NULL; |
|
| 1046 | - $n = socket_select($read, $write, $e, $timeout); |
|
| 1047 | - if ($e != NULL) var_dump($e); |
|
| 1048 | - if ($n > 0) { |
|
| 1042 | + //$read = array( $sockets[$id] ); |
|
| 1043 | + $read = $sockets; |
|
| 1044 | + $write = NULL; |
|
| 1045 | + $e = NULL; |
|
| 1046 | + $n = socket_select($read, $write, $e, $timeout); |
|
| 1047 | + if ($e != NULL) var_dump($e); |
|
| 1048 | + if ($n > 0) { |
|
| 1049 | 1049 | $reset = 0; |
| 1050 | 1050 | foreach ($read as $nb => $r) { |
| 1051 | - //$value = $formats[$nb]; |
|
| 1052 | - $format = $globalSources[$nb]['format']; |
|
| 1053 | - if ($format == 'sbs' || $format == 'aprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') { |
|
| 1051 | + //$value = $formats[$nb]; |
|
| 1052 | + $format = $globalSources[$nb]['format']; |
|
| 1053 | + if ($format == 'sbs' || $format == 'aprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') { |
|
| 1054 | 1054 | $buffer = @socket_read($r, 6000,PHP_NORMAL_READ); |
| 1055 | - } elseif ($format == 'vrstcp') { |
|
| 1055 | + } elseif ($format == 'vrstcp') { |
|
| 1056 | 1056 | $buffer = @socket_read($r, 6000); |
| 1057 | - } else { |
|
| 1057 | + } else { |
|
| 1058 | 1058 | $az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port); |
| 1059 | - } |
|
| 1060 | - //$buffer = socket_read($r, 60000,PHP_NORMAL_READ); |
|
| 1061 | - //echo $buffer."\n"; |
|
| 1062 | - // lets play nice and handle signals such as ctrl-c/kill properly |
|
| 1063 | - //if (function_exists('pcntl_fork')) pcntl_signal_dispatch(); |
|
| 1064 | - $error = false; |
|
| 1065 | - //$SI::del(); |
|
| 1066 | - if ($format == 'vrstcp') { |
|
| 1059 | + } |
|
| 1060 | + //$buffer = socket_read($r, 60000,PHP_NORMAL_READ); |
|
| 1061 | + //echo $buffer."\n"; |
|
| 1062 | + // lets play nice and handle signals such as ctrl-c/kill properly |
|
| 1063 | + //if (function_exists('pcntl_fork')) pcntl_signal_dispatch(); |
|
| 1064 | + $error = false; |
|
| 1065 | + //$SI::del(); |
|
| 1066 | + if ($format == 'vrstcp') { |
|
| 1067 | 1067 | $buffer = explode('},{',$buffer); |
| 1068 | - } else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer)); |
|
| 1069 | - // SBS format is CSV format |
|
| 1070 | - if ($buffer !== FALSE && $buffer != '') { |
|
| 1068 | + } else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer)); |
|
| 1069 | + // SBS format is CSV format |
|
| 1070 | + if ($buffer !== FALSE && $buffer != '') { |
|
| 1071 | 1071 | $tt[$format] = 0; |
| 1072 | 1072 | if ($format == 'acarssbs3') { |
| 1073 | - if ($globalDebug) echo 'ACARS : '.$buffer."\n"; |
|
| 1074 | - $ACARS->add(trim($buffer)); |
|
| 1075 | - $ACARS->deleteLiveAcarsData(); |
|
| 1073 | + if ($globalDebug) echo 'ACARS : '.$buffer."\n"; |
|
| 1074 | + $ACARS->add(trim($buffer)); |
|
| 1075 | + $ACARS->deleteLiveAcarsData(); |
|
| 1076 | 1076 | } elseif ($format == 'raw') { |
| 1077 | - // AVR format |
|
| 1078 | - $data = $SBS->parse($buffer); |
|
| 1079 | - if (is_array($data)) { |
|
| 1077 | + // AVR format |
|
| 1078 | + $data = $SBS->parse($buffer); |
|
| 1079 | + if (is_array($data)) { |
|
| 1080 | 1080 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 1081 | 1081 | $data['format_source'] = 'raw'; |
| 1082 | 1082 | if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
| 1083 | 1083 | if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
| 1084 | 1084 | if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
| 1085 | 1085 | if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
| 1086 | - } |
|
| 1086 | + } |
|
| 1087 | 1087 | } elseif ($format == 'ais') { |
| 1088 | - $ais_data = $AIS->parse_line(trim($buffer)); |
|
| 1089 | - $data = array(); |
|
| 1090 | - if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident']; |
|
| 1091 | - if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi']; |
|
| 1092 | - if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed']; |
|
| 1093 | - if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading']; |
|
| 1094 | - if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude']; |
|
| 1095 | - if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude']; |
|
| 1096 | - if (isset($ais_data['status'])) $data['status'] = $ais_data['status']; |
|
| 1097 | - if (isset($ais_data['type'])) $data['type'] = $ais_data['type']; |
|
| 1098 | - if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
|
| 1099 | - if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
|
| 1100 | - if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination']; |
|
| 1101 | - if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); |
|
| 1102 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1088 | + $ais_data = $AIS->parse_line(trim($buffer)); |
|
| 1089 | + $data = array(); |
|
| 1090 | + if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident']; |
|
| 1091 | + if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi']; |
|
| 1092 | + if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed']; |
|
| 1093 | + if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading']; |
|
| 1094 | + if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude']; |
|
| 1095 | + if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude']; |
|
| 1096 | + if (isset($ais_data['status'])) $data['status'] = $ais_data['status']; |
|
| 1097 | + if (isset($ais_data['type'])) $data['type'] = $ais_data['type']; |
|
| 1098 | + if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
|
| 1099 | + if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
|
| 1100 | + if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination']; |
|
| 1101 | + if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); |
|
| 1102 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1103 | 1103 | |
| 1104 | - if (isset($ais_data['timestamp'])) { |
|
| 1104 | + if (isset($ais_data['timestamp'])) { |
|
| 1105 | 1105 | $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
| 1106 | - } else { |
|
| 1106 | + } else { |
|
| 1107 | 1107 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 1108 | - } |
|
| 1109 | - $data['format_source'] = 'aisnmea'; |
|
| 1110 | - $data['id_source'] = $id_source; |
|
| 1111 | - if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data); |
|
| 1112 | - unset($data); |
|
| 1113 | - } elseif ($format == 'flightgearsp') { |
|
| 1114 | - //echo $buffer."\n"; |
|
| 1115 | - if (strlen($buffer) > 5) { |
|
| 1108 | + } |
|
| 1109 | + $data['format_source'] = 'aisnmea'; |
|
| 1110 | + $data['id_source'] = $id_source; |
|
| 1111 | + if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data); |
|
| 1112 | + unset($data); |
|
| 1113 | + } elseif ($format == 'flightgearsp') { |
|
| 1114 | + //echo $buffer."\n"; |
|
| 1115 | + if (strlen($buffer) > 5) { |
|
| 1116 | 1116 | $line = explode(',',$buffer); |
| 1117 | 1117 | $data = array(); |
| 1118 | 1118 | //XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p |
@@ -1129,38 +1129,38 @@ discard block |
||
| 1129 | 1129 | if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
| 1130 | 1130 | if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
| 1131 | 1131 | $send = @ socket_send( $r , $data_aprs , strlen($data_aprs) , 0 ); |
| 1132 | - } |
|
| 1133 | - } elseif ($format == 'acars') { |
|
| 1134 | - if ($globalDebug) echo 'ACARS : '.$buffer."\n"; |
|
| 1135 | - $ACARS->add(trim($buffer)); |
|
| 1136 | - socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port); |
|
| 1137 | - $ACARS->deleteLiveAcarsData(); |
|
| 1132 | + } |
|
| 1133 | + } elseif ($format == 'acars') { |
|
| 1134 | + if ($globalDebug) echo 'ACARS : '.$buffer."\n"; |
|
| 1135 | + $ACARS->add(trim($buffer)); |
|
| 1136 | + socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port); |
|
| 1137 | + $ACARS->deleteLiveAcarsData(); |
|
| 1138 | 1138 | } elseif ($format == 'flightgearmp') { |
| 1139 | - if (substr($buffer,0,1) != '#') { |
|
| 1139 | + if (substr($buffer,0,1) != '#') { |
|
| 1140 | 1140 | $data = array(); |
| 1141 | 1141 | //echo $buffer."\n"; |
| 1142 | 1142 | $line = explode(' ',$buffer); |
| 1143 | 1143 | if (count($line) == 11) { |
| 1144 | - $userserver = explode('@',$line[0]); |
|
| 1145 | - $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex |
|
| 1146 | - $data['ident'] = $userserver[0]; |
|
| 1147 | - $data['registration'] = $userserver[0]; |
|
| 1148 | - $data['latitude'] = $line[4]; |
|
| 1149 | - $data['longitude'] = $line[5]; |
|
| 1150 | - $data['altitude'] = $line[6]; |
|
| 1151 | - $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1152 | - $aircraft_type = $line[10]; |
|
| 1153 | - $aircraft_type = preg_split(':/:',$aircraft_type); |
|
| 1154 | - $data['aircraft_name'] = substr(end($aircraft_type),0,-4); |
|
| 1155 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1156 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
|
| 1144 | + $userserver = explode('@',$line[0]); |
|
| 1145 | + $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex |
|
| 1146 | + $data['ident'] = $userserver[0]; |
|
| 1147 | + $data['registration'] = $userserver[0]; |
|
| 1148 | + $data['latitude'] = $line[4]; |
|
| 1149 | + $data['longitude'] = $line[5]; |
|
| 1150 | + $data['altitude'] = $line[6]; |
|
| 1151 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1152 | + $aircraft_type = $line[10]; |
|
| 1153 | + $aircraft_type = preg_split(':/:',$aircraft_type); |
|
| 1154 | + $data['aircraft_name'] = substr(end($aircraft_type),0,-4); |
|
| 1155 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1156 | + if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
|
| 1157 | + } |
|
| 1157 | 1158 | } |
| 1158 | - } |
|
| 1159 | 1159 | } elseif ($format == 'beast') { |
| 1160 | - echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n"; |
|
| 1161 | - die; |
|
| 1160 | + echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n"; |
|
| 1161 | + die; |
|
| 1162 | 1162 | } elseif ($format == 'vrstcp') { |
| 1163 | - foreach($buffer as $all_data) { |
|
| 1163 | + foreach($buffer as $all_data) { |
|
| 1164 | 1164 | $line = json_decode('{'.$all_data.'}',true); |
| 1165 | 1165 | $data = array(); |
| 1166 | 1166 | if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex |
@@ -1180,106 +1180,106 @@ discard block |
||
| 1180 | 1180 | */ |
| 1181 | 1181 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 1182 | 1182 | if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type']; |
| 1183 | - $data['format_source'] = 'vrstcp'; |
|
| 1183 | + $data['format_source'] = 'vrstcp'; |
|
| 1184 | 1184 | $data['id_source'] = $id_source; |
| 1185 | 1185 | if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
| 1186 | 1186 | if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
| 1187 | 1187 | if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data); |
| 1188 | 1188 | unset($data); |
| 1189 | - } |
|
| 1189 | + } |
|
| 1190 | 1190 | } elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') { |
| 1191 | - $line = explode("\t", $buffer); |
|
| 1192 | - for($k = 0; $k < count($line); $k=$k+2) { |
|
| 1191 | + $line = explode("\t", $buffer); |
|
| 1192 | + for($k = 0; $k < count($line); $k=$k+2) { |
|
| 1193 | 1193 | $key = $line[$k]; |
| 1194 | - $lined[$key] = $line[$k+1]; |
|
| 1195 | - } |
|
| 1196 | - if (count($lined) > 3) { |
|
| 1197 | - $data['hex'] = $lined['hexid']; |
|
| 1198 | - //$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));; |
|
| 1199 | - $data['datetime'] = date('Y-m-d H:i:s');; |
|
| 1200 | - if (isset($lined['ident'])) $data['ident'] = $lined['ident']; |
|
| 1201 | - if (isset($lined['lat'])) $data['latitude'] = $lined['lat']; |
|
| 1202 | - if (isset($lined['lon'])) $data['longitude'] = $lined['lon']; |
|
| 1203 | - if (isset($lined['speed'])) $data['speed'] = $lined['speed']; |
|
| 1204 | - if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk']; |
|
| 1205 | - if (isset($lined['alt'])) $data['altitude'] = $lined['alt']; |
|
| 1206 | - if (isset($lined['heading'])) $data['heading'] = $lined['heading']; |
|
| 1207 | - $data['id_source'] = $id_source; |
|
| 1208 | - $data['format_source'] = 'tsv'; |
|
| 1209 | - if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
|
| 1210 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1194 | + $lined[$key] = $line[$k+1]; |
|
| 1195 | + } |
|
| 1196 | + if (count($lined) > 3) { |
|
| 1197 | + $data['hex'] = $lined['hexid']; |
|
| 1198 | + //$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));; |
|
| 1199 | + $data['datetime'] = date('Y-m-d H:i:s');; |
|
| 1200 | + if (isset($lined['ident'])) $data['ident'] = $lined['ident']; |
|
| 1201 | + if (isset($lined['lat'])) $data['latitude'] = $lined['lat']; |
|
| 1202 | + if (isset($lined['lon'])) $data['longitude'] = $lined['lon']; |
|
| 1203 | + if (isset($lined['speed'])) $data['speed'] = $lined['speed']; |
|
| 1204 | + if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk']; |
|
| 1205 | + if (isset($lined['alt'])) $data['altitude'] = $lined['alt']; |
|
| 1206 | + if (isset($lined['heading'])) $data['heading'] = $lined['heading']; |
|
| 1207 | + $data['id_source'] = $id_source; |
|
| 1208 | + $data['format_source'] = 'tsv'; |
|
| 1209 | + if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
|
| 1210 | + if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1211 | 1211 | if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
| 1212 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
|
| 1213 | - unset($lined); |
|
| 1214 | - unset($data); |
|
| 1215 | - } else $error = true; |
|
| 1212 | + if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
|
| 1213 | + unset($lined); |
|
| 1214 | + unset($data); |
|
| 1215 | + } else $error = true; |
|
| 1216 | 1216 | } elseif ($format == 'aprs' && $use_aprs) { |
| 1217 | - if ($aprs_connect == 0) { |
|
| 1217 | + if ($aprs_connect == 0) { |
|
| 1218 | 1218 | $send = @ socket_send( $r , $aprs_login , strlen($aprs_login) , 0 ); |
| 1219 | 1219 | $aprs_connect = 1; |
| 1220 | - } |
|
| 1220 | + } |
|
| 1221 | 1221 | |
| 1222 | - if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) { |
|
| 1222 | + if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) { |
|
| 1223 | 1223 | $aprs_last_tx = time(); |
| 1224 | 1224 | $data_aprs = "# Keep alive"; |
| 1225 | 1225 | $send = @ socket_send( $r , $data_aprs , strlen($data_aprs) , 0 ); |
| 1226 | - } |
|
| 1226 | + } |
|
| 1227 | 1227 | |
| 1228 | - //echo 'Connect : '.$aprs_connect.' '.$buffer."\n"; |
|
| 1229 | - //echo 'APRS data : '.$buffer."\n"; |
|
| 1230 | - $buffer = str_replace('APRS <- ','',$buffer); |
|
| 1231 | - $buffer = str_replace('APRS -> ','',$buffer); |
|
| 1232 | - //echo $buffer."\n"; |
|
| 1233 | - if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') { |
|
| 1228 | + //echo 'Connect : '.$aprs_connect.' '.$buffer."\n"; |
|
| 1229 | + //echo 'APRS data : '.$buffer."\n"; |
|
| 1230 | + $buffer = str_replace('APRS <- ','',$buffer); |
|
| 1231 | + $buffer = str_replace('APRS -> ','',$buffer); |
|
| 1232 | + //echo $buffer."\n"; |
|
| 1233 | + if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') { |
|
| 1234 | 1234 | $line = $APRS->parse($buffer); |
| 1235 | 1235 | //if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) { |
| 1236 | 1236 | if (is_array($line) && isset($line['latitude']) && isset($line['longitude']) && (isset($line['ident']) || isset($line['address']) || isset($line['mmsi']))) { |
| 1237 | - $aprs_last_tx = time(); |
|
| 1238 | - $data = array(); |
|
| 1239 | - //print_r($line); |
|
| 1240 | - if (isset($line['address'])) $data['hex'] = $line['address']; |
|
| 1241 | - if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi']; |
|
| 1242 | - if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']); |
|
| 1243 | - else $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1244 | - //$data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1245 | - if (isset($line['ident'])) $data['ident'] = $line['ident']; |
|
| 1246 | - $data['latitude'] = $line['latitude']; |
|
| 1247 | - $data['longitude'] = $line['longitude']; |
|
| 1248 | - //$data['verticalrate'] = $line[16]; |
|
| 1249 | - if (isset($line['speed'])) $data['speed'] = $line['speed']; |
|
| 1250 | - else $data['speed'] = 0; |
|
| 1251 | - if (isset($line['altitude'])) $data['altitude'] = $line['altitude']; |
|
| 1252 | - if (isset($line['comment'])) $data['comment'] = $line['comment']; |
|
| 1253 | - if (isset($line['symbol'])) $data['type'] = $line['symbol']; |
|
| 1254 | - if (isset($line['heading'])) $data['heading'] = $line['heading']; |
|
| 1255 | - //else $data['heading'] = 0; |
|
| 1256 | - if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth']; |
|
| 1257 | - if (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE)) $data['noarchive'] = true; |
|
| 1258 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1259 | - $data['id_source'] = $id_source; |
|
| 1260 | - if (isset($line['format_source'])) $data['format_source'] = $line['format_source']; |
|
| 1261 | - else $data['format_source'] = 'aprs'; |
|
| 1262 | - $data['source_name'] = $line['source']; |
|
| 1263 | - if (isset($line['source_type'])) $data['source_type'] = $line['source_type']; |
|
| 1264 | - else $data['source_type'] = 'flarm'; |
|
| 1265 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1266 | - $currentdate = date('Y-m-d H:i:s'); |
|
| 1267 | - $aprsdate = strtotime($data['datetime']); |
|
| 1268 | - // Accept data if time <= system time + 20s |
|
| 1269 | - 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'])))) { |
|
| 1237 | + $aprs_last_tx = time(); |
|
| 1238 | + $data = array(); |
|
| 1239 | + //print_r($line); |
|
| 1240 | + if (isset($line['address'])) $data['hex'] = $line['address']; |
|
| 1241 | + if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi']; |
|
| 1242 | + if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']); |
|
| 1243 | + else $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1244 | + //$data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1245 | + if (isset($line['ident'])) $data['ident'] = $line['ident']; |
|
| 1246 | + $data['latitude'] = $line['latitude']; |
|
| 1247 | + $data['longitude'] = $line['longitude']; |
|
| 1248 | + //$data['verticalrate'] = $line[16]; |
|
| 1249 | + if (isset($line['speed'])) $data['speed'] = $line['speed']; |
|
| 1250 | + else $data['speed'] = 0; |
|
| 1251 | + if (isset($line['altitude'])) $data['altitude'] = $line['altitude']; |
|
| 1252 | + if (isset($line['comment'])) $data['comment'] = $line['comment']; |
|
| 1253 | + if (isset($line['symbol'])) $data['type'] = $line['symbol']; |
|
| 1254 | + if (isset($line['heading'])) $data['heading'] = $line['heading']; |
|
| 1255 | + //else $data['heading'] = 0; |
|
| 1256 | + if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth']; |
|
| 1257 | + if (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE)) $data['noarchive'] = true; |
|
| 1258 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1259 | + $data['id_source'] = $id_source; |
|
| 1260 | + if (isset($line['format_source'])) $data['format_source'] = $line['format_source']; |
|
| 1261 | + else $data['format_source'] = 'aprs'; |
|
| 1262 | + $data['source_name'] = $line['source']; |
|
| 1263 | + if (isset($line['source_type'])) $data['source_type'] = $line['source_type']; |
|
| 1264 | + else $data['source_type'] = 'flarm'; |
|
| 1265 | + if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1266 | + $currentdate = date('Y-m-d H:i:s'); |
|
| 1267 | + $aprsdate = strtotime($data['datetime']); |
|
| 1268 | + // Accept data if time <= system time + 20s |
|
| 1269 | + 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'])))) { |
|
| 1270 | 1270 | $send = $SI->add($data); |
| 1271 | - } elseif ($data['source_type'] == 'ais') { |
|
| 1271 | + } elseif ($data['source_type'] == 'ais') { |
|
| 1272 | 1272 | echo 'add...'."\n"; |
| 1273 | 1273 | $send = $MI->add($data); |
| 1274 | - } elseif (isset($line['stealth'])) { |
|
| 1274 | + } elseif (isset($line['stealth'])) { |
|
| 1275 | 1275 | if ($line['stealth'] != 0) echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n"; |
| 1276 | 1276 | else echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n"; |
| 1277 | - //} elseif (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' || $line['symbol'] == 'Police' || $line['symbol'] == 'Bike' || $line['symbol'] == 'Jogger' || $line['symbol'] == 'Bus' || $line['symbol'] == 'Jeep' || $line['symbol'] == 'Recreational Vehicle' || $line['symbol'] == 'Yacht (Sail)' || $line['symbol'] == 'Ship (Power Boat)' || $line['symbol'] == 'Firetruck' || $line['symbol'] == 'Balloon' || $line['symbol'] == 'Aircraft (small)' || $line['symbol'] == 'Helicopter')) { |
|
| 1278 | - } 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') { |
|
| 1277 | + //} elseif (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' || $line['symbol'] == 'Police' || $line['symbol'] == 'Bike' || $line['symbol'] == 'Jogger' || $line['symbol'] == 'Bus' || $line['symbol'] == 'Jeep' || $line['symbol'] == 'Recreational Vehicle' || $line['symbol'] == 'Yacht (Sail)' || $line['symbol'] == 'Ship (Power Boat)' || $line['symbol'] == 'Firetruck' || $line['symbol'] == 'Balloon' || $line['symbol'] == 'Aircraft (small)' || $line['symbol'] == 'Helicopter')) { |
|
| 1278 | + } 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') { |
|
| 1279 | 1279 | //echo '!!!!!!!!!!!!!!!! SEND !!!!!!!!!!!!!!!!!!!!'."\n"; |
| 1280 | 1280 | if (isset($globalTracker) && $globalTracker) $send = $TI->add($data); |
| 1281 | - } |
|
| 1282 | - unset($data); |
|
| 1281 | + } |
|
| 1282 | + unset($data); |
|
| 1283 | 1283 | } |
| 1284 | 1284 | elseif (is_array($line) && $globalDebug && isset($line['symbol']) && $line['symbol'] == 'Weather Station') { |
| 1285 | 1285 | echo '!! Weather Station not yet supported'."\n"; |
@@ -1289,12 +1289,12 @@ discard block |
||
| 1289 | 1289 | } |
| 1290 | 1290 | //elseif ($line == false && $globalDebug) echo 'Ignored ('.$buffer.")\n"; |
| 1291 | 1291 | //elseif ($line == true && $globalDebug) echo '!! Failed : '.$buffer."!!\n"; |
| 1292 | - } |
|
| 1292 | + } |
|
| 1293 | 1293 | } else { |
| 1294 | - $line = explode(',', $buffer); |
|
| 1295 | - if (count($line) > 20) { |
|
| 1296 | - $data['hex'] = $line[4]; |
|
| 1297 | - /* |
|
| 1294 | + $line = explode(',', $buffer); |
|
| 1295 | + if (count($line) > 20) { |
|
| 1296 | + $data['hex'] = $line[4]; |
|
| 1297 | + /* |
|
| 1298 | 1298 | $data['datetime'] = $line[6].' '.$line[7]; |
| 1299 | 1299 | date_default_timezone_set($globalTimezone); |
| 1300 | 1300 | $datetime = new DateTime($data['datetime']); |
@@ -1302,30 +1302,30 @@ discard block |
||
| 1302 | 1302 | $data['datetime'] = $datetime->format('Y-m-d H:i:s'); |
| 1303 | 1303 | date_default_timezone_set('UTC'); |
| 1304 | 1304 | */ |
| 1305 | - // Force datetime to current UTC datetime |
|
| 1306 | - date_default_timezone_set('UTC'); |
|
| 1307 | - $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1308 | - $data['ident'] = trim($line[10]); |
|
| 1309 | - $data['latitude'] = $line[14]; |
|
| 1310 | - $data['longitude'] = $line[15]; |
|
| 1311 | - $data['verticalrate'] = $line[16]; |
|
| 1312 | - $data['emergency'] = $line[20]; |
|
| 1313 | - $data['speed'] = $line[12]; |
|
| 1314 | - $data['squawk'] = $line[17]; |
|
| 1315 | - $data['altitude'] = $line[11]; |
|
| 1316 | - $data['heading'] = $line[13]; |
|
| 1317 | - $data['ground'] = $line[21]; |
|
| 1318 | - $data['emergency'] = $line[19]; |
|
| 1319 | - $data['format_source'] = 'sbs'; |
|
| 1305 | + // Force datetime to current UTC datetime |
|
| 1306 | + date_default_timezone_set('UTC'); |
|
| 1307 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1308 | + $data['ident'] = trim($line[10]); |
|
| 1309 | + $data['latitude'] = $line[14]; |
|
| 1310 | + $data['longitude'] = $line[15]; |
|
| 1311 | + $data['verticalrate'] = $line[16]; |
|
| 1312 | + $data['emergency'] = $line[20]; |
|
| 1313 | + $data['speed'] = $line[12]; |
|
| 1314 | + $data['squawk'] = $line[17]; |
|
| 1315 | + $data['altitude'] = $line[11]; |
|
| 1316 | + $data['heading'] = $line[13]; |
|
| 1317 | + $data['ground'] = $line[21]; |
|
| 1318 | + $data['emergency'] = $line[19]; |
|
| 1319 | + $data['format_source'] = 'sbs'; |
|
| 1320 | 1320 | if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
| 1321 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1321 | + if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1322 | 1322 | if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
| 1323 | - $data['id_source'] = $id_source; |
|
| 1324 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data); |
|
| 1325 | - else $error = true; |
|
| 1326 | - unset($data); |
|
| 1327 | - } else $error = true; |
|
| 1328 | - if ($error) { |
|
| 1323 | + $data['id_source'] = $id_source; |
|
| 1324 | + if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data); |
|
| 1325 | + else $error = true; |
|
| 1326 | + unset($data); |
|
| 1327 | + } else $error = true; |
|
| 1328 | + if ($error) { |
|
| 1329 | 1329 | if (count($line) > 1 && ($line[0] == 'STA' || $line[0] == 'AIR' || $line[0] == 'SEL' || $line[0] == 'ID' || $line[0] == 'CLK')) { |
| 1330 | 1330 | if ($globalDebug) echo "Not a message. Ignoring... \n"; |
| 1331 | 1331 | } else { |
@@ -1341,13 +1341,13 @@ discard block |
||
| 1341 | 1341 | connect_all($sourceer); |
| 1342 | 1342 | $sourceer = array(); |
| 1343 | 1343 | } |
| 1344 | - } |
|
| 1344 | + } |
|
| 1345 | 1345 | } |
| 1346 | 1346 | // Sleep for xxx microseconds |
| 1347 | 1347 | if (isset($globalSBSSleep)) usleep($globalSBSSleep); |
| 1348 | - } else { |
|
| 1348 | + } else { |
|
| 1349 | 1349 | if ($format == 'flightgearmp') { |
| 1350 | - if ($globalDebug) echo "Reconnect FlightGear MP..."; |
|
| 1350 | + if ($globalDebug) echo "Reconnect FlightGear MP..."; |
|
| 1351 | 1351 | //@socket_close($r); |
| 1352 | 1352 | sleep($globalMinFetch); |
| 1353 | 1353 | $sourcefg[$nb] = $globalSources[$nb]; |
@@ -1356,9 +1356,9 @@ discard block |
||
| 1356 | 1356 | break; |
| 1357 | 1357 | |
| 1358 | 1358 | } elseif ($format != 'acars' && $format != 'flightgearsp') { |
| 1359 | - if (isset($tt[$format])) $tt[$format]++; |
|
| 1360 | - else $tt[$format] = 0; |
|
| 1361 | - if ($tt[$format] > 30) { |
|
| 1359 | + if (isset($tt[$format])) $tt[$format]++; |
|
| 1360 | + else $tt[$format] = 0; |
|
| 1361 | + if ($tt[$format] > 30) { |
|
| 1362 | 1362 | if ($globalDebug) echo "ERROR : Reconnect ".$format."..."; |
| 1363 | 1363 | //@socket_close($r); |
| 1364 | 1364 | sleep(2); |
@@ -1369,23 +1369,23 @@ discard block |
||
| 1369 | 1369 | //connect_all($globalSources); |
| 1370 | 1370 | $tt[$format]=0; |
| 1371 | 1371 | break; |
| 1372 | - } |
|
| 1372 | + } |
|
| 1373 | + } |
|
| 1373 | 1374 | } |
| 1374 | - } |
|
| 1375 | 1375 | } |
| 1376 | - } else { |
|
| 1376 | + } else { |
|
| 1377 | 1377 | $error = socket_strerror(socket_last_error()); |
| 1378 | 1378 | if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) { |
| 1379 | 1379 | if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n"; |
| 1380 | 1380 | if (isset($globalDebug)) echo "Restarting...\n"; |
| 1381 | 1381 | // Restart the script if possible |
| 1382 | 1382 | if (is_array($sockets)) { |
| 1383 | - if ($globalDebug) echo "Shutdown all sockets..."; |
|
| 1383 | + if ($globalDebug) echo "Shutdown all sockets..."; |
|
| 1384 | 1384 | |
| 1385 | - foreach ($sockets as $sock) { |
|
| 1385 | + foreach ($sockets as $sock) { |
|
| 1386 | 1386 | @socket_shutdown($sock,2); |
| 1387 | 1387 | @socket_close($sock); |
| 1388 | - } |
|
| 1388 | + } |
|
| 1389 | 1389 | |
| 1390 | 1390 | } |
| 1391 | 1391 | if ($globalDebug) echo "Restart all connections..."; |
@@ -1399,13 +1399,13 @@ discard block |
||
| 1399 | 1399 | if ($reset > 100) exit('Too many attempts...'); |
| 1400 | 1400 | connect_all($globalSources); |
| 1401 | 1401 | } |
| 1402 | - } |
|
| 1402 | + } |
|
| 1403 | 1403 | } |
| 1404 | 1404 | if ($globalDaemon === false) { |
| 1405 | - if ($globalDebug) echo 'Check all...'."\n"; |
|
| 1406 | - $SI->checkAll(); |
|
| 1405 | + if ($globalDebug) echo 'Check all...'."\n"; |
|
| 1406 | + $SI->checkAll(); |
|
| 1407 | + } |
|
| 1407 | 1408 | } |
| 1408 | - } |
|
| 1409 | 1409 | } |
| 1410 | 1410 | |
| 1411 | 1411 | ?> |
@@ -45,20 +45,20 @@ discard block |
||
| 45 | 45 | die; |
| 46 | 46 | } |
| 47 | 47 | //$hosts = array($globalSBS1Host.':'.$globalSBS1Port); |
| 48 | - $globalSources[] = array('host' => $globalSBS1Host,'port' => $globalSBS1Port); |
|
| 48 | + $globalSources[] = array('host' => $globalSBS1Host, 'port' => $globalSBS1Port); |
|
| 49 | 49 | } |
| 50 | 50 | } |
| 51 | 51 | |
| 52 | -$options = getopt('s::',array('source::','server','nodaemon','idsource::','aprsserverssid::','aprsserverpass::','aprsserverhost::','aprsserverport::','format::','noaprsserver')); |
|
| 52 | +$options = getopt('s::', array('source::', 'server', 'nodaemon', 'idsource::', 'aprsserverssid::', 'aprsserverpass::', 'aprsserverhost::', 'aprsserverport::', 'format::', 'noaprsserver')); |
|
| 53 | 53 | //if (isset($options['s'])) $hosts = array($options['s']); |
| 54 | 54 | //elseif (isset($options['source'])) $hosts = array($options['source']); |
| 55 | 55 | if (isset($options['s'])) { |
| 56 | 56 | $globalSources = array(); |
| 57 | - if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']); |
|
| 57 | + if (isset($options['format'])) $globalSources[] = array('host' => $options['s'], 'format' => $options['format']); |
|
| 58 | 58 | else $globalSources[] = array('host' => $options['s']); |
| 59 | 59 | } elseif (isset($options['source'])) { |
| 60 | 60 | $globalSources = array(); |
| 61 | - if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']); |
|
| 61 | + if (isset($options['format'])) $globalSources[] = array('host' => $options['source'], 'format' => $options['format']); |
|
| 62 | 62 | else $globalSources[] = array('host' => $options['source']); |
| 63 | 63 | } |
| 64 | 64 | if (isset($options['aprsserverhost'])) { |
@@ -75,27 +75,27 @@ discard block |
||
| 75 | 75 | else $id_source = 1; |
| 76 | 76 | if (isset($globalServer) && $globalServer) { |
| 77 | 77 | if ($globalDebug) echo "Using Server Mode\n"; |
| 78 | - $SI=new SpotterServer(); |
|
| 78 | + $SI = new SpotterServer(); |
|
| 79 | 79 | /* |
| 80 | 80 | require_once(dirname(__FILE__).'/../require/class.APRS.php'); |
| 81 | 81 | $SI = new adsb2aprs(); |
| 82 | 82 | $SI->connect(); |
| 83 | 83 | */ |
| 84 | -} else $SI=new SpotterImport($Connection->db); |
|
| 84 | +} else $SI = new SpotterImport($Connection->db); |
|
| 85 | 85 | if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db); |
| 86 | 86 | if (isset($globalMarine) && $globalMarine) { |
| 87 | 87 | $AIS = new AIS(); |
| 88 | 88 | $MI = new MarineImport($Connection->db); |
| 89 | 89 | } |
| 90 | 90 | //$APRS=new APRS($Connection->db); |
| 91 | -$SBS=new SBS(); |
|
| 92 | -$ACARS=new ACARS($Connection->db); |
|
| 93 | -$Common=new Common(); |
|
| 91 | +$SBS = new SBS(); |
|
| 92 | +$ACARS = new ACARS($Connection->db); |
|
| 93 | +$Common = new Common(); |
|
| 94 | 94 | date_default_timezone_set('UTC'); |
| 95 | 95 | //$servertz = system('date +%Z'); |
| 96 | 96 | // signal handler - playing nice with sockets and dump1090 |
| 97 | 97 | if (function_exists('pcntl_fork')) { |
| 98 | - pcntl_signal(SIGINT, function() { |
|
| 98 | + pcntl_signal(SIGINT, function() { |
|
| 99 | 99 | global $sockets; |
| 100 | 100 | echo "\n\nctrl-c or kill signal received. Tidying up ... "; |
| 101 | 101 | die("Bye!\n"); |
@@ -111,35 +111,35 @@ discard block |
||
| 111 | 111 | |
| 112 | 112 | function connect_all($hosts) { |
| 113 | 113 | //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs; |
| 114 | - global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context; |
|
| 114 | + global $sockets, $httpfeeds, $globalSources, $globalDebug, $aprs_connect, $last_exec, $globalSourcesRights, $use_aprs, $reset, $context; |
|
| 115 | 115 | $reset++; |
| 116 | 116 | if ($globalDebug) echo 'Connect to all...'."\n"; |
| 117 | 117 | foreach ($hosts as $id => $value) { |
| 118 | 118 | $host = $value['host']; |
| 119 | 119 | $globalSources[$id]['last_exec'] = 0; |
| 120 | 120 | // Here we check type of source(s) |
| 121 | - if (filter_var($host,FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) { |
|
| 122 | - if (preg_match('/deltadb.txt$/i',$host)) { |
|
| 121 | + if (filter_var($host, FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) { |
|
| 122 | + if (preg_match('/deltadb.txt$/i', $host)) { |
|
| 123 | 123 | //$formats[$id] = 'deltadbtxt'; |
| 124 | 124 | $globalSources[$id]['format'] = 'deltadbtxt'; |
| 125 | 125 | //$last_exec['deltadbtxt'] = 0; |
| 126 | 126 | if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n"; |
| 127 | - } else if (preg_match('/vatsim-data.txt$/i',$host)) { |
|
| 127 | + } else if (preg_match('/vatsim-data.txt$/i', $host)) { |
|
| 128 | 128 | //$formats[$id] = 'vatsimtxt'; |
| 129 | 129 | $globalSources[$id]['format'] = 'vatsimtxt'; |
| 130 | 130 | //$last_exec['vatsimtxt'] = 0; |
| 131 | 131 | if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n"; |
| 132 | - } else if (preg_match('/aircraftlist.json$/i',$host)) { |
|
| 132 | + } else if (preg_match('/aircraftlist.json$/i', $host)) { |
|
| 133 | 133 | //$formats[$id] = 'aircraftlistjson'; |
| 134 | 134 | $globalSources[$id]['format'] = 'aircraftlistjson'; |
| 135 | 135 | //$last_exec['aircraftlistjson'] = 0; |
| 136 | 136 | if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n"; |
| 137 | - } else if (preg_match('/opensky/i',$host)) { |
|
| 137 | + } else if (preg_match('/opensky/i', $host)) { |
|
| 138 | 138 | //$formats[$id] = 'aircraftlistjson'; |
| 139 | 139 | $globalSources[$id]['format'] = 'opensky'; |
| 140 | 140 | //$last_exec['aircraftlistjson'] = 0; |
| 141 | 141 | if ($globalDebug) echo "Connect to opensky source (".$host.")...\n"; |
| 142 | - } else if (preg_match('/radarvirtuel.com\/file.json$/i',$host)) { |
|
| 142 | + } else if (preg_match('/radarvirtuel.com\/file.json$/i', $host)) { |
|
| 143 | 143 | //$formats[$id] = 'radarvirtueljson'; |
| 144 | 144 | $globalSources[$id]['format'] = 'radarvirtueljson'; |
| 145 | 145 | //$last_exec['radarvirtueljson'] = 0; |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
| 149 | 149 | exit(0); |
| 150 | 150 | } |
| 151 | - } else if (preg_match('/planeUpdateFAA.php$/i',$host)) { |
|
| 151 | + } else if (preg_match('/planeUpdateFAA.php$/i', $host)) { |
|
| 152 | 152 | //$formats[$id] = 'planeupdatefaa'; |
| 153 | 153 | $globalSources[$id]['format'] = 'planeupdatefaa'; |
| 154 | 154 | //$last_exec['planeupdatefaa'] = 0; |
@@ -157,26 +157,26 @@ discard block |
||
| 157 | 157 | echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
| 158 | 158 | exit(0); |
| 159 | 159 | } |
| 160 | - } else if (preg_match('/\/action.php\/acars\/data$/i',$host)) { |
|
| 160 | + } else if (preg_match('/\/action.php\/acars\/data$/i', $host)) { |
|
| 161 | 161 | //$formats[$id] = 'phpvmacars'; |
| 162 | 162 | $globalSources[$id]['format'] = 'phpvmacars'; |
| 163 | 163 | //$last_exec['phpvmacars'] = 0; |
| 164 | 164 | if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n"; |
| 165 | - } else if (preg_match('/VAM-json.php$/i',$host)) { |
|
| 165 | + } else if (preg_match('/VAM-json.php$/i', $host)) { |
|
| 166 | 166 | //$formats[$id] = 'phpvmacars'; |
| 167 | 167 | $globalSources[$id]['format'] = 'vam'; |
| 168 | 168 | if ($globalDebug) echo "Connect to Vam source (".$host.")...\n"; |
| 169 | - } else if (preg_match('/whazzup/i',$host)) { |
|
| 169 | + } else if (preg_match('/whazzup/i', $host)) { |
|
| 170 | 170 | //$formats[$id] = 'whazzup'; |
| 171 | 171 | $globalSources[$id]['format'] = 'whazzup'; |
| 172 | 172 | //$last_exec['whazzup'] = 0; |
| 173 | 173 | if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n"; |
| 174 | - } else if (preg_match('/recentpireps/i',$host)) { |
|
| 174 | + } else if (preg_match('/recentpireps/i', $host)) { |
|
| 175 | 175 | //$formats[$id] = 'pirepsjson'; |
| 176 | 176 | $globalSources[$id]['format'] = 'pirepsjson'; |
| 177 | 177 | //$last_exec['pirepsjson'] = 0; |
| 178 | 178 | if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n"; |
| 179 | - } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) { |
|
| 179 | + } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i', $host)) { |
|
| 180 | 180 | //$formats[$id] = 'fr24json'; |
| 181 | 181 | $globalSources[$id]['format'] = 'fr24json'; |
| 182 | 182 | //$last_exec['fr24json'] = 0; |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
| 186 | 186 | exit(0); |
| 187 | 187 | } |
| 188 | - } else if (preg_match(':myshiptracking.com/:i',$host)) { |
|
| 188 | + } else if (preg_match(':myshiptracking.com/:i', $host)) { |
|
| 189 | 189 | //$formats[$id] = 'fr24json'; |
| 190 | 190 | $globalSources[$id]['format'] = 'myshiptracking'; |
| 191 | 191 | //$last_exec['fr24json'] = 0; |
@@ -195,22 +195,22 @@ discard block |
||
| 195 | 195 | exit(0); |
| 196 | 196 | } |
| 197 | 197 | //} else if (preg_match('/10001/',$host)) { |
| 198 | - } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) { |
|
| 198 | + } else if (preg_match('/10001/', $host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) { |
|
| 199 | 199 | //$formats[$id] = 'tsv'; |
| 200 | 200 | $globalSources[$id]['format'] = 'tsv'; |
| 201 | 201 | if ($globalDebug) echo "Connect to tsv source (".$host.")...\n"; |
| 202 | 202 | } |
| 203 | - } elseif (filter_var($host,FILTER_VALIDATE_URL)) { |
|
| 203 | + } elseif (filter_var($host, FILTER_VALIDATE_URL)) { |
|
| 204 | 204 | if ($globalSources[$id]['format'] == 'aisnmeahttp') { |
| 205 | - $idf = fopen($globalSources[$id]['host'],'r',false,$context); |
|
| 205 | + $idf = fopen($globalSources[$id]['host'], 'r', false, $context); |
|
| 206 | 206 | if ($idf !== false) { |
| 207 | 207 | $httpfeeds[$id] = $idf; |
| 208 | 208 | if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
| 209 | 209 | } |
| 210 | 210 | elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n"; |
| 211 | 211 | } elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
| 212 | - } elseif (!filter_var($host,FILTER_VALIDATE_URL)) { |
|
| 213 | - $hostport = explode(':',$host); |
|
| 212 | + } elseif (!filter_var($host, FILTER_VALIDATE_URL)) { |
|
| 213 | + $hostport = explode(':', $host); |
|
| 214 | 214 | if (isset($hostport[1])) { |
| 215 | 215 | $port = $hostport[1]; |
| 216 | 216 | $hostn = $hostport[0]; |
@@ -220,19 +220,19 @@ discard block |
||
| 220 | 220 | } |
| 221 | 221 | $Common = new Common(); |
| 222 | 222 | if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) { |
| 223 | - $s = $Common->create_socket($hostn,$port, $errno, $errstr); |
|
| 223 | + $s = $Common->create_socket($hostn, $port, $errno, $errstr); |
|
| 224 | 224 | } else { |
| 225 | - $s = $Common->create_socket_udp($hostn,$port, $errno, $errstr); |
|
| 225 | + $s = $Common->create_socket_udp($hostn, $port, $errno, $errstr); |
|
| 226 | 226 | } |
| 227 | 227 | if ($s) { |
| 228 | 228 | $sockets[$id] = $s; |
| 229 | 229 | if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') { |
| 230 | - if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') { |
|
| 230 | + if (preg_match('/aprs/', $hostn) || $port == '10152' || $port == '14580') { |
|
| 231 | 231 | //$formats[$id] = 'aprs'; |
| 232 | 232 | $globalSources[$id]['format'] = 'aprs'; |
| 233 | 233 | //$aprs_connect = 0; |
| 234 | 234 | //$use_aprs = true; |
| 235 | - } elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') { |
|
| 235 | + } elseif (preg_match('/pub-vrs/', $hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') { |
|
| 236 | 236 | $globalSources[$id]['format'] = 'vrstcp'; |
| 237 | 237 | } elseif ($port == '10001') { |
| 238 | 238 | //$formats[$id] = 'tsv'; |
@@ -271,7 +271,7 @@ discard block |
||
| 271 | 271 | else if (isset($globalSBS1TimeOut)) $timeout = $globalSBS1TimeOut; |
| 272 | 272 | else $timeout = 20; |
| 273 | 273 | $errno = ''; |
| 274 | -$errstr=''; |
|
| 274 | +$errstr = ''; |
|
| 275 | 275 | |
| 276 | 276 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 277 | 277 | /* Initiate connections to all the hosts simultaneously */ |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | //connect_all($globalSources); |
| 280 | 280 | |
| 281 | 281 | if (isset($globalProxy) && $globalProxy) { |
| 282 | - $context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true))); |
|
| 282 | + $context = stream_context_create(array('http' => array('timeout' => $timeout, 'proxy' => $globalProxy, 'request_fulluri' => true))); |
|
| 283 | 283 | } else { |
| 284 | 284 | $context = stream_context_create(array('http' => array('timeout' => $timeout))); |
| 285 | 285 | } |
@@ -306,16 +306,16 @@ discard block |
||
| 306 | 306 | |
| 307 | 307 | if ($use_aprs) { |
| 308 | 308 | require_once(dirname(__FILE__).'/../require/class.APRS.php'); |
| 309 | - $APRS=new APRS(); |
|
| 309 | + $APRS = new APRS(); |
|
| 310 | 310 | $aprs_connect = 0; |
| 311 | 311 | $aprs_keep = 120; |
| 312 | 312 | $aprs_last_tx = time(); |
| 313 | 313 | if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion; |
| 314 | - else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName); |
|
| 314 | + else $aprs_version = 'FlightAirMap '.str_replace(' ', '_', $globalName); |
|
| 315 | 315 | if (isset($globalAPRSssid)) $aprs_ssid = $globalAPRSssid; |
| 316 | - else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8); |
|
| 316 | + else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ', '_', $globalName)), 0, 8); |
|
| 317 | 317 | if (isset($globalAPRSfilter)) $aprs_filter = $globalAPRSfilter; |
| 318 | - else $aprs_filter = 'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0'; |
|
| 318 | + else $aprs_filter = 'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0'; |
|
| 319 | 319 | if ($aprs_full) $aprs_filter = ''; |
| 320 | 320 | if (isset($globalAPRSpass)) $aprs_pass = $globalAPRSpass; |
| 321 | 321 | else $aprs_pass = '-1'; |
@@ -329,12 +329,12 @@ discard block |
||
| 329 | 329 | sleep(1); |
| 330 | 330 | if ($globalDebug) echo "SCAN MODE \n\n"; |
| 331 | 331 | if (!isset($globalCronEnd)) $globalCronEnd = 60; |
| 332 | -$endtime = time()+$globalCronEnd; |
|
| 332 | +$endtime = time() + $globalCronEnd; |
|
| 333 | 333 | $i = 1; |
| 334 | 334 | $tt = array(); |
| 335 | 335 | // Delete all ATC |
| 336 | 336 | if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM)) { |
| 337 | - $ATC=new ATC($Connection->db); |
|
| 337 | + $ATC = new ATC($Connection->db); |
|
| 338 | 338 | } |
| 339 | 339 | if (!$globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) { |
| 340 | 340 | $ATC->deleteAll(); |
@@ -342,7 +342,7 @@ discard block |
||
| 342 | 342 | |
| 343 | 343 | // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time. |
| 344 | 344 | while ($i > 0) { |
| 345 | - if (!$globalDaemon) $i = $endtime-time(); |
|
| 345 | + if (!$globalDaemon) $i = $endtime - time(); |
|
| 346 | 346 | // Delete old ATC |
| 347 | 347 | if ($globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) { |
| 348 | 348 | if ($globalDebug) echo 'Delete old ATC...'."\n"; |
@@ -357,7 +357,7 @@ discard block |
||
| 357 | 357 | } |
| 358 | 358 | if ($max != $globalMinFetch) { |
| 359 | 359 | if ($globalDebug) echo 'Sleeping...'."\n"; |
| 360 | - sleep($globalMinFetch-$max+2); |
|
| 360 | + sleep($globalMinFetch - $max + 2); |
|
| 361 | 361 | } |
| 362 | 362 | } |
| 363 | 363 | |
@@ -370,8 +370,8 @@ discard block |
||
| 370 | 370 | //$buffer = $Common->getData($hosts[$id]); |
| 371 | 371 | $buffer = $Common->getData($value['host']); |
| 372 | 372 | if ($buffer != '') $reset = 0; |
| 373 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 374 | - $buffer = explode('\n',$buffer); |
|
| 373 | + $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer)); |
|
| 374 | + $buffer = explode('\n', $buffer); |
|
| 375 | 375 | foreach ($buffer as $line) { |
| 376 | 376 | if ($line != '' && count($line) > 7) { |
| 377 | 377 | $line = explode(',', $line); |
@@ -399,11 +399,11 @@ discard block |
||
| 399 | 399 | $last_exec[$id]['last'] = time(); |
| 400 | 400 | } elseif ($value['format'] == 'aisnmeatxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) { |
| 401 | 401 | date_default_timezone_set('CET'); |
| 402 | - $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host'])); |
|
| 402 | + $buffer = $Common->getData(str_replace('{date}', date('Ymd'), $value['host'])); |
|
| 403 | 403 | date_default_timezone_set('UTC'); |
| 404 | 404 | if ($buffer != '') $reset = 0; |
| 405 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 406 | - $buffer = explode('\n',$buffer); |
|
| 405 | + $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer)); |
|
| 406 | + $buffer = explode('\n', $buffer); |
|
| 407 | 407 | foreach ($buffer as $line) { |
| 408 | 408 | if ($line != '') { |
| 409 | 409 | echo "'".$line."'\n"; |
@@ -421,7 +421,7 @@ discard block |
||
| 421 | 421 | if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
| 422 | 422 | if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
| 423 | 423 | if (isset($ais_data['timestamp'])) { |
| 424 | - $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
|
| 424 | + $data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']); |
|
| 425 | 425 | if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) { |
| 426 | 426 | $last_exec[$id]['timestamp'] = $ais_data['timestamp']; |
| 427 | 427 | $add = true; |
@@ -445,12 +445,12 @@ discard block |
||
| 445 | 445 | $w = $e = null; |
| 446 | 446 | |
| 447 | 447 | if (isset($arr[$id])) { |
| 448 | - $nn = stream_select($arr,$w,$e,$timeout); |
|
| 448 | + $nn = stream_select($arr, $w, $e, $timeout); |
|
| 449 | 449 | if ($nn > 0) { |
| 450 | 450 | foreach ($httpfeeds as $feed) { |
| 451 | - $buffer = stream_get_line($feed,2000,"\n"); |
|
| 452 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 453 | - $buffer = explode('\n',$buffer); |
|
| 451 | + $buffer = stream_get_line($feed, 2000, "\n"); |
|
| 452 | + $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer)); |
|
| 453 | + $buffer = explode('\n', $buffer); |
|
| 454 | 454 | foreach ($buffer as $line) { |
| 455 | 455 | if ($line != '') { |
| 456 | 456 | $ais_data = $AIS->parse_line(trim($line)); |
@@ -466,9 +466,9 @@ discard block |
||
| 466 | 466 | if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
| 467 | 467 | if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
| 468 | 468 | if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination']; |
| 469 | - if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); |
|
| 469 | + if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s', $ais_data['eta_ts']); |
|
| 470 | 470 | if (isset($ais_data['timestamp'])) { |
| 471 | - $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
|
| 471 | + $data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']); |
|
| 472 | 472 | } else { |
| 473 | 473 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 474 | 474 | } |
@@ -493,10 +493,10 @@ discard block |
||
| 493 | 493 | } |
| 494 | 494 | } |
| 495 | 495 | } elseif ($value['format'] == 'myshiptracking' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) { |
| 496 | - $buffer = $Common->getData($value['host'],'get','','','','','20'); |
|
| 496 | + $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20'); |
|
| 497 | 497 | if ($buffer != '') { |
| 498 | 498 | //echo $buffer; |
| 499 | - $all_data = json_decode($buffer,true); |
|
| 499 | + $all_data = json_decode($buffer, true); |
|
| 500 | 500 | //print_r($all_data); |
| 501 | 501 | if (isset($all_data[0]['DATA'])) { |
| 502 | 502 | foreach ($all_data[0]['DATA'] as $line) { |
@@ -511,7 +511,7 @@ discard block |
||
| 511 | 511 | // if (isset($ais_data['type'])) $data['type'] = $ais_data['type']; |
| 512 | 512 | $data['imo'] = $line['IMO']; |
| 513 | 513 | //$data['arrival_code'] = $ais_data['destination']; |
| 514 | - $data['datetime'] = date('Y-m-d H:i:s',$line['T']); |
|
| 514 | + $data['datetime'] = date('Y-m-d H:i:s', $line['T']); |
|
| 515 | 515 | $data['format_source'] = 'myshiptracking'; |
| 516 | 516 | $data['id_source'] = $id_source; |
| 517 | 517 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
@@ -524,9 +524,9 @@ discard block |
||
| 524 | 524 | } |
| 525 | 525 | $last_exec[$id]['last'] = time(); |
| 526 | 526 | } elseif ($value['format'] == 'boatbeaconapp' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) { |
| 527 | - $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host'])); |
|
| 527 | + $buffer = $Common->getData(str_replace('{timestamp}', time(), $value['host'])); |
|
| 528 | 528 | if ($buffer != '') { |
| 529 | - $all_data = json_decode($buffer,true); |
|
| 529 | + $all_data = json_decode($buffer, true); |
|
| 530 | 530 | if (isset($all_data[0]['mmsi'])) { |
| 531 | 531 | foreach ($all_data as $line) { |
| 532 | 532 | if ($line != '') { |
@@ -554,27 +554,27 @@ discard block |
||
| 554 | 554 | $last_exec[$id]['last'] = time(); |
| 555 | 555 | } elseif ($value['format'] == 'shipplotter' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) { |
| 556 | 556 | echo 'download...'; |
| 557 | - $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter'); |
|
| 557 | + $buffer = $Common->getData($value['host'], 'post', $value['post'], '', '', '', '', 'ShipPlotter'); |
|
| 558 | 558 | echo 'done !'."\n"; |
| 559 | 559 | if ($buffer != '') $reset = 0; |
| 560 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 561 | - $buffer = explode('\n',$buffer); |
|
| 560 | + $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer)); |
|
| 561 | + $buffer = explode('\n', $buffer); |
|
| 562 | 562 | foreach ($buffer as $line) { |
| 563 | 563 | if ($line != '') { |
| 564 | 564 | $data = array(); |
| 565 | - $data['mmsi'] = (int)substr($line,0,9); |
|
| 566 | - $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10)); |
|
| 565 | + $data['mmsi'] = (int) substr($line, 0, 9); |
|
| 566 | + $data['datetime'] = date('Y-m-d H:i:s', substr($line, 10, 10)); |
|
| 567 | 567 | //$data['status'] = substr($line,21,2); |
| 568 | 568 | //$data['type'] = substr($line,24,3); |
| 569 | - $data['latitude'] = substr($line,29,9); |
|
| 570 | - $data['longitude'] = substr($line,41,9); |
|
| 571 | - $data['speed'] = round(substr($line,51,5)); |
|
| 569 | + $data['latitude'] = substr($line, 29, 9); |
|
| 570 | + $data['longitude'] = substr($line, 41, 9); |
|
| 571 | + $data['speed'] = round(substr($line, 51, 5)); |
|
| 572 | 572 | //$data['course'] = substr($line,57,5); |
| 573 | - $data['heading'] = round(substr($line,63,3)); |
|
| 573 | + $data['heading'] = round(substr($line, 63, 3)); |
|
| 574 | 574 | //$data['draft'] = substr($line,67,4); |
| 575 | 575 | //$data['length'] = substr($line,72,3); |
| 576 | 576 | //$data['beam'] = substr($line,76,2); |
| 577 | - $data['ident'] = trim(utf8_encode(substr($line,79,20))); |
|
| 577 | + $data['ident'] = trim(utf8_encode(substr($line, 79, 20))); |
|
| 578 | 578 | //$data['callsign'] = trim(substr($line,100,7); |
| 579 | 579 | //$data['dest'] = substr($line,108,20); |
| 580 | 580 | //$data['etaDate'] = substr($line,129,5); |
@@ -593,8 +593,8 @@ discard block |
||
| 593 | 593 | } elseif (($value['format'] == 'whazzup' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) || ($value['format'] == 'vatsimtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch))) { |
| 594 | 594 | //$buffer = $Common->getData($hosts[$id]); |
| 595 | 595 | $buffer = $Common->getData($value['host']); |
| 596 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 597 | - $buffer = explode('\n',$buffer); |
|
| 596 | + $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer)); |
|
| 597 | + $buffer = explode('\n', $buffer); |
|
| 598 | 598 | $reset = 0; |
| 599 | 599 | foreach ($buffer as $line) { |
| 600 | 600 | if ($line != '') { |
@@ -605,7 +605,7 @@ discard block |
||
| 605 | 605 | else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0]; |
| 606 | 606 | $data['pilot_id'] = $line[1]; |
| 607 | 607 | $data['pilot_name'] = $line[2]; |
| 608 | - $data['hex'] = str_pad(dechex($Common->str2int($line[1])),6,'000000',STR_PAD_LEFT); |
|
| 608 | + $data['hex'] = str_pad(dechex($Common->str2int($line[1])), 6, '000000', STR_PAD_LEFT); |
|
| 609 | 609 | $data['ident'] = $line[0]; // ident |
| 610 | 610 | if ($line[7] != '' && $line[7] != 0) $data['altitude'] = $line[7]; // altitude |
| 611 | 611 | $data['speed'] = $line[8]; // speed |
@@ -621,7 +621,7 @@ discard block |
||
| 621 | 621 | //$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37])); |
| 622 | 622 | //if (isset($line[37])) $data['last_update'] = $line[37]; |
| 623 | 623 | $data['departure_airport_icao'] = $line[11]; |
| 624 | - $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':'); |
|
| 624 | + $data['departure_airport_time'] = rtrim(chunk_split($line[22], 2, ':'), ':'); |
|
| 625 | 625 | $data['arrival_airport_icao'] = $line[13]; |
| 626 | 626 | $data['frequency'] = $line[4]; |
| 627 | 627 | $data['type'] = $line[18]; |
@@ -630,7 +630,7 @@ discard block |
||
| 630 | 630 | $data['id_source'] = $id_source; |
| 631 | 631 | //$data['arrival_airport_time'] = ; |
| 632 | 632 | if ($line[9] != '') { |
| 633 | - $aircraft_data = explode('/',$line[9]); |
|
| 633 | + $aircraft_data = explode('/', $line[9]); |
|
| 634 | 634 | if (isset($aircraft_data[1])) { |
| 635 | 635 | $data['aircraft_icao'] = $aircraft_data[1]; |
| 636 | 636 | } |
@@ -645,9 +645,9 @@ discard block |
||
| 645 | 645 | if ($line[3] == 'PILOT') $SI->add($data); |
| 646 | 646 | elseif ($line[3] == 'ATC') { |
| 647 | 647 | //print_r($data); |
| 648 | - $data['info'] = str_replace('^§','<br />',$data['info']); |
|
| 649 | - $data['info'] = str_replace('&sect;','',$data['info']); |
|
| 650 | - $typec = substr($data['ident'],-3); |
|
| 648 | + $data['info'] = str_replace('^§', '<br />', $data['info']); |
|
| 649 | + $data['info'] = str_replace('&sect;', '', $data['info']); |
|
| 650 | + $typec = substr($data['ident'], -3); |
|
| 651 | 651 | if ($typec == 'APP') $data['type'] = 'Approach'; |
| 652 | 652 | elseif ($typec == 'TWR') $data['type'] = 'Tower'; |
| 653 | 653 | elseif ($typec == 'OBS') $data['type'] = 'Observer'; |
@@ -658,7 +658,7 @@ discard block |
||
| 658 | 658 | elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre'; |
| 659 | 659 | elseif ($data['type'] == '') $data['type'] = 'Observer'; |
| 660 | 660 | if (!isset($data['source_name'])) $data['source_name'] = ''; |
| 661 | - if (isset($ATC)) 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']); |
|
| 661 | + if (isset($ATC)) 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']); |
|
| 662 | 662 | } |
| 663 | 663 | unset($data); |
| 664 | 664 | } |
@@ -669,9 +669,9 @@ discard block |
||
| 669 | 669 | $last_exec[$id]['last'] = time(); |
| 670 | 670 | //} elseif ($value == 'aircraftlistjson' && (time() - $last_exec['aircraftlistjson'] > $globalMinFetch)) { |
| 671 | 671 | } elseif ($value['format'] == 'aircraftlistjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 672 | - $buffer = $Common->getData($value['host'],'get','','','','','20'); |
|
| 672 | + $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20'); |
|
| 673 | 673 | if ($buffer != '') { |
| 674 | - $all_data = json_decode($buffer,true); |
|
| 674 | + $all_data = json_decode($buffer, true); |
|
| 675 | 675 | if (isset($all_data['acList'])) { |
| 676 | 676 | $reset = 0; |
| 677 | 677 | foreach ($all_data['acList'] as $line) { |
@@ -688,7 +688,7 @@ discard block |
||
| 688 | 688 | $data['emergency'] = ''; // emergency |
| 689 | 689 | if (isset($line['Reg'])) $data['registration'] = $line['Reg']; |
| 690 | 690 | |
| 691 | - if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); |
|
| 691 | + if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s', round($line['PosTime']/1000)); |
|
| 692 | 692 | else $data['datetime'] = date('Y-m-d H:i:s'); |
| 693 | 693 | |
| 694 | 694 | //$data['datetime'] = date('Y-m-d H:i:s'); |
@@ -714,7 +714,7 @@ discard block |
||
| 714 | 714 | $data['verticalrate'] = $line['vrt']; // verticale rate |
| 715 | 715 | $data['squawk'] = $line['squawk']; // squawk |
| 716 | 716 | $data['emergency'] = ''; // emergency |
| 717 | - if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); |
|
| 717 | + if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s', round($line['PosTime']/1000)); |
|
| 718 | 718 | else $data['datetime'] = date('Y-m-d H:i:s'); |
| 719 | 719 | $data['format_source'] = 'aircraftlistjson'; |
| 720 | 720 | $data['id_source'] = $id_source; |
@@ -730,7 +730,7 @@ discard block |
||
| 730 | 730 | //} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) { |
| 731 | 731 | } elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 732 | 732 | $buffer = $Common->getData($value['host']); |
| 733 | - $all_data = json_decode($buffer,true); |
|
| 733 | + $all_data = json_decode($buffer, true); |
|
| 734 | 734 | if (isset($all_data['planes'])) { |
| 735 | 735 | $reset = 0; |
| 736 | 736 | foreach ($all_data['planes'] as $key => $line) { |
@@ -747,12 +747,12 @@ discard block |
||
| 747 | 747 | $data['emergency'] = ''; // emergency |
| 748 | 748 | $data['registration'] = $line[2]; |
| 749 | 749 | $data['aircraft_icao'] = $line[0]; |
| 750 | - $deparr = explode('-',$line[1]); |
|
| 750 | + $deparr = explode('-', $line[1]); |
|
| 751 | 751 | if (count($deparr) == 2) { |
| 752 | 752 | $data['departure_airport_icao'] = $deparr[0]; |
| 753 | 753 | $data['arrival_airport_icao'] = $deparr[1]; |
| 754 | 754 | } |
| 755 | - $data['datetime'] = date('Y-m-d H:i:s',$line[9]); |
|
| 755 | + $data['datetime'] = date('Y-m-d H:i:s', $line[9]); |
|
| 756 | 756 | $data['format_source'] = 'planeupdatefaa'; |
| 757 | 757 | $data['id_source'] = $id_source; |
| 758 | 758 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
@@ -765,7 +765,7 @@ discard block |
||
| 765 | 765 | $last_exec[$id]['last'] = time(); |
| 766 | 766 | } elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 767 | 767 | $buffer = $Common->getData($value['host']); |
| 768 | - $all_data = json_decode($buffer,true); |
|
| 768 | + $all_data = json_decode($buffer, true); |
|
| 769 | 769 | if (isset($all_data['states'])) { |
| 770 | 770 | $reset = 0; |
| 771 | 771 | foreach ($all_data['states'] as $key => $line) { |
@@ -782,7 +782,7 @@ discard block |
||
| 782 | 782 | //$data['emergency'] = ''; // emergency |
| 783 | 783 | //$data['registration'] = $line[2]; |
| 784 | 784 | //$data['aircraft_icao'] = $line[0]; |
| 785 | - $data['datetime'] = date('Y-m-d H:i:s',$line[3]); |
|
| 785 | + $data['datetime'] = date('Y-m-d H:i:s', $line[3]); |
|
| 786 | 786 | $data['format_source'] = 'opensky'; |
| 787 | 787 | $data['id_source'] = $id_source; |
| 788 | 788 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
@@ -796,7 +796,7 @@ discard block |
||
| 796 | 796 | } elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 797 | 797 | //$buffer = $Common->getData($hosts[$id]); |
| 798 | 798 | $buffer = $Common->getData($value['host']); |
| 799 | - $all_data = json_decode($buffer,true); |
|
| 799 | + $all_data = json_decode($buffer, true); |
|
| 800 | 800 | if (!empty($all_data)) $reset = 0; |
| 801 | 801 | foreach ($all_data as $key => $line) { |
| 802 | 802 | if ($key != 'full_count' && $key != 'version' && $key != 'stats') { |
@@ -829,11 +829,11 @@ discard block |
||
| 829 | 829 | //} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) { |
| 830 | 830 | } elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 831 | 831 | //$buffer = $Common->getData($hosts[$id],'get','','','','','150'); |
| 832 | - $buffer = $Common->getData($value['host'],'get','','','','','150'); |
|
| 832 | + $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '150'); |
|
| 833 | 833 | //echo $buffer; |
| 834 | - $buffer = str_replace(array("\n","\r"),"",$buffer); |
|
| 835 | - $buffer = preg_replace('/,"num":(.+)/','}',$buffer); |
|
| 836 | - $all_data = json_decode($buffer,true); |
|
| 834 | + $buffer = str_replace(array("\n", "\r"), "", $buffer); |
|
| 835 | + $buffer = preg_replace('/,"num":(.+)/', '}', $buffer); |
|
| 836 | + $all_data = json_decode($buffer, true); |
|
| 837 | 837 | if (json_last_error() != JSON_ERROR_NONE) { |
| 838 | 838 | die(json_last_error_msg()); |
| 839 | 839 | } |
@@ -856,7 +856,7 @@ discard block |
||
| 856 | 856 | //$data['departure_airport_iata'] = $line[11]; |
| 857 | 857 | //$data['arrival_airport_iata'] = $line[12]; |
| 858 | 858 | //$data['emergency'] = ''; // emergency |
| 859 | - $data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10] |
|
| 859 | + $data['datetime'] = date('Y-m-d H:i:s', $line['inf']['dt']); //$line[10] |
|
| 860 | 860 | $data['format_source'] = 'radarvirtueljson'; |
| 861 | 861 | $data['id_source'] = $id_source; |
| 862 | 862 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
@@ -872,14 +872,14 @@ discard block |
||
| 872 | 872 | } elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 873 | 873 | //$buffer = $Common->getData($hosts[$id]); |
| 874 | 874 | $buffer = $Common->getData($value['host'].'?'.time()); |
| 875 | - $all_data = json_decode(utf8_encode($buffer),true); |
|
| 875 | + $all_data = json_decode(utf8_encode($buffer), true); |
|
| 876 | 876 | |
| 877 | 877 | if (isset($all_data['pireps'])) { |
| 878 | 878 | $reset = 0; |
| 879 | 879 | foreach ($all_data['pireps'] as $line) { |
| 880 | 880 | $data = array(); |
| 881 | 881 | $data['id'] = $line['id']; |
| 882 | - $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6); |
|
| 882 | + $data['hex'] = substr(str_pad(dechex($line['id']), 6, '000000', STR_PAD_LEFT), 0, 6); |
|
| 883 | 883 | $data['ident'] = $line['callsign']; // ident |
| 884 | 884 | if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id |
| 885 | 885 | if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name |
@@ -909,9 +909,9 @@ discard block |
||
| 909 | 909 | $SI->add($data); |
| 910 | 910 | // print_r($data); |
| 911 | 911 | } elseif ($line['icon'] == 'ct') { |
| 912 | - $data['info'] = str_replace('^§','<br />',$data['info']); |
|
| 913 | - $data['info'] = str_replace('&sect;','',$data['info']); |
|
| 914 | - $typec = substr($data['ident'],-3); |
|
| 912 | + $data['info'] = str_replace('^§', '<br />', $data['info']); |
|
| 913 | + $data['info'] = str_replace('&sect;', '', $data['info']); |
|
| 914 | + $typec = substr($data['ident'], -3); |
|
| 915 | 915 | $data['type'] = ''; |
| 916 | 916 | if ($typec == 'APP') $data['type'] = 'Approach'; |
| 917 | 917 | elseif ($typec == 'TWR') $data['type'] = 'Tower'; |
@@ -922,7 +922,7 @@ discard block |
||
| 922 | 922 | elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station'; |
| 923 | 923 | elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre'; |
| 924 | 924 | else $data['type'] = 'Observer'; |
| 925 | - 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']); |
|
| 925 | + 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']); |
|
| 926 | 926 | } |
| 927 | 927 | unset($data); |
| 928 | 928 | } |
@@ -934,14 +934,14 @@ discard block |
||
| 934 | 934 | //$buffer = $Common->getData($hosts[$id]); |
| 935 | 935 | if ($globalDebug) echo 'Get Data...'."\n"; |
| 936 | 936 | $buffer = $Common->getData($value['host']); |
| 937 | - $all_data = json_decode($buffer,true); |
|
| 937 | + $all_data = json_decode($buffer, true); |
|
| 938 | 938 | if ($buffer != '' && is_array($all_data)) { |
| 939 | 939 | $reset = 0; |
| 940 | 940 | foreach ($all_data as $line) { |
| 941 | 941 | $data = array(); |
| 942 | 942 | //$data['id'] = $line['id']; // id not usable |
| 943 | 943 | if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum']; |
| 944 | - $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex |
|
| 944 | + $data['hex'] = substr(str_pad(bin2hex($line['flightnum']), 6, '000000', STR_PAD_LEFT), -6); // hex |
|
| 945 | 945 | if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname']; |
| 946 | 946 | if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; |
| 947 | 947 | $data['ident'] = $line['flightnum']; // ident |
@@ -965,14 +965,14 @@ discard block |
||
| 965 | 965 | if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
| 966 | 966 | if (isset($line['aircraftname'])) { |
| 967 | 967 | $line['aircraftname'] = strtoupper($line['aircraftname']); |
| 968 | - $line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']); |
|
| 969 | - $aircraft_data = explode('-',$line['aircraftname']); |
|
| 968 | + $line['aircraftname'] = str_replace('BOEING ', 'B', $line['aircraftname']); |
|
| 969 | + $aircraft_data = explode('-', $line['aircraftname']); |
|
| 970 | 970 | if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0]; |
| 971 | 971 | elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1]; |
| 972 | 972 | else { |
| 973 | - $aircraft_data = explode(' ',$line['aircraftname']); |
|
| 974 | - if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]); |
|
| 975 | - else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']); |
|
| 973 | + $aircraft_data = explode(' ', $line['aircraftname']); |
|
| 974 | + if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-', '', $aircraft_data[1]); |
|
| 975 | + else $data['aircraft_icao'] = str_replace('-', '', $line['aircraftname']); |
|
| 976 | 976 | } |
| 977 | 977 | } |
| 978 | 978 | if (isset($line['route'])) $data['waypoints'] = $line['route']; |
@@ -992,14 +992,14 @@ discard block |
||
| 992 | 992 | //$buffer = $Common->getData($hosts[$id]); |
| 993 | 993 | if ($globalDebug) echo 'Get Data...'."\n"; |
| 994 | 994 | $buffer = $Common->getData($value['host']); |
| 995 | - $all_data = json_decode($buffer,true); |
|
| 995 | + $all_data = json_decode($buffer, true); |
|
| 996 | 996 | if ($buffer != '' && is_array($all_data)) { |
| 997 | 997 | $reset = 0; |
| 998 | 998 | foreach ($all_data as $line) { |
| 999 | 999 | $data = array(); |
| 1000 | 1000 | //$data['id'] = $line['id']; // id not usable |
| 1001 | 1001 | $data['id'] = trim($line['flight_id']); |
| 1002 | - $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex |
|
| 1002 | + $data['hex'] = substr(str_pad(bin2hex($line['callsign']), 6, '000000', STR_PAD_LEFT), -6); // hex |
|
| 1003 | 1003 | $data['pilot_name'] = $line['pilot_name']; |
| 1004 | 1004 | $data['pilot_id'] = $line['pilot_id']; |
| 1005 | 1005 | $data['ident'] = trim($line['callsign']); // ident |
@@ -1051,11 +1051,11 @@ discard block |
||
| 1051 | 1051 | //$value = $formats[$nb]; |
| 1052 | 1052 | $format = $globalSources[$nb]['format']; |
| 1053 | 1053 | if ($format == 'sbs' || $format == 'aprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') { |
| 1054 | - $buffer = @socket_read($r, 6000,PHP_NORMAL_READ); |
|
| 1054 | + $buffer = @socket_read($r, 6000, PHP_NORMAL_READ); |
|
| 1055 | 1055 | } elseif ($format == 'vrstcp') { |
| 1056 | 1056 | $buffer = @socket_read($r, 6000); |
| 1057 | 1057 | } else { |
| 1058 | - $az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port); |
|
| 1058 | + $az = socket_recvfrom($r, $buffer, 6000, 0, $remote_ip, $remote_port); |
|
| 1059 | 1059 | } |
| 1060 | 1060 | //$buffer = socket_read($r, 60000,PHP_NORMAL_READ); |
| 1061 | 1061 | //echo $buffer."\n"; |
@@ -1064,8 +1064,8 @@ discard block |
||
| 1064 | 1064 | $error = false; |
| 1065 | 1065 | //$SI::del(); |
| 1066 | 1066 | if ($format == 'vrstcp') { |
| 1067 | - $buffer = explode('},{',$buffer); |
|
| 1068 | - } else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer)); |
|
| 1067 | + $buffer = explode('},{', $buffer); |
|
| 1068 | + } else $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '', $buffer)); |
|
| 1069 | 1069 | // SBS format is CSV format |
| 1070 | 1070 | if ($buffer !== FALSE && $buffer != '') { |
| 1071 | 1071 | $tt[$format] = 0; |
@@ -1098,11 +1098,11 @@ discard block |
||
| 1098 | 1098 | if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
| 1099 | 1099 | if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
| 1100 | 1100 | if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination']; |
| 1101 | - if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); |
|
| 1101 | + if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s', $ais_data['eta_ts']); |
|
| 1102 | 1102 | if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
| 1103 | 1103 | |
| 1104 | 1104 | if (isset($ais_data['timestamp'])) { |
| 1105 | - $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
|
| 1105 | + $data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']); |
|
| 1106 | 1106 | } else { |
| 1107 | 1107 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 1108 | 1108 | } |
@@ -1113,10 +1113,10 @@ discard block |
||
| 1113 | 1113 | } elseif ($format == 'flightgearsp') { |
| 1114 | 1114 | //echo $buffer."\n"; |
| 1115 | 1115 | if (strlen($buffer) > 5) { |
| 1116 | - $line = explode(',',$buffer); |
|
| 1116 | + $line = explode(',', $buffer); |
|
| 1117 | 1117 | $data = array(); |
| 1118 | 1118 | //XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p |
| 1119 | - $data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]),6,'000000',STR_PAD_LEFT),0,6); |
|
| 1119 | + $data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]), 6, '000000', STR_PAD_LEFT), 0, 6); |
|
| 1120 | 1120 | $data['ident'] = $line[6]; |
| 1121 | 1121 | $data['aircraft_name'] = $line[7]; |
| 1122 | 1122 | $data['longitude'] = $line[1]; |
@@ -1128,21 +1128,21 @@ discard block |
||
| 1128 | 1128 | $data['format_source'] = 'flightgearsp'; |
| 1129 | 1129 | if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
| 1130 | 1130 | if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
| 1131 | - $send = @ socket_send( $r , $data_aprs , strlen($data_aprs) , 0 ); |
|
| 1131 | + $send = @ socket_send($r, $data_aprs, strlen($data_aprs), 0); |
|
| 1132 | 1132 | } |
| 1133 | 1133 | } elseif ($format == 'acars') { |
| 1134 | 1134 | if ($globalDebug) echo 'ACARS : '.$buffer."\n"; |
| 1135 | 1135 | $ACARS->add(trim($buffer)); |
| 1136 | - socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port); |
|
| 1136 | + socket_sendto($r, "OK ".$buffer, 100, 0, $remote_ip, $remote_port); |
|
| 1137 | 1137 | $ACARS->deleteLiveAcarsData(); |
| 1138 | 1138 | } elseif ($format == 'flightgearmp') { |
| 1139 | - if (substr($buffer,0,1) != '#') { |
|
| 1139 | + if (substr($buffer, 0, 1) != '#') { |
|
| 1140 | 1140 | $data = array(); |
| 1141 | 1141 | //echo $buffer."\n"; |
| 1142 | - $line = explode(' ',$buffer); |
|
| 1142 | + $line = explode(' ', $buffer); |
|
| 1143 | 1143 | if (count($line) == 11) { |
| 1144 | - $userserver = explode('@',$line[0]); |
|
| 1145 | - $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex |
|
| 1144 | + $userserver = explode('@', $line[0]); |
|
| 1145 | + $data['hex'] = substr(str_pad(bin2hex($line[0]), 6, '000000', STR_PAD_LEFT), 0, 6); // hex |
|
| 1146 | 1146 | $data['ident'] = $userserver[0]; |
| 1147 | 1147 | $data['registration'] = $userserver[0]; |
| 1148 | 1148 | $data['latitude'] = $line[4]; |
@@ -1150,8 +1150,8 @@ discard block |
||
| 1150 | 1150 | $data['altitude'] = $line[6]; |
| 1151 | 1151 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 1152 | 1152 | $aircraft_type = $line[10]; |
| 1153 | - $aircraft_type = preg_split(':/:',$aircraft_type); |
|
| 1154 | - $data['aircraft_name'] = substr(end($aircraft_type),0,-4); |
|
| 1153 | + $aircraft_type = preg_split(':/:', $aircraft_type); |
|
| 1154 | + $data['aircraft_name'] = substr(end($aircraft_type), 0, -4); |
|
| 1155 | 1155 | if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
| 1156 | 1156 | if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
| 1157 | 1157 | } |
@@ -1160,8 +1160,8 @@ discard block |
||
| 1160 | 1160 | echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n"; |
| 1161 | 1161 | die; |
| 1162 | 1162 | } elseif ($format == 'vrstcp') { |
| 1163 | - foreach($buffer as $all_data) { |
|
| 1164 | - $line = json_decode('{'.$all_data.'}',true); |
|
| 1163 | + foreach ($buffer as $all_data) { |
|
| 1164 | + $line = json_decode('{'.$all_data.'}', true); |
|
| 1165 | 1165 | $data = array(); |
| 1166 | 1166 | if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex |
| 1167 | 1167 | if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident |
@@ -1187,16 +1187,16 @@ discard block |
||
| 1187 | 1187 | if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data); |
| 1188 | 1188 | unset($data); |
| 1189 | 1189 | } |
| 1190 | - } elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') { |
|
| 1190 | + } elseif ($format == 'tsv' || substr($buffer, 0, 4) == 'clock') { |
|
| 1191 | 1191 | $line = explode("\t", $buffer); |
| 1192 | - for($k = 0; $k < count($line); $k=$k+2) { |
|
| 1192 | + for ($k = 0; $k < count($line); $k = $k + 2) { |
|
| 1193 | 1193 | $key = $line[$k]; |
| 1194 | - $lined[$key] = $line[$k+1]; |
|
| 1194 | + $lined[$key] = $line[$k + 1]; |
|
| 1195 | 1195 | } |
| 1196 | 1196 | if (count($lined) > 3) { |
| 1197 | 1197 | $data['hex'] = $lined['hexid']; |
| 1198 | 1198 | //$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));; |
| 1199 | - $data['datetime'] = date('Y-m-d H:i:s');; |
|
| 1199 | + $data['datetime'] = date('Y-m-d H:i:s'); ; |
|
| 1200 | 1200 | if (isset($lined['ident'])) $data['ident'] = $lined['ident']; |
| 1201 | 1201 | if (isset($lined['lat'])) $data['latitude'] = $lined['lat']; |
| 1202 | 1202 | if (isset($lined['lon'])) $data['longitude'] = $lined['lon']; |
@@ -1215,22 +1215,22 @@ discard block |
||
| 1215 | 1215 | } else $error = true; |
| 1216 | 1216 | } elseif ($format == 'aprs' && $use_aprs) { |
| 1217 | 1217 | if ($aprs_connect == 0) { |
| 1218 | - $send = @ socket_send( $r , $aprs_login , strlen($aprs_login) , 0 ); |
|
| 1218 | + $send = @ socket_send($r, $aprs_login, strlen($aprs_login), 0); |
|
| 1219 | 1219 | $aprs_connect = 1; |
| 1220 | 1220 | } |
| 1221 | 1221 | |
| 1222 | - if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) { |
|
| 1222 | + if ($aprs_keep > 60 && time() - $aprs_last_tx > $aprs_keep) { |
|
| 1223 | 1223 | $aprs_last_tx = time(); |
| 1224 | 1224 | $data_aprs = "# Keep alive"; |
| 1225 | - $send = @ socket_send( $r , $data_aprs , strlen($data_aprs) , 0 ); |
|
| 1225 | + $send = @ socket_send($r, $data_aprs, strlen($data_aprs), 0); |
|
| 1226 | 1226 | } |
| 1227 | 1227 | |
| 1228 | 1228 | //echo 'Connect : '.$aprs_connect.' '.$buffer."\n"; |
| 1229 | 1229 | //echo 'APRS data : '.$buffer."\n"; |
| 1230 | - $buffer = str_replace('APRS <- ','',$buffer); |
|
| 1231 | - $buffer = str_replace('APRS -> ','',$buffer); |
|
| 1230 | + $buffer = str_replace('APRS <- ', '', $buffer); |
|
| 1231 | + $buffer = str_replace('APRS -> ', '', $buffer); |
|
| 1232 | 1232 | //echo $buffer."\n"; |
| 1233 | - if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') { |
|
| 1233 | + if (substr($buffer, 0, 1) != '#' && substr($buffer, 0, 1) != '@' && substr($buffer, 0, 5) != 'APRS ') { |
|
| 1234 | 1234 | $line = $APRS->parse($buffer); |
| 1235 | 1235 | //if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) { |
| 1236 | 1236 | if (is_array($line) && isset($line['latitude']) && isset($line['longitude']) && (isset($line['ident']) || isset($line['address']) || isset($line['mmsi']))) { |
@@ -1239,7 +1239,7 @@ discard block |
||
| 1239 | 1239 | //print_r($line); |
| 1240 | 1240 | if (isset($line['address'])) $data['hex'] = $line['address']; |
| 1241 | 1241 | if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi']; |
| 1242 | - if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']); |
|
| 1242 | + if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s', $line['timestamp']); |
|
| 1243 | 1243 | else $data['datetime'] = date('Y-m-d H:i:s'); |
| 1244 | 1244 | //$data['datetime'] = date('Y-m-d H:i:s'); |
| 1245 | 1245 | if (isset($line['ident'])) $data['ident'] = $line['ident']; |
@@ -1266,7 +1266,7 @@ discard block |
||
| 1266 | 1266 | $currentdate = date('Y-m-d H:i:s'); |
| 1267 | 1267 | $aprsdate = strtotime($data['datetime']); |
| 1268 | 1268 | // Accept data if time <= system time + 20s |
| 1269 | - 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'])))) { |
|
| 1269 | + 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'])))) { |
|
| 1270 | 1270 | $send = $SI->add($data); |
| 1271 | 1271 | } elseif ($data['source_type'] == 'ais') { |
| 1272 | 1272 | echo 'add...'."\n"; |
@@ -1367,7 +1367,7 @@ discard block |
||
| 1367 | 1367 | connect_all($sourceee); |
| 1368 | 1368 | $sourceee = array(); |
| 1369 | 1369 | //connect_all($globalSources); |
| 1370 | - $tt[$format]=0; |
|
| 1370 | + $tt[$format] = 0; |
|
| 1371 | 1371 | break; |
| 1372 | 1372 | } |
| 1373 | 1373 | } |
@@ -1376,14 +1376,14 @@ discard block |
||
| 1376 | 1376 | } else { |
| 1377 | 1377 | $error = socket_strerror(socket_last_error()); |
| 1378 | 1378 | if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) { |
| 1379 | - if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n"; |
|
| 1379 | + if ($globalDebug) echo "ERROR : socket_select give this error ".$error."\n"; |
|
| 1380 | 1380 | if (isset($globalDebug)) echo "Restarting...\n"; |
| 1381 | 1381 | // Restart the script if possible |
| 1382 | 1382 | if (is_array($sockets)) { |
| 1383 | 1383 | if ($globalDebug) echo "Shutdown all sockets..."; |
| 1384 | 1384 | |
| 1385 | 1385 | foreach ($sockets as $sock) { |
| 1386 | - @socket_shutdown($sock,2); |
|
| 1386 | + @socket_shutdown($sock, 2); |
|
| 1387 | 1387 | @socket_close($sock); |
| 1388 | 1388 | } |
| 1389 | 1389 | |
@@ -13,13 +13,17 @@ discard block |
||
| 13 | 13 | require_once(dirname(__FILE__).'/../require/class.SBS.php'); |
| 14 | 14 | require_once(dirname(__FILE__).'/../require/class.Connection.php'); |
| 15 | 15 | require_once(dirname(__FILE__).'/../require/class.Common.php'); |
| 16 | -if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php'); |
|
| 16 | +if (isset($globalTracker) && $globalTracker) { |
|
| 17 | + require_once(dirname(__FILE__).'/../require/class.TrackerImport.php'); |
|
| 18 | +} |
|
| 17 | 19 | if (isset($globalMarine) && $globalMarine) { |
| 18 | 20 | require_once(dirname(__FILE__).'/../require/class.AIS.php'); |
| 19 | 21 | require_once(dirname(__FILE__).'/../require/class.MarineImport.php'); |
| 20 | 22 | } |
| 21 | 23 | |
| 22 | -if (!isset($globalDebug)) $globalDebug = FALSE; |
|
| 24 | +if (!isset($globalDebug)) { |
|
| 25 | + $globalDebug = FALSE; |
|
| 26 | +} |
|
| 23 | 27 | |
| 24 | 28 | // Check if schema is at latest version |
| 25 | 29 | $Connection = new Connection(); |
@@ -54,35 +58,62 @@ discard block |
||
| 54 | 58 | //elseif (isset($options['source'])) $hosts = array($options['source']); |
| 55 | 59 | if (isset($options['s'])) { |
| 56 | 60 | $globalSources = array(); |
| 57 | - if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']); |
|
| 58 | - else $globalSources[] = array('host' => $options['s']); |
|
| 59 | -} elseif (isset($options['source'])) { |
|
| 61 | + if (isset($options['format'])) { |
|
| 62 | + $globalSources[] = array('host' => $options['s'],'format' => $options['format']); |
|
| 63 | + } else { |
|
| 64 | + $globalSources[] = array('host' => $options['s']); |
|
| 65 | + } |
|
| 66 | + } elseif (isset($options['source'])) { |
|
| 60 | 67 | $globalSources = array(); |
| 61 | - if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']); |
|
| 62 | - else $globalSources[] = array('host' => $options['source']); |
|
| 63 | -} |
|
| 68 | + if (isset($options['format'])) { |
|
| 69 | + $globalSources[] = array('host' => $options['source'],'format' => $options['format']); |
|
| 70 | + } else { |
|
| 71 | + $globalSources[] = array('host' => $options['source']); |
|
| 72 | + } |
|
| 73 | + } |
|
| 64 | 74 | if (isset($options['aprsserverhost'])) { |
| 65 | 75 | $globalServerAPRS = TRUE; |
| 66 | 76 | $globalServerAPRShost = $options['aprsserverhost']; |
| 67 | 77 | } |
| 68 | -if (isset($options['aprsserverport'])) $globalServerAPRSport = $options['aprsserverport']; |
|
| 69 | -if (isset($options['aprsserverssid'])) $globalServerAPRSssid = $options['aprsserverssid']; |
|
| 70 | -if (isset($options['aprsserverpass'])) $globalServerAPRSpass = $options['aprsserverpass']; |
|
| 71 | -if (isset($options['noaprsserver'])) $globalServerAPRS = FALSE; |
|
| 72 | -if (isset($options['nodaemon'])) $globalDaemon = FALSE; |
|
| 73 | -if (isset($options['server'])) $globalServer = TRUE; |
|
| 74 | -if (isset($options['idsource'])) $id_source = $options['idsource']; |
|
| 75 | -else $id_source = 1; |
|
| 78 | +if (isset($options['aprsserverport'])) { |
|
| 79 | + $globalServerAPRSport = $options['aprsserverport']; |
|
| 80 | +} |
|
| 81 | +if (isset($options['aprsserverssid'])) { |
|
| 82 | + $globalServerAPRSssid = $options['aprsserverssid']; |
|
| 83 | +} |
|
| 84 | +if (isset($options['aprsserverpass'])) { |
|
| 85 | + $globalServerAPRSpass = $options['aprsserverpass']; |
|
| 86 | +} |
|
| 87 | +if (isset($options['noaprsserver'])) { |
|
| 88 | + $globalServerAPRS = FALSE; |
|
| 89 | +} |
|
| 90 | +if (isset($options['nodaemon'])) { |
|
| 91 | + $globalDaemon = FALSE; |
|
| 92 | +} |
|
| 93 | +if (isset($options['server'])) { |
|
| 94 | + $globalServer = TRUE; |
|
| 95 | +} |
|
| 96 | +if (isset($options['idsource'])) { |
|
| 97 | + $id_source = $options['idsource']; |
|
| 98 | +} else { |
|
| 99 | + $id_source = 1; |
|
| 100 | +} |
|
| 76 | 101 | if (isset($globalServer) && $globalServer) { |
| 77 | - if ($globalDebug) echo "Using Server Mode\n"; |
|
| 102 | + if ($globalDebug) { |
|
| 103 | + echo "Using Server Mode\n"; |
|
| 104 | + } |
|
| 78 | 105 | $SI=new SpotterServer(); |
| 79 | 106 | /* |
| 80 | 107 | require_once(dirname(__FILE__).'/../require/class.APRS.php'); |
| 81 | 108 | $SI = new adsb2aprs(); |
| 82 | 109 | $SI->connect(); |
| 83 | 110 | */ |
| 84 | -} else $SI=new SpotterImport($Connection->db); |
|
| 85 | -if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db); |
|
| 111 | +} else { |
|
| 112 | + $SI=new SpotterImport($Connection->db); |
|
| 113 | +} |
|
| 114 | +if (isset($globalTracker) && $globalTracker) { |
|
| 115 | + $TI = new TrackerImport($Connection->db); |
|
| 116 | +} |
|
| 86 | 117 | if (isset($globalMarine) && $globalMarine) { |
| 87 | 118 | $AIS = new AIS(); |
| 88 | 119 | $MI = new MarineImport($Connection->db); |
@@ -104,7 +135,9 @@ discard block |
||
| 104 | 135 | } |
| 105 | 136 | |
| 106 | 137 | // let's try and connect |
| 107 | -if ($globalDebug) echo "Connecting...\n"; |
|
| 138 | +if ($globalDebug) { |
|
| 139 | + echo "Connecting...\n"; |
|
| 140 | +} |
|
| 108 | 141 | $use_aprs = false; |
| 109 | 142 | $aprs_full = false; |
| 110 | 143 | $reset = 0; |
@@ -113,7 +146,9 @@ discard block |
||
| 113 | 146 | //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs; |
| 114 | 147 | global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context; |
| 115 | 148 | $reset++; |
| 116 | - if ($globalDebug) echo 'Connect to all...'."\n"; |
|
| 149 | + if ($globalDebug) { |
|
| 150 | + echo 'Connect to all...'."\n"; |
|
| 151 | + } |
|
| 117 | 152 | foreach ($hosts as $id => $value) { |
| 118 | 153 | $host = $value['host']; |
| 119 | 154 | $globalSources[$id]['last_exec'] = 0; |
@@ -123,27 +158,37 @@ discard block |
||
| 123 | 158 | //$formats[$id] = 'deltadbtxt'; |
| 124 | 159 | $globalSources[$id]['format'] = 'deltadbtxt'; |
| 125 | 160 | //$last_exec['deltadbtxt'] = 0; |
| 126 | - if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n"; |
|
| 161 | + if ($globalDebug) { |
|
| 162 | + echo "Connect to deltadb source (".$host.")...\n"; |
|
| 163 | + } |
|
| 127 | 164 | } else if (preg_match('/vatsim-data.txt$/i',$host)) { |
| 128 | 165 | //$formats[$id] = 'vatsimtxt'; |
| 129 | 166 | $globalSources[$id]['format'] = 'vatsimtxt'; |
| 130 | 167 | //$last_exec['vatsimtxt'] = 0; |
| 131 | - if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n"; |
|
| 168 | + if ($globalDebug) { |
|
| 169 | + echo "Connect to vatsim source (".$host.")...\n"; |
|
| 170 | + } |
|
| 132 | 171 | } else if (preg_match('/aircraftlist.json$/i',$host)) { |
| 133 | 172 | //$formats[$id] = 'aircraftlistjson'; |
| 134 | 173 | $globalSources[$id]['format'] = 'aircraftlistjson'; |
| 135 | 174 | //$last_exec['aircraftlistjson'] = 0; |
| 136 | - if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n"; |
|
| 175 | + if ($globalDebug) { |
|
| 176 | + echo "Connect to aircraftlist.json source (".$host.")...\n"; |
|
| 177 | + } |
|
| 137 | 178 | } else if (preg_match('/opensky/i',$host)) { |
| 138 | 179 | //$formats[$id] = 'aircraftlistjson'; |
| 139 | 180 | $globalSources[$id]['format'] = 'opensky'; |
| 140 | 181 | //$last_exec['aircraftlistjson'] = 0; |
| 141 | - if ($globalDebug) echo "Connect to opensky source (".$host.")...\n"; |
|
| 182 | + if ($globalDebug) { |
|
| 183 | + echo "Connect to opensky source (".$host.")...\n"; |
|
| 184 | + } |
|
| 142 | 185 | } else if (preg_match('/radarvirtuel.com\/file.json$/i',$host)) { |
| 143 | 186 | //$formats[$id] = 'radarvirtueljson'; |
| 144 | 187 | $globalSources[$id]['format'] = 'radarvirtueljson'; |
| 145 | 188 | //$last_exec['radarvirtueljson'] = 0; |
| 146 | - if ($globalDebug) echo "Connect to radarvirtuel.com/file.json source (".$host.")...\n"; |
|
| 189 | + if ($globalDebug) { |
|
| 190 | + echo "Connect to radarvirtuel.com/file.json source (".$host.")...\n"; |
|
| 191 | + } |
|
| 147 | 192 | if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { |
| 148 | 193 | echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
| 149 | 194 | exit(0); |
@@ -152,7 +197,9 @@ discard block |
||
| 152 | 197 | //$formats[$id] = 'planeupdatefaa'; |
| 153 | 198 | $globalSources[$id]['format'] = 'planeupdatefaa'; |
| 154 | 199 | //$last_exec['planeupdatefaa'] = 0; |
| 155 | - if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n"; |
|
| 200 | + if ($globalDebug) { |
|
| 201 | + echo "Connect to planeUpdateFAA.php source (".$host.")...\n"; |
|
| 202 | + } |
|
| 156 | 203 | if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { |
| 157 | 204 | echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
| 158 | 205 | exit(0); |
@@ -161,26 +208,36 @@ discard block |
||
| 161 | 208 | //$formats[$id] = 'phpvmacars'; |
| 162 | 209 | $globalSources[$id]['format'] = 'phpvmacars'; |
| 163 | 210 | //$last_exec['phpvmacars'] = 0; |
| 164 | - if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n"; |
|
| 211 | + if ($globalDebug) { |
|
| 212 | + echo "Connect to phpvmacars source (".$host.")...\n"; |
|
| 213 | + } |
|
| 165 | 214 | } else if (preg_match('/VAM-json.php$/i',$host)) { |
| 166 | 215 | //$formats[$id] = 'phpvmacars'; |
| 167 | 216 | $globalSources[$id]['format'] = 'vam'; |
| 168 | - if ($globalDebug) echo "Connect to Vam source (".$host.")...\n"; |
|
| 217 | + if ($globalDebug) { |
|
| 218 | + echo "Connect to Vam source (".$host.")...\n"; |
|
| 219 | + } |
|
| 169 | 220 | } else if (preg_match('/whazzup/i',$host)) { |
| 170 | 221 | //$formats[$id] = 'whazzup'; |
| 171 | 222 | $globalSources[$id]['format'] = 'whazzup'; |
| 172 | 223 | //$last_exec['whazzup'] = 0; |
| 173 | - if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n"; |
|
| 224 | + if ($globalDebug) { |
|
| 225 | + echo "Connect to whazzup source (".$host.")...\n"; |
|
| 226 | + } |
|
| 174 | 227 | } else if (preg_match('/recentpireps/i',$host)) { |
| 175 | 228 | //$formats[$id] = 'pirepsjson'; |
| 176 | 229 | $globalSources[$id]['format'] = 'pirepsjson'; |
| 177 | 230 | //$last_exec['pirepsjson'] = 0; |
| 178 | - if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n"; |
|
| 231 | + if ($globalDebug) { |
|
| 232 | + echo "Connect to pirepsjson source (".$host.")...\n"; |
|
| 233 | + } |
|
| 179 | 234 | } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) { |
| 180 | 235 | //$formats[$id] = 'fr24json'; |
| 181 | 236 | $globalSources[$id]['format'] = 'fr24json'; |
| 182 | 237 | //$last_exec['fr24json'] = 0; |
| 183 | - if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n"; |
|
| 238 | + if ($globalDebug) { |
|
| 239 | + echo "Connect to fr24 source (".$host.")...\n"; |
|
| 240 | + } |
|
| 184 | 241 | if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { |
| 185 | 242 | echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
| 186 | 243 | exit(0); |
@@ -189,7 +246,9 @@ discard block |
||
| 189 | 246 | //$formats[$id] = 'fr24json'; |
| 190 | 247 | $globalSources[$id]['format'] = 'myshiptracking'; |
| 191 | 248 | //$last_exec['fr24json'] = 0; |
| 192 | - if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n"; |
|
| 249 | + if ($globalDebug) { |
|
| 250 | + echo "Connect to myshiptracking source (".$host.")...\n"; |
|
| 251 | + } |
|
| 193 | 252 | if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { |
| 194 | 253 | echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
| 195 | 254 | exit(0); |
@@ -198,17 +257,24 @@ discard block |
||
| 198 | 257 | } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) { |
| 199 | 258 | //$formats[$id] = 'tsv'; |
| 200 | 259 | $globalSources[$id]['format'] = 'tsv'; |
| 201 | - if ($globalDebug) echo "Connect to tsv source (".$host.")...\n"; |
|
| 260 | + if ($globalDebug) { |
|
| 261 | + echo "Connect to tsv source (".$host.")...\n"; |
|
| 262 | + } |
|
| 202 | 263 | } |
| 203 | 264 | } elseif (filter_var($host,FILTER_VALIDATE_URL)) { |
| 204 | 265 | if ($globalSources[$id]['format'] == 'aisnmeahttp') { |
| 205 | 266 | $idf = fopen($globalSources[$id]['host'],'r',false,$context); |
| 206 | 267 | if ($idf !== false) { |
| 207 | 268 | $httpfeeds[$id] = $idf; |
| 208 | - if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
|
| 269 | + if ($globalDebug) { |
|
| 270 | + echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
|
| 271 | + } |
|
| 272 | + } elseif ($globalDebug) { |
|
| 273 | + echo "Can't connect to ".$globalSources[$id]['host']."\n"; |
|
| 209 | 274 | } |
| 210 | - elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n"; |
|
| 211 | - } elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
|
| 275 | + } elseif ($globalDebug) { |
|
| 276 | + echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
|
| 277 | + } |
|
| 212 | 278 | } elseif (!filter_var($host,FILTER_VALIDATE_URL)) { |
| 213 | 279 | $hostport = explode(':',$host); |
| 214 | 280 | if (isset($hostport[1])) { |
@@ -248,17 +314,25 @@ discard block |
||
| 248 | 314 | //$formats[$id] = 'beast'; |
| 249 | 315 | $globalSources[$id]['format'] = 'beast'; |
| 250 | 316 | //} else $formats[$id] = 'sbs'; |
| 251 | - } else $globalSources[$id]['format'] = 'sbs'; |
|
| 317 | + } else { |
|
| 318 | + $globalSources[$id]['format'] = 'sbs'; |
|
| 319 | + } |
|
| 252 | 320 | //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n"; |
| 253 | 321 | } |
| 254 | - if ($globalDebug) echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n"; |
|
| 322 | + if ($globalDebug) { |
|
| 323 | + echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n"; |
|
| 324 | + } |
|
| 255 | 325 | } else { |
| 256 | - if ($globalDebug) echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n"; |
|
| 326 | + if ($globalDebug) { |
|
| 327 | + echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n"; |
|
| 328 | + } |
|
| 257 | 329 | } |
| 258 | 330 | } |
| 259 | 331 | } |
| 260 | 332 | } |
| 261 | -if (!isset($globalMinFetch)) $globalMinFetch = 15; |
|
| 333 | +if (!isset($globalMinFetch)) { |
|
| 334 | + $globalMinFetch = 15; |
|
| 335 | +} |
|
| 262 | 336 | |
| 263 | 337 | // Initialize all |
| 264 | 338 | $status = array(); |
@@ -267,13 +341,19 @@ discard block |
||
| 267 | 341 | $formats = array(); |
| 268 | 342 | $last_exec = array(); |
| 269 | 343 | $time = time(); |
| 270 | -if (isset($globalSourcesTimeout)) $timeout = $globalSourcesTimeOut; |
|
| 271 | -else if (isset($globalSBS1TimeOut)) $timeout = $globalSBS1TimeOut; |
|
| 272 | -else $timeout = 20; |
|
| 344 | +if (isset($globalSourcesTimeout)) { |
|
| 345 | + $timeout = $globalSourcesTimeOut; |
|
| 346 | +} else if (isset($globalSBS1TimeOut)) { |
|
| 347 | + $timeout = $globalSBS1TimeOut; |
|
| 348 | +} else { |
|
| 349 | + $timeout = 20; |
|
| 350 | +} |
|
| 273 | 351 | $errno = ''; |
| 274 | 352 | $errstr=''; |
| 275 | 353 | |
| 276 | -if (!isset($globalDaemon)) $globalDaemon = TRUE; |
|
| 354 | +if (!isset($globalDaemon)) { |
|
| 355 | + $globalDaemon = TRUE; |
|
| 356 | +} |
|
| 277 | 357 | /* Initiate connections to all the hosts simultaneously */ |
| 278 | 358 | //connect_all($hosts); |
| 279 | 359 | //connect_all($globalSources); |
@@ -299,7 +379,9 @@ discard block |
||
| 299 | 379 | if (isset($source['format']) && $source['format'] == 'aprs') { |
| 300 | 380 | $aprs_connect = 0; |
| 301 | 381 | $use_aprs = true; |
| 302 | - if (isset($source['port']) && $source['port'] == '10152') $aprs_full = true; |
|
| 382 | + if (isset($source['port']) && $source['port'] == '10152') { |
|
| 383 | + $aprs_full = true; |
|
| 384 | + } |
|
| 303 | 385 | break; |
| 304 | 386 | } |
| 305 | 387 | } |
@@ -310,25 +392,48 @@ discard block |
||
| 310 | 392 | $aprs_connect = 0; |
| 311 | 393 | $aprs_keep = 120; |
| 312 | 394 | $aprs_last_tx = time(); |
| 313 | - if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion; |
|
| 314 | - else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName); |
|
| 315 | - if (isset($globalAPRSssid)) $aprs_ssid = $globalAPRSssid; |
|
| 316 | - else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8); |
|
| 317 | - if (isset($globalAPRSfilter)) $aprs_filter = $globalAPRSfilter; |
|
| 318 | - else $aprs_filter = 'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0'; |
|
| 319 | - if ($aprs_full) $aprs_filter = ''; |
|
| 320 | - if (isset($globalAPRSpass)) $aprs_pass = $globalAPRSpass; |
|
| 321 | - else $aprs_pass = '-1'; |
|
| 395 | + if (isset($globalAPRSversion)) { |
|
| 396 | + $aprs_version = $globalAPRSversion; |
|
| 397 | + } else { |
|
| 398 | + $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName); |
|
| 399 | + } |
|
| 400 | + if (isset($globalAPRSssid)) { |
|
| 401 | + $aprs_ssid = $globalAPRSssid; |
|
| 402 | + } else { |
|
| 403 | + $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8); |
|
| 404 | + } |
|
| 405 | + if (isset($globalAPRSfilter)) { |
|
| 406 | + $aprs_filter = $globalAPRSfilter; |
|
| 407 | + } else { |
|
| 408 | + $aprs_filter = 'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0'; |
|
| 409 | + } |
|
| 410 | + if ($aprs_full) { |
|
| 411 | + $aprs_filter = ''; |
|
| 412 | + } |
|
| 413 | + if (isset($globalAPRSpass)) { |
|
| 414 | + $aprs_pass = $globalAPRSpass; |
|
| 415 | + } else { |
|
| 416 | + $aprs_pass = '-1'; |
|
| 417 | + } |
|
| 322 | 418 | |
| 323 | - if ($aprs_filter != '') $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version} filter {$aprs_filter}\n"; |
|
| 324 | - else $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n"; |
|
| 325 | -} |
|
| 419 | + if ($aprs_filter != '') { |
|
| 420 | + $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version} filter {$aprs_filter}\n"; |
|
| 421 | + } else { |
|
| 422 | + $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n"; |
|
| 423 | + } |
|
| 424 | + } |
|
| 326 | 425 | |
| 327 | 426 | // connected - lets do some work |
| 328 | -if ($globalDebug) echo "Connected!\n"; |
|
| 427 | +if ($globalDebug) { |
|
| 428 | + echo "Connected!\n"; |
|
| 429 | +} |
|
| 329 | 430 | sleep(1); |
| 330 | -if ($globalDebug) echo "SCAN MODE \n\n"; |
|
| 331 | -if (!isset($globalCronEnd)) $globalCronEnd = 60; |
|
| 431 | +if ($globalDebug) { |
|
| 432 | + echo "SCAN MODE \n\n"; |
|
| 433 | +} |
|
| 434 | +if (!isset($globalCronEnd)) { |
|
| 435 | + $globalCronEnd = 60; |
|
| 436 | +} |
|
| 332 | 437 | $endtime = time()+$globalCronEnd; |
| 333 | 438 | $i = 1; |
| 334 | 439 | $tt = array(); |
@@ -342,10 +447,14 @@ discard block |
||
| 342 | 447 | |
| 343 | 448 | // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time. |
| 344 | 449 | while ($i > 0) { |
| 345 | - if (!$globalDaemon) $i = $endtime-time(); |
|
| 450 | + if (!$globalDaemon) { |
|
| 451 | + $i = $endtime-time(); |
|
| 452 | + } |
|
| 346 | 453 | // Delete old ATC |
| 347 | 454 | if ($globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) { |
| 348 | - if ($globalDebug) echo 'Delete old ATC...'."\n"; |
|
| 455 | + if ($globalDebug) { |
|
| 456 | + echo 'Delete old ATC...'."\n"; |
|
| 457 | + } |
|
| 349 | 458 | $ATC->deleteOldATC(); |
| 350 | 459 | } |
| 351 | 460 | |
@@ -353,10 +462,14 @@ discard block |
||
| 353 | 462 | if (count($last_exec) == count($globalSources)) { |
| 354 | 463 | $max = $globalMinFetch; |
| 355 | 464 | foreach ($last_exec as $last) { |
| 356 | - if ((time() - $last['last']) < $max) $max = time() - $last['last']; |
|
| 465 | + if ((time() - $last['last']) < $max) { |
|
| 466 | + $max = time() - $last['last']; |
|
| 467 | + } |
|
| 357 | 468 | } |
| 358 | 469 | if ($max != $globalMinFetch) { |
| 359 | - if ($globalDebug) echo 'Sleeping...'."\n"; |
|
| 470 | + if ($globalDebug) { |
|
| 471 | + echo 'Sleeping...'."\n"; |
|
| 472 | + } |
|
| 360 | 473 | sleep($globalMinFetch-$max+2); |
| 361 | 474 | } |
| 362 | 475 | } |
@@ -365,11 +478,15 @@ discard block |
||
| 365 | 478 | //foreach ($formats as $id => $value) { |
| 366 | 479 | foreach ($globalSources as $id => $value) { |
| 367 | 480 | date_default_timezone_set('UTC'); |
| 368 | - if (!isset($last_exec[$id]['last'])) $last_exec[$id]['last'] = 0; |
|
| 481 | + if (!isset($last_exec[$id]['last'])) { |
|
| 482 | + $last_exec[$id]['last'] = 0; |
|
| 483 | + } |
|
| 369 | 484 | if ($value['format'] == 'deltadbtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 370 | 485 | //$buffer = $Common->getData($hosts[$id]); |
| 371 | 486 | $buffer = $Common->getData($value['host']); |
| 372 | - if ($buffer != '') $reset = 0; |
|
| 487 | + if ($buffer != '') { |
|
| 488 | + $reset = 0; |
|
| 489 | + } |
|
| 373 | 490 | $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
| 374 | 491 | $buffer = explode('\n',$buffer); |
| 375 | 492 | foreach ($buffer as $line) { |
@@ -378,20 +495,41 @@ discard block |
||
| 378 | 495 | $data = array(); |
| 379 | 496 | $data['hex'] = $line[1]; // hex |
| 380 | 497 | $data['ident'] = $line[2]; // ident |
| 381 | - if (isset($line[3])) $data['altitude'] = $line[3]; // altitude |
|
| 382 | - if (isset($line[4])) $data['speed'] = $line[4]; // speed |
|
| 383 | - if (isset($line[5])) $data['heading'] = $line[5]; // heading |
|
| 384 | - if (isset($line[6])) $data['latitude'] = $line[6]; // lat |
|
| 385 | - if (isset($line[7])) $data['longitude'] = $line[7]; // long |
|
| 498 | + if (isset($line[3])) { |
|
| 499 | + $data['altitude'] = $line[3]; |
|
| 500 | + } |
|
| 501 | + // altitude |
|
| 502 | + if (isset($line[4])) { |
|
| 503 | + $data['speed'] = $line[4]; |
|
| 504 | + } |
|
| 505 | + // speed |
|
| 506 | + if (isset($line[5])) { |
|
| 507 | + $data['heading'] = $line[5]; |
|
| 508 | + } |
|
| 509 | + // heading |
|
| 510 | + if (isset($line[6])) { |
|
| 511 | + $data['latitude'] = $line[6]; |
|
| 512 | + } |
|
| 513 | + // lat |
|
| 514 | + if (isset($line[7])) { |
|
| 515 | + $data['longitude'] = $line[7]; |
|
| 516 | + } |
|
| 517 | + // long |
|
| 386 | 518 | $data['verticalrate'] = ''; // vertical rate |
| 387 | 519 | //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk |
| 388 | 520 | $data['emergency'] = ''; // emergency |
| 389 | 521 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 390 | 522 | $data['format_source'] = 'deltadbtxt'; |
| 391 | 523 | $data['id_source'] = $id_source; |
| 392 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 393 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 394 | - if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats']; |
|
| 524 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 525 | + $data['source_name'] = $value['name']; |
|
| 526 | + } |
|
| 527 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 528 | + $data['noarchive'] = true; |
|
| 529 | + } |
|
| 530 | + if (isset($value['sourcestats'])) { |
|
| 531 | + $data['sourcestats'] = $value['sourcestats']; |
|
| 532 | + } |
|
| 395 | 533 | $SI->add($data); |
| 396 | 534 | unset($data); |
| 397 | 535 | } |
@@ -401,7 +539,9 @@ discard block |
||
| 401 | 539 | date_default_timezone_set('CET'); |
| 402 | 540 | $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host'])); |
| 403 | 541 | date_default_timezone_set('UTC'); |
| 404 | - if ($buffer != '') $reset = 0; |
|
| 542 | + if ($buffer != '') { |
|
| 543 | + $reset = 0; |
|
| 544 | + } |
|
| 405 | 545 | $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
| 406 | 546 | $buffer = explode('\n',$buffer); |
| 407 | 547 | foreach ($buffer as $line) { |
@@ -410,16 +550,36 @@ discard block |
||
| 410 | 550 | $add = false; |
| 411 | 551 | $ais_data = $AIS->parse_line(trim($line)); |
| 412 | 552 | $data = array(); |
| 413 | - if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident']; |
|
| 414 | - if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi']; |
|
| 415 | - if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed']; |
|
| 416 | - if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading']; |
|
| 417 | - if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude']; |
|
| 418 | - if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude']; |
|
| 419 | - if (isset($ais_data['status'])) $data['status'] = $ais_data['status']; |
|
| 420 | - if (isset($ais_data['type'])) $data['type'] = $ais_data['type']; |
|
| 421 | - if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
|
| 422 | - if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
|
| 553 | + if (isset($ais_data['ident'])) { |
|
| 554 | + $data['ident'] = $ais_data['ident']; |
|
| 555 | + } |
|
| 556 | + if (isset($ais_data['mmsi'])) { |
|
| 557 | + $data['mmsi'] = $ais_data['mmsi']; |
|
| 558 | + } |
|
| 559 | + if (isset($ais_data['speed'])) { |
|
| 560 | + $data['speed'] = $ais_data['speed']; |
|
| 561 | + } |
|
| 562 | + if (isset($ais_data['heading'])) { |
|
| 563 | + $data['heading'] = $ais_data['heading']; |
|
| 564 | + } |
|
| 565 | + if (isset($ais_data['latitude'])) { |
|
| 566 | + $data['latitude'] = $ais_data['latitude']; |
|
| 567 | + } |
|
| 568 | + if (isset($ais_data['longitude'])) { |
|
| 569 | + $data['longitude'] = $ais_data['longitude']; |
|
| 570 | + } |
|
| 571 | + if (isset($ais_data['status'])) { |
|
| 572 | + $data['status'] = $ais_data['status']; |
|
| 573 | + } |
|
| 574 | + if (isset($ais_data['type'])) { |
|
| 575 | + $data['type'] = $ais_data['type']; |
|
| 576 | + } |
|
| 577 | + if (isset($ais_data['imo'])) { |
|
| 578 | + $data['imo'] = $ais_data['imo']; |
|
| 579 | + } |
|
| 580 | + if (isset($ais_data['callsign'])) { |
|
| 581 | + $data['callsign'] = $ais_data['callsign']; |
|
| 582 | + } |
|
| 423 | 583 | if (isset($ais_data['timestamp'])) { |
| 424 | 584 | $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
| 425 | 585 | if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) { |
@@ -434,8 +594,12 @@ discard block |
||
| 434 | 594 | $data['id_source'] = $id_source; |
| 435 | 595 | //print_r($data); |
| 436 | 596 | echo 'Add...'."\n"; |
| 437 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 438 | - if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data); |
|
| 597 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 598 | + $data['noarchive'] = true; |
|
| 599 | + } |
|
| 600 | + if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') { |
|
| 601 | + $MI->add($data); |
|
| 602 | + } |
|
| 439 | 603 | unset($data); |
| 440 | 604 | } |
| 441 | 605 | } |
@@ -455,18 +619,42 @@ discard block |
||
| 455 | 619 | if ($line != '') { |
| 456 | 620 | $ais_data = $AIS->parse_line(trim($line)); |
| 457 | 621 | $data = array(); |
| 458 | - if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident']; |
|
| 459 | - if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi']; |
|
| 460 | - if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed']; |
|
| 461 | - if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading']; |
|
| 462 | - if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude']; |
|
| 463 | - if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude']; |
|
| 464 | - if (isset($ais_data['status'])) $data['status'] = $ais_data['status']; |
|
| 465 | - if (isset($ais_data['type'])) $data['type'] = $ais_data['type']; |
|
| 466 | - if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
|
| 467 | - if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
|
| 468 | - if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination']; |
|
| 469 | - if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); |
|
| 622 | + if (isset($ais_data['ident'])) { |
|
| 623 | + $data['ident'] = $ais_data['ident']; |
|
| 624 | + } |
|
| 625 | + if (isset($ais_data['mmsi'])) { |
|
| 626 | + $data['mmsi'] = $ais_data['mmsi']; |
|
| 627 | + } |
|
| 628 | + if (isset($ais_data['speed'])) { |
|
| 629 | + $data['speed'] = $ais_data['speed']; |
|
| 630 | + } |
|
| 631 | + if (isset($ais_data['heading'])) { |
|
| 632 | + $data['heading'] = $ais_data['heading']; |
|
| 633 | + } |
|
| 634 | + if (isset($ais_data['latitude'])) { |
|
| 635 | + $data['latitude'] = $ais_data['latitude']; |
|
| 636 | + } |
|
| 637 | + if (isset($ais_data['longitude'])) { |
|
| 638 | + $data['longitude'] = $ais_data['longitude']; |
|
| 639 | + } |
|
| 640 | + if (isset($ais_data['status'])) { |
|
| 641 | + $data['status'] = $ais_data['status']; |
|
| 642 | + } |
|
| 643 | + if (isset($ais_data['type'])) { |
|
| 644 | + $data['type'] = $ais_data['type']; |
|
| 645 | + } |
|
| 646 | + if (isset($ais_data['imo'])) { |
|
| 647 | + $data['imo'] = $ais_data['imo']; |
|
| 648 | + } |
|
| 649 | + if (isset($ais_data['callsign'])) { |
|
| 650 | + $data['callsign'] = $ais_data['callsign']; |
|
| 651 | + } |
|
| 652 | + if (isset($ais_data['destination'])) { |
|
| 653 | + $data['arrival_code'] = $ais_data['destination']; |
|
| 654 | + } |
|
| 655 | + if (isset($ais_data['eta_ts'])) { |
|
| 656 | + $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); |
|
| 657 | + } |
|
| 470 | 658 | if (isset($ais_data['timestamp'])) { |
| 471 | 659 | $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
| 472 | 660 | } else { |
@@ -474,16 +662,23 @@ discard block |
||
| 474 | 662 | } |
| 475 | 663 | $data['format_source'] = 'aisnmeahttp'; |
| 476 | 664 | $data['id_source'] = $id_source; |
| 477 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 478 | - if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data); |
|
| 665 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 666 | + $data['noarchive'] = true; |
|
| 667 | + } |
|
| 668 | + if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') { |
|
| 669 | + $MI->add($data); |
|
| 670 | + } |
|
| 479 | 671 | unset($data); |
| 480 | 672 | } |
| 481 | 673 | } |
| 482 | 674 | } |
| 483 | 675 | } else { |
| 484 | 676 | $format = $value['format']; |
| 485 | - if (isset($tt[$format])) $tt[$format]++; |
|
| 486 | - else $tt[$format] = 0; |
|
| 677 | + if (isset($tt[$format])) { |
|
| 678 | + $tt[$format]++; |
|
| 679 | + } else { |
|
| 680 | + $tt[$format] = 0; |
|
| 681 | + } |
|
| 487 | 682 | if ($tt[$format] > 30) { |
| 488 | 683 | sleep(2); |
| 489 | 684 | $sourceeen[] = $value; |
@@ -514,7 +709,9 @@ discard block |
||
| 514 | 709 | $data['datetime'] = date('Y-m-d H:i:s',$line['T']); |
| 515 | 710 | $data['format_source'] = 'myshiptracking'; |
| 516 | 711 | $data['id_source'] = $id_source; |
| 517 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 712 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 713 | + $data['noarchive'] = true; |
|
| 714 | + } |
|
| 518 | 715 | $MI->add($data); |
| 519 | 716 | unset($data); |
| 520 | 717 | } |
@@ -535,7 +732,9 @@ discard block |
||
| 535 | 732 | $data['callsign'] = $line['callsign']; |
| 536 | 733 | $data['mmsi'] = $line['mmsi']; |
| 537 | 734 | $data['speed'] = $line['sog']; |
| 538 | - if ($line['heading'] != '511') $data['heading'] = $line['heading']; |
|
| 735 | + if ($line['heading'] != '511') { |
|
| 736 | + $data['heading'] = $line['heading']; |
|
| 737 | + } |
|
| 539 | 738 | $data['latitude'] = $line['latitude']; |
| 540 | 739 | $data['longitude'] = $line['longitude']; |
| 541 | 740 | $data['type_id'] = $line['shiptype']; |
@@ -543,7 +742,9 @@ discard block |
||
| 543 | 742 | $data['datetime'] = $line['time']; |
| 544 | 743 | $data['format_source'] = 'boatbeaconapp'; |
| 545 | 744 | $data['id_source'] = $id_source; |
| 546 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 745 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 746 | + $data['noarchive'] = true; |
|
| 747 | + } |
|
| 547 | 748 | $MI->add($data); |
| 548 | 749 | unset($data); |
| 549 | 750 | } |
@@ -556,7 +757,9 @@ discard block |
||
| 556 | 757 | echo 'download...'; |
| 557 | 758 | $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter'); |
| 558 | 759 | echo 'done !'."\n"; |
| 559 | - if ($buffer != '') $reset = 0; |
|
| 760 | + if ($buffer != '') { |
|
| 761 | + $reset = 0; |
|
| 762 | + } |
|
| 560 | 763 | $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
| 561 | 764 | $buffer = explode('\n',$buffer); |
| 562 | 765 | foreach ($buffer as $line) { |
@@ -581,7 +784,9 @@ discard block |
||
| 581 | 784 | //$data['etaTime'] = substr($line,135,5); |
| 582 | 785 | $data['format_source'] = 'shipplotter'; |
| 583 | 786 | $data['id_source'] = $id_source; |
| 584 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 787 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 788 | + $data['noarchive'] = true; |
|
| 789 | + } |
|
| 585 | 790 | //print_r($data); |
| 586 | 791 | echo 'Add...'."\n"; |
| 587 | 792 | $MI->add($data); |
@@ -601,16 +806,28 @@ discard block |
||
| 601 | 806 | $line = explode(':', $line); |
| 602 | 807 | if (count($line) > 30 && $line[0] != 'callsign') { |
| 603 | 808 | $data = array(); |
| 604 | - if (isset($line[37]) && $line[37] != '') $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37]; |
|
| 605 | - else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0]; |
|
| 809 | + if (isset($line[37]) && $line[37] != '') { |
|
| 810 | + $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37]; |
|
| 811 | + } else { |
|
| 812 | + $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0]; |
|
| 813 | + } |
|
| 606 | 814 | $data['pilot_id'] = $line[1]; |
| 607 | 815 | $data['pilot_name'] = $line[2]; |
| 608 | 816 | $data['hex'] = str_pad(dechex($Common->str2int($line[1])),6,'000000',STR_PAD_LEFT); |
| 609 | 817 | $data['ident'] = $line[0]; // ident |
| 610 | - if ($line[7] != '' && $line[7] != 0) $data['altitude'] = $line[7]; // altitude |
|
| 818 | + if ($line[7] != '' && $line[7] != 0) { |
|
| 819 | + $data['altitude'] = $line[7]; |
|
| 820 | + } |
|
| 821 | + // altitude |
|
| 611 | 822 | $data['speed'] = $line[8]; // speed |
| 612 | - if (isset($line[45])) $data['heading'] = $line[45]; // heading |
|
| 613 | - elseif (isset($line[38])) $data['heading'] = $line[38]; // heading |
|
| 823 | + if (isset($line[45])) { |
|
| 824 | + $data['heading'] = $line[45]; |
|
| 825 | + } |
|
| 826 | + // heading |
|
| 827 | + elseif (isset($line[38])) { |
|
| 828 | + $data['heading'] = $line[38]; |
|
| 829 | + } |
|
| 830 | + // heading |
|
| 614 | 831 | $data['latitude'] = $line[5]; // lat |
| 615 | 832 | $data['longitude'] = $line[6]; // long |
| 616 | 833 | $data['verticalrate'] = ''; // vertical rate |
@@ -626,7 +843,9 @@ discard block |
||
| 626 | 843 | $data['frequency'] = $line[4]; |
| 627 | 844 | $data['type'] = $line[18]; |
| 628 | 845 | $data['range'] = $line[19]; |
| 629 | - if (isset($line[35])) $data['info'] = $line[35]; |
|
| 846 | + if (isset($line[35])) { |
|
| 847 | + $data['info'] = $line[35]; |
|
| 848 | + } |
|
| 630 | 849 | $data['id_source'] = $id_source; |
| 631 | 850 | //$data['arrival_airport_time'] = ; |
| 632 | 851 | if ($line[9] != '') { |
@@ -640,25 +859,44 @@ discard block |
||
| 640 | 859 | elseif ($value == 'vatsimtxt') $data['format_source'] = 'vatsimtxt'; |
| 641 | 860 | */ |
| 642 | 861 | $data['format_source'] = $value['format']; |
| 643 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 644 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 645 | - if ($line[3] == 'PILOT') $SI->add($data); |
|
| 646 | - elseif ($line[3] == 'ATC') { |
|
| 862 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 863 | + $data['noarchive'] = true; |
|
| 864 | + } |
|
| 865 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 866 | + $data['source_name'] = $value['name']; |
|
| 867 | + } |
|
| 868 | + if ($line[3] == 'PILOT') { |
|
| 869 | + $SI->add($data); |
|
| 870 | + } elseif ($line[3] == 'ATC') { |
|
| 647 | 871 | //print_r($data); |
| 648 | 872 | $data['info'] = str_replace('^§','<br />',$data['info']); |
| 649 | 873 | $data['info'] = str_replace('&sect;','',$data['info']); |
| 650 | 874 | $typec = substr($data['ident'],-3); |
| 651 | - if ($typec == 'APP') $data['type'] = 'Approach'; |
|
| 652 | - elseif ($typec == 'TWR') $data['type'] = 'Tower'; |
|
| 653 | - elseif ($typec == 'OBS') $data['type'] = 'Observer'; |
|
| 654 | - elseif ($typec == 'GND') $data['type'] = 'Ground'; |
|
| 655 | - elseif ($typec == 'DEL') $data['type'] = 'Delivery'; |
|
| 656 | - elseif ($typec == 'DEP') $data['type'] = 'Departure'; |
|
| 657 | - elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station'; |
|
| 658 | - elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre'; |
|
| 659 | - elseif ($data['type'] == '') $data['type'] = 'Observer'; |
|
| 660 | - if (!isset($data['source_name'])) $data['source_name'] = ''; |
|
| 661 | - if (isset($ATC)) 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']); |
|
| 875 | + if ($typec == 'APP') { |
|
| 876 | + $data['type'] = 'Approach'; |
|
| 877 | + } elseif ($typec == 'TWR') { |
|
| 878 | + $data['type'] = 'Tower'; |
|
| 879 | + } elseif ($typec == 'OBS') { |
|
| 880 | + $data['type'] = 'Observer'; |
|
| 881 | + } elseif ($typec == 'GND') { |
|
| 882 | + $data['type'] = 'Ground'; |
|
| 883 | + } elseif ($typec == 'DEL') { |
|
| 884 | + $data['type'] = 'Delivery'; |
|
| 885 | + } elseif ($typec == 'DEP') { |
|
| 886 | + $data['type'] = 'Departure'; |
|
| 887 | + } elseif ($typec == 'FSS') { |
|
| 888 | + $data['type'] = 'Flight Service Station'; |
|
| 889 | + } elseif ($typec == 'CTR') { |
|
| 890 | + $data['type'] = 'Control Radar or Centre'; |
|
| 891 | + } elseif ($data['type'] == '') { |
|
| 892 | + $data['type'] = 'Observer'; |
|
| 893 | + } |
|
| 894 | + if (!isset($data['source_name'])) { |
|
| 895 | + $data['source_name'] = ''; |
|
| 896 | + } |
|
| 897 | + if (isset($ATC)) { |
|
| 898 | + 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']); |
|
| 899 | + } |
|
| 662 | 900 | } |
| 663 | 901 | unset($data); |
| 664 | 902 | } |
@@ -677,27 +915,61 @@ discard block |
||
| 677 | 915 | foreach ($all_data['acList'] as $line) { |
| 678 | 916 | $data = array(); |
| 679 | 917 | $data['hex'] = $line['Icao']; // hex |
| 680 | - if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident |
|
| 681 | - if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude |
|
| 682 | - if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed |
|
| 683 | - if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading |
|
| 684 | - if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat |
|
| 685 | - if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long |
|
| 918 | + if (isset($line['Call'])) { |
|
| 919 | + $data['ident'] = $line['Call']; |
|
| 920 | + } |
|
| 921 | + // ident |
|
| 922 | + if (isset($line['Alt'])) { |
|
| 923 | + $data['altitude'] = $line['Alt']; |
|
| 924 | + } |
|
| 925 | + // altitude |
|
| 926 | + if (isset($line['Spd'])) { |
|
| 927 | + $data['speed'] = $line['Spd']; |
|
| 928 | + } |
|
| 929 | + // speed |
|
| 930 | + if (isset($line['Trak'])) { |
|
| 931 | + $data['heading'] = $line['Trak']; |
|
| 932 | + } |
|
| 933 | + // heading |
|
| 934 | + if (isset($line['Lat'])) { |
|
| 935 | + $data['latitude'] = $line['Lat']; |
|
| 936 | + } |
|
| 937 | + // lat |
|
| 938 | + if (isset($line['Long'])) { |
|
| 939 | + $data['longitude'] = $line['Long']; |
|
| 940 | + } |
|
| 941 | + // long |
|
| 686 | 942 | //$data['verticalrate'] = $line['']; // verticale rate |
| 687 | - if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk |
|
| 943 | + if (isset($line['Sqk'])) { |
|
| 944 | + $data['squawk'] = $line['Sqk']; |
|
| 945 | + } |
|
| 946 | + // squawk |
|
| 688 | 947 | $data['emergency'] = ''; // emergency |
| 689 | - if (isset($line['Reg'])) $data['registration'] = $line['Reg']; |
|
| 948 | + if (isset($line['Reg'])) { |
|
| 949 | + $data['registration'] = $line['Reg']; |
|
| 950 | + } |
|
| 690 | 951 | |
| 691 | - if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); |
|
| 692 | - else $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 952 | + if (isset($line['PosTime'])) { |
|
| 953 | + $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); |
|
| 954 | + } else { |
|
| 955 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 956 | + } |
|
| 693 | 957 | |
| 694 | 958 | //$data['datetime'] = date('Y-m-d H:i:s'); |
| 695 | - if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type']; |
|
| 959 | + if (isset($line['Type'])) { |
|
| 960 | + $data['aircraft_icao'] = $line['Type']; |
|
| 961 | + } |
|
| 696 | 962 | $data['format_source'] = 'aircraftlistjson'; |
| 697 | 963 | $data['id_source'] = $id_source; |
| 698 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 699 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 700 | - if (isset($data['latitude'])) $SI->add($data); |
|
| 964 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 965 | + $data['source_name'] = $value['name']; |
|
| 966 | + } |
|
| 967 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 968 | + $data['noarchive'] = true; |
|
| 969 | + } |
|
| 970 | + if (isset($data['latitude'])) { |
|
| 971 | + $SI->add($data); |
|
| 972 | + } |
|
| 701 | 973 | unset($data); |
| 702 | 974 | } |
| 703 | 975 | } elseif (is_array($all_data)) { |
@@ -714,12 +986,19 @@ discard block |
||
| 714 | 986 | $data['verticalrate'] = $line['vrt']; // verticale rate |
| 715 | 987 | $data['squawk'] = $line['squawk']; // squawk |
| 716 | 988 | $data['emergency'] = ''; // emergency |
| 717 | - if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); |
|
| 718 | - else $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 989 | + if (isset($line['PosTime'])) { |
|
| 990 | + $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); |
|
| 991 | + } else { |
|
| 992 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 993 | + } |
|
| 719 | 994 | $data['format_source'] = 'aircraftlistjson'; |
| 720 | 995 | $data['id_source'] = $id_source; |
| 721 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 722 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 996 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 997 | + $data['noarchive'] = true; |
|
| 998 | + } |
|
| 999 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 1000 | + $data['source_name'] = $value['name']; |
|
| 1001 | + } |
|
| 723 | 1002 | $SI->add($data); |
| 724 | 1003 | unset($data); |
| 725 | 1004 | } |
@@ -755,8 +1034,12 @@ discard block |
||
| 755 | 1034 | $data['datetime'] = date('Y-m-d H:i:s',$line[9]); |
| 756 | 1035 | $data['format_source'] = 'planeupdatefaa'; |
| 757 | 1036 | $data['id_source'] = $id_source; |
| 758 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 759 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1037 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 1038 | + $data['noarchive'] = true; |
|
| 1039 | + } |
|
| 1040 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 1041 | + $data['source_name'] = $value['name']; |
|
| 1042 | + } |
|
| 760 | 1043 | $SI->add($data); |
| 761 | 1044 | unset($data); |
| 762 | 1045 | } |
@@ -785,7 +1068,9 @@ discard block |
||
| 785 | 1068 | $data['datetime'] = date('Y-m-d H:i:s',$line[3]); |
| 786 | 1069 | $data['format_source'] = 'opensky'; |
| 787 | 1070 | $data['id_source'] = $id_source; |
| 788 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1071 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 1072 | + $data['noarchive'] = true; |
|
| 1073 | + } |
|
| 789 | 1074 | $SI->add($data); |
| 790 | 1075 | unset($data); |
| 791 | 1076 | } |
@@ -797,7 +1082,9 @@ discard block |
||
| 797 | 1082 | //$buffer = $Common->getData($hosts[$id]); |
| 798 | 1083 | $buffer = $Common->getData($value['host']); |
| 799 | 1084 | $all_data = json_decode($buffer,true); |
| 800 | - if (!empty($all_data)) $reset = 0; |
|
| 1085 | + if (!empty($all_data)) { |
|
| 1086 | + $reset = 0; |
|
| 1087 | + } |
|
| 801 | 1088 | foreach ($all_data as $key => $line) { |
| 802 | 1089 | if ($key != 'full_count' && $key != 'version' && $key != 'stats') { |
| 803 | 1090 | $data = array(); |
@@ -818,8 +1105,12 @@ discard block |
||
| 818 | 1105 | $data['datetime'] = date('Y-m-d H:i:s'); //$line[10] |
| 819 | 1106 | $data['format_source'] = 'fr24json'; |
| 820 | 1107 | $data['id_source'] = $id_source; |
| 821 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 822 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1108 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 1109 | + $data['noarchive'] = true; |
|
| 1110 | + } |
|
| 1111 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 1112 | + $data['source_name'] = $value['name']; |
|
| 1113 | + } |
|
| 823 | 1114 | $SI->add($data); |
| 824 | 1115 | unset($data); |
| 825 | 1116 | } |
@@ -843,24 +1134,42 @@ discard block |
||
| 843 | 1134 | if (isset($line['inf'])) { |
| 844 | 1135 | $data = array(); |
| 845 | 1136 | $data['hex'] = $line['inf']['ia']; |
| 846 | - if (isset($line['inf']['cs'])) $data['ident'] = $line['inf']['cs']; //$line[13] |
|
| 1137 | + if (isset($line['inf']['cs'])) { |
|
| 1138 | + $data['ident'] = $line['inf']['cs']; |
|
| 1139 | + } |
|
| 1140 | + //$line[13] |
|
| 847 | 1141 | $data['altitude'] = round($line['inf']['al']*3.28084); // altitude |
| 848 | - if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed |
|
| 849 | - if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading |
|
| 1142 | + if (isset($line['inf']['gs'])) { |
|
| 1143 | + $data['speed'] = round($line['inf']['gs']*0.539957); |
|
| 1144 | + } |
|
| 1145 | + // speed |
|
| 1146 | + if (isset($line['inf']['tr'])) { |
|
| 1147 | + $data['heading'] = $line['inf']['tr']; |
|
| 1148 | + } |
|
| 1149 | + // heading |
|
| 850 | 1150 | $data['latitude'] = $line['pt'][0]; // lat |
| 851 | 1151 | $data['longitude'] = $line['pt'][1]; // long |
| 852 | 1152 | //if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate |
| 853 | - if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk |
|
| 1153 | + if (isset($line['inf']['sq'])) { |
|
| 1154 | + $data['squawk'] = $line['inf']['sq']; |
|
| 1155 | + } |
|
| 1156 | + // squawk |
|
| 854 | 1157 | //$data['aircraft_icao'] = $line[8]; |
| 855 | - if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc']; |
|
| 1158 | + if (isset($line['inf']['rc'])) { |
|
| 1159 | + $data['registration'] = $line['inf']['rc']; |
|
| 1160 | + } |
|
| 856 | 1161 | //$data['departure_airport_iata'] = $line[11]; |
| 857 | 1162 | //$data['arrival_airport_iata'] = $line[12]; |
| 858 | 1163 | //$data['emergency'] = ''; // emergency |
| 859 | 1164 | $data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10] |
| 860 | 1165 | $data['format_source'] = 'radarvirtueljson'; |
| 861 | 1166 | $data['id_source'] = $id_source; |
| 862 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 863 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1167 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 1168 | + $data['noarchive'] = true; |
|
| 1169 | + } |
|
| 1170 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 1171 | + $data['source_name'] = $value['name']; |
|
| 1172 | + } |
|
| 864 | 1173 | $SI->add($data); |
| 865 | 1174 | unset($data); |
| 866 | 1175 | } |
@@ -881,30 +1190,65 @@ discard block |
||
| 881 | 1190 | $data['id'] = $line['id']; |
| 882 | 1191 | $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6); |
| 883 | 1192 | $data['ident'] = $line['callsign']; // ident |
| 884 | - if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id |
|
| 885 | - if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name |
|
| 886 | - if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude |
|
| 887 | - if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed |
|
| 888 | - if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading |
|
| 889 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 1193 | + if (isset($line['pilotid'])) { |
|
| 1194 | + $data['pilot_id'] = $line['pilotid']; |
|
| 1195 | + } |
|
| 1196 | + // pilot id |
|
| 1197 | + if (isset($line['name'])) { |
|
| 1198 | + $data['pilot_name'] = $line['name']; |
|
| 1199 | + } |
|
| 1200 | + // pilot name |
|
| 1201 | + if (isset($line['alt'])) { |
|
| 1202 | + $data['altitude'] = $line['alt']; |
|
| 1203 | + } |
|
| 1204 | + // altitude |
|
| 1205 | + if (isset($line['gs'])) { |
|
| 1206 | + $data['speed'] = $line['gs']; |
|
| 1207 | + } |
|
| 1208 | + // speed |
|
| 1209 | + if (isset($line['heading'])) { |
|
| 1210 | + $data['heading'] = $line['heading']; |
|
| 1211 | + } |
|
| 1212 | + // heading |
|
| 1213 | + if (isset($line['route'])) { |
|
| 1214 | + $data['waypoints'] = $line['route']; |
|
| 1215 | + } |
|
| 1216 | + // route |
|
| 890 | 1217 | $data['latitude'] = $line['lat']; // lat |
| 891 | 1218 | $data['longitude'] = $line['lon']; // long |
| 892 | 1219 | //$data['verticalrate'] = $line['vrt']; // verticale rate |
| 893 | 1220 | //$data['squawk'] = $line['squawk']; // squawk |
| 894 | 1221 | //$data['emergency'] = ''; // emergency |
| 895 | - if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao']; |
|
| 896 | - if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime']; |
|
| 897 | - if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao']; |
|
| 1222 | + if (isset($line['depicao'])) { |
|
| 1223 | + $data['departure_airport_icao'] = $line['depicao']; |
|
| 1224 | + } |
|
| 1225 | + if (isset($line['deptime'])) { |
|
| 1226 | + $data['departure_airport_time'] = $line['deptime']; |
|
| 1227 | + } |
|
| 1228 | + if (isset($line['arricao'])) { |
|
| 1229 | + $data['arrival_airport_icao'] = $line['arricao']; |
|
| 1230 | + } |
|
| 898 | 1231 | //$data['arrival_airport_time'] = $line['arrtime']; |
| 899 | - if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft']; |
|
| 900 | - if (isset($line['transponder'])) $data['squawk'] = $line['transponder']; |
|
| 901 | - if (isset($line['atis'])) $data['info'] = $line['atis']; |
|
| 902 | - else $data['info'] = ''; |
|
| 1232 | + if (isset($line['aircraft'])) { |
|
| 1233 | + $data['aircraft_icao'] = $line['aircraft']; |
|
| 1234 | + } |
|
| 1235 | + if (isset($line['transponder'])) { |
|
| 1236 | + $data['squawk'] = $line['transponder']; |
|
| 1237 | + } |
|
| 1238 | + if (isset($line['atis'])) { |
|
| 1239 | + $data['info'] = $line['atis']; |
|
| 1240 | + } else { |
|
| 1241 | + $data['info'] = ''; |
|
| 1242 | + } |
|
| 903 | 1243 | $data['format_source'] = 'pireps'; |
| 904 | 1244 | $data['id_source'] = $id_source; |
| 905 | 1245 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 906 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 907 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1246 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 1247 | + $data['noarchive'] = true; |
|
| 1248 | + } |
|
| 1249 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 1250 | + $data['source_name'] = $value['name']; |
|
| 1251 | + } |
|
| 908 | 1252 | if ($line['icon'] == 'plane') { |
| 909 | 1253 | $SI->add($data); |
| 910 | 1254 | // print_r($data); |
@@ -913,16 +1257,28 @@ discard block |
||
| 913 | 1257 | $data['info'] = str_replace('&sect;','',$data['info']); |
| 914 | 1258 | $typec = substr($data['ident'],-3); |
| 915 | 1259 | $data['type'] = ''; |
| 916 | - if ($typec == 'APP') $data['type'] = 'Approach'; |
|
| 917 | - elseif ($typec == 'TWR') $data['type'] = 'Tower'; |
|
| 918 | - elseif ($typec == 'OBS') $data['type'] = 'Observer'; |
|
| 919 | - elseif ($typec == 'GND') $data['type'] = 'Ground'; |
|
| 920 | - elseif ($typec == 'DEL') $data['type'] = 'Delivery'; |
|
| 921 | - elseif ($typec == 'DEP') $data['type'] = 'Departure'; |
|
| 922 | - elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station'; |
|
| 923 | - elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre'; |
|
| 924 | - else $data['type'] = 'Observer'; |
|
| 925 | - 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']); |
|
| 1260 | + if ($typec == 'APP') { |
|
| 1261 | + $data['type'] = 'Approach'; |
|
| 1262 | + } elseif ($typec == 'TWR') { |
|
| 1263 | + $data['type'] = 'Tower'; |
|
| 1264 | + } elseif ($typec == 'OBS') { |
|
| 1265 | + $data['type'] = 'Observer'; |
|
| 1266 | + } elseif ($typec == 'GND') { |
|
| 1267 | + $data['type'] = 'Ground'; |
|
| 1268 | + } elseif ($typec == 'DEL') { |
|
| 1269 | + $data['type'] = 'Delivery'; |
|
| 1270 | + } elseif ($typec == 'DEP') { |
|
| 1271 | + $data['type'] = 'Departure'; |
|
| 1272 | + } elseif ($typec == 'FSS') { |
|
| 1273 | + $data['type'] = 'Flight Service Station'; |
|
| 1274 | + } elseif ($typec == 'CTR') { |
|
| 1275 | + $data['type'] = 'Control Radar or Centre'; |
|
| 1276 | + } else { |
|
| 1277 | + $data['type'] = 'Observer'; |
|
| 1278 | + } |
|
| 1279 | + if (isset($ATC)) { |
|
| 1280 | + 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']); |
|
| 1281 | + } |
|
| 926 | 1282 | } |
| 927 | 1283 | unset($data); |
| 928 | 1284 | } |
@@ -932,7 +1288,9 @@ discard block |
||
| 932 | 1288 | //} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) { |
| 933 | 1289 | } elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 934 | 1290 | //$buffer = $Common->getData($hosts[$id]); |
| 935 | - if ($globalDebug) echo 'Get Data...'."\n"; |
|
| 1291 | + if ($globalDebug) { |
|
| 1292 | + echo 'Get Data...'."\n"; |
|
| 1293 | + } |
|
| 936 | 1294 | $buffer = $Common->getData($value['host']); |
| 937 | 1295 | $all_data = json_decode($buffer,true); |
| 938 | 1296 | if ($buffer != '' && is_array($all_data)) { |
@@ -940,10 +1298,16 @@ discard block |
||
| 940 | 1298 | foreach ($all_data as $line) { |
| 941 | 1299 | $data = array(); |
| 942 | 1300 | //$data['id'] = $line['id']; // id not usable |
| 943 | - if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum']; |
|
| 1301 | + if (isset($line['pilotid'])) { |
|
| 1302 | + $data['id'] = $line['pilotid'].$line['flightnum']; |
|
| 1303 | + } |
|
| 944 | 1304 | $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex |
| 945 | - if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname']; |
|
| 946 | - if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; |
|
| 1305 | + if (isset($line['pilotname'])) { |
|
| 1306 | + $data['pilot_name'] = $line['pilotname']; |
|
| 1307 | + } |
|
| 1308 | + if (isset($line['pilotid'])) { |
|
| 1309 | + $data['pilot_id'] = $line['pilotid']; |
|
| 1310 | + } |
|
| 947 | 1311 | $data['ident'] = $line['flightnum']; // ident |
| 948 | 1312 | $data['altitude'] = $line['alt']; // altitude |
| 949 | 1313 | $data['speed'] = $line['gs']; // speed |
@@ -961,28 +1325,44 @@ discard block |
||
| 961 | 1325 | $data['arrival_airport_icao'] = $line['arricao']; |
| 962 | 1326 | $data['arrival_airport_time'] = $line['arrtime']; |
| 963 | 1327 | $data['registration'] = $line['aircraft']; |
| 964 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 965 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 1328 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 1329 | + $data['noarchive'] = true; |
|
| 1330 | + } |
|
| 1331 | + if (isset($line['route'])) { |
|
| 1332 | + $data['waypoints'] = $line['route']; |
|
| 1333 | + } |
|
| 1334 | + // route |
|
| 966 | 1335 | if (isset($line['aircraftname'])) { |
| 967 | 1336 | $line['aircraftname'] = strtoupper($line['aircraftname']); |
| 968 | 1337 | $line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']); |
| 969 | 1338 | $aircraft_data = explode('-',$line['aircraftname']); |
| 970 | - if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0]; |
|
| 971 | - elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1]; |
|
| 972 | - else { |
|
| 1339 | + if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) { |
|
| 1340 | + $data['aircraft_icao'] = $aircraft_data[0]; |
|
| 1341 | + } elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) { |
|
| 1342 | + $data['aircraft_icao'] = $aircraft_data[1]; |
|
| 1343 | + } else { |
|
| 973 | 1344 | $aircraft_data = explode(' ',$line['aircraftname']); |
| 974 | - if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]); |
|
| 975 | - else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']); |
|
| 1345 | + if (isset($aircraft_data[1])) { |
|
| 1346 | + $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]); |
|
| 1347 | + } else { |
|
| 1348 | + $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']); |
|
| 1349 | + } |
|
| 976 | 1350 | } |
| 977 | 1351 | } |
| 978 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; |
|
| 1352 | + if (isset($line['route'])) { |
|
| 1353 | + $data['waypoints'] = $line['route']; |
|
| 1354 | + } |
|
| 979 | 1355 | $data['id_source'] = $id_source; |
| 980 | 1356 | $data['format_source'] = 'phpvmacars'; |
| 981 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1357 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 1358 | + $data['source_name'] = $value['name']; |
|
| 1359 | + } |
|
| 982 | 1360 | $SI->add($data); |
| 983 | 1361 | unset($data); |
| 984 | 1362 | } |
| 985 | - if ($globalDebug) echo 'No more data...'."\n"; |
|
| 1363 | + if ($globalDebug) { |
|
| 1364 | + echo 'No more data...'."\n"; |
|
| 1365 | + } |
|
| 986 | 1366 | unset($buffer); |
| 987 | 1367 | unset($all_data); |
| 988 | 1368 | } |
@@ -990,7 +1370,9 @@ discard block |
||
| 990 | 1370 | $last_exec[$id]['last'] = time(); |
| 991 | 1371 | } elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 992 | 1372 | //$buffer = $Common->getData($hosts[$id]); |
| 993 | - if ($globalDebug) echo 'Get Data...'."\n"; |
|
| 1373 | + if ($globalDebug) { |
|
| 1374 | + echo 'Get Data...'."\n"; |
|
| 1375 | + } |
|
| 994 | 1376 | $buffer = $Common->getData($value['host']); |
| 995 | 1377 | $all_data = json_decode($buffer,true); |
| 996 | 1378 | if ($buffer != '' && is_array($all_data)) { |
@@ -1019,16 +1401,25 @@ discard block |
||
| 1019 | 1401 | $data['arrival_airport_icao'] = $line['arrival']; |
| 1020 | 1402 | //$data['arrival_airport_time'] = $line['arrival_time']; |
| 1021 | 1403 | //$data['registration'] = $line['aircraft']; |
| 1022 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 1404 | + if (isset($line['route'])) { |
|
| 1405 | + $data['waypoints'] = $line['route']; |
|
| 1406 | + } |
|
| 1407 | + // route |
|
| 1023 | 1408 | $data['aircraft_icao'] = $line['plane_type']; |
| 1024 | 1409 | $data['id_source'] = $id_source; |
| 1025 | 1410 | $data['format_source'] = 'vam'; |
| 1026 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1027 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1411 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 1412 | + $data['noarchive'] = true; |
|
| 1413 | + } |
|
| 1414 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 1415 | + $data['source_name'] = $value['name']; |
|
| 1416 | + } |
|
| 1028 | 1417 | $SI->add($data); |
| 1029 | 1418 | unset($data); |
| 1030 | 1419 | } |
| 1031 | - if ($globalDebug) echo 'No more data...'."\n"; |
|
| 1420 | + if ($globalDebug) { |
|
| 1421 | + echo 'No more data...'."\n"; |
|
| 1422 | + } |
|
| 1032 | 1423 | unset($buffer); |
| 1033 | 1424 | unset($all_data); |
| 1034 | 1425 | } |
@@ -1036,7 +1427,9 @@ discard block |
||
| 1036 | 1427 | $last_exec[$id]['last'] = time(); |
| 1037 | 1428 | //} elseif ($value == 'sbs' || $value == 'tsv' || $value == 'raw' || $value == 'aprs' || $value == 'beast') { |
| 1038 | 1429 | } elseif ($value['format'] == 'sbs' || $value['format'] == 'tsv' || $value['format'] == 'raw' || $value['format'] == 'aprs' || $value['format'] == 'beast' || $value['format'] == 'flightgearmp' || $value['format'] == 'flightgearsp' || $value['format'] == 'acars' || $value['format'] == 'acarssbs3' || $value['format'] == 'ais' || $value['format'] == 'vrstcp') { |
| 1039 | - if (function_exists('pcntl_fork')) pcntl_signal_dispatch(); |
|
| 1430 | + if (function_exists('pcntl_fork')) { |
|
| 1431 | + pcntl_signal_dispatch(); |
|
| 1432 | + } |
|
| 1040 | 1433 | //$last_exec[$id]['last'] = time(); |
| 1041 | 1434 | |
| 1042 | 1435 | //$read = array( $sockets[$id] ); |
@@ -1044,7 +1437,9 @@ discard block |
||
| 1044 | 1437 | $write = NULL; |
| 1045 | 1438 | $e = NULL; |
| 1046 | 1439 | $n = socket_select($read, $write, $e, $timeout); |
| 1047 | - if ($e != NULL) var_dump($e); |
|
| 1440 | + if ($e != NULL) { |
|
| 1441 | + var_dump($e); |
|
| 1442 | + } |
|
| 1048 | 1443 | if ($n > 0) { |
| 1049 | 1444 | $reset = 0; |
| 1050 | 1445 | foreach ($read as $nb => $r) { |
@@ -1065,12 +1460,16 @@ discard block |
||
| 1065 | 1460 | //$SI::del(); |
| 1066 | 1461 | if ($format == 'vrstcp') { |
| 1067 | 1462 | $buffer = explode('},{',$buffer); |
| 1068 | - } else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer)); |
|
| 1463 | + } else { |
|
| 1464 | + $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer)); |
|
| 1465 | + } |
|
| 1069 | 1466 | // SBS format is CSV format |
| 1070 | 1467 | if ($buffer !== FALSE && $buffer != '') { |
| 1071 | 1468 | $tt[$format] = 0; |
| 1072 | 1469 | if ($format == 'acarssbs3') { |
| 1073 | - if ($globalDebug) echo 'ACARS : '.$buffer."\n"; |
|
| 1470 | + if ($globalDebug) { |
|
| 1471 | + echo 'ACARS : '.$buffer."\n"; |
|
| 1472 | + } |
|
| 1074 | 1473 | $ACARS->add(trim($buffer)); |
| 1075 | 1474 | $ACARS->deleteLiveAcarsData(); |
| 1076 | 1475 | } elseif ($format == 'raw') { |
@@ -1079,27 +1478,61 @@ discard block |
||
| 1079 | 1478 | if (is_array($data)) { |
| 1080 | 1479 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 1081 | 1480 | $data['format_source'] = 'raw'; |
| 1082 | - if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
|
| 1083 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1084 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1085 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
|
| 1481 | + if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') { |
|
| 1482 | + $data['source_name'] = $globalSources[$nb]['name']; |
|
| 1483 | + } |
|
| 1484 | + if (isset($globalSources[$nb]['sourcestats'])) { |
|
| 1485 | + $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1486 | + } |
|
| 1487 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) { |
|
| 1488 | + $data['noarchive'] = true; |
|
| 1489 | + } |
|
| 1490 | + if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) { |
|
| 1491 | + $SI->add($data); |
|
| 1492 | + } |
|
| 1086 | 1493 | } |
| 1087 | 1494 | } elseif ($format == 'ais') { |
| 1088 | 1495 | $ais_data = $AIS->parse_line(trim($buffer)); |
| 1089 | 1496 | $data = array(); |
| 1090 | - if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident']; |
|
| 1091 | - if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi']; |
|
| 1092 | - if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed']; |
|
| 1093 | - if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading']; |
|
| 1094 | - if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude']; |
|
| 1095 | - if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude']; |
|
| 1096 | - if (isset($ais_data['status'])) $data['status'] = $ais_data['status']; |
|
| 1097 | - if (isset($ais_data['type'])) $data['type'] = $ais_data['type']; |
|
| 1098 | - if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
|
| 1099 | - if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
|
| 1100 | - if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination']; |
|
| 1101 | - if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); |
|
| 1102 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1497 | + if (isset($ais_data['ident'])) { |
|
| 1498 | + $data['ident'] = $ais_data['ident']; |
|
| 1499 | + } |
|
| 1500 | + if (isset($ais_data['mmsi'])) { |
|
| 1501 | + $data['mmsi'] = $ais_data['mmsi']; |
|
| 1502 | + } |
|
| 1503 | + if (isset($ais_data['speed'])) { |
|
| 1504 | + $data['speed'] = $ais_data['speed']; |
|
| 1505 | + } |
|
| 1506 | + if (isset($ais_data['heading'])) { |
|
| 1507 | + $data['heading'] = $ais_data['heading']; |
|
| 1508 | + } |
|
| 1509 | + if (isset($ais_data['latitude'])) { |
|
| 1510 | + $data['latitude'] = $ais_data['latitude']; |
|
| 1511 | + } |
|
| 1512 | + if (isset($ais_data['longitude'])) { |
|
| 1513 | + $data['longitude'] = $ais_data['longitude']; |
|
| 1514 | + } |
|
| 1515 | + if (isset($ais_data['status'])) { |
|
| 1516 | + $data['status'] = $ais_data['status']; |
|
| 1517 | + } |
|
| 1518 | + if (isset($ais_data['type'])) { |
|
| 1519 | + $data['type'] = $ais_data['type']; |
|
| 1520 | + } |
|
| 1521 | + if (isset($ais_data['imo'])) { |
|
| 1522 | + $data['imo'] = $ais_data['imo']; |
|
| 1523 | + } |
|
| 1524 | + if (isset($ais_data['callsign'])) { |
|
| 1525 | + $data['callsign'] = $ais_data['callsign']; |
|
| 1526 | + } |
|
| 1527 | + if (isset($ais_data['destination'])) { |
|
| 1528 | + $data['arrival_code'] = $ais_data['destination']; |
|
| 1529 | + } |
|
| 1530 | + if (isset($ais_data['eta_ts'])) { |
|
| 1531 | + $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); |
|
| 1532 | + } |
|
| 1533 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) { |
|
| 1534 | + $data['noarchive'] = true; |
|
| 1535 | + } |
|
| 1103 | 1536 | |
| 1104 | 1537 | if (isset($ais_data['timestamp'])) { |
| 1105 | 1538 | $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
@@ -1108,7 +1541,9 @@ discard block |
||
| 1108 | 1541 | } |
| 1109 | 1542 | $data['format_source'] = 'aisnmea'; |
| 1110 | 1543 | $data['id_source'] = $id_source; |
| 1111 | - if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data); |
|
| 1544 | + if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') { |
|
| 1545 | + $MI->add($data); |
|
| 1546 | + } |
|
| 1112 | 1547 | unset($data); |
| 1113 | 1548 | } elseif ($format == 'flightgearsp') { |
| 1114 | 1549 | //echo $buffer."\n"; |
@@ -1126,12 +1561,18 @@ discard block |
||
| 1126 | 1561 | $data['speed'] = round($line[5]*1.94384); |
| 1127 | 1562 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 1128 | 1563 | $data['format_source'] = 'flightgearsp'; |
| 1129 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1130 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
|
| 1564 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) { |
|
| 1565 | + $data['noarchive'] = true; |
|
| 1566 | + } |
|
| 1567 | + if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) { |
|
| 1568 | + $SI->add($data); |
|
| 1569 | + } |
|
| 1131 | 1570 | $send = @ socket_send( $r , $data_aprs , strlen($data_aprs) , 0 ); |
| 1132 | 1571 | } |
| 1133 | 1572 | } elseif ($format == 'acars') { |
| 1134 | - if ($globalDebug) echo 'ACARS : '.$buffer."\n"; |
|
| 1573 | + if ($globalDebug) { |
|
| 1574 | + echo 'ACARS : '.$buffer."\n"; |
|
| 1575 | + } |
|
| 1135 | 1576 | $ACARS->add(trim($buffer)); |
| 1136 | 1577 | socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port); |
| 1137 | 1578 | $ACARS->deleteLiveAcarsData(); |
@@ -1152,8 +1593,12 @@ discard block |
||
| 1152 | 1593 | $aircraft_type = $line[10]; |
| 1153 | 1594 | $aircraft_type = preg_split(':/:',$aircraft_type); |
| 1154 | 1595 | $data['aircraft_name'] = substr(end($aircraft_type),0,-4); |
| 1155 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1156 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
|
| 1596 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) { |
|
| 1597 | + $data['noarchive'] = true; |
|
| 1598 | + } |
|
| 1599 | + if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) { |
|
| 1600 | + $SI->add($data); |
|
| 1601 | + } |
|
| 1157 | 1602 | } |
| 1158 | 1603 | } |
| 1159 | 1604 | } elseif ($format == 'beast') { |
@@ -1163,28 +1608,62 @@ discard block |
||
| 1163 | 1608 | foreach($buffer as $all_data) { |
| 1164 | 1609 | $line = json_decode('{'.$all_data.'}',true); |
| 1165 | 1610 | $data = array(); |
| 1166 | - if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex |
|
| 1167 | - if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident |
|
| 1168 | - if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude |
|
| 1169 | - if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed |
|
| 1170 | - if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading |
|
| 1171 | - if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat |
|
| 1172 | - if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long |
|
| 1611 | + if (isset($line['Icao'])) { |
|
| 1612 | + $data['hex'] = $line['Icao']; |
|
| 1613 | + } |
|
| 1614 | + // hex |
|
| 1615 | + if (isset($line['Call'])) { |
|
| 1616 | + $data['ident'] = $line['Call']; |
|
| 1617 | + } |
|
| 1618 | + // ident |
|
| 1619 | + if (isset($line['Alt'])) { |
|
| 1620 | + $data['altitude'] = $line['Alt']; |
|
| 1621 | + } |
|
| 1622 | + // altitude |
|
| 1623 | + if (isset($line['Spd'])) { |
|
| 1624 | + $data['speed'] = $line['Spd']; |
|
| 1625 | + } |
|
| 1626 | + // speed |
|
| 1627 | + if (isset($line['Trak'])) { |
|
| 1628 | + $data['heading'] = $line['Trak']; |
|
| 1629 | + } |
|
| 1630 | + // heading |
|
| 1631 | + if (isset($line['Lat'])) { |
|
| 1632 | + $data['latitude'] = $line['Lat']; |
|
| 1633 | + } |
|
| 1634 | + // lat |
|
| 1635 | + if (isset($line['Long'])) { |
|
| 1636 | + $data['longitude'] = $line['Long']; |
|
| 1637 | + } |
|
| 1638 | + // long |
|
| 1173 | 1639 | //$data['verticalrate'] = $line['']; // verticale rate |
| 1174 | - if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk |
|
| 1640 | + if (isset($line['Sqk'])) { |
|
| 1641 | + $data['squawk'] = $line['Sqk']; |
|
| 1642 | + } |
|
| 1643 | + // squawk |
|
| 1175 | 1644 | $data['emergency'] = ''; // emergency |
| 1176 | - if (isset($line['Reg'])) $data['registration'] = $line['Reg']; |
|
| 1645 | + if (isset($line['Reg'])) { |
|
| 1646 | + $data['registration'] = $line['Reg']; |
|
| 1647 | + } |
|
| 1177 | 1648 | /* |
| 1178 | 1649 | if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',$line['PosTime']/1000); |
| 1179 | 1650 | else $data['datetime'] = date('Y-m-d H:i:s'); |
| 1180 | 1651 | */ |
| 1181 | 1652 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 1182 | - if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type']; |
|
| 1653 | + if (isset($line['Type'])) { |
|
| 1654 | + $data['aircraft_icao'] = $line['Type']; |
|
| 1655 | + } |
|
| 1183 | 1656 | $data['format_source'] = 'vrstcp'; |
| 1184 | 1657 | $data['id_source'] = $id_source; |
| 1185 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1186 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1187 | - if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data); |
|
| 1658 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) { |
|
| 1659 | + $data['noarchive'] = true; |
|
| 1660 | + } |
|
| 1661 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 1662 | + $data['source_name'] = $value['name']; |
|
| 1663 | + } |
|
| 1664 | + if (isset($data['latitude']) && isset($data['hex'])) { |
|
| 1665 | + $SI->add($data); |
|
| 1666 | + } |
|
| 1188 | 1667 | unset($data); |
| 1189 | 1668 | } |
| 1190 | 1669 | } elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') { |
@@ -1197,22 +1676,46 @@ discard block |
||
| 1197 | 1676 | $data['hex'] = $lined['hexid']; |
| 1198 | 1677 | //$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));; |
| 1199 | 1678 | $data['datetime'] = date('Y-m-d H:i:s');; |
| 1200 | - if (isset($lined['ident'])) $data['ident'] = $lined['ident']; |
|
| 1201 | - if (isset($lined['lat'])) $data['latitude'] = $lined['lat']; |
|
| 1202 | - if (isset($lined['lon'])) $data['longitude'] = $lined['lon']; |
|
| 1203 | - if (isset($lined['speed'])) $data['speed'] = $lined['speed']; |
|
| 1204 | - if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk']; |
|
| 1205 | - if (isset($lined['alt'])) $data['altitude'] = $lined['alt']; |
|
| 1206 | - if (isset($lined['heading'])) $data['heading'] = $lined['heading']; |
|
| 1679 | + if (isset($lined['ident'])) { |
|
| 1680 | + $data['ident'] = $lined['ident']; |
|
| 1681 | + } |
|
| 1682 | + if (isset($lined['lat'])) { |
|
| 1683 | + $data['latitude'] = $lined['lat']; |
|
| 1684 | + } |
|
| 1685 | + if (isset($lined['lon'])) { |
|
| 1686 | + $data['longitude'] = $lined['lon']; |
|
| 1687 | + } |
|
| 1688 | + if (isset($lined['speed'])) { |
|
| 1689 | + $data['speed'] = $lined['speed']; |
|
| 1690 | + } |
|
| 1691 | + if (isset($lined['squawk'])) { |
|
| 1692 | + $data['squawk'] = $lined['squawk']; |
|
| 1693 | + } |
|
| 1694 | + if (isset($lined['alt'])) { |
|
| 1695 | + $data['altitude'] = $lined['alt']; |
|
| 1696 | + } |
|
| 1697 | + if (isset($lined['heading'])) { |
|
| 1698 | + $data['heading'] = $lined['heading']; |
|
| 1699 | + } |
|
| 1207 | 1700 | $data['id_source'] = $id_source; |
| 1208 | 1701 | $data['format_source'] = 'tsv'; |
| 1209 | - if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
|
| 1210 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1211 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1212 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
|
| 1702 | + if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') { |
|
| 1703 | + $data['source_name'] = $globalSources[$nb]['name']; |
|
| 1704 | + } |
|
| 1705 | + if (isset($globalSources[$nb]['sourcestats'])) { |
|
| 1706 | + $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1707 | + } |
|
| 1708 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) { |
|
| 1709 | + $data['noarchive'] = true; |
|
| 1710 | + } |
|
| 1711 | + if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) { |
|
| 1712 | + $SI->add($data); |
|
| 1713 | + } |
|
| 1213 | 1714 | unset($lined); |
| 1214 | 1715 | unset($data); |
| 1215 | - } else $error = true; |
|
| 1716 | + } else { |
|
| 1717 | + $error = true; |
|
| 1718 | + } |
|
| 1216 | 1719 | } elseif ($format == 'aprs' && $use_aprs) { |
| 1217 | 1720 | if ($aprs_connect == 0) { |
| 1218 | 1721 | $send = @ socket_send( $r , $aprs_login , strlen($aprs_login) , 0 ); |
@@ -1237,32 +1740,66 @@ discard block |
||
| 1237 | 1740 | $aprs_last_tx = time(); |
| 1238 | 1741 | $data = array(); |
| 1239 | 1742 | //print_r($line); |
| 1240 | - if (isset($line['address'])) $data['hex'] = $line['address']; |
|
| 1241 | - if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi']; |
|
| 1242 | - if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']); |
|
| 1243 | - else $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1743 | + if (isset($line['address'])) { |
|
| 1744 | + $data['hex'] = $line['address']; |
|
| 1745 | + } |
|
| 1746 | + if (isset($line['mmsi'])) { |
|
| 1747 | + $data['mmsi'] = $line['mmsi']; |
|
| 1748 | + } |
|
| 1749 | + if (isset($line['timestamp'])) { |
|
| 1750 | + $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']); |
|
| 1751 | + } else { |
|
| 1752 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1753 | + } |
|
| 1244 | 1754 | //$data['datetime'] = date('Y-m-d H:i:s'); |
| 1245 | - if (isset($line['ident'])) $data['ident'] = $line['ident']; |
|
| 1755 | + if (isset($line['ident'])) { |
|
| 1756 | + $data['ident'] = $line['ident']; |
|
| 1757 | + } |
|
| 1246 | 1758 | $data['latitude'] = $line['latitude']; |
| 1247 | 1759 | $data['longitude'] = $line['longitude']; |
| 1248 | 1760 | //$data['verticalrate'] = $line[16]; |
| 1249 | - if (isset($line['speed'])) $data['speed'] = $line['speed']; |
|
| 1250 | - else $data['speed'] = 0; |
|
| 1251 | - if (isset($line['altitude'])) $data['altitude'] = $line['altitude']; |
|
| 1252 | - if (isset($line['comment'])) $data['comment'] = $line['comment']; |
|
| 1253 | - if (isset($line['symbol'])) $data['type'] = $line['symbol']; |
|
| 1254 | - if (isset($line['heading'])) $data['heading'] = $line['heading']; |
|
| 1761 | + if (isset($line['speed'])) { |
|
| 1762 | + $data['speed'] = $line['speed']; |
|
| 1763 | + } else { |
|
| 1764 | + $data['speed'] = 0; |
|
| 1765 | + } |
|
| 1766 | + if (isset($line['altitude'])) { |
|
| 1767 | + $data['altitude'] = $line['altitude']; |
|
| 1768 | + } |
|
| 1769 | + if (isset($line['comment'])) { |
|
| 1770 | + $data['comment'] = $line['comment']; |
|
| 1771 | + } |
|
| 1772 | + if (isset($line['symbol'])) { |
|
| 1773 | + $data['type'] = $line['symbol']; |
|
| 1774 | + } |
|
| 1775 | + if (isset($line['heading'])) { |
|
| 1776 | + $data['heading'] = $line['heading']; |
|
| 1777 | + } |
|
| 1255 | 1778 | //else $data['heading'] = 0; |
| 1256 | - if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth']; |
|
| 1257 | - if (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE)) $data['noarchive'] = true; |
|
| 1258 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1779 | + if (isset($line['stealth'])) { |
|
| 1780 | + $data['aircraft_type'] = $line['stealth']; |
|
| 1781 | + } |
|
| 1782 | + if (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE)) { |
|
| 1783 | + $data['noarchive'] = true; |
|
| 1784 | + } |
|
| 1785 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) { |
|
| 1786 | + $data['noarchive'] = true; |
|
| 1787 | + } |
|
| 1259 | 1788 | $data['id_source'] = $id_source; |
| 1260 | - if (isset($line['format_source'])) $data['format_source'] = $line['format_source']; |
|
| 1261 | - else $data['format_source'] = 'aprs'; |
|
| 1789 | + if (isset($line['format_source'])) { |
|
| 1790 | + $data['format_source'] = $line['format_source']; |
|
| 1791 | + } else { |
|
| 1792 | + $data['format_source'] = 'aprs'; |
|
| 1793 | + } |
|
| 1262 | 1794 | $data['source_name'] = $line['source']; |
| 1263 | - if (isset($line['source_type'])) $data['source_type'] = $line['source_type']; |
|
| 1264 | - else $data['source_type'] = 'flarm'; |
|
| 1265 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1795 | + if (isset($line['source_type'])) { |
|
| 1796 | + $data['source_type'] = $line['source_type']; |
|
| 1797 | + } else { |
|
| 1798 | + $data['source_type'] = 'flarm'; |
|
| 1799 | + } |
|
| 1800 | + if (isset($globalSources[$nb]['sourcestats'])) { |
|
| 1801 | + $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1802 | + } |
|
| 1266 | 1803 | $currentdate = date('Y-m-d H:i:s'); |
| 1267 | 1804 | $aprsdate = strtotime($data['datetime']); |
| 1268 | 1805 | // Accept data if time <= system time + 20s |
@@ -1272,19 +1809,22 @@ discard block |
||
| 1272 | 1809 | echo 'add...'."\n"; |
| 1273 | 1810 | $send = $MI->add($data); |
| 1274 | 1811 | } elseif (isset($line['stealth'])) { |
| 1275 | - if ($line['stealth'] != 0) echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n"; |
|
| 1276 | - else echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n"; |
|
| 1812 | + if ($line['stealth'] != 0) { |
|
| 1813 | + echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n"; |
|
| 1814 | + } else { |
|
| 1815 | + echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n"; |
|
| 1816 | + } |
|
| 1277 | 1817 | //} elseif (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' || $line['symbol'] == 'Police' || $line['symbol'] == 'Bike' || $line['symbol'] == 'Jogger' || $line['symbol'] == 'Bus' || $line['symbol'] == 'Jeep' || $line['symbol'] == 'Recreational Vehicle' || $line['symbol'] == 'Yacht (Sail)' || $line['symbol'] == 'Ship (Power Boat)' || $line['symbol'] == 'Firetruck' || $line['symbol'] == 'Balloon' || $line['symbol'] == 'Aircraft (small)' || $line['symbol'] == 'Helicopter')) { |
| 1278 | 1818 | } 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') { |
| 1279 | 1819 | //echo '!!!!!!!!!!!!!!!! SEND !!!!!!!!!!!!!!!!!!!!'."\n"; |
| 1280 | - if (isset($globalTracker) && $globalTracker) $send = $TI->add($data); |
|
| 1820 | + if (isset($globalTracker) && $globalTracker) { |
|
| 1821 | + $send = $TI->add($data); |
|
| 1822 | + } |
|
| 1281 | 1823 | } |
| 1282 | 1824 | unset($data); |
| 1283 | - } |
|
| 1284 | - elseif (is_array($line) && $globalDebug && isset($line['symbol']) && $line['symbol'] == 'Weather Station') { |
|
| 1825 | + } elseif (is_array($line) && $globalDebug && isset($line['symbol']) && $line['symbol'] == 'Weather Station') { |
|
| 1285 | 1826 | echo '!! Weather Station not yet supported'."\n"; |
| 1286 | - } |
|
| 1287 | - 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')) { |
|
| 1827 | + } 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')) { |
|
| 1288 | 1828 | echo '!! Car & Trucks not yet supported'."\n"; |
| 1289 | 1829 | } |
| 1290 | 1830 | //elseif ($line == false && $globalDebug) echo 'Ignored ('.$buffer.")\n"; |
@@ -1317,26 +1857,45 @@ discard block |
||
| 1317 | 1857 | $data['ground'] = $line[21]; |
| 1318 | 1858 | $data['emergency'] = $line[19]; |
| 1319 | 1859 | $data['format_source'] = 'sbs'; |
| 1320 | - if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
|
| 1321 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1322 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1860 | + if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') { |
|
| 1861 | + $data['source_name'] = $globalSources[$nb]['name']; |
|
| 1862 | + } |
|
| 1863 | + if (isset($globalSources[$nb]['sourcestats'])) { |
|
| 1864 | + $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1865 | + } |
|
| 1866 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) { |
|
| 1867 | + $data['noarchive'] = true; |
|
| 1868 | + } |
|
| 1323 | 1869 | $data['id_source'] = $id_source; |
| 1324 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data); |
|
| 1325 | - else $error = true; |
|
| 1870 | + if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) { |
|
| 1871 | + $send = $SI->add($data); |
|
| 1872 | + } else { |
|
| 1873 | + $error = true; |
|
| 1874 | + } |
|
| 1326 | 1875 | unset($data); |
| 1327 | - } else $error = true; |
|
| 1876 | + } else { |
|
| 1877 | + $error = true; |
|
| 1878 | + } |
|
| 1328 | 1879 | if ($error) { |
| 1329 | 1880 | if (count($line) > 1 && ($line[0] == 'STA' || $line[0] == 'AIR' || $line[0] == 'SEL' || $line[0] == 'ID' || $line[0] == 'CLK')) { |
| 1330 | - if ($globalDebug) echo "Not a message. Ignoring... \n"; |
|
| 1881 | + if ($globalDebug) { |
|
| 1882 | + echo "Not a message. Ignoring... \n"; |
|
| 1883 | + } |
|
| 1331 | 1884 | } else { |
| 1332 | - if ($globalDebug) echo "Wrong line format. Ignoring... \n"; |
|
| 1885 | + if ($globalDebug) { |
|
| 1886 | + echo "Wrong line format. Ignoring... \n"; |
|
| 1887 | + } |
|
| 1333 | 1888 | if ($globalDebug) { |
| 1334 | 1889 | echo $buffer; |
| 1335 | 1890 | //print_r($line); |
| 1336 | 1891 | } |
| 1337 | 1892 | //socket_close($r); |
| 1338 | - if ($globalDebug) echo "Reconnect after an error...\n"; |
|
| 1339 | - if ($format == 'aprs') $aprs_connect = 0; |
|
| 1893 | + if ($globalDebug) { |
|
| 1894 | + echo "Reconnect after an error...\n"; |
|
| 1895 | + } |
|
| 1896 | + if ($format == 'aprs') { |
|
| 1897 | + $aprs_connect = 0; |
|
| 1898 | + } |
|
| 1340 | 1899 | $sourceer[$nb] = $globalSources[$nb]; |
| 1341 | 1900 | connect_all($sourceer); |
| 1342 | 1901 | $sourceer = array(); |
@@ -1344,10 +1903,14 @@ discard block |
||
| 1344 | 1903 | } |
| 1345 | 1904 | } |
| 1346 | 1905 | // Sleep for xxx microseconds |
| 1347 | - if (isset($globalSBSSleep)) usleep($globalSBSSleep); |
|
| 1906 | + if (isset($globalSBSSleep)) { |
|
| 1907 | + usleep($globalSBSSleep); |
|
| 1908 | + } |
|
| 1348 | 1909 | } else { |
| 1349 | 1910 | if ($format == 'flightgearmp') { |
| 1350 | - if ($globalDebug) echo "Reconnect FlightGear MP..."; |
|
| 1911 | + if ($globalDebug) { |
|
| 1912 | + echo "Reconnect FlightGear MP..."; |
|
| 1913 | + } |
|
| 1351 | 1914 | //@socket_close($r); |
| 1352 | 1915 | sleep($globalMinFetch); |
| 1353 | 1916 | $sourcefg[$nb] = $globalSources[$nb]; |
@@ -1356,10 +1919,15 @@ discard block |
||
| 1356 | 1919 | break; |
| 1357 | 1920 | |
| 1358 | 1921 | } elseif ($format != 'acars' && $format != 'flightgearsp') { |
| 1359 | - if (isset($tt[$format])) $tt[$format]++; |
|
| 1360 | - else $tt[$format] = 0; |
|
| 1922 | + if (isset($tt[$format])) { |
|
| 1923 | + $tt[$format]++; |
|
| 1924 | + } else { |
|
| 1925 | + $tt[$format] = 0; |
|
| 1926 | + } |
|
| 1361 | 1927 | if ($tt[$format] > 30) { |
| 1362 | - if ($globalDebug) echo "ERROR : Reconnect ".$format."..."; |
|
| 1928 | + if ($globalDebug) { |
|
| 1929 | + echo "ERROR : Reconnect ".$format."..."; |
|
| 1930 | + } |
|
| 1363 | 1931 | //@socket_close($r); |
| 1364 | 1932 | sleep(2); |
| 1365 | 1933 | $aprs_connect = 0; |
@@ -1376,11 +1944,17 @@ discard block |
||
| 1376 | 1944 | } else { |
| 1377 | 1945 | $error = socket_strerror(socket_last_error()); |
| 1378 | 1946 | if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) { |
| 1379 | - if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n"; |
|
| 1380 | - if (isset($globalDebug)) echo "Restarting...\n"; |
|
| 1947 | + if ($globalDebug) { |
|
| 1948 | + echo "ERROR : socket_select give this error ".$error . "\n"; |
|
| 1949 | + } |
|
| 1950 | + if (isset($globalDebug)) { |
|
| 1951 | + echo "Restarting...\n"; |
|
| 1952 | + } |
|
| 1381 | 1953 | // Restart the script if possible |
| 1382 | 1954 | if (is_array($sockets)) { |
| 1383 | - if ($globalDebug) echo "Shutdown all sockets..."; |
|
| 1955 | + if ($globalDebug) { |
|
| 1956 | + echo "Shutdown all sockets..."; |
|
| 1957 | + } |
|
| 1384 | 1958 | |
| 1385 | 1959 | foreach ($sockets as $sock) { |
| 1386 | 1960 | @socket_shutdown($sock,2); |
@@ -1388,21 +1962,33 @@ discard block |
||
| 1388 | 1962 | } |
| 1389 | 1963 | |
| 1390 | 1964 | } |
| 1391 | - if ($globalDebug) echo "Restart all connections..."; |
|
| 1965 | + if ($globalDebug) { |
|
| 1966 | + echo "Restart all connections..."; |
|
| 1967 | + } |
|
| 1392 | 1968 | sleep(2); |
| 1393 | 1969 | $time = time(); |
| 1394 | 1970 | //connect_all($hosts); |
| 1395 | 1971 | $aprs_connect = 0; |
| 1396 | - if ($reset%5 == 0) sleep(20); |
|
| 1397 | - if ($reset%10 == 0) sleep(100); |
|
| 1398 | - if ($reset%20 == 0) sleep(200); |
|
| 1399 | - if ($reset > 100) exit('Too many attempts...'); |
|
| 1972 | + if ($reset%5 == 0) { |
|
| 1973 | + sleep(20); |
|
| 1974 | + } |
|
| 1975 | + if ($reset%10 == 0) { |
|
| 1976 | + sleep(100); |
|
| 1977 | + } |
|
| 1978 | + if ($reset%20 == 0) { |
|
| 1979 | + sleep(200); |
|
| 1980 | + } |
|
| 1981 | + if ($reset > 100) { |
|
| 1982 | + exit('Too many attempts...'); |
|
| 1983 | + } |
|
| 1400 | 1984 | connect_all($globalSources); |
| 1401 | 1985 | } |
| 1402 | 1986 | } |
| 1403 | 1987 | } |
| 1404 | 1988 | if ($globalDaemon === false) { |
| 1405 | - if ($globalDebug) echo 'Check all...'."\n"; |
|
| 1989 | + if ($globalDebug) { |
|
| 1990 | + echo 'Check all...'."\n"; |
|
| 1991 | + } |
|
| 1406 | 1992 | $SI->checkAll(); |
| 1407 | 1993 | } |
| 1408 | 1994 | } |
@@ -254,6 +254,7 @@ discard block |
||
| 254 | 254 | * |
| 255 | 255 | * @param String $aircraft_registration the registration of the aircraft |
| 256 | 256 | * @param String $aircraft_name type of the aircraft |
| 257 | + * @param string $type |
|
| 257 | 258 | * @return Array the aircraft thumbnail, orignal url and copyright |
| 258 | 259 | * |
| 259 | 260 | */ |
@@ -287,6 +288,7 @@ discard block |
||
| 287 | 288 | * |
| 288 | 289 | * @param String $registration the registration of the aircraft |
| 289 | 290 | * @param String $name type of the aircraft |
| 291 | + * @param string $type |
|
| 290 | 292 | * @return Array the aircraft thumbnail, orignal url and copyright |
| 291 | 293 | * |
| 292 | 294 | */ |
@@ -325,6 +327,7 @@ discard block |
||
| 325 | 327 | * |
| 326 | 328 | * @param String $aircraft_registration the registration of the aircraft |
| 327 | 329 | * @param String $aircraft_name type of the aircraft |
| 330 | + * @param string $type |
|
| 328 | 331 | * @return Array the aircraft thumbnail, orignal url and copyright |
| 329 | 332 | * |
| 330 | 333 | */ |
@@ -367,6 +370,7 @@ discard block |
||
| 367 | 370 | * |
| 368 | 371 | * @param String $aircraft_registration the registration of the aircraft |
| 369 | 372 | * @param String $aircraft_name type of the aircraft |
| 373 | + * @param string $type |
|
| 370 | 374 | * @return Array the aircraft thumbnail, orignal url and copyright |
| 371 | 375 | * |
| 372 | 376 | */ |
@@ -401,6 +405,7 @@ discard block |
||
| 401 | 405 | * |
| 402 | 406 | * @param String $registration the registration of the aircraft |
| 403 | 407 | * @param String $name type of the aircraft |
| 408 | + * @param string $type |
|
| 404 | 409 | * @return Array the aircraft thumbnail, orignal url and copyright |
| 405 | 410 | * |
| 406 | 411 | */ |
@@ -429,6 +434,10 @@ discard block |
||
| 429 | 434 | return false; |
| 430 | 435 | } |
| 431 | 436 | |
| 437 | + /** |
|
| 438 | + * @param string $type |
|
| 439 | + * @param string $aircraft_icao |
|
| 440 | + */ |
|
| 432 | 441 | public function fromIvaoMtl($type,$aircraft_icao,$airline_icao) { |
| 433 | 442 | $Common = new Common(); |
| 434 | 443 | //echo "\n".'SEARCH IMAGE : http://mtlcatalog.ivao.aero/images/aircraft/'.$aircraft_icao.$airline_icao.'.jpg'; |
@@ -450,6 +459,7 @@ discard block |
||
| 450 | 459 | * |
| 451 | 460 | * @param String $aircraft_registration the registration of the aircraft |
| 452 | 461 | * @param String $aircraft_name type of the aircraft |
| 462 | + * @param string $type |
|
| 453 | 463 | * @return Array the aircraft thumbnail, orignal url and copyright |
| 454 | 464 | * |
| 455 | 465 | */ |
@@ -482,6 +492,7 @@ discard block |
||
| 482 | 492 | * |
| 483 | 493 | * @param String $aircraft_registration the registration of the aircraft |
| 484 | 494 | * @param String $aircraft_name type of the aircraft |
| 495 | + * @param string $type |
|
| 485 | 496 | * @return Array the aircraft thumbnail, orignal url and copyright |
| 486 | 497 | * |
| 487 | 498 | */ |
@@ -507,6 +518,7 @@ discard block |
||
| 507 | 518 | * |
| 508 | 519 | * @param String $registration the registration of the aircraft/mmsi |
| 509 | 520 | * @param String $name name |
| 521 | + * @param string $type |
|
| 510 | 522 | * @return Array the aircraft thumbnail, orignal url and copyright |
| 511 | 523 | * |
| 512 | 524 | */ |
@@ -568,6 +580,7 @@ discard block |
||
| 568 | 580 | * |
| 569 | 581 | * @param String $registration the registration of the aircraft |
| 570 | 582 | * @param String $name type of the aircraft |
| 583 | + * @param string $type |
|
| 571 | 584 | * @return Array the aircraft thumbnail, orignal url and copyright |
| 572 | 585 | * |
| 573 | 586 | */ |
@@ -12,11 +12,11 @@ discard block |
||
| 12 | 12 | } |
| 13 | 13 | |
| 14 | 14 | /** |
| 15 | - * Gets the images based on the aircraft registration |
|
| 16 | - * |
|
| 17 | - * @return Array the images list |
|
| 18 | - * |
|
| 19 | - */ |
|
| 15 | + * Gets the images based on the aircraft registration |
|
| 16 | + * |
|
| 17 | + * @return Array the images list |
|
| 18 | + * |
|
| 19 | + */ |
|
| 20 | 20 | public function getSpotterImage($registration,$aircraft_icao = '', $airline_icao = '') |
| 21 | 21 | { |
| 22 | 22 | $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
@@ -37,11 +37,11 @@ discard block |
||
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | /** |
| 40 | - * Gets the images based on the ship name |
|
| 41 | - * |
|
| 42 | - * @return Array the images list |
|
| 43 | - * |
|
| 44 | - */ |
|
| 40 | + * Gets the images based on the ship name |
|
| 41 | + * |
|
| 42 | + * @return Array the images list |
|
| 43 | + * |
|
| 44 | + */ |
|
| 45 | 45 | public function getMarineImage($mmsi,$imo = '',$name = '') |
| 46 | 46 | { |
| 47 | 47 | $mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING); |
@@ -68,11 +68,11 @@ discard block |
||
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | /** |
| 71 | - * Gets the image copyright based on the Exif data |
|
| 72 | - * |
|
| 73 | - * @return String image copyright |
|
| 74 | - * |
|
| 75 | - */ |
|
| 71 | + * Gets the image copyright based on the Exif data |
|
| 72 | + * |
|
| 73 | + * @return String image copyright |
|
| 74 | + * |
|
| 75 | + */ |
|
| 76 | 76 | public function getExifCopyright($url) { |
| 77 | 77 | $exif = exif_read_data($url); |
| 78 | 78 | $copyright = ''; |
@@ -87,11 +87,11 @@ discard block |
||
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | /** |
| 90 | - * Adds the images based on the aircraft registration |
|
| 91 | - * |
|
| 92 | - * @return String either success or error |
|
| 93 | - * |
|
| 94 | - */ |
|
| 90 | + * Adds the images based on the aircraft registration |
|
| 91 | + * |
|
| 92 | + * @return String either success or error |
|
| 93 | + * |
|
| 94 | + */ |
|
| 95 | 95 | public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '') |
| 96 | 96 | { |
| 97 | 97 | global $globalDebug,$globalAircraftImageFetch; |
@@ -119,11 +119,11 @@ discard block |
||
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | /** |
| 122 | - * Adds the images based on the marine name |
|
| 123 | - * |
|
| 124 | - * @return String either success or error |
|
| 125 | - * |
|
| 126 | - */ |
|
| 122 | + * Adds the images based on the marine name |
|
| 123 | + * |
|
| 124 | + * @return String either success or error |
|
| 125 | + * |
|
| 126 | + */ |
|
| 127 | 127 | public function addMarineImage($mmsi,$imo = '',$name = '') |
| 128 | 128 | { |
| 129 | 129 | global $globalDebug,$globalMarineImageFetch; |
@@ -160,12 +160,12 @@ discard block |
||
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | /** |
| 163 | - * Gets the aircraft image |
|
| 164 | - * |
|
| 165 | - * @param String $aircraft_registration the registration of the aircraft |
|
| 166 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 167 | - * |
|
| 168 | - */ |
|
| 163 | + * Gets the aircraft image |
|
| 164 | + * |
|
| 165 | + * @param String $aircraft_registration the registration of the aircraft |
|
| 166 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 167 | + * |
|
| 168 | + */ |
|
| 169 | 169 | public function findAircraftImage($aircraft_registration, $aircraft_icao = '', $airline_icao = '') |
| 170 | 170 | { |
| 171 | 171 | global $globalAircraftImageSources, $globalIVAO, $globalAircraftImageCheckICAO; |
@@ -209,14 +209,14 @@ discard block |
||
| 209 | 209 | } |
| 210 | 210 | |
| 211 | 211 | /** |
| 212 | - * Gets the vessel image |
|
| 213 | - * |
|
| 214 | - * @param String $mmsi the vessel mmsi |
|
| 215 | - * @param String $imo the vessel imo |
|
| 216 | - * @param String $name the vessel name |
|
| 217 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 218 | - * |
|
| 219 | - */ |
|
| 212 | + * Gets the vessel image |
|
| 213 | + * |
|
| 214 | + * @param String $mmsi the vessel mmsi |
|
| 215 | + * @param String $imo the vessel imo |
|
| 216 | + * @param String $name the vessel name |
|
| 217 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 218 | + * |
|
| 219 | + */ |
|
| 220 | 220 | public function findMarineImage($mmsi,$imo = '',$name = '') |
| 221 | 221 | { |
| 222 | 222 | global $globalMarineImageSources; |
@@ -250,13 +250,13 @@ discard block |
||
| 250 | 250 | } |
| 251 | 251 | |
| 252 | 252 | /** |
| 253 | - * Gets the aircraft image from Planespotters |
|
| 254 | - * |
|
| 255 | - * @param String $aircraft_registration the registration of the aircraft |
|
| 256 | - * @param String $aircraft_name type of the aircraft |
|
| 257 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 258 | - * |
|
| 259 | - */ |
|
| 253 | + * Gets the aircraft image from Planespotters |
|
| 254 | + * |
|
| 255 | + * @param String $aircraft_registration the registration of the aircraft |
|
| 256 | + * @param String $aircraft_name type of the aircraft |
|
| 257 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 258 | + * |
|
| 259 | + */ |
|
| 260 | 260 | public function fromPlanespotters($type,$aircraft_registration, $aircraft_name='') { |
| 261 | 261 | $Common = new Common(); |
| 262 | 262 | // If aircraft registration is only number, also check with aircraft model |
@@ -283,13 +283,13 @@ discard block |
||
| 283 | 283 | } |
| 284 | 284 | |
| 285 | 285 | /** |
| 286 | - * Gets the aircraft image from Deviantart |
|
| 287 | - * |
|
| 288 | - * @param String $registration the registration of the aircraft |
|
| 289 | - * @param String $name type of the aircraft |
|
| 290 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 291 | - * |
|
| 292 | - */ |
|
| 286 | + * Gets the aircraft image from Deviantart |
|
| 287 | + * |
|
| 288 | + * @param String $registration the registration of the aircraft |
|
| 289 | + * @param String $name type of the aircraft |
|
| 290 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 291 | + * |
|
| 292 | + */ |
|
| 293 | 293 | public function fromDeviantart($type,$registration, $name='') { |
| 294 | 294 | $Common = new Common(); |
| 295 | 295 | if ($type == 'aircraft') { |
@@ -321,13 +321,13 @@ discard block |
||
| 321 | 321 | } |
| 322 | 322 | |
| 323 | 323 | /** |
| 324 | - * Gets the aircraft image from JetPhotos |
|
| 325 | - * |
|
| 326 | - * @param String $aircraft_registration the registration of the aircraft |
|
| 327 | - * @param String $aircraft_name type of the aircraft |
|
| 328 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 329 | - * |
|
| 330 | - */ |
|
| 324 | + * Gets the aircraft image from JetPhotos |
|
| 325 | + * |
|
| 326 | + * @param String $aircraft_registration the registration of the aircraft |
|
| 327 | + * @param String $aircraft_name type of the aircraft |
|
| 328 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 329 | + * |
|
| 330 | + */ |
|
| 331 | 331 | public function fromJetPhotos($type,$aircraft_registration, $aircraft_name='') { |
| 332 | 332 | $Common = new Common(); |
| 333 | 333 | $url= 'http://jetphotos.net/showphotos.php?displaymode=2®search='.$aircraft_registration; |
@@ -363,13 +363,13 @@ discard block |
||
| 363 | 363 | } |
| 364 | 364 | |
| 365 | 365 | /** |
| 366 | - * Gets the aircraft image from PlanePictures |
|
| 367 | - * |
|
| 368 | - * @param String $aircraft_registration the registration of the aircraft |
|
| 369 | - * @param String $aircraft_name type of the aircraft |
|
| 370 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 371 | - * |
|
| 372 | - */ |
|
| 366 | + * Gets the aircraft image from PlanePictures |
|
| 367 | + * |
|
| 368 | + * @param String $aircraft_registration the registration of the aircraft |
|
| 369 | + * @param String $aircraft_name type of the aircraft |
|
| 370 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 371 | + * |
|
| 372 | + */ |
|
| 373 | 373 | public function fromPlanePictures($type,$aircraft_registration, $aircraft_name='') { |
| 374 | 374 | $Common = new Common(); |
| 375 | 375 | $url= 'http://www.planepictures.net/netsearch4.cgi?srch='.$aircraft_registration.'&stype=reg&srng=2'; |
@@ -397,13 +397,13 @@ discard block |
||
| 397 | 397 | } |
| 398 | 398 | |
| 399 | 399 | /** |
| 400 | - * Gets the aircraft image from Flickr |
|
| 401 | - * |
|
| 402 | - * @param String $registration the registration of the aircraft |
|
| 403 | - * @param String $name type of the aircraft |
|
| 404 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 405 | - * |
|
| 406 | - */ |
|
| 400 | + * Gets the aircraft image from Flickr |
|
| 401 | + * |
|
| 402 | + * @param String $registration the registration of the aircraft |
|
| 403 | + * @param String $name type of the aircraft |
|
| 404 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 405 | + * |
|
| 406 | + */ |
|
| 407 | 407 | public function fromFlickr($type,$registration,$name='') { |
| 408 | 408 | $Common = new Common(); |
| 409 | 409 | if ($type == 'aircraft') { |
@@ -446,13 +446,13 @@ discard block |
||
| 446 | 446 | } |
| 447 | 447 | |
| 448 | 448 | /** |
| 449 | - * Gets the aircraft image from Bing |
|
| 450 | - * |
|
| 451 | - * @param String $aircraft_registration the registration of the aircraft |
|
| 452 | - * @param String $aircraft_name type of the aircraft |
|
| 453 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 454 | - * |
|
| 455 | - */ |
|
| 449 | + * Gets the aircraft image from Bing |
|
| 450 | + * |
|
| 451 | + * @param String $aircraft_registration the registration of the aircraft |
|
| 452 | + * @param String $aircraft_name type of the aircraft |
|
| 453 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 454 | + * |
|
| 455 | + */ |
|
| 456 | 456 | public function fromBing($type,$aircraft_registration,$aircraft_name='') { |
| 457 | 457 | global $globalImageBingKey; |
| 458 | 458 | $Common = new Common(); |
@@ -478,13 +478,13 @@ discard block |
||
| 478 | 478 | } |
| 479 | 479 | |
| 480 | 480 | /** |
| 481 | - * Gets the aircraft image from airport-data |
|
| 482 | - * |
|
| 483 | - * @param String $aircraft_registration the registration of the aircraft |
|
| 484 | - * @param String $aircraft_name type of the aircraft |
|
| 485 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 486 | - * |
|
| 487 | - */ |
|
| 481 | + * Gets the aircraft image from airport-data |
|
| 482 | + * |
|
| 483 | + * @param String $aircraft_registration the registration of the aircraft |
|
| 484 | + * @param String $aircraft_name type of the aircraft |
|
| 485 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 486 | + * |
|
| 487 | + */ |
|
| 488 | 488 | public function fromAirportData($type,$aircraft_registration,$aircraft_name='') { |
| 489 | 489 | $Common = new Common(); |
| 490 | 490 | $url = 'http://www.airport-data.com/api/ac_thumb.json?&n=1&r='.$aircraft_registration; |
@@ -503,13 +503,13 @@ discard block |
||
| 503 | 503 | } |
| 504 | 504 | |
| 505 | 505 | /** |
| 506 | - * Gets image from WikiMedia |
|
| 507 | - * |
|
| 508 | - * @param String $registration the registration of the aircraft/mmsi |
|
| 509 | - * @param String $name name |
|
| 510 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 511 | - * |
|
| 512 | - */ |
|
| 506 | + * Gets image from WikiMedia |
|
| 507 | + * |
|
| 508 | + * @param String $registration the registration of the aircraft/mmsi |
|
| 509 | + * @param String $name name |
|
| 510 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 511 | + * |
|
| 512 | + */ |
|
| 513 | 513 | public function fromWikimedia($type,$registration,$name='') { |
| 514 | 514 | $Common = new Common(); |
| 515 | 515 | if ($type == 'aircraft') { |
@@ -564,13 +564,13 @@ discard block |
||
| 564 | 564 | } |
| 565 | 565 | |
| 566 | 566 | /** |
| 567 | - * Gets the aircraft image from custom url |
|
| 568 | - * |
|
| 569 | - * @param String $registration the registration of the aircraft |
|
| 570 | - * @param String $name type of the aircraft |
|
| 571 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 572 | - * |
|
| 573 | - */ |
|
| 567 | + * Gets the aircraft image from custom url |
|
| 568 | + * |
|
| 569 | + * @param String $registration the registration of the aircraft |
|
| 570 | + * @param String $name type of the aircraft |
|
| 571 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
| 572 | + * |
|
| 573 | + */ |
|
| 574 | 574 | public function fromCustomSource($type,$registration,$name='') { |
| 575 | 575 | global $globalAircraftImageCustomSources, $globalMarineImageCustomSources, $globalDebug; |
| 576 | 576 | //$globalAircraftImageCustomSource[] = array('thumbnail' => '','original' => '', 'copyright' => '', 'source_website' => '', 'source' => '','exif' => true); |
@@ -17,22 +17,22 @@ discard block |
||
| 17 | 17 | * @return Array the images list |
| 18 | 18 | * |
| 19 | 19 | */ |
| 20 | - public function getSpotterImage($registration,$aircraft_icao = '', $airline_icao = '') |
|
| 20 | + public function getSpotterImage($registration, $aircraft_icao = '', $airline_icao = '') |
|
| 21 | 21 | { |
| 22 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 23 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 24 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 22 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 23 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 24 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 25 | 25 | $reg = $registration; |
| 26 | 26 | if ($reg == '' && $aircraft_icao != '') $reg = $aircraft_icao.$airline_icao; |
| 27 | 27 | $reg = trim($reg); |
| 28 | - $query = "SELECT spotter_image.image, spotter_image.image_thumbnail, spotter_image.image_source, spotter_image.image_source_website,spotter_image.image_copyright, spotter_image.registration |
|
| 28 | + $query = "SELECT spotter_image.image, spotter_image.image_thumbnail, spotter_image.image_source, spotter_image.image_source_website,spotter_image.image_copyright, spotter_image.registration |
|
| 29 | 29 | FROM spotter_image |
| 30 | 30 | WHERE spotter_image.registration = :registration LIMIT 1"; |
| 31 | 31 | $sth = $this->db->prepare($query); |
| 32 | 32 | $sth->execute(array(':registration' => $reg)); |
| 33 | 33 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 34 | 34 | if (!empty($result)) return $result; |
| 35 | - elseif ($registration != '') return $this->getSpotterImage('',$aircraft_icao,$airline_icao); |
|
| 35 | + elseif ($registration != '') return $this->getSpotterImage('', $aircraft_icao, $airline_icao); |
|
| 36 | 36 | else return array(); |
| 37 | 37 | } |
| 38 | 38 | |
@@ -42,23 +42,23 @@ discard block |
||
| 42 | 42 | * @return Array the images list |
| 43 | 43 | * |
| 44 | 44 | */ |
| 45 | - public function getMarineImage($mmsi,$imo = '',$name = '') |
|
| 45 | + public function getMarineImage($mmsi, $imo = '', $name = '') |
|
| 46 | 46 | { |
| 47 | - $mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING); |
|
| 48 | - $imo = filter_var($imo,FILTER_SANITIZE_STRING); |
|
| 49 | - $name = filter_var($name,FILTER_SANITIZE_STRING); |
|
| 47 | + $mmsi = filter_var($mmsi, FILTER_SANITIZE_STRING); |
|
| 48 | + $imo = filter_var($imo, FILTER_SANITIZE_STRING); |
|
| 49 | + $name = filter_var($name, FILTER_SANITIZE_STRING); |
|
| 50 | 50 | $name = trim($name); |
| 51 | - $query = "SELECT marine_image.image, marine_image.image_thumbnail, marine_image.image_source, marine_image.image_source_website,marine_image.image_copyright, marine_image.mmsi, marine_image.imo, marine_image.name |
|
| 51 | + $query = "SELECT marine_image.image, marine_image.image_thumbnail, marine_image.image_source, marine_image.image_source_website,marine_image.image_copyright, marine_image.mmsi, marine_image.imo, marine_image.name |
|
| 52 | 52 | FROM marine_image |
| 53 | 53 | WHERE marine_image.mmsi = :mmsi"; |
| 54 | 54 | $query_data = array(':mmsi' => $mmsi); |
| 55 | 55 | if ($imo != '') { |
| 56 | 56 | $query .= " AND marine_image.imo = :imo"; |
| 57 | - $query_data = array_merge($query_data,array(':imo' => $imo)); |
|
| 57 | + $query_data = array_merge($query_data, array(':imo' => $imo)); |
|
| 58 | 58 | } |
| 59 | 59 | if ($name != '') { |
| 60 | 60 | $query .= " AND marine_image.name = :name"; |
| 61 | - $query_data = array_merge($query_data,array(':name' => $name)); |
|
| 61 | + $query_data = array_merge($query_data, array(':name' => $name)); |
|
| 62 | 62 | } |
| 63 | 63 | $query .= " LIMIT 1"; |
| 64 | 64 | $sth = $this->db->prepare($query); |
@@ -79,9 +79,9 @@ discard block |
||
| 79 | 79 | if (isset($exif['COMPUTED']['copyright'])) $copyright = $exif['COMPUTED']['copyright']; |
| 80 | 80 | elseif (isset($exif['copyright'])) $copyright = $exif['copyright']; |
| 81 | 81 | if ($copyright != '') { |
| 82 | - $copyright = str_replace('Copyright ','',$copyright); |
|
| 83 | - $copyright = str_replace('© ','',$copyright); |
|
| 84 | - $copyright = str_replace('(c) ','',$copyright); |
|
| 82 | + $copyright = str_replace('Copyright ', '', $copyright); |
|
| 83 | + $copyright = str_replace('© ', '', $copyright); |
|
| 84 | + $copyright = str_replace('(c) ', '', $copyright); |
|
| 85 | 85 | } |
| 86 | 86 | return $copyright; |
| 87 | 87 | } |
@@ -92,25 +92,25 @@ discard block |
||
| 92 | 92 | * @return String either success or error |
| 93 | 93 | * |
| 94 | 94 | */ |
| 95 | - public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '') |
|
| 95 | + public function addSpotterImage($registration, $aircraft_icao = '', $airline_icao = '') |
|
| 96 | 96 | { |
| 97 | - global $globalDebug,$globalAircraftImageFetch; |
|
| 97 | + global $globalDebug, $globalAircraftImageFetch; |
|
| 98 | 98 | if (isset($globalAircraftImageFetch) && !$globalAircraftImageFetch) return ''; |
| 99 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 99 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 100 | 100 | $registration = trim($registration); |
| 101 | 101 | //getting the aircraft image |
| 102 | 102 | if ($globalDebug && $registration != '') echo 'Try to find an aircraft image for '.$registration.'...'; |
| 103 | 103 | elseif ($globalDebug && $aircraft_icao != '') echo 'Try to find an aircraft image for '.$aircraft_icao.'...'; |
| 104 | 104 | elseif ($globalDebug && $airline_icao != '') echo 'Try to find an aircraft image for '.$airline_icao.'...'; |
| 105 | - $image_url = $this->findAircraftImage($registration,$aircraft_icao,$airline_icao); |
|
| 105 | + $image_url = $this->findAircraftImage($registration, $aircraft_icao, $airline_icao); |
|
| 106 | 106 | if ($registration == '' && $aircraft_icao != '') $registration = $aircraft_icao.$airline_icao; |
| 107 | 107 | if ($image_url['original'] != '') { |
| 108 | 108 | if ($globalDebug) echo 'Found !'."\n"; |
| 109 | - $query = "INSERT INTO spotter_image (registration, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:registration,:image,:image_thumbnail,:copyright,:source,:source_website)"; |
|
| 109 | + $query = "INSERT INTO spotter_image (registration, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:registration,:image,:image_thumbnail,:copyright,:source,:source_website)"; |
|
| 110 | 110 | try { |
| 111 | 111 | $sth = $this->db->prepare($query); |
| 112 | - $sth->execute(array(':registration' => $registration,':image' => $image_url['original'],':image_thumbnail' => $image_url['thumbnail'], ':copyright' => $image_url['copyright'],':source' => $image_url['source'],':source_website' => $image_url['source_website'])); |
|
| 113 | - } catch(PDOException $e) { |
|
| 112 | + $sth->execute(array(':registration' => $registration, ':image' => $image_url['original'], ':image_thumbnail' => $image_url['thumbnail'], ':copyright' => $image_url['copyright'], ':source' => $image_url['source'], ':source_website' => $image_url['source_website'])); |
|
| 113 | + } catch (PDOException $e) { |
|
| 114 | 114 | echo $e->getMessage()."\n"; |
| 115 | 115 | return "error"; |
| 116 | 116 | } |
@@ -124,13 +124,13 @@ discard block |
||
| 124 | 124 | * @return String either success or error |
| 125 | 125 | * |
| 126 | 126 | */ |
| 127 | - public function addMarineImage($mmsi,$imo = '',$name = '') |
|
| 127 | + public function addMarineImage($mmsi, $imo = '', $name = '') |
|
| 128 | 128 | { |
| 129 | - global $globalDebug,$globalMarineImageFetch; |
|
| 129 | + global $globalDebug, $globalMarineImageFetch; |
|
| 130 | 130 | if (isset($globalMarineImageFetch) && !$globalMarineImageFetch) return ''; |
| 131 | - $mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING); |
|
| 132 | - $imo = filter_var($imo,FILTER_SANITIZE_STRING); |
|
| 133 | - $name = filter_var($name,FILTER_SANITIZE_STRING); |
|
| 131 | + $mmsi = filter_var($mmsi, FILTER_SANITIZE_STRING); |
|
| 132 | + $imo = filter_var($imo, FILTER_SANITIZE_STRING); |
|
| 133 | + $name = filter_var($name, FILTER_SANITIZE_STRING); |
|
| 134 | 134 | $name = trim($name); |
| 135 | 135 | $Marine = new Marine($this->db); |
| 136 | 136 | if ($imo == '' || $name == '') { |
@@ -144,14 +144,14 @@ discard block |
||
| 144 | 144 | |
| 145 | 145 | //getting the aircraft image |
| 146 | 146 | if ($globalDebug && $name != '') echo 'Try to find an vessel image for '.$name.'...'; |
| 147 | - $image_url = $this->findMarineImage($mmsi,$imo,$name); |
|
| 147 | + $image_url = $this->findMarineImage($mmsi, $imo, $name); |
|
| 148 | 148 | if ($image_url['original'] != '') { |
| 149 | 149 | if ($globalDebug) echo 'Found !'."\n"; |
| 150 | - $query = "INSERT INTO marine_image (mmsi,imo,name, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:mmsi,:imo,:name,:image,:image_thumbnail,:copyright,:source,:source_website)"; |
|
| 150 | + $query = "INSERT INTO marine_image (mmsi,imo,name, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:mmsi,:imo,:name,:image,:image_thumbnail,:copyright,:source,:source_website)"; |
|
| 151 | 151 | try { |
| 152 | 152 | $sth = $this->db->prepare($query); |
| 153 | - $sth->execute(array(':mmsi' => $mmsi,':imo' => $imo,':name' => $name,':image' => $image_url['original'],':image_thumbnail' => $image_url['thumbnail'], ':copyright' => $image_url['copyright'],':source' => $image_url['source'],':source_website' => $image_url['source_website'])); |
|
| 154 | - } catch(PDOException $e) { |
|
| 153 | + $sth->execute(array(':mmsi' => $mmsi, ':imo' => $imo, ':name' => $name, ':image' => $image_url['original'], ':image_thumbnail' => $image_url['thumbnail'], ':copyright' => $image_url['copyright'], ':source' => $image_url['source'], ':source_website' => $image_url['source_website'])); |
|
| 154 | + } catch (PDOException $e) { |
|
| 155 | 155 | echo $e->getMessage()."\n"; |
| 156 | 156 | return "error"; |
| 157 | 157 | } |
@@ -171,9 +171,9 @@ discard block |
||
| 171 | 171 | global $globalAircraftImageSources, $globalIVAO, $globalAircraftImageCheckICAO; |
| 172 | 172 | $Spotter = new Spotter($this->db); |
| 173 | 173 | if (!isset($globalIVAO)) $globalIVAO = FALSE; |
| 174 | - $aircraft_registration = filter_var($aircraft_registration,FILTER_SANITIZE_STRING); |
|
| 174 | + $aircraft_registration = filter_var($aircraft_registration, FILTER_SANITIZE_STRING); |
|
| 175 | 175 | if ($aircraft_registration != '') { |
| 176 | - if (strpos($aircraft_registration,'/') !== false) return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 176 | + if (strpos($aircraft_registration, '/') !== false) return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
| 177 | 177 | $aircraft_registration = urlencode(trim($aircraft_registration)); |
| 178 | 178 | $aircraft_info = $Spotter->getAircraftInfoByRegistration($aircraft_registration); |
| 179 | 179 | if (isset($aircraft_info[0]['aircraft_name'])) $aircraft_name = $aircraft_info[0]['aircraft_name']; |
@@ -187,25 +187,25 @@ discard block |
||
| 187 | 187 | if (isset($aircraft_info[0]['type'])) $aircraft_name = $aircraft_info[0]['type']; |
| 188 | 188 | else $aircraft_name = ''; |
| 189 | 189 | $aircraft_registration = $aircraft_icao; |
| 190 | - } else return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => ''); |
|
| 190 | + } else return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
| 191 | 191 | unset($Spotter); |
| 192 | - if (!isset($globalAircraftImageSources)) $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters'); |
|
| 192 | + if (!isset($globalAircraftImageSources)) $globalAircraftImageSources = array('ivaomtl', 'wikimedia', 'airportdata', 'deviantart', 'flickr', 'bing', 'jetphotos', 'planepictures', 'planespotters'); |
|
| 193 | 193 | foreach ($globalAircraftImageSources as $source) { |
| 194 | 194 | $source = strtolower($source); |
| 195 | - if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') $images_array = $this->fromIvaoMtl('aircraft',$aircraft_icao,$airline_icao); |
|
| 196 | - if ($source == 'planespotters' && !$globalIVAO) $images_array = $this->fromPlanespotters('aircraft',$aircraft_registration,$aircraft_name); |
|
| 197 | - if ($source == 'flickr') $images_array = $this->fromFlickr('aircraft',$aircraft_registration,$aircraft_name); |
|
| 198 | - if ($source == 'bing') $images_array = $this->fromBing('aircraft',$aircraft_registration,$aircraft_name); |
|
| 199 | - if ($source == 'deviantart') $images_array = $this->fromDeviantart('aircraft',$aircraft_registration,$aircraft_name); |
|
| 200 | - if ($source == 'wikimedia') $images_array = $this->fromWikimedia('aircraft',$aircraft_registration,$aircraft_name); |
|
| 201 | - if ($source == 'jetphotos' && !$globalIVAO) $images_array = $this->fromJetPhotos('aircraft',$aircraft_registration,$aircraft_name); |
|
| 202 | - if ($source == 'planepictures' && !$globalIVAO) $images_array = $this->fromPlanePictures('aircraft',$aircraft_registration,$aircraft_name); |
|
| 203 | - if ($source == 'airportdata' && !$globalIVAO) $images_array = $this->fromAirportData('aircraft',$aircraft_registration,$aircraft_name); |
|
| 204 | - if ($source == 'customsources') $images_array = $this->fromCustomSource('aircraft',$aircraft_registration,$aircraft_name); |
|
| 195 | + if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') $images_array = $this->fromIvaoMtl('aircraft', $aircraft_icao, $airline_icao); |
|
| 196 | + if ($source == 'planespotters' && !$globalIVAO) $images_array = $this->fromPlanespotters('aircraft', $aircraft_registration, $aircraft_name); |
|
| 197 | + if ($source == 'flickr') $images_array = $this->fromFlickr('aircraft', $aircraft_registration, $aircraft_name); |
|
| 198 | + if ($source == 'bing') $images_array = $this->fromBing('aircraft', $aircraft_registration, $aircraft_name); |
|
| 199 | + if ($source == 'deviantart') $images_array = $this->fromDeviantart('aircraft', $aircraft_registration, $aircraft_name); |
|
| 200 | + if ($source == 'wikimedia') $images_array = $this->fromWikimedia('aircraft', $aircraft_registration, $aircraft_name); |
|
| 201 | + if ($source == 'jetphotos' && !$globalIVAO) $images_array = $this->fromJetPhotos('aircraft', $aircraft_registration, $aircraft_name); |
|
| 202 | + if ($source == 'planepictures' && !$globalIVAO) $images_array = $this->fromPlanePictures('aircraft', $aircraft_registration, $aircraft_name); |
|
| 203 | + if ($source == 'airportdata' && !$globalIVAO) $images_array = $this->fromAirportData('aircraft', $aircraft_registration, $aircraft_name); |
|
| 204 | + if ($source == 'customsources') $images_array = $this->fromCustomSource('aircraft', $aircraft_registration, $aircraft_name); |
|
| 205 | 205 | if (isset($images_array) && $images_array['original'] != '') return $images_array; |
| 206 | 206 | } |
| 207 | 207 | if ((!isset($globalAircraftImageCheckICAO) || $globalAircraftImageCheckICAO === TRUE) && isset($aircraft_icao)) return $this->findAircraftImage($aircraft_icao); |
| 208 | - return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 208 | + return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
| 209 | 209 | } |
| 210 | 210 | |
| 211 | 211 | /** |
@@ -217,14 +217,14 @@ discard block |
||
| 217 | 217 | * @return Array the aircraft thumbnail, orignal url and copyright |
| 218 | 218 | * |
| 219 | 219 | */ |
| 220 | - public function findMarineImage($mmsi,$imo = '',$name = '') |
|
| 220 | + public function findMarineImage($mmsi, $imo = '', $name = '') |
|
| 221 | 221 | { |
| 222 | 222 | global $globalMarineImageSources; |
| 223 | - $mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING); |
|
| 223 | + $mmsi = filter_var($mmsi, FILTER_SANITIZE_STRING); |
|
| 224 | 224 | //$imo = filter_var($imo,FILTER_SANITIZE_STRING); |
| 225 | - $name = filter_var($name,FILTER_SANITIZE_STRING); |
|
| 225 | + $name = filter_var($name, FILTER_SANITIZE_STRING); |
|
| 226 | 226 | $name = trim($name); |
| 227 | - if (strlen($name) < 4) return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => ''); |
|
| 227 | + if (strlen($name) < 4) return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
| 228 | 228 | /* |
| 229 | 229 | $Marine = new Marine($this->db); |
| 230 | 230 | if ($imo == '' || $name == '') { |
@@ -236,17 +236,17 @@ discard block |
||
| 236 | 236 | } |
| 237 | 237 | unset($Marine); |
| 238 | 238 | */ |
| 239 | - if (!isset($globalMarineImageSources)) $globalMarineImageSources = array('wikimedia','deviantart','flickr','bing'); |
|
| 239 | + if (!isset($globalMarineImageSources)) $globalMarineImageSources = array('wikimedia', 'deviantart', 'flickr', 'bing'); |
|
| 240 | 240 | foreach ($globalMarineImageSources as $source) { |
| 241 | 241 | $source = strtolower($source); |
| 242 | - if ($source == 'flickr') $images_array = $this->fromFlickr('marine',$mmsi,$name); |
|
| 243 | - if ($source == 'bing') $images_array = $this->fromBing('marine',$mmsi,$name); |
|
| 244 | - if ($source == 'deviantart') $images_array = $this->fromDeviantart('marine',$mmsi,$name); |
|
| 245 | - if ($source == 'wikimedia') $images_array = $this->fromWikimedia('marine',$mmsi,$name); |
|
| 246 | - if ($source == 'customsources') $images_array = $this->fromCustomSource('marine',$mmsi,$name); |
|
| 242 | + if ($source == 'flickr') $images_array = $this->fromFlickr('marine', $mmsi, $name); |
|
| 243 | + if ($source == 'bing') $images_array = $this->fromBing('marine', $mmsi, $name); |
|
| 244 | + if ($source == 'deviantart') $images_array = $this->fromDeviantart('marine', $mmsi, $name); |
|
| 245 | + if ($source == 'wikimedia') $images_array = $this->fromWikimedia('marine', $mmsi, $name); |
|
| 246 | + if ($source == 'customsources') $images_array = $this->fromCustomSource('marine', $mmsi, $name); |
|
| 247 | 247 | if (isset($images_array) && $images_array['original'] != '') return $images_array; |
| 248 | 248 | } |
| 249 | - return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 249 | + return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
| 250 | 250 | } |
| 251 | 251 | |
| 252 | 252 | /** |
@@ -257,24 +257,24 @@ discard block |
||
| 257 | 257 | * @return Array the aircraft thumbnail, orignal url and copyright |
| 258 | 258 | * |
| 259 | 259 | */ |
| 260 | - public function fromPlanespotters($type,$aircraft_registration, $aircraft_name='') { |
|
| 260 | + public function fromPlanespotters($type, $aircraft_registration, $aircraft_name = '') { |
|
| 261 | 261 | $Common = new Common(); |
| 262 | 262 | // If aircraft registration is only number, also check with aircraft model |
| 263 | - if (preg_match('/^[[:digit]]+$/',$aircraft_registration) && $aircraft_name != '') { |
|
| 264 | - $url= 'http://www.planespotters.net/Aviation_Photos/search.php?tag='.$aircraft_registration.'&actype=s_'.urlencode($aircraft_name).'&output=rss'; |
|
| 263 | + if (preg_match('/^[[:digit]]+$/', $aircraft_registration) && $aircraft_name != '') { |
|
| 264 | + $url = 'http://www.planespotters.net/Aviation_Photos/search.php?tag='.$aircraft_registration.'&actype=s_'.urlencode($aircraft_name).'&output=rss'; |
|
| 265 | 265 | } else { |
| 266 | 266 | //$url= 'http://www.planespotters.net/Aviation_Photos/search.php?tag='.$airline_aircraft_type.'&output=rss'; |
| 267 | - $url= 'http://www.planespotters.net/Aviation_Photos/search.php?reg='.$aircraft_registration.'&output=rss'; |
|
| 267 | + $url = 'http://www.planespotters.net/Aviation_Photos/search.php?reg='.$aircraft_registration.'&output=rss'; |
|
| 268 | 268 | } |
| 269 | 269 | $data = $Common->getData($url); |
| 270 | 270 | if ($xml = simplexml_load_string($data)) { |
| 271 | 271 | if (isset($xml->channel->item)) { |
| 272 | 272 | $image_url = array(); |
| 273 | - $thumbnail_url = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url); |
|
| 273 | + $thumbnail_url = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url); |
|
| 274 | 274 | $image_url['thumbnail'] = $thumbnail_url; |
| 275 | - $image_url['original'] = str_replace('thumbnail','original',$thumbnail_url); |
|
| 276 | - $image_url['copyright'] = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->copyright); |
|
| 277 | - $image_url['source_website'] = trim((string)$xml->channel->item->link); |
|
| 275 | + $image_url['original'] = str_replace('thumbnail', 'original', $thumbnail_url); |
|
| 276 | + $image_url['copyright'] = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->copyright); |
|
| 277 | + $image_url['source_website'] = trim((string) $xml->channel->item->link); |
|
| 278 | 278 | $image_url['source'] = 'planespotters'; |
| 279 | 279 | return $image_url; |
| 280 | 280 | } |
@@ -290,29 +290,29 @@ discard block |
||
| 290 | 290 | * @return Array the aircraft thumbnail, orignal url and copyright |
| 291 | 291 | * |
| 292 | 292 | */ |
| 293 | - public function fromDeviantart($type,$registration, $name='') { |
|
| 293 | + public function fromDeviantart($type, $registration, $name = '') { |
|
| 294 | 294 | $Common = new Common(); |
| 295 | 295 | if ($type == 'aircraft') { |
| 296 | 296 | // If aircraft registration is only number, also check with aircraft model |
| 297 | - if (preg_match('/^[[:digit]]+$/',$registration) && $name != '') { |
|
| 298 | - $url= 'http://backend.deviantart.com/rss.xml?type=deviation&q='.$registration.'%20'.urlencode($name); |
|
| 297 | + if (preg_match('/^[[:digit]]+$/', $registration) && $name != '') { |
|
| 298 | + $url = 'http://backend.deviantart.com/rss.xml?type=deviation&q='.$registration.'%20'.urlencode($name); |
|
| 299 | 299 | } else { |
| 300 | - $url= 'http://backend.deviantart.com/rss.xml?type=deviation&q=aircraft%20'.$registration; |
|
| 300 | + $url = 'http://backend.deviantart.com/rss.xml?type=deviation&q=aircraft%20'.$registration; |
|
| 301 | 301 | } |
| 302 | 302 | } elseif ($type == 'marine') { |
| 303 | - $url= 'http://backend.deviantart.com/rss.xml?type=deviation&q="'.urlencode($name).'"'; |
|
| 303 | + $url = 'http://backend.deviantart.com/rss.xml?type=deviation&q="'.urlencode($name).'"'; |
|
| 304 | 304 | } |
| 305 | 305 | |
| 306 | 306 | $data = $Common->getData($url); |
| 307 | 307 | if ($xml = simplexml_load_string($data)) { |
| 308 | 308 | if (isset($xml->channel->item->link)) { |
| 309 | 309 | $image_url = array(); |
| 310 | - $thumbnail_url = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url); |
|
| 310 | + $thumbnail_url = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url); |
|
| 311 | 311 | $image_url['thumbnail'] = $thumbnail_url; |
| 312 | - $original_url = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->content->attributes()->url); |
|
| 312 | + $original_url = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->content->attributes()->url); |
|
| 313 | 313 | $image_url['original'] = $original_url; |
| 314 | - $image_url['copyright'] = str_replace('Copyright ','',trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->copyright)); |
|
| 315 | - $image_url['source_website'] = trim((string)$xml->channel->item->link); |
|
| 314 | + $image_url['copyright'] = str_replace('Copyright ', '', trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->copyright)); |
|
| 315 | + $image_url['source_website'] = trim((string) $xml->channel->item->link); |
|
| 316 | 316 | $image_url['source'] = 'deviantart'; |
| 317 | 317 | return $image_url; |
| 318 | 318 | } |
@@ -328,32 +328,32 @@ discard block |
||
| 328 | 328 | * @return Array the aircraft thumbnail, orignal url and copyright |
| 329 | 329 | * |
| 330 | 330 | */ |
| 331 | - public function fromJetPhotos($type,$aircraft_registration, $aircraft_name='') { |
|
| 331 | + public function fromJetPhotos($type, $aircraft_registration, $aircraft_name = '') { |
|
| 332 | 332 | $Common = new Common(); |
| 333 | - $url= 'http://jetphotos.net/showphotos.php?displaymode=2®search='.$aircraft_registration; |
|
| 333 | + $url = 'http://jetphotos.net/showphotos.php?displaymode=2®search='.$aircraft_registration; |
|
| 334 | 334 | $data = $Common->getData($url); |
| 335 | 335 | $dom = new DOMDocument(); |
| 336 | 336 | @$dom->loadHTML($data); |
| 337 | 337 | $all_pics = array(); |
| 338 | - foreach($dom->getElementsByTagName('img') as $image) { |
|
| 338 | + foreach ($dom->getElementsByTagName('img') as $image) { |
|
| 339 | 339 | if ($image->getAttribute('itemprop') == "http://schema.org/image") { |
| 340 | 340 | $all_pics[] = $image->getAttribute('src'); |
| 341 | 341 | } |
| 342 | 342 | } |
| 343 | 343 | $all_authors = array(); |
| 344 | - foreach($dom->getElementsByTagName('meta') as $author) { |
|
| 344 | + foreach ($dom->getElementsByTagName('meta') as $author) { |
|
| 345 | 345 | if ($author->getAttribute('itemprop') == "http://schema.org/author") { |
| 346 | 346 | $all_authors[] = $author->getAttribute('content'); |
| 347 | 347 | } |
| 348 | 348 | } |
| 349 | 349 | $all_ref = array(); |
| 350 | - foreach($dom->getElementsByTagName('a') as $link) { |
|
| 350 | + foreach ($dom->getElementsByTagName('a') as $link) { |
|
| 351 | 351 | $all_ref[] = $link->getAttribute('href'); |
| 352 | 352 | } |
| 353 | 353 | if (isset($all_pics[0])) { |
| 354 | 354 | $image_url = array(); |
| 355 | 355 | $image_url['thumbnail'] = $all_pics[0]; |
| 356 | - $image_url['original'] = str_replace('_tb','',$all_pics[0]); |
|
| 356 | + $image_url['original'] = str_replace('_tb', '', $all_pics[0]); |
|
| 357 | 357 | $image_url['copyright'] = $all_authors[0]; |
| 358 | 358 | $image_url['source_website'] = 'http://jetphotos.net'.$all_ref[8]; |
| 359 | 359 | $image_url['source'] = 'JetPhotos'; |
@@ -370,24 +370,24 @@ discard block |
||
| 370 | 370 | * @return Array the aircraft thumbnail, orignal url and copyright |
| 371 | 371 | * |
| 372 | 372 | */ |
| 373 | - public function fromPlanePictures($type,$aircraft_registration, $aircraft_name='') { |
|
| 373 | + public function fromPlanePictures($type, $aircraft_registration, $aircraft_name = '') { |
|
| 374 | 374 | $Common = new Common(); |
| 375 | - $url= 'http://www.planepictures.net/netsearch4.cgi?srch='.$aircraft_registration.'&stype=reg&srng=2'; |
|
| 375 | + $url = 'http://www.planepictures.net/netsearch4.cgi?srch='.$aircraft_registration.'&stype=reg&srng=2'; |
|
| 376 | 376 | $data = $Common->getData($url); |
| 377 | 377 | $dom = new DOMDocument(); |
| 378 | 378 | @$dom->loadHTML($data); |
| 379 | 379 | $all_pics = array(); |
| 380 | - foreach($dom->getElementsByTagName('img') as $image) { |
|
| 380 | + foreach ($dom->getElementsByTagName('img') as $image) { |
|
| 381 | 381 | $all_pics[] = $image->getAttribute('src'); |
| 382 | 382 | } |
| 383 | 383 | $all_links = array(); |
| 384 | - foreach($dom->getElementsByTagName('a') as $link) { |
|
| 385 | - $all_links[] = array('text' => $link->textContent,'href' => $link->getAttribute('href')); |
|
| 384 | + foreach ($dom->getElementsByTagName('a') as $link) { |
|
| 385 | + $all_links[] = array('text' => $link->textContent, 'href' => $link->getAttribute('href')); |
|
| 386 | 386 | } |
| 387 | - if (isset($all_pics[1]) && !preg_match('/bit.ly/',$all_pics[1]) && !preg_match('/flagge/',$all_pics[1])) { |
|
| 387 | + if (isset($all_pics[1]) && !preg_match('/bit.ly/', $all_pics[1]) && !preg_match('/flagge/', $all_pics[1])) { |
|
| 388 | 388 | $image_url = array(); |
| 389 | 389 | $image_url['thumbnail'] = 'http://www.planepictures.net/'.$all_pics[1]; |
| 390 | - $image_url['original'] = 'http://www.planepictures.net/'.str_replace('_TN','',$all_pics[1]); |
|
| 390 | + $image_url['original'] = 'http://www.planepictures.net/'.str_replace('_TN', '', $all_pics[1]); |
|
| 391 | 391 | $image_url['copyright'] = $all_links[6]['text']; |
| 392 | 392 | $image_url['source_website'] = 'http://www.planepictures.net/'.$all_links[2]['href']; |
| 393 | 393 | $image_url['source'] = 'PlanePictures'; |
@@ -404,7 +404,7 @@ discard block |
||
| 404 | 404 | * @return Array the aircraft thumbnail, orignal url and copyright |
| 405 | 405 | * |
| 406 | 406 | */ |
| 407 | - public function fromFlickr($type,$registration,$name='') { |
|
| 407 | + public function fromFlickr($type, $registration, $name = '') { |
|
| 408 | 408 | $Common = new Common(); |
| 409 | 409 | if ($type == 'aircraft') { |
| 410 | 410 | if ($name != '') $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.','.urlencode($name); |
@@ -416,12 +416,12 @@ discard block |
||
| 416 | 416 | $data = $Common->getData($url); |
| 417 | 417 | if ($xml = simplexml_load_string($data)) { |
| 418 | 418 | if (isset($xml->channel->item)) { |
| 419 | - $original_url = trim((string)$xml->channel->item->enclosure->attributes()->url); |
|
| 419 | + $original_url = trim((string) $xml->channel->item->enclosure->attributes()->url); |
|
| 420 | 420 | $image_url = array(); |
| 421 | 421 | $image_url['thumbnail'] = $original_url; |
| 422 | 422 | $image_url['original'] = $original_url; |
| 423 | - $image_url['copyright'] = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->credit); |
|
| 424 | - $image_url['source_website'] = trim((string)$xml->channel->item->link); |
|
| 423 | + $image_url['copyright'] = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->credit); |
|
| 424 | + $image_url['source_website'] = trim((string) $xml->channel->item->link); |
|
| 425 | 425 | $image_url['source'] = 'flickr'; |
| 426 | 426 | return $image_url; |
| 427 | 427 | } |
@@ -429,7 +429,7 @@ discard block |
||
| 429 | 429 | return false; |
| 430 | 430 | } |
| 431 | 431 | |
| 432 | - public function fromIvaoMtl($type,$aircraft_icao,$airline_icao) { |
|
| 432 | + public function fromIvaoMtl($type, $aircraft_icao, $airline_icao) { |
|
| 433 | 433 | $Common = new Common(); |
| 434 | 434 | //echo "\n".'SEARCH IMAGE : http://mtlcatalog.ivao.aero/images/aircraft/'.$aircraft_icao.$airline_icao.'.jpg'; |
| 435 | 435 | if ($Common->urlexist('http://mtlcatalog.ivao.aero/images/aircraft/'.$aircraft_icao.$airline_icao.'.jpg')) { |
@@ -453,14 +453,14 @@ discard block |
||
| 453 | 453 | * @return Array the aircraft thumbnail, orignal url and copyright |
| 454 | 454 | * |
| 455 | 455 | */ |
| 456 | - public function fromBing($type,$aircraft_registration,$aircraft_name='') { |
|
| 456 | + public function fromBing($type, $aircraft_registration, $aircraft_name = '') { |
|
| 457 | 457 | global $globalImageBingKey; |
| 458 | 458 | $Common = new Common(); |
| 459 | 459 | if (!isset($globalImageBingKey) || $globalImageBingKey == '') return false; |
| 460 | 460 | if ($aircraft_name != '') $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.$aircraft_registration.'%20'.urlencode($aircraft_name).'%20-site:planespotters.com%20-site:flickr.com%27'; |
| 461 | 461 | else $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Baircraft%20-site:planespotters.com%20-site:flickr.com%27'; |
| 462 | - $headers = array("Authorization: Basic " . base64_encode("ignored:".$globalImageBingKey)); |
|
| 463 | - $data = $Common->getData($url,'get','',$headers); |
|
| 462 | + $headers = array("Authorization: Basic ".base64_encode("ignored:".$globalImageBingKey)); |
|
| 463 | + $data = $Common->getData($url, 'get', '', $headers); |
|
| 464 | 464 | $result = json_decode($data); |
| 465 | 465 | if (isset($result->d->results[0]->MediaUrl)) { |
| 466 | 466 | $image_url = array(); |
@@ -485,14 +485,14 @@ discard block |
||
| 485 | 485 | * @return Array the aircraft thumbnail, orignal url and copyright |
| 486 | 486 | * |
| 487 | 487 | */ |
| 488 | - public function fromAirportData($type,$aircraft_registration,$aircraft_name='') { |
|
| 488 | + public function fromAirportData($type, $aircraft_registration, $aircraft_name = '') { |
|
| 489 | 489 | $Common = new Common(); |
| 490 | 490 | $url = 'http://www.airport-data.com/api/ac_thumb.json?&n=1&r='.$aircraft_registration; |
| 491 | 491 | $data = $Common->getData($url); |
| 492 | 492 | $result = json_decode($data); |
| 493 | 493 | if (isset($result->count) && $result->count > 0) { |
| 494 | 494 | $image_url = array(); |
| 495 | - $image_url['original'] = str_replace('thumbnails','large',$result->data[0]->image); |
|
| 495 | + $image_url['original'] = str_replace('thumbnails', 'large', $result->data[0]->image); |
|
| 496 | 496 | $image_url['source_website'] = $result->data[0]->link; |
| 497 | 497 | $image_url['thumbnail'] = $result->data[0]->image; |
| 498 | 498 | $image_url['copyright'] = $result->data[0]->photographer; |
@@ -510,7 +510,7 @@ discard block |
||
| 510 | 510 | * @return Array the aircraft thumbnail, orignal url and copyright |
| 511 | 511 | * |
| 512 | 512 | */ |
| 513 | - public function fromWikimedia($type,$registration,$name='') { |
|
| 513 | + public function fromWikimedia($type, $registration, $name = '') { |
|
| 514 | 514 | $Common = new Common(); |
| 515 | 515 | if ($type == 'aircraft') { |
| 516 | 516 | if ($name != '') $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20'.urlencode($name); |
@@ -523,7 +523,7 @@ discard block |
||
| 523 | 523 | $result = json_decode($data); |
| 524 | 524 | if (isset($result->query->search[0]->title)) { |
| 525 | 525 | $fileo = $result->query->search[0]->title; |
| 526 | - if (substr($fileo,-3) == 'pdf') return false; |
|
| 526 | + if (substr($fileo, -3) == 'pdf') return false; |
|
| 527 | 527 | $file = urlencode($fileo); |
| 528 | 528 | $url2 = 'https://commons.wikimedia.org/w/api.php?action=query&format=json&continue&iilimit=500&prop=imageinfo&iiprop=user|url|size|mime|sha1|timestamp&iiurlwidth=200%27&titles='.$file; |
| 529 | 529 | $data2 = $Common->getData($url2); |
@@ -548,11 +548,11 @@ discard block |
||
| 548 | 548 | if (isset($result2->query->pages)) { |
| 549 | 549 | foreach ($result2->query->pages as $page) { |
| 550 | 550 | if (isset($page->imageinfo[0]->extmetadata->Artist)) { |
| 551 | - $image_url['copyright'] = preg_replace('/ from(.*)/','',strip_tags($page->imageinfo[0]->extmetadata->Artist->value)); |
|
| 551 | + $image_url['copyright'] = preg_replace('/ from(.*)/', '', strip_tags($page->imageinfo[0]->extmetadata->Artist->value)); |
|
| 552 | 552 | if (isset($page->imageinfo[0]->extmetadata->License->value)) { |
| 553 | 553 | $image_url['copyright'] = $image_url['copyright'].' (under '.$page->imageinfo[0]->extmetadata->License->value.')'; |
| 554 | 554 | } |
| 555 | - $image_url['copyright'] = trim(str_replace('\n','',$image_url['copyright'])); |
|
| 555 | + $image_url['copyright'] = trim(str_replace('\n', '', $image_url['copyright'])); |
|
| 556 | 556 | return $image_url; |
| 557 | 557 | } |
| 558 | 558 | } |
@@ -571,7 +571,7 @@ discard block |
||
| 571 | 571 | * @return Array the aircraft thumbnail, orignal url and copyright |
| 572 | 572 | * |
| 573 | 573 | */ |
| 574 | - public function fromCustomSource($type,$registration,$name='') { |
|
| 574 | + public function fromCustomSource($type, $registration, $name = '') { |
|
| 575 | 575 | global $globalAircraftImageCustomSources, $globalMarineImageCustomSources, $globalDebug; |
| 576 | 576 | //$globalAircraftImageCustomSource[] = array('thumbnail' => '','original' => '', 'copyright' => '', 'source_website' => '', 'source' => '','exif' => true); |
| 577 | 577 | if (!empty($globalAircraftImageCustomSources) && $type == 'aircraft') { |
@@ -588,15 +588,15 @@ discard block |
||
| 588 | 588 | print_r($source); |
| 589 | 589 | print_r($customsources); |
| 590 | 590 | } |
| 591 | - $url = str_replace('{registration}',$registration,$source['original']); |
|
| 592 | - $url_thumbnail = str_replace('{registration}',$registration,$source['thumbnail']); |
|
| 591 | + $url = str_replace('{registration}', $registration, $source['original']); |
|
| 592 | + $url_thumbnail = str_replace('{registration}', $registration, $source['thumbnail']); |
|
| 593 | 593 | if ($Common->urlexist($url)) { |
| 594 | 594 | $image_url = array(); |
| 595 | 595 | $image_url['thumbnail'] = $url_thumbnail; |
| 596 | 596 | $image_url['original'] = $url; |
| 597 | 597 | if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) $exifCopyright = $this->getExifCopyright($url); |
| 598 | 598 | else $exifCopyright = ''; |
| 599 | - if ($exifCopyright != '') $image_url['copyright'] = $exifCopyright; |
|
| 599 | + if ($exifCopyright != '') $image_url['copyright'] = $exifCopyright; |
|
| 600 | 600 | elseif (isset($source['copyright'])) $image_url['copyright'] = $source['copyright']; |
| 601 | 601 | else $image_url['copyright'] = $source['source_website']; |
| 602 | 602 | $image_url['source_website'] = $source['source_website']; |
@@ -620,19 +620,19 @@ discard block |
||
| 620 | 620 | print_r($source); |
| 621 | 621 | print_r($customsources); |
| 622 | 622 | } |
| 623 | - $url = str_replace('{registration}',$registration,$source['original']); |
|
| 624 | - $url = str_replace('{mmsi}',$registration,$url); |
|
| 625 | - $url = str_replace('{name}',$name,$url); |
|
| 626 | - $url_thumbnail = str_replace('{registration}',$registration,$source['thumbnail']); |
|
| 627 | - $url_thumbnail = str_replace('{mmsi}',$registration,$url_thumbnail); |
|
| 628 | - $url_thumbnail = str_replace('{name}',$name,$url_thumbnail); |
|
| 623 | + $url = str_replace('{registration}', $registration, $source['original']); |
|
| 624 | + $url = str_replace('{mmsi}', $registration, $url); |
|
| 625 | + $url = str_replace('{name}', $name, $url); |
|
| 626 | + $url_thumbnail = str_replace('{registration}', $registration, $source['thumbnail']); |
|
| 627 | + $url_thumbnail = str_replace('{mmsi}', $registration, $url_thumbnail); |
|
| 628 | + $url_thumbnail = str_replace('{name}', $name, $url_thumbnail); |
|
| 629 | 629 | if ($Common->urlexist($url)) { |
| 630 | 630 | $image_url = array(); |
| 631 | 631 | $image_url['thumbnail'] = $url_thumbnail; |
| 632 | 632 | $image_url['original'] = $url; |
| 633 | 633 | if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) $exifCopyright = $this->getExifCopyright($url); |
| 634 | 634 | else $exifCopyright = ''; |
| 635 | - if ($exifCopyright != '') $image_url['copyright'] = $exifCopyright; |
|
| 635 | + if ($exifCopyright != '') $image_url['copyright'] = $exifCopyright; |
|
| 636 | 636 | elseif (isset($source['copyright'])) $image_url['copyright'] = $source['copyright']; |
| 637 | 637 | else $image_url['copyright'] = $source['source_website']; |
| 638 | 638 | $image_url['source_website'] = $source['source_website']; |
@@ -23,7 +23,9 @@ discard block |
||
| 23 | 23 | $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
| 24 | 24 | $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
| 25 | 25 | $reg = $registration; |
| 26 | - if ($reg == '' && $aircraft_icao != '') $reg = $aircraft_icao.$airline_icao; |
|
| 26 | + if ($reg == '' && $aircraft_icao != '') { |
|
| 27 | + $reg = $aircraft_icao.$airline_icao; |
|
| 28 | + } |
|
| 27 | 29 | $reg = trim($reg); |
| 28 | 30 | $query = "SELECT spotter_image.image, spotter_image.image_thumbnail, spotter_image.image_source, spotter_image.image_source_website,spotter_image.image_copyright, spotter_image.registration |
| 29 | 31 | FROM spotter_image |
@@ -31,9 +33,13 @@ discard block |
||
| 31 | 33 | $sth = $this->db->prepare($query); |
| 32 | 34 | $sth->execute(array(':registration' => $reg)); |
| 33 | 35 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 34 | - if (!empty($result)) return $result; |
|
| 35 | - elseif ($registration != '') return $this->getSpotterImage('',$aircraft_icao,$airline_icao); |
|
| 36 | - else return array(); |
|
| 36 | + if (!empty($result)) { |
|
| 37 | + return $result; |
|
| 38 | + } elseif ($registration != '') { |
|
| 39 | + return $this->getSpotterImage('',$aircraft_icao,$airline_icao); |
|
| 40 | + } else { |
|
| 41 | + return array(); |
|
| 42 | + } |
|
| 37 | 43 | } |
| 38 | 44 | |
| 39 | 45 | /** |
@@ -76,8 +82,11 @@ discard block |
||
| 76 | 82 | public function getExifCopyright($url) { |
| 77 | 83 | $exif = exif_read_data($url); |
| 78 | 84 | $copyright = ''; |
| 79 | - if (isset($exif['COMPUTED']['copyright'])) $copyright = $exif['COMPUTED']['copyright']; |
|
| 80 | - elseif (isset($exif['copyright'])) $copyright = $exif['copyright']; |
|
| 85 | + if (isset($exif['COMPUTED']['copyright'])) { |
|
| 86 | + $copyright = $exif['COMPUTED']['copyright']; |
|
| 87 | + } elseif (isset($exif['copyright'])) { |
|
| 88 | + $copyright = $exif['copyright']; |
|
| 89 | + } |
|
| 81 | 90 | if ($copyright != '') { |
| 82 | 91 | $copyright = str_replace('Copyright ','',$copyright); |
| 83 | 92 | $copyright = str_replace('© ','',$copyright); |
@@ -95,17 +104,27 @@ discard block |
||
| 95 | 104 | public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '') |
| 96 | 105 | { |
| 97 | 106 | global $globalDebug,$globalAircraftImageFetch; |
| 98 | - if (isset($globalAircraftImageFetch) && !$globalAircraftImageFetch) return ''; |
|
| 107 | + if (isset($globalAircraftImageFetch) && !$globalAircraftImageFetch) { |
|
| 108 | + return ''; |
|
| 109 | + } |
|
| 99 | 110 | $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
| 100 | 111 | $registration = trim($registration); |
| 101 | 112 | //getting the aircraft image |
| 102 | - if ($globalDebug && $registration != '') echo 'Try to find an aircraft image for '.$registration.'...'; |
|
| 103 | - elseif ($globalDebug && $aircraft_icao != '') echo 'Try to find an aircraft image for '.$aircraft_icao.'...'; |
|
| 104 | - elseif ($globalDebug && $airline_icao != '') echo 'Try to find an aircraft image for '.$airline_icao.'...'; |
|
| 113 | + if ($globalDebug && $registration != '') { |
|
| 114 | + echo 'Try to find an aircraft image for '.$registration.'...'; |
|
| 115 | + } elseif ($globalDebug && $aircraft_icao != '') { |
|
| 116 | + echo 'Try to find an aircraft image for '.$aircraft_icao.'...'; |
|
| 117 | + } elseif ($globalDebug && $airline_icao != '') { |
|
| 118 | + echo 'Try to find an aircraft image for '.$airline_icao.'...'; |
|
| 119 | + } |
|
| 105 | 120 | $image_url = $this->findAircraftImage($registration,$aircraft_icao,$airline_icao); |
| 106 | - if ($registration == '' && $aircraft_icao != '') $registration = $aircraft_icao.$airline_icao; |
|
| 121 | + if ($registration == '' && $aircraft_icao != '') { |
|
| 122 | + $registration = $aircraft_icao.$airline_icao; |
|
| 123 | + } |
|
| 107 | 124 | if ($image_url['original'] != '') { |
| 108 | - if ($globalDebug) echo 'Found !'."\n"; |
|
| 125 | + if ($globalDebug) { |
|
| 126 | + echo 'Found !'."\n"; |
|
| 127 | + } |
|
| 109 | 128 | $query = "INSERT INTO spotter_image (registration, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:registration,:image,:image_thumbnail,:copyright,:source,:source_website)"; |
| 110 | 129 | try { |
| 111 | 130 | $sth = $this->db->prepare($query); |
@@ -114,7 +133,9 @@ discard block |
||
| 114 | 133 | echo $e->getMessage()."\n"; |
| 115 | 134 | return "error"; |
| 116 | 135 | } |
| 117 | - } elseif ($globalDebug) echo "Not found :'(\n"; |
|
| 136 | + } elseif ($globalDebug) { |
|
| 137 | + echo "Not found :'(\n"; |
|
| 138 | + } |
|
| 118 | 139 | return "success"; |
| 119 | 140 | } |
| 120 | 141 | |
@@ -127,7 +148,9 @@ discard block |
||
| 127 | 148 | public function addMarineImage($mmsi,$imo = '',$name = '') |
| 128 | 149 | { |
| 129 | 150 | global $globalDebug,$globalMarineImageFetch; |
| 130 | - if (isset($globalMarineImageFetch) && !$globalMarineImageFetch) return ''; |
|
| 151 | + if (isset($globalMarineImageFetch) && !$globalMarineImageFetch) { |
|
| 152 | + return ''; |
|
| 153 | + } |
|
| 131 | 154 | $mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING); |
| 132 | 155 | $imo = filter_var($imo,FILTER_SANITIZE_STRING); |
| 133 | 156 | $name = filter_var($name,FILTER_SANITIZE_STRING); |
@@ -137,16 +160,22 @@ discard block |
||
| 137 | 160 | $identity = $Marine->getIdentity($mmsi); |
| 138 | 161 | if (isset($identity[0]['mmsi'])) { |
| 139 | 162 | $imo = $identity[0]['imo']; |
| 140 | - if ($identity[0]['ship_name'] != '') $name = $identity[0]['ship_name']; |
|
| 163 | + if ($identity[0]['ship_name'] != '') { |
|
| 164 | + $name = $identity[0]['ship_name']; |
|
| 165 | + } |
|
| 141 | 166 | } |
| 142 | 167 | } |
| 143 | 168 | unset($Marine); |
| 144 | 169 | |
| 145 | 170 | //getting the aircraft image |
| 146 | - if ($globalDebug && $name != '') echo 'Try to find an vessel image for '.$name.'...'; |
|
| 171 | + if ($globalDebug && $name != '') { |
|
| 172 | + echo 'Try to find an vessel image for '.$name.'...'; |
|
| 173 | + } |
|
| 147 | 174 | $image_url = $this->findMarineImage($mmsi,$imo,$name); |
| 148 | 175 | if ($image_url['original'] != '') { |
| 149 | - if ($globalDebug) echo 'Found !'."\n"; |
|
| 176 | + if ($globalDebug) { |
|
| 177 | + echo 'Found !'."\n"; |
|
| 178 | + } |
|
| 150 | 179 | $query = "INSERT INTO marine_image (mmsi,imo,name, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:mmsi,:imo,:name,:image,:image_thumbnail,:copyright,:source,:source_website)"; |
| 151 | 180 | try { |
| 152 | 181 | $sth = $this->db->prepare($query); |
@@ -155,7 +184,9 @@ discard block |
||
| 155 | 184 | echo $e->getMessage()."\n"; |
| 156 | 185 | return "error"; |
| 157 | 186 | } |
| 158 | - } elseif ($globalDebug) echo "Not found :'(\n"; |
|
| 187 | + } elseif ($globalDebug) { |
|
| 188 | + echo "Not found :'(\n"; |
|
| 189 | + } |
|
| 159 | 190 | return "success"; |
| 160 | 191 | } |
| 161 | 192 | |
@@ -170,41 +201,85 @@ discard block |
||
| 170 | 201 | { |
| 171 | 202 | global $globalAircraftImageSources, $globalIVAO, $globalAircraftImageCheckICAO; |
| 172 | 203 | $Spotter = new Spotter($this->db); |
| 173 | - if (!isset($globalIVAO)) $globalIVAO = FALSE; |
|
| 204 | + if (!isset($globalIVAO)) { |
|
| 205 | + $globalIVAO = FALSE; |
|
| 206 | + } |
|
| 174 | 207 | $aircraft_registration = filter_var($aircraft_registration,FILTER_SANITIZE_STRING); |
| 175 | 208 | if ($aircraft_registration != '') { |
| 176 | - if (strpos($aircraft_registration,'/') !== false) return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 209 | + if (strpos($aircraft_registration,'/') !== false) { |
|
| 210 | + return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 211 | + } |
|
| 177 | 212 | $aircraft_registration = urlencode(trim($aircraft_registration)); |
| 178 | 213 | $aircraft_info = $Spotter->getAircraftInfoByRegistration($aircraft_registration); |
| 179 | - if (isset($aircraft_info[0]['aircraft_name'])) $aircraft_name = $aircraft_info[0]['aircraft_name']; |
|
| 180 | - else $aircraft_name = ''; |
|
| 181 | - if (isset($aircraft_info[0]['aircraft_icao'])) $aircraft_name = $aircraft_info[0]['aircraft_icao']; |
|
| 182 | - else $aircraft_icao = ''; |
|
| 183 | - if (isset($aircraft_info[0]['airline_icao'])) $airline_icao = $aircraft_info[0]['airline_icao']; |
|
| 184 | - else $airline_icao = ''; |
|
| 214 | + if (isset($aircraft_info[0]['aircraft_name'])) { |
|
| 215 | + $aircraft_name = $aircraft_info[0]['aircraft_name']; |
|
| 216 | + } else { |
|
| 217 | + $aircraft_name = ''; |
|
| 218 | + } |
|
| 219 | + if (isset($aircraft_info[0]['aircraft_icao'])) { |
|
| 220 | + $aircraft_name = $aircraft_info[0]['aircraft_icao']; |
|
| 221 | + } else { |
|
| 222 | + $aircraft_icao = ''; |
|
| 223 | + } |
|
| 224 | + if (isset($aircraft_info[0]['airline_icao'])) { |
|
| 225 | + $airline_icao = $aircraft_info[0]['airline_icao']; |
|
| 226 | + } else { |
|
| 227 | + $airline_icao = ''; |
|
| 228 | + } |
|
| 185 | 229 | } elseif ($aircraft_icao != '') { |
| 186 | 230 | $aircraft_info = $Spotter->getAllAircraftInfo($aircraft_icao); |
| 187 | - if (isset($aircraft_info[0]['type'])) $aircraft_name = $aircraft_info[0]['type']; |
|
| 188 | - else $aircraft_name = ''; |
|
| 231 | + if (isset($aircraft_info[0]['type'])) { |
|
| 232 | + $aircraft_name = $aircraft_info[0]['type']; |
|
| 233 | + } else { |
|
| 234 | + $aircraft_name = ''; |
|
| 235 | + } |
|
| 189 | 236 | $aircraft_registration = $aircraft_icao; |
| 190 | - } else return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => ''); |
|
| 237 | + } else { |
|
| 238 | + return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => ''); |
|
| 239 | + } |
|
| 191 | 240 | unset($Spotter); |
| 192 | - if (!isset($globalAircraftImageSources)) $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters'); |
|
| 241 | + if (!isset($globalAircraftImageSources)) { |
|
| 242 | + $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters'); |
|
| 243 | + } |
|
| 193 | 244 | foreach ($globalAircraftImageSources as $source) { |
| 194 | 245 | $source = strtolower($source); |
| 195 | - if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') $images_array = $this->fromIvaoMtl('aircraft',$aircraft_icao,$airline_icao); |
|
| 196 | - if ($source == 'planespotters' && !$globalIVAO) $images_array = $this->fromPlanespotters('aircraft',$aircraft_registration,$aircraft_name); |
|
| 197 | - if ($source == 'flickr') $images_array = $this->fromFlickr('aircraft',$aircraft_registration,$aircraft_name); |
|
| 198 | - if ($source == 'bing') $images_array = $this->fromBing('aircraft',$aircraft_registration,$aircraft_name); |
|
| 199 | - if ($source == 'deviantart') $images_array = $this->fromDeviantart('aircraft',$aircraft_registration,$aircraft_name); |
|
| 200 | - if ($source == 'wikimedia') $images_array = $this->fromWikimedia('aircraft',$aircraft_registration,$aircraft_name); |
|
| 201 | - if ($source == 'jetphotos' && !$globalIVAO) $images_array = $this->fromJetPhotos('aircraft',$aircraft_registration,$aircraft_name); |
|
| 202 | - if ($source == 'planepictures' && !$globalIVAO) $images_array = $this->fromPlanePictures('aircraft',$aircraft_registration,$aircraft_name); |
|
| 203 | - if ($source == 'airportdata' && !$globalIVAO) $images_array = $this->fromAirportData('aircraft',$aircraft_registration,$aircraft_name); |
|
| 204 | - if ($source == 'customsources') $images_array = $this->fromCustomSource('aircraft',$aircraft_registration,$aircraft_name); |
|
| 205 | - if (isset($images_array) && $images_array['original'] != '') return $images_array; |
|
| 206 | - } |
|
| 207 | - if ((!isset($globalAircraftImageCheckICAO) || $globalAircraftImageCheckICAO === TRUE) && isset($aircraft_icao)) return $this->findAircraftImage($aircraft_icao); |
|
| 246 | + if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') { |
|
| 247 | + $images_array = $this->fromIvaoMtl('aircraft',$aircraft_icao,$airline_icao); |
|
| 248 | + } |
|
| 249 | + if ($source == 'planespotters' && !$globalIVAO) { |
|
| 250 | + $images_array = $this->fromPlanespotters('aircraft',$aircraft_registration,$aircraft_name); |
|
| 251 | + } |
|
| 252 | + if ($source == 'flickr') { |
|
| 253 | + $images_array = $this->fromFlickr('aircraft',$aircraft_registration,$aircraft_name); |
|
| 254 | + } |
|
| 255 | + if ($source == 'bing') { |
|
| 256 | + $images_array = $this->fromBing('aircraft',$aircraft_registration,$aircraft_name); |
|
| 257 | + } |
|
| 258 | + if ($source == 'deviantart') { |
|
| 259 | + $images_array = $this->fromDeviantart('aircraft',$aircraft_registration,$aircraft_name); |
|
| 260 | + } |
|
| 261 | + if ($source == 'wikimedia') { |
|
| 262 | + $images_array = $this->fromWikimedia('aircraft',$aircraft_registration,$aircraft_name); |
|
| 263 | + } |
|
| 264 | + if ($source == 'jetphotos' && !$globalIVAO) { |
|
| 265 | + $images_array = $this->fromJetPhotos('aircraft',$aircraft_registration,$aircraft_name); |
|
| 266 | + } |
|
| 267 | + if ($source == 'planepictures' && !$globalIVAO) { |
|
| 268 | + $images_array = $this->fromPlanePictures('aircraft',$aircraft_registration,$aircraft_name); |
|
| 269 | + } |
|
| 270 | + if ($source == 'airportdata' && !$globalIVAO) { |
|
| 271 | + $images_array = $this->fromAirportData('aircraft',$aircraft_registration,$aircraft_name); |
|
| 272 | + } |
|
| 273 | + if ($source == 'customsources') { |
|
| 274 | + $images_array = $this->fromCustomSource('aircraft',$aircraft_registration,$aircraft_name); |
|
| 275 | + } |
|
| 276 | + if (isset($images_array) && $images_array['original'] != '') { |
|
| 277 | + return $images_array; |
|
| 278 | + } |
|
| 279 | + } |
|
| 280 | + if ((!isset($globalAircraftImageCheckICAO) || $globalAircraftImageCheckICAO === TRUE) && isset($aircraft_icao)) { |
|
| 281 | + return $this->findAircraftImage($aircraft_icao); |
|
| 282 | + } |
|
| 208 | 283 | return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
| 209 | 284 | } |
| 210 | 285 | |
@@ -224,7 +299,9 @@ discard block |
||
| 224 | 299 | //$imo = filter_var($imo,FILTER_SANITIZE_STRING); |
| 225 | 300 | $name = filter_var($name,FILTER_SANITIZE_STRING); |
| 226 | 301 | $name = trim($name); |
| 227 | - if (strlen($name) < 4) return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => ''); |
|
| 302 | + if (strlen($name) < 4) { |
|
| 303 | + return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => ''); |
|
| 304 | + } |
|
| 228 | 305 | /* |
| 229 | 306 | $Marine = new Marine($this->db); |
| 230 | 307 | if ($imo == '' || $name == '') { |
@@ -236,15 +313,29 @@ discard block |
||
| 236 | 313 | } |
| 237 | 314 | unset($Marine); |
| 238 | 315 | */ |
| 239 | - if (!isset($globalMarineImageSources)) $globalMarineImageSources = array('wikimedia','deviantart','flickr','bing'); |
|
| 316 | + if (!isset($globalMarineImageSources)) { |
|
| 317 | + $globalMarineImageSources = array('wikimedia','deviantart','flickr','bing'); |
|
| 318 | + } |
|
| 240 | 319 | foreach ($globalMarineImageSources as $source) { |
| 241 | 320 | $source = strtolower($source); |
| 242 | - if ($source == 'flickr') $images_array = $this->fromFlickr('marine',$mmsi,$name); |
|
| 243 | - if ($source == 'bing') $images_array = $this->fromBing('marine',$mmsi,$name); |
|
| 244 | - if ($source == 'deviantart') $images_array = $this->fromDeviantart('marine',$mmsi,$name); |
|
| 245 | - if ($source == 'wikimedia') $images_array = $this->fromWikimedia('marine',$mmsi,$name); |
|
| 246 | - if ($source == 'customsources') $images_array = $this->fromCustomSource('marine',$mmsi,$name); |
|
| 247 | - if (isset($images_array) && $images_array['original'] != '') return $images_array; |
|
| 321 | + if ($source == 'flickr') { |
|
| 322 | + $images_array = $this->fromFlickr('marine',$mmsi,$name); |
|
| 323 | + } |
|
| 324 | + if ($source == 'bing') { |
|
| 325 | + $images_array = $this->fromBing('marine',$mmsi,$name); |
|
| 326 | + } |
|
| 327 | + if ($source == 'deviantart') { |
|
| 328 | + $images_array = $this->fromDeviantart('marine',$mmsi,$name); |
|
| 329 | + } |
|
| 330 | + if ($source == 'wikimedia') { |
|
| 331 | + $images_array = $this->fromWikimedia('marine',$mmsi,$name); |
|
| 332 | + } |
|
| 333 | + if ($source == 'customsources') { |
|
| 334 | + $images_array = $this->fromCustomSource('marine',$mmsi,$name); |
|
| 335 | + } |
|
| 336 | + if (isset($images_array) && $images_array['original'] != '') { |
|
| 337 | + return $images_array; |
|
| 338 | + } |
|
| 248 | 339 | } |
| 249 | 340 | return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
| 250 | 341 | } |
@@ -407,11 +498,17 @@ discard block |
||
| 407 | 498 | public function fromFlickr($type,$registration,$name='') { |
| 408 | 499 | $Common = new Common(); |
| 409 | 500 | if ($type == 'aircraft') { |
| 410 | - if ($name != '') $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.','.urlencode($name); |
|
| 411 | - else $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.',aircraft'; |
|
| 501 | + if ($name != '') { |
|
| 502 | + $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.','.urlencode($name); |
|
| 503 | + } else { |
|
| 504 | + $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.',aircraft'; |
|
| 505 | + } |
|
| 412 | 506 | } elseif ($type == 'marine') { |
| 413 | - if ($name != '') $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.urlencode($name); |
|
| 414 | - else $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.',vessel'; |
|
| 507 | + if ($name != '') { |
|
| 508 | + $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.urlencode($name); |
|
| 509 | + } else { |
|
| 510 | + $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.',vessel'; |
|
| 511 | + } |
|
| 415 | 512 | } |
| 416 | 513 | $data = $Common->getData($url); |
| 417 | 514 | if ($xml = simplexml_load_string($data)) { |
@@ -456,9 +553,14 @@ discard block |
||
| 456 | 553 | public function fromBing($type,$aircraft_registration,$aircraft_name='') { |
| 457 | 554 | global $globalImageBingKey; |
| 458 | 555 | $Common = new Common(); |
| 459 | - if (!isset($globalImageBingKey) || $globalImageBingKey == '') return false; |
|
| 460 | - if ($aircraft_name != '') $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.$aircraft_registration.'%20'.urlencode($aircraft_name).'%20-site:planespotters.com%20-site:flickr.com%27'; |
|
| 461 | - else $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Baircraft%20-site:planespotters.com%20-site:flickr.com%27'; |
|
| 556 | + if (!isset($globalImageBingKey) || $globalImageBingKey == '') { |
|
| 557 | + return false; |
|
| 558 | + } |
|
| 559 | + if ($aircraft_name != '') { |
|
| 560 | + $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.$aircraft_registration.'%20'.urlencode($aircraft_name).'%20-site:planespotters.com%20-site:flickr.com%27'; |
|
| 561 | + } else { |
|
| 562 | + $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Baircraft%20-site:planespotters.com%20-site:flickr.com%27'; |
|
| 563 | + } |
|
| 462 | 564 | $headers = array("Authorization: Basic " . base64_encode("ignored:".$globalImageBingKey)); |
| 463 | 565 | $data = $Common->getData($url,'get','',$headers); |
| 464 | 566 | $result = json_decode($data); |
@@ -513,17 +615,25 @@ discard block |
||
| 513 | 615 | public function fromWikimedia($type,$registration,$name='') { |
| 514 | 616 | $Common = new Common(); |
| 515 | 617 | if ($type == 'aircraft') { |
| 516 | - if ($name != '') $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20'.urlencode($name); |
|
| 517 | - else $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20aircraft'; |
|
| 618 | + if ($name != '') { |
|
| 619 | + $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20'.urlencode($name); |
|
| 620 | + } else { |
|
| 621 | + $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20aircraft'; |
|
| 622 | + } |
|
| 518 | 623 | } elseif ($type == 'marine') { |
| 519 | - if ($name != '') $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.urlencode($name).'"'; |
|
| 520 | - else return false; |
|
| 624 | + if ($name != '') { |
|
| 625 | + $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.urlencode($name).'"'; |
|
| 626 | + } else { |
|
| 627 | + return false; |
|
| 628 | + } |
|
| 521 | 629 | } |
| 522 | 630 | $data = $Common->getData($url); |
| 523 | 631 | $result = json_decode($data); |
| 524 | 632 | if (isset($result->query->search[0]->title)) { |
| 525 | 633 | $fileo = $result->query->search[0]->title; |
| 526 | - if (substr($fileo,-3) == 'pdf') return false; |
|
| 634 | + if (substr($fileo,-3) == 'pdf') { |
|
| 635 | + return false; |
|
| 636 | + } |
|
| 527 | 637 | $file = urlencode($fileo); |
| 528 | 638 | $url2 = 'https://commons.wikimedia.org/w/api.php?action=query&format=json&continue&iilimit=500&prop=imageinfo&iiprop=user|url|size|mime|sha1|timestamp&iiurlwidth=200%27&titles='.$file; |
| 529 | 639 | $data2 = $Common->getData($url2); |
@@ -594,18 +704,27 @@ discard block |
||
| 594 | 704 | $image_url = array(); |
| 595 | 705 | $image_url['thumbnail'] = $url_thumbnail; |
| 596 | 706 | $image_url['original'] = $url; |
| 597 | - if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) $exifCopyright = $this->getExifCopyright($url); |
|
| 598 | - else $exifCopyright = ''; |
|
| 599 | - if ($exifCopyright != '') $image_url['copyright'] = $exifCopyright; |
|
| 600 | - elseif (isset($source['copyright'])) $image_url['copyright'] = $source['copyright']; |
|
| 601 | - else $image_url['copyright'] = $source['source_website']; |
|
| 707 | + if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) { |
|
| 708 | + $exifCopyright = $this->getExifCopyright($url); |
|
| 709 | + } else { |
|
| 710 | + $exifCopyright = ''; |
|
| 711 | + } |
|
| 712 | + if ($exifCopyright != '') { |
|
| 713 | + $image_url['copyright'] = $exifCopyright; |
|
| 714 | + } elseif (isset($source['copyright'])) { |
|
| 715 | + $image_url['copyright'] = $source['copyright']; |
|
| 716 | + } else { |
|
| 717 | + $image_url['copyright'] = $source['source_website']; |
|
| 718 | + } |
|
| 602 | 719 | $image_url['source_website'] = $source['source_website']; |
| 603 | 720 | $image_url['source'] = $source['source']; |
| 604 | 721 | return $image_url; |
| 605 | 722 | } |
| 606 | 723 | } |
| 607 | 724 | return false; |
| 608 | - } else return false; |
|
| 725 | + } else { |
|
| 726 | + return false; |
|
| 727 | + } |
|
| 609 | 728 | if (!empty($globalMarineImageCustomSources) && $type == 'marine') { |
| 610 | 729 | $customsources = array(); |
| 611 | 730 | if (!isset($globalMarineImageCustomSources[0])) { |
@@ -630,18 +749,27 @@ discard block |
||
| 630 | 749 | $image_url = array(); |
| 631 | 750 | $image_url['thumbnail'] = $url_thumbnail; |
| 632 | 751 | $image_url['original'] = $url; |
| 633 | - if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) $exifCopyright = $this->getExifCopyright($url); |
|
| 634 | - else $exifCopyright = ''; |
|
| 635 | - if ($exifCopyright != '') $image_url['copyright'] = $exifCopyright; |
|
| 636 | - elseif (isset($source['copyright'])) $image_url['copyright'] = $source['copyright']; |
|
| 637 | - else $image_url['copyright'] = $source['source_website']; |
|
| 752 | + if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) { |
|
| 753 | + $exifCopyright = $this->getExifCopyright($url); |
|
| 754 | + } else { |
|
| 755 | + $exifCopyright = ''; |
|
| 756 | + } |
|
| 757 | + if ($exifCopyright != '') { |
|
| 758 | + $image_url['copyright'] = $exifCopyright; |
|
| 759 | + } elseif (isset($source['copyright'])) { |
|
| 760 | + $image_url['copyright'] = $source['copyright']; |
|
| 761 | + } else { |
|
| 762 | + $image_url['copyright'] = $source['source_website']; |
|
| 763 | + } |
|
| 638 | 764 | $image_url['source_website'] = $source['source_website']; |
| 639 | 765 | $image_url['source'] = $source['source']; |
| 640 | 766 | return $image_url; |
| 641 | 767 | } |
| 642 | 768 | } |
| 643 | 769 | return false; |
| 644 | - } else return false; |
|
| 770 | + } else { |
|
| 771 | + return false; |
|
| 772 | + } |
|
| 645 | 773 | } |
| 646 | 774 | } |
| 647 | 775 | |
@@ -9,25 +9,25 @@ discard block |
||
| 9 | 9 | require_once(dirname(__FILE__).'/class.Stats.php'); |
| 10 | 10 | require_once(dirname(__FILE__).'/class.Source.php'); |
| 11 | 11 | if (isset($globalServerAPRS) && $globalServerAPRS) { |
| 12 | - require_once(dirname(__FILE__).'/class.APRS.php'); |
|
| 12 | + require_once(dirname(__FILE__).'/class.APRS.php'); |
|
| 13 | 13 | } |
| 14 | 14 | |
| 15 | 15 | class MarineImport { |
| 16 | - private $all_tracked = array(); |
|
| 17 | - private $last_delete_hourly = 0; |
|
| 18 | - private $last_delete = 0; |
|
| 19 | - private $stats = array(); |
|
| 20 | - private $tmd = 0; |
|
| 21 | - private $source_location = array(); |
|
| 22 | - public $db = null; |
|
| 23 | - public $nb = 0; |
|
| 16 | + private $all_tracked = array(); |
|
| 17 | + private $last_delete_hourly = 0; |
|
| 18 | + private $last_delete = 0; |
|
| 19 | + private $stats = array(); |
|
| 20 | + private $tmd = 0; |
|
| 21 | + private $source_location = array(); |
|
| 22 | + public $db = null; |
|
| 23 | + public $nb = 0; |
|
| 24 | 24 | |
| 25 | - public function __construct($dbc = null) { |
|
| 25 | + public function __construct($dbc = null) { |
|
| 26 | 26 | global $globalBeta, $globalServerAPRS, $APRSMarine, $globalNoDB; |
| 27 | 27 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 28 | - $Connection = new Connection($dbc); |
|
| 29 | - $this->db = $Connection->db(); |
|
| 30 | - date_default_timezone_set('UTC'); |
|
| 28 | + $Connection = new Connection($dbc); |
|
| 29 | + $this->db = $Connection->db(); |
|
| 30 | + date_default_timezone_set('UTC'); |
|
| 31 | 31 | } |
| 32 | 32 | // Get previous source stats |
| 33 | 33 | /* |
@@ -46,55 +46,55 @@ discard block |
||
| 46 | 46 | } |
| 47 | 47 | */ |
| 48 | 48 | if (isset($globalServerAPRS) && $globalServerAPRS) { |
| 49 | - $APRSMarine = new APRSMarine(); |
|
| 50 | - //$APRSSpotter->connect(); |
|
| 49 | + $APRSMarine = new APRSMarine(); |
|
| 50 | + //$APRSSpotter->connect(); |
|
| 51 | + } |
|
| 51 | 52 | } |
| 52 | - } |
|
| 53 | 53 | |
| 54 | - public function checkAll() { |
|
| 54 | + public function checkAll() { |
|
| 55 | 55 | global $globalDebug; |
| 56 | 56 | if ($globalDebug) echo "Update last seen tracked data...\n"; |
| 57 | 57 | foreach ($this->all_tracked as $key => $flight) { |
| 58 | - if (isset($this->all_tracked[$key]['id'])) { |
|
| 58 | + if (isset($this->all_tracked[$key]['id'])) { |
|
| 59 | 59 | //echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].' '.$this->all_tracked[$key]['longitude']."\n"; |
| 60 | - $Marine = new Marine($this->db); |
|
| 61 | - $Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']); |
|
| 62 | - } |
|
| 60 | + $Marine = new Marine($this->db); |
|
| 61 | + $Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']); |
|
| 62 | + } |
|
| 63 | + } |
|
| 63 | 64 | } |
| 64 | - } |
|
| 65 | 65 | |
| 66 | - public function del() { |
|
| 66 | + public function del() { |
|
| 67 | 67 | global $globalDebug, $globalNoDB, $globalNoImport; |
| 68 | 68 | // Delete old infos |
| 69 | 69 | if ($globalDebug) echo 'Delete old values and update latest data...'."\n"; |
| 70 | 70 | foreach ($this->all_tracked as $key => $flight) { |
| 71 | - if (isset($flight['lastupdate'])) { |
|
| 72 | - if ($flight['lastupdate'] < (time()-3000)) { |
|
| 73 | - if ((!isset($globalNoImport) || $globalNoImport !== TRUE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
|
| 74 | - if (isset($this->all_tracked[$key]['id'])) { |
|
| 75 | - if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n"; |
|
| 76 | - /* |
|
| 71 | + if (isset($flight['lastupdate'])) { |
|
| 72 | + if ($flight['lastupdate'] < (time()-3000)) { |
|
| 73 | + if ((!isset($globalNoImport) || $globalNoImport !== TRUE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
|
| 74 | + if (isset($this->all_tracked[$key]['id'])) { |
|
| 75 | + if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n"; |
|
| 76 | + /* |
|
| 77 | 77 | $MarineLive = new MarineLive(); |
| 78 | 78 | $MarineLive->deleteLiveMarineDataById($this->all_tracked[$key]['id']); |
| 79 | 79 | $MarineLive->db = null; |
| 80 | 80 | */ |
| 81 | - //$real_arrival = $this->arrival($key); |
|
| 82 | - $Marine = new Marine($this->db); |
|
| 83 | - if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') { |
|
| 81 | + //$real_arrival = $this->arrival($key); |
|
| 82 | + $Marine = new Marine($this->db); |
|
| 83 | + if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') { |
|
| 84 | 84 | $result = $Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']); |
| 85 | 85 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 86 | - } |
|
| 87 | - // Put in archive |
|
| 86 | + } |
|
| 87 | + // Put in archive |
|
| 88 | 88 | // $Marine->db = null; |
| 89 | 89 | } |
| 90 | - } |
|
| 91 | - unset($this->all_tracked[$key]); |
|
| 92 | - } |
|
| 93 | - } |
|
| 94 | - } |
|
| 95 | - } |
|
| 90 | + } |
|
| 91 | + unset($this->all_tracked[$key]); |
|
| 92 | + } |
|
| 93 | + } |
|
| 94 | + } |
|
| 95 | + } |
|
| 96 | 96 | |
| 97 | - public function add($line) { |
|
| 97 | + public function add($line) { |
|
| 98 | 98 | global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked, $globalNoImport, $globalNoDB, $globalServerAPRS,$APRSMarine; |
| 99 | 99 | if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02'; |
| 100 | 100 | date_default_timezone_set('UTC'); |
@@ -103,8 +103,8 @@ discard block |
||
| 103 | 103 | |
| 104 | 104 | // SBS format is CSV format |
| 105 | 105 | if(is_array($line) && isset($line['mmsi'])) { |
| 106 | - //print_r($line); |
|
| 107 | - if (isset($line['mmsi'])) { |
|
| 106 | + //print_r($line); |
|
| 107 | + if (isset($line['mmsi'])) { |
|
| 108 | 108 | |
| 109 | 109 | /* |
| 110 | 110 | // Increment message number |
@@ -121,64 +121,64 @@ discard block |
||
| 121 | 121 | |
| 122 | 122 | $Common = new Common(); |
| 123 | 123 | $AIS = new AIS(); |
| 124 | - if (!isset($line['id'])) $id = trim($line['mmsi']); |
|
| 125 | - else $id = trim($line['id']); |
|
| 124 | + if (!isset($line['id'])) $id = trim($line['mmsi']); |
|
| 125 | + else $id = trim($line['id']); |
|
| 126 | 126 | |
| 127 | 127 | if (!isset($this->all_tracked[$id])) { |
| 128 | - $this->all_tracked[$id] = array(); |
|
| 129 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedMarine' => 0)); |
|
| 130 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','typeid' => '','noarchive' => false,'putinarchive' => true,'over_country' => '','mmsi' => '','status' => '','imo' => '','callsign' => '','arrival_code' => '','arrival_date' => '','mmsi_type' => '')); |
|
| 131 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time())); |
|
| 132 | - if (!isset($line['id'])) { |
|
| 128 | + $this->all_tracked[$id] = array(); |
|
| 129 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedMarine' => 0)); |
|
| 130 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','typeid' => '','noarchive' => false,'putinarchive' => true,'over_country' => '','mmsi' => '','status' => '','imo' => '','callsign' => '','arrival_code' => '','arrival_date' => '','mmsi_type' => '')); |
|
| 131 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time())); |
|
| 132 | + if (!isset($line['id'])) { |
|
| 133 | 133 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 134 | 134 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi'))); |
| 135 | - } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id'])); |
|
| 136 | - if ($globalAllTracked !== FALSE) $dataFound = true; |
|
| 135 | + } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id'])); |
|
| 136 | + if ($globalAllTracked !== FALSE) $dataFound = true; |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | if (isset($line['mmsi']) && $line['mmsi'] != '' && $line['mmsi'] != $this->all_tracked[$id]['mmsi']) { |
| 140 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi' => $line['mmsi'])); |
|
| 141 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 140 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi' => $line['mmsi'])); |
|
| 141 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 142 | 142 | $Marine = new Marine($this->db); |
| 143 | 143 | $identity = $Marine->getIdentity($line['mmsi']); |
| 144 | 144 | if (!empty($identity)) { |
| 145 | - $this->all_tracked[$id]['ident'] = $identity['ship_name']; |
|
| 146 | - $this->all_tracked[$id]['type'] = $identity['type']; |
|
| 145 | + $this->all_tracked[$id]['ident'] = $identity['ship_name']; |
|
| 146 | + $this->all_tracked[$id]['type'] = $identity['type']; |
|
| 147 | 147 | } |
| 148 | 148 | //print_r($identity); |
| 149 | 149 | unset($Marine); |
| 150 | 150 | //$dataFound = true; |
| 151 | - } |
|
| 151 | + } |
|
| 152 | 152 | } |
| 153 | 153 | if (isset($line['type_id']) && $line['type_id'] != '') { |
| 154 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $AIS->getShipType($line['type_id']))); |
|
| 154 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $AIS->getShipType($line['type_id']))); |
|
| 155 | 155 | } |
| 156 | 156 | if (isset($line['type']) && $line['type'] != '') { |
| 157 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type'])); |
|
| 157 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type'])); |
|
| 158 | 158 | } |
| 159 | 159 | if (isset($line['mmsi_type']) && $line['mmsi_type'] != '') { |
| 160 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi_type' => $line['mmsi_type'])); |
|
| 160 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi_type' => $line['mmsi_type'])); |
|
| 161 | 161 | } |
| 162 | 162 | if (isset($line['imo']) && $line['imo'] != '') { |
| 163 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('imo' => $line['imo'])); |
|
| 163 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('imo' => $line['imo'])); |
|
| 164 | 164 | } |
| 165 | 165 | if (isset($line['callsign']) && $line['callsign'] != '') { |
| 166 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('callsign' => $line['callsign'])); |
|
| 166 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('callsign' => $line['callsign'])); |
|
| 167 | 167 | } |
| 168 | 168 | if (isset($line['arrival_code']) && $line['arrival_code'] != '') { |
| 169 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_code' => $line['arrival_code'])); |
|
| 169 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_code' => $line['arrival_code'])); |
|
| 170 | 170 | } |
| 171 | 171 | if (isset($line['arrival_date']) && $line['arrival_date'] != '') { |
| 172 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_date' => $line['arrival_date'])); |
|
| 172 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_date' => $line['arrival_date'])); |
|
| 173 | 173 | } |
| 174 | 174 | |
| 175 | 175 | |
| 176 | 176 | //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'])) { |
| 177 | 177 | if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident']))) { |
| 178 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident']))); |
|
| 179 | - if ($this->all_tracked[$id]['addedMarine'] == 1) { |
|
| 178 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident']))); |
|
| 179 | + if ($this->all_tracked[$id]['addedMarine'] == 1) { |
|
| 180 | 180 | if (!isset($globalNoImport) || $globalNoImport !== TRUE) { |
| 181 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 181 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 182 | 182 | $timeelapsed = microtime(true); |
| 183 | 183 | $Marine = new Marine($this->db); |
| 184 | 184 | $fromsource = NULL; |
@@ -186,20 +186,20 @@ discard block |
||
| 186 | 186 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 187 | 187 | $Marine->db = null; |
| 188 | 188 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 189 | - } |
|
| 189 | + } |
|
| 190 | 190 | } |
| 191 | - } |
|
| 192 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'])); |
|
| 191 | + } |
|
| 192 | + if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'])); |
|
| 193 | 193 | } |
| 194 | 194 | |
| 195 | 195 | if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) { |
| 196 | - if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime'])) { |
|
| 196 | + if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime'])) { |
|
| 197 | 197 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime'])); |
| 198 | - } else { |
|
| 198 | + } else { |
|
| 199 | 199 | if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['mmsi']."\n"; |
| 200 | 200 | 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]['hex']." - format : ".$line['format_source']."\n"; |
| 201 | 201 | return ''; |
| 202 | - } |
|
| 202 | + } |
|
| 203 | 203 | } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
| 204 | 204 | if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!"; |
| 205 | 205 | return ''; |
@@ -216,24 +216,24 @@ discard block |
||
| 216 | 216 | |
| 217 | 217 | |
| 218 | 218 | if (isset($line['speed']) && $line['speed'] != '') { |
| 219 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed']))); |
|
| 220 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true)); |
|
| 219 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed']))); |
|
| 220 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true)); |
|
| 221 | 221 | } 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'])) { |
| 222 | - $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m'); |
|
| 223 | - if ($distance > 1000 && $distance < 10000) { |
|
| 222 | + $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m'); |
|
| 223 | + if ($distance > 1000 && $distance < 10000) { |
|
| 224 | 224 | $speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']); |
| 225 | 225 | $speed = $speed*3.6; |
| 226 | 226 | if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed))); |
| 227 | 227 | if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['hex']." : ".$speed." - distance : ".$distance."\n"; |
| 228 | - } |
|
| 228 | + } |
|
| 229 | 229 | } |
| 230 | 230 | |
| 231 | - if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
|
| 232 | - if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']); |
|
| 233 | - else unset($timediff); |
|
| 234 | - if ($this->tmd > 5 || !isset($timediff) || $timediff > 2000 || ($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')))) { |
|
| 231 | + if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
|
| 232 | + if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']); |
|
| 233 | + else unset($timediff); |
|
| 234 | + if ($this->tmd > 5 || !isset($timediff) || $timediff > 2000 || ($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')))) { |
|
| 235 | 235 | 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'])) { |
| 236 | - 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'])) { |
|
| 236 | + 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'])) { |
|
| 237 | 237 | $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
| 238 | 238 | $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
| 239 | 239 | $this->all_tracked[$id]['putinarchive'] = true; |
@@ -241,123 +241,123 @@ discard block |
||
| 241 | 241 | if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
| 242 | 242 | $timeelapsed = microtime(true); |
| 243 | 243 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 244 | - $Marine = new Marine($this->db); |
|
| 245 | - $all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
|
| 246 | - if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2']; |
|
| 247 | - $Marine->db = null; |
|
| 248 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 244 | + $Marine = new Marine($this->db); |
|
| 245 | + $all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
|
| 246 | + if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2']; |
|
| 247 | + $Marine->db = null; |
|
| 248 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 249 | 249 | } |
| 250 | 250 | $this->tmd = 0; |
| 251 | 251 | if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n"; |
| 252 | - } |
|
| 252 | + } |
|
| 253 | 253 | } |
| 254 | 254 | |
| 255 | 255 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 256 | 256 | if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
| 257 | 257 | if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
| 258 | - $this->all_tracked[$id]['livedb_latitude'] = $line['latitude']; |
|
| 259 | - $dataFound = true; |
|
| 260 | - $this->all_tracked[$id]['time_last_coord'] = time(); |
|
| 258 | + $this->all_tracked[$id]['livedb_latitude'] = $line['latitude']; |
|
| 259 | + $dataFound = true; |
|
| 260 | + $this->all_tracked[$id]['time_last_coord'] = time(); |
|
| 261 | 261 | } |
| 262 | 262 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude'])); |
| 263 | 263 | } |
| 264 | 264 | if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) { |
| 265 | - if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 265 | + if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 266 | 266 | if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
| 267 | 267 | if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
| 268 | - $this->all_tracked[$id]['livedb_longitude'] = $line['longitude']; |
|
| 269 | - $dataFound = true; |
|
| 270 | - $this->all_tracked[$id]['time_last_coord'] = time(); |
|
| 268 | + $this->all_tracked[$id]['livedb_longitude'] = $line['longitude']; |
|
| 269 | + $dataFound = true; |
|
| 270 | + $this->all_tracked[$id]['time_last_coord'] = time(); |
|
| 271 | 271 | } |
| 272 | 272 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('longitude' => $line['longitude'])); |
| 273 | 273 | } |
| 274 | 274 | |
| 275 | - } else if ($globalDebug && $timediff > 20) { |
|
| 275 | + } else if ($globalDebug && $timediff > 20) { |
|
| 276 | 276 | $this->tmd = $this->tmd + 1; |
| 277 | 277 | echo '!!! Too much distance in short time... for '.$this->all_tracked[$id]['ident']."\n"; |
| 278 | 278 | echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')."m -"; |
| 279 | 279 | echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')/$timediff)*3.6)." km/h - "; |
| 280 | 280 | echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_tracked[$id]['latitude'].' - prev long : '.$this->all_tracked[$id]['longitude']." \n"; |
| 281 | - } |
|
| 281 | + } |
|
| 282 | 282 | } |
| 283 | 283 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 284 | - if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
| 285 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update'])); |
|
| 284 | + if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
| 285 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update'])); |
|
| 286 | 286 | } |
| 287 | 287 | if (isset($line['format_source']) && $line['format_source'] != '') { |
| 288 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source'])); |
|
| 288 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source'])); |
|
| 289 | 289 | } |
| 290 | 290 | if (isset($line['source_name']) && $line['source_name'] != '') { |
| 291 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name'])); |
|
| 291 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name'])); |
|
| 292 | 292 | } |
| 293 | 293 | if (isset($line['status']) && $line['status'] != '') { |
| 294 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status' => $line['status'])); |
|
| 294 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status' => $line['status'])); |
|
| 295 | 295 | } |
| 296 | 296 | |
| 297 | 297 | if (isset($line['noarchive']) && $line['noarchive'] === true) { |
| 298 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true)); |
|
| 298 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true)); |
|
| 299 | 299 | } |
| 300 | 300 | |
| 301 | 301 | if (isset($line['heading']) && $line['heading'] != '') { |
| 302 | - if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 303 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading']))); |
|
| 304 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true)); |
|
| 305 | - //$dataFound = true; |
|
| 302 | + if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 303 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading']))); |
|
| 304 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true)); |
|
| 305 | + //$dataFound = true; |
|
| 306 | 306 | } 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']) { |
| 307 | - $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']); |
|
| 308 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading))); |
|
| 309 | - if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 310 | - if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n"; |
|
| 307 | + $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']); |
|
| 308 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading))); |
|
| 309 | + if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 310 | + if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n"; |
|
| 311 | 311 | } |
| 312 | 312 | //if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
| 313 | 313 | |
| 314 | 314 | |
| 315 | 315 | |
| 316 | 316 | if ($dataFound === true && isset($this->all_tracked[$id]['mmsi'])) { |
| 317 | - $this->all_tracked[$id]['lastupdate'] = time(); |
|
| 318 | - if ($this->all_tracked[$id]['addedMarine'] == 0) { |
|
| 319 | - 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'])) { |
|
| 320 | - if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) { |
|
| 317 | + $this->all_tracked[$id]['lastupdate'] = time(); |
|
| 318 | + if ($this->all_tracked[$id]['addedMarine'] == 0) { |
|
| 319 | + 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'])) { |
|
| 320 | + if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) { |
|
| 321 | 321 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 322 | - if ($globalDebug) echo "Check if aircraft is already in DB..."; |
|
| 323 | - $timeelapsed = microtime(true); |
|
| 324 | - $MarineLive = new MarineLive($this->db); |
|
| 325 | - if (isset($line['id'])) { |
|
| 322 | + if ($globalDebug) echo "Check if aircraft is already in DB..."; |
|
| 323 | + $timeelapsed = microtime(true); |
|
| 324 | + $MarineLive = new MarineLive($this->db); |
|
| 325 | + if (isset($line['id'])) { |
|
| 326 | 326 | $recent_ident = $MarineLive->checkIdRecent($line['id']); |
| 327 | 327 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 328 | - } elseif (isset($this->all_tracked[$id]['mmsi']) && $this->all_tracked[$id]['mmsi'] != '') { |
|
| 328 | + } elseif (isset($this->all_tracked[$id]['mmsi']) && $this->all_tracked[$id]['mmsi'] != '') { |
|
| 329 | 329 | $recent_ident = $MarineLive->checkMMSIRecent($this->all_tracked[$id]['mmsi']); |
| 330 | 330 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 331 | - } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') { |
|
| 331 | + } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') { |
|
| 332 | 332 | $recent_ident = $MarineLive->checkIdentRecent($this->all_tracked[$id]['ident']); |
| 333 | 333 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 334 | - } else $recent_ident = ''; |
|
| 335 | - $MarineLive->db=null; |
|
| 336 | - if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
|
| 337 | - elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
|
| 334 | + } else $recent_ident = ''; |
|
| 335 | + $MarineLive->db=null; |
|
| 336 | + if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
|
| 337 | + elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
|
| 338 | 338 | } else $recent_ident = ''; |
| 339 | - } else { |
|
| 339 | + } else { |
|
| 340 | 340 | $recent_ident = ''; |
| 341 | 341 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0)); |
| 342 | - } |
|
| 343 | - //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
|
| 344 | - if($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') |
|
| 345 | - { |
|
| 342 | + } |
|
| 343 | + //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
|
| 344 | + if($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') |
|
| 345 | + { |
|
| 346 | 346 | if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['mmsi']." in archive DB : "; |
| 347 | 347 | //adds the spotter data for the archive |
| 348 | - $highlight = ''; |
|
| 349 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi'))); |
|
| 350 | - if (!isset($globalNoImport) || $globalNoImport !== TRUE) { |
|
| 348 | + $highlight = ''; |
|
| 349 | + if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi'))); |
|
| 350 | + if (!isset($globalNoImport) || $globalNoImport !== TRUE) { |
|
| 351 | 351 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 352 | - $timeelapsed = microtime(true); |
|
| 353 | - $Marine = new Marine($this->db); |
|
| 354 | - $result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']); |
|
| 355 | - $Marine->db = null; |
|
| 356 | - if ($globalDebug && isset($result)) echo $result."\n"; |
|
| 357 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 352 | + $timeelapsed = microtime(true); |
|
| 353 | + $Marine = new Marine($this->db); |
|
| 354 | + $result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']); |
|
| 355 | + $Marine->db = null; |
|
| 356 | + if ($globalDebug && isset($result)) echo $result."\n"; |
|
| 357 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 358 | 358 | } |
| 359 | - } |
|
| 360 | - /* |
|
| 359 | + } |
|
| 360 | + /* |
|
| 361 | 361 | // Add source stat in DB |
| 362 | 362 | $Stats = new Stats($this->db); |
| 363 | 363 | if (!empty($this->stats)) { |
@@ -384,56 +384,56 @@ discard block |
||
| 384 | 384 | } |
| 385 | 385 | $Stats->db = null; |
| 386 | 386 | */ |
| 387 | - $this->del(); |
|
| 387 | + $this->del(); |
|
| 388 | 388 | //$ignoreImport = false; |
| 389 | 389 | $this->all_tracked[$id]['addedMarine'] = 1; |
| 390 | 390 | //print_r($this->all_tracked[$id]); |
| 391 | 391 | if ($this->last_delete == 0 || time() - $this->last_delete > 1800) { |
| 392 | - if ($globalDebug) echo "---- Deleting Live Marine data older than 9 hours..."; |
|
| 393 | - //MarineLive->deleteLiveMarineDataNotUpdated(); |
|
| 394 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 392 | + if ($globalDebug) echo "---- Deleting Live Marine data older than 9 hours..."; |
|
| 393 | + //MarineLive->deleteLiveMarineDataNotUpdated(); |
|
| 394 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 395 | 395 | $MarineLive = new MarineLive($this->db); |
| 396 | 396 | $MarineLive->deleteLiveMarineData(); |
| 397 | 397 | $MarineLive->db=null; |
| 398 | 398 | if ($globalDebug) echo " Done\n"; |
| 399 | - } |
|
| 400 | - $this->last_delete = time(); |
|
| 399 | + } |
|
| 400 | + $this->last_delete = time(); |
|
| 401 | 401 | } |
| 402 | - } elseif ($recent_ident != '') { |
|
| 402 | + } elseif ($recent_ident != '') { |
|
| 403 | 403 | $this->all_tracked[$id]['id'] = $recent_ident; |
| 404 | 404 | $this->all_tracked[$id]['addedMarine'] = 1; |
| 405 | 405 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 406 | - if (isset($globalDaemon) && !$globalDaemon) { |
|
| 406 | + if (isset($globalDaemon) && !$globalDaemon) { |
|
| 407 | 407 | $Marine = new Marine($this->db); |
| 408 | 408 | $Marine->updateLatestMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime']); |
| 409 | 409 | $Marine->db = null; |
| 410 | - } |
|
| 410 | + } |
|
| 411 | 411 | } |
| 412 | 412 | |
| 413 | - } |
|
| 413 | + } |
|
| 414 | 414 | } |
| 415 | - } |
|
| 416 | - //adds the spotter LIVE data |
|
| 417 | - if ($globalDebug) { |
|
| 415 | + } |
|
| 416 | + //adds the spotter LIVE data |
|
| 417 | + if ($globalDebug) { |
|
| 418 | 418 | 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'].' - Heading : '.$this->all_tracked[$id]['heading'].' - Speed : '.$this->all_tracked[$id]['speed']."\n"; |
| 419 | - } |
|
| 420 | - $ignoreImport = false; |
|
| 419 | + } |
|
| 420 | + $ignoreImport = false; |
|
| 421 | 421 | |
| 422 | - if (!$ignoreImport) { |
|
| 422 | + if (!$ignoreImport) { |
|
| 423 | 423 | 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'])) { |
| 424 | 424 | if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : "; |
| 425 | 425 | if (!isset($globalNoImport) || $globalNoImport !== TRUE) { |
| 426 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 426 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 427 | 427 | $timeelapsed = microtime(true); |
| 428 | 428 | $MarineLive = new MarineLive($this->db); |
| 429 | 429 | $result = $MarineLive->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']); |
| 430 | 430 | $MarineLive->db = null; |
| 431 | 431 | if ($globalDebug) echo $result."\n"; |
| 432 | 432 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 433 | - } |
|
| 433 | + } |
|
| 434 | 434 | } |
| 435 | 435 | if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_tracked[$id]['putinarchive']) { |
| 436 | - $APRSMarine->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']); |
|
| 436 | + $APRSMarine->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']); |
|
| 437 | 437 | } |
| 438 | 438 | $this->all_tracked[$id]['putinarchive'] = false; |
| 439 | 439 | |
@@ -498,24 +498,24 @@ discard block |
||
| 498 | 498 | |
| 499 | 499 | |
| 500 | 500 | if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) { |
| 501 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 501 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 502 | 502 | if ($globalDebug) echo "---- Deleting Live Marine data Not updated since 2 hour..."; |
| 503 | 503 | $MarineLive = new MarineLive($this->db); |
| 504 | 504 | $MarineLive->deleteLiveMarineDataNotUpdated(); |
| 505 | 505 | $MarineLive->db = null; |
| 506 | 506 | //MarineLive->deleteLiveMarineData(); |
| 507 | 507 | if ($globalDebug) echo " Done\n"; |
| 508 | - } |
|
| 509 | - $this->last_delete_hourly = time(); |
|
| 508 | + } |
|
| 509 | + $this->last_delete_hourly = time(); |
|
| 510 | 510 | } |
| 511 | 511 | |
| 512 | - } |
|
| 513 | - //$ignoreImport = false; |
|
| 512 | + } |
|
| 513 | + //$ignoreImport = false; |
|
| 514 | 514 | } |
| 515 | 515 | //if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN); |
| 516 | 516 | if ($send) return $this->all_tracked[$id]; |
| 517 | - } |
|
| 517 | + } |
|
| 518 | + } |
|
| 518 | 519 | } |
| 519 | - } |
|
| 520 | 520 | } |
| 521 | 521 | ?> |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | if (isset($this->all_tracked[$key]['id'])) { |
| 59 | 59 | //echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].' '.$this->all_tracked[$key]['longitude']."\n"; |
| 60 | 60 | $Marine = new Marine($this->db); |
| 61 | - $Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']); |
|
| 61 | + $Marine->updateLatestMarineData($this->all_tracked[$key]['id'], $this->all_tracked[$key]['ident'], $this->all_tracked[$key]['latitude'], $this->all_tracked[$key]['longitude'], $this->all_tracked[$key]['speed'], $this->all_tracked[$key]['datetime']); |
|
| 62 | 62 | } |
| 63 | 63 | } |
| 64 | 64 | } |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | if ($globalDebug) echo 'Delete old values and update latest data...'."\n"; |
| 70 | 70 | foreach ($this->all_tracked as $key => $flight) { |
| 71 | 71 | if (isset($flight['lastupdate'])) { |
| 72 | - if ($flight['lastupdate'] < (time()-3000)) { |
|
| 72 | + if ($flight['lastupdate'] < (time() - 3000)) { |
|
| 73 | 73 | if ((!isset($globalNoImport) || $globalNoImport !== TRUE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
| 74 | 74 | if (isset($this->all_tracked[$key]['id'])) { |
| 75 | 75 | if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n"; |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | //$real_arrival = $this->arrival($key); |
| 82 | 82 | $Marine = new Marine($this->db); |
| 83 | 83 | if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') { |
| 84 | - $result = $Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']); |
|
| 84 | + $result = $Marine->updateLatestMarineData($this->all_tracked[$key]['id'], $this->all_tracked[$key]['ident'], $this->all_tracked[$key]['latitude'], $this->all_tracked[$key]['longitude'], $this->all_tracked[$key]['speed'], $this->all_tracked[$key]['datetime']); |
|
| 85 | 85 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 86 | 86 | } |
| 87 | 87 | // Put in archive |
@@ -95,14 +95,14 @@ discard block |
||
| 95 | 95 | } |
| 96 | 96 | |
| 97 | 97 | public function add($line) { |
| 98 | - global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked, $globalNoImport, $globalNoDB, $globalServerAPRS,$APRSMarine; |
|
| 98 | + global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked, $globalNoImport, $globalNoDB, $globalServerAPRS, $APRSMarine; |
|
| 99 | 99 | if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02'; |
| 100 | 100 | date_default_timezone_set('UTC'); |
| 101 | 101 | $dataFound = false; |
| 102 | 102 | $send = false; |
| 103 | 103 | |
| 104 | 104 | // SBS format is CSV format |
| 105 | - if(is_array($line) && isset($line['mmsi'])) { |
|
| 105 | + if (is_array($line) && isset($line['mmsi'])) { |
|
| 106 | 106 | //print_r($line); |
| 107 | 107 | if (isset($line['mmsi'])) { |
| 108 | 108 | |
@@ -126,18 +126,18 @@ discard block |
||
| 126 | 126 | |
| 127 | 127 | if (!isset($this->all_tracked[$id])) { |
| 128 | 128 | $this->all_tracked[$id] = array(); |
| 129 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedMarine' => 0)); |
|
| 130 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','typeid' => '','noarchive' => false,'putinarchive' => true,'over_country' => '','mmsi' => '','status' => '','imo' => '','callsign' => '','arrival_code' => '','arrival_date' => '','mmsi_type' => '')); |
|
| 131 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time())); |
|
| 129 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('addedMarine' => 0)); |
|
| 130 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('ident' => '', 'latitude' => '', 'longitude' => '', 'speed' => '', 'heading' => '', 'format_source' => '', 'source_name' => '', 'comment'=> '', 'type' => '', 'typeid' => '', 'noarchive' => false, 'putinarchive' => true, 'over_country' => '', 'mmsi' => '', 'status' => '', 'imo' => '', 'callsign' => '', 'arrival_code' => '', 'arrival_date' => '', 'mmsi_type' => '')); |
|
| 131 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('lastupdate' => time())); |
|
| 132 | 132 | if (!isset($line['id'])) { |
| 133 | 133 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 134 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 135 | - } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id'])); |
|
| 134 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $id.'-'.date('YmdHi'))); |
|
| 135 | + } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $line['id'])); |
|
| 136 | 136 | if ($globalAllTracked !== FALSE) $dataFound = true; |
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | if (isset($line['mmsi']) && $line['mmsi'] != '' && $line['mmsi'] != $this->all_tracked[$id]['mmsi']) { |
| 140 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi' => $line['mmsi'])); |
|
| 140 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('mmsi' => $line['mmsi'])); |
|
| 141 | 141 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 142 | 142 | $Marine = new Marine($this->db); |
| 143 | 143 | $identity = $Marine->getIdentity($line['mmsi']); |
@@ -151,64 +151,64 @@ discard block |
||
| 151 | 151 | } |
| 152 | 152 | } |
| 153 | 153 | if (isset($line['type_id']) && $line['type_id'] != '') { |
| 154 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $AIS->getShipType($line['type_id']))); |
|
| 154 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('type' => $AIS->getShipType($line['type_id']))); |
|
| 155 | 155 | } |
| 156 | 156 | if (isset($line['type']) && $line['type'] != '') { |
| 157 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type'])); |
|
| 157 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('type' => $line['type'])); |
|
| 158 | 158 | } |
| 159 | 159 | if (isset($line['mmsi_type']) && $line['mmsi_type'] != '') { |
| 160 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi_type' => $line['mmsi_type'])); |
|
| 160 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('mmsi_type' => $line['mmsi_type'])); |
|
| 161 | 161 | } |
| 162 | 162 | if (isset($line['imo']) && $line['imo'] != '') { |
| 163 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('imo' => $line['imo'])); |
|
| 163 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('imo' => $line['imo'])); |
|
| 164 | 164 | } |
| 165 | 165 | if (isset($line['callsign']) && $line['callsign'] != '') { |
| 166 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('callsign' => $line['callsign'])); |
|
| 166 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('callsign' => $line['callsign'])); |
|
| 167 | 167 | } |
| 168 | 168 | if (isset($line['arrival_code']) && $line['arrival_code'] != '') { |
| 169 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_code' => $line['arrival_code'])); |
|
| 169 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('arrival_code' => $line['arrival_code'])); |
|
| 170 | 170 | } |
| 171 | 171 | if (isset($line['arrival_date']) && $line['arrival_date'] != '') { |
| 172 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_date' => $line['arrival_date'])); |
|
| 172 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('arrival_date' => $line['arrival_date'])); |
|
| 173 | 173 | } |
| 174 | 174 | |
| 175 | 175 | |
| 176 | 176 | //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'])) { |
| 177 | 177 | if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident']))) { |
| 178 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident']))); |
|
| 178 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('ident' => trim($line['ident']))); |
|
| 179 | 179 | if ($this->all_tracked[$id]['addedMarine'] == 1) { |
| 180 | 180 | if (!isset($globalNoImport) || $globalNoImport !== TRUE) { |
| 181 | 181 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 182 | 182 | $timeelapsed = microtime(true); |
| 183 | 183 | $Marine = new Marine($this->db); |
| 184 | 184 | $fromsource = NULL; |
| 185 | - $result = $Marine->updateIdentMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource); |
|
| 185 | + $result = $Marine->updateIdentMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $fromsource); |
|
| 186 | 186 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 187 | 187 | $Marine->db = null; |
| 188 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 188 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 189 | 189 | } |
| 190 | 190 | } |
| 191 | 191 | } |
| 192 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'])); |
|
| 192 | + if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $this->all_tracked[$id]['ident'])); |
|
| 193 | 193 | } |
| 194 | 194 | |
| 195 | - if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) { |
|
| 195 | + if (isset($line['datetime']) && strtotime($line['datetime']) > time() - 20*60 && strtotime($line['datetime']) < time() + 20*60) { |
|
| 196 | 196 | if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime'])) { |
| 197 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime'])); |
|
| 197 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('datetime' => $line['datetime'])); |
|
| 198 | 198 | } else { |
| 199 | 199 | if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['mmsi']."\n"; |
| 200 | 200 | 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]['hex']." - format : ".$line['format_source']."\n"; |
| 201 | 201 | return ''; |
| 202 | 202 | } |
| 203 | - } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
|
| 203 | + } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time() - 20*60) { |
|
| 204 | 204 | if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!"; |
| 205 | 205 | return ''; |
| 206 | - } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) { |
|
| 206 | + } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time() + 20*60) { |
|
| 207 | 207 | if ($globalDebug) echo "!!! Date is in the future ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!"; |
| 208 | 208 | return ''; |
| 209 | 209 | } elseif (!isset($line['datetime'])) { |
| 210 | 210 | date_default_timezone_set('UTC'); |
| 211 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => date('Y-m-d H:i:s'))); |
|
| 211 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('datetime' => date('Y-m-d H:i:s'))); |
|
| 212 | 212 | } else { |
| 213 | 213 | if ($globalDebug) echo "!!! Unknow date error ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!"; |
| 214 | 214 | return ''; |
@@ -216,24 +216,24 @@ discard block |
||
| 216 | 216 | |
| 217 | 217 | |
| 218 | 218 | if (isset($line['speed']) && $line['speed'] != '') { |
| 219 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed']))); |
|
| 220 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true)); |
|
| 219 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed' => round($line['speed']))); |
|
| 220 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed_fromsrc' => true)); |
|
| 221 | 221 | } 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'])) { |
| 222 | - $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m'); |
|
| 222 | + $distance = $Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm'); |
|
| 223 | 223 | if ($distance > 1000 && $distance < 10000) { |
| 224 | 224 | $speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']); |
| 225 | 225 | $speed = $speed*3.6; |
| 226 | - if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed))); |
|
| 226 | + if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed' => round($speed))); |
|
| 227 | 227 | if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['hex']." : ".$speed." - distance : ".$distance."\n"; |
| 228 | 228 | } |
| 229 | 229 | } |
| 230 | 230 | |
| 231 | 231 | if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
| 232 | - if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']); |
|
| 232 | + if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time() - $this->all_tracked[$id]['time_last_coord']); |
|
| 233 | 233 | else unset($timediff); |
| 234 | - if ($this->tmd > 5 || !isset($timediff) || $timediff > 2000 || ($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')))) { |
|
| 234 | + if ($this->tmd > 5 || !isset($timediff) || $timediff > 2000 || ($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')))) { |
|
| 235 | 235 | 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'])) { |
| 236 | - 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'])) { |
|
| 236 | + 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'])) { |
|
| 237 | 237 | $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
| 238 | 238 | $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
| 239 | 239 | $this->all_tracked[$id]['putinarchive'] = true; |
@@ -242,10 +242,10 @@ discard block |
||
| 242 | 242 | $timeelapsed = microtime(true); |
| 243 | 243 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 244 | 244 | $Marine = new Marine($this->db); |
| 245 | - $all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
|
| 245 | + $all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'], $line['longitude']); |
|
| 246 | 246 | if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2']; |
| 247 | 247 | $Marine->db = null; |
| 248 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 248 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 249 | 249 | } |
| 250 | 250 | $this->tmd = 0; |
| 251 | 251 | if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n"; |
@@ -254,59 +254,59 @@ discard block |
||
| 254 | 254 | |
| 255 | 255 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 256 | 256 | if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
| 257 | - if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
|
| 257 | + if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude'] - $line['latitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
|
| 258 | 258 | $this->all_tracked[$id]['livedb_latitude'] = $line['latitude']; |
| 259 | 259 | $dataFound = true; |
| 260 | 260 | $this->all_tracked[$id]['time_last_coord'] = time(); |
| 261 | 261 | } |
| 262 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude'])); |
|
| 262 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('latitude' => $line['latitude'])); |
|
| 263 | 263 | } |
| 264 | 264 | if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) { |
| 265 | 265 | if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
| 266 | 266 | if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
| 267 | - if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
|
| 267 | + if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude'] - $line['longitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
|
| 268 | 268 | $this->all_tracked[$id]['livedb_longitude'] = $line['longitude']; |
| 269 | 269 | $dataFound = true; |
| 270 | 270 | $this->all_tracked[$id]['time_last_coord'] = time(); |
| 271 | 271 | } |
| 272 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('longitude' => $line['longitude'])); |
|
| 272 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('longitude' => $line['longitude'])); |
|
| 273 | 273 | } |
| 274 | 274 | |
| 275 | 275 | } else if ($globalDebug && $timediff > 20) { |
| 276 | 276 | $this->tmd = $this->tmd + 1; |
| 277 | 277 | echo '!!! Too much distance in short time... for '.$this->all_tracked[$id]['ident']."\n"; |
| 278 | - echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')."m -"; |
|
| 279 | - echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')/$timediff)*3.6)." km/h - "; |
|
| 278 | + echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')."m -"; |
|
| 279 | + echo 'Speed : '.(($Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')/$timediff)*3.6)." km/h - "; |
|
| 280 | 280 | echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_tracked[$id]['latitude'].' - prev long : '.$this->all_tracked[$id]['longitude']." \n"; |
| 281 | 281 | } |
| 282 | 282 | } |
| 283 | 283 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 284 | 284 | if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true; |
| 285 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update'])); |
|
| 285 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('last_update' => $line['last_update'])); |
|
| 286 | 286 | } |
| 287 | 287 | if (isset($line['format_source']) && $line['format_source'] != '') { |
| 288 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source'])); |
|
| 288 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('format_source' => $line['format_source'])); |
|
| 289 | 289 | } |
| 290 | 290 | if (isset($line['source_name']) && $line['source_name'] != '') { |
| 291 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name'])); |
|
| 291 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('source_name' => $line['source_name'])); |
|
| 292 | 292 | } |
| 293 | 293 | if (isset($line['status']) && $line['status'] != '') { |
| 294 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status' => $line['status'])); |
|
| 294 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('status' => $line['status'])); |
|
| 295 | 295 | } |
| 296 | 296 | |
| 297 | 297 | if (isset($line['noarchive']) && $line['noarchive'] === true) { |
| 298 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true)); |
|
| 298 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('noarchive' => true)); |
|
| 299 | 299 | } |
| 300 | 300 | |
| 301 | 301 | if (isset($line['heading']) && $line['heading'] != '') { |
| 302 | - if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 303 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading']))); |
|
| 304 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true)); |
|
| 302 | + if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading'] - round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 303 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading' => round($line['heading']))); |
|
| 304 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading_fromsrc' => true)); |
|
| 305 | 305 | //$dataFound = true; |
| 306 | 306 | } 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']) { |
| 307 | - $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']); |
|
| 308 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading))); |
|
| 309 | - if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 307 | + $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']); |
|
| 308 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading' => round($heading))); |
|
| 309 | + if (abs($this->all_tracked[$id]['heading'] - round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 310 | 310 | if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n"; |
| 311 | 311 | } |
| 312 | 312 | //if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
@@ -316,7 +316,7 @@ discard block |
||
| 316 | 316 | if ($dataFound === true && isset($this->all_tracked[$id]['mmsi'])) { |
| 317 | 317 | $this->all_tracked[$id]['lastupdate'] = time(); |
| 318 | 318 | if ($this->all_tracked[$id]['addedMarine'] == 0) { |
| 319 | - 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'])) { |
|
| 319 | + 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'])) { |
|
| 320 | 320 | if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) { |
| 321 | 321 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 322 | 322 | if ($globalDebug) echo "Check if aircraft is already in DB..."; |
@@ -324,37 +324,37 @@ discard block |
||
| 324 | 324 | $MarineLive = new MarineLive($this->db); |
| 325 | 325 | if (isset($line['id'])) { |
| 326 | 326 | $recent_ident = $MarineLive->checkIdRecent($line['id']); |
| 327 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 327 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 328 | 328 | } elseif (isset($this->all_tracked[$id]['mmsi']) && $this->all_tracked[$id]['mmsi'] != '') { |
| 329 | 329 | $recent_ident = $MarineLive->checkMMSIRecent($this->all_tracked[$id]['mmsi']); |
| 330 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 330 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 331 | 331 | } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') { |
| 332 | 332 | $recent_ident = $MarineLive->checkIdentRecent($this->all_tracked[$id]['ident']); |
| 333 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 333 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 334 | 334 | } else $recent_ident = ''; |
| 335 | - $MarineLive->db=null; |
|
| 335 | + $MarineLive->db = null; |
|
| 336 | 336 | if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
| 337 | 337 | elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
| 338 | 338 | } else $recent_ident = ''; |
| 339 | 339 | } else { |
| 340 | 340 | $recent_ident = ''; |
| 341 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0)); |
|
| 341 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('forcenew' => 0)); |
|
| 342 | 342 | } |
| 343 | 343 | //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
| 344 | - if($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') |
|
| 344 | + if ($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') |
|
| 345 | 345 | { |
| 346 | 346 | if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['mmsi']." in archive DB : "; |
| 347 | 347 | //adds the spotter data for the archive |
| 348 | 348 | $highlight = ''; |
| 349 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi'))); |
|
| 349 | + if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi'))); |
|
| 350 | 350 | if (!isset($globalNoImport) || $globalNoImport !== TRUE) { |
| 351 | 351 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 352 | 352 | $timeelapsed = microtime(true); |
| 353 | 353 | $Marine = new Marine($this->db); |
| 354 | - $result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']); |
|
| 354 | + $result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'], $this->all_tracked[$id]['typeid'], $this->all_tracked[$id]['imo'], $this->all_tracked[$id]['callsign'], $this->all_tracked[$id]['arrival_code'], $this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['format_source'], $this->all_tracked[$id]['source_name']); |
|
| 355 | 355 | $Marine->db = null; |
| 356 | 356 | if ($globalDebug && isset($result)) echo $result."\n"; |
| 357 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 357 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 358 | 358 | } |
| 359 | 359 | } |
| 360 | 360 | /* |
@@ -394,7 +394,7 @@ discard block |
||
| 394 | 394 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 395 | 395 | $MarineLive = new MarineLive($this->db); |
| 396 | 396 | $MarineLive->deleteLiveMarineData(); |
| 397 | - $MarineLive->db=null; |
|
| 397 | + $MarineLive->db = null; |
|
| 398 | 398 | if ($globalDebug) echo " Done\n"; |
| 399 | 399 | } |
| 400 | 400 | $this->last_delete = time(); |
@@ -405,7 +405,7 @@ discard block |
||
| 405 | 405 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 406 | 406 | if (isset($globalDaemon) && !$globalDaemon) { |
| 407 | 407 | $Marine = new Marine($this->db); |
| 408 | - $Marine->updateLatestMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime']); |
|
| 408 | + $Marine->updateLatestMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime']); |
|
| 409 | 409 | $Marine->db = null; |
| 410 | 410 | } |
| 411 | 411 | } |
@@ -420,20 +420,20 @@ discard block |
||
| 420 | 420 | $ignoreImport = false; |
| 421 | 421 | |
| 422 | 422 | if (!$ignoreImport) { |
| 423 | - 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'])) { |
|
| 423 | + 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'])) { |
|
| 424 | 424 | if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : "; |
| 425 | 425 | if (!isset($globalNoImport) || $globalNoImport !== TRUE) { |
| 426 | 426 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 427 | 427 | $timeelapsed = microtime(true); |
| 428 | 428 | $MarineLive = new MarineLive($this->db); |
| 429 | - $result = $MarineLive->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']); |
|
| 429 | + $result = $MarineLive->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'], $this->all_tracked[$id]['typeid'], $this->all_tracked[$id]['imo'], $this->all_tracked[$id]['callsign'], $this->all_tracked[$id]['arrival_code'], $this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['noarchive'], $this->all_tracked[$id]['format_source'], $this->all_tracked[$id]['source_name'], $this->all_tracked[$id]['over_country']); |
|
| 430 | 430 | $MarineLive->db = null; |
| 431 | 431 | if ($globalDebug) echo $result."\n"; |
| 432 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 432 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 433 | 433 | } |
| 434 | 434 | } |
| 435 | 435 | if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_tracked[$id]['putinarchive']) { |
| 436 | - $APRSMarine->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']); |
|
| 436 | + $APRSMarine->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'], $this->all_tracked[$id]['typeid'], $this->all_tracked[$id]['imo'], $this->all_tracked[$id]['callsign'], $this->all_tracked[$id]['arrival_code'], $this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['noarchive'], $this->all_tracked[$id]['format_source'], $this->all_tracked[$id]['source_name'], $this->all_tracked[$id]['over_country']); |
|
| 437 | 437 | } |
| 438 | 438 | $this->all_tracked[$id]['putinarchive'] = false; |
| 439 | 439 | |
@@ -493,7 +493,7 @@ discard block |
||
| 493 | 493 | |
| 494 | 494 | $this->all_tracked[$id]['lastupdate'] = time(); |
| 495 | 495 | if ($this->all_tracked[$id]['putinarchive']) $send = true; |
| 496 | - } 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"; |
|
| 496 | + } 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"; |
|
| 497 | 497 | //$this->del(); |
| 498 | 498 | |
| 499 | 499 | |
@@ -53,7 +53,9 @@ discard block |
||
| 53 | 53 | |
| 54 | 54 | public function checkAll() { |
| 55 | 55 | global $globalDebug; |
| 56 | - if ($globalDebug) echo "Update last seen tracked data...\n"; |
|
| 56 | + if ($globalDebug) { |
|
| 57 | + echo "Update last seen tracked data...\n"; |
|
| 58 | + } |
|
| 57 | 59 | foreach ($this->all_tracked as $key => $flight) { |
| 58 | 60 | if (isset($this->all_tracked[$key]['id'])) { |
| 59 | 61 | //echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].' '.$this->all_tracked[$key]['longitude']."\n"; |
@@ -66,13 +68,17 @@ discard block |
||
| 66 | 68 | public function del() { |
| 67 | 69 | global $globalDebug, $globalNoDB, $globalNoImport; |
| 68 | 70 | // Delete old infos |
| 69 | - if ($globalDebug) echo 'Delete old values and update latest data...'."\n"; |
|
| 71 | + if ($globalDebug) { |
|
| 72 | + echo 'Delete old values and update latest data...'."\n"; |
|
| 73 | + } |
|
| 70 | 74 | foreach ($this->all_tracked as $key => $flight) { |
| 71 | 75 | if (isset($flight['lastupdate'])) { |
| 72 | 76 | if ($flight['lastupdate'] < (time()-3000)) { |
| 73 | 77 | if ((!isset($globalNoImport) || $globalNoImport !== TRUE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
| 74 | 78 | if (isset($this->all_tracked[$key]['id'])) { |
| 75 | - if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n"; |
|
| 79 | + if ($globalDebug) { |
|
| 80 | + echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n"; |
|
| 81 | + } |
|
| 76 | 82 | /* |
| 77 | 83 | $MarineLive = new MarineLive(); |
| 78 | 84 | $MarineLive->deleteLiveMarineDataById($this->all_tracked[$key]['id']); |
@@ -82,7 +88,9 @@ discard block |
||
| 82 | 88 | $Marine = new Marine($this->db); |
| 83 | 89 | if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') { |
| 84 | 90 | $result = $Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']); |
| 85 | - if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
|
| 91 | + if ($globalDebug && $result != 'success') { |
|
| 92 | + echo '!!! ERROR : '.$result."\n"; |
|
| 93 | + } |
|
| 86 | 94 | } |
| 87 | 95 | // Put in archive |
| 88 | 96 | // $Marine->db = null; |
@@ -96,7 +104,9 @@ discard block |
||
| 96 | 104 | |
| 97 | 105 | public function add($line) { |
| 98 | 106 | global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked, $globalNoImport, $globalNoDB, $globalServerAPRS,$APRSMarine; |
| 99 | - if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02'; |
|
| 107 | + if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') { |
|
| 108 | + $globalCoordMinChange = '0.02'; |
|
| 109 | + } |
|
| 100 | 110 | date_default_timezone_set('UTC'); |
| 101 | 111 | $dataFound = false; |
| 102 | 112 | $send = false; |
@@ -121,8 +131,11 @@ discard block |
||
| 121 | 131 | |
| 122 | 132 | $Common = new Common(); |
| 123 | 133 | $AIS = new AIS(); |
| 124 | - if (!isset($line['id'])) $id = trim($line['mmsi']); |
|
| 125 | - else $id = trim($line['id']); |
|
| 134 | + if (!isset($line['id'])) { |
|
| 135 | + $id = trim($line['mmsi']); |
|
| 136 | + } else { |
|
| 137 | + $id = trim($line['id']); |
|
| 138 | + } |
|
| 126 | 139 | |
| 127 | 140 | if (!isset($this->all_tracked[$id])) { |
| 128 | 141 | $this->all_tracked[$id] = array(); |
@@ -130,10 +143,16 @@ discard block |
||
| 130 | 143 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','typeid' => '','noarchive' => false,'putinarchive' => true,'over_country' => '','mmsi' => '','status' => '','imo' => '','callsign' => '','arrival_code' => '','arrival_date' => '','mmsi_type' => '')); |
| 131 | 144 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time())); |
| 132 | 145 | if (!isset($line['id'])) { |
| 133 | - if (!isset($globalDaemon)) $globalDaemon = TRUE; |
|
| 146 | + if (!isset($globalDaemon)) { |
|
| 147 | + $globalDaemon = TRUE; |
|
| 148 | + } |
|
| 134 | 149 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi'))); |
| 135 | - } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id'])); |
|
| 136 | - if ($globalAllTracked !== FALSE) $dataFound = true; |
|
| 150 | + } else { |
|
| 151 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id'])); |
|
| 152 | + } |
|
| 153 | + if ($globalAllTracked !== FALSE) { |
|
| 154 | + $dataFound = true; |
|
| 155 | + } |
|
| 137 | 156 | } |
| 138 | 157 | |
| 139 | 158 | if (isset($line['mmsi']) && $line['mmsi'] != '' && $line['mmsi'] != $this->all_tracked[$id]['mmsi']) { |
@@ -183,34 +202,49 @@ discard block |
||
| 183 | 202 | $Marine = new Marine($this->db); |
| 184 | 203 | $fromsource = NULL; |
| 185 | 204 | $result = $Marine->updateIdentMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource); |
| 186 | - if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
|
| 205 | + if ($globalDebug && $result != 'success') { |
|
| 206 | + echo '!!! ERROR : '.$result."\n"; |
|
| 207 | + } |
|
| 187 | 208 | $Marine->db = null; |
| 188 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 209 | + if ($globalDebugTimeElapsed) { |
|
| 210 | + echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 211 | + } |
|
| 189 | 212 | } |
| 190 | 213 | } |
| 191 | 214 | } |
| 192 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'])); |
|
| 215 | + if (!isset($this->all_tracked[$id]['id'])) { |
|
| 216 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'])); |
|
| 217 | + } |
|
| 193 | 218 | } |
| 194 | 219 | |
| 195 | 220 | if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) { |
| 196 | 221 | if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime'])) { |
| 197 | 222 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime'])); |
| 198 | 223 | } else { |
| 199 | - if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['mmsi']."\n"; |
|
| 200 | - 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]['hex']." - format : ".$line['format_source']."\n"; |
|
| 224 | + if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) { |
|
| 225 | + echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['mmsi']."\n"; |
|
| 226 | + } elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) { |
|
| 227 | + echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['hex']." - format : ".$line['format_source']."\n"; |
|
| 228 | + } |
|
| 201 | 229 | return ''; |
| 202 | 230 | } |
| 203 | 231 | } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
| 204 | - if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!"; |
|
| 232 | + if ($globalDebug) { |
|
| 233 | + echo "!!! Date is too old ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!"; |
|
| 234 | + } |
|
| 205 | 235 | return ''; |
| 206 | 236 | } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) { |
| 207 | - if ($globalDebug) echo "!!! Date is in the future ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!"; |
|
| 237 | + if ($globalDebug) { |
|
| 238 | + echo "!!! Date is in the future ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!"; |
|
| 239 | + } |
|
| 208 | 240 | return ''; |
| 209 | 241 | } elseif (!isset($line['datetime'])) { |
| 210 | 242 | date_default_timezone_set('UTC'); |
| 211 | 243 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => date('Y-m-d H:i:s'))); |
| 212 | 244 | } else { |
| 213 | - if ($globalDebug) echo "!!! Unknow date error ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!"; |
|
| 245 | + if ($globalDebug) { |
|
| 246 | + echo "!!! Unknow date error ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!"; |
|
| 247 | + } |
|
| 214 | 248 | return ''; |
| 215 | 249 | } |
| 216 | 250 | |
@@ -223,14 +257,21 @@ discard block |
||
| 223 | 257 | if ($distance > 1000 && $distance < 10000) { |
| 224 | 258 | $speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']); |
| 225 | 259 | $speed = $speed*3.6; |
| 226 | - if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed))); |
|
| 227 | - if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['hex']." : ".$speed." - distance : ".$distance."\n"; |
|
| 260 | + if ($speed < 1000) { |
|
| 261 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed))); |
|
| 262 | + } |
|
| 263 | + if ($globalDebug) { |
|
| 264 | + echo "ø Calculated Speed for ".$this->all_tracked[$id]['hex']." : ".$speed." - distance : ".$distance."\n"; |
|
| 265 | + } |
|
| 228 | 266 | } |
| 229 | 267 | } |
| 230 | 268 | |
| 231 | 269 | if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
| 232 | - if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']); |
|
| 233 | - else unset($timediff); |
|
| 270 | + if (isset($this->all_tracked[$id]['time_last_coord'])) { |
|
| 271 | + $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']); |
|
| 272 | + } else { |
|
| 273 | + unset($timediff); |
|
| 274 | + } |
|
| 234 | 275 | if ($this->tmd > 5 || !isset($timediff) || $timediff > 2000 || ($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')))) { |
| 235 | 276 | 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'])) { |
| 236 | 277 | 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'])) { |
@@ -238,22 +279,32 @@ discard block |
||
| 238 | 279 | $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
| 239 | 280 | $this->all_tracked[$id]['putinarchive'] = true; |
| 240 | 281 | |
| 241 | - if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
| 282 | + if ($globalDebug) { |
|
| 283 | + echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
| 284 | + } |
|
| 242 | 285 | $timeelapsed = microtime(true); |
| 243 | 286 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 244 | 287 | $Marine = new Marine($this->db); |
| 245 | 288 | $all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
| 246 | - if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2']; |
|
| 289 | + if (!empty($all_country)) { |
|
| 290 | + $this->all_tracked[$id]['over_country'] = $all_country['iso2']; |
|
| 291 | + } |
|
| 247 | 292 | $Marine->db = null; |
| 248 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 293 | + if ($globalDebugTimeElapsed) { |
|
| 294 | + echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 295 | + } |
|
| 249 | 296 | } |
| 250 | 297 | $this->tmd = 0; |
| 251 | - if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n"; |
|
| 298 | + if ($globalDebug) { |
|
| 299 | + echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n"; |
|
| 300 | + } |
|
| 252 | 301 | } |
| 253 | 302 | } |
| 254 | 303 | |
| 255 | 304 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 256 | - if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
|
| 305 | + if (!isset($this->all_tracked[$id]['archive_latitude'])) { |
|
| 306 | + $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
|
| 307 | + } |
|
| 257 | 308 | if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
| 258 | 309 | $this->all_tracked[$id]['livedb_latitude'] = $line['latitude']; |
| 259 | 310 | $dataFound = true; |
@@ -262,8 +313,12 @@ discard block |
||
| 262 | 313 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude'])); |
| 263 | 314 | } |
| 264 | 315 | if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) { |
| 265 | - if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 266 | - if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
|
| 316 | + if ($line['longitude'] > 180) { |
|
| 317 | + $line['longitude'] = $line['longitude'] - 360; |
|
| 318 | + } |
|
| 319 | + if (!isset($this->all_tracked[$id]['archive_longitude'])) { |
|
| 320 | + $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
|
| 321 | + } |
|
| 267 | 322 | if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
| 268 | 323 | $this->all_tracked[$id]['livedb_longitude'] = $line['longitude']; |
| 269 | 324 | $dataFound = true; |
@@ -281,7 +336,9 @@ discard block |
||
| 281 | 336 | } |
| 282 | 337 | } |
| 283 | 338 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 284 | - if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
| 339 | + if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) { |
|
| 340 | + $dataFound = true; |
|
| 341 | + } |
|
| 285 | 342 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update'])); |
| 286 | 343 | } |
| 287 | 344 | if (isset($line['format_source']) && $line['format_source'] != '') { |
@@ -299,15 +356,21 @@ discard block |
||
| 299 | 356 | } |
| 300 | 357 | |
| 301 | 358 | if (isset($line['heading']) && $line['heading'] != '') { |
| 302 | - if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 359 | + if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) { |
|
| 360 | + $this->all_tracked[$id]['putinarchive'] = true; |
|
| 361 | + } |
|
| 303 | 362 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading']))); |
| 304 | 363 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true)); |
| 305 | 364 | //$dataFound = true; |
| 306 | 365 | } 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']) { |
| 307 | 366 | $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']); |
| 308 | 367 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading))); |
| 309 | - if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 310 | - if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n"; |
|
| 368 | + if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) { |
|
| 369 | + $this->all_tracked[$id]['putinarchive'] = true; |
|
| 370 | + } |
|
| 371 | + if ($globalDebug) { |
|
| 372 | + echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n"; |
|
| 373 | + } |
|
| 311 | 374 | } |
| 312 | 375 | //if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
| 313 | 376 | |
@@ -319,23 +382,38 @@ discard block |
||
| 319 | 382 | 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'])) { |
| 320 | 383 | if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) { |
| 321 | 384 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 322 | - if ($globalDebug) echo "Check if aircraft is already in DB..."; |
|
| 385 | + if ($globalDebug) { |
|
| 386 | + echo "Check if aircraft is already in DB..."; |
|
| 387 | + } |
|
| 323 | 388 | $timeelapsed = microtime(true); |
| 324 | 389 | $MarineLive = new MarineLive($this->db); |
| 325 | 390 | if (isset($line['id'])) { |
| 326 | 391 | $recent_ident = $MarineLive->checkIdRecent($line['id']); |
| 327 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 392 | + if ($globalDebugTimeElapsed) { |
|
| 393 | + echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 394 | + } |
|
| 328 | 395 | } elseif (isset($this->all_tracked[$id]['mmsi']) && $this->all_tracked[$id]['mmsi'] != '') { |
| 329 | 396 | $recent_ident = $MarineLive->checkMMSIRecent($this->all_tracked[$id]['mmsi']); |
| 330 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 397 | + if ($globalDebugTimeElapsed) { |
|
| 398 | + echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 399 | + } |
|
| 331 | 400 | } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') { |
| 332 | 401 | $recent_ident = $MarineLive->checkIdentRecent($this->all_tracked[$id]['ident']); |
| 333 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 334 | - } else $recent_ident = ''; |
|
| 402 | + if ($globalDebugTimeElapsed) { |
|
| 403 | + echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 404 | + } |
|
| 405 | + } else { |
|
| 406 | + $recent_ident = ''; |
|
| 407 | + } |
|
| 335 | 408 | $MarineLive->db=null; |
| 336 | - if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
|
| 337 | - elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
|
| 338 | - } else $recent_ident = ''; |
|
| 409 | + if ($globalDebug && $recent_ident == '') { |
|
| 410 | + echo " Not in DB.\n"; |
|
| 411 | + } elseif ($globalDebug && $recent_ident != '') { |
|
| 412 | + echo " Already in DB.\n"; |
|
| 413 | + } |
|
| 414 | + } else { |
|
| 415 | + $recent_ident = ''; |
|
| 416 | + } |
|
| 339 | 417 | } else { |
| 340 | 418 | $recent_ident = ''; |
| 341 | 419 | $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0)); |
@@ -343,18 +421,26 @@ discard block |
||
| 343 | 421 | //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
| 344 | 422 | if($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') |
| 345 | 423 | { |
| 346 | - if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['mmsi']." in archive DB : "; |
|
| 424 | + if ($globalDebug) { |
|
| 425 | + echo "\o/ Add ".$this->all_tracked[$id]['mmsi']." in archive DB : "; |
|
| 426 | + } |
|
| 347 | 427 | //adds the spotter data for the archive |
| 348 | 428 | $highlight = ''; |
| 349 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi'))); |
|
| 429 | + if (!isset($this->all_tracked[$id]['id'])) { |
|
| 430 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi'))); |
|
| 431 | + } |
|
| 350 | 432 | if (!isset($globalNoImport) || $globalNoImport !== TRUE) { |
| 351 | 433 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 352 | 434 | $timeelapsed = microtime(true); |
| 353 | 435 | $Marine = new Marine($this->db); |
| 354 | 436 | $result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']); |
| 355 | 437 | $Marine->db = null; |
| 356 | - if ($globalDebug && isset($result)) echo $result."\n"; |
|
| 357 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 438 | + if ($globalDebug && isset($result)) { |
|
| 439 | + echo $result."\n"; |
|
| 440 | + } |
|
| 441 | + if ($globalDebugTimeElapsed) { |
|
| 442 | + echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 443 | + } |
|
| 358 | 444 | } |
| 359 | 445 | } |
| 360 | 446 | /* |
@@ -389,13 +475,17 @@ discard block |
||
| 389 | 475 | $this->all_tracked[$id]['addedMarine'] = 1; |
| 390 | 476 | //print_r($this->all_tracked[$id]); |
| 391 | 477 | if ($this->last_delete == 0 || time() - $this->last_delete > 1800) { |
| 392 | - if ($globalDebug) echo "---- Deleting Live Marine data older than 9 hours..."; |
|
| 478 | + if ($globalDebug) { |
|
| 479 | + echo "---- Deleting Live Marine data older than 9 hours..."; |
|
| 480 | + } |
|
| 393 | 481 | //MarineLive->deleteLiveMarineDataNotUpdated(); |
| 394 | 482 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 395 | 483 | $MarineLive = new MarineLive($this->db); |
| 396 | 484 | $MarineLive->deleteLiveMarineData(); |
| 397 | 485 | $MarineLive->db=null; |
| 398 | - if ($globalDebug) echo " Done\n"; |
|
| 486 | + if ($globalDebug) { |
|
| 487 | + echo " Done\n"; |
|
| 488 | + } |
|
| 399 | 489 | } |
| 400 | 490 | $this->last_delete = time(); |
| 401 | 491 | } |
@@ -421,15 +511,21 @@ discard block |
||
| 421 | 511 | |
| 422 | 512 | if (!$ignoreImport) { |
| 423 | 513 | 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'])) { |
| 424 | - if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : "; |
|
| 514 | + if ($globalDebug) { |
|
| 515 | + echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : "; |
|
| 516 | + } |
|
| 425 | 517 | if (!isset($globalNoImport) || $globalNoImport !== TRUE) { |
| 426 | 518 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 427 | 519 | $timeelapsed = microtime(true); |
| 428 | 520 | $MarineLive = new MarineLive($this->db); |
| 429 | 521 | $result = $MarineLive->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']); |
| 430 | 522 | $MarineLive->db = null; |
| 431 | - if ($globalDebug) echo $result."\n"; |
|
| 432 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 523 | + if ($globalDebug) { |
|
| 524 | + echo $result."\n"; |
|
| 525 | + } |
|
| 526 | + if ($globalDebugTimeElapsed) { |
|
| 527 | + echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 528 | + } |
|
| 433 | 529 | } |
| 434 | 530 | } |
| 435 | 531 | if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_tracked[$id]['putinarchive']) { |
@@ -492,19 +588,27 @@ discard block |
||
| 492 | 588 | */ |
| 493 | 589 | |
| 494 | 590 | $this->all_tracked[$id]['lastupdate'] = time(); |
| 495 | - if ($this->all_tracked[$id]['putinarchive']) $send = true; |
|
| 496 | - } 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"; |
|
| 591 | + if ($this->all_tracked[$id]['putinarchive']) { |
|
| 592 | + $send = true; |
|
| 593 | + } |
|
| 594 | + } elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) { |
|
| 595 | + echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
|
| 596 | + } |
|
| 497 | 597 | //$this->del(); |
| 498 | 598 | |
| 499 | 599 | |
| 500 | 600 | if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) { |
| 501 | 601 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 502 | - if ($globalDebug) echo "---- Deleting Live Marine data Not updated since 2 hour..."; |
|
| 602 | + if ($globalDebug) { |
|
| 603 | + echo "---- Deleting Live Marine data Not updated since 2 hour..."; |
|
| 604 | + } |
|
| 503 | 605 | $MarineLive = new MarineLive($this->db); |
| 504 | 606 | $MarineLive->deleteLiveMarineDataNotUpdated(); |
| 505 | 607 | $MarineLive->db = null; |
| 506 | 608 | //MarineLive->deleteLiveMarineData(); |
| 507 | - if ($globalDebug) echo " Done\n"; |
|
| 609 | + if ($globalDebug) { |
|
| 610 | + echo " Done\n"; |
|
| 611 | + } |
|
| 508 | 612 | } |
| 509 | 613 | $this->last_delete_hourly = time(); |
| 510 | 614 | } |
@@ -513,7 +617,9 @@ discard block |
||
| 513 | 617 | //$ignoreImport = false; |
| 514 | 618 | } |
| 515 | 619 | //if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN); |
| 516 | - if ($send) return $this->all_tracked[$id]; |
|
| 620 | + if ($send) { |
|
| 621 | + return $this->all_tracked[$id]; |
|
| 622 | + } |
|
| 517 | 623 | } |
| 518 | 624 | } |
| 519 | 625 | } |
