Ysurac /
FlightAirMap
@@ -7,13 +7,13 @@ |
||
| 7 | 7 | |
| 8 | 8 | $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
| 9 | 9 | if ($airline_icao == 'all') { |
| 10 | - unset($_COOKIE['stats_airline_icao']); |
|
| 11 | - setcookie('stats_airline_icao', '', time()-3600); |
|
| 12 | - $airline_icao = ''; |
|
| 10 | + unset($_COOKIE['stats_airline_icao']); |
|
| 11 | + setcookie('stats_airline_icao', '', time()-3600); |
|
| 12 | + $airline_icao = ''; |
|
| 13 | 13 | } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) { |
| 14 | - $airline_icao = $_COOKIE['stats_airline_icao']; |
|
| 14 | + $airline_icao = $_COOKIE['stats_airline_icao']; |
|
| 15 | 15 | } elseif ($airline_icao == '' && isset($globalFilter)) { |
| 16 | - if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
|
| 16 | + if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
|
| 17 | 17 | } |
| 18 | 18 | setcookie('stats_airline_icao',$airline_icao); |
| 19 | 19 | |
@@ -7,91 +7,91 @@ discard block |
||
| 7 | 7 | |
| 8 | 8 | |
| 9 | 9 | class Translation { |
| 10 | - public $db; |
|
| 11 | - public function __construct($dbc = null) { |
|
| 12 | - $Connection = new Connection($dbc); |
|
| 13 | - $this->db = $Connection->db(); |
|
| 14 | - } |
|
| 10 | + public $db; |
|
| 11 | + public function __construct($dbc = null) { |
|
| 12 | + $Connection = new Connection($dbc); |
|
| 13 | + $this->db = $Connection->db(); |
|
| 14 | + } |
|
| 15 | 15 | |
| 16 | - /** |
|
| 17 | - * Change IATA to ICAO value for ident |
|
| 18 | - * |
|
| 19 | - * @param String $ident ident |
|
| 20 | - * @return String the icao |
|
| 21 | - */ |
|
| 22 | - public function ident2icao($ident) { |
|
| 16 | + /** |
|
| 17 | + * Change IATA to ICAO value for ident |
|
| 18 | + * |
|
| 19 | + * @param String $ident ident |
|
| 20 | + * @return String the icao |
|
| 21 | + */ |
|
| 22 | + public function ident2icao($ident) { |
|
| 23 | 23 | $Spotter = new Spotter(); |
| 24 | 24 | if (!is_numeric(substr($ident, 0, 3))) |
| 25 | - { |
|
| 26 | - if (is_numeric(substr(substr($ident, 0, 3), -1, 1))) { |
|
| 27 | - $airline_icao = substr($ident, 0, 2); |
|
| 28 | - } elseif (is_numeric(substr(substr($ident, 0, 4), -1, 1))) { |
|
| 29 | - //$airline_icao = substr($ident, 0, 3); |
|
| 30 | - return $ident; |
|
| 31 | - } else return $ident; |
|
| 32 | - } else return $ident; |
|
| 33 | - if ($airline_icao == 'AF') { |
|
| 34 | - if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident; |
|
| 35 | - else $icao = 'AFR'.ltrim(substr($ident,2),'0'); |
|
| 36 | - } else { |
|
| 37 | - $identicao = $Spotter->getAllAirlineInfo($airline_icao); |
|
| 38 | - if (isset($identicao[0])) { |
|
| 39 | - $icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0'); |
|
| 40 | - } else $icao = $ident; |
|
| 41 | - } |
|
| 42 | - return $icao; |
|
| 43 | - } |
|
| 25 | + { |
|
| 26 | + if (is_numeric(substr(substr($ident, 0, 3), -1, 1))) { |
|
| 27 | + $airline_icao = substr($ident, 0, 2); |
|
| 28 | + } elseif (is_numeric(substr(substr($ident, 0, 4), -1, 1))) { |
|
| 29 | + //$airline_icao = substr($ident, 0, 3); |
|
| 30 | + return $ident; |
|
| 31 | + } else return $ident; |
|
| 32 | + } else return $ident; |
|
| 33 | + if ($airline_icao == 'AF') { |
|
| 34 | + if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident; |
|
| 35 | + else $icao = 'AFR'.ltrim(substr($ident,2),'0'); |
|
| 36 | + } else { |
|
| 37 | + $identicao = $Spotter->getAllAirlineInfo($airline_icao); |
|
| 38 | + if (isset($identicao[0])) { |
|
| 39 | + $icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0'); |
|
| 40 | + } else $icao = $ident; |
|
| 41 | + } |
|
| 42 | + return $icao; |
|
| 43 | + } |
|
| 44 | 44 | |
| 45 | 45 | |
| 46 | - public function getOperator($ident) { |
|
| 47 | - $query = "SELECT * FROM translation WHERE Operator = :ident LIMIT 1"; |
|
| 48 | - $query_values = array(':ident' => $ident); |
|
| 49 | - try { |
|
| 50 | - $sth = $this->db->prepare($query); |
|
| 51 | - $sth->execute($query_values); |
|
| 52 | - } catch(PDOException $e) { |
|
| 53 | - return "error : ".$e->getMessage(); |
|
| 54 | - } |
|
| 55 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 56 | - $sth->closeCursor(); |
|
| 57 | - if (count($row) > 0) { |
|
| 58 | - return $row['operator_correct']; |
|
| 59 | - } else return $ident; |
|
| 60 | - } |
|
| 46 | + public function getOperator($ident) { |
|
| 47 | + $query = "SELECT * FROM translation WHERE Operator = :ident LIMIT 1"; |
|
| 48 | + $query_values = array(':ident' => $ident); |
|
| 49 | + try { |
|
| 50 | + $sth = $this->db->prepare($query); |
|
| 51 | + $sth->execute($query_values); |
|
| 52 | + } catch(PDOException $e) { |
|
| 53 | + return "error : ".$e->getMessage(); |
|
| 54 | + } |
|
| 55 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 56 | + $sth->closeCursor(); |
|
| 57 | + if (count($row) > 0) { |
|
| 58 | + return $row['operator_correct']; |
|
| 59 | + } else return $ident; |
|
| 60 | + } |
|
| 61 | 61 | |
| 62 | - public function addOperator($ident,$correct_ident,$source) { |
|
| 63 | - $query = "INSERT INTO translation (Operator,Operator_correct,Source) VALUES (:ident,:correct_ident,:source)"; |
|
| 64 | - $query_values = array(':ident' => $ident,':correct_ident' => $correct_ident, ':source' => $source); |
|
| 65 | - try { |
|
| 66 | - $sth = $this->db->prepare($query); |
|
| 67 | - $sth->execute($query_values); |
|
| 68 | - } catch(PDOException $e) { |
|
| 69 | - return "error : ".$e->getMessage(); |
|
| 70 | - } |
|
| 71 | - } |
|
| 62 | + public function addOperator($ident,$correct_ident,$source) { |
|
| 63 | + $query = "INSERT INTO translation (Operator,Operator_correct,Source) VALUES (:ident,:correct_ident,:source)"; |
|
| 64 | + $query_values = array(':ident' => $ident,':correct_ident' => $correct_ident, ':source' => $source); |
|
| 65 | + try { |
|
| 66 | + $sth = $this->db->prepare($query); |
|
| 67 | + $sth->execute($query_values); |
|
| 68 | + } catch(PDOException $e) { |
|
| 69 | + return "error : ".$e->getMessage(); |
|
| 70 | + } |
|
| 71 | + } |
|
| 72 | 72 | |
| 73 | - public function updateOperator($ident,$correct_ident,$source) { |
|
| 74 | - $query = "UPDATE translation SET Operator_correct = :correct_ident,Source = :source WHERE Operator = :ident"; |
|
| 75 | - $query_values = array(':ident' => $ident,':correct_ident' => $correct_ident, ':source' => $source); |
|
| 76 | - try { |
|
| 77 | - $sth = $this->db->prepare($query); |
|
| 78 | - $sth->execute($query_values); |
|
| 79 | - } catch(PDOException $e) { |
|
| 80 | - return "error : ".$e->getMessage(); |
|
| 81 | - } |
|
| 82 | - } |
|
| 73 | + public function updateOperator($ident,$correct_ident,$source) { |
|
| 74 | + $query = "UPDATE translation SET Operator_correct = :correct_ident,Source = :source WHERE Operator = :ident"; |
|
| 75 | + $query_values = array(':ident' => $ident,':correct_ident' => $correct_ident, ':source' => $source); |
|
| 76 | + try { |
|
| 77 | + $sth = $this->db->prepare($query); |
|
| 78 | + $sth->execute($query_values); |
|
| 79 | + } catch(PDOException $e) { |
|
| 80 | + return "error : ".$e->getMessage(); |
|
| 81 | + } |
|
| 82 | + } |
|
| 83 | 83 | |
| 84 | - public function checkTranslation($ident,$web = false) { |
|
| 85 | - global $globalTranslationSources, $globalTranslationFetch; |
|
| 86 | - //if (!isset($globalTranslationSources)) $globalTranslationSources = array('planefinder'); |
|
| 87 | - $globalTranslationSources = array(); |
|
| 88 | - if (!isset($globalTranslationFetch)) $globalTranslationFetch = TRUE; |
|
| 89 | - //echo "Check Translation for ".$ident."..."; |
|
| 90 | - $correct = $this->getOperator($ident); |
|
| 91 | - if ($correct != '' && $correct != $ident) { |
|
| 92 | - //echo "Found in DB !\n"; |
|
| 93 | - return $correct; |
|
| 94 | - } /* |
|
| 84 | + public function checkTranslation($ident,$web = false) { |
|
| 85 | + global $globalTranslationSources, $globalTranslationFetch; |
|
| 86 | + //if (!isset($globalTranslationSources)) $globalTranslationSources = array('planefinder'); |
|
| 87 | + $globalTranslationSources = array(); |
|
| 88 | + if (!isset($globalTranslationFetch)) $globalTranslationFetch = TRUE; |
|
| 89 | + //echo "Check Translation for ".$ident."..."; |
|
| 90 | + $correct = $this->getOperator($ident); |
|
| 91 | + if ($correct != '' && $correct != $ident) { |
|
| 92 | + //echo "Found in DB !\n"; |
|
| 93 | + return $correct; |
|
| 94 | + } /* |
|
| 95 | 95 | elseif ($web && $globalTranslationFetch) { |
| 96 | 96 | if (! is_numeric(substr($ident,-4))) { |
| 97 | 97 | if (count($globalTranslationSources) > 0) { |
@@ -108,8 +108,8 @@ discard block |
||
| 108 | 108 | } |
| 109 | 109 | } |
| 110 | 110 | */ |
| 111 | - return $this->ident2icao($ident); |
|
| 112 | - } |
|
| 111 | + return $this->ident2icao($ident); |
|
| 112 | + } |
|
| 113 | 113 | |
| 114 | 114 | /* |
| 115 | 115 | function fromPlanefinder($icao) { |
@@ -7,18 +7,18 @@ discard block |
||
| 7 | 7 | public $latest_schema = 26; |
| 8 | 8 | |
| 9 | 9 | public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) { |
| 10 | - global $globalDBdriver; |
|
| 11 | - if ($dbc === null) { |
|
| 10 | + global $globalDBdriver; |
|
| 11 | + if ($dbc === null) { |
|
| 12 | 12 | if ($this->db === null && $dbname === null) { |
| 13 | - if ($user === null && $pass === null) { |
|
| 13 | + if ($user === null && $pass === null) { |
|
| 14 | 14 | $this->createDBConnection(); |
| 15 | - } else { |
|
| 15 | + } else { |
|
| 16 | 16 | $this->createDBConnection(null,$user,$pass); |
| 17 | - } |
|
| 17 | + } |
|
| 18 | 18 | } else { |
| 19 | - $this->createDBConnection($dbname); |
|
| 19 | + $this->createDBConnection($dbname); |
|
| 20 | 20 | } |
| 21 | - } elseif ($dbname === null || $dbname === 'default') { |
|
| 21 | + } elseif ($dbname === null || $dbname === 'default') { |
|
| 22 | 22 | $this->db = $dbc; |
| 23 | 23 | if ($this->connectionExists() === false) { |
| 24 | 24 | /* |
@@ -28,10 +28,10 @@ discard block |
||
| 28 | 28 | */ |
| 29 | 29 | $this->createDBConnection(); |
| 30 | 30 | } |
| 31 | - } else { |
|
| 31 | + } else { |
|
| 32 | 32 | //$this->connectionExists(); |
| 33 | 33 | $this->dbs[$dbname] = $dbc; |
| 34 | - } |
|
| 34 | + } |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | public function db() { |
@@ -47,11 +47,11 @@ discard block |
||
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | /** |
| 50 | - * Creates the database connection |
|
| 51 | - * |
|
| 52 | - * @return Boolean of the database connection |
|
| 53 | - * |
|
| 54 | - */ |
|
| 50 | + * Creates the database connection |
|
| 51 | + * |
|
| 52 | + * @return Boolean of the database connection |
|
| 53 | + * |
|
| 54 | + */ |
|
| 55 | 55 | |
| 56 | 56 | public function createDBConnection($DBname = null, $user = null, $pass = null) |
| 57 | 57 | { |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | return false; |
| 148 | 148 | } |
| 149 | 149 | if($results->rowCount()>0) { |
| 150 | - return true; |
|
| 150 | + return true; |
|
| 151 | 151 | } |
| 152 | 152 | else return false; |
| 153 | 153 | } |
@@ -164,14 +164,14 @@ discard block |
||
| 164 | 164 | $sum = $sum->fetchColumn(0); |
| 165 | 165 | } else $sum = 0; |
| 166 | 166 | if (intval($sum) !== 2) { |
| 167 | - return false; |
|
| 167 | + return false; |
|
| 168 | 168 | } |
| 169 | 169 | |
| 170 | 170 | } catch(PDOException $e) { |
| 171 | 171 | if($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) { |
| 172 | - throw $e; |
|
| 173 | - } |
|
| 174 | - //echo 'error ! '.$e->getMessage(); |
|
| 172 | + throw $e; |
|
| 173 | + } |
|
| 174 | + //echo 'error ! '.$e->getMessage(); |
|
| 175 | 175 | return false; |
| 176 | 176 | } |
| 177 | 177 | return true; |
@@ -268,8 +268,8 @@ discard block |
||
| 268 | 268 | $version = 0; |
| 269 | 269 | if ($this->tableExists('aircraft')) { |
| 270 | 270 | if (!$this->tableExists('config')) { |
| 271 | - $version = '1'; |
|
| 272 | - return $version; |
|
| 271 | + $version = '1'; |
|
| 272 | + return $version; |
|
| 273 | 273 | } else { |
| 274 | 274 | $query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1"; |
| 275 | 275 | try { |
@@ -289,8 +289,8 @@ discard block |
||
| 289 | 289 | * @return Boolean if latest version or not |
| 290 | 290 | */ |
| 291 | 291 | public function latest() { |
| 292 | - if ($this->check_schema_version() == $this->latest_schema) return true; |
|
| 293 | - else return false; |
|
| 292 | + if ($this->check_schema_version() == $this->latest_schema) return true; |
|
| 293 | + else return false; |
|
| 294 | 294 | } |
| 295 | 295 | |
| 296 | 296 | } |
@@ -21,18 +21,18 @@ discard block |
||
| 21 | 21 | print '<div class="select-item">'; |
| 22 | 22 | print '<form action="'.$globalURL.'/aircraft" method="post">'; |
| 23 | 23 | print '<select name="aircraft_type" class="selectpicker" data-live-search="true">'; |
| 24 | - print '<option></option>'; |
|
| 25 | - $Stats = new Stats(); |
|
| 26 | - $aircraft_types = $Stats->getAllAircraftTypes(); |
|
| 27 | - if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes(); |
|
| 28 | - foreach($aircraft_types as $aircrafttype) |
|
| 29 | - { |
|
| 30 | - if($aircraft_type == $aircrafttype['aircraft_icao']) |
|
| 31 | - { |
|
| 32 | - print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>'; |
|
| 33 | - } else { |
|
| 34 | - print '<option value="'.$aircrafttype['aircraft_icao'].'">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>'; |
|
| 35 | - } |
|
| 24 | + print '<option></option>'; |
|
| 25 | + $Stats = new Stats(); |
|
| 26 | + $aircraft_types = $Stats->getAllAircraftTypes(); |
|
| 27 | + if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes(); |
|
| 28 | + foreach($aircraft_types as $aircrafttype) |
|
| 29 | + { |
|
| 30 | + if($aircraft_type == $aircrafttype['aircraft_icao']) |
|
| 31 | + { |
|
| 32 | + print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>'; |
|
| 33 | + } else { |
|
| 34 | + print '<option value="'.$aircrafttype['aircraft_icao'].'">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>'; |
|
| 35 | + } |
|
| 36 | 36 | } |
| 37 | 37 | print '</select>'; |
| 38 | 38 | print '<button type="submit"><i class="fa fa-angle-double-right"></i></button>'; |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | function drawChart() { |
| 65 | 65 | var data = google.visualization.arrayToDataTable([ |
| 66 | 66 | ["Country", "# of times"], '; |
| 67 | - $country_data = ''; |
|
| 67 | + $country_data = ''; |
|
| 68 | 68 | foreach($airline_array as $airline_item) |
| 69 | 69 | { |
| 70 | 70 | $country_data .= '[ "'.$airline_item['airline_country'].'",'.$airline_item['airline_country_count'].'],'; |
@@ -42,8 +42,8 @@ discard block |
||
| 42 | 42 | print '<div class="select-item">'; |
| 43 | 43 | print '<form action="'.$globalURL.'/aircraft" method="post">'; |
| 44 | 44 | print '<select name="aircraft_type" class="selectpicker" data-live-search="true">'; |
| 45 | - print '<option></option>'; |
|
| 46 | - $Stats = new Stats(); |
|
| 45 | + print '<option></option>'; |
|
| 46 | + $Stats = new Stats(); |
|
| 47 | 47 | $aircraft_types = $Stats->getAllAircraftTypes(); |
| 48 | 48 | if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes(); |
| 49 | 49 | foreach($aircraft_types as $aircrafttype) |
@@ -54,20 +54,20 @@ discard block |
||
| 54 | 54 | } else { |
| 55 | 55 | print '<option value="'.$aircrafttype['aircraft_icao'].'">'.$aircrafttype['aircraft_manufacturer'].' '.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>'; |
| 56 | 56 | } |
| 57 | - } |
|
| 58 | - print '</select>'; |
|
| 59 | - print '<button type="submit"><i class="fa fa-angle-double-right"></i></button>'; |
|
| 57 | + } |
|
| 58 | + print '</select>'; |
|
| 59 | + print '<button type="submit"><i class="fa fa-angle-double-right"></i></button>'; |
|
| 60 | 60 | print '</form>'; |
| 61 | 61 | print '</div>'; |
| 62 | 62 | |
| 63 | 63 | if ($aircraft_type != "NA") |
| 64 | 64 | { |
| 65 | - print '<div class="info column">'; |
|
| 66 | - print '<h1>'.$spotter_array[0]['aircraft_name'].' ('.$spotter_array[0]['aircraft_type'].')</h1>'; |
|
| 67 | - print '<div><span class="label">'._("Name").'</span>'.$spotter_array[0]['aircraft_name'].'</div>'; |
|
| 68 | - print '<div><span class="label">'._("ICAO").'</span>'.$spotter_array[0]['aircraft_type'].'</div>'; |
|
| 69 | - if (isset($spotter_array[0]['aircraft_manufacturer'])) print '<div><span class="label">'._("Manufacturer").'</span><a href="'.$globalURL.'/manufacturer/'.strtolower(str_replace(" ", "-", $spotter_array[0]['aircraft_manufacturer'])).'">'.$spotter_array[0]['aircraft_manufacturer'].'</a></div>'; |
|
| 70 | - print '</div>'; |
|
| 65 | + print '<div class="info column">'; |
|
| 66 | + print '<h1>'.$spotter_array[0]['aircraft_name'].' ('.$spotter_array[0]['aircraft_type'].')</h1>'; |
|
| 67 | + print '<div><span class="label">'._("Name").'</span>'.$spotter_array[0]['aircraft_name'].'</div>'; |
|
| 68 | + print '<div><span class="label">'._("ICAO").'</span>'.$spotter_array[0]['aircraft_type'].'</div>'; |
|
| 69 | + if (isset($spotter_array[0]['aircraft_manufacturer'])) print '<div><span class="label">'._("Manufacturer").'</span><a href="'.$globalURL.'/manufacturer/'.strtolower(str_replace(" ", "-", $spotter_array[0]['aircraft_manufacturer'])).'">'.$spotter_array[0]['aircraft_manufacturer'].'</a></div>'; |
|
| 70 | + print '</div>'; |
|
| 71 | 71 | } else { |
| 72 | 72 | print '<div class="alert alert-warning">'._("This special aircraft profile shows all flights in where the aircraft type is unknown.").'</div>'; |
| 73 | 73 | } |
@@ -305,17 +305,17 @@ discard block |
||
| 305 | 305 | </tr> |
| 306 | 306 | <!-- |
| 307 | 307 | <?php |
| 308 | - require_once(dirname(__FILE__).'/../require/class.Connection.php'); |
|
| 309 | - $Connection = new Connection(); |
|
| 308 | + require_once(dirname(__FILE__).'/../require/class.Connection.php'); |
|
| 309 | + $Connection = new Connection(); |
|
| 310 | 310 | ?> |
| 311 | 311 | --> |
| 312 | 312 | <?php |
| 313 | - if ($Connection->db != NULL) { |
|
| 313 | + if ($Connection->db != NULL) { |
|
| 314 | 314 | if ($Connection->tableExists('source_location')) { |
| 315 | - require_once(dirname(__FILE__).'/../require/class.Source.php'); |
|
| 316 | - $Source = new Source(); |
|
| 317 | - $alllocations = $Source->getAllLocationInfo(); |
|
| 318 | - foreach ($alllocations as $location) { |
|
| 315 | + require_once(dirname(__FILE__).'/../require/class.Source.php'); |
|
| 316 | + $Source = new Source(); |
|
| 317 | + $alllocations = $Source->getAllLocationInfo(); |
|
| 318 | + foreach ($alllocations as $location) { |
|
| 319 | 319 | ?> |
| 320 | 320 | <tr> |
| 321 | 321 | <input type="hidden" name="source_id[]" value="<?php print $location['id']; ?>" /> |
@@ -329,9 +329,9 @@ discard block |
||
| 329 | 329 | </tr> |
| 330 | 330 | |
| 331 | 331 | <?php |
| 332 | - } |
|
| 332 | + } |
|
| 333 | + } |
|
| 333 | 334 | } |
| 334 | - } |
|
| 335 | 335 | ?> |
| 336 | 336 | |
| 337 | 337 | <tr> |
@@ -424,12 +424,12 @@ discard block |
||
| 424 | 424 | ?> |
| 425 | 425 | <tr> |
| 426 | 426 | <?php |
| 427 | - if (filter_var($source['host'],FILTER_VALIDATE_URL)) { |
|
| 427 | + if (filter_var($source['host'],FILTER_VALIDATE_URL)) { |
|
| 428 | 428 | ?> |
| 429 | 429 | <td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td> |
| 430 | 430 | <td><input type="number" name="port[]" id="port" value="<?php print $source['port']; ?>" /></td> |
| 431 | 431 | <?php |
| 432 | - } else { |
|
| 432 | + } else { |
|
| 433 | 433 | $hostport = explode(':',$source['host']); |
| 434 | 434 | if (isset($hostport[1])) { |
| 435 | 435 | $host = $hostport[0]; |
@@ -442,7 +442,7 @@ discard block |
||
| 442 | 442 | <td><input type="text" name="host[]" id="host" value="<?php print $host; ?>" /></td> |
| 443 | 443 | <td><input type="number" name="port[]" id="port" value="<?php print $port; ?>" /></td> |
| 444 | 444 | <?php |
| 445 | - } |
|
| 445 | + } |
|
| 446 | 446 | ?> |
| 447 | 447 | <td> |
| 448 | 448 | <select name="format[]" id="format"> |
@@ -758,7 +758,7 @@ discard block |
||
| 758 | 758 | <br /> |
| 759 | 759 | <p> |
| 760 | 760 | <?php |
| 761 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 761 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 762 | 762 | ?> |
| 763 | 763 | <label for="aircrafticoncolor">Color of aircraft icon on map</label> |
| 764 | 764 | <input type="color" name="aircrafticoncolor" id="aircrafticoncolor" value="#<?php if (isset($globalAircraftIconColor)) echo $globalAircraftIconColor; else echo '1a3151'; ?>" /> |
@@ -768,11 +768,11 @@ discard block |
||
| 768 | 768 | <b>The directory cache is not writable, aircraft icon will not be cached</b> |
| 769 | 769 | <?php |
| 770 | 770 | } |
| 771 | - } else { |
|
| 771 | + } else { |
|
| 772 | 772 | ?> |
| 773 | 773 | <b>PHP GD is not installed, you can t change color of aircraft icon on map</b> |
| 774 | 774 | <?php |
| 775 | - } |
|
| 775 | + } |
|
| 776 | 776 | ?> |
| 777 | 777 | </p> |
| 778 | 778 | <br /> |
@@ -791,7 +791,7 @@ discard block |
||
| 791 | 791 | </p> |
| 792 | 792 | <?php |
| 793 | 793 | require('../footer.php'); |
| 794 | - exit; |
|
| 794 | + exit; |
|
| 795 | 795 | } |
| 796 | 796 | |
| 797 | 797 | $settings = array(); |
@@ -881,8 +881,8 @@ discard block |
||
| 881 | 881 | |
| 882 | 882 | $sources = array(); |
| 883 | 883 | foreach ($source_name as $keys => $name) { |
| 884 | - if (isset($source_id[$keys])) $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]); |
|
| 885 | - else $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]); |
|
| 884 | + if (isset($source_id[$keys])) $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]); |
|
| 885 | + else $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]); |
|
| 886 | 886 | } |
| 887 | 887 | if (count($sources) > 0) $_SESSION['sources'] = $sources; |
| 888 | 888 | |
@@ -1176,14 +1176,14 @@ discard block |
||
| 1176 | 1176 | |
| 1177 | 1177 | // Set some defaults values... |
| 1178 | 1178 | if (!isset($globalAircraftImageSources)) { |
| 1179 | - $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters'); |
|
| 1180 | - $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources)); |
|
| 1179 | + $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters'); |
|
| 1180 | + $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources)); |
|
| 1181 | 1181 | } |
| 1182 | 1182 | |
| 1183 | 1183 | if (!isset($globalSchedulesSources)) { |
| 1184 | - $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware'); |
|
| 1185 | - $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources)); |
|
| 1186 | - } |
|
| 1184 | + $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware'); |
|
| 1185 | + $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources)); |
|
| 1186 | + } |
|
| 1187 | 1187 | |
| 1188 | 1188 | $settings = array_merge($settings,array('globalInstalled' => 'TRUE')); |
| 1189 | 1189 | |
@@ -1235,21 +1235,21 @@ discard block |
||
| 1235 | 1235 | $popi = false; |
| 1236 | 1236 | $popw = false; |
| 1237 | 1237 | foreach ($_SESSION['done'] as $done) { |
| 1238 | - print '<li>'.$done.'....<strong>SUCCESS</strong></li>'; |
|
| 1239 | - if ($done == 'Create database') $pop = true; |
|
| 1240 | - if ($_SESSION['install'] == 'database_create') $pop = true; |
|
| 1241 | - if ($_SESSION['install'] == 'database_import') $popi = true; |
|
| 1242 | - if ($_SESSION['install'] == 'waypoints') $popw = true; |
|
| 1238 | + print '<li>'.$done.'....<strong>SUCCESS</strong></li>'; |
|
| 1239 | + if ($done == 'Create database') $pop = true; |
|
| 1240 | + if ($_SESSION['install'] == 'database_create') $pop = true; |
|
| 1241 | + if ($_SESSION['install'] == 'database_import') $popi = true; |
|
| 1242 | + if ($_SESSION['install'] == 'waypoints') $popw = true; |
|
| 1243 | 1243 | } |
| 1244 | 1244 | if ($pop) { |
| 1245 | - sleep(5); |
|
| 1246 | - print '<li>Create database....<img src="../images/loading.gif" /></li>'; |
|
| 1245 | + sleep(5); |
|
| 1246 | + print '<li>Create database....<img src="../images/loading.gif" /></li>'; |
|
| 1247 | 1247 | } else if ($popi) { |
| 1248 | - sleep(5); |
|
| 1249 | - print '<li>Create and import tables....<img src="../images/loading.gif" /></li>'; |
|
| 1248 | + sleep(5); |
|
| 1249 | + print '<li>Create and import tables....<img src="../images/loading.gif" /></li>'; |
|
| 1250 | 1250 | } else if ($popw) { |
| 1251 | - sleep(5); |
|
| 1252 | - print '<li>Populate waypoints database....<img src="../images/loading.gif" /></li>'; |
|
| 1251 | + sleep(5); |
|
| 1252 | + print '<li>Populate waypoints database....<img src="../images/loading.gif" /></li>'; |
|
| 1253 | 1253 | } else print '<li>Update schema if needed....<img src="../images/loading.gif" /></li>'; |
| 1254 | 1254 | print '</div></ul>'; |
| 1255 | 1255 | print '<div id="error"></div>'; |
@@ -1312,7 +1312,7 @@ discard block |
||
| 1312 | 1312 | unset($_COOKIE['install']); |
| 1313 | 1313 | print '<div class="info column"><ul>'; |
| 1314 | 1314 | foreach ($_SESSION['done'] as $done) { |
| 1315 | - print '<li>'.$done.'....<strong>SUCCESS</strong></li>'; |
|
| 1315 | + print '<li>'.$done.'....<strong>SUCCESS</strong></li>'; |
|
| 1316 | 1316 | } |
| 1317 | 1317 | print '<li>Reloading page to check all is now ok....<strong>SUCCESS</strong></li>'; |
| 1318 | 1318 | print '</ul></div>'; |
@@ -19,47 +19,47 @@ discard block |
||
| 19 | 19 | // Check if schema is at latest version |
| 20 | 20 | $Connection = new Connection(); |
| 21 | 21 | if ($Connection->latest() === false) { |
| 22 | - echo "You MUST update to latest schema. Run install/index.php"; |
|
| 23 | - exit(); |
|
| 22 | + echo "You MUST update to latest schema. Run install/index.php"; |
|
| 23 | + exit(); |
|
| 24 | 24 | } |
| 25 | 25 | if (PHP_SAPI != 'cli') { |
| 26 | - echo "This script MUST be called from console, not a web browser."; |
|
| 26 | + echo "This script MUST be called from console, not a web browser."; |
|
| 27 | 27 | // exit(); |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | // This is to be compatible with old version of settings.php |
| 31 | 31 | if (!isset($globalSources)) { |
| 32 | - if (isset($globalSBS1Hosts)) { |
|
| 33 | - //$hosts = $globalSBS1Hosts; |
|
| 34 | - foreach ($globalSBS1Hosts as $host) { |
|
| 35 | - $globalSources[] = array('host' => $host); |
|
| 36 | - } |
|
| 37 | - } else { |
|
| 38 | - if (!isset($globalSBS1Host)) { |
|
| 39 | - echo '$globalSources MUST be defined !'; |
|
| 40 | - die; |
|
| 32 | + if (isset($globalSBS1Hosts)) { |
|
| 33 | + //$hosts = $globalSBS1Hosts; |
|
| 34 | + foreach ($globalSBS1Hosts as $host) { |
|
| 35 | + $globalSources[] = array('host' => $host); |
|
| 36 | + } |
|
| 37 | + } else { |
|
| 38 | + if (!isset($globalSBS1Host)) { |
|
| 39 | + echo '$globalSources MUST be defined !'; |
|
| 40 | + die; |
|
| 41 | 41 | } |
| 42 | 42 | //$hosts = array($globalSBS1Host.':'.$globalSBS1Port); |
| 43 | 43 | $globalSources[] = array('host' => $globalSBS1Host,'port' => $globalSBS1Port); |
| 44 | - } |
|
| 44 | + } |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | $options = getopt('s::',array('source::','server','idsource::')); |
| 48 | 48 | //if (isset($options['s'])) $hosts = array($options['s']); |
| 49 | 49 | //elseif (isset($options['source'])) $hosts = array($options['source']); |
| 50 | 50 | if (isset($options['s'])) { |
| 51 | - $globalSources = array(); |
|
| 52 | - $globalSources[] = array('host' => $options['s']); |
|
| 51 | + $globalSources = array(); |
|
| 52 | + $globalSources[] = array('host' => $options['s']); |
|
| 53 | 53 | } elseif (isset($options['source'])) { |
| 54 | - $globalSources = array(); |
|
| 55 | - $globalSources[] = array('host' => $options['source']); |
|
| 54 | + $globalSources = array(); |
|
| 55 | + $globalSources[] = array('host' => $options['source']); |
|
| 56 | 56 | } |
| 57 | 57 | if (isset($options['server'])) $globalServer = TRUE; |
| 58 | 58 | if (isset($options['idsource'])) $id_source = $options['idsource']; |
| 59 | 59 | else $id_source = 1; |
| 60 | 60 | if (isset($globalServer) && $globalServer) { |
| 61 | - if ($globalDebug) echo "Using Server Mode\n"; |
|
| 62 | - $SI=new SpotterServer(); |
|
| 61 | + if ($globalDebug) echo "Using Server Mode\n"; |
|
| 62 | + $SI=new SpotterServer(); |
|
| 63 | 63 | } else $SI=new SpotterImport($Connection->db); |
| 64 | 64 | //$APRS=new APRS($Connection->db); |
| 65 | 65 | $SBS=new SBS(); |
@@ -69,12 +69,12 @@ discard block |
||
| 69 | 69 | //$servertz = system('date +%Z'); |
| 70 | 70 | // signal handler - playing nice with sockets and dump1090 |
| 71 | 71 | if (function_exists('pcntl_fork')) { |
| 72 | - pcntl_signal(SIGINT, function() { |
|
| 73 | - global $sockets; |
|
| 74 | - echo "\n\nctrl-c or kill signal received. Tidying up ... "; |
|
| 75 | - die("Bye!\n"); |
|
| 76 | - }); |
|
| 77 | - pcntl_signal_dispatch(); |
|
| 72 | + pcntl_signal(SIGINT, function() { |
|
| 73 | + global $sockets; |
|
| 74 | + echo "\n\nctrl-c or kill signal received. Tidying up ... "; |
|
| 75 | + die("Bye!\n"); |
|
| 76 | + }); |
|
| 77 | + pcntl_signal_dispatch(); |
|
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | // let's try and connect |
@@ -83,161 +83,161 @@ discard block |
||
| 83 | 83 | $aprs_full = false; |
| 84 | 84 | |
| 85 | 85 | function create_socket($host, $port, &$errno, &$errstr) { |
| 86 | - $ip = gethostbyname($host); |
|
| 87 | - $s = socket_create(AF_INET, SOCK_STREAM, 0); |
|
| 88 | - $r = @socket_connect($s, $ip, $port); |
|
| 89 | - if (!socket_set_nonblock($s)) echo "Unable to set nonblock on socket\n"; |
|
| 90 | - if ($r || socket_last_error() == 114 || socket_last_error() == 115) { |
|
| 91 | - return $s; |
|
| 92 | - } |
|
| 93 | - $errno = socket_last_error($s); |
|
| 94 | - $errstr = socket_strerror($errno); |
|
| 95 | - socket_close($s); |
|
| 96 | - return false; |
|
| 86 | + $ip = gethostbyname($host); |
|
| 87 | + $s = socket_create(AF_INET, SOCK_STREAM, 0); |
|
| 88 | + $r = @socket_connect($s, $ip, $port); |
|
| 89 | + if (!socket_set_nonblock($s)) echo "Unable to set nonblock on socket\n"; |
|
| 90 | + if ($r || socket_last_error() == 114 || socket_last_error() == 115) { |
|
| 91 | + return $s; |
|
| 92 | + } |
|
| 93 | + $errno = socket_last_error($s); |
|
| 94 | + $errstr = socket_strerror($errno); |
|
| 95 | + socket_close($s); |
|
| 96 | + return false; |
|
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | function create_socket_udp($host, $port, &$errno, &$errstr) { |
| 100 | - echo "UDP !!"; |
|
| 101 | - $ip = gethostbyname($host); |
|
| 102 | - $s = socket_create(AF_INET, SOCK_DGRAM, 0); |
|
| 103 | - $r = @socket_bind($s, $ip, $port); |
|
| 104 | - if ($r || socket_last_error() == 114 || socket_last_error() == 115) { |
|
| 105 | - return $s; |
|
| 106 | - } |
|
| 107 | - $errno = socket_last_error($s); |
|
| 108 | - $errstr = socket_strerror($errno); |
|
| 109 | - socket_close($s); |
|
| 110 | - return false; |
|
| 100 | + echo "UDP !!"; |
|
| 101 | + $ip = gethostbyname($host); |
|
| 102 | + $s = socket_create(AF_INET, SOCK_DGRAM, 0); |
|
| 103 | + $r = @socket_bind($s, $ip, $port); |
|
| 104 | + if ($r || socket_last_error() == 114 || socket_last_error() == 115) { |
|
| 105 | + return $s; |
|
| 106 | + } |
|
| 107 | + $errno = socket_last_error($s); |
|
| 108 | + $errstr = socket_strerror($errno); |
|
| 109 | + socket_close($s); |
|
| 110 | + return false; |
|
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | function connect_all($hosts) { |
| 114 | - //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs; |
|
| 115 | - global $sockets, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs; |
|
| 116 | - if ($globalDebug) echo 'Connect to all...'."\n"; |
|
| 117 | - foreach ($hosts as $id => $value) { |
|
| 114 | + //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs; |
|
| 115 | + global $sockets, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs; |
|
| 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('/10001/',$host)) { |
|
| 189 | - } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) { |
|
| 190 | - //$formats[$id] = 'tsv'; |
|
| 191 | - $globalSources[$id]['format'] = 'tsv'; |
|
| 192 | - if ($globalDebug) echo "Connect to tsv source (".$host.")...\n"; |
|
| 193 | - } |
|
| 194 | - } elseif (filter_var($host,FILTER_VALIDATE_URL)) { |
|
| 195 | - if ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
|
| 196 | - } elseif (!filter_var($host,FILTER_VALIDATE_URL)) { |
|
| 197 | - $hostport = explode(':',$host); |
|
| 198 | - 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('/10001/',$host)) { |
|
| 189 | + } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) { |
|
| 190 | + //$formats[$id] = 'tsv'; |
|
| 191 | + $globalSources[$id]['format'] = 'tsv'; |
|
| 192 | + if ($globalDebug) echo "Connect to tsv source (".$host.")...\n"; |
|
| 193 | + } |
|
| 194 | + } elseif (filter_var($host,FILTER_VALIDATE_URL)) { |
|
| 195 | + if ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
|
| 196 | + } elseif (!filter_var($host,FILTER_VALIDATE_URL)) { |
|
| 197 | + $hostport = explode(':',$host); |
|
| 198 | + if (isset($hostport[1])) { |
|
| 199 | 199 | $port = $hostport[1]; |
| 200 | 200 | $hostn = $hostport[0]; |
| 201 | - } else { |
|
| 201 | + } else { |
|
| 202 | 202 | $port = $globalSources[$id]['port']; |
| 203 | 203 | $hostn = $globalSources[$id]['host']; |
| 204 | - } |
|
| 205 | - if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) { |
|
| 206 | - $s = create_socket($hostn,$port, $errno, $errstr); |
|
| 207 | - } else { |
|
| 208 | - $s = create_socket_udp($hostn,$port, $errno, $errstr); |
|
| 209 | - } |
|
| 210 | - if ($s) { |
|
| 211 | - $sockets[$id] = $s; |
|
| 212 | - if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') { |
|
| 213 | - if (preg_match('/aprs/',$hostn)) { |
|
| 204 | + } |
|
| 205 | + if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) { |
|
| 206 | + $s = create_socket($hostn,$port, $errno, $errstr); |
|
| 207 | + } else { |
|
| 208 | + $s = create_socket_udp($hostn,$port, $errno, $errstr); |
|
| 209 | + } |
|
| 210 | + if ($s) { |
|
| 211 | + $sockets[$id] = $s; |
|
| 212 | + if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') { |
|
| 213 | + if (preg_match('/aprs/',$hostn)) { |
|
| 214 | 214 | //$formats[$id] = 'aprs'; |
| 215 | 215 | $globalSources[$id]['format'] = 'aprs'; |
| 216 | 216 | //$aprs_connect = 0; |
| 217 | 217 | //$use_aprs = true; |
| 218 | - } elseif ($port == '10001') { |
|
| 219 | - //$formats[$id] = 'tsv'; |
|
| 220 | - $globalSources[$id]['format'] = 'tsv'; |
|
| 221 | - } elseif ($port == '30002') { |
|
| 222 | - //$formats[$id] = 'raw'; |
|
| 223 | - $globalSources[$id]['format'] = 'raw'; |
|
| 224 | - } elseif ($port == '5001') { |
|
| 225 | - //$formats[$id] = 'raw'; |
|
| 226 | - $globalSources[$id]['format'] = 'flightgearmp'; |
|
| 227 | - } elseif ($port == '30005') { |
|
| 218 | + } elseif ($port == '10001') { |
|
| 219 | + //$formats[$id] = 'tsv'; |
|
| 220 | + $globalSources[$id]['format'] = 'tsv'; |
|
| 221 | + } elseif ($port == '30002') { |
|
| 222 | + //$formats[$id] = 'raw'; |
|
| 223 | + $globalSources[$id]['format'] = 'raw'; |
|
| 224 | + } elseif ($port == '5001') { |
|
| 225 | + //$formats[$id] = 'raw'; |
|
| 226 | + $globalSources[$id]['format'] = 'flightgearmp'; |
|
| 227 | + } elseif ($port == '30005') { |
|
| 228 | 228 | // Not yet supported |
| 229 | - //$formats[$id] = 'beast'; |
|
| 230 | - $globalSources[$id]['format'] = 'beast'; |
|
| 231 | - //} else $formats[$id] = 'sbs'; |
|
| 232 | - } else $globalSources[$id]['format'] = 'sbs'; |
|
| 233 | - //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n"; |
|
| 229 | + //$formats[$id] = 'beast'; |
|
| 230 | + $globalSources[$id]['format'] = 'beast'; |
|
| 231 | + //} else $formats[$id] = 'sbs'; |
|
| 232 | + } else $globalSources[$id]['format'] = 'sbs'; |
|
| 233 | + //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n"; |
|
| 234 | 234 | } |
| 235 | 235 | if ($globalDebug) echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n"; |
| 236 | - } else { |
|
| 236 | + } else { |
|
| 237 | 237 | if ($globalDebug) echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n"; |
| 238 | - } |
|
| 239 | - } |
|
| 240 | - } |
|
| 238 | + } |
|
| 239 | + } |
|
| 240 | + } |
|
| 241 | 241 | } |
| 242 | 242 | if (!isset($globalMinFetch)) $globalMinFetch = 15; |
| 243 | 243 | |
@@ -264,18 +264,18 @@ discard block |
||
| 264 | 264 | die; |
| 265 | 265 | } |
| 266 | 266 | foreach ($globalSources as $key => $source) { |
| 267 | - if (!isset($source['format'])) { |
|
| 268 | - $globalSources[$key]['format'] = 'auto'; |
|
| 269 | - } |
|
| 267 | + if (!isset($source['format'])) { |
|
| 268 | + $globalSources[$key]['format'] = 'auto'; |
|
| 269 | + } |
|
| 270 | 270 | } |
| 271 | 271 | connect_all($globalSources); |
| 272 | 272 | foreach ($globalSources as $key => $source) { |
| 273 | - if (isset($source['format']) && $source['format'] == 'aprs') { |
|
| 273 | + if (isset($source['format']) && $source['format'] == 'aprs') { |
|
| 274 | 274 | $aprs_connect = 0; |
| 275 | 275 | $use_aprs = true; |
| 276 | 276 | if (isset($source['port']) && $source['port'] == '10152') $aprs_full = true; |
| 277 | 277 | break; |
| 278 | - } |
|
| 278 | + } |
|
| 279 | 279 | } |
| 280 | 280 | |
| 281 | 281 | if ($use_aprs) { |
@@ -315,67 +315,67 @@ discard block |
||
| 315 | 315 | |
| 316 | 316 | // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time. |
| 317 | 317 | while ($i > 0) { |
| 318 | - if (!$globalDaemon) $i = $endtime-time(); |
|
| 319 | - // Delete old ATC |
|
| 320 | - if ($globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) { |
|
| 318 | + if (!$globalDaemon) $i = $endtime-time(); |
|
| 319 | + // Delete old ATC |
|
| 320 | + if ($globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) { |
|
| 321 | 321 | if ($globalDebug) echo 'Delete old ATC...'."\n"; |
| 322 | - $ATC->deleteOldATC(); |
|
| 323 | - } |
|
| 322 | + $ATC->deleteOldATC(); |
|
| 323 | + } |
|
| 324 | 324 | |
| 325 | - if (count($last_exec) > 0) { |
|
| 325 | + if (count($last_exec) > 0) { |
|
| 326 | 326 | $max = $globalMinFetch; |
| 327 | 327 | foreach ($last_exec as $last) { |
| 328 | - if ((time() - $last['last']) < $max) $max = time() - $last['last']; |
|
| 328 | + if ((time() - $last['last']) < $max) $max = time() - $last['last']; |
|
| 329 | 329 | } |
| 330 | 330 | if ($max != $globalMinFetch) { |
| 331 | - if ($globalDebug) echo 'Sleeping...'."\n"; |
|
| 332 | - sleep($globalMinFetch-$max+2); |
|
| 331 | + if ($globalDebug) echo 'Sleeping...'."\n"; |
|
| 332 | + sleep($globalMinFetch-$max+2); |
|
| 333 | + } |
|
| 333 | 334 | } |
| 334 | - } |
|
| 335 | 335 | |
| 336 | 336 | |
| 337 | - //foreach ($formats as $id => $value) { |
|
| 338 | - foreach ($globalSources as $id => $value) { |
|
| 337 | + //foreach ($formats as $id => $value) { |
|
| 338 | + foreach ($globalSources as $id => $value) { |
|
| 339 | 339 | if (!isset($last_exec[$id]['last'])) $last_exec[$id]['last'] = 0; |
| 340 | 340 | if ($value['format'] == 'deltadbtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 341 | - //$buffer = $Common->getData($hosts[$id]); |
|
| 342 | - $buffer = $Common->getData($value['host']); |
|
| 343 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 344 | - $buffer = explode('\n',$buffer); |
|
| 345 | - foreach ($buffer as $line) { |
|
| 346 | - if ($line != '' && count($line) > 7) { |
|
| 347 | - $line = explode(',', $line); |
|
| 348 | - $data = array(); |
|
| 349 | - $data['hex'] = $line[1]; // hex |
|
| 350 | - $data['ident'] = $line[2]; // ident |
|
| 351 | - if (isset($line[3])) $data['altitude'] = $line[3]; // altitude |
|
| 352 | - if (isset($line[4])) $data['speed'] = $line[4]; // speed |
|
| 353 | - if (isset($line[5])) $data['heading'] = $line[5]; // heading |
|
| 354 | - if (isset($line[6])) $data['latitude'] = $line[6]; // lat |
|
| 355 | - if (isset($line[7])) $data['longitude'] = $line[7]; // long |
|
| 356 | - $data['verticalrate'] = ''; // vertical rate |
|
| 357 | - //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk |
|
| 358 | - $data['emergency'] = ''; // emergency |
|
| 359 | - $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 360 | - $data['format_source'] = 'deltadbtxt'; |
|
| 361 | - $data['id_source'] = $id_source; |
|
| 362 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 363 | - if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats']; |
|
| 364 | - $SI->add($data); |
|
| 365 | - unset($data); |
|
| 366 | - } |
|
| 367 | - } |
|
| 368 | - $last_exec[$id]['last'] = time(); |
|
| 341 | + //$buffer = $Common->getData($hosts[$id]); |
|
| 342 | + $buffer = $Common->getData($value['host']); |
|
| 343 | + $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 344 | + $buffer = explode('\n',$buffer); |
|
| 345 | + foreach ($buffer as $line) { |
|
| 346 | + if ($line != '' && count($line) > 7) { |
|
| 347 | + $line = explode(',', $line); |
|
| 348 | + $data = array(); |
|
| 349 | + $data['hex'] = $line[1]; // hex |
|
| 350 | + $data['ident'] = $line[2]; // ident |
|
| 351 | + if (isset($line[3])) $data['altitude'] = $line[3]; // altitude |
|
| 352 | + if (isset($line[4])) $data['speed'] = $line[4]; // speed |
|
| 353 | + if (isset($line[5])) $data['heading'] = $line[5]; // heading |
|
| 354 | + if (isset($line[6])) $data['latitude'] = $line[6]; // lat |
|
| 355 | + if (isset($line[7])) $data['longitude'] = $line[7]; // long |
|
| 356 | + $data['verticalrate'] = ''; // vertical rate |
|
| 357 | + //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk |
|
| 358 | + $data['emergency'] = ''; // emergency |
|
| 359 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 360 | + $data['format_source'] = 'deltadbtxt'; |
|
| 361 | + $data['id_source'] = $id_source; |
|
| 362 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 363 | + if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats']; |
|
| 364 | + $SI->add($data); |
|
| 365 | + unset($data); |
|
| 366 | + } |
|
| 367 | + } |
|
| 368 | + $last_exec[$id]['last'] = time(); |
|
| 369 | 369 | //} elseif (($value == 'whazzup' && (time() - $last_exec['whazzup'] > $globalMinFetch)) || ($value == 'vatsimtxt' && (time() - $last_exec['vatsimtxt'] > $globalMinFetch))) { |
| 370 | 370 | } elseif (($value['format'] == 'whazzup' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) || ($value['format'] == 'vatsimtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch))) { |
| 371 | - //$buffer = $Common->getData($hosts[$id]); |
|
| 372 | - $buffer = $Common->getData($value['host']); |
|
| 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 != '') { |
|
| 377 | - $line = explode(':', $line); |
|
| 378 | - if (count($line) > 30 && $line[0] != 'callsign') { |
|
| 371 | + //$buffer = $Common->getData($hosts[$id]); |
|
| 372 | + $buffer = $Common->getData($value['host']); |
|
| 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 != '') { |
|
| 377 | + $line = explode(':', $line); |
|
| 378 | + if (count($line) > 30 && $line[0] != 'callsign') { |
|
| 379 | 379 | $data = array(); |
| 380 | 380 | $data['id'] = $line[1].'-'.$line[0]; |
| 381 | 381 | $data['pilot_id'] = $line[1]; |
@@ -387,36 +387,36 @@ discard block |
||
| 387 | 387 | if (isset($line[45])) $data['heading'] = $line[45]; // heading |
| 388 | 388 | elseif (isset($line[38])) $data['heading'] = $line[38]; // heading |
| 389 | 389 | $data['latitude'] = $line[5]; // lat |
| 390 | - $data['longitude'] = $line[6]; // long |
|
| 391 | - $data['verticalrate'] = ''; // vertical rate |
|
| 392 | - $data['squawk'] = ''; // squawk |
|
| 393 | - $data['emergency'] = ''; // emergency |
|
| 394 | - $data['waypoints'] = $line[30]; |
|
| 390 | + $data['longitude'] = $line[6]; // long |
|
| 391 | + $data['verticalrate'] = ''; // vertical rate |
|
| 392 | + $data['squawk'] = ''; // squawk |
|
| 393 | + $data['emergency'] = ''; // emergency |
|
| 394 | + $data['waypoints'] = $line[30]; |
|
| 395 | 395 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 396 | 396 | //$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37])); |
| 397 | 397 | if (isset($line[37])) $data['last_update'] = $line[37]; |
| 398 | - $data['departure_airport_icao'] = $line[11]; |
|
| 399 | - $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':'); |
|
| 400 | - $data['arrival_airport_icao'] = $line[13]; |
|
| 398 | + $data['departure_airport_icao'] = $line[11]; |
|
| 399 | + $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':'); |
|
| 400 | + $data['arrival_airport_icao'] = $line[13]; |
|
| 401 | 401 | $data['frequency'] = $line[4]; |
| 402 | 402 | $data['type'] = $line[18]; |
| 403 | 403 | $data['range'] = $line[19]; |
| 404 | 404 | if (isset($line[35])) $data['info'] = $line[35]; |
| 405 | - $data['id_source'] = $id_source; |
|
| 406 | - //$data['arrival_airport_time'] = ; |
|
| 407 | - if ($line[9] != '') { |
|
| 408 | - $aircraft_data = explode('/',$line[9]); |
|
| 409 | - if (isset($aircraft_data[1])) { |
|
| 410 | - $data['aircraft_icao'] = $aircraft_data[1]; |
|
| 411 | - } |
|
| 412 | - } |
|
| 413 | - /* |
|
| 405 | + $data['id_source'] = $id_source; |
|
| 406 | + //$data['arrival_airport_time'] = ; |
|
| 407 | + if ($line[9] != '') { |
|
| 408 | + $aircraft_data = explode('/',$line[9]); |
|
| 409 | + if (isset($aircraft_data[1])) { |
|
| 410 | + $data['aircraft_icao'] = $aircraft_data[1]; |
|
| 411 | + } |
|
| 412 | + } |
|
| 413 | + /* |
|
| 414 | 414 | if ($value == 'whazzup') $data['format_source'] = 'whazzup'; |
| 415 | 415 | elseif ($value == 'vatsimtxt') $data['format_source'] = 'vatsimtxt'; |
| 416 | 416 | */ |
| 417 | - $data['format_source'] = $value['format']; |
|
| 417 | + $data['format_source'] = $value['format']; |
|
| 418 | 418 | if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
| 419 | - if ($line[3] == 'PILOT') $SI->add($data); |
|
| 419 | + if ($line[3] == 'PILOT') $SI->add($data); |
|
| 420 | 420 | elseif ($line[3] == 'ATC') { |
| 421 | 421 | //print_r($data); |
| 422 | 422 | $data['info'] = str_replace('^§','<br />',$data['info']); |
@@ -434,240 +434,240 @@ discard block |
||
| 434 | 434 | if (!isset($data['source_name'])) $data['source_name'] = ''; |
| 435 | 435 | 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']); |
| 436 | 436 | } |
| 437 | - unset($data); |
|
| 438 | - } |
|
| 439 | - } |
|
| 440 | - } |
|
| 441 | - //if ($value == 'whazzup') $last_exec['whazzup'] = time(); |
|
| 442 | - //elseif ($value == 'vatsimtxt') $last_exec['vatsimtxt'] = time(); |
|
| 443 | - $last_exec[$id]['last'] = time(); |
|
| 444 | - //} elseif ($value == 'aircraftlistjson' && (time() - $last_exec['aircraftlistjson'] > $globalMinFetch)) { |
|
| 445 | - } elseif ($value['format'] == 'aircraftlistjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 446 | - $buffer = $Common->getData($value['host'],'get','','','','','20'); |
|
| 447 | - if ($buffer != '') { |
|
| 448 | - $all_data = json_decode($buffer,true); |
|
| 449 | - if (isset($all_data['acList'])) { |
|
| 437 | + unset($data); |
|
| 438 | + } |
|
| 439 | + } |
|
| 440 | + } |
|
| 441 | + //if ($value == 'whazzup') $last_exec['whazzup'] = time(); |
|
| 442 | + //elseif ($value == 'vatsimtxt') $last_exec['vatsimtxt'] = time(); |
|
| 443 | + $last_exec[$id]['last'] = time(); |
|
| 444 | + //} elseif ($value == 'aircraftlistjson' && (time() - $last_exec['aircraftlistjson'] > $globalMinFetch)) { |
|
| 445 | + } elseif ($value['format'] == 'aircraftlistjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 446 | + $buffer = $Common->getData($value['host'],'get','','','','','20'); |
|
| 447 | + if ($buffer != '') { |
|
| 448 | + $all_data = json_decode($buffer,true); |
|
| 449 | + if (isset($all_data['acList'])) { |
|
| 450 | 450 | foreach ($all_data['acList'] as $line) { |
| 451 | - $data = array(); |
|
| 452 | - $data['hex'] = $line['Icao']; // hex |
|
| 453 | - if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident |
|
| 454 | - if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude |
|
| 455 | - if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed |
|
| 456 | - if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading |
|
| 457 | - if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat |
|
| 458 | - if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long |
|
| 459 | - //$data['verticalrate'] = $line['']; // verticale rate |
|
| 460 | - if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk |
|
| 461 | - $data['emergency'] = ''; // emergency |
|
| 462 | - if (isset($line['Reg'])) $data['registration'] = $line['Reg']; |
|
| 463 | - /* |
|
| 451 | + $data = array(); |
|
| 452 | + $data['hex'] = $line['Icao']; // hex |
|
| 453 | + if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident |
|
| 454 | + if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude |
|
| 455 | + if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed |
|
| 456 | + if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading |
|
| 457 | + if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat |
|
| 458 | + if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long |
|
| 459 | + //$data['verticalrate'] = $line['']; // verticale rate |
|
| 460 | + if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk |
|
| 461 | + $data['emergency'] = ''; // emergency |
|
| 462 | + if (isset($line['Reg'])) $data['registration'] = $line['Reg']; |
|
| 463 | + /* |
|
| 464 | 464 | if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',$line['PosTime']/1000); |
| 465 | 465 | else $data['datetime'] = date('Y-m-d H:i:s'); |
| 466 | 466 | */ |
| 467 | - $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 468 | - if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type']; |
|
| 469 | - $data['format_source'] = 'aircraftlistjson'; |
|
| 470 | - $data['id_source'] = $id_source; |
|
| 471 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 472 | - if (isset($data['datetime'])) $SI->add($data); |
|
| 473 | - unset($data); |
|
| 467 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 468 | + if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type']; |
|
| 469 | + $data['format_source'] = 'aircraftlistjson'; |
|
| 470 | + $data['id_source'] = $id_source; |
|
| 471 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 472 | + if (isset($data['datetime'])) $SI->add($data); |
|
| 473 | + unset($data); |
|
| 474 | 474 | } |
| 475 | - } else { |
|
| 475 | + } else { |
|
| 476 | 476 | foreach ($all_data as $line) { |
| 477 | - $data = array(); |
|
| 478 | - $data['hex'] = $line['hex']; // hex |
|
| 479 | - $data['ident'] = $line['flight']; // ident |
|
| 480 | - $data['altitude'] = $line['altitude']; // altitude |
|
| 481 | - $data['speed'] = $line['speed']; // speed |
|
| 482 | - $data['heading'] = $line['track']; // heading |
|
| 483 | - $data['latitude'] = $line['lat']; // lat |
|
| 484 | - $data['longitude'] = $line['lon']; // long |
|
| 485 | - $data['verticalrate'] = $line['vrt']; // verticale rate |
|
| 486 | - $data['squawk'] = $line['squawk']; // squawk |
|
| 487 | - $data['emergency'] = ''; // emergency |
|
| 488 | - $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 489 | - $data['format_source'] = 'aircraftlistjson'; |
|
| 490 | - $data['id_source'] = $id_source; |
|
| 491 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 492 | - $SI->add($data); |
|
| 493 | - unset($data); |
|
| 477 | + $data = array(); |
|
| 478 | + $data['hex'] = $line['hex']; // hex |
|
| 479 | + $data['ident'] = $line['flight']; // ident |
|
| 480 | + $data['altitude'] = $line['altitude']; // altitude |
|
| 481 | + $data['speed'] = $line['speed']; // speed |
|
| 482 | + $data['heading'] = $line['track']; // heading |
|
| 483 | + $data['latitude'] = $line['lat']; // lat |
|
| 484 | + $data['longitude'] = $line['lon']; // long |
|
| 485 | + $data['verticalrate'] = $line['vrt']; // verticale rate |
|
| 486 | + $data['squawk'] = $line['squawk']; // squawk |
|
| 487 | + $data['emergency'] = ''; // emergency |
|
| 488 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 489 | + $data['format_source'] = 'aircraftlistjson'; |
|
| 490 | + $data['id_source'] = $id_source; |
|
| 491 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 492 | + $SI->add($data); |
|
| 493 | + unset($data); |
|
| 494 | + } |
|
| 495 | + } |
|
| 494 | 496 | } |
| 495 | - } |
|
| 496 | - } |
|
| 497 | - //$last_exec['aircraftlistjson'] = time(); |
|
| 498 | - $last_exec[$id]['last'] = time(); |
|
| 499 | - //} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) { |
|
| 500 | - } elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 501 | - $buffer = $Common->getData($value['host']); |
|
| 502 | - $all_data = json_decode($buffer,true); |
|
| 503 | - if (isset($all_data['planes'])) { |
|
| 497 | + //$last_exec['aircraftlistjson'] = time(); |
|
| 498 | + $last_exec[$id]['last'] = time(); |
|
| 499 | + //} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) { |
|
| 500 | + } elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 501 | + $buffer = $Common->getData($value['host']); |
|
| 502 | + $all_data = json_decode($buffer,true); |
|
| 503 | + if (isset($all_data['planes'])) { |
|
| 504 | 504 | foreach ($all_data['planes'] as $key => $line) { |
| 505 | - $data = array(); |
|
| 506 | - $data['hex'] = $key; // hex |
|
| 507 | - $data['ident'] = $line[3]; // ident |
|
| 508 | - $data['altitude'] = $line[6]; // altitude |
|
| 509 | - $data['speed'] = $line[8]; // speed |
|
| 510 | - $data['heading'] = $line[7]; // heading |
|
| 511 | - $data['latitude'] = $line[4]; // lat |
|
| 512 | - $data['longitude'] = $line[5]; // long |
|
| 513 | - //$data['verticalrate'] = $line[]; // verticale rate |
|
| 514 | - $data['squawk'] = $line[10]; // squawk |
|
| 515 | - $data['emergency'] = ''; // emergency |
|
| 516 | - $data['registration'] = $line[2]; |
|
| 517 | - $data['aircraft_icao'] = $line[0]; |
|
| 518 | - $deparr = explode('-',$line[1]); |
|
| 519 | - if (count($deparr) == 2) { |
|
| 505 | + $data = array(); |
|
| 506 | + $data['hex'] = $key; // hex |
|
| 507 | + $data['ident'] = $line[3]; // ident |
|
| 508 | + $data['altitude'] = $line[6]; // altitude |
|
| 509 | + $data['speed'] = $line[8]; // speed |
|
| 510 | + $data['heading'] = $line[7]; // heading |
|
| 511 | + $data['latitude'] = $line[4]; // lat |
|
| 512 | + $data['longitude'] = $line[5]; // long |
|
| 513 | + //$data['verticalrate'] = $line[]; // verticale rate |
|
| 514 | + $data['squawk'] = $line[10]; // squawk |
|
| 515 | + $data['emergency'] = ''; // emergency |
|
| 516 | + $data['registration'] = $line[2]; |
|
| 517 | + $data['aircraft_icao'] = $line[0]; |
|
| 518 | + $deparr = explode('-',$line[1]); |
|
| 519 | + if (count($deparr) == 2) { |
|
| 520 | 520 | $data['departure_airport_icao'] = $deparr[0]; |
| 521 | 521 | $data['arrival_airport_icao'] = $deparr[1]; |
| 522 | - } |
|
| 523 | - $data['datetime'] = date('Y-m-d H:i:s',$line[9]); |
|
| 524 | - $data['format_source'] = 'planeupdatefaa'; |
|
| 525 | - $data['id_source'] = $id_source; |
|
| 526 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 527 | - $SI->add($data); |
|
| 528 | - unset($data); |
|
| 522 | + } |
|
| 523 | + $data['datetime'] = date('Y-m-d H:i:s',$line[9]); |
|
| 524 | + $data['format_source'] = 'planeupdatefaa'; |
|
| 525 | + $data['id_source'] = $id_source; |
|
| 526 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 527 | + $SI->add($data); |
|
| 528 | + unset($data); |
|
| 529 | 529 | } |
| 530 | - } |
|
| 531 | - //$last_exec['planeupdatefaa'] = time(); |
|
| 532 | - $last_exec[$id]['last'] = time(); |
|
| 533 | - } elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 534 | - $buffer = $Common->getData($value['host']); |
|
| 535 | - $all_data = json_decode($buffer,true); |
|
| 536 | - if (isset($all_data['states'])) { |
|
| 530 | + } |
|
| 531 | + //$last_exec['planeupdatefaa'] = time(); |
|
| 532 | + $last_exec[$id]['last'] = time(); |
|
| 533 | + } elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 534 | + $buffer = $Common->getData($value['host']); |
|
| 535 | + $all_data = json_decode($buffer,true); |
|
| 536 | + if (isset($all_data['states'])) { |
|
| 537 | 537 | foreach ($all_data['states'] as $key => $line) { |
| 538 | - $data = array(); |
|
| 539 | - $data['hex'] = $line[0]; // hex |
|
| 540 | - $data['ident'] = trim($line[1]); // ident |
|
| 541 | - $data['altitude'] = round($line[7]*3.28084); // altitude |
|
| 542 | - $data['speed'] = round($line[9]*1.94384); // speed |
|
| 543 | - $data['heading'] = round($line[10]); // heading |
|
| 544 | - $data['latitude'] = $line[5]; // lat |
|
| 545 | - $data['longitude'] = $line[6]; // long |
|
| 546 | - $data['verticalrate'] = $line[11]; // verticale rate |
|
| 547 | - //$data['squawk'] = $line[10]; // squawk |
|
| 548 | - //$data['emergency'] = ''; // emergency |
|
| 549 | - //$data['registration'] = $line[2]; |
|
| 550 | - //$data['aircraft_icao'] = $line[0]; |
|
| 551 | - $data['datetime'] = date('Y-m-d H:i:s',$line[3]); |
|
| 552 | - $data['format_source'] = 'opensky'; |
|
| 553 | - $data['id_source'] = $id_source; |
|
| 554 | - $SI->add($data); |
|
| 555 | - unset($data); |
|
| 538 | + $data = array(); |
|
| 539 | + $data['hex'] = $line[0]; // hex |
|
| 540 | + $data['ident'] = trim($line[1]); // ident |
|
| 541 | + $data['altitude'] = round($line[7]*3.28084); // altitude |
|
| 542 | + $data['speed'] = round($line[9]*1.94384); // speed |
|
| 543 | + $data['heading'] = round($line[10]); // heading |
|
| 544 | + $data['latitude'] = $line[5]; // lat |
|
| 545 | + $data['longitude'] = $line[6]; // long |
|
| 546 | + $data['verticalrate'] = $line[11]; // verticale rate |
|
| 547 | + //$data['squawk'] = $line[10]; // squawk |
|
| 548 | + //$data['emergency'] = ''; // emergency |
|
| 549 | + //$data['registration'] = $line[2]; |
|
| 550 | + //$data['aircraft_icao'] = $line[0]; |
|
| 551 | + $data['datetime'] = date('Y-m-d H:i:s',$line[3]); |
|
| 552 | + $data['format_source'] = 'opensky'; |
|
| 553 | + $data['id_source'] = $id_source; |
|
| 554 | + $SI->add($data); |
|
| 555 | + unset($data); |
|
| 556 | 556 | } |
| 557 | - } |
|
| 558 | - //$last_exec['planeupdatefaa'] = time(); |
|
| 559 | - $last_exec[$id]['last'] = time(); |
|
| 560 | - //} elseif ($value == 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) { |
|
| 561 | - } elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 562 | - //$buffer = $Common->getData($hosts[$id]); |
|
| 563 | - $buffer = $Common->getData($value['host']); |
|
| 564 | - $all_data = json_decode($buffer,true); |
|
| 565 | - foreach ($all_data as $key => $line) { |
|
| 557 | + } |
|
| 558 | + //$last_exec['planeupdatefaa'] = time(); |
|
| 559 | + $last_exec[$id]['last'] = time(); |
|
| 560 | + //} elseif ($value == 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) { |
|
| 561 | + } elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 562 | + //$buffer = $Common->getData($hosts[$id]); |
|
| 563 | + $buffer = $Common->getData($value['host']); |
|
| 564 | + $all_data = json_decode($buffer,true); |
|
| 565 | + foreach ($all_data as $key => $line) { |
|
| 566 | 566 | if ($key != 'full_count' && $key != 'version' && $key != 'stats') { |
| 567 | - $data = array(); |
|
| 568 | - $data['hex'] = $line[0]; |
|
| 569 | - $data['ident'] = $line[16]; //$line[13] |
|
| 570 | - $data['altitude'] = $line[4]; // altitude |
|
| 571 | - $data['speed'] = $line[5]; // speed |
|
| 572 | - $data['heading'] = $line[3]; // heading |
|
| 573 | - $data['latitude'] = $line[1]; // lat |
|
| 574 | - $data['longitude'] = $line[2]; // long |
|
| 575 | - $data['verticalrate'] = $line[15]; // verticale rate |
|
| 576 | - $data['squawk'] = $line[6]; // squawk |
|
| 577 | - $data['aircraft_icao'] = $line[8]; |
|
| 578 | - $data['registration'] = $line[9]; |
|
| 579 | - $data['departure_airport_iata'] = $line[11]; |
|
| 580 | - $data['arrival_airport_iata'] = $line[12]; |
|
| 581 | - $data['emergency'] = ''; // emergency |
|
| 582 | - $data['datetime'] = date('Y-m-d H:i:s'); //$line[10] |
|
| 583 | - $data['format_source'] = 'fr24json'; |
|
| 584 | - $data['id_source'] = $id_source; |
|
| 585 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 586 | - $SI->add($data); |
|
| 587 | - unset($data); |
|
| 567 | + $data = array(); |
|
| 568 | + $data['hex'] = $line[0]; |
|
| 569 | + $data['ident'] = $line[16]; //$line[13] |
|
| 570 | + $data['altitude'] = $line[4]; // altitude |
|
| 571 | + $data['speed'] = $line[5]; // speed |
|
| 572 | + $data['heading'] = $line[3]; // heading |
|
| 573 | + $data['latitude'] = $line[1]; // lat |
|
| 574 | + $data['longitude'] = $line[2]; // long |
|
| 575 | + $data['verticalrate'] = $line[15]; // verticale rate |
|
| 576 | + $data['squawk'] = $line[6]; // squawk |
|
| 577 | + $data['aircraft_icao'] = $line[8]; |
|
| 578 | + $data['registration'] = $line[9]; |
|
| 579 | + $data['departure_airport_iata'] = $line[11]; |
|
| 580 | + $data['arrival_airport_iata'] = $line[12]; |
|
| 581 | + $data['emergency'] = ''; // emergency |
|
| 582 | + $data['datetime'] = date('Y-m-d H:i:s'); //$line[10] |
|
| 583 | + $data['format_source'] = 'fr24json'; |
|
| 584 | + $data['id_source'] = $id_source; |
|
| 585 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 586 | + $SI->add($data); |
|
| 587 | + unset($data); |
|
| 588 | 588 | } |
| 589 | - } |
|
| 590 | - //$last_exec['fr24json'] = time(); |
|
| 591 | - $last_exec[$id]['last'] = time(); |
|
| 592 | - //} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) { |
|
| 593 | - } elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 594 | - //$buffer = $Common->getData($hosts[$id],'get','','','','','150'); |
|
| 595 | - $buffer = $Common->getData($value['host'],'get','','','','','150'); |
|
| 596 | - //echo $buffer; |
|
| 597 | - $buffer = str_replace(array("\n","\r"),"",$buffer); |
|
| 598 | - $buffer = preg_replace('/,"num":(.+)/','}',$buffer); |
|
| 599 | - $all_data = json_decode($buffer,true); |
|
| 600 | - if (json_last_error() != JSON_ERROR_NONE) { |
|
| 589 | + } |
|
| 590 | + //$last_exec['fr24json'] = time(); |
|
| 591 | + $last_exec[$id]['last'] = time(); |
|
| 592 | + //} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) { |
|
| 593 | + } elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 594 | + //$buffer = $Common->getData($hosts[$id],'get','','','','','150'); |
|
| 595 | + $buffer = $Common->getData($value['host'],'get','','','','','150'); |
|
| 596 | + //echo $buffer; |
|
| 597 | + $buffer = str_replace(array("\n","\r"),"",$buffer); |
|
| 598 | + $buffer = preg_replace('/,"num":(.+)/','}',$buffer); |
|
| 599 | + $all_data = json_decode($buffer,true); |
|
| 600 | + if (json_last_error() != JSON_ERROR_NONE) { |
|
| 601 | 601 | die(json_last_error_msg()); |
| 602 | - } |
|
| 603 | - if (isset($all_data['mrkrs'])) { |
|
| 602 | + } |
|
| 603 | + if (isset($all_data['mrkrs'])) { |
|
| 604 | 604 | foreach ($all_data['mrkrs'] as $key => $line) { |
| 605 | - if (isset($line['inf'])) { |
|
| 605 | + if (isset($line['inf'])) { |
|
| 606 | 606 | $data = array(); |
| 607 | 607 | $data['hex'] = $line['inf']['ia']; |
| 608 | 608 | if (isset($line['inf']['cs'])) $data['ident'] = $line['inf']['cs']; //$line[13] |
| 609 | - $data['altitude'] = round($line['inf']['al']*3.28084); // altitude |
|
| 610 | - if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed |
|
| 611 | - if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading |
|
| 612 | - $data['latitude'] = $line['pt'][0]; // lat |
|
| 613 | - $data['longitude'] = $line['pt'][1]; // long |
|
| 614 | - //if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate |
|
| 615 | - if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk |
|
| 616 | - //$data['aircraft_icao'] = $line[8]; |
|
| 617 | - if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc']; |
|
| 609 | + $data['altitude'] = round($line['inf']['al']*3.28084); // altitude |
|
| 610 | + if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed |
|
| 611 | + if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading |
|
| 612 | + $data['latitude'] = $line['pt'][0]; // lat |
|
| 613 | + $data['longitude'] = $line['pt'][1]; // long |
|
| 614 | + //if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate |
|
| 615 | + if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk |
|
| 616 | + //$data['aircraft_icao'] = $line[8]; |
|
| 617 | + if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc']; |
|
| 618 | 618 | //$data['departure_airport_iata'] = $line[11]; |
| 619 | 619 | //$data['arrival_airport_iata'] = $line[12]; |
| 620 | - //$data['emergency'] = ''; // emergency |
|
| 620 | + //$data['emergency'] = ''; // emergency |
|
| 621 | 621 | $data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10] |
| 622 | - $data['format_source'] = 'radarvirtueljson'; |
|
| 623 | - $data['id_source'] = $id_source; |
|
| 622 | + $data['format_source'] = 'radarvirtueljson'; |
|
| 623 | + $data['id_source'] = $id_source; |
|
| 624 | 624 | if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
| 625 | 625 | $SI->add($data); |
| 626 | 626 | unset($data); |
| 627 | - } |
|
| 627 | + } |
|
| 628 | 628 | } |
| 629 | - } |
|
| 630 | - //$last_exec['radarvirtueljson'] = time(); |
|
| 631 | - $last_exec[$id]['last'] = time(); |
|
| 632 | - //} elseif ($value == 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) { |
|
| 633 | - } elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 634 | - //$buffer = $Common->getData($hosts[$id]); |
|
| 635 | - $buffer = $Common->getData($value['host'].'?'.time()); |
|
| 636 | - $all_data = json_decode(utf8_encode($buffer),true); |
|
| 629 | + } |
|
| 630 | + //$last_exec['radarvirtueljson'] = time(); |
|
| 631 | + $last_exec[$id]['last'] = time(); |
|
| 632 | + //} elseif ($value == 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) { |
|
| 633 | + } elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 634 | + //$buffer = $Common->getData($hosts[$id]); |
|
| 635 | + $buffer = $Common->getData($value['host'].'?'.time()); |
|
| 636 | + $all_data = json_decode(utf8_encode($buffer),true); |
|
| 637 | 637 | |
| 638 | - if (isset($all_data['pireps'])) { |
|
| 639 | - foreach ($all_data['pireps'] as $line) { |
|
| 640 | - $data = array(); |
|
| 641 | - $data['id'] = $line['id']; |
|
| 642 | - $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6); |
|
| 643 | - $data['ident'] = $line['callsign']; // ident |
|
| 644 | - if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id |
|
| 645 | - if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name |
|
| 646 | - if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude |
|
| 647 | - if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed |
|
| 648 | - if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading |
|
| 649 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 650 | - $data['latitude'] = $line['lat']; // lat |
|
| 651 | - $data['longitude'] = $line['lon']; // long |
|
| 652 | - //$data['verticalrate'] = $line['vrt']; // verticale rate |
|
| 653 | - //$data['squawk'] = $line['squawk']; // squawk |
|
| 654 | - //$data['emergency'] = ''; // emergency |
|
| 655 | - if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao']; |
|
| 656 | - if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime']; |
|
| 657 | - if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao']; |
|
| 658 | - //$data['arrival_airport_time'] = $line['arrtime']; |
|
| 659 | - if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft']; |
|
| 660 | - if (isset($line['transponder'])) $data['squawk'] = $line['transponder']; |
|
| 661 | - if (isset($line['atis'])) $data['info'] = $line['atis']; |
|
| 662 | - else $data['info'] = ''; |
|
| 663 | - $data['format_source'] = 'pireps'; |
|
| 664 | - $data['id_source'] = $id_source; |
|
| 665 | - $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 666 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 667 | - if ($line['icon'] == 'plane') { |
|
| 638 | + if (isset($all_data['pireps'])) { |
|
| 639 | + foreach ($all_data['pireps'] as $line) { |
|
| 640 | + $data = array(); |
|
| 641 | + $data['id'] = $line['id']; |
|
| 642 | + $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6); |
|
| 643 | + $data['ident'] = $line['callsign']; // ident |
|
| 644 | + if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id |
|
| 645 | + if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name |
|
| 646 | + if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude |
|
| 647 | + if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed |
|
| 648 | + if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading |
|
| 649 | + if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 650 | + $data['latitude'] = $line['lat']; // lat |
|
| 651 | + $data['longitude'] = $line['lon']; // long |
|
| 652 | + //$data['verticalrate'] = $line['vrt']; // verticale rate |
|
| 653 | + //$data['squawk'] = $line['squawk']; // squawk |
|
| 654 | + //$data['emergency'] = ''; // emergency |
|
| 655 | + if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao']; |
|
| 656 | + if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime']; |
|
| 657 | + if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao']; |
|
| 658 | + //$data['arrival_airport_time'] = $line['arrtime']; |
|
| 659 | + if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft']; |
|
| 660 | + if (isset($line['transponder'])) $data['squawk'] = $line['transponder']; |
|
| 661 | + if (isset($line['atis'])) $data['info'] = $line['atis']; |
|
| 662 | + else $data['info'] = ''; |
|
| 663 | + $data['format_source'] = 'pireps'; |
|
| 664 | + $data['id_source'] = $id_source; |
|
| 665 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 666 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 667 | + if ($line['icon'] == 'plane') { |
|
| 668 | 668 | $SI->add($data); |
| 669 | - // print_r($data); |
|
| 670 | - } elseif ($line['icon'] == 'ct') { |
|
| 669 | + // print_r($data); |
|
| 670 | + } elseif ($line['icon'] == 'ct') { |
|
| 671 | 671 | $data['info'] = str_replace('^§','<br />',$data['info']); |
| 672 | 672 | $data['info'] = str_replace('&sect;','',$data['info']); |
| 673 | 673 | $typec = substr($data['ident'],-3); |
@@ -682,160 +682,160 @@ discard block |
||
| 682 | 682 | elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre'; |
| 683 | 683 | else $data['type'] = 'Observer'; |
| 684 | 684 | 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']); |
| 685 | - } |
|
| 686 | - unset($data); |
|
| 685 | + } |
|
| 686 | + unset($data); |
|
| 687 | 687 | } |
| 688 | - } |
|
| 689 | - //$last_exec['pirepsjson'] = time(); |
|
| 690 | - $last_exec[$id]['last'] = time(); |
|
| 691 | - //} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) { |
|
| 692 | - } elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 693 | - //$buffer = $Common->getData($hosts[$id]); |
|
| 694 | - if ($globalDebug) echo 'Get Data...'."\n"; |
|
| 695 | - $buffer = $Common->getData($value['host']); |
|
| 696 | - $all_data = json_decode($buffer,true); |
|
| 697 | - if ($buffer != '' && is_array($all_data)) { |
|
| 688 | + } |
|
| 689 | + //$last_exec['pirepsjson'] = time(); |
|
| 690 | + $last_exec[$id]['last'] = time(); |
|
| 691 | + //} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) { |
|
| 692 | + } elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 693 | + //$buffer = $Common->getData($hosts[$id]); |
|
| 694 | + if ($globalDebug) echo 'Get Data...'."\n"; |
|
| 695 | + $buffer = $Common->getData($value['host']); |
|
| 696 | + $all_data = json_decode($buffer,true); |
|
| 697 | + if ($buffer != '' && is_array($all_data)) { |
|
| 698 | 698 | foreach ($all_data as $line) { |
| 699 | - $data = array(); |
|
| 700 | - //$data['id'] = $line['id']; // id not usable |
|
| 701 | - if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum']; |
|
| 702 | - $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex |
|
| 703 | - if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname']; |
|
| 704 | - if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; |
|
| 705 | - $data['ident'] = $line['flightnum']; // ident |
|
| 706 | - $data['altitude'] = $line['alt']; // altitude |
|
| 707 | - $data['speed'] = $line['gs']; // speed |
|
| 708 | - $data['heading'] = $line['heading']; // heading |
|
| 709 | - $data['latitude'] = $line['lat']; // lat |
|
| 710 | - $data['longitude'] = $line['lng']; // long |
|
| 711 | - $data['verticalrate'] = ''; // verticale rate |
|
| 712 | - $data['squawk'] = ''; // squawk |
|
| 713 | - $data['emergency'] = ''; // emergency |
|
| 714 | - //$data['datetime'] = $line['lastupdate']; |
|
| 715 | - $data['last_update'] = $line['lastupdate']; |
|
| 716 | - $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 717 | - $data['departure_airport_icao'] = $line['depicao']; |
|
| 718 | - $data['departure_airport_time'] = $line['deptime']; |
|
| 719 | - $data['arrival_airport_icao'] = $line['arricao']; |
|
| 720 | - $data['arrival_airport_time'] = $line['arrtime']; |
|
| 721 | - $data['registration'] = $line['aircraft']; |
|
| 722 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 723 | - if (isset($line['aircraftname'])) { |
|
| 699 | + $data = array(); |
|
| 700 | + //$data['id'] = $line['id']; // id not usable |
|
| 701 | + if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum']; |
|
| 702 | + $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex |
|
| 703 | + if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname']; |
|
| 704 | + if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; |
|
| 705 | + $data['ident'] = $line['flightnum']; // ident |
|
| 706 | + $data['altitude'] = $line['alt']; // altitude |
|
| 707 | + $data['speed'] = $line['gs']; // speed |
|
| 708 | + $data['heading'] = $line['heading']; // heading |
|
| 709 | + $data['latitude'] = $line['lat']; // lat |
|
| 710 | + $data['longitude'] = $line['lng']; // long |
|
| 711 | + $data['verticalrate'] = ''; // verticale rate |
|
| 712 | + $data['squawk'] = ''; // squawk |
|
| 713 | + $data['emergency'] = ''; // emergency |
|
| 714 | + //$data['datetime'] = $line['lastupdate']; |
|
| 715 | + $data['last_update'] = $line['lastupdate']; |
|
| 716 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 717 | + $data['departure_airport_icao'] = $line['depicao']; |
|
| 718 | + $data['departure_airport_time'] = $line['deptime']; |
|
| 719 | + $data['arrival_airport_icao'] = $line['arricao']; |
|
| 720 | + $data['arrival_airport_time'] = $line['arrtime']; |
|
| 721 | + $data['registration'] = $line['aircraft']; |
|
| 722 | + if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 723 | + if (isset($line['aircraftname'])) { |
|
| 724 | 724 | $line['aircraftname'] = strtoupper($line['aircraftname']); |
| 725 | 725 | $line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']); |
| 726 | - $aircraft_data = explode('-',$line['aircraftname']); |
|
| 727 | - if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) < 5) $data['aircraft_icao'] = $aircraft_data[0]; |
|
| 728 | - elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) < 5) $data['aircraft_icao'] = $aircraft_data[1]; |
|
| 729 | - else { |
|
| 730 | - $aircraft_data = explode(' ',$line['aircraftname']); |
|
| 731 | - if (isset($aircraft_data[1])) $data['aircraft_icao'] = $aircraft_data[1]; |
|
| 732 | - else $data['aircraft_icao'] = $line['aircraftname']; |
|
| 733 | - } |
|
| 734 | - } |
|
| 735 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; |
|
| 736 | - $data['id_source'] = $id_source; |
|
| 737 | - $data['format_source'] = 'phpvmacars'; |
|
| 738 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 739 | - $SI->add($data); |
|
| 740 | - unset($data); |
|
| 726 | + $aircraft_data = explode('-',$line['aircraftname']); |
|
| 727 | + if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) < 5) $data['aircraft_icao'] = $aircraft_data[0]; |
|
| 728 | + elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) < 5) $data['aircraft_icao'] = $aircraft_data[1]; |
|
| 729 | + else { |
|
| 730 | + $aircraft_data = explode(' ',$line['aircraftname']); |
|
| 731 | + if (isset($aircraft_data[1])) $data['aircraft_icao'] = $aircraft_data[1]; |
|
| 732 | + else $data['aircraft_icao'] = $line['aircraftname']; |
|
| 733 | + } |
|
| 734 | + } |
|
| 735 | + if (isset($line['route'])) $data['waypoints'] = $line['route']; |
|
| 736 | + $data['id_source'] = $id_source; |
|
| 737 | + $data['format_source'] = 'phpvmacars'; |
|
| 738 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 739 | + $SI->add($data); |
|
| 740 | + unset($data); |
|
| 741 | 741 | } |
| 742 | 742 | if ($globalDebug) echo 'No more data...'."\n"; |
| 743 | 743 | unset($buffer); |
| 744 | 744 | unset($all_data); |
| 745 | - } |
|
| 746 | - //$last_exec['phpvmacars'] = time(); |
|
| 747 | - $last_exec[$id]['last'] = time(); |
|
| 748 | - } elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 749 | - //$buffer = $Common->getData($hosts[$id]); |
|
| 750 | - if ($globalDebug) echo 'Get Data...'."\n"; |
|
| 751 | - $buffer = $Common->getData($value['host']); |
|
| 752 | - $all_data = json_decode($buffer,true); |
|
| 753 | - if ($buffer != '' && is_array($all_data)) { |
|
| 745 | + } |
|
| 746 | + //$last_exec['phpvmacars'] = time(); |
|
| 747 | + $last_exec[$id]['last'] = time(); |
|
| 748 | + } elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 749 | + //$buffer = $Common->getData($hosts[$id]); |
|
| 750 | + if ($globalDebug) echo 'Get Data...'."\n"; |
|
| 751 | + $buffer = $Common->getData($value['host']); |
|
| 752 | + $all_data = json_decode($buffer,true); |
|
| 753 | + if ($buffer != '' && is_array($all_data)) { |
|
| 754 | 754 | foreach ($all_data as $line) { |
| 755 | - $data = array(); |
|
| 756 | - //$data['id'] = $line['id']; // id not usable |
|
| 757 | - $data['id'] = trim($line['flight_id']); |
|
| 758 | - $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex |
|
| 759 | - $data['pilot_name'] = $line['pilot_name']; |
|
| 760 | - $data['pilot_id'] = $line['pilot_id']; |
|
| 761 | - $data['ident'] = trim($line['callsign']); // ident |
|
| 762 | - $data['altitude'] = $line['altitude']; // altitude |
|
| 763 | - $data['speed'] = $line['gs']; // speed |
|
| 764 | - $data['heading'] = $line['heading']; // heading |
|
| 765 | - $data['latitude'] = $line['latitude']; // lat |
|
| 766 | - $data['longitude'] = $line['longitude']; // long |
|
| 767 | - $data['verticalrate'] = ''; // verticale rate |
|
| 768 | - $data['squawk'] = ''; // squawk |
|
| 769 | - $data['emergency'] = ''; // emergency |
|
| 770 | - //$data['datetime'] = $line['lastupdate']; |
|
| 771 | - $data['last_update'] = $line['last_update']; |
|
| 772 | - $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 773 | - $data['departure_airport_icao'] = $line['departure']; |
|
| 774 | - //$data['departure_airport_time'] = $line['departure_time']; |
|
| 775 | - $data['arrival_airport_icao'] = $line['arrival']; |
|
| 776 | - //$data['arrival_airport_time'] = $line['arrival_time']; |
|
| 777 | - //$data['registration'] = $line['aircraft']; |
|
| 778 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 779 | - $data['aircraft_icao'] = $line['plane_type']; |
|
| 780 | - $data['id_source'] = $id_source; |
|
| 781 | - $data['format_source'] = 'vam'; |
|
| 782 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 783 | - $SI->add($data); |
|
| 784 | - unset($data); |
|
| 755 | + $data = array(); |
|
| 756 | + //$data['id'] = $line['id']; // id not usable |
|
| 757 | + $data['id'] = trim($line['flight_id']); |
|
| 758 | + $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex |
|
| 759 | + $data['pilot_name'] = $line['pilot_name']; |
|
| 760 | + $data['pilot_id'] = $line['pilot_id']; |
|
| 761 | + $data['ident'] = trim($line['callsign']); // ident |
|
| 762 | + $data['altitude'] = $line['altitude']; // altitude |
|
| 763 | + $data['speed'] = $line['gs']; // speed |
|
| 764 | + $data['heading'] = $line['heading']; // heading |
|
| 765 | + $data['latitude'] = $line['latitude']; // lat |
|
| 766 | + $data['longitude'] = $line['longitude']; // long |
|
| 767 | + $data['verticalrate'] = ''; // verticale rate |
|
| 768 | + $data['squawk'] = ''; // squawk |
|
| 769 | + $data['emergency'] = ''; // emergency |
|
| 770 | + //$data['datetime'] = $line['lastupdate']; |
|
| 771 | + $data['last_update'] = $line['last_update']; |
|
| 772 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 773 | + $data['departure_airport_icao'] = $line['departure']; |
|
| 774 | + //$data['departure_airport_time'] = $line['departure_time']; |
|
| 775 | + $data['arrival_airport_icao'] = $line['arrival']; |
|
| 776 | + //$data['arrival_airport_time'] = $line['arrival_time']; |
|
| 777 | + //$data['registration'] = $line['aircraft']; |
|
| 778 | + if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 779 | + $data['aircraft_icao'] = $line['plane_type']; |
|
| 780 | + $data['id_source'] = $id_source; |
|
| 781 | + $data['format_source'] = 'vam'; |
|
| 782 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 783 | + $SI->add($data); |
|
| 784 | + unset($data); |
|
| 785 | 785 | } |
| 786 | 786 | if ($globalDebug) echo 'No more data...'."\n"; |
| 787 | 787 | unset($buffer); |
| 788 | 788 | unset($all_data); |
| 789 | - } |
|
| 790 | - //$last_exec['phpvmacars'] = time(); |
|
| 791 | - $last_exec[$id]['last'] = time(); |
|
| 789 | + } |
|
| 790 | + //$last_exec['phpvmacars'] = time(); |
|
| 791 | + $last_exec[$id]['last'] = time(); |
|
| 792 | 792 | //} elseif ($value == 'sbs' || $value == 'tsv' || $value == 'raw' || $value == 'aprs' || $value == 'beast') { |
| 793 | 793 | } 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') { |
| 794 | - if (function_exists('pcntl_fork')) pcntl_signal_dispatch(); |
|
| 795 | - //$last_exec[$id]['last'] = time(); |
|
| 794 | + if (function_exists('pcntl_fork')) pcntl_signal_dispatch(); |
|
| 795 | + //$last_exec[$id]['last'] = time(); |
|
| 796 | 796 | |
| 797 | - //$read = array( $sockets[$id] ); |
|
| 798 | - $read = $sockets; |
|
| 799 | - $write = NULL; |
|
| 800 | - $e = NULL; |
|
| 801 | - $n = socket_select($read, $write, $e, $timeout); |
|
| 802 | - if ($e != NULL) var_dump($e); |
|
| 803 | - if ($n > 0) { |
|
| 797 | + //$read = array( $sockets[$id] ); |
|
| 798 | + $read = $sockets; |
|
| 799 | + $write = NULL; |
|
| 800 | + $e = NULL; |
|
| 801 | + $n = socket_select($read, $write, $e, $timeout); |
|
| 802 | + if ($e != NULL) var_dump($e); |
|
| 803 | + if ($n > 0) { |
|
| 804 | 804 | foreach ($read as $nb => $r) { |
| 805 | - //$value = $formats[$nb]; |
|
| 806 | - $format = $globalSources[$nb]['format']; |
|
| 807 | - if ($format == 'sbs' || $format == 'aprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') { |
|
| 808 | - $buffer = socket_read($r, 6000,PHP_NORMAL_READ); |
|
| 809 | - } else { |
|
| 810 | - $az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port); |
|
| 811 | - } |
|
| 812 | - //$buffer = socket_read($r, 60000,PHP_NORMAL_READ); |
|
| 813 | - //echo $buffer."\n"; |
|
| 814 | - // lets play nice and handle signals such as ctrl-c/kill properly |
|
| 815 | - //if (function_exists('pcntl_fork')) pcntl_signal_dispatch(); |
|
| 816 | - $error = false; |
|
| 817 | - //$SI::del(); |
|
| 818 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer)); |
|
| 819 | - // SBS format is CSV format |
|
| 820 | - if ($buffer != '') { |
|
| 805 | + //$value = $formats[$nb]; |
|
| 806 | + $format = $globalSources[$nb]['format']; |
|
| 807 | + if ($format == 'sbs' || $format == 'aprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') { |
|
| 808 | + $buffer = socket_read($r, 6000,PHP_NORMAL_READ); |
|
| 809 | + } else { |
|
| 810 | + $az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port); |
|
| 811 | + } |
|
| 812 | + //$buffer = socket_read($r, 60000,PHP_NORMAL_READ); |
|
| 813 | + //echo $buffer."\n"; |
|
| 814 | + // lets play nice and handle signals such as ctrl-c/kill properly |
|
| 815 | + //if (function_exists('pcntl_fork')) pcntl_signal_dispatch(); |
|
| 816 | + $error = false; |
|
| 817 | + //$SI::del(); |
|
| 818 | + $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer)); |
|
| 819 | + // SBS format is CSV format |
|
| 820 | + if ($buffer != '') { |
|
| 821 | 821 | $tt[$format] = 0; |
| 822 | 822 | if ($format == 'acarssbs3') { |
| 823 | - if ($globalDebug) echo 'ACARS : '.$buffer."\n"; |
|
| 824 | - $ACARS->add(trim($buffer)); |
|
| 825 | - $ACARS->deleteLiveAcarsData(); |
|
| 823 | + if ($globalDebug) echo 'ACARS : '.$buffer."\n"; |
|
| 824 | + $ACARS->add(trim($buffer)); |
|
| 825 | + $ACARS->deleteLiveAcarsData(); |
|
| 826 | 826 | } elseif ($format == 'raw') { |
| 827 | - // AVR format |
|
| 828 | - $data = $SBS->parse($buffer); |
|
| 829 | - if (is_array($data)) { |
|
| 827 | + // AVR format |
|
| 828 | + $data = $SBS->parse($buffer); |
|
| 829 | + if (is_array($data)) { |
|
| 830 | 830 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 831 | 831 | $data['format_source'] = 'raw'; |
| 832 | 832 | if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
| 833 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 834 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
|
| 835 | - } |
|
| 836 | - } elseif ($format == 'flightgearsp') { |
|
| 837 | - //echo $buffer."\n"; |
|
| 838 | - if (strlen($buffer) > 5) { |
|
| 833 | + if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 834 | + if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
|
| 835 | + } |
|
| 836 | + } elseif ($format == 'flightgearsp') { |
|
| 837 | + //echo $buffer."\n"; |
|
| 838 | + if (strlen($buffer) > 5) { |
|
| 839 | 839 | $line = explode(',',$buffer); |
| 840 | 840 | $data = array(); |
| 841 | 841 | //XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p |
@@ -851,114 +851,114 @@ discard block |
||
| 851 | 851 | $data['format_source'] = 'flightgearsp'; |
| 852 | 852 | if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
| 853 | 853 | $send = @ socket_send( $r , $data_aprs , strlen($data_aprs) , 0 ); |
| 854 | - } |
|
| 855 | - } elseif ($format == 'acars') { |
|
| 856 | - if ($globalDebug) echo 'ACARS : '.$buffer."\n"; |
|
| 857 | - $ACARS->add(trim($buffer)); |
|
| 858 | - socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port); |
|
| 859 | - $ACARS->deleteLiveAcarsData(); |
|
| 854 | + } |
|
| 855 | + } elseif ($format == 'acars') { |
|
| 856 | + if ($globalDebug) echo 'ACARS : '.$buffer."\n"; |
|
| 857 | + $ACARS->add(trim($buffer)); |
|
| 858 | + socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port); |
|
| 859 | + $ACARS->deleteLiveAcarsData(); |
|
| 860 | 860 | } elseif ($format == 'flightgearmp') { |
| 861 | - if (substr($buffer,0,1) != '#') { |
|
| 861 | + if (substr($buffer,0,1) != '#') { |
|
| 862 | 862 | $data = array(); |
| 863 | 863 | //echo $buffer."\n"; |
| 864 | 864 | $line = explode(' ',$buffer); |
| 865 | 865 | if (count($line) == 11) { |
| 866 | - $userserver = explode('@',$line[0]); |
|
| 867 | - $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex |
|
| 868 | - $data['ident'] = $userserver[0]; |
|
| 869 | - $data['registration'] = $userserver[0]; |
|
| 870 | - $data['latitude'] = $line[4]; |
|
| 871 | - $data['longitude'] = $line[5]; |
|
| 872 | - $data['altitude'] = $line[6]; |
|
| 873 | - $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 874 | - $aircraft_type = $line[10]; |
|
| 875 | - $aircraft_type = preg_split(':/:',$aircraft_type); |
|
| 876 | - $data['aircraft_name'] = substr(end($aircraft_type),0,-4); |
|
| 877 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
|
| 866 | + $userserver = explode('@',$line[0]); |
|
| 867 | + $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex |
|
| 868 | + $data['ident'] = $userserver[0]; |
|
| 869 | + $data['registration'] = $userserver[0]; |
|
| 870 | + $data['latitude'] = $line[4]; |
|
| 871 | + $data['longitude'] = $line[5]; |
|
| 872 | + $data['altitude'] = $line[6]; |
|
| 873 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 874 | + $aircraft_type = $line[10]; |
|
| 875 | + $aircraft_type = preg_split(':/:',$aircraft_type); |
|
| 876 | + $data['aircraft_name'] = substr(end($aircraft_type),0,-4); |
|
| 877 | + if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
|
| 878 | + } |
|
| 878 | 879 | } |
| 879 | - } |
|
| 880 | 880 | } elseif ($format == 'beast') { |
| 881 | - echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n"; |
|
| 882 | - die; |
|
| 881 | + echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n"; |
|
| 882 | + die; |
|
| 883 | 883 | } elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') { |
| 884 | - $line = explode("\t", $buffer); |
|
| 885 | - for($k = 0; $k < count($line); $k=$k+2) { |
|
| 884 | + $line = explode("\t", $buffer); |
|
| 885 | + for($k = 0; $k < count($line); $k=$k+2) { |
|
| 886 | 886 | $key = $line[$k]; |
| 887 | - $lined[$key] = $line[$k+1]; |
|
| 888 | - } |
|
| 889 | - if (count($lined) > 3) { |
|
| 890 | - $data['hex'] = $lined['hexid']; |
|
| 891 | - //$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));; |
|
| 892 | - $data['datetime'] = date('Y-m-d H:i:s');; |
|
| 893 | - if (isset($lined['ident'])) $data['ident'] = $lined['ident']; |
|
| 894 | - if (isset($lined['lat'])) $data['latitude'] = $lined['lat']; |
|
| 895 | - if (isset($lined['lon'])) $data['longitude'] = $lined['lon']; |
|
| 896 | - if (isset($lined['speed'])) $data['speed'] = $lined['speed']; |
|
| 897 | - if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk']; |
|
| 898 | - if (isset($lined['alt'])) $data['altitude'] = $lined['alt']; |
|
| 899 | - if (isset($lined['heading'])) $data['heading'] = $lined['heading']; |
|
| 900 | - $data['id_source'] = $id_source; |
|
| 901 | - $data['format_source'] = 'tsv'; |
|
| 902 | - if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
|
| 903 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 904 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
|
| 905 | - unset($lined); |
|
| 906 | - unset($data); |
|
| 907 | - } else $error = true; |
|
| 887 | + $lined[$key] = $line[$k+1]; |
|
| 888 | + } |
|
| 889 | + if (count($lined) > 3) { |
|
| 890 | + $data['hex'] = $lined['hexid']; |
|
| 891 | + //$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));; |
|
| 892 | + $data['datetime'] = date('Y-m-d H:i:s');; |
|
| 893 | + if (isset($lined['ident'])) $data['ident'] = $lined['ident']; |
|
| 894 | + if (isset($lined['lat'])) $data['latitude'] = $lined['lat']; |
|
| 895 | + if (isset($lined['lon'])) $data['longitude'] = $lined['lon']; |
|
| 896 | + if (isset($lined['speed'])) $data['speed'] = $lined['speed']; |
|
| 897 | + if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk']; |
|
| 898 | + if (isset($lined['alt'])) $data['altitude'] = $lined['alt']; |
|
| 899 | + if (isset($lined['heading'])) $data['heading'] = $lined['heading']; |
|
| 900 | + $data['id_source'] = $id_source; |
|
| 901 | + $data['format_source'] = 'tsv'; |
|
| 902 | + if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
|
| 903 | + if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 904 | + if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
|
| 905 | + unset($lined); |
|
| 906 | + unset($data); |
|
| 907 | + } else $error = true; |
|
| 908 | 908 | } elseif ($format == 'aprs' && $use_aprs) { |
| 909 | - if ($aprs_connect == 0) { |
|
| 909 | + if ($aprs_connect == 0) { |
|
| 910 | 910 | $send = @ socket_send( $r , $aprs_login , strlen($aprs_login) , 0 ); |
| 911 | 911 | $aprs_connect = 1; |
| 912 | - } |
|
| 913 | - if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) { |
|
| 912 | + } |
|
| 913 | + if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) { |
|
| 914 | 914 | $aprs_last_tx = time(); |
| 915 | 915 | $data_aprs = "# Keep alive"; |
| 916 | 916 | $send = @ socket_send( $r , $data_aprs , strlen($data_aprs) , 0 ); |
| 917 | - } |
|
| 918 | - //echo 'Connect : '.$aprs_connect.' '.$buffer."\n"; |
|
| 919 | - $buffer = str_replace('APRS <- ','',$buffer); |
|
| 920 | - $buffer = str_replace('APRS -> ','',$buffer); |
|
| 921 | - if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') { |
|
| 917 | + } |
|
| 918 | + //echo 'Connect : '.$aprs_connect.' '.$buffer."\n"; |
|
| 919 | + $buffer = str_replace('APRS <- ','',$buffer); |
|
| 920 | + $buffer = str_replace('APRS -> ','',$buffer); |
|
| 921 | + if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') { |
|
| 922 | 922 | $line = $APRS->parse($buffer); |
| 923 | 923 | if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) { |
| 924 | - $data = array(); |
|
| 925 | - //print_r($line); |
|
| 926 | - $data['hex'] = $line['address']; |
|
| 927 | - $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']); |
|
| 928 | - //$data['datetime'] = date('Y-m-d H:i:s'); |
|
| 929 | - $data['ident'] = $line['ident']; |
|
| 930 | - $data['latitude'] = $line['latitude']; |
|
| 931 | - $data['longitude'] = $line['longitude']; |
|
| 932 | - //$data['verticalrate'] = $line[16]; |
|
| 933 | - if (isset($line['speed'])) $data['speed'] = $line['speed']; |
|
| 934 | - else $data['speed'] = 0; |
|
| 935 | - $data['altitude'] = $line['altitude']; |
|
| 936 | - if (isset($line['course'])) $data['heading'] = $line['course']; |
|
| 937 | - //else $data['heading'] = 0; |
|
| 938 | - $data['aircraft_type'] = $line['stealth']; |
|
| 939 | - if (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive == FALSE)) $data['noarchive'] = true; |
|
| 940 | - $data['id_source'] = $id_source; |
|
| 941 | - $data['format_source'] = 'aprs'; |
|
| 942 | - $data['source_name'] = $line['source']; |
|
| 943 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 944 | - $currentdate = date('Y-m-d H:i:s'); |
|
| 945 | - $aprsdate = strtotime($data['datetime']); |
|
| 946 | - // Accept data if time <= system time + 20s |
|
| 947 | - if ($line['stealth'] == 0 && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) $send = $SI->add($data); |
|
| 948 | - else { |
|
| 924 | + $data = array(); |
|
| 925 | + //print_r($line); |
|
| 926 | + $data['hex'] = $line['address']; |
|
| 927 | + $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']); |
|
| 928 | + //$data['datetime'] = date('Y-m-d H:i:s'); |
|
| 929 | + $data['ident'] = $line['ident']; |
|
| 930 | + $data['latitude'] = $line['latitude']; |
|
| 931 | + $data['longitude'] = $line['longitude']; |
|
| 932 | + //$data['verticalrate'] = $line[16]; |
|
| 933 | + if (isset($line['speed'])) $data['speed'] = $line['speed']; |
|
| 934 | + else $data['speed'] = 0; |
|
| 935 | + $data['altitude'] = $line['altitude']; |
|
| 936 | + if (isset($line['course'])) $data['heading'] = $line['course']; |
|
| 937 | + //else $data['heading'] = 0; |
|
| 938 | + $data['aircraft_type'] = $line['stealth']; |
|
| 939 | + if (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive == FALSE)) $data['noarchive'] = true; |
|
| 940 | + $data['id_source'] = $id_source; |
|
| 941 | + $data['format_source'] = 'aprs'; |
|
| 942 | + $data['source_name'] = $line['source']; |
|
| 943 | + if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 944 | + $currentdate = date('Y-m-d H:i:s'); |
|
| 945 | + $aprsdate = strtotime($data['datetime']); |
|
| 946 | + // Accept data if time <= system time + 20s |
|
| 947 | + if ($line['stealth'] == 0 && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) $send = $SI->add($data); |
|
| 948 | + else { |
|
| 949 | 949 | if ($line['stealth'] != 0) echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n"; |
| 950 | 950 | else echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n"; |
| 951 | - } |
|
| 952 | - unset($data); |
|
| 951 | + } |
|
| 952 | + unset($data); |
|
| 953 | 953 | } |
| 954 | 954 | //elseif ($line == false && $globalDebug) echo 'Ignored ('.$buffer.")\n"; |
| 955 | 955 | elseif ($line == true && $globalDebug) echo '!! Failed : '.$buffer."!!\n"; |
| 956 | - } |
|
| 956 | + } |
|
| 957 | 957 | } else { |
| 958 | - $line = explode(',', $buffer); |
|
| 959 | - if (count($line) > 20) { |
|
| 960 | - $data['hex'] = $line[4]; |
|
| 961 | - /* |
|
| 958 | + $line = explode(',', $buffer); |
|
| 959 | + if (count($line) > 20) { |
|
| 960 | + $data['hex'] = $line[4]; |
|
| 961 | + /* |
|
| 962 | 962 | $data['datetime'] = $line[6].' '.$line[7]; |
| 963 | 963 | date_default_timezone_set($globalTimezone); |
| 964 | 964 | $datetime = new DateTime($data['datetime']); |
@@ -966,28 +966,28 @@ discard block |
||
| 966 | 966 | $data['datetime'] = $datetime->format('Y-m-d H:i:s'); |
| 967 | 967 | date_default_timezone_set('UTC'); |
| 968 | 968 | */ |
| 969 | - // Force datetime to current UTC datetime |
|
| 970 | - $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 971 | - $data['ident'] = trim($line[10]); |
|
| 972 | - $data['latitude'] = $line[14]; |
|
| 973 | - $data['longitude'] = $line[15]; |
|
| 974 | - $data['verticalrate'] = $line[16]; |
|
| 975 | - $data['emergency'] = $line[20]; |
|
| 976 | - $data['speed'] = $line[12]; |
|
| 977 | - $data['squawk'] = $line[17]; |
|
| 978 | - $data['altitude'] = $line[11]; |
|
| 979 | - $data['heading'] = $line[13]; |
|
| 980 | - $data['ground'] = $line[21]; |
|
| 981 | - $data['emergency'] = $line[19]; |
|
| 982 | - $data['format_source'] = 'sbs'; |
|
| 969 | + // Force datetime to current UTC datetime |
|
| 970 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 971 | + $data['ident'] = trim($line[10]); |
|
| 972 | + $data['latitude'] = $line[14]; |
|
| 973 | + $data['longitude'] = $line[15]; |
|
| 974 | + $data['verticalrate'] = $line[16]; |
|
| 975 | + $data['emergency'] = $line[20]; |
|
| 976 | + $data['speed'] = $line[12]; |
|
| 977 | + $data['squawk'] = $line[17]; |
|
| 978 | + $data['altitude'] = $line[11]; |
|
| 979 | + $data['heading'] = $line[13]; |
|
| 980 | + $data['ground'] = $line[21]; |
|
| 981 | + $data['emergency'] = $line[19]; |
|
| 982 | + $data['format_source'] = 'sbs'; |
|
| 983 | 983 | if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
| 984 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 985 | - $data['id_source'] = $id_source; |
|
| 986 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data); |
|
| 987 | - else $error = true; |
|
| 988 | - unset($data); |
|
| 989 | - } else $error = true; |
|
| 990 | - if ($error) { |
|
| 984 | + if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 985 | + $data['id_source'] = $id_source; |
|
| 986 | + if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data); |
|
| 987 | + else $error = true; |
|
| 988 | + unset($data); |
|
| 989 | + } else $error = true; |
|
| 990 | + if ($error) { |
|
| 991 | 991 | if (count($line) > 1 && ($line[0] == 'STA' || $line[0] == 'AIR' || $line[0] == 'SEL' || $line[0] == 'ID' || $line[0] == 'CLK')) { |
| 992 | 992 | if ($globalDebug) echo "Not a message. Ignoring... \n"; |
| 993 | 993 | } else { |
@@ -1003,13 +1003,13 @@ discard block |
||
| 1003 | 1003 | connect_all($sourceer); |
| 1004 | 1004 | $sourceer = array(); |
| 1005 | 1005 | } |
| 1006 | - } |
|
| 1006 | + } |
|
| 1007 | 1007 | } |
| 1008 | 1008 | // Sleep for xxx microseconds |
| 1009 | 1009 | if (isset($globalSBSSleep)) usleep($globalSBSSleep); |
| 1010 | - } else { |
|
| 1010 | + } else { |
|
| 1011 | 1011 | if ($format == 'flightgearmp') { |
| 1012 | - if ($globalDebug) echo "Reconnect FlightGear MP..."; |
|
| 1012 | + if ($globalDebug) echo "Reconnect FlightGear MP..."; |
|
| 1013 | 1013 | //@socket_close($r); |
| 1014 | 1014 | sleep($globalMinFetch); |
| 1015 | 1015 | $sourcefg[$nb] = $globalSources[$nb]; |
@@ -1018,9 +1018,9 @@ discard block |
||
| 1018 | 1018 | break; |
| 1019 | 1019 | |
| 1020 | 1020 | } elseif ($format != 'acars' && $format != 'flightgearsp') { |
| 1021 | - if (isset($tt[$format])) $tt[$format]++; |
|
| 1022 | - else $tt[$format] = 0; |
|
| 1023 | - if ($tt[$format] > 30) { |
|
| 1021 | + if (isset($tt[$format])) $tt[$format]++; |
|
| 1022 | + else $tt[$format] = 0; |
|
| 1023 | + if ($tt[$format] > 30) { |
|
| 1024 | 1024 | if ($globalDebug) echo "ERROR : Reconnect ".$format."..."; |
| 1025 | 1025 | //@socket_close($r); |
| 1026 | 1026 | sleep(2); |
@@ -1031,40 +1031,40 @@ discard block |
||
| 1031 | 1031 | //connect_all($globalSources); |
| 1032 | 1032 | $tt[$format]=0; |
| 1033 | 1033 | break; |
| 1034 | - } |
|
| 1034 | + } |
|
| 1035 | + } |
|
| 1035 | 1036 | } |
| 1036 | - } |
|
| 1037 | 1037 | } |
| 1038 | - } else { |
|
| 1038 | + } else { |
|
| 1039 | 1039 | $error = socket_strerror(socket_last_error()); |
| 1040 | 1040 | if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n"; |
| 1041 | 1041 | if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || time() - $time >= $timeout) { |
| 1042 | 1042 | if (isset($globalDebug)) echo "Restarting...\n"; |
| 1043 | 1043 | // Restart the script if possible |
| 1044 | 1044 | if (is_array($sockets)) { |
| 1045 | - if ($globalDebug) echo "Shutdown all sockets..."; |
|
| 1045 | + if ($globalDebug) echo "Shutdown all sockets..."; |
|
| 1046 | 1046 | |
| 1047 | - foreach ($sockets as $sock) { |
|
| 1047 | + foreach ($sockets as $sock) { |
|
| 1048 | 1048 | @socket_shutdown($sock,2); |
| 1049 | 1049 | @socket_close($sock); |
| 1050 | - } |
|
| 1050 | + } |
|
| 1051 | 1051 | |
| 1052 | 1052 | } |
| 1053 | - if ($globalDebug) echo "Restart all connections..."; |
|
| 1054 | - sleep(2); |
|
| 1055 | - $time = time(); |
|
| 1056 | - //connect_all($hosts); |
|
| 1057 | - $aprs_connect = 0; |
|
| 1058 | - connect_all($globalSources); |
|
| 1053 | + if ($globalDebug) echo "Restart all connections..."; |
|
| 1054 | + sleep(2); |
|
| 1055 | + $time = time(); |
|
| 1056 | + //connect_all($hosts); |
|
| 1057 | + $aprs_connect = 0; |
|
| 1058 | + connect_all($globalSources); |
|
| 1059 | 1059 | |
| 1060 | 1060 | } |
| 1061 | - } |
|
| 1061 | + } |
|
| 1062 | 1062 | } |
| 1063 | 1063 | if ($globalDaemon === false) { |
| 1064 | - if ($globalDebug) echo 'Check all...'."\n"; |
|
| 1065 | - $SI->checkAll(); |
|
| 1064 | + if ($globalDebug) echo 'Check all...'."\n"; |
|
| 1065 | + $SI->checkAll(); |
|
| 1066 | + } |
|
| 1066 | 1067 | } |
| 1067 | - } |
|
| 1068 | 1068 | } |
| 1069 | 1069 | |
| 1070 | 1070 | ?> |
@@ -8,12 +8,12 @@ discard block |
||
| 8 | 8 | $this->db = $Connection->db; |
| 9 | 9 | } |
| 10 | 10 | |
| 11 | - /** |
|
| 12 | - * Get SQL query part for filter used |
|
| 13 | - * @param Array $filter the filter |
|
| 14 | - * @return Array the SQL part |
|
| 15 | - */ |
|
| 16 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 11 | + /** |
|
| 12 | + * Get SQL query part for filter used |
|
| 13 | + * @param Array $filter the filter |
|
| 14 | + * @return Array the SQL part |
|
| 15 | + */ |
|
| 16 | + public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 17 | 17 | global $globalFilter, $globalStatsFilters, $globalFilterName; |
| 18 | 18 | $filters = array(); |
| 19 | 19 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
@@ -27,58 +27,58 @@ discard block |
||
| 27 | 27 | $filter_query_join = ''; |
| 28 | 28 | $filter_query_where = ''; |
| 29 | 29 | foreach($filters as $flt) { |
| 30 | - if (isset($flt['airlines']) && !empty($flt['airlines'])) { |
|
| 30 | + if (isset($flt['airlines']) && !empty($flt['airlines'])) { |
|
| 31 | 31 | if ($flt['airlines'][0] != '') { |
| 32 | - if (isset($flt['source'])) { |
|
| 32 | + if (isset($flt['source'])) { |
|
| 33 | 33 | $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) so ON so.flightaware_id = spotter_archive_output.flightaware_id"; |
| 34 | - } else { |
|
| 34 | + } else { |
|
| 35 | 35 | $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."')) so ON so.flightaware_id = spotter_archive_output.flightaware_id"; |
| 36 | - } |
|
| 36 | + } |
|
| 37 | 37 | } |
| 38 | - } |
|
| 39 | - if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) { |
|
| 38 | + } |
|
| 39 | + if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) { |
|
| 40 | 40 | if (isset($flt['source'])) { |
| 41 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) so ON so.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 41 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) so ON so.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 42 | 42 | } else { |
| 43 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) so ON so.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 43 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) so ON so.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 44 | + } |
|
| 44 | 45 | } |
| 45 | - } |
|
| 46 | - if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']))) { |
|
| 46 | + if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']))) { |
|
| 47 | 47 | if (isset($flt['source'])) { |
| 48 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) so ON so.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 48 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) so ON so.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 49 | + } |
|
| 49 | 50 | } |
| 50 | - } |
|
| 51 | 51 | } |
| 52 | 52 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 53 | - if ($filter['airlines'][0] != '') { |
|
| 53 | + if ($filter['airlines'][0] != '') { |
|
| 54 | 54 | $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive_output.flightaware_id"; |
| 55 | - } |
|
| 55 | + } |
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 59 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive_output.flightaware_id "; |
|
| 59 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive_output.flightaware_id "; |
|
| 60 | 60 | } |
| 61 | 61 | if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) { |
| 62 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) so ON so.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 62 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) so ON so.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 63 | 63 | } |
| 64 | 64 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 65 | - $filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 65 | + $filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 66 | 66 | } |
| 67 | 67 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 68 | - $filter_query_where = " WHERE ident = '".$filter['ident']."'"; |
|
| 68 | + $filter_query_where = " WHERE ident = '".$filter['ident']."'"; |
|
| 69 | 69 | } |
| 70 | 70 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 71 | - if ($filter_query_where == '') { |
|
| 71 | + if ($filter_query_where == '') { |
|
| 72 | 72 | $filter_query_where = " WHERE format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
| 73 | - } else { |
|
| 73 | + } else { |
|
| 74 | 74 | $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
| 75 | - } |
|
| 75 | + } |
|
| 76 | 76 | } |
| 77 | 77 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 78 | 78 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
| 79 | 79 | $filter_query = $filter_query_join.$filter_query_where; |
| 80 | 80 | return $filter_query; |
| 81 | - } |
|
| 81 | + } |
|
| 82 | 82 | |
| 83 | 83 | // Spotter_archive |
| 84 | 84 | public function addSpotterArchiveData($flightaware_id = '', $ident = '', $registration = '', $airline_name = '', $airline_icao = '', $airline_country = '', $airline_type = '', $aircraft_icao = '', $aircraft_shadow = '', $aircraft_name = '', $aircraft_manufacturer = '', $departure_airport_icao = '', $departure_airport_name = '', $departure_airport_city = '', $departure_airport_country = '', $departure_airport_time = '',$arrival_airport_icao = '', $arrival_airport_name = '', $arrival_airport_city ='', $arrival_airport_country = '', $arrival_airport_time = '', $route_stop = '', $date = '',$latitude = '', $longitude = '', $waypoints = '', $altitude = '', $heading = '', $ground_speed = '', $squawk = '', $ModeS = '', $pilot_id = '', $pilot_name = '',$verticalrate = '',$format_source = '', $source_name = '', $over_country = '') { |
@@ -109,44 +109,44 @@ discard block |
||
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | |
| 112 | - /** |
|
| 113 | - * Gets all the spotter information based on a particular callsign |
|
| 114 | - * |
|
| 115 | - * @return Array the spotter information |
|
| 116 | - * |
|
| 117 | - */ |
|
| 118 | - public function getLastArchiveSpotterDataByIdent($ident) |
|
| 119 | - { |
|
| 112 | + /** |
|
| 113 | + * Gets all the spotter information based on a particular callsign |
|
| 114 | + * |
|
| 115 | + * @return Array the spotter information |
|
| 116 | + * |
|
| 117 | + */ |
|
| 118 | + public function getLastArchiveSpotterDataByIdent($ident) |
|
| 119 | + { |
|
| 120 | 120 | $Spotter = new Spotter($this->db); |
| 121 | - date_default_timezone_set('UTC'); |
|
| 121 | + date_default_timezone_set('UTC'); |
|
| 122 | 122 | |
| 123 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 124 | - //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 125 | - $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 123 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 124 | + //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 125 | + $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 126 | 126 | |
| 127 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident)); |
|
| 127 | + $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident)); |
|
| 128 | 128 | |
| 129 | - return $spotter_array; |
|
| 130 | - } |
|
| 129 | + return $spotter_array; |
|
| 130 | + } |
|
| 131 | 131 | |
| 132 | 132 | |
| 133 | - /** |
|
| 134 | - * Gets last the spotter information based on a particular id |
|
| 135 | - * |
|
| 136 | - * @return Array the spotter information |
|
| 137 | - * |
|
| 138 | - */ |
|
| 139 | - public function getLastArchiveSpotterDataById($id) |
|
| 140 | - { |
|
| 141 | - $Spotter = new Spotter($this->db); |
|
| 142 | - date_default_timezone_set('UTC'); |
|
| 143 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 144 | - //$query = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id"; |
|
| 145 | - //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 146 | - $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 133 | + /** |
|
| 134 | + * Gets last the spotter information based on a particular id |
|
| 135 | + * |
|
| 136 | + * @return Array the spotter information |
|
| 137 | + * |
|
| 138 | + */ |
|
| 139 | + public function getLastArchiveSpotterDataById($id) |
|
| 140 | + { |
|
| 141 | + $Spotter = new Spotter($this->db); |
|
| 142 | + date_default_timezone_set('UTC'); |
|
| 143 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 144 | + //$query = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id"; |
|
| 145 | + //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 146 | + $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 147 | 147 | |
| 148 | 148 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 149 | - /* |
|
| 149 | + /* |
|
| 150 | 150 | try { |
| 151 | 151 | $Connection = new Connection(); |
| 152 | 152 | $sth = Connection->$db->prepare($query); |
@@ -156,232 +156,232 @@ discard block |
||
| 156 | 156 | } |
| 157 | 157 | $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC); |
| 158 | 158 | */ |
| 159 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id)); |
|
| 160 | - |
|
| 161 | - return $spotter_array; |
|
| 162 | - } |
|
| 163 | - |
|
| 164 | - /** |
|
| 165 | - * Gets all the spotter information based on a particular id |
|
| 166 | - * |
|
| 167 | - * @return Array the spotter information |
|
| 168 | - * |
|
| 169 | - */ |
|
| 170 | - public function getAllArchiveSpotterDataById($id) |
|
| 171 | - { |
|
| 172 | - date_default_timezone_set('UTC'); |
|
| 173 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 174 | - $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id"; |
|
| 159 | + $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id)); |
|
| 160 | + |
|
| 161 | + return $spotter_array; |
|
| 162 | + } |
|
| 163 | + |
|
| 164 | + /** |
|
| 165 | + * Gets all the spotter information based on a particular id |
|
| 166 | + * |
|
| 167 | + * @return Array the spotter information |
|
| 168 | + * |
|
| 169 | + */ |
|
| 170 | + public function getAllArchiveSpotterDataById($id) |
|
| 171 | + { |
|
| 172 | + date_default_timezone_set('UTC'); |
|
| 173 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 174 | + $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id"; |
|
| 175 | 175 | |
| 176 | 176 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 177 | 177 | |
| 178 | - try { |
|
| 179 | - $sth = $this->db->prepare($query); |
|
| 180 | - $sth->execute(array(':id' => $id)); |
|
| 181 | - } catch(PDOException $e) { |
|
| 182 | - echo $e->getMessage(); |
|
| 183 | - die; |
|
| 184 | - } |
|
| 185 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 186 | - |
|
| 187 | - return $spotter_array; |
|
| 188 | - } |
|
| 189 | - |
|
| 190 | - /** |
|
| 191 | - * Gets coordinate & time spotter information based on a particular id |
|
| 192 | - * |
|
| 193 | - * @return Array the spotter information |
|
| 194 | - * |
|
| 195 | - */ |
|
| 196 | - public function getCoordArchiveSpotterDataById($id) |
|
| 197 | - { |
|
| 198 | - date_default_timezone_set('UTC'); |
|
| 199 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 200 | - $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id"; |
|
| 178 | + try { |
|
| 179 | + $sth = $this->db->prepare($query); |
|
| 180 | + $sth->execute(array(':id' => $id)); |
|
| 181 | + } catch(PDOException $e) { |
|
| 182 | + echo $e->getMessage(); |
|
| 183 | + die; |
|
| 184 | + } |
|
| 185 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 186 | + |
|
| 187 | + return $spotter_array; |
|
| 188 | + } |
|
| 189 | + |
|
| 190 | + /** |
|
| 191 | + * Gets coordinate & time spotter information based on a particular id |
|
| 192 | + * |
|
| 193 | + * @return Array the spotter information |
|
| 194 | + * |
|
| 195 | + */ |
|
| 196 | + public function getCoordArchiveSpotterDataById($id) |
|
| 197 | + { |
|
| 198 | + date_default_timezone_set('UTC'); |
|
| 199 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 200 | + $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id"; |
|
| 201 | 201 | |
| 202 | 202 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 203 | 203 | |
| 204 | - try { |
|
| 205 | - $sth = $this->db->prepare($query); |
|
| 206 | - $sth->execute(array(':id' => $id)); |
|
| 207 | - } catch(PDOException $e) { |
|
| 208 | - echo $e->getMessage(); |
|
| 209 | - die; |
|
| 210 | - } |
|
| 211 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 204 | + try { |
|
| 205 | + $sth = $this->db->prepare($query); |
|
| 206 | + $sth->execute(array(':id' => $id)); |
|
| 207 | + } catch(PDOException $e) { |
|
| 208 | + echo $e->getMessage(); |
|
| 209 | + die; |
|
| 210 | + } |
|
| 211 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 212 | 212 | |
| 213 | - return $spotter_array; |
|
| 214 | - } |
|
| 213 | + return $spotter_array; |
|
| 214 | + } |
|
| 215 | 215 | |
| 216 | 216 | |
| 217 | - /** |
|
| 218 | - * Gets altitude information based on a particular callsign |
|
| 219 | - * |
|
| 220 | - * @return Array the spotter information |
|
| 221 | - * |
|
| 222 | - */ |
|
| 223 | - public function getAltitudeArchiveSpotterDataByIdent($ident) |
|
| 224 | - { |
|
| 217 | + /** |
|
| 218 | + * Gets altitude information based on a particular callsign |
|
| 219 | + * |
|
| 220 | + * @return Array the spotter information |
|
| 221 | + * |
|
| 222 | + */ |
|
| 223 | + public function getAltitudeArchiveSpotterDataByIdent($ident) |
|
| 224 | + { |
|
| 225 | 225 | |
| 226 | - date_default_timezone_set('UTC'); |
|
| 226 | + date_default_timezone_set('UTC'); |
|
| 227 | 227 | |
| 228 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 229 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 228 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 229 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 230 | 230 | |
| 231 | - try { |
|
| 232 | - $sth = $this->db->prepare($query); |
|
| 233 | - $sth->execute(array(':ident' => $ident)); |
|
| 234 | - } catch(PDOException $e) { |
|
| 235 | - echo $e->getMessage(); |
|
| 236 | - die; |
|
| 237 | - } |
|
| 238 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 231 | + try { |
|
| 232 | + $sth = $this->db->prepare($query); |
|
| 233 | + $sth->execute(array(':ident' => $ident)); |
|
| 234 | + } catch(PDOException $e) { |
|
| 235 | + echo $e->getMessage(); |
|
| 236 | + die; |
|
| 237 | + } |
|
| 238 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 239 | 239 | |
| 240 | - return $spotter_array; |
|
| 241 | - } |
|
| 240 | + return $spotter_array; |
|
| 241 | + } |
|
| 242 | 242 | |
| 243 | - /** |
|
| 244 | - * Gets altitude information based on a particular id |
|
| 245 | - * |
|
| 246 | - * @return Array the spotter information |
|
| 247 | - * |
|
| 248 | - */ |
|
| 249 | - public function getAltitudeArchiveSpotterDataById($id) |
|
| 250 | - { |
|
| 243 | + /** |
|
| 244 | + * Gets altitude information based on a particular id |
|
| 245 | + * |
|
| 246 | + * @return Array the spotter information |
|
| 247 | + * |
|
| 248 | + */ |
|
| 249 | + public function getAltitudeArchiveSpotterDataById($id) |
|
| 250 | + { |
|
| 251 | 251 | |
| 252 | - date_default_timezone_set('UTC'); |
|
| 252 | + date_default_timezone_set('UTC'); |
|
| 253 | 253 | |
| 254 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 255 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 254 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 255 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 256 | 256 | |
| 257 | - try { |
|
| 258 | - $sth = $this->db->prepare($query); |
|
| 259 | - $sth->execute(array(':id' => $id)); |
|
| 260 | - } catch(PDOException $e) { |
|
| 261 | - echo $e->getMessage(); |
|
| 262 | - die; |
|
| 263 | - } |
|
| 264 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 257 | + try { |
|
| 258 | + $sth = $this->db->prepare($query); |
|
| 259 | + $sth->execute(array(':id' => $id)); |
|
| 260 | + } catch(PDOException $e) { |
|
| 261 | + echo $e->getMessage(); |
|
| 262 | + die; |
|
| 263 | + } |
|
| 264 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 265 | 265 | |
| 266 | - return $spotter_array; |
|
| 267 | - } |
|
| 266 | + return $spotter_array; |
|
| 267 | + } |
|
| 268 | 268 | |
| 269 | - /** |
|
| 270 | - * Gets altitude & speed information based on a particular id |
|
| 271 | - * |
|
| 272 | - * @return Array the spotter information |
|
| 273 | - * |
|
| 274 | - */ |
|
| 275 | - public function getAltitudeSpeedArchiveSpotterDataById($id) |
|
| 276 | - { |
|
| 269 | + /** |
|
| 270 | + * Gets altitude & speed information based on a particular id |
|
| 271 | + * |
|
| 272 | + * @return Array the spotter information |
|
| 273 | + * |
|
| 274 | + */ |
|
| 275 | + public function getAltitudeSpeedArchiveSpotterDataById($id) |
|
| 276 | + { |
|
| 277 | 277 | |
| 278 | - date_default_timezone_set('UTC'); |
|
| 278 | + date_default_timezone_set('UTC'); |
|
| 279 | 279 | |
| 280 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 281 | - $query = "SELECT spotter_archive.altitude, spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 280 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 281 | + $query = "SELECT spotter_archive.altitude, spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 282 | 282 | |
| 283 | - try { |
|
| 284 | - $sth = $this->db->prepare($query); |
|
| 285 | - $sth->execute(array(':id' => $id)); |
|
| 286 | - } catch(PDOException $e) { |
|
| 287 | - echo $e->getMessage(); |
|
| 288 | - die; |
|
| 289 | - } |
|
| 290 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 283 | + try { |
|
| 284 | + $sth = $this->db->prepare($query); |
|
| 285 | + $sth->execute(array(':id' => $id)); |
|
| 286 | + } catch(PDOException $e) { |
|
| 287 | + echo $e->getMessage(); |
|
| 288 | + die; |
|
| 289 | + } |
|
| 290 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 291 | 291 | |
| 292 | - return $spotter_array; |
|
| 293 | - } |
|
| 292 | + return $spotter_array; |
|
| 293 | + } |
|
| 294 | 294 | |
| 295 | 295 | |
| 296 | - /** |
|
| 297 | - * Gets altitude information based on a particular callsign |
|
| 298 | - * |
|
| 299 | - * @return Array the spotter information |
|
| 300 | - * |
|
| 301 | - */ |
|
| 302 | - public function getLastAltitudeArchiveSpotterDataByIdent($ident) |
|
| 303 | - { |
|
| 296 | + /** |
|
| 297 | + * Gets altitude information based on a particular callsign |
|
| 298 | + * |
|
| 299 | + * @return Array the spotter information |
|
| 300 | + * |
|
| 301 | + */ |
|
| 302 | + public function getLastAltitudeArchiveSpotterDataByIdent($ident) |
|
| 303 | + { |
|
| 304 | 304 | |
| 305 | - date_default_timezone_set('UTC'); |
|
| 305 | + date_default_timezone_set('UTC'); |
|
| 306 | 306 | |
| 307 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 308 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 307 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 308 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 309 | 309 | // $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident"; |
| 310 | 310 | |
| 311 | - try { |
|
| 312 | - $sth = $this->db->prepare($query); |
|
| 313 | - $sth->execute(array(':ident' => $ident)); |
|
| 314 | - } catch(PDOException $e) { |
|
| 315 | - echo $e->getMessage(); |
|
| 316 | - die; |
|
| 317 | - } |
|
| 318 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 311 | + try { |
|
| 312 | + $sth = $this->db->prepare($query); |
|
| 313 | + $sth->execute(array(':ident' => $ident)); |
|
| 314 | + } catch(PDOException $e) { |
|
| 315 | + echo $e->getMessage(); |
|
| 316 | + die; |
|
| 317 | + } |
|
| 318 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 319 | 319 | |
| 320 | - return $spotter_array; |
|
| 321 | - } |
|
| 320 | + return $spotter_array; |
|
| 321 | + } |
|
| 322 | 322 | |
| 323 | 323 | |
| 324 | 324 | |
| 325 | - /** |
|
| 326 | - * Gets all the archive spotter information |
|
| 327 | - * |
|
| 328 | - * @return Array the spotter information |
|
| 329 | - * |
|
| 330 | - */ |
|
| 331 | - public function getSpotterArchiveData($ident,$flightaware_id,$date) |
|
| 332 | - { |
|
| 333 | - $Spotter = new Spotter($this->db); |
|
| 334 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 335 | - $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate"; |
|
| 325 | + /** |
|
| 326 | + * Gets all the archive spotter information |
|
| 327 | + * |
|
| 328 | + * @return Array the spotter information |
|
| 329 | + * |
|
| 330 | + */ |
|
| 331 | + public function getSpotterArchiveData($ident,$flightaware_id,$date) |
|
| 332 | + { |
|
| 333 | + $Spotter = new Spotter($this->db); |
|
| 334 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 335 | + $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate"; |
|
| 336 | 336 | |
| 337 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':flightaware_id' => $flightaware_id,':date' => $date.'%')); |
|
| 337 | + $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':flightaware_id' => $flightaware_id,':date' => $date.'%')); |
|
| 338 | 338 | |
| 339 | - return $spotter_array; |
|
| 340 | - } |
|
| 339 | + return $spotter_array; |
|
| 340 | + } |
|
| 341 | 341 | |
| 342 | - public function deleteSpotterArchiveTrackData() |
|
| 343 | - { |
|
| 342 | + public function deleteSpotterArchiveTrackData() |
|
| 343 | + { |
|
| 344 | 344 | global $globalArchiveKeepTrackMonths; |
| 345 | - date_default_timezone_set('UTC'); |
|
| 345 | + date_default_timezone_set('UTC'); |
|
| 346 | 346 | $query = 'DELETE FROM spotter_archive WHERE spotter_archive.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepTrackMonths.' MONTH)'; |
| 347 | - try { |
|
| 348 | - $sth = $this->db->prepare($query); |
|
| 349 | - $sth->execute(); |
|
| 350 | - } catch(PDOException $e) { |
|
| 351 | - echo $e->getMessage(); |
|
| 352 | - die; |
|
| 353 | - } |
|
| 347 | + try { |
|
| 348 | + $sth = $this->db->prepare($query); |
|
| 349 | + $sth->execute(); |
|
| 350 | + } catch(PDOException $e) { |
|
| 351 | + echo $e->getMessage(); |
|
| 352 | + die; |
|
| 353 | + } |
|
| 354 | 354 | } |
| 355 | 355 | |
| 356 | 356 | /** |
| 357 | - * Gets Minimal Live Spotter data |
|
| 358 | - * |
|
| 359 | - * @return Array the spotter information |
|
| 360 | - * |
|
| 361 | - */ |
|
| 362 | - public function getMinLiveSpotterData($begindate,$enddate,$filter = array()) |
|
| 363 | - { |
|
| 364 | - global $globalDBdriver, $globalLiveInterval; |
|
| 365 | - date_default_timezone_set('UTC'); |
|
| 366 | - |
|
| 367 | - $filter_query = ''; |
|
| 368 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 369 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 370 | - } |
|
| 371 | - // Use spotter_output also ? |
|
| 372 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 373 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 374 | - } |
|
| 375 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 376 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 377 | - } |
|
| 378 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 379 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 380 | - } |
|
| 381 | - |
|
| 382 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 383 | - if ($globalDBdriver == 'mysql') { |
|
| 384 | - /* |
|
| 357 | + * Gets Minimal Live Spotter data |
|
| 358 | + * |
|
| 359 | + * @return Array the spotter information |
|
| 360 | + * |
|
| 361 | + */ |
|
| 362 | + public function getMinLiveSpotterData($begindate,$enddate,$filter = array()) |
|
| 363 | + { |
|
| 364 | + global $globalDBdriver, $globalLiveInterval; |
|
| 365 | + date_default_timezone_set('UTC'); |
|
| 366 | + |
|
| 367 | + $filter_query = ''; |
|
| 368 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 369 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 370 | + } |
|
| 371 | + // Use spotter_output also ? |
|
| 372 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 373 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 374 | + } |
|
| 375 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 376 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 377 | + } |
|
| 378 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 379 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 380 | + } |
|
| 381 | + |
|
| 382 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 383 | + if ($globalDBdriver == 'mysql') { |
|
| 384 | + /* |
|
| 385 | 385 | $query = 'SELECT a.aircraft_shadow, spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk |
| 386 | 386 | FROM spotter_archive |
| 387 | 387 | INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao'; |
@@ -400,56 +400,56 @@ discard block |
||
| 400 | 400 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao |
| 401 | 401 | WHERE spotter_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' |
| 402 | 402 | '.$filter_query.' ORDER BY flightaware_id'; |
| 403 | - } else { |
|
| 404 | - //$query = 'SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao'; |
|
| 405 | - $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 403 | + } else { |
|
| 404 | + //$query = 'SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao'; |
|
| 405 | + $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 406 | 406 | FROM spotter_archive |
| 407 | 407 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao |
| 408 | 408 | WHERE spotter_archive.date >= '."'".$begindate."'".' AND spotter_archive.date <= '."'".$enddate."'".' |
| 409 | 409 | '.$filter_query.' ORDER BY flightaware_id'; |
| 410 | - } |
|
| 411 | - //echo $query; |
|
| 412 | - try { |
|
| 413 | - $sth = $this->db->prepare($query); |
|
| 414 | - $sth->execute(); |
|
| 415 | - } catch(PDOException $e) { |
|
| 416 | - echo $e->getMessage(); |
|
| 417 | - die; |
|
| 418 | - } |
|
| 419 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 420 | - |
|
| 421 | - return $spotter_array; |
|
| 422 | - } |
|
| 410 | + } |
|
| 411 | + //echo $query; |
|
| 412 | + try { |
|
| 413 | + $sth = $this->db->prepare($query); |
|
| 414 | + $sth->execute(); |
|
| 415 | + } catch(PDOException $e) { |
|
| 416 | + echo $e->getMessage(); |
|
| 417 | + die; |
|
| 418 | + } |
|
| 419 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 420 | + |
|
| 421 | + return $spotter_array; |
|
| 422 | + } |
|
| 423 | 423 | |
| 424 | 424 | /** |
| 425 | - * Gets Minimal Live Spotter data |
|
| 426 | - * |
|
| 427 | - * @return Array the spotter information |
|
| 428 | - * |
|
| 429 | - */ |
|
| 430 | - public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array()) |
|
| 431 | - { |
|
| 432 | - global $globalDBdriver, $globalLiveInterval; |
|
| 433 | - date_default_timezone_set('UTC'); |
|
| 434 | - |
|
| 435 | - $filter_query = ''; |
|
| 436 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 437 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 438 | - } |
|
| 439 | - // Should use spotter_output also ? |
|
| 440 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 441 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 442 | - } |
|
| 443 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 444 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 445 | - } |
|
| 446 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 447 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 448 | - } |
|
| 449 | - |
|
| 450 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 451 | - if ($globalDBdriver == 'mysql') { |
|
| 452 | - /* |
|
| 425 | + * Gets Minimal Live Spotter data |
|
| 426 | + * |
|
| 427 | + * @return Array the spotter information |
|
| 428 | + * |
|
| 429 | + */ |
|
| 430 | + public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array()) |
|
| 431 | + { |
|
| 432 | + global $globalDBdriver, $globalLiveInterval; |
|
| 433 | + date_default_timezone_set('UTC'); |
|
| 434 | + |
|
| 435 | + $filter_query = ''; |
|
| 436 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 437 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 438 | + } |
|
| 439 | + // Should use spotter_output also ? |
|
| 440 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 441 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 442 | + } |
|
| 443 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 444 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 445 | + } |
|
| 446 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 447 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 448 | + } |
|
| 449 | + |
|
| 450 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 451 | + if ($globalDBdriver == 'mysql') { |
|
| 452 | + /* |
|
| 453 | 453 | $query = 'SELECT a.aircraft_shadow, spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk |
| 454 | 454 | FROM spotter_archive |
| 455 | 455 | INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao'; |
@@ -460,95 +460,95 @@ discard block |
||
| 460 | 460 | WHERE (spotter_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') |
| 461 | 461 | '.$filter_query.' GROUP BY spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao, spotter_archive_output.arrival_airport_icao, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow'; |
| 462 | 462 | |
| 463 | - } else { |
|
| 464 | - //$query = 'SELECT spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow FROM spotter_archive_output INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive_output.flightaware_id = s.flightaware_id AND spotter_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao'; |
|
| 465 | - /* |
|
| 463 | + } else { |
|
| 464 | + //$query = 'SELECT spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow FROM spotter_archive_output INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive_output.flightaware_id = s.flightaware_id AND spotter_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao'; |
|
| 465 | + /* |
|
| 466 | 466 | $query = 'SELECT spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
| 467 | 467 | FROM spotter_archive_output |
| 468 | 468 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao |
| 469 | 469 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
| 470 | 470 | '.$filter_query.' GROUP BY spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao, spotter_archive_output.arrival_airport_icao, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow'; |
| 471 | 471 | */ |
| 472 | - $query = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
|
| 472 | + $query = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
|
| 473 | 473 | FROM spotter_archive_output |
| 474 | 474 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao |
| 475 | 475 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
| 476 | 476 | '.$filter_query.' LIMIT 200 OFFSET 0'; |
| 477 | 477 | // .' GROUP BY spotter_output.flightaware_id, spotter_output.ident, spotter_output.aircraft_icao, spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao, spotter_output.latitude, spotter_output.longitude, spotter_output.altitude, spotter_output.heading, spotter_output.ground_speed, spotter_output.squawk, a.aircraft_shadow'; |
| 478 | 478 | |
| 479 | - } |
|
| 480 | - //echo $query; |
|
| 481 | - try { |
|
| 482 | - $sth = $this->db->prepare($query); |
|
| 483 | - $sth->execute(); |
|
| 484 | - } catch(PDOException $e) { |
|
| 485 | - echo $e->getMessage(); |
|
| 486 | - die; |
|
| 487 | - } |
|
| 488 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 489 | - |
|
| 490 | - return $spotter_array; |
|
| 491 | - } |
|
| 479 | + } |
|
| 480 | + //echo $query; |
|
| 481 | + try { |
|
| 482 | + $sth = $this->db->prepare($query); |
|
| 483 | + $sth->execute(); |
|
| 484 | + } catch(PDOException $e) { |
|
| 485 | + echo $e->getMessage(); |
|
| 486 | + die; |
|
| 487 | + } |
|
| 488 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 489 | + |
|
| 490 | + return $spotter_array; |
|
| 491 | + } |
|
| 492 | 492 | |
| 493 | 493 | /** |
| 494 | - * Gets count Live Spotter data |
|
| 495 | - * |
|
| 496 | - * @return Array the spotter information |
|
| 497 | - * |
|
| 498 | - */ |
|
| 499 | - public function getLiveSpotterCount($begindate,$enddate,$filter = array()) |
|
| 500 | - { |
|
| 501 | - global $globalDBdriver, $globalLiveInterval; |
|
| 502 | - date_default_timezone_set('UTC'); |
|
| 503 | - |
|
| 504 | - $filter_query = ''; |
|
| 505 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 506 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 507 | - } |
|
| 508 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 509 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 510 | - } |
|
| 511 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 512 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 513 | - } |
|
| 514 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 515 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 516 | - } |
|
| 517 | - |
|
| 518 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 519 | - if ($globalDBdriver == 'mysql') { |
|
| 494 | + * Gets count Live Spotter data |
|
| 495 | + * |
|
| 496 | + * @return Array the spotter information |
|
| 497 | + * |
|
| 498 | + */ |
|
| 499 | + public function getLiveSpotterCount($begindate,$enddate,$filter = array()) |
|
| 500 | + { |
|
| 501 | + global $globalDBdriver, $globalLiveInterval; |
|
| 502 | + date_default_timezone_set('UTC'); |
|
| 503 | + |
|
| 504 | + $filter_query = ''; |
|
| 505 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 506 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 507 | + } |
|
| 508 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 509 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 510 | + } |
|
| 511 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 512 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 513 | + } |
|
| 514 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 515 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 516 | + } |
|
| 517 | + |
|
| 518 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 519 | + if ($globalDBdriver == 'mysql') { |
|
| 520 | 520 | $query = 'SELECT COUNT(DISTINCT flightaware_id) as nb |
| 521 | 521 | FROM spotter_archive l |
| 522 | 522 | WHERE (l.date BETWEEN DATE_SUB('."'".$begindate."'".',INTERVAL '.$globalLiveInterval.' SECOND) AND '."'".$begindate."'".')'.$filter_query; |
| 523 | - } else { |
|
| 523 | + } else { |
|
| 524 | 524 | $query = 'SELECT COUNT(DISTINCT flightaware_id) as nb FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."' - INTERVAL '".$globalLiveInterval." SECONDS' AND "."'".$enddate."'".')'.$filter_query; |
| 525 | - } |
|
| 526 | - //echo $query; |
|
| 527 | - try { |
|
| 528 | - $sth = $this->db->prepare($query); |
|
| 529 | - $sth->execute(); |
|
| 530 | - } catch(PDOException $e) { |
|
| 531 | - echo $e->getMessage(); |
|
| 532 | - die; |
|
| 533 | - } |
|
| 525 | + } |
|
| 526 | + //echo $query; |
|
| 527 | + try { |
|
| 528 | + $sth = $this->db->prepare($query); |
|
| 529 | + $sth->execute(); |
|
| 530 | + } catch(PDOException $e) { |
|
| 531 | + echo $e->getMessage(); |
|
| 532 | + die; |
|
| 533 | + } |
|
| 534 | 534 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
| 535 | 535 | $sth->closeCursor(); |
| 536 | - return $result['nb']; |
|
| 536 | + return $result['nb']; |
|
| 537 | 537 | |
| 538 | - } |
|
| 538 | + } |
|
| 539 | 539 | |
| 540 | 540 | |
| 541 | 541 | |
| 542 | 542 | // Spotter_Archive_output |
| 543 | 543 | |
| 544 | - /** |
|
| 545 | - * Gets all the spotter information |
|
| 546 | - * |
|
| 547 | - * @return Array the spotter information |
|
| 548 | - * |
|
| 549 | - */ |
|
| 550 | - public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array()) |
|
| 551 | - { |
|
| 544 | + /** |
|
| 545 | + * Gets all the spotter information |
|
| 546 | + * |
|
| 547 | + * @return Array the spotter information |
|
| 548 | + * |
|
| 549 | + */ |
|
| 550 | + public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array()) |
|
| 551 | + { |
|
| 552 | 552 | global $globalTimezone, $globalDBdriver; |
| 553 | 553 | require_once(dirname(__FILE__).'/class.Translation.php'); |
| 554 | 554 | $Translation = new Translation(); |
@@ -562,159 +562,159 @@ discard block |
||
| 562 | 562 | $filter_query = $this->getFilter($filters); |
| 563 | 563 | if ($q != "") |
| 564 | 564 | { |
| 565 | - if (!is_string($q)) |
|
| 566 | - { |
|
| 565 | + if (!is_string($q)) |
|
| 566 | + { |
|
| 567 | 567 | return false; |
| 568 | - } else { |
|
| 568 | + } else { |
|
| 569 | 569 | |
| 570 | 570 | $q_array = explode(" ", $q); |
| 571 | 571 | |
| 572 | 572 | foreach ($q_array as $q_item){ |
| 573 | - $additional_query .= " AND ("; |
|
| 574 | - $additional_query .= "(spotter_archive_output.spotter_id like '%".$q_item."%') OR "; |
|
| 575 | - $additional_query .= "(spotter_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
|
| 576 | - $additional_query .= "(spotter_archive_output.aircraft_name like '%".$q_item."%') OR "; |
|
| 577 | - $additional_query .= "(spotter_archive_output.aircraft_manufacturer like '%".$q_item."%') OR "; |
|
| 578 | - $additional_query .= "(spotter_archive_output.airline_icao like '%".$q_item."%') OR "; |
|
| 579 | - $additional_query .= "(spotter_archive_output.airline_name like '%".$q_item."%') OR "; |
|
| 580 | - $additional_query .= "(spotter_archive_output.airline_country like '%".$q_item."%') OR "; |
|
| 581 | - $additional_query .= "(spotter_archive_output.departure_airport_icao like '%".$q_item."%') OR "; |
|
| 582 | - $additional_query .= "(spotter_archive_output.departure_airport_name like '%".$q_item."%') OR "; |
|
| 583 | - $additional_query .= "(spotter_archive_output.departure_airport_city like '%".$q_item."%') OR "; |
|
| 584 | - $additional_query .= "(spotter_archive_output.departure_airport_country like '%".$q_item."%') OR "; |
|
| 585 | - $additional_query .= "(spotter_archive_output.arrival_airport_icao like '%".$q_item."%') OR "; |
|
| 586 | - $additional_query .= "(spotter_archive_output.arrival_airport_name like '%".$q_item."%') OR "; |
|
| 587 | - $additional_query .= "(spotter_archive_output.arrival_airport_city like '%".$q_item."%') OR "; |
|
| 588 | - $additional_query .= "(spotter_archive_output.arrival_airport_country like '%".$q_item."%') OR "; |
|
| 589 | - $additional_query .= "(spotter_archive_output.registration like '%".$q_item."%') OR "; |
|
| 590 | - $additional_query .= "(spotter_archive_output.owner_name like '%".$q_item."%') OR "; |
|
| 591 | - $additional_query .= "(spotter_archive_output.pilot_id like '%".$q_item."%') OR "; |
|
| 592 | - $additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR "; |
|
| 593 | - $additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR "; |
|
| 594 | - $translate = $Translation->ident2icao($q_item); |
|
| 595 | - if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR "; |
|
| 596 | - $additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')"; |
|
| 597 | - $additional_query .= ")"; |
|
| 573 | + $additional_query .= " AND ("; |
|
| 574 | + $additional_query .= "(spotter_archive_output.spotter_id like '%".$q_item."%') OR "; |
|
| 575 | + $additional_query .= "(spotter_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
|
| 576 | + $additional_query .= "(spotter_archive_output.aircraft_name like '%".$q_item."%') OR "; |
|
| 577 | + $additional_query .= "(spotter_archive_output.aircraft_manufacturer like '%".$q_item."%') OR "; |
|
| 578 | + $additional_query .= "(spotter_archive_output.airline_icao like '%".$q_item."%') OR "; |
|
| 579 | + $additional_query .= "(spotter_archive_output.airline_name like '%".$q_item."%') OR "; |
|
| 580 | + $additional_query .= "(spotter_archive_output.airline_country like '%".$q_item."%') OR "; |
|
| 581 | + $additional_query .= "(spotter_archive_output.departure_airport_icao like '%".$q_item."%') OR "; |
|
| 582 | + $additional_query .= "(spotter_archive_output.departure_airport_name like '%".$q_item."%') OR "; |
|
| 583 | + $additional_query .= "(spotter_archive_output.departure_airport_city like '%".$q_item."%') OR "; |
|
| 584 | + $additional_query .= "(spotter_archive_output.departure_airport_country like '%".$q_item."%') OR "; |
|
| 585 | + $additional_query .= "(spotter_archive_output.arrival_airport_icao like '%".$q_item."%') OR "; |
|
| 586 | + $additional_query .= "(spotter_archive_output.arrival_airport_name like '%".$q_item."%') OR "; |
|
| 587 | + $additional_query .= "(spotter_archive_output.arrival_airport_city like '%".$q_item."%') OR "; |
|
| 588 | + $additional_query .= "(spotter_archive_output.arrival_airport_country like '%".$q_item."%') OR "; |
|
| 589 | + $additional_query .= "(spotter_archive_output.registration like '%".$q_item."%') OR "; |
|
| 590 | + $additional_query .= "(spotter_archive_output.owner_name like '%".$q_item."%') OR "; |
|
| 591 | + $additional_query .= "(spotter_archive_output.pilot_id like '%".$q_item."%') OR "; |
|
| 592 | + $additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR "; |
|
| 593 | + $additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR "; |
|
| 594 | + $translate = $Translation->ident2icao($q_item); |
|
| 595 | + if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR "; |
|
| 596 | + $additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')"; |
|
| 597 | + $additional_query .= ")"; |
|
| 598 | + } |
|
| 598 | 599 | } |
| 599 | - } |
|
| 600 | 600 | } |
| 601 | 601 | |
| 602 | 602 | if ($registration != "") |
| 603 | 603 | { |
| 604 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 605 | - if (!is_string($registration)) |
|
| 606 | - { |
|
| 604 | + $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 605 | + if (!is_string($registration)) |
|
| 606 | + { |
|
| 607 | 607 | return false; |
| 608 | - } else { |
|
| 608 | + } else { |
|
| 609 | 609 | $additional_query .= " AND (spotter_archive_output.registration = '".$registration."')"; |
| 610 | - } |
|
| 610 | + } |
|
| 611 | 611 | } |
| 612 | 612 | |
| 613 | 613 | if ($aircraft_icao != "") |
| 614 | 614 | { |
| 615 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 616 | - if (!is_string($aircraft_icao)) |
|
| 617 | - { |
|
| 615 | + $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 616 | + if (!is_string($aircraft_icao)) |
|
| 617 | + { |
|
| 618 | 618 | return false; |
| 619 | - } else { |
|
| 619 | + } else { |
|
| 620 | 620 | $additional_query .= " AND (spotter_archive_output.aircraft_icao = '".$aircraft_icao."')"; |
| 621 | - } |
|
| 621 | + } |
|
| 622 | 622 | } |
| 623 | 623 | |
| 624 | 624 | if ($aircraft_manufacturer != "") |
| 625 | 625 | { |
| 626 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 627 | - if (!is_string($aircraft_manufacturer)) |
|
| 628 | - { |
|
| 626 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 627 | + if (!is_string($aircraft_manufacturer)) |
|
| 628 | + { |
|
| 629 | 629 | return false; |
| 630 | - } else { |
|
| 630 | + } else { |
|
| 631 | 631 | $additional_query .= " AND (spotter_archive_output.aircraft_manufacturer = '".$aircraft_manufacturer."')"; |
| 632 | - } |
|
| 632 | + } |
|
| 633 | 633 | } |
| 634 | 634 | |
| 635 | 635 | if ($highlights == "true") |
| 636 | 636 | { |
| 637 | - if (!is_string($highlights)) |
|
| 638 | - { |
|
| 637 | + if (!is_string($highlights)) |
|
| 638 | + { |
|
| 639 | 639 | return false; |
| 640 | - } else { |
|
| 640 | + } else { |
|
| 641 | 641 | $additional_query .= " AND (spotter_archive_output.highlight <> '')"; |
| 642 | - } |
|
| 642 | + } |
|
| 643 | 643 | } |
| 644 | 644 | |
| 645 | 645 | if ($airline_icao != "") |
| 646 | 646 | { |
| 647 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 648 | - if (!is_string($airline_icao)) |
|
| 649 | - { |
|
| 647 | + $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 648 | + if (!is_string($airline_icao)) |
|
| 649 | + { |
|
| 650 | 650 | return false; |
| 651 | - } else { |
|
| 651 | + } else { |
|
| 652 | 652 | $additional_query .= " AND (spotter_archive_output.airline_icao = '".$airline_icao."')"; |
| 653 | - } |
|
| 653 | + } |
|
| 654 | 654 | } |
| 655 | 655 | |
| 656 | 656 | if ($airline_country != "") |
| 657 | 657 | { |
| 658 | - $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 659 | - if (!is_string($airline_country)) |
|
| 660 | - { |
|
| 658 | + $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 659 | + if (!is_string($airline_country)) |
|
| 660 | + { |
|
| 661 | 661 | return false; |
| 662 | - } else { |
|
| 662 | + } else { |
|
| 663 | 663 | $additional_query .= " AND (spotter_archive_output.airline_country = '".$airline_country."')"; |
| 664 | - } |
|
| 664 | + } |
|
| 665 | 665 | } |
| 666 | 666 | |
| 667 | 667 | if ($airline_type != "") |
| 668 | 668 | { |
| 669 | - $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 670 | - if (!is_string($airline_type)) |
|
| 671 | - { |
|
| 669 | + $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 670 | + if (!is_string($airline_type)) |
|
| 671 | + { |
|
| 672 | 672 | return false; |
| 673 | - } else { |
|
| 673 | + } else { |
|
| 674 | 674 | if ($airline_type == "passenger") |
| 675 | 675 | { |
| 676 | - $additional_query .= " AND (spotter_archive_output.airline_type = 'passenger')"; |
|
| 676 | + $additional_query .= " AND (spotter_archive_output.airline_type = 'passenger')"; |
|
| 677 | 677 | } |
| 678 | 678 | if ($airline_type == "cargo") |
| 679 | 679 | { |
| 680 | - $additional_query .= " AND (spotter_archive_output.airline_type = 'cargo')"; |
|
| 680 | + $additional_query .= " AND (spotter_archive_output.airline_type = 'cargo')"; |
|
| 681 | 681 | } |
| 682 | 682 | if ($airline_type == "military") |
| 683 | 683 | { |
| 684 | - $additional_query .= " AND (spotter_archive_output.airline_type = 'military')"; |
|
| 684 | + $additional_query .= " AND (spotter_archive_output.airline_type = 'military')"; |
|
| 685 | + } |
|
| 685 | 686 | } |
| 686 | - } |
|
| 687 | 687 | } |
| 688 | 688 | |
| 689 | 689 | if ($airport != "") |
| 690 | 690 | { |
| 691 | - $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 692 | - if (!is_string($airport)) |
|
| 693 | - { |
|
| 691 | + $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 692 | + if (!is_string($airport)) |
|
| 693 | + { |
|
| 694 | 694 | return false; |
| 695 | - } else { |
|
| 695 | + } else { |
|
| 696 | 696 | $additional_query .= " AND ((spotter_archive_output.departure_airport_icao = '".$airport."') OR (spotter_archive_output.arrival_airport_icao = '".$airport."'))"; |
| 697 | - } |
|
| 697 | + } |
|
| 698 | 698 | } |
| 699 | 699 | |
| 700 | 700 | if ($airport_country != "") |
| 701 | 701 | { |
| 702 | - $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 703 | - if (!is_string($airport_country)) |
|
| 704 | - { |
|
| 702 | + $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 703 | + if (!is_string($airport_country)) |
|
| 704 | + { |
|
| 705 | 705 | return false; |
| 706 | - } else { |
|
| 706 | + } else { |
|
| 707 | 707 | $additional_query .= " AND ((spotter_archive_output.departure_airport_country = '".$airport_country."') OR (spotter_archive_output.arrival_airport_country = '".$airport_country."'))"; |
| 708 | - } |
|
| 708 | + } |
|
| 709 | 709 | } |
| 710 | 710 | |
| 711 | 711 | if ($callsign != "") |
| 712 | 712 | { |
| 713 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 714 | - if (!is_string($callsign)) |
|
| 715 | - { |
|
| 713 | + $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 714 | + if (!is_string($callsign)) |
|
| 715 | + { |
|
| 716 | 716 | return false; |
| 717 | - } else { |
|
| 717 | + } else { |
|
| 718 | 718 | $translate = $Translation->ident2icao($callsign); |
| 719 | 719 | if ($translate != $callsign) { |
| 720 | 720 | $additional_query .= " AND (spotter_archive_output.ident = :callsign OR spotter_archive_output.ident = :translate)"; |
@@ -722,99 +722,99 @@ discard block |
||
| 722 | 722 | } else { |
| 723 | 723 | $additional_query .= " AND (spotter_archive_output.ident = '".$callsign."')"; |
| 724 | 724 | } |
| 725 | - } |
|
| 725 | + } |
|
| 726 | 726 | } |
| 727 | 727 | |
| 728 | 728 | if ($owner != "") |
| 729 | 729 | { |
| 730 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 731 | - if (!is_string($owner)) |
|
| 732 | - { |
|
| 730 | + $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 731 | + if (!is_string($owner)) |
|
| 732 | + { |
|
| 733 | 733 | return false; |
| 734 | - } else { |
|
| 734 | + } else { |
|
| 735 | 735 | $additional_query .= " AND (spotter_archive_output.owner_name = '".$owner."')"; |
| 736 | - } |
|
| 736 | + } |
|
| 737 | 737 | } |
| 738 | 738 | |
| 739 | 739 | if ($pilot_name != "") |
| 740 | 740 | { |
| 741 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 742 | - if (!is_string($pilot_name)) |
|
| 743 | - { |
|
| 741 | + $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 742 | + if (!is_string($pilot_name)) |
|
| 743 | + { |
|
| 744 | 744 | return false; |
| 745 | - } else { |
|
| 745 | + } else { |
|
| 746 | 746 | $additional_query .= " AND (spotter_archive_output.pilot_name = '".$pilot_name."')"; |
| 747 | - } |
|
| 747 | + } |
|
| 748 | 748 | } |
| 749 | 749 | |
| 750 | 750 | if ($pilot_id != "") |
| 751 | 751 | { |
| 752 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 753 | - if (!is_string($pilot_id)) |
|
| 754 | - { |
|
| 752 | + $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 753 | + if (!is_string($pilot_id)) |
|
| 754 | + { |
|
| 755 | 755 | return false; |
| 756 | - } else { |
|
| 756 | + } else { |
|
| 757 | 757 | $additional_query .= " AND (spotter_archive_output.pilot_id = '".$pilot_id."')"; |
| 758 | - } |
|
| 758 | + } |
|
| 759 | 759 | } |
| 760 | 760 | |
| 761 | 761 | if ($departure_airport_route != "") |
| 762 | 762 | { |
| 763 | - $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 764 | - if (!is_string($departure_airport_route)) |
|
| 765 | - { |
|
| 763 | + $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 764 | + if (!is_string($departure_airport_route)) |
|
| 765 | + { |
|
| 766 | 766 | return false; |
| 767 | - } else { |
|
| 767 | + } else { |
|
| 768 | 768 | $additional_query .= " AND (spotter_archive_output.departure_airport_icao = '".$departure_airport_route."')"; |
| 769 | - } |
|
| 769 | + } |
|
| 770 | 770 | } |
| 771 | 771 | |
| 772 | 772 | if ($arrival_airport_route != "") |
| 773 | 773 | { |
| 774 | - $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 775 | - if (!is_string($arrival_airport_route)) |
|
| 776 | - { |
|
| 774 | + $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 775 | + if (!is_string($arrival_airport_route)) |
|
| 776 | + { |
|
| 777 | 777 | return false; |
| 778 | - } else { |
|
| 778 | + } else { |
|
| 779 | 779 | $additional_query .= " AND (spotter_archive_output.arrival_airport_icao = '".$arrival_airport_route."')"; |
| 780 | - } |
|
| 780 | + } |
|
| 781 | 781 | } |
| 782 | 782 | |
| 783 | 783 | if ($altitude != "") |
| 784 | 784 | { |
| 785 | - $altitude_array = explode(",", $altitude); |
|
| 785 | + $altitude_array = explode(",", $altitude); |
|
| 786 | 786 | |
| 787 | - $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 788 | - $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 787 | + $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 788 | + $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 789 | 789 | |
| 790 | 790 | |
| 791 | - if ($altitude_array[1] != "") |
|
| 792 | - { |
|
| 791 | + if ($altitude_array[1] != "") |
|
| 792 | + { |
|
| 793 | 793 | $altitude_array[0] = substr($altitude_array[0], 0, -2); |
| 794 | 794 | $altitude_array[1] = substr($altitude_array[1], 0, -2); |
| 795 | 795 | $additional_query .= " AND altitude BETWEEN '".$altitude_array[0]."' AND '".$altitude_array[1]."' "; |
| 796 | - } else { |
|
| 796 | + } else { |
|
| 797 | 797 | $altitude_array[0] = substr($altitude_array[0], 0, -2); |
| 798 | 798 | $additional_query .= " AND altitude <= '".$altitude_array[0]."' "; |
| 799 | - } |
|
| 799 | + } |
|
| 800 | 800 | } |
| 801 | 801 | |
| 802 | 802 | if ($date_posted != "") |
| 803 | 803 | { |
| 804 | - $date_array = explode(",", $date_posted); |
|
| 804 | + $date_array = explode(",", $date_posted); |
|
| 805 | 805 | |
| 806 | - $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 807 | - $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 806 | + $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 807 | + $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 808 | 808 | |
| 809 | - if ($globalTimezone != '') { |
|
| 809 | + if ($globalTimezone != '') { |
|
| 810 | 810 | date_default_timezone_set($globalTimezone); |
| 811 | 811 | $datetime = new DateTime(); |
| 812 | 812 | $offset = $datetime->format('P'); |
| 813 | - } else $offset = '+00:00'; |
|
| 813 | + } else $offset = '+00:00'; |
|
| 814 | 814 | |
| 815 | 815 | |
| 816 | - if ($date_array[1] != "") |
|
| 817 | - { |
|
| 816 | + if ($date_array[1] != "") |
|
| 817 | + { |
|
| 818 | 818 | $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0])); |
| 819 | 819 | $date_array[1] = date("Y-m-d H:i:s", strtotime($date_array[1])); |
| 820 | 820 | if ($globalDBdriver == 'mysql') { |
@@ -822,28 +822,28 @@ discard block |
||
| 822 | 822 | } else { |
| 823 | 823 | $additional_query .= " AND spotter_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) AND spotter_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." <= CAST('".$date_array[1]."' AS TIMESTAMP) "; |
| 824 | 824 | } |
| 825 | - } else { |
|
| 825 | + } else { |
|
| 826 | 826 | $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0])); |
| 827 | - if ($globalDBdriver == 'mysql') { |
|
| 827 | + if ($globalDBdriver == 'mysql') { |
|
| 828 | 828 | $additional_query .= " AND TIMESTAMP(CONVERT_TZ(spotter_archive_output.date,'+00:00', '".$offset."')) >= '".$date_array[0]."' "; |
| 829 | 829 | } else { |
| 830 | 830 | $additional_query .= " AND spotter_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) "; |
| 831 | 831 | } |
| 832 | - } |
|
| 832 | + } |
|
| 833 | 833 | } |
| 834 | 834 | |
| 835 | 835 | if ($limit != "") |
| 836 | 836 | { |
| 837 | - $limit_array = explode(",", $limit); |
|
| 837 | + $limit_array = explode(",", $limit); |
|
| 838 | 838 | |
| 839 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 840 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 839 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 840 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 841 | 841 | |
| 842 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 843 | - { |
|
| 842 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 843 | + { |
|
| 844 | 844 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 845 | 845 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 846 | - } |
|
| 846 | + } |
|
| 847 | 847 | } |
| 848 | 848 | |
| 849 | 849 | |
@@ -874,33 +874,33 @@ discard block |
||
| 874 | 874 | $spotter_array = $Spotter->getDataFromDB($query, $query_values,$limit_query); |
| 875 | 875 | |
| 876 | 876 | return $spotter_array; |
| 877 | - } |
|
| 877 | + } |
|
| 878 | 878 | |
| 879 | - public function deleteSpotterArchiveData() |
|
| 880 | - { |
|
| 879 | + public function deleteSpotterArchiveData() |
|
| 880 | + { |
|
| 881 | 881 | global $globalArchiveKeepMonths, $globalDBdriver; |
| 882 | - date_default_timezone_set('UTC'); |
|
| 883 | - if ($globalDBdriver == 'mysql') { |
|
| 882 | + date_default_timezone_set('UTC'); |
|
| 883 | + if ($globalDBdriver == 'mysql') { |
|
| 884 | 884 | $query = 'DELETE FROM spotter_archive_output WHERE spotter_archive_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepMonths.' MONTH)'; |
| 885 | 885 | } else { |
| 886 | 886 | $query = "DELETE FROM spotter_archive_output WHERE spotter_archive_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveKeepMonths." MONTH'"; |
| 887 | 887 | } |
| 888 | - try { |
|
| 889 | - $sth = $this->db->prepare($query); |
|
| 890 | - $sth->execute(); |
|
| 891 | - } catch(PDOException $e) { |
|
| 892 | - return "error"; |
|
| 893 | - } |
|
| 888 | + try { |
|
| 889 | + $sth = $this->db->prepare($query); |
|
| 890 | + $sth->execute(); |
|
| 891 | + } catch(PDOException $e) { |
|
| 892 | + return "error"; |
|
| 893 | + } |
|
| 894 | 894 | } |
| 895 | 895 | |
| 896 | - /** |
|
| 897 | - * Gets all the spotter information based on the callsign |
|
| 898 | - * |
|
| 899 | - * @return Array the spotter information |
|
| 900 | - * |
|
| 901 | - */ |
|
| 902 | - public function getSpotterDataByIdent($ident = '', $limit = '', $sort = '') |
|
| 903 | - { |
|
| 896 | + /** |
|
| 897 | + * Gets all the spotter information based on the callsign |
|
| 898 | + * |
|
| 899 | + * @return Array the spotter information |
|
| 900 | + * |
|
| 901 | + */ |
|
| 902 | + public function getSpotterDataByIdent($ident = '', $limit = '', $sort = '') |
|
| 903 | + { |
|
| 904 | 904 | $global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output"; |
| 905 | 905 | |
| 906 | 906 | date_default_timezone_set('UTC'); |
@@ -912,35 +912,35 @@ discard block |
||
| 912 | 912 | |
| 913 | 913 | if ($ident != "") |
| 914 | 914 | { |
| 915 | - if (!is_string($ident)) |
|
| 916 | - { |
|
| 915 | + if (!is_string($ident)) |
|
| 916 | + { |
|
| 917 | 917 | return false; |
| 918 | - } else { |
|
| 918 | + } else { |
|
| 919 | 919 | $additional_query = " AND (spotter_archive_output.ident = :ident)"; |
| 920 | 920 | $query_values = array(':ident' => $ident); |
| 921 | - } |
|
| 921 | + } |
|
| 922 | 922 | } |
| 923 | 923 | |
| 924 | 924 | if ($limit != "") |
| 925 | 925 | { |
| 926 | - $limit_array = explode(",", $limit); |
|
| 926 | + $limit_array = explode(",", $limit); |
|
| 927 | 927 | |
| 928 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 929 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 928 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 929 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 930 | 930 | |
| 931 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 932 | - { |
|
| 931 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 932 | + { |
|
| 933 | 933 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 934 | 934 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 935 | - } |
|
| 935 | + } |
|
| 936 | 936 | } |
| 937 | 937 | |
| 938 | 938 | if ($sort != "") |
| 939 | 939 | { |
| 940 | - $search_orderby_array = $Spotter->getOrderBy(); |
|
| 941 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 940 | + $search_orderby_array = $Spotter->getOrderBy(); |
|
| 941 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 942 | 942 | } else { |
| 943 | - $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 943 | + $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 944 | 944 | } |
| 945 | 945 | |
| 946 | 946 | $query = $global_query." WHERE spotter_archive_output.ident <> '' ".$additional_query." ".$orderby_query; |
@@ -948,16 +948,16 @@ discard block |
||
| 948 | 948 | $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
| 949 | 949 | |
| 950 | 950 | return $spotter_array; |
| 951 | - } |
|
| 952 | - |
|
| 953 | - /** |
|
| 954 | - * Gets all number of flight over countries |
|
| 955 | - * |
|
| 956 | - * @return Array the airline country list |
|
| 957 | - * |
|
| 958 | - */ |
|
| 959 | - public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 960 | - { |
|
| 951 | + } |
|
| 952 | + |
|
| 953 | + /** |
|
| 954 | + * Gets all number of flight over countries |
|
| 955 | + * |
|
| 956 | + * @return Array the airline country list |
|
| 957 | + * |
|
| 958 | + */ |
|
| 959 | + public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 960 | + { |
|
| 961 | 961 | global $globalDBdriver; |
| 962 | 962 | /* |
| 963 | 963 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
@@ -967,14 +967,14 @@ discard block |
||
| 967 | 967 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
| 968 | 968 | FROM countries c, spotter_archive s |
| 969 | 969 | WHERE c.iso2 = s.over_country "; |
| 970 | - if ($olderthanmonths > 0) { |
|
| 971 | - if ($globalDBdriver == 'mysql') { |
|
| 970 | + if ($olderthanmonths > 0) { |
|
| 971 | + if ($globalDBdriver == 'mysql') { |
|
| 972 | 972 | $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) '; |
| 973 | 973 | } else { |
| 974 | 974 | $query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 975 | 975 | } |
| 976 | 976 | } |
| 977 | - if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
| 977 | + if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
| 978 | 978 | $query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 979 | 979 | if ($limit) $query .= " LIMIT 0,10"; |
| 980 | 980 | |
@@ -987,23 +987,23 @@ discard block |
||
| 987 | 987 | |
| 988 | 988 | while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
| 989 | 989 | { |
| 990 | - $temp_array['flight_count'] = $row['nb']; |
|
| 991 | - $temp_array['flight_country'] = $row['name']; |
|
| 992 | - $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 993 | - $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 994 | - $flight_array[] = $temp_array; |
|
| 990 | + $temp_array['flight_count'] = $row['nb']; |
|
| 991 | + $temp_array['flight_country'] = $row['name']; |
|
| 992 | + $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 993 | + $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 994 | + $flight_array[] = $temp_array; |
|
| 995 | 995 | } |
| 996 | 996 | return $flight_array; |
| 997 | - } |
|
| 998 | - |
|
| 999 | - /** |
|
| 1000 | - * Gets last spotter information based on a particular callsign |
|
| 1001 | - * |
|
| 1002 | - * @return Array the spotter information |
|
| 1003 | - * |
|
| 1004 | - */ |
|
| 1005 | - public function getDateArchiveSpotterDataById($id,$date) |
|
| 1006 | - { |
|
| 997 | + } |
|
| 998 | + |
|
| 999 | + /** |
|
| 1000 | + * Gets last spotter information based on a particular callsign |
|
| 1001 | + * |
|
| 1002 | + * @return Array the spotter information |
|
| 1003 | + * |
|
| 1004 | + */ |
|
| 1005 | + public function getDateArchiveSpotterDataById($id,$date) |
|
| 1006 | + { |
|
| 1007 | 1007 | $Spotter = new Spotter($this->db); |
| 1008 | 1008 | date_default_timezone_set('UTC'); |
| 1009 | 1009 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
@@ -1011,16 +1011,16 @@ discard block |
||
| 1011 | 1011 | $date = date('c',$date); |
| 1012 | 1012 | $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date)); |
| 1013 | 1013 | return $spotter_array; |
| 1014 | - } |
|
| 1015 | - |
|
| 1016 | - /** |
|
| 1017 | - * Gets all the spotter information based on a particular callsign |
|
| 1018 | - * |
|
| 1019 | - * @return Array the spotter information |
|
| 1020 | - * |
|
| 1021 | - */ |
|
| 1022 | - public function getDateArchiveSpotterDataByIdent($ident,$date) |
|
| 1023 | - { |
|
| 1014 | + } |
|
| 1015 | + |
|
| 1016 | + /** |
|
| 1017 | + * Gets all the spotter information based on a particular callsign |
|
| 1018 | + * |
|
| 1019 | + * @return Array the spotter information |
|
| 1020 | + * |
|
| 1021 | + */ |
|
| 1022 | + public function getDateArchiveSpotterDataByIdent($ident,$date) |
|
| 1023 | + { |
|
| 1024 | 1024 | $Spotter = new Spotter($this->db); |
| 1025 | 1025 | date_default_timezone_set('UTC'); |
| 1026 | 1026 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
@@ -1028,16 +1028,16 @@ discard block |
||
| 1028 | 1028 | $date = date('c',$date); |
| 1029 | 1029 | $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
| 1030 | 1030 | return $spotter_array; |
| 1031 | - } |
|
| 1032 | - |
|
| 1033 | - /** |
|
| 1034 | - * Gets all the spotter information based on the airport |
|
| 1035 | - * |
|
| 1036 | - * @return Array the spotter information |
|
| 1037 | - * |
|
| 1038 | - */ |
|
| 1039 | - public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1040 | - { |
|
| 1031 | + } |
|
| 1032 | + |
|
| 1033 | + /** |
|
| 1034 | + * Gets all the spotter information based on the airport |
|
| 1035 | + * |
|
| 1036 | + * @return Array the spotter information |
|
| 1037 | + * |
|
| 1038 | + */ |
|
| 1039 | + public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1040 | + { |
|
| 1041 | 1041 | global $global_query; |
| 1042 | 1042 | $Spotter = new Spotter(); |
| 1043 | 1043 | date_default_timezone_set('UTC'); |
@@ -1048,35 +1048,35 @@ discard block |
||
| 1048 | 1048 | |
| 1049 | 1049 | if ($airport != "") |
| 1050 | 1050 | { |
| 1051 | - if (!is_string($airport)) |
|
| 1052 | - { |
|
| 1051 | + if (!is_string($airport)) |
|
| 1052 | + { |
|
| 1053 | 1053 | return false; |
| 1054 | - } else { |
|
| 1054 | + } else { |
|
| 1055 | 1055 | $additional_query .= " AND ((spotter_archive_output.departure_airport_icao = :airport) OR (spotter_archive_output.arrival_airport_icao = :airport))"; |
| 1056 | 1056 | $query_values = array(':airport' => $airport); |
| 1057 | - } |
|
| 1057 | + } |
|
| 1058 | 1058 | } |
| 1059 | 1059 | |
| 1060 | 1060 | if ($limit != "") |
| 1061 | 1061 | { |
| 1062 | - $limit_array = explode(",", $limit); |
|
| 1062 | + $limit_array = explode(",", $limit); |
|
| 1063 | 1063 | |
| 1064 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1065 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1064 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1065 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1066 | 1066 | |
| 1067 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1068 | - { |
|
| 1067 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1068 | + { |
|
| 1069 | 1069 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 1070 | 1070 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 1071 | - } |
|
| 1071 | + } |
|
| 1072 | 1072 | } |
| 1073 | 1073 | |
| 1074 | 1074 | if ($sort != "") |
| 1075 | 1075 | { |
| 1076 | - $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1077 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1076 | + $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1077 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1078 | 1078 | } else { |
| 1079 | - $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1079 | + $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1080 | 1080 | } |
| 1081 | 1081 | |
| 1082 | 1082 | $query = $global_query.$filter_query." spotter_archive_output.ident <> '' ".$additional_query." AND ((spotter_archive_output.departure_airport_icao <> 'NA') AND (spotter_archive_output.arrival_airport_icao <> 'NA')) ".$orderby_query; |
@@ -1084,6 +1084,6 @@ discard block |
||
| 1084 | 1084 | $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
| 1085 | 1085 | |
| 1086 | 1086 | return $spotter_array; |
| 1087 | - } |
|
| 1087 | + } |
|
| 1088 | 1088 | } |
| 1089 | 1089 | ?> |
| 1090 | 1090 | \ No newline at end of file |
@@ -36,12 +36,12 @@ discard block |
||
| 36 | 36 | <div id="showdetails" class="showdetails"></div> |
| 37 | 37 | <div id="infobox" class="infobox"><h4><?php echo _("Aircrafts detected"); ?></h4><br /><i class="fa fa-spinner fa-pulse fa-fw"></i></div> |
| 38 | 38 | <?php |
| 39 | - if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) { |
|
| 39 | + if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) { |
|
| 40 | 40 | |
| 41 | 41 | ?> |
| 42 | 42 | <script src="<?php echo $globalURL; ?>/js/map.3d.js.php"></script> |
| 43 | 43 | <?php |
| 44 | - } |
|
| 44 | + } |
|
| 45 | 45 | ?> |
| 46 | 46 | <div id="dialog" title="<?php echo _("Session has timed-out"); ?>"> |
| 47 | 47 | <p><?php echo _("In order to save data consumption web page times out after 30 minutes. Close this dialog to continue."); ?></p> |
@@ -55,34 +55,34 @@ discard block |
||
| 55 | 55 | <li><a href="#" onclick="getUserLocation(); return false;" title="<?php echo _("Plot your Location"); ?>"><i class="fa fa-map-marker"></i></a></li> |
| 56 | 56 | <li><a href="#" onclick="getCompassDirection(); return false;" title="<?php echo _("Compass Mode"); ?>"><i class="fa fa-compass"></i></a></li> |
| 57 | 57 | <?php |
| 58 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 58 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 59 | 59 | if (isset($globalArchive) && $globalArchive == TRUE) { |
| 60 | 60 | ?> |
| 61 | 61 | <li><a href="#archive" role="tab" title="<?php echo _("Archive"); ?>"><i class="fa fa-archive"></i></a></li> |
| 62 | 62 | <?php |
| 63 | 63 | } |
| 64 | - } |
|
| 64 | + } |
|
| 65 | 65 | ?> |
| 66 | 66 | <li><a href="#home" role="tab" title="<?php echo _("Layers"); ?>"><i class="fa fa-map"></i></a></li> |
| 67 | 67 | <li><a href="#filters" role="tab" title="<?php echo _("Filters"); ?>"><i class="fa fa-filter"></i></a></li> |
| 68 | 68 | <li><a href="#settings" role="tab" title="<?php echo _("Settings"); ?>"><i class="fa fa-gears"></i></a></li> |
| 69 | 69 | <?php |
| 70 | - if (isset($globalMap3D) && $globalMap3D) { |
|
| 70 | + if (isset($globalMap3D) && $globalMap3D) { |
|
| 71 | 71 | if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
| 72 | 72 | ?> |
| 73 | 73 | <li><a href="#" onclick="show3D(); return false;" role="tab" title="3D"><b>3D</b></a></li> |
| 74 | 74 | <?php |
| 75 | - } else { |
|
| 76 | - if (isset($globalMapSatellites) && $globalMapSatellites) { |
|
| 75 | + } else { |
|
| 76 | + if (isset($globalMapSatellites) && $globalMapSatellites) { |
|
| 77 | 77 | ?> |
| 78 | 78 | <li><a href="#satellites" role="tab" title="<?php echo _("Satellites"); ?>"><i class="satellite"></i></a></li> |
| 79 | 79 | <?php |
| 80 | - } |
|
| 80 | + } |
|
| 81 | 81 | ?> |
| 82 | 82 | <li><a href="#" onclick="show2D(); return false;" role="tab" title="2D"><b>2D</b></a></li> |
| 83 | 83 | <?php |
| 84 | 84 | } |
| 85 | - } |
|
| 85 | + } |
|
| 86 | 86 | ?> |
| 87 | 87 | </ul> |
| 88 | 88 | |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | ?> |
| 157 | 157 | </div> |
| 158 | 158 | <?php |
| 159 | - if (isset($globalArchive) && $globalArchive == TRUE) { |
|
| 159 | + if (isset($globalArchive) && $globalArchive == TRUE) { |
|
| 160 | 160 | ?> |
| 161 | 161 | <div class="sidebar-pane" id="archive"> |
| 162 | 162 | <h1 class="sidebar-header"><?php echo _("Playback"); ?> <i>Bêta</i><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | </form> |
| 217 | 217 | </div> |
| 218 | 218 | <?php |
| 219 | - } |
|
| 219 | + } |
|
| 220 | 220 | ?> |
| 221 | 221 | <div class="sidebar-pane" id="settings"> |
| 222 | 222 | <h1 class="sidebar-header"><?php echo _("Settings"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
@@ -227,56 +227,56 @@ discard block |
||
| 227 | 227 | <?php |
| 228 | 228 | if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider; |
| 229 | 229 | else $MapType = $_COOKIE['MapType']; |
| 230 | - ?> |
|
| 230 | + ?> |
|
| 231 | 231 | <?php |
| 232 | 232 | if (isset($globalBingMapKey) && $globalBingMapKey != '') { |
| 233 | - ?> |
|
| 233 | + ?> |
|
| 234 | 234 | <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option> |
| 235 | 235 | <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option> |
| 236 | 236 | <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option> |
| 237 | 237 | <?php |
| 238 | 238 | } |
| 239 | - ?> |
|
| 239 | + ?> |
|
| 240 | 240 | <?php |
| 241 | - if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
| 242 | - ?> |
|
| 241 | + if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
| 242 | + ?> |
|
| 243 | 243 | <?php |
| 244 | - if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') { |
|
| 245 | - ?> |
|
| 244 | + if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') { |
|
| 245 | + ?> |
|
| 246 | 246 | <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option> |
| 247 | 247 | <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option> |
| 248 | 248 | <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option> |
| 249 | 249 | <?php |
| 250 | - } |
|
| 251 | - ?> |
|
| 250 | + } |
|
| 251 | + ?> |
|
| 252 | 252 | <?php |
| 253 | - if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') { |
|
| 254 | - ?> |
|
| 253 | + if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') { |
|
| 254 | + ?> |
|
| 255 | 255 | <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option> |
| 256 | 256 | <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option> |
| 257 | 257 | <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option> |
| 258 | 258 | <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option> |
| 259 | 259 | <?php |
| 260 | - } |
|
| 261 | - ?> |
|
| 260 | + } |
|
| 261 | + ?> |
|
| 262 | 262 | <?php |
| 263 | - if (isset($globalMapQuestKey) && $globalMapQuestKey != '') { |
|
| 264 | - ?> |
|
| 263 | + if (isset($globalMapQuestKey) && $globalMapQuestKey != '') { |
|
| 264 | + ?> |
|
| 265 | 265 | <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option> |
| 266 | 266 | <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option> |
| 267 | 267 | <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option> |
| 268 | 268 | <?php |
| 269 | - } |
|
| 270 | - ?> |
|
| 269 | + } |
|
| 270 | + ?> |
|
| 271 | 271 | <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option> |
| 272 | 272 | <?php |
| 273 | 273 | } |
| 274 | - ?> |
|
| 274 | + ?> |
|
| 275 | 275 | <?php |
| 276 | - if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
|
| 276 | + if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
|
| 277 | 277 | if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default'; |
| 278 | 278 | else $MapBoxId = $_COOKIE['MapTypeId']; |
| 279 | - ?> |
|
| 279 | + ?> |
|
| 280 | 280 | <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option> |
| 281 | 281 | <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option> |
| 282 | 282 | <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option> |
@@ -290,13 +290,13 @@ discard block |
||
| 290 | 290 | <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option> |
| 291 | 291 | <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option> |
| 292 | 292 | <?php |
| 293 | - } |
|
| 294 | - ?> |
|
| 293 | + } |
|
| 294 | + ?> |
|
| 295 | 295 | <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option> |
| 296 | 296 | </select> |
| 297 | 297 | </li> |
| 298 | 298 | <?php |
| 299 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 299 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 300 | 300 | ?> |
| 301 | 301 | <li><?php echo _("Type of Terrain:"); ?> |
| 302 | 302 | <select class="selectpicker" onchange="terrainType(this);"> |
@@ -306,10 +306,10 @@ discard block |
||
| 306 | 306 | </select> |
| 307 | 307 | </li> |
| 308 | 308 | <?php |
| 309 | - } |
|
| 309 | + } |
|
| 310 | 310 | ?> |
| 311 | 311 | <?php |
| 312 | - if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
| 312 | + if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
| 313 | 313 | ?> |
| 314 | 314 | |
| 315 | 315 | <li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') print 'checked'; ?> ><?php echo _("Display flight info as popup"); ?></label></div></li> |
@@ -317,59 +317,59 @@ discard block |
||
| 317 | 317 | <li><div class="checkbox"><label><input type="checkbox" name="flightroute" value="1" onclick="clickFlightRoute(this)" <?php if ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == 'true') || !isset($_COOKIE['MapRoute'])) print 'checked'; ?> ><?php echo _("Display flight route on click"); ?></label></div></li> |
| 318 | 318 | <li><div class="checkbox"><label><input type="checkbox" name="flightestimation" value="1" onclick="clickFlightEstimation(this)" <?php if ((isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'true') || (!isset($_COOKIE['flightestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Planes animate between updates"); ?></label></div></li> |
| 319 | 319 | <?php |
| 320 | - } |
|
| 320 | + } |
|
| 321 | 321 | ?> |
| 322 | 322 | <li><div class="checkbox"><label><input type="checkbox" name="displayairports" value="1" onclick="clickDisplayAirports(this)" <?php if (isset($_COOKIE['displayairports']) && $_COOKIE['displayairports'] == 'true') print 'checked'; ?> ><?php echo _("Display airports on map"); ?></label></div></li> |
| 323 | 323 | <?php |
| 324 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 324 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 325 | 325 | ?> |
| 326 | 326 | <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) print 'checked'; ?> ><?php echo _("Show mini-map"); ?></label></div></li> |
| 327 | 327 | <?php |
| 328 | - } |
|
| 329 | - if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
|
| 328 | + } |
|
| 329 | + if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
|
| 330 | 330 | ?> |
| 331 | 331 | <li><div class="checkbox"><label><input type="checkbox" name="displaysanta" value="1" onclick="clickSanta(this)"><i class="fa fa-snowflake-o" aria-hidden="true"></i> <?php echo _("Show Santa Claus now"); ?> <i class="fa fa-snowflake-o" aria-hidden="true"></i></label></div></li> |
| 332 | 332 | <?php |
| 333 | - } |
|
| 333 | + } |
|
| 334 | 334 | ?> |
| 335 | 335 | |
| 336 | 336 | <?php |
| 337 | 337 | if (function_exists('array_column')) { |
| 338 | - if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
|
| 339 | - ?> |
|
| 338 | + if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
|
| 339 | + ?> |
|
| 340 | 340 | <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li> |
| 341 | 341 | <?php |
| 342 | - } |
|
| 342 | + } |
|
| 343 | 343 | } elseif (isset($globalSources)) { |
| 344 | - $dispolar = false; |
|
| 345 | - foreach ($globalSources as $testsource) { |
|
| 346 | - if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
| 347 | - } |
|
| 348 | - if ($dispolar) { |
|
| 349 | - ?> |
|
| 344 | + $dispolar = false; |
|
| 345 | + foreach ($globalSources as $testsource) { |
|
| 346 | + if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
| 347 | + } |
|
| 348 | + if ($dispolar) { |
|
| 349 | + ?> |
|
| 350 | 350 | <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li> |
| 351 | 351 | <?php |
| 352 | - } |
|
| 353 | - } |
|
| 354 | - ?> |
|
| 352 | + } |
|
| 353 | + } |
|
| 354 | + ?> |
|
| 355 | 355 | <?php |
| 356 | - if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
| 356 | + if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
| 357 | 357 | ?> |
| 358 | 358 | |
| 359 | 359 | <?php |
| 360 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 361 | - ?> |
|
| 360 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 361 | + ?> |
|
| 362 | 362 | <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') print 'checked'; ?> ><?php echo _("Aircraft icon color based on altitude"); ?></li> |
| 363 | 363 | <?php |
| 364 | 364 | if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') { |
| 365 | - ?> |
|
| 365 | + ?> |
|
| 366 | 366 | <li><?php echo _("Aircraft icon color:"); ?> |
| 367 | 367 | <input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print '1a3151'; ?>"> |
| 368 | 368 | </li> |
| 369 | 369 | <?php |
| 370 | - } |
|
| 371 | - } |
|
| 372 | - ?> |
|
| 370 | + } |
|
| 371 | + } |
|
| 372 | + ?> |
|
| 373 | 373 | <li><?php echo _("Show airport icon at zoom level:"); ?> |
| 374 | 374 | <div class="range"> |
| 375 | 375 | <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?>"> |
@@ -377,7 +377,7 @@ discard block |
||
| 377 | 377 | </div> |
| 378 | 378 | </li> |
| 379 | 379 | <?php |
| 380 | - } |
|
| 380 | + } |
|
| 381 | 381 | ?> |
| 382 | 382 | <li><?php echo _("Distance unit:"); ?> |
| 383 | 383 | <select class="selectpicker" onchange="unitdistance(this);"> |
@@ -410,16 +410,16 @@ discard block |
||
| 410 | 410 | <ul> |
| 411 | 411 | <?php |
| 412 | 412 | if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) { |
| 413 | - ?> |
|
| 413 | + ?> |
|
| 414 | 414 | <?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) print 'checked'; ?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?> |
| 415 | 415 | <?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) print 'checked'; ?> ><?php echo _("Display IVAO data"); ?></li><?php } ?> |
| 416 | 416 | <?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') || !isset($_COOKIE['ShowVMS'])) print 'checked'; ?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?> |
| 417 | 417 | <?php |
| 418 | 418 | } |
| 419 | - ?> |
|
| 419 | + ?> |
|
| 420 | 420 | <?php |
| 421 | 421 | if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) { |
| 422 | - ?> |
|
| 422 | + ?> |
|
| 423 | 423 | <?php if (isset($globalSBS1) && $globalSBS1) { ?> |
| 424 | 424 | <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) print 'checked'; ?> ><?php echo _("Display ADS-B data"); ?></label></div></li> |
| 425 | 425 | <?php } ?> |
@@ -428,7 +428,7 @@ discard block |
||
| 428 | 428 | <?php } ?> |
| 429 | 429 | <?php |
| 430 | 430 | } |
| 431 | - ?> |
|
| 431 | + ?> |
|
| 432 | 432 | <li><?php echo _("Display airlines:"); ?> |
| 433 | 433 | <br/> |
| 434 | 434 | <select class="selectpicker" multiple onchange="airlines(this);" id="display_airlines"> |
@@ -448,12 +448,12 @@ discard block |
||
| 448 | 448 | echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>'; |
| 449 | 449 | } |
| 450 | 450 | } |
| 451 | - ?> |
|
| 451 | + ?> |
|
| 452 | 452 | </select> |
| 453 | 453 | </li> |
| 454 | 454 | <?php |
| 455 | 455 | if (isset($globalAPRS) && $globalAPRS) { |
| 456 | - ?> |
|
| 456 | + ?> |
|
| 457 | 457 | <li><?php echo _("Display APRS sources name:"); ?> |
| 458 | 458 | <select class="selectpicker" multiple onchange="sources(this);"> |
| 459 | 459 | <?php |
@@ -465,15 +465,15 @@ discard block |
||
| 465 | 465 | echo '<option value="'.$source['source_name'].'">'.$source['source_name'].'</option>'; |
| 466 | 466 | } |
| 467 | 467 | } |
| 468 | - ?> |
|
| 468 | + ?> |
|
| 469 | 469 | </select> |
| 470 | 470 | </li> |
| 471 | 471 | <?php |
| 472 | 472 | } |
| 473 | - ?> |
|
| 473 | + ?> |
|
| 474 | 474 | <?php |
| 475 | 475 | if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) { |
| 476 | - ?> |
|
| 476 | + ?> |
|
| 477 | 477 | <li><?php echo _("Display airlines of type:"); ?><br/> |
| 478 | 478 | <select class="selectpicker" onchange="airlinestype(this);"> |
| 479 | 479 | <option value="all"<?php if (!isset($_COOKIE['airlinestype']) || $_COOKIE['airlinestype'] == 'all' || $_COOKIE['airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option> |
@@ -484,7 +484,7 @@ discard block |
||
| 484 | 484 | </li> |
| 485 | 485 | <?php |
| 486 | 486 | } |
| 487 | - ?> |
|
| 487 | + ?> |
|
| 488 | 488 | <li> |
| 489 | 489 | <?php echo _("Display flight with ident:"); ?> |
| 490 | 490 | <input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['identfilter'])) print $_COOKIE['identfilter']; ?>" /> |
@@ -497,7 +497,7 @@ discard block |
||
| 497 | 497 | </form> |
| 498 | 498 | </div> |
| 499 | 499 | <?php |
| 500 | - if (isset($globalMapSatellites) && $globalMapSatellites && isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 500 | + if (isset($globalMapSatellites) && $globalMapSatellites && isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 501 | 501 | ?> |
| 502 | 502 | <div class="sidebar-pane" id="satellites"> |
| 503 | 503 | <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
@@ -537,14 +537,14 @@ discard block |
||
| 537 | 537 | print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>'; |
| 538 | 538 | } |
| 539 | 539 | } |
| 540 | - ?> |
|
| 540 | + ?> |
|
| 541 | 541 | </select> |
| 542 | 542 | </li> |
| 543 | 543 | </ul> |
| 544 | 544 | </form> |
| 545 | 545 | </div> |
| 546 | 546 | <?php |
| 547 | - } |
|
| 547 | + } |
|
| 548 | 548 | ?> |
| 549 | 549 | </div> |
| 550 | 550 | </div> |
