Ysurac /
FlightAirMap
@@ -42,7 +42,9 @@ discard block |
||
| 42 | 42 | } |
| 43 | 43 | $Stats = new Stats(); |
| 44 | 44 | $airline_names = $Stats->getAllAirlineNames(); |
| 45 | - if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames(); |
|
| 45 | + if (empty($airline_names)) { |
|
| 46 | + $airline_names = $Spotter->getAllAirlineNames(); |
|
| 47 | + } |
|
| 46 | 48 | foreach($airline_names as $airline_name) |
| 47 | 49 | { |
| 48 | 50 | if($airline == $airline_name['airline_icao']) |
@@ -65,8 +67,7 @@ discard block |
||
| 65 | 67 | if ($globalIVAO && @getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.gif')) |
| 66 | 68 | { |
| 67 | 69 | print '<img src="'.$globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.gif" alt="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" title="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" class="logo" />'; |
| 68 | - } |
|
| 69 | - elseif (@getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png')) |
|
| 70 | + } elseif (@getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png')) |
|
| 70 | 71 | { |
| 71 | 72 | print '<img src="'.$globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png" alt="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" title="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" class="logo" />'; |
| 72 | 73 | } |
@@ -7,21 +7,21 @@ discard block |
||
| 7 | 7 | header('Location: '.$globalURL.'/airline'); |
| 8 | 8 | die(); |
| 9 | 9 | } |
| 10 | -$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
|
| 10 | +$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING); |
|
| 11 | 11 | $Spotter = new Spotter(); |
| 12 | 12 | $alliance = false; |
| 13 | -if (strpos($airline,'alliance_') !== FALSE) { |
|
| 13 | +if (strpos($airline, 'alliance_') !== FALSE) { |
|
| 14 | 14 | $alliance = true; |
| 15 | 15 | } else { |
| 16 | - $spotter_array = $Spotter->getSpotterDataByAirline($airline,"0,1",""); |
|
| 16 | + $spotter_array = $Spotter->getSpotterDataByAirline($airline, "0,1", ""); |
|
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | if (!empty($spotter_array) || $alliance === true) |
| 20 | 20 | { |
| 21 | 21 | if ($alliance) { |
| 22 | - $title = sprintf(_("Most Common Aircraft Manufacturer from %s"),str_replace('_',' ',str_replace('alliance_','',$airline))); |
|
| 22 | + $title = sprintf(_("Most Common Aircraft Manufacturer from %s"), str_replace('_', ' ', str_replace('alliance_', '', $airline))); |
|
| 23 | 23 | } else { |
| 24 | - $title = sprintf(_("Most Common Aircraft Manufacturer from %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']); |
|
| 24 | + $title = sprintf(_("Most Common Aircraft Manufacturer from %s (%s)"), $spotter_array[0]['airline_name'], $spotter_array[0]['airline_icao']); |
|
| 25 | 25 | } |
| 26 | 26 | require_once('header.php'); |
| 27 | 27 | print '<div class="select-item">'; |
@@ -31,10 +31,10 @@ discard block |
||
| 31 | 31 | $alliances = $Spotter->getAllAllianceNames(); |
| 32 | 32 | if (!empty($alliances)) { |
| 33 | 33 | foreach ($alliances as $al) { |
| 34 | - if ($alliance && str_replace('_',' ',str_replace('alliance_','',$airline)) == $al['alliance']) { |
|
| 35 | - print '<option value="'.str_replace(' ','_',$al['alliance']).'" selected>'.$al['alliance'].'</option>'; |
|
| 34 | + if ($alliance && str_replace('_', ' ', str_replace('alliance_', '', $airline)) == $al['alliance']) { |
|
| 35 | + print '<option value="'.str_replace(' ', '_', $al['alliance']).'" selected>'.$al['alliance'].'</option>'; |
|
| 36 | 36 | } else { |
| 37 | - print '<option value="'.str_replace(' ','_',$al['alliance']).'">'.$al['alliance'].'</option>'; |
|
| 37 | + print '<option value="'.str_replace(' ', '_', $al['alliance']).'">'.$al['alliance'].'</option>'; |
|
| 38 | 38 | } |
| 39 | 39 | } |
| 40 | 40 | print '<option disabled>───────────────────</option>'; |
@@ -42,9 +42,9 @@ discard block |
||
| 42 | 42 | $Stats = new Stats(); |
| 43 | 43 | $airline_names = $Stats->getAllAirlineNames(); |
| 44 | 44 | if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames(); |
| 45 | - foreach($airline_names as $airline_name) |
|
| 45 | + foreach ($airline_names as $airline_name) |
|
| 46 | 46 | { |
| 47 | - if($airline == $airline_name['airline_icao']) |
|
| 47 | + if ($airline == $airline_name['airline_icao']) |
|
| 48 | 48 | { |
| 49 | 49 | print '<option value="'.$airline_name['airline_icao'].'" selected="selected">'.$airline_name['airline_name'].' ('.$airline_name['airline_icao'].')</option>'; |
| 50 | 50 | } else { |
@@ -78,12 +78,12 @@ discard block |
||
| 78 | 78 | print '</div>'; |
| 79 | 79 | } else { |
| 80 | 80 | print '<div class="info column">'; |
| 81 | - print '<h1>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</h1>'; |
|
| 82 | - if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png') || @getimagesize('images/airlines/'.str_replace('alliance_','',$airline).'.png')) |
|
| 81 | + print '<h1>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</h1>'; |
|
| 82 | + if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png') || @getimagesize('images/airlines/'.str_replace('alliance_', '', $airline).'.png')) |
|
| 83 | 83 | { |
| 84 | - print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png" alt="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" title="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" class="logo" />'; |
|
| 84 | + print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png" alt="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" title="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" class="logo" />'; |
|
| 85 | 85 | } |
| 86 | - print '<div><span class="label">'._("Name").'</span>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</div>'; |
|
| 86 | + print '<div><span class="label">'._("Name").'</span>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</div>'; |
|
| 87 | 87 | print '</div>'; |
| 88 | 88 | } |
| 89 | 89 | } else { |
@@ -94,16 +94,16 @@ discard block |
||
| 94 | 94 | print '<div class="column">'; |
| 95 | 95 | print '<h2>'._("Most Common Aircraft Manufacturer").'</h2>'; |
| 96 | 96 | if ($alliance) { |
| 97 | - print '<p>'.sprintf(_("The statistic below shows the most common Aircraft Manufacturer of flights from <strong>%s</strong>."),str_replace('_',' ',str_replace('alliance_','',$airline))).'</p>'; |
|
| 97 | + print '<p>'.sprintf(_("The statistic below shows the most common Aircraft Manufacturer of flights from <strong>%s</strong>."), str_replace('_', ' ', str_replace('alliance_', '', $airline))).'</p>'; |
|
| 98 | 98 | } else { |
| 99 | - print '<p>'.sprintf(_("The statistic below shows the most common Aircraft Manufacturer of flights from <strong>%s</strong>."),$spotter_array[0]['airline_name']).'</p>'; |
|
| 99 | + print '<p>'.sprintf(_("The statistic below shows the most common Aircraft Manufacturer of flights from <strong>%s</strong>."), $spotter_array[0]['airline_name']).'</p>'; |
|
| 100 | 100 | } |
| 101 | 101 | if ($alliance) { |
| 102 | - $manufacturers_array = $Spotter->countAllAircraftManufacturerByAirline('',array('alliance' => str_replace('_',' ',str_replace('alliance_','',$airline)))); |
|
| 102 | + $manufacturers_array = $Spotter->countAllAircraftManufacturerByAirline('', array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $airline)))); |
|
| 103 | 103 | } else { |
| 104 | 104 | $manufacturers_array = $Spotter->countAllAircraftManufacturerByAirline($airline); |
| 105 | 105 | } |
| 106 | - $manufacturers_array = $Stats->countAllAircraftManufacturers(true,$airline); |
|
| 106 | + $manufacturers_array = $Stats->countAllAircraftManufacturers(true, $airline); |
|
| 107 | 107 | if (!empty($manufacturers_array)) |
| 108 | 108 | { |
| 109 | 109 | print '<div class="table-responsive">'; |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | print '</thead>'; |
| 117 | 117 | print '<tbody>'; |
| 118 | 118 | $i = 1; |
| 119 | - foreach($manufacturers_array as $manufacturer_item) |
|
| 119 | + foreach ($manufacturers_array as $manufacturer_item) |
|
| 120 | 120 | { |
| 121 | 121 | print '<tr>'; |
| 122 | 122 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -7,7 +7,7 @@ discard block |
||
| 7 | 7 | $Spotter = new Spotter(); |
| 8 | 8 | $orderby = $Spotter->getOrderBy(); |
| 9 | 9 | |
| 10 | -$ask = filter_input(INPUT_GET,'ask',FILTER_SANITIZE_STRING); |
|
| 10 | +$ask = filter_input(INPUT_GET, 'ask', FILTER_SANITIZE_STRING); |
|
| 11 | 11 | if ($ask == 'aircraftsdetected') { |
| 12 | 12 | require_once('require/class.SpotterLive.php'); |
| 13 | 13 | $SpotterLive = new SpotterLive(); |
@@ -27,16 +27,16 @@ discard block |
||
| 27 | 27 | $manufacturers = $Stats->getAllManufacturers(); |
| 28 | 28 | if (empty($manufacturers)) $manufacturers = $Spotter->getAllManufacturers(); |
| 29 | 29 | $all_manufacturers = array(); |
| 30 | - foreach($manufacturers as $manufacturer) |
|
| 30 | + foreach ($manufacturers as $manufacturer) |
|
| 31 | 31 | { |
| 32 | - $all_manufacturers[] = array('value' => $manufacturer['aircraft_manufacturer'], 'id' => strtolower(str_replace(' ','-',$manufacturer['aircraft_manufacturer']))); |
|
| 32 | + $all_manufacturers[] = array('value' => $manufacturer['aircraft_manufacturer'], 'id' => strtolower(str_replace(' ', '-', $manufacturer['aircraft_manufacturer']))); |
|
| 33 | 33 | } |
| 34 | 34 | echo json_encode($all_manufacturers); |
| 35 | 35 | } elseif ($ask == 'aircrafttypes') { |
| 36 | 36 | $aircraft_types = $Stats->getAllAircraftTypes(); |
| 37 | 37 | if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes(); |
| 38 | 38 | $all_aircraft_types = array(); |
| 39 | - foreach($aircraft_types as $aircraft_type) |
|
| 39 | + foreach ($aircraft_types as $aircraft_type) |
|
| 40 | 40 | { |
| 41 | 41 | $all_aircraft_types[] = array('id' => $aircraft_type['aircraft_icao'], 'value' => $aircraft_type['aircraft_name'].' ('.$aircraft_type['aircraft_icao'].')'); |
| 42 | 42 | } |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | } elseif ($ask == 'airlinenames') { |
| 45 | 45 | $airline_names = $Stats->getAllAirlineNames(); |
| 46 | 46 | $all_airline_names = array(); |
| 47 | - foreach($airline_names as $airline_name) |
|
| 47 | + foreach ($airline_names as $airline_name) |
|
| 48 | 48 | { |
| 49 | 49 | $all_airline_names[] = array('id' => $airline_name['airline_icao'], 'value' => $airline_name['airline_name'].' ('.$airline_name['airline_icao'].')'); |
| 50 | 50 | } |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | } elseif ($ask == 'airlinecountries') { |
| 53 | 53 | $airline_countries = $Spotter->getAllAirlineCountries(); |
| 54 | 54 | $all_airline_countries = array(); |
| 55 | - foreach($airline_countries as $airline_country) |
|
| 55 | + foreach ($airline_countries as $airline_country) |
|
| 56 | 56 | { |
| 57 | 57 | $all_airline_countries[] = array('id' => $airline_country['airline_country'], 'value' => $airline_country['airline_country']); |
| 58 | 58 | } |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames(); |
| 63 | 63 | ksort($airport_names); |
| 64 | 64 | $all_airport_names = array(); |
| 65 | - foreach($airport_names as $airport_name) |
|
| 65 | + foreach ($airport_names as $airport_name) |
|
| 66 | 66 | { |
| 67 | 67 | $all_airport_names[] = array('id' => $airport_name['airport_icao'], 'value' => $airport_name['airport_city'].', '.$airport_name['airport_name'].', '.$airport_name['airport_country'].' ('.$airport_name['airport_icao'].')'); |
| 68 | 68 | } |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | } elseif ($ask == 'airportcountries') { |
| 71 | 71 | $airport_countries = $Spotter->getAllAirportCountries(); |
| 72 | 72 | $all_airport_countries = array(); |
| 73 | - foreach($airport_countries as $airport_country) |
|
| 73 | + foreach ($airport_countries as $airport_country) |
|
| 74 | 74 | { |
| 75 | 75 | $all_airport_countries[] = array('id' => $airport_country['airport_country'], 'value' => $airport_country['airport_country']); |
| 76 | 76 | } |
@@ -25,7 +25,9 @@ discard block |
||
| 25 | 25 | echo json_encode($marinecnt); |
| 26 | 26 | } elseif ($ask == 'manufacturer') { |
| 27 | 27 | $manufacturers = $Stats->getAllManufacturers(); |
| 28 | - if (empty($manufacturers)) $manufacturers = $Spotter->getAllManufacturers(); |
|
| 28 | + if (empty($manufacturers)) { |
|
| 29 | + $manufacturers = $Spotter->getAllManufacturers(); |
|
| 30 | + } |
|
| 29 | 31 | $all_manufacturers = array(); |
| 30 | 32 | foreach($manufacturers as $manufacturer) |
| 31 | 33 | { |
@@ -34,7 +36,9 @@ discard block |
||
| 34 | 36 | echo json_encode($all_manufacturers); |
| 35 | 37 | } elseif ($ask == 'aircrafttypes') { |
| 36 | 38 | $aircraft_types = $Stats->getAllAircraftTypes(); |
| 37 | - if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes(); |
|
| 39 | + if (empty($aircraft_types)) { |
|
| 40 | + $aircraft_types = $Spotter->getAllAircraftTypes(); |
|
| 41 | + } |
|
| 38 | 42 | $all_aircraft_types = array(); |
| 39 | 43 | foreach($aircraft_types as $aircraft_type) |
| 40 | 44 | { |
@@ -59,7 +63,9 @@ discard block |
||
| 59 | 63 | echo json_encode($all_airline_countries); |
| 60 | 64 | } elseif ($ask == 'airportnames' || $ask == 'departureairportnames' || $ask == 'arrivalairportnames') { |
| 61 | 65 | $airport_names = $Stats->getAllAirportNames(); |
| 62 | - if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames(); |
|
| 66 | + if (empty($airport_names)) { |
|
| 67 | + $airport_names = $Spotter->getAllAirportNames(); |
|
| 68 | + } |
|
| 63 | 69 | ksort($airport_names); |
| 64 | 70 | $all_airport_names = array(); |
| 65 | 71 | foreach($airport_names as $airport_name) |
@@ -36,8 +36,10 @@ discard block |
||
| 36 | 36 | $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".date("Y-m-d",strtotime($_GET['end_date']))." 00:00:00"; |
| 37 | 37 | $sql_date = $end_date; |
| 38 | 38 | } |
| 39 | - } else $sql_date = ''; |
|
| 40 | -} |
|
| 39 | + } else { |
|
| 40 | + $sql_date = ''; |
|
| 41 | + } |
|
| 42 | + } |
|
| 41 | 43 | |
| 42 | 44 | if (isset($_GET['highest_altitude'])) { |
| 43 | 45 | //for altitude manipulation |
@@ -51,8 +53,12 @@ discard block |
||
| 51 | 53 | } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){ |
| 52 | 54 | $start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT).",60000"; |
| 53 | 55 | $sql_altitude = $start_altitude; |
| 54 | - } else $sql_altitude = ''; |
|
| 55 | -} else $sql_altitude = ''; |
|
| 56 | + } else { |
|
| 57 | + $sql_altitude = ''; |
|
| 58 | + } |
|
| 59 | + } else { |
|
| 60 | + $sql_altitude = ''; |
|
| 61 | +} |
|
| 56 | 62 | |
| 57 | 63 | //calculuation for the pagination |
| 58 | 64 | if(!isset($_GET['limit'])) |
@@ -70,7 +76,7 @@ discard block |
||
| 70 | 76 | $limit_end = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT); |
| 71 | 77 | $absolute_difference = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT); |
| 72 | 78 | } |
| 73 | -} else { |
|
| 79 | +} else { |
|
| 74 | 80 | $limit_explode = explode(",", $_GET['limit']); |
| 75 | 81 | $limit_start = filter_var($limit_explode[0],FILTER_SANITIZE_NUMBER_INT); |
| 76 | 82 | $limit_end = filter_var($limit_explode[1],FILTER_SANITIZE_NUMBER_INT); |
@@ -103,10 +109,15 @@ discard block |
||
| 103 | 109 | $origlon = filter_input(INPUT_GET,'origlon',FILTER_SANITIZE_NUMBER_FLOAT); |
| 104 | 110 | $dist = filter_input(INPUT_GET,'dist',FILTER_SANITIZE_NUMBER_INT); |
| 105 | 111 | if ($dist != '') { |
| 106 | - if (isset($globalDistanceUnit) && $globalDistanceUnit == 'mi') $dist = $dist*1.60934; |
|
| 107 | - elseif (isset($globalDistanceUnit) && $globalDistanceUnit == 'nm') $dist = $dist*1.852; |
|
| 112 | + if (isset($globalDistanceUnit) && $globalDistanceUnit == 'mi') { |
|
| 113 | + $dist = $dist*1.60934; |
|
| 114 | + } elseif (isset($globalDistanceUnit) && $globalDistanceUnit == 'nm') { |
|
| 115 | + $dist = $dist*1.852; |
|
| 116 | + } |
|
| 117 | + } |
|
| 118 | + if (!isset($sql_date)) { |
|
| 119 | + $sql_date = ''; |
|
| 108 | 120 | } |
| 109 | - if (!isset($sql_date)) $sql_date = ''; |
|
| 110 | 121 | if ($archive == 1) { |
| 111 | 122 | $SpotterArchive = new SpotterArchive(); |
| 112 | 123 | $spotter_array = $SpotterArchive->searchSpotterData($q,$registration,$aircraft,strtolower(str_replace("-", " ", $manufacturer)),$highlights,$airline,$airline_country,$airline_type,$airport,$airport_country,$callsign,$departure_airport_route,$arrival_airport_route,$owner,$pilot_id,$pilot_name,$sql_altitude,$sql_date,$limit_start.",".$absolute_difference,$sort,'',$origlat,$origlon,$dist); |
@@ -174,7 +185,10 @@ discard block |
||
| 174 | 185 | if (isset($_GET['aircraft']) && $_GET['aircraft'] != ""){ print _("Aircraft:").' <span>'.$aircraft.'</span> '; } |
| 175 | 186 | if (isset($_GET['manufacturer']) && $_GET['manufacturer'] != ""){ print _("Manufacturer:").' <span>'.$manufacturer.'</span> '; } |
| 176 | 187 | if (isset($_GET['registration']) && $_GET['registration'] != ""){ print _("Registration:").' <span>'.$registration.'</span> '; } |
| 177 | - if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print _("Highlights:").' <span>'.$highlights.'</span> '; } |
|
| 188 | + if (isset($_GET['highlights'])) { |
|
| 189 | + if ($_GET['highlights'] == "true"){ print _("Highlights:").' <span>'.$highlights.'</span> '; |
|
| 190 | + } |
|
| 191 | + } |
|
| 178 | 192 | if (isset($_GET['airline']) && $_GET['airline'] != ""){ print _("Airline:").' <span>'.$airline.'</span> '; } |
| 179 | 193 | if (isset($_GET['airline_country']) && $_GET['airline_country'] != ""){ print _("Airline country:").' <span>'.$airline_country.'</span> '; } |
| 180 | 194 | if (isset($_GET['airline_type']) && $_GET['airline_type'] != ""){ print _("Airline type:").' <span>'.$airline_type.'</span> '; } |
@@ -285,7 +299,10 @@ discard block |
||
| 285 | 299 | <div class="form-group"> |
| 286 | 300 | <label class="control-label col-sm-2"><?php echo _("Keywords"); ?></label> |
| 287 | 301 | <div class="col-sm-10"> |
| 288 | - <input type="text" class="form-control" id="q" name="q" value="<?php if (isset($_GET['q'])) print $q; ?>" size="10" placeholder="<?php echo _("Keywords"); ?>" /> |
|
| 302 | + <input type="text" class="form-control" id="q" name="q" value="<?php if (isset($_GET['q'])) { |
|
| 303 | + print $q; |
|
| 304 | +} |
|
| 305 | +?>" size="10" placeholder="<?php echo _("Keywords"); ?>" /> |
|
| 289 | 306 | </div> |
| 290 | 307 | </div> |
| 291 | 308 | </fieldset> |
@@ -300,7 +317,10 @@ discard block |
||
| 300 | 317 | </select> |
| 301 | 318 | </div> |
| 302 | 319 | </div> |
| 303 | - <script type="text/javascript">getSelect('manufacturer','<?php if(isset($_GET['manufacturer'])) print $manufacturer; ?>')</script> |
|
| 320 | + <script type="text/javascript">getSelect('manufacturer','<?php if(isset($_GET['manufacturer'])) { |
|
| 321 | + print $manufacturer; |
|
| 322 | +} |
|
| 323 | +?>')</script> |
|
| 304 | 324 | <div class="form-group"> |
| 305 | 325 | <label class="control-label col-sm-2"><?php echo _("Type"); ?></label> |
| 306 | 326 | <div class="col-sm-10"> |
@@ -309,11 +329,17 @@ discard block |
||
| 309 | 329 | </select> |
| 310 | 330 | </div> |
| 311 | 331 | </div> |
| 312 | - <script type="text/javascript">getSelect('aircrafttypes','<?php if(isset($_GET['aircraft_icao'])) print $aircraft_icao; ?>');</script> |
|
| 332 | + <script type="text/javascript">getSelect('aircrafttypes','<?php if(isset($_GET['aircraft_icao'])) { |
|
| 333 | + print $aircraft_icao; |
|
| 334 | +} |
|
| 335 | +?>');</script> |
|
| 313 | 336 | <div class="form-group"> |
| 314 | 337 | <label class="control-label col-sm-2"><?php echo _("Registration"); ?></label> |
| 315 | 338 | <div class="col-sm-10"> |
| 316 | - <input type="text" class="form-control" name="registration" value="<?php if (isset($_GET['registration'])) print $registration; ?>" size="8" placeholder="<?php echo _("Registration"); ?>" /> |
|
| 339 | + <input type="text" class="form-control" name="registration" value="<?php if (isset($_GET['registration'])) { |
|
| 340 | + print $registration; |
|
| 341 | +} |
|
| 342 | +?>" size="8" placeholder="<?php echo _("Registration"); ?>" /> |
|
| 317 | 343 | </div> |
| 318 | 344 | </div> |
| 319 | 345 | <?php |
@@ -322,22 +348,31 @@ discard block |
||
| 322 | 348 | <div class="form-group"> |
| 323 | 349 | <label class="control-label col-sm-2"><?php echo _("Pilot id"); ?></label> |
| 324 | 350 | <div class="col-sm-10"> |
| 325 | - <input type="text" class="form-control" name="pilot_id" value="<?php if (isset($_GET['pilot_id'])) print $pilot_id; ?>" size="15" placeholder="<?php echo _("Pilot id"); ?>" /> |
|
| 351 | + <input type="text" class="form-control" name="pilot_id" value="<?php if (isset($_GET['pilot_id'])) { |
|
| 352 | + print $pilot_id; |
|
| 353 | +} |
|
| 354 | +?>" size="15" placeholder="<?php echo _("Pilot id"); ?>" /> |
|
| 326 | 355 | </div> |
| 327 | 356 | </div> |
| 328 | 357 | <div class="form-group"> |
| 329 | 358 | <label class="control-label col-sm-2"><?php echo _("Pilot name"); ?></label> |
| 330 | 359 | <div class="col-sm-10"> |
| 331 | - <input type="text" class="form-control" name="pilot_name" value="<?php if (isset($_GET['pilot_name'])) print $pilot_name; ?>" size="15" placeholder="<?php echo _("Pilot name"); ?>" /> |
|
| 360 | + <input type="text" class="form-control" name="pilot_name" value="<?php if (isset($_GET['pilot_name'])) { |
|
| 361 | + print $pilot_name; |
|
| 362 | +} |
|
| 363 | +?>" size="15" placeholder="<?php echo _("Pilot name"); ?>" /> |
|
| 332 | 364 | </div> |
| 333 | 365 | </div> |
| 334 | 366 | <?php |
| 335 | -}else { |
|
| 367 | +} else { |
|
| 336 | 368 | ?> |
| 337 | 369 | <div class="form-group"> |
| 338 | 370 | <label class="control-label col-sm-2"><?php echo _("Owner name"); ?></label> |
| 339 | 371 | <div class="col-sm-10"> |
| 340 | - <input type="text" class="form-control" name="owner" value="<?php if (isset($_GET['owner'])) print $owner; ?>" size="15" placeholder="<?php echo _("Owner name"); ?>" /> |
|
| 372 | + <input type="text" class="form-control" name="owner" value="<?php if (isset($_GET['owner'])) { |
|
| 373 | + print $owner; |
|
| 374 | +} |
|
| 375 | +?>" size="15" placeholder="<?php echo _("Owner name"); ?>" /> |
|
| 341 | 376 | </div> |
| 342 | 377 | </div> |
| 343 | 378 | <?php |
@@ -345,8 +380,14 @@ discard block |
||
| 345 | 380 | ?> |
| 346 | 381 | <div class="form-group"> |
| 347 | 382 | <div class="col-sm-offset-2 col-sm-10"> |
| 348 | - <!--<div><input type="checkbox" class="form-control" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print 'checked="checked"'; } ?>> <label for="highlights"><?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label></div>--> |
|
| 349 | - <label class="checkbox-inline"><input type="checkbox" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print 'checked="checked"'; } ?>> <?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label> |
|
| 383 | + <!--<div><input type="checkbox" class="form-control" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) { |
|
| 384 | + if ($_GET['highlights'] == "true"){ print 'checked="checked"'; |
|
| 385 | +} |
|
| 386 | +} ?>> <label for="highlights"><?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label></div>--> |
|
| 387 | + <label class="checkbox-inline"><input type="checkbox" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) { |
|
| 388 | + if ($_GET['highlights'] == "true"){ print 'checked="checked"'; |
|
| 389 | +} |
|
| 390 | +} ?>> <?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label> |
|
| 350 | 391 | </div> |
| 351 | 392 | </div> |
| 352 | 393 | </fieldset> |
@@ -360,7 +401,10 @@ discard block |
||
| 360 | 401 | </select> |
| 361 | 402 | </div> |
| 362 | 403 | </div> |
| 363 | - <script type="text/javascript">getSelect('airlinenames','<?php if(isset($_GET['airline'])) print $airline; ?>');</script> |
|
| 404 | + <script type="text/javascript">getSelect('airlinenames','<?php if(isset($_GET['airline'])) { |
|
| 405 | + print $airline; |
|
| 406 | +} |
|
| 407 | +?>');</script> |
|
| 364 | 408 | <div class="form-group"> |
| 365 | 409 | <label class="control-label col-sm-2"><?php echo _("Country"); ?></label> |
| 366 | 410 | <div class="col-sm-10"> |
@@ -369,19 +413,34 @@ discard block |
||
| 369 | 413 | </select> |
| 370 | 414 | </div> |
| 371 | 415 | </div> |
| 372 | - <script type="text/javascript">getSelect('airlinecountries','<?php if(isset($_GET['airline_country'])) print $airline_country; ?>');</script> |
|
| 416 | + <script type="text/javascript">getSelect('airlinecountries','<?php if(isset($_GET['airline_country'])) { |
|
| 417 | + print $airline_country; |
|
| 418 | +} |
|
| 419 | +?>');</script> |
|
| 373 | 420 | <div class="form-group"> |
| 374 | 421 | <label class="control-label col-sm-2"><?php echo _("Callsign"); ?></label> |
| 375 | 422 | <div class="col-sm-10"> |
| 376 | - <input type="text" name="callsign" class="form-control" value="<?php if (isset($_GET['callsign'])) print $callsign; ?>" size="8" placeholder="<?php echo _("Callsign"); ?>" /> |
|
| 423 | + <input type="text" name="callsign" class="form-control" value="<?php if (isset($_GET['callsign'])) { |
|
| 424 | + print $callsign; |
|
| 425 | +} |
|
| 426 | +?>" size="8" placeholder="<?php echo _("Callsign"); ?>" /> |
|
| 377 | 427 | </div> |
| 378 | 428 | </div> |
| 379 | 429 | <div class="form-group"> |
| 380 | 430 | <div class="col-sm-offset-2 col-sm-10"> |
| 381 | 431 | <label class="radio-inline"><input type="radio" name="airline_type" value="all" id="airline_type_all" <?php if (!isset($_GET['airline_type']) || $_GET['airline_type'] == "all"){ print 'checked="checked"'; } ?>> <?php echo _("All airlines types"); ?></label> |
| 382 | - <label class="radio-inline"><input type="radio" name="airline_type" value="passenger" id="airline_type_passenger" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "passenger"){ print 'checked="checked"'; } ?>> <?php echo _("Only Passenger airlines"); ?></label> |
|
| 383 | - <label class="radio-inline"><input type="radio" name="airline_type" value="cargo" id="airline_type_cargo" <?php if (isset($_GET['airline_type'])) if ( $_GET['airline_type'] == "cargo"){ print 'checked="checked"'; } ?>> <?php echo _("Only Cargo airlines"); ?></label> |
|
| 384 | - <label class="radio-inline"><input type="radio" name="airline_type" value="military" id="airline_type_military" <?php if (isset($_GET['airline_type'])) if ( $_GET['airline_type'] == "military"){ print 'checked="checked"'; } ?>> <?php echo _("Only Military airlines"); ?></label> |
|
| 432 | + <label class="radio-inline"><input type="radio" name="airline_type" value="passenger" id="airline_type_passenger" <?php if (isset($_GET['airline_type'])) { |
|
| 433 | + if ($_GET['airline_type'] == "passenger"){ print 'checked="checked"'; |
|
| 434 | +} |
|
| 435 | +} ?>> <?php echo _("Only Passenger airlines"); ?></label> |
|
| 436 | + <label class="radio-inline"><input type="radio" name="airline_type" value="cargo" id="airline_type_cargo" <?php if (isset($_GET['airline_type'])) { |
|
| 437 | + if ( $_GET['airline_type'] == "cargo"){ print 'checked="checked"'; |
|
| 438 | +} |
|
| 439 | +} ?>> <?php echo _("Only Cargo airlines"); ?></label> |
|
| 440 | + <label class="radio-inline"><input type="radio" name="airline_type" value="military" id="airline_type_military" <?php if (isset($_GET['airline_type'])) { |
|
| 441 | + if ( $_GET['airline_type'] == "military"){ print 'checked="checked"'; |
|
| 442 | +} |
|
| 443 | +} ?>> <?php echo _("Only Military airlines"); ?></label> |
|
| 385 | 444 | </div> |
| 386 | 445 | </div> |
| 387 | 446 | </fieldset> |
@@ -395,7 +454,10 @@ discard block |
||
| 395 | 454 | </select> |
| 396 | 455 | </div> |
| 397 | 456 | </div> |
| 398 | - <script type="text/javascript">getSelect('airportnames','<?php if(isset($_GET['airport_icao'])) print $airport_icao; ?>');</script> |
|
| 457 | + <script type="text/javascript">getSelect('airportnames','<?php if(isset($_GET['airport_icao'])) { |
|
| 458 | + print $airport_icao; |
|
| 459 | +} |
|
| 460 | +?>');</script> |
|
| 399 | 461 | <div class="form-group"> |
| 400 | 462 | <label class="control-label col-sm-2"><?php echo _("Country"); ?></label> |
| 401 | 463 | <div class="col-sm-10"> |
@@ -404,7 +466,10 @@ discard block |
||
| 404 | 466 | </select> |
| 405 | 467 | </div> |
| 406 | 468 | </div> |
| 407 | - <script type="text/javascript">getSelect('airportcountries','<?php if(isset($_GET['airport_country'])) print $airport_country; ?>');</script> |
|
| 469 | + <script type="text/javascript">getSelect('airportcountries','<?php if(isset($_GET['airport_country'])) { |
|
| 470 | + print $airport_country; |
|
| 471 | +} |
|
| 472 | +?>');</script> |
|
| 408 | 473 | </fieldset> |
| 409 | 474 | <fieldset> |
| 410 | 475 | <legend><?php echo _("Route"); ?></legend> |
@@ -416,7 +481,10 @@ discard block |
||
| 416 | 481 | </select> |
| 417 | 482 | </div> |
| 418 | 483 | </div> |
| 419 | - <script type="text/javascript">getSelect('departureairportnames','<?php if(isset($_GET['departure_airport_route'])) print $departure_airport_route; ?>');</script> |
|
| 484 | + <script type="text/javascript">getSelect('departureairportnames','<?php if(isset($_GET['departure_airport_route'])) { |
|
| 485 | + print $departure_airport_route; |
|
| 486 | +} |
|
| 487 | +?>');</script> |
|
| 420 | 488 | <div class="form-group"> |
| 421 | 489 | <label class="control-label col-sm-2"><?php echo _("Arrival Airport"); ?></label> |
| 422 | 490 | <div class="col-sm-10"> |
@@ -425,7 +493,10 @@ discard block |
||
| 425 | 493 | </select> |
| 426 | 494 | </div> |
| 427 | 495 | </div> |
| 428 | - <script type="text/javascript">getSelect('arrivalairportnames','<?php if(isset($_GET['arrival_airport_route'])) print $arrival_airport_route; ?>');</script> |
|
| 496 | + <script type="text/javascript">getSelect('arrivalairportnames','<?php if(isset($_GET['arrival_airport_route'])) { |
|
| 497 | + print $arrival_airport_route; |
|
| 498 | +} |
|
| 499 | +?>');</script> |
|
| 429 | 500 | </fieldset> |
| 430 | 501 | <fieldset> |
| 431 | 502 | <legend><?php echo _("Date"); ?></legend> |
@@ -433,7 +504,10 @@ discard block |
||
| 433 | 504 | <label class="control-label col-sm-2"><?php echo _("Start Date"); ?></label> |
| 434 | 505 | <div class="col-sm-10"> |
| 435 | 506 | <div class='input-group date' id='datetimepicker1'> |
| 436 | - <input type='text' name="start_date" class="form-control" value="<?php if (isset($_GET['start_date'])) print $start_date; ?>" placeholder="<?php echo _("Start Date/Time"); ?>" /> |
|
| 507 | + <input type='text' name="start_date" class="form-control" value="<?php if (isset($_GET['start_date'])) { |
|
| 508 | + print $start_date; |
|
| 509 | +} |
|
| 510 | +?>" placeholder="<?php echo _("Start Date/Time"); ?>" /> |
|
| 437 | 511 | <span class="input-group-addon"> |
| 438 | 512 | <span class="glyphicon glyphicon-calendar"></span> |
| 439 | 513 | </span> |
@@ -444,7 +518,10 @@ discard block |
||
| 444 | 518 | <label class="control-label col-sm-2"><?php echo _("End Date"); ?></label> |
| 445 | 519 | <div class="col-sm-10"> |
| 446 | 520 | <div class='input-group date' id='datetimepicker2'> |
| 447 | - <input type='text' name="end_date" class="form-control" value="<?php if (isset($_GET['end_date'])) print $end_date; ?>" placeholder="<?php echo _("End Date/Time"); ?>" /> |
|
| 521 | + <input type='text' name="end_date" class="form-control" value="<?php if (isset($_GET['end_date'])) { |
|
| 522 | + print $end_date; |
|
| 523 | +} |
|
| 524 | +?>" placeholder="<?php echo _("End Date/Time"); ?>" /> |
|
| 448 | 525 | <span class="input-group-addon"> |
| 449 | 526 | <span class="glyphicon glyphicon-calendar"></span> |
| 450 | 527 | </span> |
@@ -517,19 +594,33 @@ discard block |
||
| 517 | 594 | <div class="form-group"> |
| 518 | 595 | <label class="control-label col-sm-2"><?php echo _("Latitude"); ?></label> |
| 519 | 596 | <div class="col-sm-10"> |
| 520 | - <input type="text" name="origlat" class="form-control" placeholder="<?php echo _("Center point latitude"); ?>" value="<?php if (isset($_GET['origlat'])) print $origlat; ?>" /> |
|
| 597 | + <input type="text" name="origlat" class="form-control" placeholder="<?php echo _("Center point latitude"); ?>" value="<?php if (isset($_GET['origlat'])) { |
|
| 598 | + print $origlat; |
|
| 599 | +} |
|
| 600 | +?>" /> |
|
| 521 | 601 | </div> |
| 522 | 602 | </div> |
| 523 | 603 | <div class="form-group"> |
| 524 | 604 | <label class="control-label col-sm-2"><?php echo _("Longitude"); ?></label> |
| 525 | 605 | <div class="col-sm-10"> |
| 526 | - <input type="text" name="origlon" class="form-control" placeholder="<?php echo _("Center point longitude"); ?>" value="<?php if (isset($_GET['origlon'])) print $origlon; ?>" /> |
|
| 606 | + <input type="text" name="origlon" class="form-control" placeholder="<?php echo _("Center point longitude"); ?>" value="<?php if (isset($_GET['origlon'])) { |
|
| 607 | + print $origlon; |
|
| 608 | +} |
|
| 609 | +?>" /> |
|
| 527 | 610 | </div> |
| 528 | 611 | </div> |
| 529 | 612 | <div class="form-group"> |
| 530 | - <label class="control-label col-sm-2"><?php echo _("Distance").' ('; if (isset($globalDistanceUnit)) print $globalDistanceUnit; else print 'km'; print ')'; ?></label> |
|
| 613 | + <label class="control-label col-sm-2"><?php echo _("Distance").' ('; if (isset($globalDistanceUnit)) { |
|
| 614 | + print $globalDistanceUnit; |
|
| 615 | +} else { |
|
| 616 | + print 'km'; |
|
| 617 | +} |
|
| 618 | +print ')'; ?></label> |
|
| 531 | 619 | <div class="col-sm-10"> |
| 532 | - <input type="text" name="dist" class="form-control" placeholder="<?php echo _("Distance from center point"); ?>" value="<?php if (isset($_GET['distance'])) print $distance; ?>" /> |
|
| 620 | + <input type="text" name="dist" class="form-control" placeholder="<?php echo _("Distance from center point"); ?>" value="<?php if (isset($_GET['distance'])) { |
|
| 621 | + print $distance; |
|
| 622 | +} |
|
| 623 | +?>" /> |
|
| 533 | 624 | </div> |
| 534 | 625 | </div> |
| 535 | 626 | </fieldset> |
@@ -16,24 +16,24 @@ discard block |
||
| 16 | 16 | $sql_date = ''; |
| 17 | 17 | if (isset($_GET['start_date'])) { |
| 18 | 18 | //for the date manipulation into the query |
| 19 | - if($_GET['start_date'] != "" && $_GET['end_date'] != ""){ |
|
| 19 | + if ($_GET['start_date'] != "" && $_GET['end_date'] != "") { |
|
| 20 | 20 | if (strtotime($_GET['start_date']) !== false && strtotime($_GET['end_date']) !== false) { |
| 21 | 21 | //$start_date = $_GET['start_date']." 00:00:00"; |
| 22 | - $start_date = date("Y-m-d",strtotime($_GET['start_date']))." 00:00:00"; |
|
| 22 | + $start_date = date("Y-m-d", strtotime($_GET['start_date']))." 00:00:00"; |
|
| 23 | 23 | //$end_date = $_GET['end_date']." 00:00:00"; |
| 24 | - $end_date = date("Y-m-d",strtotime($_GET['end_date']))." 00:00:00"; |
|
| 24 | + $end_date = date("Y-m-d", strtotime($_GET['end_date']))." 00:00:00"; |
|
| 25 | 25 | $sql_date = $start_date.",".$end_date; |
| 26 | 26 | } |
| 27 | - } else if($_GET['start_date'] != ""){ |
|
| 27 | + } else if ($_GET['start_date'] != "") { |
|
| 28 | 28 | if (strtotime($_GET['start_date']) !== false) { |
| 29 | 29 | //$start_date = $_GET['start_date']." 00:00:00"; |
| 30 | - $start_date = date("Y-m-d",strtotime($_GET['start_date']))." 00:00:00"; |
|
| 30 | + $start_date = date("Y-m-d", strtotime($_GET['start_date']))." 00:00:00"; |
|
| 31 | 31 | $sql_date = $start_date; |
| 32 | 32 | } |
| 33 | - } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){ |
|
| 33 | + } else if ($_GET['start_date'] == "" && $_GET['end_date'] != "") { |
|
| 34 | 34 | if (strtotime($_GET['end_date']) !== false) { |
| 35 | 35 | //$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date']." 00:00:00"; |
| 36 | - $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".date("Y-m-d",strtotime($_GET['end_date']))." 00:00:00"; |
|
| 36 | + $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".date("Y-m-d", strtotime($_GET['end_date']))." 00:00:00"; |
|
| 37 | 37 | $sql_date = $end_date; |
| 38 | 38 | } |
| 39 | 39 | } else $sql_date = ''; |
@@ -41,21 +41,21 @@ discard block |
||
| 41 | 41 | |
| 42 | 42 | if (isset($_GET['highest_altitude'])) { |
| 43 | 43 | //for altitude manipulation |
| 44 | - if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){ |
|
| 45 | - $end_altitude = filter_input(INPUT_GET,'highest_altitude',FILTER_SANITIZE_NUMBER_INT); |
|
| 46 | - $start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT); |
|
| 44 | + if ($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != "") { |
|
| 45 | + $end_altitude = filter_input(INPUT_GET, 'highest_altitude', FILTER_SANITIZE_NUMBER_INT); |
|
| 46 | + $start_altitude = filter_input(INPUT_GET, 'lowest_altitude', FILTER_SANITIZE_NUMBER_INT); |
|
| 47 | 47 | $sql_altitude = $start_altitude.",".$end_altitude; |
| 48 | - } else if($_GET['highest_altitude'] != ""){ |
|
| 49 | - $end_altitude = filter_input(INPUT_GET,'highest_altitude',FILTER_SANITIZE_NUMBER_INT); |
|
| 48 | + } else if ($_GET['highest_altitude'] != "") { |
|
| 49 | + $end_altitude = filter_input(INPUT_GET, 'highest_altitude', FILTER_SANITIZE_NUMBER_INT); |
|
| 50 | 50 | $sql_altitude = $end_altitude; |
| 51 | - } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){ |
|
| 52 | - $start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT).",60000"; |
|
| 51 | + } else if ($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != "") { |
|
| 52 | + $start_altitude = filter_input(INPUT_GET, 'lowest_altitude', FILTER_SANITIZE_NUMBER_INT).",60000"; |
|
| 53 | 53 | $sql_altitude = $start_altitude; |
| 54 | 54 | } else $sql_altitude = ''; |
| 55 | 55 | } else $sql_altitude = ''; |
| 56 | 56 | |
| 57 | 57 | //calculuation for the pagination |
| 58 | -if(!isset($_GET['limit'])) |
|
| 58 | +if (!isset($_GET['limit'])) |
|
| 59 | 59 | { |
| 60 | 60 | if (!isset($_GET['number_results'])) |
| 61 | 61 | { |
@@ -63,45 +63,45 @@ discard block |
||
| 63 | 63 | $limit_end = 25; |
| 64 | 64 | $absolute_difference = 25; |
| 65 | 65 | } else { |
| 66 | - if ($_GET['number_results'] > 1000){ |
|
| 66 | + if ($_GET['number_results'] > 1000) { |
|
| 67 | 67 | $_GET['number_results'] = 1000; |
| 68 | 68 | } |
| 69 | 69 | $limit_start = 0; |
| 70 | - $limit_end = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT); |
|
| 71 | - $absolute_difference = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT); |
|
| 70 | + $limit_end = filter_input(INPUT_GET, 'number_results', FILTER_SANITIZE_NUMBER_INT); |
|
| 71 | + $absolute_difference = filter_input(INPUT_GET, 'number_results', FILTER_SANITIZE_NUMBER_INT); |
|
| 72 | 72 | } |
| 73 | -} else { |
|
| 73 | +} else { |
|
| 74 | 74 | $limit_explode = explode(",", $_GET['limit']); |
| 75 | - $limit_start = filter_var($limit_explode[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 76 | - $limit_end = filter_var($limit_explode[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 75 | + $limit_start = filter_var($limit_explode[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 76 | + $limit_end = filter_var($limit_explode[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 77 | 77 | } |
| 78 | 78 | $absolute_difference = abs($limit_start - $limit_end); |
| 79 | 79 | $limit_next = $limit_end + $absolute_difference; |
| 80 | 80 | $limit_previous_1 = $limit_start - $absolute_difference; |
| 81 | 81 | $limit_previous_2 = $limit_end - $absolute_difference; |
| 82 | 82 | |
| 83 | -if (!empty($_GET)){ |
|
| 84 | - $q = filter_input(INPUT_GET, 'q',FILTER_SANITIZE_STRING); |
|
| 85 | - $registration = filter_input(INPUT_GET, 'registration',FILTER_SANITIZE_STRING); |
|
| 86 | - $aircraft = filter_input(INPUT_GET, 'aircraft',FILTER_SANITIZE_STRING); |
|
| 87 | - $manufacturer = filter_input(INPUT_GET, 'manufacturer',FILTER_SANITIZE_STRING); |
|
| 88 | - $highlights = filter_input(INPUT_GET, 'highlights',FILTER_SANITIZE_STRING); |
|
| 89 | - $airline = filter_input(INPUT_GET, 'airline',FILTER_SANITIZE_STRING); |
|
| 90 | - $airline_country = filter_input(INPUT_GET, 'airline_country',FILTER_SANITIZE_STRING); |
|
| 91 | - $airline_type = filter_input(INPUT_GET, 'airline_type',FILTER_SANITIZE_STRING); |
|
| 92 | - $airport = filter_input(INPUT_GET, 'airport',FILTER_SANITIZE_STRING); |
|
| 93 | - $airport_country = filter_input(INPUT_GET, 'airport_country',FILTER_SANITIZE_STRING); |
|
| 94 | - $callsign = filter_input(INPUT_GET, 'callsign',FILTER_SANITIZE_STRING); |
|
| 95 | - $owner = filter_input(INPUT_GET, 'owner',FILTER_SANITIZE_STRING); |
|
| 96 | - $pilot_name = filter_input(INPUT_GET, 'pilot_name',FILTER_SANITIZE_STRING); |
|
| 97 | - $pilot_id = filter_input(INPUT_GET, 'pilot_id',FILTER_SANITIZE_STRING); |
|
| 98 | - $departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route',FILTER_SANITIZE_STRING); |
|
| 99 | - $arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route',FILTER_SANITIZE_STRING); |
|
| 100 | - $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
|
| 101 | - $archive = filter_input(INPUT_GET,'archive',FILTER_SANITIZE_NUMBER_INT); |
|
| 102 | - $origlat = filter_input(INPUT_GET,'origlat',FILTER_SANITIZE_NUMBER_FLOAT); |
|
| 103 | - $origlon = filter_input(INPUT_GET,'origlon',FILTER_SANITIZE_NUMBER_FLOAT); |
|
| 104 | - $dist = filter_input(INPUT_GET,'dist',FILTER_SANITIZE_NUMBER_INT); |
|
| 83 | +if (!empty($_GET)) { |
|
| 84 | + $q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING); |
|
| 85 | + $registration = filter_input(INPUT_GET, 'registration', FILTER_SANITIZE_STRING); |
|
| 86 | + $aircraft = filter_input(INPUT_GET, 'aircraft', FILTER_SANITIZE_STRING); |
|
| 87 | + $manufacturer = filter_input(INPUT_GET, 'manufacturer', FILTER_SANITIZE_STRING); |
|
| 88 | + $highlights = filter_input(INPUT_GET, 'highlights', FILTER_SANITIZE_STRING); |
|
| 89 | + $airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING); |
|
| 90 | + $airline_country = filter_input(INPUT_GET, 'airline_country', FILTER_SANITIZE_STRING); |
|
| 91 | + $airline_type = filter_input(INPUT_GET, 'airline_type', FILTER_SANITIZE_STRING); |
|
| 92 | + $airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING); |
|
| 93 | + $airport_country = filter_input(INPUT_GET, 'airport_country', FILTER_SANITIZE_STRING); |
|
| 94 | + $callsign = filter_input(INPUT_GET, 'callsign', FILTER_SANITIZE_STRING); |
|
| 95 | + $owner = filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING); |
|
| 96 | + $pilot_name = filter_input(INPUT_GET, 'pilot_name', FILTER_SANITIZE_STRING); |
|
| 97 | + $pilot_id = filter_input(INPUT_GET, 'pilot_id', FILTER_SANITIZE_STRING); |
|
| 98 | + $departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route', FILTER_SANITIZE_STRING); |
|
| 99 | + $arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route', FILTER_SANITIZE_STRING); |
|
| 100 | + $sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING); |
|
| 101 | + $archive = filter_input(INPUT_GET, 'archive', FILTER_SANITIZE_NUMBER_INT); |
|
| 102 | + $origlat = filter_input(INPUT_GET, 'origlat', FILTER_SANITIZE_NUMBER_FLOAT); |
|
| 103 | + $origlon = filter_input(INPUT_GET, 'origlon', FILTER_SANITIZE_NUMBER_FLOAT); |
|
| 104 | + $dist = filter_input(INPUT_GET, 'dist', FILTER_SANITIZE_NUMBER_INT); |
|
| 105 | 105 | if ($dist != '') { |
| 106 | 106 | if (isset($globalDistanceUnit) && $globalDistanceUnit == 'mi') $dist = $dist*1.60934; |
| 107 | 107 | elseif (isset($globalDistanceUnit) && $globalDistanceUnit == 'nm') $dist = $dist*1.852; |
@@ -109,9 +109,9 @@ discard block |
||
| 109 | 109 | if (!isset($sql_date)) $sql_date = ''; |
| 110 | 110 | if ($archive == 1) { |
| 111 | 111 | $SpotterArchive = new SpotterArchive(); |
| 112 | - $spotter_array = $SpotterArchive->searchSpotterData($q,$registration,$aircraft,strtolower(str_replace("-", " ", $manufacturer)),$highlights,$airline,$airline_country,$airline_type,$airport,$airport_country,$callsign,$departure_airport_route,$arrival_airport_route,$owner,$pilot_id,$pilot_name,$sql_altitude,$sql_date,$limit_start.",".$absolute_difference,$sort,'',$origlat,$origlon,$dist); |
|
| 112 | + $spotter_array = $SpotterArchive->searchSpotterData($q, $registration, $aircraft, strtolower(str_replace("-", " ", $manufacturer)), $highlights, $airline, $airline_country, $airline_type, $airport, $airport_country, $callsign, $departure_airport_route, $arrival_airport_route, $owner, $pilot_id, $pilot_name, $sql_altitude, $sql_date, $limit_start.",".$absolute_difference, $sort, '', $origlat, $origlon, $dist); |
|
| 113 | 113 | } else { |
| 114 | - $spotter_array = $Spotter->searchSpotterData($q,$registration,$aircraft,strtolower(str_replace("-", " ", $manufacturer)),$highlights,$airline,$airline_country,$airline_type,$airport,$airport_country,$callsign,$departure_airport_route,$arrival_airport_route,$owner,$pilot_id,$pilot_name,$sql_altitude,$sql_date,$limit_start.",".$absolute_difference,$sort,'',$origlat,$origlon,$dist); |
|
| 114 | + $spotter_array = $Spotter->searchSpotterData($q, $registration, $aircraft, strtolower(str_replace("-", " ", $manufacturer)), $highlights, $airline, $airline_country, $airline_type, $airport, $airport_country, $callsign, $departure_airport_route, $arrival_airport_route, $owner, $pilot_id, $pilot_name, $sql_altitude, $sql_date, $limit_start.",".$absolute_difference, $sort, '', $origlat, $origlon, $dist); |
|
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | print '<span class="sub-menu-statistic column mobile">'; |
@@ -144,12 +144,12 @@ discard block |
||
| 144 | 144 | //remove 3D=true parameter |
| 145 | 145 | $no3D = str_replace("&3D=true", "", $_SERVER['QUERY_STRING']); |
| 146 | 146 | $kmlURL = str_replace("http://", "kml://", $globalURL); |
| 147 | - if (!isset($_GET['3D'])){ |
|
| 147 | + if (!isset($_GET['3D'])) { |
|
| 148 | 148 | print '<li><a href="'.$globalURL.'/search?'.$no3D.'" class="active"><i class="fa fa-table"></i> '._("Table").'</a></li>'; |
| 149 | 149 | } else { |
| 150 | 150 | print '<li><span class="notablet"><a href="'.$globalURL.'/search?'.$no3D.'"><i class="fa fa-table"></i> '._("Table").'</a></span></li>'; |
| 151 | 151 | } |
| 152 | - if (isset($_GET['3D'])){ |
|
| 152 | + if (isset($_GET['3D'])) { |
|
| 153 | 153 | print '<li><a href="'.$globalURL.'/search?'.$no3D.'&3D=true" class="active"><i class="fa fa-globe"></i> '._("3D Map").'</a></li>'; |
| 154 | 154 | } else { |
| 155 | 155 | print '<li ><a href="'.$globalURL.'/search?'.$no3D.'&3D=true" class="notablet nomobile"><i class="fa fa-globe"></i> '._("3D Map").'</a><a href="'.$kmlURL.'/search/kml?'.htmlentities($_SERVER['QUERY_STRING']).'" class="tablet mobile"><i class="fa fa-globe"></i> 3D Map</a></li>'; |
@@ -170,30 +170,30 @@ discard block |
||
| 170 | 170 | print '<div class="column">'; |
| 171 | 171 | print '<div class="info">'; |
| 172 | 172 | print '<h1>'._("Search Results for").' '; |
| 173 | - if (isset($_GET['q']) && $_GET['q'] != ""){ print _("Keyword:").' <span>'.$q.'</span> '; } |
|
| 174 | - if (isset($_GET['aircraft']) && $_GET['aircraft'] != ""){ print _("Aircraft:").' <span>'.$aircraft.'</span> '; } |
|
| 175 | - if (isset($_GET['manufacturer']) && $_GET['manufacturer'] != ""){ print _("Manufacturer:").' <span>'.$manufacturer.'</span> '; } |
|
| 176 | - if (isset($_GET['registration']) && $_GET['registration'] != ""){ print _("Registration:").' <span>'.$registration.'</span> '; } |
|
| 177 | - if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print _("Highlights:").' <span>'.$highlights.'</span> '; } |
|
| 178 | - if (isset($_GET['airline']) && $_GET['airline'] != ""){ print _("Airline:").' <span>'.$airline.'</span> '; } |
|
| 179 | - if (isset($_GET['airline_country']) && $_GET['airline_country'] != ""){ print _("Airline country:").' <span>'.$airline_country.'</span> '; } |
|
| 180 | - if (isset($_GET['airline_type']) && $_GET['airline_type'] != ""){ print _("Airline type:").' <span>'.$airline_type.'</span> '; } |
|
| 181 | - if (isset($_GET['airport']) && $_GET['airport'] != ""){ print _("Airport:").' <span>'.$airport.'</span> '; } |
|
| 182 | - if (isset($_GET['airport_country']) && $_GET['airport_country'] != ""){ print _("Airport country:").' <span>'.$airport_country.'</span> '; } |
|
| 183 | - if (isset($_GET['callsign']) && $_GET['callsign'] != ""){ print _("Callsign:").' <span>'.$callsign.'</span> '; } |
|
| 184 | - if (isset($_GET['owner']) && $_GET['owner'] != ""){ print _("Owner:").' <span>'.$owner.'</span> '; } |
|
| 185 | - if (isset($_GET['pilot_id']) && $_GET['pilot_id'] != ""){ print _("Pilot id:").' <span>'.$pilot_id.'</span> '; } |
|
| 186 | - if (isset($_GET['pilot_name']) && $_GET['pilot_name'] != ""){ print _("Pilot name:").' <span>'.$pilot_name.'</span> '; } |
|
| 187 | - if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && (!isset($_GET['arrival_airport_route']) || $_GET['arrival_airport_route'] == "")){ print _("Route out of:").' <span>'.$departure_airport_route.'</span> '; } |
|
| 188 | - if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] == "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != ""){ print _("Route into:").' <span>'.$arrival_airport_route.'</span> '; } |
|
| 189 | - if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != ""){ print _("Route between:").' <span>'.$departure_airport_route.'</span> and <span>'.$_GET['arrival_airport_route'].'</span> '; } |
|
| 190 | - if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] == ""){ print _("Date starting at:").' <span>'.$start_date.'</span> '; } |
|
| 191 | - if (isset($_GET['start_date']) && $_GET['start_date'] == "" && isset($_GET['end_date']) && $_GET['end_date'] != ""){ print _("Date ending at:").' <span>'.$end_date.'</span> '; } |
|
| 192 | - if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] != ""){ print _("Date between:").' <span>'.$start_date.'</span> and <span>'.$end_date.'</span> '; } |
|
| 193 | - if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == ""){ print _("Altitude starting at:").' <span>'.number_format($lowest_altitude).' feet</span> '; } |
|
| 194 | - if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != ""){ print _("Altitude ending at:").' <span>'.number_format($highest_altitude).' feet</span> '; } |
|
| 195 | - if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != ""){ print _("Altitude between:").' <span>'.number_format($lowest_altitude).' feet</span> '._("and").' <span>'.number_format($highest_altitude).' feet</span> '; } |
|
| 196 | - if (isset($_GET['number_results']) && $_GET['number_results'] != ""){ print _("limit per page:").' <span>'.$number_results.'</span> '; } |
|
| 173 | + if (isset($_GET['q']) && $_GET['q'] != "") { print _("Keyword:").' <span>'.$q.'</span> '; } |
|
| 174 | + if (isset($_GET['aircraft']) && $_GET['aircraft'] != "") { print _("Aircraft:").' <span>'.$aircraft.'</span> '; } |
|
| 175 | + if (isset($_GET['manufacturer']) && $_GET['manufacturer'] != "") { print _("Manufacturer:").' <span>'.$manufacturer.'</span> '; } |
|
| 176 | + if (isset($_GET['registration']) && $_GET['registration'] != "") { print _("Registration:").' <span>'.$registration.'</span> '; } |
|
| 177 | + if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true") { print _("Highlights:").' <span>'.$highlights.'</span> '; } |
|
| 178 | + if (isset($_GET['airline']) && $_GET['airline'] != "") { print _("Airline:").' <span>'.$airline.'</span> '; } |
|
| 179 | + if (isset($_GET['airline_country']) && $_GET['airline_country'] != "") { print _("Airline country:").' <span>'.$airline_country.'</span> '; } |
|
| 180 | + if (isset($_GET['airline_type']) && $_GET['airline_type'] != "") { print _("Airline type:").' <span>'.$airline_type.'</span> '; } |
|
| 181 | + if (isset($_GET['airport']) && $_GET['airport'] != "") { print _("Airport:").' <span>'.$airport.'</span> '; } |
|
| 182 | + if (isset($_GET['airport_country']) && $_GET['airport_country'] != "") { print _("Airport country:").' <span>'.$airport_country.'</span> '; } |
|
| 183 | + if (isset($_GET['callsign']) && $_GET['callsign'] != "") { print _("Callsign:").' <span>'.$callsign.'</span> '; } |
|
| 184 | + if (isset($_GET['owner']) && $_GET['owner'] != "") { print _("Owner:").' <span>'.$owner.'</span> '; } |
|
| 185 | + if (isset($_GET['pilot_id']) && $_GET['pilot_id'] != "") { print _("Pilot id:").' <span>'.$pilot_id.'</span> '; } |
|
| 186 | + if (isset($_GET['pilot_name']) && $_GET['pilot_name'] != "") { print _("Pilot name:").' <span>'.$pilot_name.'</span> '; } |
|
| 187 | + if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && (!isset($_GET['arrival_airport_route']) || $_GET['arrival_airport_route'] == "")) { print _("Route out of:").' <span>'.$departure_airport_route.'</span> '; } |
|
| 188 | + if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] == "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != "") { print _("Route into:").' <span>'.$arrival_airport_route.'</span> '; } |
|
| 189 | + if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != "") { print _("Route between:").' <span>'.$departure_airport_route.'</span> and <span>'.$_GET['arrival_airport_route'].'</span> '; } |
|
| 190 | + if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] == "") { print _("Date starting at:").' <span>'.$start_date.'</span> '; } |
|
| 191 | + if (isset($_GET['start_date']) && $_GET['start_date'] == "" && isset($_GET['end_date']) && $_GET['end_date'] != "") { print _("Date ending at:").' <span>'.$end_date.'</span> '; } |
|
| 192 | + if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] != "") { print _("Date between:").' <span>'.$start_date.'</span> and <span>'.$end_date.'</span> '; } |
|
| 193 | + if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == "") { print _("Altitude starting at:").' <span>'.number_format($lowest_altitude).' feet</span> '; } |
|
| 194 | + if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != "") { print _("Altitude ending at:").' <span>'.number_format($highest_altitude).' feet</span> '; } |
|
| 195 | + if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != "") { print _("Altitude between:").' <span>'.number_format($lowest_altitude).' feet</span> '._("and").' <span>'.number_format($highest_altitude).' feet</span> '; } |
|
| 196 | + if (isset($_GET['number_results']) && $_GET['number_results'] != "") { print _("limit per page:").' <span>'.$number_results.'</span> '; } |
|
| 197 | 197 | print '</h1>'; |
| 198 | 198 | print '</div>'; |
| 199 | 199 | |
@@ -300,7 +300,7 @@ discard block |
||
| 300 | 300 | </select> |
| 301 | 301 | </div> |
| 302 | 302 | </div> |
| 303 | - <script type="text/javascript">getSelect('manufacturer','<?php if(isset($_GET['manufacturer'])) print $manufacturer; ?>')</script> |
|
| 303 | + <script type="text/javascript">getSelect('manufacturer','<?php if (isset($_GET['manufacturer'])) print $manufacturer; ?>')</script> |
|
| 304 | 304 | <div class="form-group"> |
| 305 | 305 | <label class="control-label col-sm-2"><?php echo _("Type"); ?></label> |
| 306 | 306 | <div class="col-sm-10"> |
@@ -309,7 +309,7 @@ discard block |
||
| 309 | 309 | </select> |
| 310 | 310 | </div> |
| 311 | 311 | </div> |
| 312 | - <script type="text/javascript">getSelect('aircrafttypes','<?php if(isset($_GET['aircraft_icao'])) print $aircraft_icao; ?>');</script> |
|
| 312 | + <script type="text/javascript">getSelect('aircrafttypes','<?php if (isset($_GET['aircraft_icao'])) print $aircraft_icao; ?>');</script> |
|
| 313 | 313 | <div class="form-group"> |
| 314 | 314 | <label class="control-label col-sm-2"><?php echo _("Registration"); ?></label> |
| 315 | 315 | <div class="col-sm-10"> |
@@ -332,7 +332,7 @@ discard block |
||
| 332 | 332 | </div> |
| 333 | 333 | </div> |
| 334 | 334 | <?php |
| 335 | -}else { |
|
| 335 | +} else { |
|
| 336 | 336 | ?> |
| 337 | 337 | <div class="form-group"> |
| 338 | 338 | <label class="control-label col-sm-2"><?php echo _("Owner name"); ?></label> |
@@ -345,8 +345,8 @@ discard block |
||
| 345 | 345 | ?> |
| 346 | 346 | <div class="form-group"> |
| 347 | 347 | <div class="col-sm-offset-2 col-sm-10"> |
| 348 | - <!--<div><input type="checkbox" class="form-control" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print 'checked="checked"'; } ?>> <label for="highlights"><?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label></div>--> |
|
| 349 | - <label class="checkbox-inline"><input type="checkbox" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print 'checked="checked"'; } ?>> <?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label> |
|
| 348 | + <!--<div><input type="checkbox" class="form-control" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true") { print 'checked="checked"'; } ?>> <label for="highlights"><?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label></div>--> |
|
| 349 | + <label class="checkbox-inline"><input type="checkbox" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true") { print 'checked="checked"'; } ?>> <?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label> |
|
| 350 | 350 | </div> |
| 351 | 351 | </div> |
| 352 | 352 | </fieldset> |
@@ -360,7 +360,7 @@ discard block |
||
| 360 | 360 | </select> |
| 361 | 361 | </div> |
| 362 | 362 | </div> |
| 363 | - <script type="text/javascript">getSelect('airlinenames','<?php if(isset($_GET['airline'])) print $airline; ?>');</script> |
|
| 363 | + <script type="text/javascript">getSelect('airlinenames','<?php if (isset($_GET['airline'])) print $airline; ?>');</script> |
|
| 364 | 364 | <div class="form-group"> |
| 365 | 365 | <label class="control-label col-sm-2"><?php echo _("Country"); ?></label> |
| 366 | 366 | <div class="col-sm-10"> |
@@ -369,7 +369,7 @@ discard block |
||
| 369 | 369 | </select> |
| 370 | 370 | </div> |
| 371 | 371 | </div> |
| 372 | - <script type="text/javascript">getSelect('airlinecountries','<?php if(isset($_GET['airline_country'])) print $airline_country; ?>');</script> |
|
| 372 | + <script type="text/javascript">getSelect('airlinecountries','<?php if (isset($_GET['airline_country'])) print $airline_country; ?>');</script> |
|
| 373 | 373 | <div class="form-group"> |
| 374 | 374 | <label class="control-label col-sm-2"><?php echo _("Callsign"); ?></label> |
| 375 | 375 | <div class="col-sm-10"> |
@@ -378,10 +378,10 @@ discard block |
||
| 378 | 378 | </div> |
| 379 | 379 | <div class="form-group"> |
| 380 | 380 | <div class="col-sm-offset-2 col-sm-10"> |
| 381 | - <label class="radio-inline"><input type="radio" name="airline_type" value="all" id="airline_type_all" <?php if (!isset($_GET['airline_type']) || $_GET['airline_type'] == "all"){ print 'checked="checked"'; } ?>> <?php echo _("All airlines types"); ?></label> |
|
| 382 | - <label class="radio-inline"><input type="radio" name="airline_type" value="passenger" id="airline_type_passenger" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "passenger"){ print 'checked="checked"'; } ?>> <?php echo _("Only Passenger airlines"); ?></label> |
|
| 383 | - <label class="radio-inline"><input type="radio" name="airline_type" value="cargo" id="airline_type_cargo" <?php if (isset($_GET['airline_type'])) if ( $_GET['airline_type'] == "cargo"){ print 'checked="checked"'; } ?>> <?php echo _("Only Cargo airlines"); ?></label> |
|
| 384 | - <label class="radio-inline"><input type="radio" name="airline_type" value="military" id="airline_type_military" <?php if (isset($_GET['airline_type'])) if ( $_GET['airline_type'] == "military"){ print 'checked="checked"'; } ?>> <?php echo _("Only Military airlines"); ?></label> |
|
| 381 | + <label class="radio-inline"><input type="radio" name="airline_type" value="all" id="airline_type_all" <?php if (!isset($_GET['airline_type']) || $_GET['airline_type'] == "all") { print 'checked="checked"'; } ?>> <?php echo _("All airlines types"); ?></label> |
|
| 382 | + <label class="radio-inline"><input type="radio" name="airline_type" value="passenger" id="airline_type_passenger" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "passenger") { print 'checked="checked"'; } ?>> <?php echo _("Only Passenger airlines"); ?></label> |
|
| 383 | + <label class="radio-inline"><input type="radio" name="airline_type" value="cargo" id="airline_type_cargo" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "cargo") { print 'checked="checked"'; } ?>> <?php echo _("Only Cargo airlines"); ?></label> |
|
| 384 | + <label class="radio-inline"><input type="radio" name="airline_type" value="military" id="airline_type_military" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "military") { print 'checked="checked"'; } ?>> <?php echo _("Only Military airlines"); ?></label> |
|
| 385 | 385 | </div> |
| 386 | 386 | </div> |
| 387 | 387 | </fieldset> |
@@ -395,7 +395,7 @@ discard block |
||
| 395 | 395 | </select> |
| 396 | 396 | </div> |
| 397 | 397 | </div> |
| 398 | - <script type="text/javascript">getSelect('airportnames','<?php if(isset($_GET['airport_icao'])) print $airport_icao; ?>');</script> |
|
| 398 | + <script type="text/javascript">getSelect('airportnames','<?php if (isset($_GET['airport_icao'])) print $airport_icao; ?>');</script> |
|
| 399 | 399 | <div class="form-group"> |
| 400 | 400 | <label class="control-label col-sm-2"><?php echo _("Country"); ?></label> |
| 401 | 401 | <div class="col-sm-10"> |
@@ -404,7 +404,7 @@ discard block |
||
| 404 | 404 | </select> |
| 405 | 405 | </div> |
| 406 | 406 | </div> |
| 407 | - <script type="text/javascript">getSelect('airportcountries','<?php if(isset($_GET['airport_country'])) print $airport_country; ?>');</script> |
|
| 407 | + <script type="text/javascript">getSelect('airportcountries','<?php if (isset($_GET['airport_country'])) print $airport_country; ?>');</script> |
|
| 408 | 408 | </fieldset> |
| 409 | 409 | <fieldset> |
| 410 | 410 | <legend><?php echo _("Route"); ?></legend> |
@@ -416,7 +416,7 @@ discard block |
||
| 416 | 416 | </select> |
| 417 | 417 | </div> |
| 418 | 418 | </div> |
| 419 | - <script type="text/javascript">getSelect('departureairportnames','<?php if(isset($_GET['departure_airport_route'])) print $departure_airport_route; ?>');</script> |
|
| 419 | + <script type="text/javascript">getSelect('departureairportnames','<?php if (isset($_GET['departure_airport_route'])) print $departure_airport_route; ?>');</script> |
|
| 420 | 420 | <div class="form-group"> |
| 421 | 421 | <label class="control-label col-sm-2"><?php echo _("Arrival Airport"); ?></label> |
| 422 | 422 | <div class="col-sm-10"> |
@@ -425,7 +425,7 @@ discard block |
||
| 425 | 425 | </select> |
| 426 | 426 | </div> |
| 427 | 427 | </div> |
| 428 | - <script type="text/javascript">getSelect('arrivalairportnames','<?php if(isset($_GET['arrival_airport_route'])) print $arrival_airport_route; ?>');</script> |
|
| 428 | + <script type="text/javascript">getSelect('arrivalairportnames','<?php if (isset($_GET['arrival_airport_route'])) print $arrival_airport_route; ?>');</script> |
|
| 429 | 429 | </fieldset> |
| 430 | 430 | <fieldset> |
| 431 | 431 | <legend><?php echo _("Date"); ?></legend> |
@@ -479,9 +479,9 @@ discard block |
||
| 479 | 479 | <option></option> |
| 480 | 480 | <?php |
| 481 | 481 | $altitude_array = Array(1000, 5000, 10000, 15000, 20000, 25000, 30000, 35000, 40000, 45000, 50000); |
| 482 | -foreach($altitude_array as $altitude) |
|
| 482 | +foreach ($altitude_array as $altitude) |
|
| 483 | 483 | { |
| 484 | - if(isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == $altitude) |
|
| 484 | + if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == $altitude) |
|
| 485 | 485 | { |
| 486 | 486 | print '<option value="'.$altitude.'" selected="selected">'.number_format($altitude).' feet</option>'; |
| 487 | 487 | } else { |
@@ -499,9 +499,9 @@ discard block |
||
| 499 | 499 | <option></option> |
| 500 | 500 | <?php |
| 501 | 501 | $altitude_array = Array(1000, 5000, 10000, 15000, 20000, 25000, 30000, 35000, 40000, 45000, 50000); |
| 502 | -foreach($altitude_array as $altitude) |
|
| 502 | +foreach ($altitude_array as $altitude) |
|
| 503 | 503 | { |
| 504 | - if(isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == $altitude) |
|
| 504 | + if (isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == $altitude) |
|
| 505 | 505 | { |
| 506 | 506 | print '<option value="'.$altitude.'" selected="selected">'.number_format($altitude).' feet</option>'; |
| 507 | 507 | } else { |
@@ -540,10 +540,10 @@ discard block |
||
| 540 | 540 | <div class="col-sm-10"> |
| 541 | 541 | <select class="form-control" name="number_results"> |
| 542 | 542 | <?php |
| 543 | -$number_results_array = Array(25, 50, 100, 150, 200, 250, 300, 400, 500, 600, 700, 800, 900, 1000); |
|
| 544 | -foreach($number_results_array as $number) |
|
| 543 | +$number_results_array = Array(25, 50, 100, 150, 200, 250, 300, 400, 500, 600, 700, 800, 900, 1000); |
|
| 544 | +foreach ($number_results_array as $number) |
|
| 545 | 545 | { |
| 546 | - if(isset($_GET['number_results']) && $_GET['number_results'] == $number) |
|
| 546 | + if (isset($_GET['number_results']) && $_GET['number_results'] == $number) |
|
| 547 | 547 | { |
| 548 | 548 | print '<option value="'.$number.'" selected="selected">'.$number.'</option>'; |
| 549 | 549 | } else { |
@@ -562,7 +562,7 @@ discard block |
||
| 562 | 562 | <fieldset> |
| 563 | 563 | <div class="form-group"> |
| 564 | 564 | <div class="col-sm-offset-2 col-sm-10"> |
| 565 | - <label class="checkbox-inline"><input type="checkbox" name="archive" value="1" disabled /><?php echo sprintf(_("Search in archive (older than %s months)"),$globalArchiveKeepMonths); ?></label> |
|
| 565 | + <label class="checkbox-inline"><input type="checkbox" name="archive" value="1" disabled /><?php echo sprintf(_("Search in archive (older than %s months)"), $globalArchiveKeepMonths); ?></label> |
|
| 566 | 566 | <p class="help-block">Disabled in demo</p> |
| 567 | 567 | </div> |
| 568 | 568 | </div> |
@@ -573,7 +573,7 @@ discard block |
||
| 573 | 573 | <fieldset> |
| 574 | 574 | <div class="form-group"> |
| 575 | 575 | <div class="col-sm-offset-2 col-sm-10"> |
| 576 | - <label class="checkbox-inline"><input type="checkbox" name="archive" value="1" /><?php echo sprintf(_("Search in archive (older than %s months)"),$globalArchiveKeepMonths); ?></label> |
|
| 576 | + <label class="checkbox-inline"><input type="checkbox" name="archive" value="1" /><?php echo sprintf(_("Search in archive (older than %s months)"), $globalArchiveKeepMonths); ?></label> |
|
| 577 | 577 | </div> |
| 578 | 578 | </div> |
| 579 | 579 | </fieldset> |
@@ -7,35 +7,35 @@ discard block |
||
| 7 | 7 | public $latest_schema = 46; |
| 8 | 8 | |
| 9 | 9 | public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) { |
| 10 | - global $globalNoDB; |
|
| 11 | - if (isset($globalNoDB) && $globalNoDB === TRUE) { |
|
| 10 | + global $globalNoDB; |
|
| 11 | + if (isset($globalNoDB) && $globalNoDB === TRUE) { |
|
| 12 | 12 | $this->db = null; |
| 13 | - } else { |
|
| 13 | + } else { |
|
| 14 | 14 | if ($dbc === null) { |
| 15 | - if ($this->db === null && $dbname === null) { |
|
| 15 | + if ($this->db === null && $dbname === null) { |
|
| 16 | 16 | if ($user === null && $pass === null) { |
| 17 | - $this->createDBConnection(); |
|
| 17 | + $this->createDBConnection(); |
|
| 18 | 18 | } else { |
| 19 | - $this->createDBConnection(null,$user,$pass); |
|
| 19 | + $this->createDBConnection(null,$user,$pass); |
|
| 20 | 20 | } |
| 21 | - } else { |
|
| 21 | + } else { |
|
| 22 | 22 | $this->createDBConnection($dbname); |
| 23 | - } |
|
| 23 | + } |
|
| 24 | 24 | } elseif ($dbname === null || $dbname === 'default') { |
| 25 | - $this->db = $dbc; |
|
| 26 | - if ($this->connectionExists() === false) { |
|
| 25 | + $this->db = $dbc; |
|
| 26 | + if ($this->connectionExists() === false) { |
|
| 27 | 27 | /* |
| 28 | 28 | echo 'Restart Connection !!!'."\n"; |
| 29 | 29 | $e = new \Exception; |
| 30 | 30 | var_dump($e->getTraceAsString()); |
| 31 | 31 | */ |
| 32 | 32 | $this->createDBConnection(); |
| 33 | - } |
|
| 33 | + } |
|
| 34 | 34 | } else { |
| 35 | - //$this->connectionExists(); |
|
| 36 | - $this->dbs[$dbname] = $dbc; |
|
| 35 | + //$this->connectionExists(); |
|
| 36 | + $this->dbs[$dbname] = $dbc; |
|
| 37 | + } |
|
| 37 | 38 | } |
| 38 | - } |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | public function db() { |
@@ -56,11 +56,11 @@ discard block |
||
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | /** |
| 59 | - * Creates the database connection |
|
| 60 | - * |
|
| 61 | - * @return Boolean of the database connection |
|
| 62 | - * |
|
| 63 | - */ |
|
| 59 | + * Creates the database connection |
|
| 60 | + * |
|
| 61 | + * @return Boolean of the database connection |
|
| 62 | + * |
|
| 63 | + */ |
|
| 64 | 64 | |
| 65 | 65 | public function createDBConnection($DBname = null, $user = null, $pass = null) |
| 66 | 66 | { |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | return false; |
| 159 | 159 | } |
| 160 | 160 | if($results->rowCount()>0) { |
| 161 | - return true; |
|
| 161 | + return true; |
|
| 162 | 162 | } |
| 163 | 163 | else return false; |
| 164 | 164 | } |
@@ -176,14 +176,14 @@ discard block |
||
| 176 | 176 | $sum = $sum->fetchColumn(0); |
| 177 | 177 | } else $sum = 0; |
| 178 | 178 | if (intval($sum) !== 2) { |
| 179 | - return false; |
|
| 179 | + return false; |
|
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | } catch(PDOException $e) { |
| 183 | 183 | if($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) { |
| 184 | - throw $e; |
|
| 185 | - } |
|
| 186 | - //echo 'error ! '.$e->getMessage(); |
|
| 184 | + throw $e; |
|
| 185 | + } |
|
| 186 | + //echo 'error ! '.$e->getMessage(); |
|
| 187 | 187 | return false; |
| 188 | 188 | } |
| 189 | 189 | return true; |
@@ -287,8 +287,8 @@ discard block |
||
| 287 | 287 | $version = 0; |
| 288 | 288 | if ($this->tableExists('aircraft')) { |
| 289 | 289 | if (!$this->tableExists('config')) { |
| 290 | - $version = '1'; |
|
| 291 | - return $version; |
|
| 290 | + $version = '1'; |
|
| 291 | + return $version; |
|
| 292 | 292 | } else { |
| 293 | 293 | $query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1"; |
| 294 | 294 | try { |
@@ -309,10 +309,10 @@ discard block |
||
| 309 | 309 | * @return Boolean if latest version or not |
| 310 | 310 | */ |
| 311 | 311 | public function latest() { |
| 312 | - global $globalNoDB; |
|
| 313 | - if (isset($globalNoDB) && $globalNoDB === TRUE) return true; |
|
| 314 | - if ($this->check_schema_version() == $this->latest_schema) return true; |
|
| 315 | - else return false; |
|
| 312 | + global $globalNoDB; |
|
| 313 | + if (isset($globalNoDB) && $globalNoDB === TRUE) return true; |
|
| 314 | + if ($this->check_schema_version() == $this->latest_schema) return true; |
|
| 315 | + else return false; |
|
| 316 | 316 | } |
| 317 | 317 | |
| 318 | 318 | } |
@@ -1,12 +1,12 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | require_once(dirname(__FILE__).'/settings.php'); |
| 3 | 3 | |
| 4 | -class Connection{ |
|
| 4 | +class Connection { |
|
| 5 | 5 | public $db = null; |
| 6 | 6 | public $dbs = array(); |
| 7 | 7 | public $latest_schema = 46; |
| 8 | 8 | |
| 9 | - public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) { |
|
| 9 | + public function __construct($dbc = null, $dbname = null, $user = null, $pass = null) { |
|
| 10 | 10 | global $globalNoDB; |
| 11 | 11 | if (isset($globalNoDB) && $globalNoDB === TRUE) { |
| 12 | 12 | $this->db = null; |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | if ($user === null && $pass === null) { |
| 17 | 17 | $this->createDBConnection(); |
| 18 | 18 | } else { |
| 19 | - $this->createDBConnection(null,$user,$pass); |
|
| 19 | + $this->createDBConnection(null, $user, $pass); |
|
| 20 | 20 | } |
| 21 | 21 | } else { |
| 22 | 22 | $this->createDBConnection($dbname); |
@@ -100,14 +100,14 @@ discard block |
||
| 100 | 100 | while (true) { |
| 101 | 101 | try { |
| 102 | 102 | if ($globalDBSdriver == 'mysql') { |
| 103 | - $this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;charset=utf8", $globalDBSuser, $globalDBSpass); |
|
| 103 | + $this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;charset=utf8", $globalDBSuser, $globalDBSpass); |
|
| 104 | 104 | $this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'"); |
| 105 | 105 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
| 106 | - $this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER); |
|
| 107 | - if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500); |
|
| 108 | - else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut); |
|
| 109 | - if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true); |
|
| 110 | - else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent); |
|
| 106 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER); |
|
| 107 | + if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, 500); |
|
| 108 | + else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, $globalDBTimeOut); |
|
| 109 | + if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, true); |
|
| 110 | + else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, $globalDBPersistent); |
|
| 111 | 111 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true); |
| 112 | 112 | $this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true); |
| 113 | 113 | // Workaround against "ONLY_FULL_GROUP_BY" mode |
@@ -117,19 +117,19 @@ discard block |
||
| 117 | 117 | $this->dbs[$DBname]->exec('SET SESSION time_zone = "+00:00"'); |
| 118 | 118 | //$this->dbs[$DBname]->exec('SET @@session.time_zone = "+00:00"'); |
| 119 | 119 | } else { |
| 120 | - $this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;options='--client_encoding=utf8'", $globalDBSuser, $globalDBSpass); |
|
| 120 | + $this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;options='--client_encoding=utf8'", $globalDBSuser, $globalDBSpass); |
|
| 121 | 121 | //$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'"); |
| 122 | 122 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
| 123 | - $this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER); |
|
| 124 | - if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200); |
|
| 125 | - else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut); |
|
| 126 | - if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true); |
|
| 127 | - else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent); |
|
| 123 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER); |
|
| 124 | + if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, 200); |
|
| 125 | + else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, $globalDBTimeOut); |
|
| 126 | + if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, true); |
|
| 127 | + else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, $globalDBPersistent); |
|
| 128 | 128 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true); |
| 129 | 129 | $this->dbs[$DBname]->exec('SET timezone="UTC"'); |
| 130 | 130 | } |
| 131 | 131 | break; |
| 132 | - } catch(PDOException $e) { |
|
| 132 | + } catch (PDOException $e) { |
|
| 133 | 133 | $i++; |
| 134 | 134 | if (isset($globalDebug) && $globalDebug) echo 'Error connecting to DB: '.$globalDBSname.' - Error: '.$e->getMessage()."\n"; |
| 135 | 135 | //exit; |
@@ -154,10 +154,10 @@ discard block |
||
| 154 | 154 | try { |
| 155 | 155 | //$Connection = new Connection(); |
| 156 | 156 | $results = $this->db->query($query); |
| 157 | - } catch(PDOException $e) { |
|
| 157 | + } catch (PDOException $e) { |
|
| 158 | 158 | return false; |
| 159 | 159 | } |
| 160 | - if($results->rowCount()>0) { |
|
| 160 | + if ($results->rowCount() > 0) { |
|
| 161 | 161 | return true; |
| 162 | 162 | } |
| 163 | 163 | else return false; |
@@ -179,8 +179,8 @@ discard block |
||
| 179 | 179 | return false; |
| 180 | 180 | } |
| 181 | 181 | |
| 182 | - } catch(PDOException $e) { |
|
| 183 | - if($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) { |
|
| 182 | + } catch (PDOException $e) { |
|
| 183 | + if ($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) { |
|
| 184 | 184 | throw $e; |
| 185 | 185 | } |
| 186 | 186 | //echo 'error ! '.$e->getMessage(); |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | /* |
| 193 | 193 | * Check if index exist |
| 194 | 194 | */ |
| 195 | - public function indexExists($table,$index) |
|
| 195 | + public function indexExists($table, $index) |
|
| 196 | 196 | { |
| 197 | 197 | global $globalDBdriver, $globalDBname; |
| 198 | 198 | if ($globalDBdriver == 'mysql') { |
@@ -203,11 +203,11 @@ discard block |
||
| 203 | 203 | try { |
| 204 | 204 | //$Connection = new Connection(); |
| 205 | 205 | $results = $this->db->query($query); |
| 206 | - } catch(PDOException $e) { |
|
| 206 | + } catch (PDOException $e) { |
|
| 207 | 207 | return false; |
| 208 | 208 | } |
| 209 | 209 | $nb = $results->fetchAll(PDO::FETCH_ASSOC); |
| 210 | - if($nb[0]['nb'] > 0) { |
|
| 210 | + if ($nb[0]['nb'] > 0) { |
|
| 211 | 211 | return true; |
| 212 | 212 | } |
| 213 | 213 | else return false; |
@@ -222,7 +222,7 @@ discard block |
||
| 222 | 222 | $query = "SELECT * FROM ".$table." LIMIT 0"; |
| 223 | 223 | try { |
| 224 | 224 | $results = $this->db->query($query); |
| 225 | - } catch(PDOException $e) { |
|
| 225 | + } catch (PDOException $e) { |
|
| 226 | 226 | return "error : ".$e->getMessage()."\n"; |
| 227 | 227 | } |
| 228 | 228 | $columns = array(); |
@@ -234,7 +234,7 @@ discard block |
||
| 234 | 234 | return $columns; |
| 235 | 235 | } |
| 236 | 236 | |
| 237 | - public function getColumnType($table,$column) { |
|
| 237 | + public function getColumnType($table, $column) { |
|
| 238 | 238 | $select = $this->db->query('SELECT '.$column.' FROM '.$table); |
| 239 | 239 | $tomet = $select->getColumnMeta(0); |
| 240 | 240 | return $tomet['native_type']; |
@@ -244,7 +244,7 @@ discard block |
||
| 244 | 244 | * Check if a column name exist in a table |
| 245 | 245 | * @return Boolean column exist or not |
| 246 | 246 | */ |
| 247 | - public function checkColumnName($table,$name) |
|
| 247 | + public function checkColumnName($table, $name) |
|
| 248 | 248 | { |
| 249 | 249 | global $globalDBdriver, $globalDBname; |
| 250 | 250 | if ($globalDBdriver == 'mysql') { |
@@ -254,8 +254,8 @@ discard block |
||
| 254 | 254 | } |
| 255 | 255 | try { |
| 256 | 256 | $sth = $this->db()->prepare($query); |
| 257 | - $sth->execute(array(':database' => $globalDBname,':table' => $table,':name' => $name)); |
|
| 258 | - } catch(PDOException $e) { |
|
| 257 | + $sth->execute(array(':database' => $globalDBname, ':table' => $table, ':name' => $name)); |
|
| 258 | + } catch (PDOException $e) { |
|
| 259 | 259 | echo "error : ".$e->getMessage()."\n"; |
| 260 | 260 | } |
| 261 | 261 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -294,7 +294,7 @@ discard block |
||
| 294 | 294 | try { |
| 295 | 295 | $sth = $this->db->prepare($query); |
| 296 | 296 | $sth->execute(); |
| 297 | - } catch(PDOException $e) { |
|
| 297 | + } catch (PDOException $e) { |
|
| 298 | 298 | return "error : ".$e->getMessage()."\n"; |
| 299 | 299 | } |
| 300 | 300 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -6,6 +6,9 @@ discard block |
||
| 6 | 6 | public $dbs = array(); |
| 7 | 7 | public $latest_schema = 46; |
| 8 | 8 | |
| 9 | + /** |
|
| 10 | + * @param string $dbname |
|
| 11 | + */ |
|
| 9 | 12 | public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) { |
| 10 | 13 | global $globalNoDB; |
| 11 | 14 | if (isset($globalNoDB) && $globalNoDB === TRUE) { |
@@ -142,6 +145,9 @@ discard block |
||
| 142 | 145 | return true; |
| 143 | 146 | } |
| 144 | 147 | |
| 148 | + /** |
|
| 149 | + * @param string $table |
|
| 150 | + */ |
|
| 145 | 151 | public function tableExists($table) |
| 146 | 152 | { |
| 147 | 153 | global $globalDBdriver, $globalDBname; |
@@ -192,6 +198,11 @@ discard block |
||
| 192 | 198 | /* |
| 193 | 199 | * Check if index exist |
| 194 | 200 | */ |
| 201 | + |
|
| 202 | + /** |
|
| 203 | + * @param string $table |
|
| 204 | + * @param string $index |
|
| 205 | + */ |
|
| 195 | 206 | public function indexExists($table,$index) |
| 196 | 207 | { |
| 197 | 208 | global $globalDBdriver, $globalDBname; |
@@ -234,6 +245,10 @@ discard block |
||
| 234 | 245 | return $columns; |
| 235 | 246 | } |
| 236 | 247 | |
| 248 | + /** |
|
| 249 | + * @param string $table |
|
| 250 | + * @param string $column |
|
| 251 | + */ |
|
| 237 | 252 | public function getColumnType($table,$column) { |
| 238 | 253 | $select = $this->db->query('SELECT '.$column.' FROM '.$table); |
| 239 | 254 | $tomet = $select->getColumnMeta(0); |
@@ -244,6 +259,11 @@ discard block |
||
| 244 | 259 | * Check if a column name exist in a table |
| 245 | 260 | * @return Boolean column exist or not |
| 246 | 261 | */ |
| 262 | + |
|
| 263 | + /** |
|
| 264 | + * @param string $table |
|
| 265 | + * @param string $name |
|
| 266 | + */ |
|
| 247 | 267 | public function checkColumnName($table,$name) |
| 248 | 268 | { |
| 249 | 269 | global $globalDBdriver, $globalDBname; |
@@ -73,8 +73,11 @@ discard block |
||
| 73 | 73 | $globalDBSname = $globalDBname; |
| 74 | 74 | $globalDBSuser = $globalDBuser; |
| 75 | 75 | $globalDBSpass = $globalDBpass; |
| 76 | - if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') $globalDBSport = 3306; |
|
| 77 | - else $globalDBSport = $globalDBport; |
|
| 76 | + if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') { |
|
| 77 | + $globalDBSport = 3306; |
|
| 78 | + } else { |
|
| 79 | + $globalDBSport = $globalDBport; |
|
| 80 | + } |
|
| 78 | 81 | } else { |
| 79 | 82 | $DBname = 'default'; |
| 80 | 83 | $globalDBSdriver = $globalDBdriver; |
@@ -82,8 +85,11 @@ discard block |
||
| 82 | 85 | $globalDBSname = $globalDBname; |
| 83 | 86 | $globalDBSuser = $user; |
| 84 | 87 | $globalDBSpass = $pass; |
| 85 | - if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') $globalDBSport = 3306; |
|
| 86 | - else $globalDBSport = $globalDBport; |
|
| 88 | + if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') { |
|
| 89 | + $globalDBSport = 3306; |
|
| 90 | + } else { |
|
| 91 | + $globalDBSport = $globalDBport; |
|
| 92 | + } |
|
| 87 | 93 | } |
| 88 | 94 | } else { |
| 89 | 95 | $globalDBSdriver = $globalDB[$DBname]['driver']; |
@@ -91,12 +97,19 @@ discard block |
||
| 91 | 97 | $globalDBSname = $globalDB[$DBname]['name']; |
| 92 | 98 | $globalDBSuser = $globalDB[$DBname]['user']; |
| 93 | 99 | $globalDBSpass = $globalDB[$DBname]['pass']; |
| 94 | - if (isset($globalDB[$DBname]['port'])) $globalDBSport = $globalDB[$DBname]['port']; |
|
| 95 | - else $globalDBSport = 3306; |
|
| 100 | + if (isset($globalDB[$DBname]['port'])) { |
|
| 101 | + $globalDBSport = $globalDB[$DBname]['port']; |
|
| 102 | + } else { |
|
| 103 | + $globalDBSport = 3306; |
|
| 104 | + } |
|
| 105 | + } |
|
| 106 | + if ($globalDBSname == '' || $globalDBSuser == '') { |
|
| 107 | + return false; |
|
| 96 | 108 | } |
| 97 | - if ($globalDBSname == '' || $globalDBSuser == '') return false; |
|
| 98 | 109 | // Set number of try to connect to DB |
| 99 | - if (!isset($globalDBretry) || $globalDBretry == '' || $globalDBretry === NULL) $globalDBretry = 5; |
|
| 110 | + if (!isset($globalDBretry) || $globalDBretry == '' || $globalDBretry === NULL) { |
|
| 111 | + $globalDBretry = 5; |
|
| 112 | + } |
|
| 100 | 113 | $i = 0; |
| 101 | 114 | while (true) { |
| 102 | 115 | try { |
@@ -105,10 +118,16 @@ discard block |
||
| 105 | 118 | $this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'"); |
| 106 | 119 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
| 107 | 120 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER); |
| 108 | - if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500); |
|
| 109 | - else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut); |
|
| 110 | - if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true); |
|
| 111 | - else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent); |
|
| 121 | + if (!isset($globalDBTimeOut)) { |
|
| 122 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500); |
|
| 123 | + } else { |
|
| 124 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut); |
|
| 125 | + } |
|
| 126 | + if (!isset($globalDBPersistent)) { |
|
| 127 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true); |
|
| 128 | + } else { |
|
| 129 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent); |
|
| 130 | + } |
|
| 112 | 131 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true); |
| 113 | 132 | $this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true); |
| 114 | 133 | // Workaround against "ONLY_FULL_GROUP_BY" mode |
@@ -122,24 +141,36 @@ discard block |
||
| 122 | 141 | //$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'"); |
| 123 | 142 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
| 124 | 143 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER); |
| 125 | - if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200); |
|
| 126 | - else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut); |
|
| 127 | - if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true); |
|
| 128 | - else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent); |
|
| 144 | + if (!isset($globalDBTimeOut)) { |
|
| 145 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200); |
|
| 146 | + } else { |
|
| 147 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut); |
|
| 148 | + } |
|
| 149 | + if (!isset($globalDBPersistent)) { |
|
| 150 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true); |
|
| 151 | + } else { |
|
| 152 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent); |
|
| 153 | + } |
|
| 129 | 154 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true); |
| 130 | 155 | $this->dbs[$DBname]->exec('SET timezone="UTC"'); |
| 131 | 156 | } |
| 132 | 157 | break; |
| 133 | 158 | } catch(PDOException $e) { |
| 134 | 159 | $i++; |
| 135 | - if (isset($globalDebug) && $globalDebug) echo 'Error connecting to DB: '.$globalDBSname.' - Error: '.$e->getMessage()."\n"; |
|
| 160 | + if (isset($globalDebug) && $globalDebug) { |
|
| 161 | + echo 'Error connecting to DB: '.$globalDBSname.' - Error: '.$e->getMessage()."\n"; |
|
| 162 | + } |
|
| 136 | 163 | //exit; |
| 137 | - if ($i > $globalDBretry) return false; |
|
| 164 | + if ($i > $globalDBretry) { |
|
| 165 | + return false; |
|
| 166 | + } |
|
| 138 | 167 | //return false; |
| 139 | 168 | } |
| 140 | 169 | sleep(2); |
| 141 | 170 | } |
| 142 | - if ($DBname === 'default') $this->db = $this->dbs['default']; |
|
| 171 | + if ($DBname === 'default') { |
|
| 172 | + $this->db = $this->dbs['default']; |
|
| 173 | + } |
|
| 143 | 174 | return true; |
| 144 | 175 | } |
| 145 | 176 | |
@@ -151,7 +182,9 @@ discard block |
||
| 151 | 182 | } else { |
| 152 | 183 | $query = "SELECT * FROM pg_catalog.pg_tables WHERE tablename = '".$table."'"; |
| 153 | 184 | } |
| 154 | - if ($this->db == NULL) return false; |
|
| 185 | + if ($this->db == NULL) { |
|
| 186 | + return false; |
|
| 187 | + } |
|
| 155 | 188 | try { |
| 156 | 189 | //$Connection = new Connection(); |
| 157 | 190 | $results = $this->db->query($query); |
@@ -160,22 +193,31 @@ discard block |
||
| 160 | 193 | } |
| 161 | 194 | if($results->rowCount()>0) { |
| 162 | 195 | return true; |
| 196 | + } else { |
|
| 197 | + return false; |
|
| 163 | 198 | } |
| 164 | - else return false; |
|
| 165 | 199 | } |
| 166 | 200 | |
| 167 | 201 | public function connectionExists() |
| 168 | 202 | { |
| 169 | 203 | global $globalDBdriver, $globalDBCheckConnection, $globalNoDB; |
| 170 | - if (isset($globalDBCheckConnection) && $globalDBCheckConnection === FALSE) return true; |
|
| 171 | - if (isset($globalNoDB) && $globalNoDB === TRUE) return true; |
|
| 204 | + if (isset($globalDBCheckConnection) && $globalDBCheckConnection === FALSE) { |
|
| 205 | + return true; |
|
| 206 | + } |
|
| 207 | + if (isset($globalNoDB) && $globalNoDB === TRUE) { |
|
| 208 | + return true; |
|
| 209 | + } |
|
| 172 | 210 | $query = "SELECT 1 + 1"; |
| 173 | - if ($this->db === null) return false; |
|
| 211 | + if ($this->db === null) { |
|
| 212 | + return false; |
|
| 213 | + } |
|
| 174 | 214 | try { |
| 175 | 215 | $sum = @$this->db->query($query); |
| 176 | 216 | if ($sum instanceof \PDOStatement) { |
| 177 | 217 | $sum = $sum->fetchColumn(0); |
| 178 | - } else $sum = 0; |
|
| 218 | + } else { |
|
| 219 | + $sum = 0; |
|
| 220 | + } |
|
| 179 | 221 | if (intval($sum) !== 2) { |
| 180 | 222 | return false; |
| 181 | 223 | } |
@@ -210,8 +252,9 @@ discard block |
||
| 210 | 252 | $nb = $results->fetchAll(PDO::FETCH_ASSOC); |
| 211 | 253 | if($nb[0]['nb'] > 0) { |
| 212 | 254 | return true; |
| 255 | + } else { |
|
| 256 | + return false; |
|
| 213 | 257 | } |
| 214 | - else return false; |
|
| 215 | 258 | } |
| 216 | 259 | |
| 217 | 260 | /* |
@@ -261,9 +304,12 @@ discard block |
||
| 261 | 304 | } |
| 262 | 305 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
| 263 | 306 | $sth->closeCursor(); |
| 264 | - if ($result['nb'] > 0) return true; |
|
| 265 | - else return false; |
|
| 266 | -/* } else { |
|
| 307 | + if ($result['nb'] > 0) { |
|
| 308 | + return true; |
|
| 309 | + } else { |
|
| 310 | + return false; |
|
| 311 | + } |
|
| 312 | + /* } else { |
|
| 267 | 313 | $query = "SELECT * FROM ".$table." LIMIT 0"; |
| 268 | 314 | try { |
| 269 | 315 | $results = $this->db->query($query); |
@@ -302,7 +348,9 @@ discard block |
||
| 302 | 348 | $sth->closeCursor(); |
| 303 | 349 | return $result['value']; |
| 304 | 350 | } |
| 305 | - } else return $version; |
|
| 351 | + } else { |
|
| 352 | + return $version; |
|
| 353 | + } |
|
| 306 | 354 | } |
| 307 | 355 | |
| 308 | 356 | /* |
@@ -311,9 +359,14 @@ discard block |
||
| 311 | 359 | */ |
| 312 | 360 | public function latest() { |
| 313 | 361 | global $globalNoDB; |
| 314 | - if (isset($globalNoDB) && $globalNoDB === TRUE) return true; |
|
| 315 | - if ($this->check_schema_version() == $this->latest_schema) return true; |
|
| 316 | - else return false; |
|
| 362 | + if (isset($globalNoDB) && $globalNoDB === TRUE) { |
|
| 363 | + return true; |
|
| 364 | + } |
|
| 365 | + if ($this->check_schema_version() == $this->latest_schema) { |
|
| 366 | + return true; |
|
| 367 | + } else { |
|
| 368 | + return false; |
|
| 369 | + } |
|
| 317 | 370 | } |
| 318 | 371 | |
| 319 | 372 | } |
@@ -124,11 +124,11 @@ discard block |
||
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | /** |
| 127 | - * Gets all launch site |
|
| 128 | - * |
|
| 129 | - * @return Array the launch site list |
|
| 130 | - * |
|
| 131 | - */ |
|
| 127 | + * Gets all launch site |
|
| 128 | + * |
|
| 129 | + * @return Array the launch site list |
|
| 130 | + * |
|
| 131 | + */ |
|
| 132 | 132 | public function countAllLaunchSite($limit = true, $filters = array()) |
| 133 | 133 | { |
| 134 | 134 | global $globalDBdriver; |
@@ -153,11 +153,11 @@ discard block |
||
| 153 | 153 | } |
| 154 | 154 | |
| 155 | 155 | /** |
| 156 | - * Gets all owners |
|
| 157 | - * |
|
| 158 | - * @return Array the owners list |
|
| 159 | - * |
|
| 160 | - */ |
|
| 156 | + * Gets all owners |
|
| 157 | + * |
|
| 158 | + * @return Array the owners list |
|
| 159 | + * |
|
| 160 | + */ |
|
| 161 | 161 | public function countAllOwners($limit = true, $filters = array()) |
| 162 | 162 | { |
| 163 | 163 | global $globalDBdriver; |
@@ -182,11 +182,11 @@ discard block |
||
| 182 | 182 | } |
| 183 | 183 | |
| 184 | 184 | /** |
| 185 | - * Gets all countries owners |
|
| 186 | - * |
|
| 187 | - * @return Array the countries list |
|
| 188 | - * |
|
| 189 | - */ |
|
| 185 | + * Gets all countries owners |
|
| 186 | + * |
|
| 187 | + * @return Array the countries list |
|
| 188 | + * |
|
| 189 | + */ |
|
| 190 | 190 | public function countAllCountriesOwners($limit = true, $filters = array()) |
| 191 | 191 | { |
| 192 | 192 | global $globalDBdriver; |
@@ -211,11 +211,11 @@ discard block |
||
| 211 | 211 | } |
| 212 | 212 | |
| 213 | 213 | /** |
| 214 | - * Counts all launch dates during the last year |
|
| 215 | - * |
|
| 216 | - * @return Array the launch date list |
|
| 217 | - * |
|
| 218 | - */ |
|
| 214 | + * Counts all launch dates during the last year |
|
| 215 | + * |
|
| 216 | + * @return Array the launch date list |
|
| 217 | + * |
|
| 218 | + */ |
|
| 219 | 219 | public function countAllMonthsLastYear($filters = array(), $sincedate = '') |
| 220 | 220 | { |
| 221 | 221 | global $globalTimezone, $globalDBdriver; |
@@ -256,11 +256,11 @@ discard block |
||
| 256 | 256 | } |
| 257 | 257 | |
| 258 | 258 | /** |
| 259 | - * Counts all dates during the last 10 years |
|
| 260 | - * |
|
| 261 | - * @return Array the date list |
|
| 262 | - * |
|
| 263 | - */ |
|
| 259 | + * Counts all dates during the last 10 years |
|
| 260 | + * |
|
| 261 | + * @return Array the date list |
|
| 262 | + * |
|
| 263 | + */ |
|
| 264 | 264 | public function countAllYears($filters = array(), $sincedate = '') |
| 265 | 265 | { |
| 266 | 266 | global $globalTimezone, $globalDBdriver; |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | try { |
| 21 | 21 | $sth = $this->db->prepare($query); |
| 22 | 22 | $sth->execute(array(':name' => $name)); |
| 23 | - } catch(PDOException $e) { |
|
| 23 | + } catch (PDOException $e) { |
|
| 24 | 24 | echo $e->getMessage(); |
| 25 | 25 | } |
| 26 | 26 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | try { |
| 33 | 33 | $sth = $this->db->prepare($query); |
| 34 | 34 | $sth->execute(); |
| 35 | - } catch(PDOException $e) { |
|
| 35 | + } catch (PDOException $e) { |
|
| 36 | 36 | echo $e->getMessage(); |
| 37 | 37 | } |
| 38 | 38 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | try { |
| 45 | 45 | $sth = $this->db->prepare($query); |
| 46 | 46 | $sth->execute(); |
| 47 | - } catch(PDOException $e) { |
|
| 47 | + } catch (PDOException $e) { |
|
| 48 | 48 | echo $e->getMessage(); |
| 49 | 49 | } |
| 50 | 50 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | try { |
| 57 | 57 | $sth = $this->db->prepare($query); |
| 58 | 58 | $sth->execute(array(':type' => $type)); |
| 59 | - } catch(PDOException $e) { |
|
| 59 | + } catch (PDOException $e) { |
|
| 60 | 60 | echo $e->getMessage(); |
| 61 | 61 | } |
| 62 | 62 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -64,49 +64,49 @@ discard block |
||
| 64 | 64 | else return array(); |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | - public function position_all($timestamp_begin = '',$timestamp_end = '',$second = 10) { |
|
| 67 | + public function position_all($timestamp_begin = '', $timestamp_end = '', $second = 10) { |
|
| 68 | 68 | $all_sat = $this->get_tle_names(); |
| 69 | 69 | $result = array(); |
| 70 | 70 | foreach ($all_sat as $sat) { |
| 71 | - $position = $this->position($sat['tle_name'],$timestamp_begin,$timestamp_end,$second); |
|
| 72 | - $result = array_merge($position,$result); |
|
| 71 | + $position = $this->position($sat['tle_name'], $timestamp_begin, $timestamp_end, $second); |
|
| 72 | + $result = array_merge($position, $result); |
|
| 73 | 73 | } |
| 74 | 74 | return $result; |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - public function position_all_type($type,$timestamp_begin = '',$timestamp_end = '',$second = 10) { |
|
| 77 | + public function position_all_type($type, $timestamp_begin = '', $timestamp_end = '', $second = 10) { |
|
| 78 | 78 | $all_sat = $this->get_tle_names_type($type); |
| 79 | 79 | $result = array(); |
| 80 | 80 | foreach ($all_sat as $sat) { |
| 81 | - $position = $this->position($sat['tle_name'],$timestamp_begin,$timestamp_end,$second); |
|
| 82 | - if (isset($position[0])) $result = array_merge($position,$result); |
|
| 81 | + $position = $this->position($sat['tle_name'], $timestamp_begin, $timestamp_end, $second); |
|
| 82 | + if (isset($position[0])) $result = array_merge($position, $result); |
|
| 83 | 83 | else $result[] = $position; |
| 84 | 84 | } |
| 85 | 85 | return $result; |
| 86 | 86 | } |
| 87 | 87 | |
| 88 | - public function position($name,$timestamp_begin = '',$timestamp_end = '',$second = 10) { |
|
| 88 | + public function position($name, $timestamp_begin = '', $timestamp_end = '', $second = 10) { |
|
| 89 | 89 | $qth = new Predict_QTH(); |
| 90 | 90 | $qth->lat = floatval(37.790252); |
| 91 | 91 | $qth->lon = floatval(-122.419968); |
| 92 | 92 | |
| 93 | 93 | $tle_file = $this->get_tle($name); |
| 94 | 94 | $type = $tle_file['tle_type']; |
| 95 | - $tle = new Predict_TLE($tle_file['tle_name'],$tle_file['tle_tle1'],$tle_file['tle_tle2']); |
|
| 95 | + $tle = new Predict_TLE($tle_file['tle_name'], $tle_file['tle_tle1'], $tle_file['tle_tle2']); |
|
| 96 | 96 | $sat = new Predict_Sat($tle); |
| 97 | 97 | $predict = new Predict(); |
| 98 | 98 | //if ($timestamp == '') $now = Predict_Time::get_current_daynum(); |
| 99 | 99 | if ($timestamp_begin == '') $timestamp_begin = time(); |
| 100 | 100 | if ($timestamp_end == '') { |
| 101 | 101 | $now = Predict_Time::unix2daynum($timestamp_begin); |
| 102 | - $predict->predict_calc($sat,$qth,$now); |
|
| 103 | - return array('name' => $name, 'latitude' => $sat->ssplat,'longitude' => $sat->ssplon, 'altitude' => $sat->alt,'speed' => $sat->velo*60*60,'timestamp' => $timestamp_begin,'type' => $type); |
|
| 102 | + $predict->predict_calc($sat, $qth, $now); |
|
| 103 | + return array('name' => $name, 'latitude' => $sat->ssplat, 'longitude' => $sat->ssplon, 'altitude' => $sat->alt, 'speed' => $sat->velo*60*60, 'timestamp' => $timestamp_begin, 'type' => $type); |
|
| 104 | 104 | } else { |
| 105 | 105 | $result = array(); |
| 106 | - for ($timestamp = $timestamp_begin; $timestamp <= $timestamp_end; $timestamp=$timestamp+$second) { |
|
| 106 | + for ($timestamp = $timestamp_begin; $timestamp <= $timestamp_end; $timestamp = $timestamp + $second) { |
|
| 107 | 107 | $now = Predict_Time::unix2daynum($timestamp); |
| 108 | - $predict->predict_calc($sat,$qth,$now); |
|
| 109 | - $result[] = array('name' => $name,'latitude' => $sat->ssplat,'longitude' => $sat->ssplon, 'altitude' => $sat->alt,'speed' => $sat->velo*60*60,'timestamp' => $timestamp,'type' => $type); |
|
| 108 | + $predict->predict_calc($sat, $qth, $now); |
|
| 109 | + $result[] = array('name' => $name, 'latitude' => $sat->ssplat, 'longitude' => $sat->ssplon, 'altitude' => $sat->alt, 'speed' => $sat->velo*60*60, 'timestamp' => $timestamp, 'type' => $type); |
|
| 110 | 110 | } |
| 111 | 111 | return $result; |
| 112 | 112 | } |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | try { |
| 118 | 118 | $sth = $this->db->prepare($query); |
| 119 | 119 | $sth->execute(array(':name' => $name.'%')); |
| 120 | - } catch(PDOException $e) { |
|
| 120 | + } catch (PDOException $e) { |
|
| 121 | 121 | echo $e->getMessage(); |
| 122 | 122 | } |
| 123 | 123 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | $sth->execute($query_values); |
| 146 | 146 | $launch_site_array = array(); |
| 147 | 147 | $temp_array = array(); |
| 148 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 148 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 149 | 149 | { |
| 150 | 150 | $temp_array['launch_site'] = $row['launch_site']; |
| 151 | 151 | $temp_array['launch_site_count'] = $row['launch_site_count']; |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | $sth->execute($query_values); |
| 175 | 175 | $owner_array = array(); |
| 176 | 176 | $temp_array = array(); |
| 177 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 177 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 178 | 178 | { |
| 179 | 179 | $temp_array['owner_name'] = $row['owner_name']; |
| 180 | 180 | $temp_array['owner_count'] = $row['owner_count']; |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | $sth->execute($query_values); |
| 204 | 204 | $owner_array = array(); |
| 205 | 205 | $temp_array = array(); |
| 206 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 206 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 207 | 207 | { |
| 208 | 208 | $temp_array['country_name'] = $row['country_name']; |
| 209 | 209 | $temp_array['country_count'] = $row['country_count']; |
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | $sth->execute($query_data); |
| 248 | 248 | $date_array = array(); |
| 249 | 249 | $temp_array = array(); |
| 250 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 250 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 251 | 251 | { |
| 252 | 252 | $temp_array['year_name'] = $row['year_name']; |
| 253 | 253 | $temp_array['month_name'] = $row['month_name']; |
@@ -292,7 +292,7 @@ discard block |
||
| 292 | 292 | $sth->execute($query_data); |
| 293 | 293 | $date_array = array(); |
| 294 | 294 | $temp_array = array(); |
| 295 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 295 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 296 | 296 | { |
| 297 | 297 | $temp_array['year_name'] = $row['year_name']; |
| 298 | 298 | $temp_array['date_count'] = $row['date_count']; |
@@ -12,7 +12,9 @@ discard block |
||
| 12 | 12 | public function __construct($dbc = null) { |
| 13 | 13 | $Connection = new Connection($dbc); |
| 14 | 14 | $this->db = $Connection->db(); |
| 15 | - if ($this->db === null) die('Error: No DB connection.'); |
|
| 15 | + if ($this->db === null) { |
|
| 16 | + die('Error: No DB connection.'); |
|
| 17 | + } |
|
| 16 | 18 | } |
| 17 | 19 | |
| 18 | 20 | public function get_tle($name) { |
@@ -24,8 +26,11 @@ discard block |
||
| 24 | 26 | echo $e->getMessage(); |
| 25 | 27 | } |
| 26 | 28 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 27 | - if (isset($result[0])) return $result[0]; |
|
| 28 | - else return array(); |
|
| 29 | + if (isset($result[0])) { |
|
| 30 | + return $result[0]; |
|
| 31 | + } else { |
|
| 32 | + return array(); |
|
| 33 | + } |
|
| 29 | 34 | } |
| 30 | 35 | public function get_tle_types() { |
| 31 | 36 | $query = 'SELECT DISTINCT tle_type FROM tle ORDER BY tle_type'; |
@@ -36,8 +41,11 @@ discard block |
||
| 36 | 41 | echo $e->getMessage(); |
| 37 | 42 | } |
| 38 | 43 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 39 | - if (isset($result[0])) return $result; |
|
| 40 | - else return array(); |
|
| 44 | + if (isset($result[0])) { |
|
| 45 | + return $result; |
|
| 46 | + } else { |
|
| 47 | + return array(); |
|
| 48 | + } |
|
| 41 | 49 | } |
| 42 | 50 | public function get_tle_names() { |
| 43 | 51 | $query = 'SELECT DISTINCT tle_name, tle_type FROM tle'; |
@@ -48,8 +56,11 @@ discard block |
||
| 48 | 56 | echo $e->getMessage(); |
| 49 | 57 | } |
| 50 | 58 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 51 | - if (isset($result[0])) return $result; |
|
| 52 | - else return array(); |
|
| 59 | + if (isset($result[0])) { |
|
| 60 | + return $result; |
|
| 61 | + } else { |
|
| 62 | + return array(); |
|
| 63 | + } |
|
| 53 | 64 | } |
| 54 | 65 | public function get_tle_names_type($type) { |
| 55 | 66 | $query = 'SELECT tle_name, tle_type FROM tle WHERE tle_type = :type ORDER BY tle_name'; |
@@ -60,8 +71,11 @@ discard block |
||
| 60 | 71 | echo $e->getMessage(); |
| 61 | 72 | } |
| 62 | 73 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 63 | - if (isset($result[0])) return $result; |
|
| 64 | - else return array(); |
|
| 74 | + if (isset($result[0])) { |
|
| 75 | + return $result; |
|
| 76 | + } else { |
|
| 77 | + return array(); |
|
| 78 | + } |
|
| 65 | 79 | } |
| 66 | 80 | |
| 67 | 81 | public function position_all($timestamp_begin = '',$timestamp_end = '',$second = 10) { |
@@ -79,8 +93,11 @@ discard block |
||
| 79 | 93 | $result = array(); |
| 80 | 94 | foreach ($all_sat as $sat) { |
| 81 | 95 | $position = $this->position($sat['tle_name'],$timestamp_begin,$timestamp_end,$second); |
| 82 | - if (isset($position[0])) $result = array_merge($position,$result); |
|
| 83 | - else $result[] = $position; |
|
| 96 | + if (isset($position[0])) { |
|
| 97 | + $result = array_merge($position,$result); |
|
| 98 | + } else { |
|
| 99 | + $result[] = $position; |
|
| 100 | + } |
|
| 84 | 101 | } |
| 85 | 102 | return $result; |
| 86 | 103 | } |
@@ -96,7 +113,9 @@ discard block |
||
| 96 | 113 | $sat = new Predict_Sat($tle); |
| 97 | 114 | $predict = new Predict(); |
| 98 | 115 | //if ($timestamp == '') $now = Predict_Time::get_current_daynum(); |
| 99 | - if ($timestamp_begin == '') $timestamp_begin = time(); |
|
| 116 | + if ($timestamp_begin == '') { |
|
| 117 | + $timestamp_begin = time(); |
|
| 118 | + } |
|
| 100 | 119 | if ($timestamp_end == '') { |
| 101 | 120 | $now = Predict_Time::unix2daynum($timestamp_begin); |
| 102 | 121 | $predict->predict_calc($sat,$qth,$now); |
@@ -121,8 +140,11 @@ discard block |
||
| 121 | 140 | echo $e->getMessage(); |
| 122 | 141 | } |
| 123 | 142 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 124 | - if (isset($result[0])) return $result[0]; |
|
| 125 | - else return array(); |
|
| 143 | + if (isset($result[0])) { |
|
| 144 | + return $result[0]; |
|
| 145 | + } else { |
|
| 146 | + return array(); |
|
| 147 | + } |
|
| 126 | 148 | } |
| 127 | 149 | |
| 128 | 150 | /** |
@@ -140,7 +162,9 @@ discard block |
||
| 140 | 162 | FROM satellite".$filter_query." satellite.launch_site <> '' AND satellite.launch_site IS NOT NULL"; |
| 141 | 163 | $query_values = array(); |
| 142 | 164 | $query .= " GROUP BY satellite.launch_site ORDER BY launch_site_count DESC"; |
| 143 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 165 | + if ($limit) { |
|
| 166 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 167 | + } |
|
| 144 | 168 | $sth = $this->db->prepare($query); |
| 145 | 169 | $sth->execute($query_values); |
| 146 | 170 | $launch_site_array = array(); |
@@ -169,7 +193,9 @@ discard block |
||
| 169 | 193 | FROM satellite".$filter_query." satellite.owner <> '' AND satellite.owner IS NOT NULL"; |
| 170 | 194 | $query_values = array(); |
| 171 | 195 | $query .= " GROUP BY satellite.owner ORDER BY owner_count DESC"; |
| 172 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 196 | + if ($limit) { |
|
| 197 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 198 | + } |
|
| 173 | 199 | $sth = $this->db->prepare($query); |
| 174 | 200 | $sth->execute($query_values); |
| 175 | 201 | $owner_array = array(); |
@@ -198,7 +224,9 @@ discard block |
||
| 198 | 224 | FROM satellite".$filter_query." satellite.country_owner <> '' AND satellite.country_owner IS NOT NULL"; |
| 199 | 225 | $query_values = array(); |
| 200 | 226 | $query .= " GROUP BY satellite.country_owner ORDER BY country_count DESC"; |
| 201 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 227 | + if ($limit) { |
|
| 228 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 229 | + } |
|
| 202 | 230 | $sth = $this->db->prepare($query); |
| 203 | 231 | $sth->execute($query_values); |
| 204 | 232 | $owner_array = array(); |
@@ -225,20 +253,26 @@ discard block |
||
| 225 | 253 | date_default_timezone_set($globalTimezone); |
| 226 | 254 | $datetime = new DateTime(); |
| 227 | 255 | $offset = $datetime->format('P'); |
| 228 | - } else $offset = '+00:00'; |
|
| 256 | + } else { |
|
| 257 | + $offset = '+00:00'; |
|
| 258 | + } |
|
| 229 | 259 | //$filter_query = $this->getFilter($filters,true,true); |
| 230 | 260 | $filter_query = ' WHERE'; |
| 231 | 261 | if ($globalDBdriver == 'mysql') { |
| 232 | 262 | $query = "SELECT MONTH(CONVERT_TZ(satellite.launch_date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(satellite.launch_date,'+00:00', :offset)) AS year_name, count(*) as date_count |
| 233 | 263 | FROM satellite".$filter_query." satellite.launch_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 YEAR)"; |
| 234 | - if ($sincedate != '') $query .= " AND satellite.launch_date > '".$sincedate."'"; |
|
| 264 | + if ($sincedate != '') { |
|
| 265 | + $query .= " AND satellite.launch_date > '".$sincedate."'"; |
|
| 266 | + } |
|
| 235 | 267 | $query .= " GROUP BY year_name, month_name |
| 236 | 268 | ORDER BY year_name, month_name ASC"; |
| 237 | 269 | $query_data = array(':offset' => $offset); |
| 238 | 270 | } else { |
| 239 | 271 | $query = "SELECT EXTRACT(MONTH FROM satellite.launch_date AT TIME ZONE INTERVAL :offset) AS month_name, EXTRACT(YEAR FROM satellite.launch_date AT TIME ZONE INTERVAL :offset) AS year_name, count(*) as date_count |
| 240 | 272 | FROM satellite".$filter_query." satellite.launch_date >= CURRENT_TIMESTAMP AT TIME ZONE INTERVAL :offset - INTERVAL '1 YEARS'"; |
| 241 | - if ($sincedate != '') $query .= " AND satellite.launch_date > '".$sincedate."'"; |
|
| 273 | + if ($sincedate != '') { |
|
| 274 | + $query .= " AND satellite.launch_date > '".$sincedate."'"; |
|
| 275 | + } |
|
| 242 | 276 | $query .= " GROUP BY year_name, month_name |
| 243 | 277 | ORDER BY year_name, month_name ASC"; |
| 244 | 278 | $query_data = array(':offset' => $offset); |
@@ -270,20 +304,26 @@ discard block |
||
| 270 | 304 | date_default_timezone_set($globalTimezone); |
| 271 | 305 | $datetime = new DateTime(); |
| 272 | 306 | $offset = $datetime->format('P'); |
| 273 | - } else $offset = '+00:00'; |
|
| 307 | + } else { |
|
| 308 | + $offset = '+00:00'; |
|
| 309 | + } |
|
| 274 | 310 | //$filter_query = $this->getFilter($filters,true,true); |
| 275 | 311 | $filter_query = ' WHERE'; |
| 276 | 312 | if ($globalDBdriver == 'mysql') { |
| 277 | 313 | $query = "SELECT YEAR(CONVERT_TZ(satellite.launch_date,'+00:00', :offset)) AS year_name, count(*) as date_count |
| 278 | 314 | FROM satellite".$filter_query." satellite.launch_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 10 YEAR)"; |
| 279 | - if ($sincedate != '') $query .= " AND satellite.launch_date > '".$sincedate."'"; |
|
| 315 | + if ($sincedate != '') { |
|
| 316 | + $query .= " AND satellite.launch_date > '".$sincedate."'"; |
|
| 317 | + } |
|
| 280 | 318 | $query .= " GROUP BY year_name |
| 281 | 319 | ORDER BY year_name ASC"; |
| 282 | 320 | $query_data = array(':offset' => $offset); |
| 283 | 321 | } else { |
| 284 | 322 | $query = "SELECT EXTRACT(YEAR FROM satellite.launch_date AT TIME ZONE INTERVAL :offset) AS year_name, count(*) as date_count |
| 285 | 323 | FROM satellite".$filter_query." satellite.launch_date >= CURRENT_TIMESTAMP AT TIME ZONE INTERVAL :offset - INTERVAL '10 YEARS'"; |
| 286 | - if ($sincedate != '') $query .= " AND satellite.launch_date > '".$sincedate."'"; |
|
| 324 | + if ($sincedate != '') { |
|
| 325 | + $query .= " AND satellite.launch_date > '".$sincedate."'"; |
|
| 326 | + } |
|
| 287 | 327 | $query .= " GROUP BY year_name |
| 288 | 328 | ORDER BY year_name ASC"; |
| 289 | 329 | $query_data = array(':offset' => $offset); |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | <button type="button" class="close">×</button> |
| 10 | 10 | <?php |
| 11 | 11 | |
| 12 | -$sat = filter_input(INPUT_GET,'sat',FILTER_SANITIZE_STRING); |
|
| 12 | +$sat = filter_input(INPUT_GET, 'sat', FILTER_SANITIZE_STRING); |
|
| 13 | 13 | $sat = urldecode($sat); |
| 14 | 14 | //$info = $Satellite->get_info(str_replace(' ','-',$sat)); |
| 15 | 15 | //print_r($info); |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | $aircraft_name = 'INTEGRAL'; |
| 49 | 49 | // $ground_speed = 14970; |
| 50 | 50 | $launch_date = '17 October 2002'; |
| 51 | -} elseif (strpos($sat,'IRIDIUM') !== false) { |
|
| 51 | +} elseif (strpos($sat, 'IRIDIUM') !== false) { |
|
| 52 | 52 | $image = 'https://upload.wikimedia.org/wikipedia/commons/b/b6/Iridium_Satellite.jpg'; |
| 53 | 53 | $image_copyright = 'Cliff'; |
| 54 | 54 | $ident = 'Iridium satellite constellation'; |
@@ -56,23 +56,23 @@ discard block |
||
| 56 | 56 | $aircraft_name = $sat; |
| 57 | 57 | // $ground_speed = 14970; |
| 58 | 58 | // $launch_date = '29 september 2011'; |
| 59 | -} elseif (strpos($sat,'ORBCOMM') !== false) { |
|
| 59 | +} elseif (strpos($sat, 'ORBCOMM') !== false) { |
|
| 60 | 60 | $ident = 'Orbcomm'; |
| 61 | 61 | $aircraft_wiki = 'https://en.wikipedia.org/wiki/Orbcomm_(satellite)'; |
| 62 | 62 | $aircraft_name = $sat; |
| 63 | -} elseif (strpos($sat,'GLOBALSTAR') !== false) { |
|
| 63 | +} elseif (strpos($sat, 'GLOBALSTAR') !== false) { |
|
| 64 | 64 | $ident = 'Globalstar'; |
| 65 | 65 | $aircraft_wiki = 'https://en.wikipedia.org/wiki/Globalstar'; |
| 66 | 66 | $aircraft_name = $sat; |
| 67 | - $satname = str_replace(array('[+]','[-]'),'',$sat); |
|
| 68 | -} elseif (strpos($sat,'OSCAR 7') !== false) { |
|
| 67 | + $satname = str_replace(array('[+]', '[-]'), '', $sat); |
|
| 68 | +} elseif (strpos($sat, 'OSCAR 7') !== false) { |
|
| 69 | 69 | $image = 'https://upload.wikimedia.org/wikipedia/en/a/ad/AMSAT-OSCAR_7.jpg'; |
| 70 | 70 | $image_copyright = 'Amsat.org'; |
| 71 | 71 | $ident = 'AMSAT-OSCAR 7'; |
| 72 | 72 | $aircraft_wiki = 'https://en.wikipedia.org/wiki/AMSAT-OSCAR_7'; |
| 73 | 73 | $aircraft_name = $sat; |
| 74 | 74 | $launch_date = '15 November 1974'; |
| 75 | -} elseif (strpos($sat,'santaclaus') !== false) { |
|
| 75 | +} elseif (strpos($sat, 'santaclaus') !== false) { |
|
| 76 | 76 | $image = 'https://upload.wikimedia.org/wikipedia/commons/4/49/Jonathan_G_Meath_portrays_Santa_Claus.jpg'; |
| 77 | 77 | $image_copyright = 'Jonathan G Meath'; |
| 78 | 78 | $ident = 'Santa Claus'; |
@@ -81,8 +81,8 @@ discard block |
||
| 81 | 81 | // $launch_date = '15 November 1974'; |
| 82 | 82 | } else { |
| 83 | 83 | $ident = $sat; |
| 84 | - if (strpos($sat,'(')) $satname = $sat; |
|
| 85 | - else $satname = str_replace(array(' '),'-',$sat); |
|
| 84 | + if (strpos($sat, '(')) $satname = $sat; |
|
| 85 | + else $satname = str_replace(array(' '), '-', $sat); |
|
| 86 | 86 | } |
| 87 | 87 | if (!isset($satname)) $satname = $sat; |
| 88 | 88 | $info = $Satellite->get_info(strtolower(trim($satname))); |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | print '<div><span>'._("Orbit").'</span>'.$info['orbit'].'</div>'; |
| 146 | 146 | } |
| 147 | 147 | if ($info['launch_date'] != '') { |
| 148 | - print '<div><span>'._("Launch Date").'</span>'.date('Y-m-d',strtotime($info['launch_date'])).'</div>'; |
|
| 148 | + print '<div><span>'._("Launch Date").'</span>'.date('Y-m-d', strtotime($info['launch_date'])).'</div>'; |
|
| 149 | 149 | } |
| 150 | 150 | if ($info['launch_site'] != '') { |
| 151 | 151 | print '<div><span>'._("Launch Site").'</span>'.$info['launch_site'].'</div>'; |
@@ -81,10 +81,15 @@ |
||
| 81 | 81 | // $launch_date = '15 November 1974'; |
| 82 | 82 | } else { |
| 83 | 83 | $ident = $sat; |
| 84 | - if (strpos($sat,'(')) $satname = $sat; |
|
| 85 | - else $satname = str_replace(array(' '),'-',$sat); |
|
| 84 | + if (strpos($sat,'(')) { |
|
| 85 | + $satname = $sat; |
|
| 86 | + } else { |
|
| 87 | + $satname = str_replace(array(' '),'-',$sat); |
|
| 88 | + } |
|
| 89 | + } |
|
| 90 | +if (!isset($satname)) { |
|
| 91 | + $satname = $sat; |
|
| 86 | 92 | } |
| 87 | -if (!isset($satname)) $satname = $sat; |
|
| 88 | 93 | $info = $Satellite->get_info(strtolower(trim($satname))); |
| 89 | 94 | $position = $Satellite->position($sat); |
| 90 | 95 | $ground_speed = $position['speed']; |
@@ -52,7 +52,12 @@ |
||
| 52 | 52 | } else { |
| 53 | 53 | for (var i = 0; i < viewer.dataSources.get(dsn).entities.values.length; i++) { |
| 54 | 54 | var entity = viewer.dataSources.get(dsn).entities.values[i]; |
| 55 | - if (parseInt(entity.lastupdatesat) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) print $globalMapRefresh*2000; else print '60000'; ?>)) { |
|
| 55 | + if (parseInt(entity.lastupdatesat) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) { |
|
| 56 | + print $globalMapRefresh*2000; |
|
| 57 | +} else { |
|
| 58 | + print '60000'; |
|
| 59 | +} |
|
| 60 | +?>)) { |
|
| 56 | 61 | viewer.dataSources.get(dsn).entities.remove(entity); |
| 57 | 62 | } |
| 58 | 63 | } |
@@ -9,7 +9,7 @@ |
||
| 9 | 9 | if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { |
| 10 | 10 | exec("ps ux", $output, $result); |
| 11 | 11 | $j = 0; |
| 12 | - foreach ($output as $line) if(strpos($line, dirname(__FILE__)."/update_db.php") && !strpos($line, "sh ")) $j++; |
|
| 12 | + foreach ($output as $line) if (strpos($line, dirname(__FILE__)."/update_db.php") && !strpos($line, "sh ")) $j++; |
|
| 13 | 13 | if ($j > 1) { |
| 14 | 14 | echo "Script is already runnning..."; |
| 15 | 15 | die(); |
@@ -9,7 +9,9 @@ discard block |
||
| 9 | 9 | if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { |
| 10 | 10 | exec("ps ux", $output, $result); |
| 11 | 11 | $j = 0; |
| 12 | - foreach ($output as $line) if(strpos($line, dirname(__FILE__)."/update_db.php") && !strpos($line, "sh ")) $j++; |
|
| 12 | + foreach ($output as $line) { |
|
| 13 | + if(strpos($line, dirname(__FILE__)."/update_db.php") && !strpos($line, "sh ")) $j++; |
|
| 14 | + } |
|
| 13 | 15 | if ($j > 1) { |
| 14 | 16 | echo "Script is already runnning..."; |
| 15 | 17 | die(); |
@@ -29,14 +31,18 @@ discard block |
||
| 29 | 31 | $update_db->update_notam(); |
| 30 | 32 | } |
| 31 | 33 | $update_db->insert_last_notam_update(); |
| 32 | - } elseif (isset($globalDebug) && $globalDebug && isset($globalNOTAM) && $globalNOTAM) echo "NOTAM are only updated once a day.\n"; |
|
| 34 | + } elseif (isset($globalDebug) && $globalDebug && isset($globalNOTAM) && $globalNOTAM) { |
|
| 35 | + echo "NOTAM are only updated once a day.\n"; |
|
| 36 | + } |
|
| 33 | 37 | if ($update_db->check_last_update() && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) { |
| 34 | 38 | $update_db->update_all(); |
| 35 | 39 | // require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 36 | 40 | // $Spotter = new Spotter(); |
| 37 | 41 | // $Spotter->updateFieldsFromOtherTables(); |
| 38 | 42 | $update_db->insert_last_update(); |
| 39 | - } elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM)) echo "DB are populated with external data only every 15 days ! Files are not updated more often.\n"; |
|
| 43 | + } elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM)) { |
|
| 44 | + echo "DB are populated with external data only every 15 days ! Files are not updated more often.\n"; |
|
| 45 | + } |
|
| 40 | 46 | if (isset($globalWaypoints) && $globalWaypoints && $update_db->check_last_airspace_update()) { |
| 41 | 47 | echo "Check if new airspace version exist..."; |
| 42 | 48 | echo $update_db->update_airspace_fam(); |
@@ -45,8 +51,11 @@ discard block |
||
| 45 | 51 | if (isset($globalGeoid) && $globalGeoid && $update_db->check_last_geoid_update()) { |
| 46 | 52 | echo "Check if new geoid version exist..."; |
| 47 | 53 | $error = $update_db->update_geoid_fam(); |
| 48 | - if ($error == '') $update_db->insert_last_geoid_update(); |
|
| 49 | - else echo $error; |
|
| 54 | + if ($error == '') { |
|
| 55 | + $update_db->insert_last_geoid_update(); |
|
| 56 | + } else { |
|
| 57 | + echo $error; |
|
| 58 | + } |
|
| 50 | 59 | } |
| 51 | 60 | if (isset($globalMarine) && $globalMarine && $update_db->check_last_marine_identity_update()) { |
| 52 | 61 | echo "Check if new marine identity version exist..."; |
@@ -64,7 +73,9 @@ discard block |
||
| 64 | 73 | //echo "Done"; |
| 65 | 74 | } |
| 66 | 75 | $update_db->insert_last_owner_update(); |
| 67 | - } elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) echo "Owner are only updated every 15 days.\n"; |
|
| 76 | + } elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) { |
|
| 77 | + echo "Owner are only updated every 15 days.\n"; |
|
| 78 | + } |
|
| 68 | 79 | |
| 69 | 80 | if ($update_db->check_last_airlines_update() && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) { |
| 70 | 81 | echo "Updating airlines...\n"; |
@@ -72,7 +83,9 @@ discard block |
||
| 72 | 83 | echo $update_db->update_airlines_fam(); |
| 73 | 84 | } |
| 74 | 85 | $update_db->insert_last_airlines_update(); |
| 75 | - } elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) echo "Airlines are only updated every 15 days.\n"; |
|
| 86 | + } elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) { |
|
| 87 | + echo "Airlines are only updated every 15 days.\n"; |
|
| 88 | + } |
|
| 76 | 89 | |
| 77 | 90 | if (isset($globalAccidents) && $globalAccidents && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) { |
| 78 | 91 | require_once(dirname(__FILE__).'/../require/class.Accident.php'); |
@@ -81,7 +94,9 @@ discard block |
||
| 81 | 94 | if ($Accident->check_last_accidents_update()) { |
| 82 | 95 | $Accident->download_update(); |
| 83 | 96 | $Accident->insert_last_accidents_update(); |
| 84 | - } else echo "Accidents are updated once a day.\n"; |
|
| 97 | + } else { |
|
| 98 | + echo "Accidents are updated once a day.\n"; |
|
| 99 | + } |
|
| 85 | 100 | } |
| 86 | 101 | |
| 87 | 102 | } |
@@ -94,15 +109,19 @@ discard block |
||
| 94 | 109 | if ($METAR->check_last_update()) { |
| 95 | 110 | $METAR->addMETARCycle(); |
| 96 | 111 | $METAR->insert_last_update(); |
| 97 | - } else echo "METAR are only updated every 30 minutes.\n"; |
|
| 98 | -} |
|
| 112 | + } else { |
|
| 113 | + echo "METAR are only updated every 30 minutes.\n"; |
|
| 114 | + } |
|
| 115 | + } |
|
| 99 | 116 | |
| 100 | 117 | if (isset($globalSchedules) && $globalSchedules && $update_db->check_last_schedules_update() && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) { |
| 101 | 118 | echo "Updating schedules..."; |
| 102 | 119 | //$update_db->update_oneworld(); |
| 103 | 120 | $update_db->update_skyteam(); |
| 104 | 121 | $update_db->insert_last_schedules_update(); |
| 105 | -} elseif (isset($globalDebug) && $globalDebug && isset($globalOwner) && $globalOwner && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) echo "Schedules are only updated every 15 days.\n"; |
|
| 122 | +} elseif (isset($globalDebug) && $globalDebug && isset($globalOwner) && $globalOwner && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) { |
|
| 123 | + echo "Schedules are only updated every 15 days.\n"; |
|
| 124 | +} |
|
| 106 | 125 | |
| 107 | 126 | if (isset($globalArchiveMonths) && $globalArchiveMonths > 0) { |
| 108 | 127 | echo "Updating statistics and archive old data..."; |
@@ -19,11 +19,11 @@ discard block |
||
| 19 | 19 | } |
| 20 | 20 | } |
| 21 | 21 | /** |
| 22 | - * Change IATA to ICAO value for ident |
|
| 23 | - * |
|
| 24 | - * @param String $ident ident |
|
| 25 | - * @return String the icao |
|
| 26 | - */ |
|
| 22 | + * Change IATA to ICAO value for ident |
|
| 23 | + * |
|
| 24 | + * @param String $ident ident |
|
| 25 | + * @return String the icao |
|
| 26 | + */ |
|
| 27 | 27 | public function ident2icao($ident) { |
| 28 | 28 | if (substr($ident,0,2) == 'AF') { |
| 29 | 29 | if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident; |
@@ -39,11 +39,11 @@ discard block |
||
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | /** |
| 42 | - * Deletes all info in the live table |
|
| 43 | - * |
|
| 44 | - * @return String success or false |
|
| 45 | - * |
|
| 46 | - */ |
|
| 42 | + * Deletes all info in the live table |
|
| 43 | + * |
|
| 44 | + * @return String success or false |
|
| 45 | + * |
|
| 46 | + */ |
|
| 47 | 47 | public function deleteLiveAcarsData() |
| 48 | 48 | { |
| 49 | 49 | global $globalDBdriver; |
@@ -63,11 +63,11 @@ discard block |
||
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | /** |
| 66 | - * Deletes all info in the archive table |
|
| 67 | - * |
|
| 68 | - * @return String success or false |
|
| 69 | - * |
|
| 70 | - */ |
|
| 66 | + * Deletes all info in the archive table |
|
| 67 | + * |
|
| 68 | + * @return String success or false |
|
| 69 | + * |
|
| 70 | + */ |
|
| 71 | 71 | public function deleteArchiveAcarsData() |
| 72 | 72 | { |
| 73 | 73 | global $globalACARSArchiveKeepMonths, $globalDBdriver; |
@@ -88,11 +88,11 @@ discard block |
||
| 88 | 88 | |
| 89 | 89 | |
| 90 | 90 | /** |
| 91 | - * Parse ACARS data |
|
| 92 | - * |
|
| 93 | - * @param String ACARS data in acarsdec data |
|
| 94 | - * |
|
| 95 | - */ |
|
| 91 | + * Parse ACARS data |
|
| 92 | + * |
|
| 93 | + * @param String ACARS data in acarsdec data |
|
| 94 | + * |
|
| 95 | + */ |
|
| 96 | 96 | public function parse($data) { |
| 97 | 97 | global $globalDebug, $globalACARSArchive; |
| 98 | 98 | //$Image = new Image($this->db); |
@@ -722,11 +722,11 @@ discard block |
||
| 722 | 722 | } |
| 723 | 723 | |
| 724 | 724 | /** |
| 725 | - * Add ACARS data |
|
| 726 | - * |
|
| 727 | - * @param String ACARS data in acarsdec data |
|
| 728 | - * |
|
| 729 | - */ |
|
| 725 | + * Add ACARS data |
|
| 726 | + * |
|
| 727 | + * @param String ACARS data in acarsdec data |
|
| 728 | + * |
|
| 729 | + */ |
|
| 730 | 730 | function add($data) { |
| 731 | 731 | global $globalDebug, $globalACARSArchive; |
| 732 | 732 | $Image = new Image($this->db); |
@@ -773,15 +773,15 @@ discard block |
||
| 773 | 773 | } |
| 774 | 774 | |
| 775 | 775 | /** |
| 776 | - * Add Live ACARS data in DB |
|
| 777 | - * |
|
| 778 | - * @param String $ident ident |
|
| 779 | - * @param String $registration Registration of the aircraft |
|
| 780 | - * @param String $label Label of the ACARS message |
|
| 781 | - * @param String $block_id Block id of the ACARS message |
|
| 782 | - * @param String $msg_no Number of the ACARS message |
|
| 783 | - * @param String $message ACARS message |
|
| 784 | - */ |
|
| 776 | + * Add Live ACARS data in DB |
|
| 777 | + * |
|
| 778 | + * @param String $ident ident |
|
| 779 | + * @param String $registration Registration of the aircraft |
|
| 780 | + * @param String $label Label of the ACARS message |
|
| 781 | + * @param String $block_id Block id of the ACARS message |
|
| 782 | + * @param String $msg_no Number of the ACARS message |
|
| 783 | + * @param String $message ACARS message |
|
| 784 | + */ |
|
| 785 | 785 | public function addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') { |
| 786 | 786 | global $globalDebug; |
| 787 | 787 | date_default_timezone_set('UTC'); |
@@ -817,15 +817,15 @@ discard block |
||
| 817 | 817 | } |
| 818 | 818 | |
| 819 | 819 | /** |
| 820 | - * Add Archive ACARS data in DB |
|
| 821 | - * |
|
| 822 | - * @param String $ident ident |
|
| 823 | - * @param String $registration Registration of the aircraft |
|
| 824 | - * @param String $label Label of the ACARS message |
|
| 825 | - * @param String $block_id Block id of the ACARS message |
|
| 826 | - * @param String $msg_no Number of the ACARS message |
|
| 827 | - * @param String $message ACARS message |
|
| 828 | - */ |
|
| 820 | + * Add Archive ACARS data in DB |
|
| 821 | + * |
|
| 822 | + * @param String $ident ident |
|
| 823 | + * @param String $registration Registration of the aircraft |
|
| 824 | + * @param String $label Label of the ACARS message |
|
| 825 | + * @param String $block_id Block id of the ACARS message |
|
| 826 | + * @param String $msg_no Number of the ACARS message |
|
| 827 | + * @param String $message ACARS message |
|
| 828 | + */ |
|
| 829 | 829 | public function addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') { |
| 830 | 830 | global $globalDebug; |
| 831 | 831 | date_default_timezone_set('UTC'); |
@@ -856,11 +856,11 @@ discard block |
||
| 856 | 856 | } |
| 857 | 857 | |
| 858 | 858 | /** |
| 859 | - * Get Message title from label from DB |
|
| 860 | - * |
|
| 861 | - * @param String $label |
|
| 862 | - * @return String Return ACARS title |
|
| 863 | - */ |
|
| 859 | + * Get Message title from label from DB |
|
| 860 | + * |
|
| 861 | + * @param String $label |
|
| 862 | + * @return String Return ACARS title |
|
| 863 | + */ |
|
| 864 | 864 | public function getTitlefromLabel($label) { |
| 865 | 865 | $Connection = new Connection($this->db); |
| 866 | 866 | $this->db = $Connection->db; |
@@ -879,10 +879,10 @@ discard block |
||
| 879 | 879 | } |
| 880 | 880 | |
| 881 | 881 | /** |
| 882 | - * List all Message title & label from DB |
|
| 883 | - * |
|
| 884 | - * @return Array Return ACARS data in array |
|
| 885 | - */ |
|
| 882 | + * List all Message title & label from DB |
|
| 883 | + * |
|
| 884 | + * @return Array Return ACARS data in array |
|
| 885 | + */ |
|
| 886 | 886 | public function getAllTitleLabel() { |
| 887 | 887 | $query = "SELECT * FROM acars_label ORDER BY title"; |
| 888 | 888 | $query_values = array(); |
@@ -899,11 +899,11 @@ discard block |
||
| 899 | 899 | } |
| 900 | 900 | |
| 901 | 901 | /** |
| 902 | - * Get Live ACARS data from DB |
|
| 903 | - * |
|
| 904 | - * @param String $ident |
|
| 905 | - * @return Array Return ACARS data in array |
|
| 906 | - */ |
|
| 902 | + * Get Live ACARS data from DB |
|
| 903 | + * |
|
| 904 | + * @param String $ident |
|
| 905 | + * @return Array Return ACARS data in array |
|
| 906 | + */ |
|
| 907 | 907 | public function getLiveAcarsData($ident) { |
| 908 | 908 | $query = "SELECT * FROM acars_live WHERE ident = :ident ORDER BY acars_live_id DESC"; |
| 909 | 909 | $query_values = array(':ident' => $ident); |
@@ -920,10 +920,10 @@ discard block |
||
| 920 | 920 | } |
| 921 | 921 | |
| 922 | 922 | /** |
| 923 | - * Get Latest ACARS data from DB |
|
| 924 | - * |
|
| 925 | - * @return Array Return ACARS data in array |
|
| 926 | - */ |
|
| 923 | + * Get Latest ACARS data from DB |
|
| 924 | + * |
|
| 925 | + * @return Array Return ACARS data in array |
|
| 926 | + */ |
|
| 927 | 927 | public function getLatestAcarsData($limit = '',$label = '') { |
| 928 | 928 | global $globalURL, $globalDBdriver; |
| 929 | 929 | $Image = new Image($this->db); |
@@ -1011,10 +1011,10 @@ discard block |
||
| 1011 | 1011 | } |
| 1012 | 1012 | |
| 1013 | 1013 | /** |
| 1014 | - * Get Archive ACARS data from DB |
|
| 1015 | - * |
|
| 1016 | - * @return Array Return ACARS data in array |
|
| 1017 | - */ |
|
| 1014 | + * Get Archive ACARS data from DB |
|
| 1015 | + * |
|
| 1016 | + * @return Array Return ACARS data in array |
|
| 1017 | + */ |
|
| 1018 | 1018 | public function getArchiveAcarsData($limit = '',$label = '') { |
| 1019 | 1019 | global $globalURL, $globalDBdriver; |
| 1020 | 1020 | $Image = new Image($this->db); |
@@ -1102,13 +1102,13 @@ discard block |
||
| 1102 | 1102 | } |
| 1103 | 1103 | |
| 1104 | 1104 | /** |
| 1105 | - * Add ModeS data to DB |
|
| 1106 | - * |
|
| 1107 | - * @param String $ident ident |
|
| 1108 | - * @param String $registration Registration of the aircraft |
|
| 1109 | - * @param String $icao |
|
| 1110 | - * @param String $ICAOTypeCode |
|
| 1111 | - */ |
|
| 1105 | + * Add ModeS data to DB |
|
| 1106 | + * |
|
| 1107 | + * @param String $ident ident |
|
| 1108 | + * @param String $registration Registration of the aircraft |
|
| 1109 | + * @param String $icao |
|
| 1110 | + * @param String $ICAOTypeCode |
|
| 1111 | + */ |
|
| 1112 | 1112 | public function addModeSData($ident,$registration,$icao = '',$ICAOTypeCode = '',$latitude = '', $longitude = '') { |
| 1113 | 1113 | global $globalDebug, $globalDBdriver; |
| 1114 | 1114 | $ident = trim($ident); |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | public $db; |
| 11 | 11 | public $SI; |
| 12 | 12 | private $fromACARSscript = false; |
| 13 | - public function __construct($dbc = null,$fromACARSscript = false) { |
|
| 13 | + public function __construct($dbc = null, $fromACARSscript = false) { |
|
| 14 | 14 | $Connection = new Connection($dbc); |
| 15 | 15 | $this->db = $Connection->db(); |
| 16 | 16 | if ($this->db === null) die('Error: No DB connection.'); |
@@ -26,14 +26,14 @@ discard block |
||
| 26 | 26 | * @return String the icao |
| 27 | 27 | */ |
| 28 | 28 | public function ident2icao($ident) { |
| 29 | - if (substr($ident,0,2) == 'AF') { |
|
| 30 | - if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident; |
|
| 31 | - else $icao = 'AFR'.ltrim(substr($ident,2),'0'); |
|
| 29 | + if (substr($ident, 0, 2) == 'AF') { |
|
| 30 | + if (filter_var(substr($ident, 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident; |
|
| 31 | + else $icao = 'AFR'.ltrim(substr($ident, 2), '0'); |
|
| 32 | 32 | } else { |
| 33 | 33 | $Spotter = new Spotter($this->db); |
| 34 | - $identicao = $Spotter->getAllAirlineInfo(substr($ident,0,2)); |
|
| 34 | + $identicao = $Spotter->getAllAirlineInfo(substr($ident, 0, 2)); |
|
| 35 | 35 | if (isset($identicao[0])) { |
| 36 | - $icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0'); |
|
| 36 | + $icao = $identicao[0]['icao'].ltrim(substr($ident, 2), '0'); |
|
| 37 | 37 | } else $icao = $ident; |
| 38 | 38 | } |
| 39 | 39 | return $icao; |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | |
| 58 | 58 | $sth = $this->db->prepare($query); |
| 59 | 59 | $sth->execute(); |
| 60 | - } catch(PDOException $e) { |
|
| 60 | + } catch (PDOException $e) { |
|
| 61 | 61 | return "error"; |
| 62 | 62 | } |
| 63 | 63 | return "success"; |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | |
| 82 | 82 | $sth = $this->db->prepare($query); |
| 83 | 83 | $sth->execute(); |
| 84 | - } catch(PDOException $e) { |
|
| 84 | + } catch (PDOException $e) { |
|
| 85 | 85 | return "error"; |
| 86 | 86 | } |
| 87 | 87 | return "success"; |
@@ -106,13 +106,13 @@ discard block |
||
| 106 | 106 | $ident = ''; |
| 107 | 107 | $message = ''; |
| 108 | 108 | $result = array(); |
| 109 | - $n = sscanf($data,'(null) %*d %*02d/%*02d/%*04d %*02d:%*02d:%*02d %*d %*[0-9-] %*[A-Z0-9] %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message); |
|
| 110 | - if ($n == 0) $n = sscanf($data,'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message); |
|
| 111 | - if ($n == 0) $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message); |
|
| 112 | - if ($n == 0) $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message); |
|
| 109 | + $n = sscanf($data, '(null) %*d %*02d/%*02d/%*04d %*02d:%*02d:%*02d %*d %*[0-9-] %*[A-Z0-9] %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message); |
|
| 110 | + if ($n == 0) $n = sscanf($data, 'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message); |
|
| 111 | + if ($n == 0) $n = sscanf($data, '%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message); |
|
| 112 | + if ($n == 0) $n = sscanf($data, '%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message); |
|
| 113 | 113 | if ($n != 0) { |
| 114 | - $registration = str_replace('.','',$registration); |
|
| 115 | - $result = array('registration' => $registration, 'ident' => $ident,'label' => $label, 'block_id' => $block_id,'msg_no' => $msg_no,'message' => $message); |
|
| 114 | + $registration = str_replace('.', '', $registration); |
|
| 115 | + $result = array('registration' => $registration, 'ident' => $ident, 'label' => $label, 'block_id' => $block_id, 'msg_no' => $msg_no, 'message' => $message); |
|
| 116 | 116 | if ($globalDebug) echo "Reg. : ".$registration." - Ident : ".$ident." - Label : ".$label." - Message : ".$message."\n"; |
| 117 | 117 | } else $message = $data; |
| 118 | 118 | $decode = array(); |
@@ -132,14 +132,14 @@ discard block |
||
| 132 | 132 | $temp = ''; |
| 133 | 133 | $n = sscanf($message, "FST01%4c%4c%c%06d%c%07d%03d%*8[0-9a-zA-Z ]-%02dC", $dair, $darr, $lac, $la, $lnc, $ln, $alt, $temp); |
| 134 | 134 | if ($n > 5 && ($lac == 'N' || $lac == 'S') && ($lnc == 'E' || $lnc == 'W')) { |
| 135 | - $latitude = $la / 10000.0; |
|
| 136 | - $longitude = $ln / 10000.0; |
|
| 135 | + $latitude = $la/10000.0; |
|
| 136 | + $longitude = $ln/10000.0; |
|
| 137 | 137 | if ($lac == 'S') $latitude = '-'.$latitude; |
| 138 | 138 | if ($lnc == 'W') $longitude = '-'.$longitude; |
| 139 | 139 | // Temp not always available |
| 140 | 140 | if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude.' - airport depart : '.$dair.' - airport arrival : '.$darr.' - température : '.$temp."°C\n"; |
| 141 | - if ($temp == '') $decode = array('Latitude' => $latitude, 'Longitude' => $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr,'Altitude' => $alt); |
|
| 142 | - else $decode = array('Latitude' => $latitude, 'Longitude' => $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt,'Temperature' => $temp.'°C'); |
|
| 141 | + if ($temp == '') $decode = array('Latitude' => $latitude, 'Longitude' => $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => $alt); |
|
| 142 | + else $decode = array('Latitude' => $latitude, 'Longitude' => $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt, 'Temperature' => $temp.'°C'); |
|
| 143 | 143 | |
| 144 | 144 | //$icao = $Translation->checkTranslation($ident); |
| 145 | 145 | //$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS'); |
@@ -151,19 +151,19 @@ discard block |
||
| 151 | 151 | $dhour = ''; |
| 152 | 152 | $darr = ''; |
| 153 | 153 | $ahour = ''; |
| 154 | - $n = sscanf($message, "ARR01 %4[A-Z]%4d %4[A-Z]%4d", $dair, $dhour, $darr,$ahour); |
|
| 154 | + $n = sscanf($message, "ARR01 %4[A-Z]%4d %4[A-Z]%4d", $dair, $dhour, $darr, $ahour); |
|
| 155 | 155 | if ($n == 4 && strlen($darr) == 4) { |
| 156 | - if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2); |
|
| 157 | - if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2); |
|
| 158 | - if ($globalDebug) echo 'departure airport : '.$dair.' - arrival airport : '. $darr.' - departure hour : '. $dhour.' - arrival hour : '.$ahour."\n"; |
|
| 156 | + if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2); |
|
| 157 | + if ($ahour != '') $ahour = substr(sprintf('%04d', $ahour), 0, 2).':'.substr(sprintf('%04d', $ahour), 2); |
|
| 158 | + if ($globalDebug) echo 'departure airport : '.$dair.' - arrival airport : '.$darr.' - departure hour : '.$dhour.' - arrival hour : '.$ahour."\n"; |
|
| 159 | 159 | //$icao = ACARS->ident2icao($ident); |
| 160 | 160 | //$icao = $Translation->checkTranslation($ident); |
| 161 | 161 | //$Schedule->addSchedule($icao,$dair,$dhour,$darr,$ahour,'ACARS'); |
| 162 | 162 | $decode = array('Departure airport' => $dair, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour); |
| 163 | 163 | $found = true; |
| 164 | 164 | } |
| 165 | - elseif ($n == 2 || $n == 4) { |
|
| 166 | - if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2); |
|
| 165 | + elseif ($n == 2 || $n == 4) { |
|
| 166 | + if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2); |
|
| 167 | 167 | if ($globalDebug) echo 'airport arrival : '.$dair.' - arrival hour : '.$dhour."\n"; |
| 168 | 168 | //$icao = ACARS->ident2icao($ident); |
| 169 | 169 | //$icao = $Translation->checkTranslation($ident); |
@@ -221,11 +221,11 @@ discard block |
||
| 221 | 221 | $ahour = ''; |
| 222 | 222 | $aair = ''; |
| 223 | 223 | $apiste = ''; |
| 224 | - $n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z]/%*3d/%4s/%*cSCH/%6[0-9A-Z ]/%4c/%4c/%5s/%4d%*3c/%4d/%4c/%[0-9A-Z ]/", $airicao,$aident,$dair, $darr, $ddate, $dhour,$ahour, $aair, $apiste); |
|
| 224 | + $n = sscanf(str_replace(array("\r\n", "\n", "\r"), '', $message), "%*[0-9A-Z]/%*3d/%4s/%*cSCH/%6[0-9A-Z ]/%4c/%4c/%5s/%4d%*3c/%4d/%4c/%[0-9A-Z ]/", $airicao, $aident, $dair, $darr, $ddate, $dhour, $ahour, $aair, $apiste); |
|
| 225 | 225 | if ($n > 8) { |
| 226 | - if ($globalDebug) echo 'airicao : '. $airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '. $darr.' - date depart : '.$ddate.' - departure hour : '. $dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n"; |
|
| 227 | - if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2); |
|
| 228 | - if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2); |
|
| 226 | + if ($globalDebug) echo 'airicao : '.$airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '.$darr.' - date depart : '.$ddate.' - departure hour : '.$dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n"; |
|
| 227 | + if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2); |
|
| 228 | + if ($ahour != '') $ahour = substr(sprintf('%04d', $ahour), 0, 2).':'.substr(sprintf('%04d', $ahour), 2); |
|
| 229 | 229 | $icao = trim($aident); |
| 230 | 230 | |
| 231 | 231 | //$decode = 'Departure airport : '.$dair.' ('.$ddate.' at '.$dhour.') - Arrival Airport : '.$aair.' (at '.$ahour.') way '.$apiste; |
@@ -250,8 +250,8 @@ discard block |
||
| 250 | 250 | if ($n == 10 && ($lac == 'N' || $lac == 'S') && ($lnc == 'E' || $lnc == 'W')) { |
| 251 | 251 | $las = $las.'.'.$lass; |
| 252 | 252 | $lns = $lns.'.'.$lns; |
| 253 | - $latitude = $las / 1000.0; |
|
| 254 | - $longitude = $lns / 1000.0; |
|
| 253 | + $latitude = $las/1000.0; |
|
| 254 | + $longitude = $lns/1000.0; |
|
| 255 | 255 | if ($lac == 'S') $latitude = '-'.$latitude; |
| 256 | 256 | if ($lnc == 'W') $longitude = '-'.$longitude; |
| 257 | 257 | if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude."\n"; |
@@ -346,17 +346,17 @@ discard block |
||
| 346 | 346 | $alt = ''; |
| 347 | 347 | $fuel = ''; |
| 348 | 348 | $speed = ''; |
| 349 | - $n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "#DFB(POS-%s -%4d%c%5d%c/%*d F%dRMK/FUEL %f M%f", $aident, $las, $lac, $lns, $lnc, $alt, $fuel, $speed); |
|
| 349 | + $n = sscanf(str_replace(array("\r\n", "\n", "\r"), '', $message), "#DFB(POS-%s -%4d%c%5d%c/%*d F%dRMK/FUEL %f M%f", $aident, $las, $lac, $lns, $lnc, $alt, $fuel, $speed); |
|
| 350 | 350 | if ($n == 9) { |
| 351 | 351 | //if (self->$debug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n"; |
| 352 | 352 | $icao = trim($aident); |
| 353 | 353 | $decode['icao'] = $icao; |
| 354 | - $latitude = $las / 100.0; |
|
| 355 | - $longitude = $lns / 100.0; |
|
| 354 | + $latitude = $las/100.0; |
|
| 355 | + $longitude = $lns/100.0; |
|
| 356 | 356 | if ($lac == 'S') $latitude = '-'.$latitude; |
| 357 | 357 | if ($lnc == 'W') $longitude = '-'.$longitude; |
| 358 | 358 | |
| 359 | - $decode = array('Latitude' => $latitude,'Longitude' => $longitude,'Altitude' => 'FL'.$alt,'Fuel' => $fuel,'speed' => $speed); |
|
| 359 | + $decode = array('Latitude' => $latitude, 'Longitude' => $longitude, 'Altitude' => 'FL'.$alt, 'Fuel' => $fuel, 'speed' => $speed); |
|
| 360 | 360 | $found = true; |
| 361 | 361 | } |
| 362 | 362 | } |
@@ -375,7 +375,7 @@ discard block |
||
| 375 | 375 | if ($lac == 'S') $latitude = '-'.$latitude; |
| 376 | 376 | if ($lnc == 'W') $longitude = '-'.$longitude; |
| 377 | 377 | |
| 378 | - $decode = array('Latitude' => $latitude,'Longitude' => $longitude); |
|
| 378 | + $decode = array('Latitude' => $latitude, 'Longitude' => $longitude); |
|
| 379 | 379 | $found = true; |
| 380 | 380 | } |
| 381 | 381 | } |
@@ -408,7 +408,7 @@ discard block |
||
| 408 | 408 | $dair = ''; |
| 409 | 409 | $darr = ''; |
| 410 | 410 | $aident = ''; |
| 411 | - $n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z],,%*[0-9A-Z],%*[0-9A-Z],%4s,%4s,.%*6s,%*4[A-Z],%[0-9A-Z],", $dair, $darr, $aident); |
|
| 411 | + $n = sscanf(str_replace(array("\r\n", "\n", "\r"), '', $message), "%*[0-9A-Z],,%*[0-9A-Z],%*[0-9A-Z],%4s,%4s,.%*6s,%*4[A-Z],%[0-9A-Z],", $dair, $darr, $aident); |
|
| 412 | 412 | if ($n == 8) { |
| 413 | 413 | if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n"; |
| 414 | 414 | $icao = trim($aident); |
@@ -440,7 +440,7 @@ discard block |
||
| 440 | 440 | */ |
| 441 | 441 | $dair = ''; |
| 442 | 442 | $darr = ''; |
| 443 | - $n = sscanf($message,'%4[A-Z]%4[A-Z]%*4d',$dair,$darr); |
|
| 443 | + $n = sscanf($message, '%4[A-Z]%4[A-Z]%*4d', $dair, $darr); |
|
| 444 | 444 | if ($n == 3) { |
| 445 | 445 | if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n"; |
| 446 | 446 | //$icao = $Translation->checkTranslation($ident); |
@@ -455,7 +455,7 @@ discard block |
||
| 455 | 455 | */ |
| 456 | 456 | $dair = ''; |
| 457 | 457 | $darr = ''; |
| 458 | - $n = sscanf($message,'3J01 DSPTCH %*d/%*d %4s/%4s .%*6s',$dair,$darr); |
|
| 458 | + $n = sscanf($message, '3J01 DSPTCH %*d/%*d %4s/%4s .%*6s', $dair, $darr); |
|
| 459 | 459 | if ($n == 3) { |
| 460 | 460 | if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n"; |
| 461 | 461 | //$icao = $Translation->checkTranslation($ident); |
@@ -465,7 +465,7 @@ discard block |
||
| 465 | 465 | } |
| 466 | 466 | } |
| 467 | 467 | if (!$found) { |
| 468 | - $n = sscanf($message,'MET01%4c',$airport); |
|
| 468 | + $n = sscanf($message, 'MET01%4c', $airport); |
|
| 469 | 469 | if ($n == 1) { |
| 470 | 470 | if ($globalDebug) echo 'airport name : '.$airport; |
| 471 | 471 | $decode = array('Airport/Waypoint name' => $airport); |
@@ -473,241 +473,241 @@ discard block |
||
| 473 | 473 | } |
| 474 | 474 | } |
| 475 | 475 | if ($label == 'H1') { |
| 476 | - if (preg_match('/^#CFBFLR/',$message) || preg_match('/^#CFBWRN/',$message)) { |
|
| 477 | - $decode = array_merge(array('Message nature' => 'Equipment failure'),$decode); |
|
| 476 | + if (preg_match('/^#CFBFLR/', $message) || preg_match('/^#CFBWRN/', $message)) { |
|
| 477 | + $decode = array_merge(array('Message nature' => 'Equipment failure'), $decode); |
|
| 478 | 478 | } |
| 479 | - elseif (preg_match('/^#DFB\*TKO/',$message) || preg_match('/^#DFBTKO/',$message)) { |
|
| 480 | - $decode = array_merge(array('Message nature' => 'Take off performance data'),$decode); |
|
| 479 | + elseif (preg_match('/^#DFB\*TKO/', $message) || preg_match('/^#DFBTKO/', $message)) { |
|
| 480 | + $decode = array_merge(array('Message nature' => 'Take off performance data'), $decode); |
|
| 481 | 481 | } |
| 482 | - elseif (preg_match('/^#DFB\*CRZ/',$message) || preg_match('/^#DFBCRZ/',$message)) { |
|
| 483 | - $decode = array_merge(array('Message nature' => 'Cruise performance data'),$decode); |
|
| 482 | + elseif (preg_match('/^#DFB\*CRZ/', $message) || preg_match('/^#DFBCRZ/', $message)) { |
|
| 483 | + $decode = array_merge(array('Message nature' => 'Cruise performance data'), $decode); |
|
| 484 | 484 | } |
| 485 | - elseif (preg_match('/^#DFB\*WOB/',$message) || preg_match('/^#DFBWOB/',$message)) { |
|
| 486 | - $decode = array_merge(array('Message nature' => 'Weather observation'),$decode); |
|
| 485 | + elseif (preg_match('/^#DFB\*WOB/', $message) || preg_match('/^#DFBWOB/', $message)) { |
|
| 486 | + $decode = array_merge(array('Message nature' => 'Weather observation'), $decode); |
|
| 487 | 487 | } |
| 488 | - elseif (preg_match(':^#DFB/PIREP:',$message)) { |
|
| 489 | - $decode = array_merge(array('Message nature' => 'Pilot Report'),$decode); |
|
| 488 | + elseif (preg_match(':^#DFB/PIREP:', $message)) { |
|
| 489 | + $decode = array_merge(array('Message nature' => 'Pilot Report'), $decode); |
|
| 490 | 490 | } |
| 491 | - elseif (preg_match('/^#DFBEDA/',$message) || preg_match('/^#DFBENG/',$message)) { |
|
| 492 | - $decode = array_merge(array('Message nature' => 'Engine Data'),$decode); |
|
| 491 | + elseif (preg_match('/^#DFBEDA/', $message) || preg_match('/^#DFBENG/', $message)) { |
|
| 492 | + $decode = array_merge(array('Message nature' => 'Engine Data'), $decode); |
|
| 493 | 493 | } |
| 494 | - elseif (preg_match(':^#M1AAEP:',$message)) { |
|
| 495 | - $decode = array_merge(array('Message nature' => 'Position/Weather Report'),$decode); |
|
| 494 | + elseif (preg_match(':^#M1AAEP:', $message)) { |
|
| 495 | + $decode = array_merge(array('Message nature' => 'Position/Weather Report'), $decode); |
|
| 496 | 496 | } |
| 497 | - elseif (preg_match(':^#M2APWD:',$message)) { |
|
| 498 | - $decode = array_merge(array('Message nature' => 'Flight plan predicted wind data'),$decode); |
|
| 497 | + elseif (preg_match(':^#M2APWD:', $message)) { |
|
| 498 | + $decode = array_merge(array('Message nature' => 'Flight plan predicted wind data'), $decode); |
|
| 499 | 499 | } |
| 500 | - elseif (preg_match(':^#M1BREQPWI:',$message)) { |
|
| 501 | - $decode = array_merge(array('Message nature' => 'Predicted wind info request'),$decode); |
|
| 500 | + elseif (preg_match(':^#M1BREQPWI:', $message)) { |
|
| 501 | + $decode = array_merge(array('Message nature' => 'Predicted wind info request'), $decode); |
|
| 502 | 502 | } |
| 503 | - elseif (preg_match(':^#CF:',$message)) { |
|
| 504 | - $decode = array_merge(array('Message nature' => 'Central Fault Display'),$decode); |
|
| 503 | + elseif (preg_match(':^#CF:', $message)) { |
|
| 504 | + $decode = array_merge(array('Message nature' => 'Central Fault Display'), $decode); |
|
| 505 | 505 | } |
| 506 | - elseif (preg_match(':^#DF:',$message)) { |
|
| 507 | - $decode = array_merge(array('Message nature' => 'Digital Flight Data Acquisition Unit'),$decode); |
|
| 506 | + elseif (preg_match(':^#DF:', $message)) { |
|
| 507 | + $decode = array_merge(array('Message nature' => 'Digital Flight Data Acquisition Unit'), $decode); |
|
| 508 | 508 | } |
| 509 | - elseif (preg_match(':^#EC:',$message)) { |
|
| 510 | - $decode = array_merge(array('Message nature' => 'Engine Display System'),$decode); |
|
| 509 | + elseif (preg_match(':^#EC:', $message)) { |
|
| 510 | + $decode = array_merge(array('Message nature' => 'Engine Display System'), $decode); |
|
| 511 | 511 | } |
| 512 | - elseif (preg_match(':^#EI:',$message)) { |
|
| 513 | - $decode = array_merge(array('Message nature' => 'Engine Report'),$decode); |
|
| 512 | + elseif (preg_match(':^#EI:', $message)) { |
|
| 513 | + $decode = array_merge(array('Message nature' => 'Engine Report'), $decode); |
|
| 514 | 514 | } |
| 515 | - elseif (preg_match(':^#H1:',$message)) { |
|
| 516 | - $decode = array_merge(array('Message nature' => 'HF Data Radio - Left'),$decode); |
|
| 515 | + elseif (preg_match(':^#H1:', $message)) { |
|
| 516 | + $decode = array_merge(array('Message nature' => 'HF Data Radio - Left'), $decode); |
|
| 517 | 517 | } |
| 518 | - elseif (preg_match(':^#H2:',$message)) { |
|
| 519 | - $decode = array_merge(array('Message nature' => 'HF Data Radio - Right'),$decode); |
|
| 518 | + elseif (preg_match(':^#H2:', $message)) { |
|
| 519 | + $decode = array_merge(array('Message nature' => 'HF Data Radio - Right'), $decode); |
|
| 520 | 520 | } |
| 521 | - elseif (preg_match(':^#HD:',$message)) { |
|
| 522 | - $decode = array_merge(array('Message nature' => 'HF Data Radio - Selected'),$decode); |
|
| 521 | + elseif (preg_match(':^#HD:', $message)) { |
|
| 522 | + $decode = array_merge(array('Message nature' => 'HF Data Radio - Selected'), $decode); |
|
| 523 | 523 | } |
| 524 | - elseif (preg_match(':^#M1:',$message)) { |
|
| 525 | - $decode = array_merge(array('Message nature' => 'Flight Management Computer - Left'),$decode); |
|
| 524 | + elseif (preg_match(':^#M1:', $message)) { |
|
| 525 | + $decode = array_merge(array('Message nature' => 'Flight Management Computer - Left'), $decode); |
|
| 526 | 526 | } |
| 527 | - elseif (preg_match(':^#M2:',$message)) { |
|
| 528 | - $decode = array_merge(array('Message nature' => 'Flight Management Computer - Right'),$decode); |
|
| 527 | + elseif (preg_match(':^#M2:', $message)) { |
|
| 528 | + $decode = array_merge(array('Message nature' => 'Flight Management Computer - Right'), $decode); |
|
| 529 | 529 | } |
| 530 | - elseif (preg_match(':^#M3:',$message)) { |
|
| 531 | - $decode = array_merge(array('Message nature' => 'Flight Management Computer - Center'),$decode); |
|
| 530 | + elseif (preg_match(':^#M3:', $message)) { |
|
| 531 | + $decode = array_merge(array('Message nature' => 'Flight Management Computer - Center'), $decode); |
|
| 532 | 532 | } |
| 533 | - elseif (preg_match(':^#MD:',$message)) { |
|
| 534 | - $decode = array_merge(array('Message nature' => 'Flight Management Computer - Selected'),$decode); |
|
| 533 | + elseif (preg_match(':^#MD:', $message)) { |
|
| 534 | + $decode = array_merge(array('Message nature' => 'Flight Management Computer - Selected'), $decode); |
|
| 535 | 535 | } |
| 536 | - elseif (preg_match(':^#PS:',$message)) { |
|
| 537 | - $decode = array_merge(array('Message nature' => 'Keyboard/Display Unit'),$decode); |
|
| 536 | + elseif (preg_match(':^#PS:', $message)) { |
|
| 537 | + $decode = array_merge(array('Message nature' => 'Keyboard/Display Unit'), $decode); |
|
| 538 | 538 | } |
| 539 | - elseif (preg_match(':^#S1:',$message)) { |
|
| 540 | - $decode = array_merge(array('Message nature' => 'SDU - Left'),$decode); |
|
| 539 | + elseif (preg_match(':^#S1:', $message)) { |
|
| 540 | + $decode = array_merge(array('Message nature' => 'SDU - Left'), $decode); |
|
| 541 | 541 | } |
| 542 | - elseif (preg_match(':^#S2:',$message)) { |
|
| 543 | - $decode = array_merge(array('Message nature' => 'SDU - Right'),$decode); |
|
| 542 | + elseif (preg_match(':^#S2:', $message)) { |
|
| 543 | + $decode = array_merge(array('Message nature' => 'SDU - Right'), $decode); |
|
| 544 | 544 | } |
| 545 | - elseif (preg_match(':^#SD:',$message)) { |
|
| 546 | - $decode = array_merge(array('Message nature' => 'SDU - Selected'),$decode); |
|
| 545 | + elseif (preg_match(':^#SD:', $message)) { |
|
| 546 | + $decode = array_merge(array('Message nature' => 'SDU - Selected'), $decode); |
|
| 547 | 547 | } |
| 548 | - elseif (preg_match(':^#T[0-8]:',$message)) { |
|
| 549 | - $decode = array_merge(array('Message nature' => 'Cabin Terminal Messages'),$decode); |
|
| 548 | + elseif (preg_match(':^#T[0-8]:', $message)) { |
|
| 549 | + $decode = array_merge(array('Message nature' => 'Cabin Terminal Messages'), $decode); |
|
| 550 | 550 | } |
| 551 | - elseif (preg_match(':^#WO:',$message)) { |
|
| 552 | - $decode = array_merge(array('Message nature' => 'Weather Observation Report'),$decode); |
|
| 551 | + elseif (preg_match(':^#WO:', $message)) { |
|
| 552 | + $decode = array_merge(array('Message nature' => 'Weather Observation Report'), $decode); |
|
| 553 | 553 | } |
| 554 | - elseif (preg_match(':^#A1:',$message)) { |
|
| 555 | - $decode = array_merge(array('Message nature' => 'Oceanic Clearance'),$decode); |
|
| 554 | + elseif (preg_match(':^#A1:', $message)) { |
|
| 555 | + $decode = array_merge(array('Message nature' => 'Oceanic Clearance'), $decode); |
|
| 556 | 556 | } |
| 557 | - elseif (preg_match(':^#A3:',$message)) { |
|
| 558 | - $decode = array_merge(array('Message nature' => 'Departure Clearance Response'),$decode); |
|
| 557 | + elseif (preg_match(':^#A3:', $message)) { |
|
| 558 | + $decode = array_merge(array('Message nature' => 'Departure Clearance Response'), $decode); |
|
| 559 | 559 | } |
| 560 | - elseif (preg_match(':^#A4:',$message)) { |
|
| 561 | - $decode = array_merge(array('Message nature' => 'Flight Systems Message'),$decode); |
|
| 560 | + elseif (preg_match(':^#A4:', $message)) { |
|
| 561 | + $decode = array_merge(array('Message nature' => 'Flight Systems Message'), $decode); |
|
| 562 | 562 | } |
| 563 | - elseif (preg_match(':^#A6:',$message)) { |
|
| 564 | - $decode = array_merge(array('Message nature' => 'Request ADS Reports'),$decode); |
|
| 563 | + elseif (preg_match(':^#A6:', $message)) { |
|
| 564 | + $decode = array_merge(array('Message nature' => 'Request ADS Reports'), $decode); |
|
| 565 | 565 | } |
| 566 | - elseif (preg_match(':^#A8:',$message)) { |
|
| 567 | - $decode = array_merge(array('Message nature' => 'Deliver Departure Slot'),$decode); |
|
| 566 | + elseif (preg_match(':^#A8:', $message)) { |
|
| 567 | + $decode = array_merge(array('Message nature' => 'Deliver Departure Slot'), $decode); |
|
| 568 | 568 | } |
| 569 | - elseif (preg_match(':^#A9:',$message)) { |
|
| 570 | - $decode = array_merge(array('Message nature' => 'ATIS report'),$decode); |
|
| 569 | + elseif (preg_match(':^#A9:', $message)) { |
|
| 570 | + $decode = array_merge(array('Message nature' => 'ATIS report'), $decode); |
|
| 571 | 571 | } |
| 572 | - elseif (preg_match(':^#A0:',$message)) { |
|
| 573 | - $decode = array_merge(array('Message nature' => 'ATIS Facility Notification (AFN)'),$decode); |
|
| 572 | + elseif (preg_match(':^#A0:', $message)) { |
|
| 573 | + $decode = array_merge(array('Message nature' => 'ATIS Facility Notification (AFN)'), $decode); |
|
| 574 | 574 | } |
| 575 | - elseif (preg_match(':^#AA:',$message)) { |
|
| 576 | - $decode = array_merge(array('Message nature' => 'ATCComm'),$decode); |
|
| 575 | + elseif (preg_match(':^#AA:', $message)) { |
|
| 576 | + $decode = array_merge(array('Message nature' => 'ATCComm'), $decode); |
|
| 577 | 577 | } |
| 578 | - elseif (preg_match(':^#AB:',$message)) { |
|
| 579 | - $decode = array_merge(array('Message nature' => 'TWIP Report'),$decode); |
|
| 578 | + elseif (preg_match(':^#AB:', $message)) { |
|
| 579 | + $decode = array_merge(array('Message nature' => 'TWIP Report'), $decode); |
|
| 580 | 580 | } |
| 581 | - elseif (preg_match(':^#AC:',$message)) { |
|
| 582 | - $decode = array_merge(array('Message nature' => 'Pushback Clearance'),$decode); |
|
| 581 | + elseif (preg_match(':^#AC:', $message)) { |
|
| 582 | + $decode = array_merge(array('Message nature' => 'Pushback Clearance'), $decode); |
|
| 583 | 583 | } |
| 584 | - elseif (preg_match(':^#AD:',$message)) { |
|
| 585 | - $decode = array_merge(array('Message nature' => 'Expected Taxi Clearance'),$decode); |
|
| 584 | + elseif (preg_match(':^#AD:', $message)) { |
|
| 585 | + $decode = array_merge(array('Message nature' => 'Expected Taxi Clearance'), $decode); |
|
| 586 | 586 | } |
| 587 | - elseif (preg_match(':^#AF:',$message)) { |
|
| 588 | - $decode = array_merge(array('Message nature' => 'CPC Command/Response'),$decode); |
|
| 587 | + elseif (preg_match(':^#AF:', $message)) { |
|
| 588 | + $decode = array_merge(array('Message nature' => 'CPC Command/Response'), $decode); |
|
| 589 | 589 | } |
| 590 | - elseif (preg_match(':^#B1:',$message)) { |
|
| 591 | - $decode = array_merge(array('Message nature' => 'Request Oceanic Clearance'),$decode); |
|
| 590 | + elseif (preg_match(':^#B1:', $message)) { |
|
| 591 | + $decode = array_merge(array('Message nature' => 'Request Oceanic Clearance'), $decode); |
|
| 592 | 592 | } |
| 593 | - elseif (preg_match(':^#B2:',$message)) { |
|
| 594 | - $decode = array_merge(array('Message nature' => 'Oceanic Clearance Readback'),$decode); |
|
| 593 | + elseif (preg_match(':^#B2:', $message)) { |
|
| 594 | + $decode = array_merge(array('Message nature' => 'Oceanic Clearance Readback'), $decode); |
|
| 595 | 595 | } |
| 596 | - elseif (preg_match(':^#B3:',$message)) { |
|
| 597 | - $decode = array_merge(array('Message nature' => 'Request Departure Clearance'),$decode); |
|
| 596 | + elseif (preg_match(':^#B3:', $message)) { |
|
| 597 | + $decode = array_merge(array('Message nature' => 'Request Departure Clearance'), $decode); |
|
| 598 | 598 | } |
| 599 | - elseif (preg_match(':^#B4:',$message)) { |
|
| 600 | - $decode = array_merge(array('Message nature' => 'Departure Clearance Readback'),$decode); |
|
| 599 | + elseif (preg_match(':^#B4:', $message)) { |
|
| 600 | + $decode = array_merge(array('Message nature' => 'Departure Clearance Readback'), $decode); |
|
| 601 | 601 | } |
| 602 | - elseif (preg_match(':^#B6:',$message)) { |
|
| 603 | - $decode = array_merge(array('Message nature' => 'Provide ADS Report'),$decode); |
|
| 602 | + elseif (preg_match(':^#B6:', $message)) { |
|
| 603 | + $decode = array_merge(array('Message nature' => 'Provide ADS Report'), $decode); |
|
| 604 | 604 | } |
| 605 | - elseif (preg_match(':^#B8:',$message)) { |
|
| 606 | - $decode = array_merge(array('Message nature' => 'Request Departure Slot'),$decode); |
|
| 605 | + elseif (preg_match(':^#B8:', $message)) { |
|
| 606 | + $decode = array_merge(array('Message nature' => 'Request Departure Slot'), $decode); |
|
| 607 | 607 | } |
| 608 | - elseif (preg_match(':^#B9:',$message)) { |
|
| 609 | - $decode = array_merge(array('Message nature' => 'Request ATIS Report'),$decode); |
|
| 608 | + elseif (preg_match(':^#B9:', $message)) { |
|
| 609 | + $decode = array_merge(array('Message nature' => 'Request ATIS Report'), $decode); |
|
| 610 | 610 | } |
| 611 | - elseif (preg_match(':^#B0:',$message)) { |
|
| 612 | - $decode = array_merge(array('Message nature' => 'ATS Facility Notification'),$decode); |
|
| 611 | + elseif (preg_match(':^#B0:', $message)) { |
|
| 612 | + $decode = array_merge(array('Message nature' => 'ATS Facility Notification'), $decode); |
|
| 613 | 613 | } |
| 614 | - elseif (preg_match(':^#BA:',$message)) { |
|
| 615 | - $decode = array_merge(array('Message nature' => 'ATCComm'),$decode); |
|
| 614 | + elseif (preg_match(':^#BA:', $message)) { |
|
| 615 | + $decode = array_merge(array('Message nature' => 'ATCComm'), $decode); |
|
| 616 | 616 | } |
| 617 | - elseif (preg_match(':^#BB:',$message)) { |
|
| 618 | - $decode = array_merge(array('Message nature' => 'Request TWIP Report'),$decode); |
|
| 617 | + elseif (preg_match(':^#BB:', $message)) { |
|
| 618 | + $decode = array_merge(array('Message nature' => 'Request TWIP Report'), $decode); |
|
| 619 | 619 | } |
| 620 | - elseif (preg_match(':^#BC:',$message)) { |
|
| 621 | - $decode = array_merge(array('Message nature' => 'Pushback Clearance Request'),$decode); |
|
| 620 | + elseif (preg_match(':^#BC:', $message)) { |
|
| 621 | + $decode = array_merge(array('Message nature' => 'Pushback Clearance Request'), $decode); |
|
| 622 | 622 | } |
| 623 | - elseif (preg_match(':^#BD:',$message)) { |
|
| 624 | - $decode = array_merge(array('Message nature' => 'Expected Taxi Clearance Request'),$decode); |
|
| 623 | + elseif (preg_match(':^#BD:', $message)) { |
|
| 624 | + $decode = array_merge(array('Message nature' => 'Expected Taxi Clearance Request'), $decode); |
|
| 625 | 625 | } |
| 626 | - elseif (preg_match(':^#BE:',$message)) { |
|
| 627 | - $decode = array_merge(array('Message nature' => 'CPC Aircraft Log-On/Off Request'),$decode); |
|
| 626 | + elseif (preg_match(':^#BE:', $message)) { |
|
| 627 | + $decode = array_merge(array('Message nature' => 'CPC Aircraft Log-On/Off Request'), $decode); |
|
| 628 | 628 | } |
| 629 | - elseif (preg_match(':^#BF:',$message)) { |
|
| 630 | - $decode = array_merge(array('Message nature' => 'CPC WILCO/UNABLE Response'),$decode); |
|
| 629 | + elseif (preg_match(':^#BF:', $message)) { |
|
| 630 | + $decode = array_merge(array('Message nature' => 'CPC WILCO/UNABLE Response'), $decode); |
|
| 631 | 631 | } |
| 632 | - elseif (preg_match(':^#H3:',$message)) { |
|
| 633 | - $decode = array_merge(array('Message nature' => 'Icing Report'),$decode); |
|
| 632 | + elseif (preg_match(':^#H3:', $message)) { |
|
| 633 | + $decode = array_merge(array('Message nature' => 'Icing Report'), $decode); |
|
| 634 | 634 | } |
| 635 | 635 | } |
| 636 | 636 | if ($label == '10') { |
| 637 | - if (preg_match(':^DTO01:',$message)) { |
|
| 638 | - $decode = array_merge(array('Message nature' => 'Delayed Takeoff Report'),$decode); |
|
| 637 | + if (preg_match(':^DTO01:', $message)) { |
|
| 638 | + $decode = array_merge(array('Message nature' => 'Delayed Takeoff Report'), $decode); |
|
| 639 | 639 | } |
| 640 | - elseif (preg_match(':^AIS01:',$message)) { |
|
| 641 | - $decode = array_merge(array('Message nature' => 'AIS Request'),$decode); |
|
| 640 | + elseif (preg_match(':^AIS01:', $message)) { |
|
| 641 | + $decode = array_merge(array('Message nature' => 'AIS Request'), $decode); |
|
| 642 | 642 | } |
| 643 | - elseif (preg_match(':^FTX01:',$message)) { |
|
| 644 | - $decode = array_merge(array('Message nature' => 'Free Text Downlink'),$decode); |
|
| 643 | + elseif (preg_match(':^FTX01:', $message)) { |
|
| 644 | + $decode = array_merge(array('Message nature' => 'Free Text Downlink'), $decode); |
|
| 645 | 645 | } |
| 646 | - elseif (preg_match(':^FPL01:',$message)) { |
|
| 647 | - $decode = array_merge(array('Message nature' => 'Flight Plan Request'),$decode); |
|
| 646 | + elseif (preg_match(':^FPL01:', $message)) { |
|
| 647 | + $decode = array_merge(array('Message nature' => 'Flight Plan Request'), $decode); |
|
| 648 | 648 | } |
| 649 | - elseif (preg_match(':^WAB01:',$message)) { |
|
| 650 | - $decode = array_merge(array('Message nature' => 'Weight & Balance Request'),$decode); |
|
| 649 | + elseif (preg_match(':^WAB01:', $message)) { |
|
| 650 | + $decode = array_merge(array('Message nature' => 'Weight & Balance Request'), $decode); |
|
| 651 | 651 | } |
| 652 | - elseif (preg_match(':^MET01:',$message)) { |
|
| 653 | - $decode = array_merge(array('Message nature' => 'Weather Data Request'),$decode); |
|
| 652 | + elseif (preg_match(':^MET01:', $message)) { |
|
| 653 | + $decode = array_merge(array('Message nature' => 'Weather Data Request'), $decode); |
|
| 654 | 654 | } |
| 655 | - elseif (preg_match(':^WAB02:',$message)) { |
|
| 656 | - $decode = array_merge(array('Message nature' => 'Weight and Balance Acknowledgement'),$decode); |
|
| 655 | + elseif (preg_match(':^WAB02:', $message)) { |
|
| 656 | + $decode = array_merge(array('Message nature' => 'Weight and Balance Acknowledgement'), $decode); |
|
| 657 | 657 | } |
| 658 | 658 | } |
| 659 | 659 | if ($label == '15') { |
| 660 | - if (preg_match(':^FST01:',$message)) { |
|
| 661 | - $decode = array_merge(array('Message nature' => 'Flight Status Report'),$decode); |
|
| 660 | + if (preg_match(':^FST01:', $message)) { |
|
| 661 | + $decode = array_merge(array('Message nature' => 'Flight Status Report'), $decode); |
|
| 662 | 662 | } |
| 663 | 663 | } |
| 664 | 664 | if (!$found && $label == 'SA') { |
| 665 | - $n = sscanf($message, "%d%c%c%6[0-9]", $version,$state,$type,$at); |
|
| 665 | + $n = sscanf($message, "%d%c%c%6[0-9]", $version, $state, $type, $at); |
|
| 666 | 666 | if ($n == 4) { |
| 667 | 667 | $vsta = array('Version' => $version); |
| 668 | 668 | if ($state == 'E') { |
| 669 | - $vsta = array_merge($vsta,array('Link state' => 'Established')); |
|
| 669 | + $vsta = array_merge($vsta, array('Link state' => 'Established')); |
|
| 670 | 670 | } |
| 671 | 671 | elseif ($state == 'L') { |
| 672 | - $vsta = array_merge($vsta,array('Link state' => 'Lost')); |
|
| 672 | + $vsta = array_merge($vsta, array('Link state' => 'Lost')); |
|
| 673 | 673 | } |
| 674 | 674 | else { |
| 675 | - $vsta = array_merge($vsta,array('Link state' => 'Unknown')); |
|
| 675 | + $vsta = array_merge($vsta, array('Link state' => 'Unknown')); |
|
| 676 | 676 | } |
| 677 | 677 | if ($type == 'V') { |
| 678 | - $vsta = array_merge($vsta,array('Link type' => 'VHF ACARS')); |
|
| 678 | + $vsta = array_merge($vsta, array('Link type' => 'VHF ACARS')); |
|
| 679 | 679 | } |
| 680 | 680 | elseif ($type == 'S') { |
| 681 | - $vsta = array_merge($vsta,array('Link type' => 'Generic SATCOM')); |
|
| 681 | + $vsta = array_merge($vsta, array('Link type' => 'Generic SATCOM')); |
|
| 682 | 682 | } |
| 683 | 683 | elseif ($type == 'H') { |
| 684 | - $vsta = array_merge($vsta,array('Link type' => 'HF')); |
|
| 684 | + $vsta = array_merge($vsta, array('Link type' => 'HF')); |
|
| 685 | 685 | } |
| 686 | 686 | elseif ($type == 'G') { |
| 687 | - $vsta = array_merge($vsta,array('Link type' => 'GlobalStar SATCOM')); |
|
| 687 | + $vsta = array_merge($vsta, array('Link type' => 'GlobalStar SATCOM')); |
|
| 688 | 688 | } |
| 689 | 689 | elseif ($type == 'C') { |
| 690 | - $vsta = array_merge($vsta,array('Link type' => 'ICO SATCOM')); |
|
| 690 | + $vsta = array_merge($vsta, array('Link type' => 'ICO SATCOM')); |
|
| 691 | 691 | } |
| 692 | 692 | elseif ($type == '2') { |
| 693 | - $vsta = array_merge($vsta,array('Link type' => 'VDL Mode 2')); |
|
| 693 | + $vsta = array_merge($vsta, array('Link type' => 'VDL Mode 2')); |
|
| 694 | 694 | } |
| 695 | 695 | elseif ($type == 'X') { |
| 696 | - $vsta = array_merge($vsta,array('Link type' => 'Inmarsat Aero')); |
|
| 696 | + $vsta = array_merge($vsta, array('Link type' => 'Inmarsat Aero')); |
|
| 697 | 697 | } |
| 698 | 698 | elseif ($type == 'I') { |
| 699 | - $vsta = array_merge($vsta,array('Link type' => 'Irridium SATCOM')); |
|
| 699 | + $vsta = array_merge($vsta, array('Link type' => 'Irridium SATCOM')); |
|
| 700 | 700 | } |
| 701 | 701 | else { |
| 702 | - $vsta = array_merge($vsta,array('Link type' => 'Unknown')); |
|
| 702 | + $vsta = array_merge($vsta, array('Link type' => 'Unknown')); |
|
| 703 | 703 | } |
| 704 | - $vsta = array_merge($vsta,array('Event occured at' => implode(':',str_split($at,2)))); |
|
| 705 | - $decode = array_merge($vsta,$decode); |
|
| 704 | + $vsta = array_merge($vsta, array('Event occured at' => implode(':', str_split($at, 2)))); |
|
| 705 | + $decode = array_merge($vsta, $decode); |
|
| 706 | 706 | } |
| 707 | 707 | } |
| 708 | 708 | |
| 709 | 709 | $title = $this->getTitlefromLabel($label); |
| 710 | - if ($title != '') $decode = array_merge(array('Message title' => $title),$decode); |
|
| 710 | + if ($title != '') $decode = array_merge(array('Message title' => $title), $decode); |
|
| 711 | 711 | /* |
| 712 | 712 | // Business jets always use GS0001 |
| 713 | 713 | if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude); |
@@ -735,13 +735,13 @@ discard block |
||
| 735 | 735 | $Translation = new Translation($this->db); |
| 736 | 736 | $message = $this->parse($data); |
| 737 | 737 | if (isset($message['registration']) && $message['registration'] != '' && $message['ident'] != '' && $message['registration'] != '!') { |
| 738 | - $ident = (string)$message['ident']; |
|
| 738 | + $ident = (string) $message['ident']; |
|
| 739 | 739 | $label = $message['label']; |
| 740 | 740 | $block_id = $message['block_id']; |
| 741 | 741 | $msg_no = $message['msg_no']; |
| 742 | 742 | $msg = $message['message']; |
| 743 | 743 | $decode = $message['decode']; |
| 744 | - $registration = (string)$message['registration']; |
|
| 744 | + $registration = (string) $message['registration']; |
|
| 745 | 745 | if (isset($decode['latitude'])) $latitude = $decode['latitude']; |
| 746 | 746 | else $latitude = ''; |
| 747 | 747 | if (isset($decode['longitude'])) $longitude = $decode['longitude']; |
@@ -755,20 +755,20 @@ discard block |
||
| 755 | 755 | $Image->addSpotterImage($registration); |
| 756 | 756 | } |
| 757 | 757 | // Business jets always use GS0001 |
| 758 | - if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude); |
|
| 758 | + if ($ident != 'GS0001') $info = $this->addModeSData($ident, $registration, $icao, $airicao, $latitude, $longitude); |
|
| 759 | 759 | if ($globalDebug && isset($info) && $info != '') echo $info; |
| 760 | 760 | if (count($decode) > 0) $decode_json = json_encode($decode); |
| 761 | 761 | else $decode_json = ''; |
| 762 | 762 | if (isset($decode['Departure airport']) && isset($decode['Departure hour']) && isset($decode['Arrival airport']) && isset($decode['Arrival hour'])) { |
| 763 | - $Schedule->addSchedule($icao,$decode['Departure airport'],$decode['Departure hour'],$decode['Arrival airport'],$decode['Arrival hour'],'ACARS'); |
|
| 763 | + $Schedule->addSchedule($icao, $decode['Departure airport'], $decode['Departure hour'], $decode['Arrival airport'], $decode['Arrival hour'], 'ACARS'); |
|
| 764 | 764 | } elseif (isset($decode['Departure airport']) && isset($decode['Arrival airport'])) { |
| 765 | - $Schedule->addSchedule($icao,$decode['Departure airport'],'',$decode['Arrival airport'],'','ACARS'); |
|
| 765 | + $Schedule->addSchedule($icao, $decode['Departure airport'], '', $decode['Arrival airport'], '', 'ACARS'); |
|
| 766 | 766 | } |
| 767 | - $result = $this->addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json); |
|
| 768 | - if (!isset($globalACARSArchive)) $globalACARSArchive = array('10','80','81','82','3F'); |
|
| 769 | - if ($result && in_array($label,$globalACARSArchive)) $this->addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json); |
|
| 767 | + $result = $this->addLiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $msg, $decode_json); |
|
| 768 | + if (!isset($globalACARSArchive)) $globalACARSArchive = array('10', '80', '81', '82', '3F'); |
|
| 769 | + if ($result && in_array($label, $globalACARSArchive)) $this->addArchiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $msg, $decode_json); |
|
| 770 | 770 | if ($globalDebug && count($decode) > 0) { |
| 771 | - echo "Human readable data : ".implode(' - ',$decode)."\n"; |
|
| 771 | + echo "Human readable data : ".implode(' - ', $decode)."\n"; |
|
| 772 | 772 | } |
| 773 | 773 | } |
| 774 | 774 | } |
@@ -783,7 +783,7 @@ discard block |
||
| 783 | 783 | * @param String $msg_no Number of the ACARS message |
| 784 | 784 | * @param String $message ACARS message |
| 785 | 785 | */ |
| 786 | - public function addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') { |
|
| 786 | + public function addLiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $message, $decode = '') { |
|
| 787 | 787 | global $globalDebug; |
| 788 | 788 | date_default_timezone_set('UTC'); |
| 789 | 789 | if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '') { |
@@ -791,21 +791,21 @@ discard block |
||
| 791 | 791 | $this->db = $Connection->db; |
| 792 | 792 | if ($globalDebug) echo "Test if not already in Live ACARS table..."; |
| 793 | 793 | $query_test = "SELECT COUNT(*) as nb FROM acars_live WHERE ident = :ident AND registration = :registration AND message = :message"; |
| 794 | - $query_test_values = array(':ident' => $ident,':registration' => $registration, ':message' => $message); |
|
| 794 | + $query_test_values = array(':ident' => $ident, ':registration' => $registration, ':message' => $message); |
|
| 795 | 795 | try { |
| 796 | 796 | $stht = $this->db->prepare($query_test); |
| 797 | 797 | $stht->execute($query_test_values); |
| 798 | - } catch(PDOException $e) { |
|
| 798 | + } catch (PDOException $e) { |
|
| 799 | 799 | return "error : ".$e->getMessage(); |
| 800 | 800 | } |
| 801 | 801 | if ($stht->fetchColumn() == 0) { |
| 802 | 802 | if ($globalDebug) echo "Add Live ACARS data..."; |
| 803 | 803 | $query = "INSERT INTO acars_live (ident,registration,label,block_id,msg_no,message,decode,date) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode,:date)"; |
| 804 | - $query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode,':date' => date("Y-m-d H:i:s")); |
|
| 804 | + $query_values = array(':ident' => $ident, ':registration' => $registration, ':label' => $label, ':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode, ':date' => date("Y-m-d H:i:s")); |
|
| 805 | 805 | try { |
| 806 | 806 | $sth = $this->db->prepare($query); |
| 807 | 807 | $sth->execute($query_values); |
| 808 | - } catch(PDOException $e) { |
|
| 808 | + } catch (PDOException $e) { |
|
| 809 | 809 | return "error : ".$e->getMessage(); |
| 810 | 810 | } |
| 811 | 811 | } else { |
@@ -827,10 +827,10 @@ discard block |
||
| 827 | 827 | * @param String $msg_no Number of the ACARS message |
| 828 | 828 | * @param String $message ACARS message |
| 829 | 829 | */ |
| 830 | - public function addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') { |
|
| 830 | + public function addArchiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $message, $decode = '') { |
|
| 831 | 831 | global $globalDebug; |
| 832 | 832 | date_default_timezone_set('UTC'); |
| 833 | - if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '' && preg_match('/^MET0/',$message) === 0 && preg_match('/^ARR0/',$message) === 0 && preg_match('/^ETA/',$message) === 0 && preg_match('/^WXR/',$message) === 0 && preg_match('/^FTX01.FIC/',$message) === 0) { |
|
| 833 | + if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '' && preg_match('/^MET0/', $message) === 0 && preg_match('/^ARR0/', $message) === 0 && preg_match('/^ETA/', $message) === 0 && preg_match('/^WXR/', $message) === 0 && preg_match('/^FTX01.FIC/', $message) === 0) { |
|
| 834 | 834 | /* |
| 835 | 835 | if ($globalDebug) echo "Test if not already in Archive ACARS table..."; |
| 836 | 836 | $query_test = "SELECT COUNT(*) as nb FROM acars_archive WHERE ident = :ident AND registration = :registration AND message = :message"; |
@@ -845,11 +845,11 @@ discard block |
||
| 845 | 845 | */ |
| 846 | 846 | if ($globalDebug) echo "Add Live ACARS data..."; |
| 847 | 847 | $query = "INSERT INTO acars_archive (ident,registration,label,block_id,msg_no,message,decode) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode)"; |
| 848 | - $query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode); |
|
| 848 | + $query_values = array(':ident' => $ident, ':registration' => $registration, ':label' => $label, ':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode); |
|
| 849 | 849 | try { |
| 850 | 850 | $sth = $this->db->prepare($query); |
| 851 | 851 | $sth->execute($query_values); |
| 852 | - } catch(PDOException $e) { |
|
| 852 | + } catch (PDOException $e) { |
|
| 853 | 853 | return "error : ".$e->getMessage(); |
| 854 | 854 | } |
| 855 | 855 | if ($globalDebug) echo "Done\n"; |
@@ -870,7 +870,7 @@ discard block |
||
| 870 | 870 | try { |
| 871 | 871 | $sth = $this->db->prepare($query); |
| 872 | 872 | $sth->execute($query_values); |
| 873 | - } catch(PDOException $e) { |
|
| 873 | + } catch (PDOException $e) { |
|
| 874 | 874 | echo "error : ".$e->getMessage(); |
| 875 | 875 | return ''; |
| 876 | 876 | } |
@@ -890,7 +890,7 @@ discard block |
||
| 890 | 890 | try { |
| 891 | 891 | $sth = $this->db->prepare($query); |
| 892 | 892 | $sth->execute($query_values); |
| 893 | - } catch(PDOException $e) { |
|
| 893 | + } catch (PDOException $e) { |
|
| 894 | 894 | echo "error : ".$e->getMessage(); |
| 895 | 895 | return array(); |
| 896 | 896 | } |
@@ -911,7 +911,7 @@ discard block |
||
| 911 | 911 | try { |
| 912 | 912 | $sth = $this->db->prepare($query); |
| 913 | 913 | $sth->execute($query_values); |
| 914 | - } catch(PDOException $e) { |
|
| 914 | + } catch (PDOException $e) { |
|
| 915 | 915 | echo "error : ".$e->getMessage(); |
| 916 | 916 | return array(); |
| 917 | 917 | } |
@@ -925,7 +925,7 @@ discard block |
||
| 925 | 925 | * |
| 926 | 926 | * @return Array Return ACARS data in array |
| 927 | 927 | */ |
| 928 | - public function getLatestAcarsData($limit = '',$label = '') { |
|
| 928 | + public function getLatestAcarsData($limit = '', $label = '') { |
|
| 929 | 929 | global $globalURL, $globalDBdriver; |
| 930 | 930 | $Image = new Image($this->db); |
| 931 | 931 | $Spotter = new Spotter($this->db); |
@@ -936,8 +936,8 @@ discard block |
||
| 936 | 936 | if ($limit != "") |
| 937 | 937 | { |
| 938 | 938 | $limit_array = explode(",", $limit); |
| 939 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 940 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 939 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 940 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 941 | 941 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 942 | 942 | { |
| 943 | 943 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
@@ -953,46 +953,46 @@ discard block |
||
| 953 | 953 | try { |
| 954 | 954 | $sth = $this->db->prepare($query); |
| 955 | 955 | $sth->execute($query_values); |
| 956 | - } catch(PDOException $e) { |
|
| 956 | + } catch (PDOException $e) { |
|
| 957 | 957 | return "error : ".$e->getMessage(); |
| 958 | 958 | } |
| 959 | 959 | $i = 0; |
| 960 | 960 | while ($row = $sth->fetch(PDO::FETCH_ASSOC)) { |
| 961 | 961 | $data = array(); |
| 962 | 962 | if ($row['registration'] != '') { |
| 963 | - $row['registration'] = str_replace('.','',$row['registration']); |
|
| 963 | + $row['registration'] = str_replace('.', '', $row['registration']); |
|
| 964 | 964 | $image_array = $Image->getSpotterImage($row['registration']); |
| 965 | - if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website'])); |
|
| 966 | - else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => '')); |
|
| 967 | - } else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => '')); |
|
| 965 | + if (count($image_array) > 0) $data = array_merge($data, array('image' => $image_array[0]['image'], 'image_thumbnail' => $image_array[0]['image_thumbnail'], 'image_copyright' => $image_array[0]['image_copyright'], 'image_source' => $image_array[0]['image_source'], 'image_source_website' => $image_array[0]['image_source_website'])); |
|
| 966 | + else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => '')); |
|
| 967 | + } else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => '')); |
|
| 968 | 968 | if ($row['registration'] == '') $row['registration'] = 'NA'; |
| 969 | 969 | if ($row['ident'] == '') $row['ident'] = 'NA'; |
| 970 | - $identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2)); |
|
| 970 | + $identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 2)); |
|
| 971 | 971 | if (isset($identicao[0])) { |
| 972 | - if (substr($row['ident'],0,2) == 'AF') { |
|
| 973 | - if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident']; |
|
| 974 | - else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0'); |
|
| 975 | - } else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0'); |
|
| 976 | - $data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name'])); |
|
| 972 | + if (substr($row['ident'], 0, 2) == 'AF') { |
|
| 973 | + if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident']; |
|
| 974 | + else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0'); |
|
| 975 | + } else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0'); |
|
| 976 | + $data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name'])); |
|
| 977 | 977 | } else $icao = $row['ident']; |
| 978 | - $icao = $Translation->checkTranslation($icao,false); |
|
| 979 | - $decode = json_decode($row['decode'],true); |
|
| 978 | + $icao = $Translation->checkTranslation($icao, false); |
|
| 979 | + $decode = json_decode($row['decode'], true); |
|
| 980 | 980 | $found = false; |
| 981 | - if ($decode != '' && array_key_exists('Departure airport',$decode)) { |
|
| 981 | + if ($decode != '' && array_key_exists('Departure airport', $decode)) { |
|
| 982 | 982 | $airport_info = $Spotter->getAllAirportInfo($decode['Departure airport']); |
| 983 | 983 | if (isset($airport_info[0]['icao'])) { |
| 984 | 984 | $decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>'; |
| 985 | 985 | $found = true; |
| 986 | 986 | } |
| 987 | 987 | } |
| 988 | - if ($decode != '' && array_key_exists('Arrival airport',$decode)) { |
|
| 988 | + if ($decode != '' && array_key_exists('Arrival airport', $decode)) { |
|
| 989 | 989 | $airport_info = $Spotter->getAllAirportInfo($decode['Arrival airport']); |
| 990 | 990 | if (isset($airport_info[0]['icao'])) { |
| 991 | 991 | $decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>'; |
| 992 | 992 | $found = true; |
| 993 | 993 | } |
| 994 | 994 | } |
| 995 | - if ($decode != '' && array_key_exists('Airport/Waypoint name',$decode)) { |
|
| 995 | + if ($decode != '' && array_key_exists('Airport/Waypoint name', $decode)) { |
|
| 996 | 996 | $airport_info = $Spotter->getAllAirportInfo($decode['Airport/Waypoint name']); |
| 997 | 997 | if (isset($airport_info[0]['icao'])) { |
| 998 | 998 | $decode['Airport/Waypoint name'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>'; |
@@ -1000,7 +1000,7 @@ discard block |
||
| 1000 | 1000 | } |
| 1001 | 1001 | } |
| 1002 | 1002 | if ($found) $row['decode'] = json_encode($decode); |
| 1003 | - $data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode'])); |
|
| 1003 | + $data = array_merge($data, array('registration' => $row['registration'], 'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode'])); |
|
| 1004 | 1004 | $result[] = $data; |
| 1005 | 1005 | $i++; |
| 1006 | 1006 | } |
@@ -1016,7 +1016,7 @@ discard block |
||
| 1016 | 1016 | * |
| 1017 | 1017 | * @return Array Return ACARS data in array |
| 1018 | 1018 | */ |
| 1019 | - public function getArchiveAcarsData($limit = '',$label = '') { |
|
| 1019 | + public function getArchiveAcarsData($limit = '', $label = '') { |
|
| 1020 | 1020 | global $globalURL, $globalDBdriver; |
| 1021 | 1021 | $Image = new Image($this->db); |
| 1022 | 1022 | $Spotter = new Spotter($this->db); |
@@ -1026,8 +1026,8 @@ discard block |
||
| 1026 | 1026 | if ($limit != "") |
| 1027 | 1027 | { |
| 1028 | 1028 | $limit_array = explode(",", $limit); |
| 1029 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1030 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1029 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1030 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1031 | 1031 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1032 | 1032 | { |
| 1033 | 1033 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
@@ -1048,43 +1048,43 @@ discard block |
||
| 1048 | 1048 | try { |
| 1049 | 1049 | $sth = $this->db->prepare($query); |
| 1050 | 1050 | $sth->execute($query_values); |
| 1051 | - } catch(PDOException $e) { |
|
| 1051 | + } catch (PDOException $e) { |
|
| 1052 | 1052 | return "error : ".$e->getMessage(); |
| 1053 | 1053 | } |
| 1054 | - $i=0; |
|
| 1054 | + $i = 0; |
|
| 1055 | 1055 | while ($row = $sth->fetch(PDO::FETCH_ASSOC)) { |
| 1056 | 1056 | $data = array(); |
| 1057 | 1057 | if ($row['registration'] != '') { |
| 1058 | - $row['registration'] = str_replace('.','',$row['registration']); |
|
| 1058 | + $row['registration'] = str_replace('.', '', $row['registration']); |
|
| 1059 | 1059 | $image_array = $Image->getSpotterImage($row['registration']); |
| 1060 | - if (count($image_array) > 0) $data = array_merge($data,array('image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website'])); |
|
| 1061 | - else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => '')); |
|
| 1062 | - } else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => '')); |
|
| 1060 | + if (count($image_array) > 0) $data = array_merge($data, array('image_thumbnail' => $image_array[0]['image_thumbnail'], 'image_copyright' => $image_array[0]['image_copyright'], 'image_source' => $image_array[0]['image_source'], 'image_source_website' => $image_array[0]['image_source_website'])); |
|
| 1061 | + else $data = array_merge($data, array('image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => '')); |
|
| 1062 | + } else $data = array_merge($data, array('image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => '')); |
|
| 1063 | 1063 | $icao = ''; |
| 1064 | 1064 | if ($row['registration'] == '') $row['registration'] = 'NA'; |
| 1065 | 1065 | if ($row['ident'] == '') $row['ident'] = 'NA'; |
| 1066 | - $identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2)); |
|
| 1066 | + $identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 2)); |
|
| 1067 | 1067 | if (isset($identicao[0])) { |
| 1068 | - if (substr($row['ident'],0,2) == 'AF') { |
|
| 1069 | - if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident']; |
|
| 1070 | - else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0'); |
|
| 1071 | - } else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0'); |
|
| 1072 | - $data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name'])); |
|
| 1068 | + if (substr($row['ident'], 0, 2) == 'AF') { |
|
| 1069 | + if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident']; |
|
| 1070 | + else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0'); |
|
| 1071 | + } else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0'); |
|
| 1072 | + $data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name'])); |
|
| 1073 | 1073 | } else $icao = $row['ident']; |
| 1074 | 1074 | $icao = $Translation->checkTranslation($icao); |
| 1075 | - $decode = json_decode($row['decode'],true); |
|
| 1075 | + $decode = json_decode($row['decode'], true); |
|
| 1076 | 1076 | $found = false; |
| 1077 | - if ($decode != '' && array_key_exists('Departure airport',$decode)) { |
|
| 1077 | + if ($decode != '' && array_key_exists('Departure airport', $decode)) { |
|
| 1078 | 1078 | $airport_info = $Spotter->getAllAirportInfo($decode['Departure airport']); |
| 1079 | 1079 | if (isset($airport_info[0]['icao'])) $decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>'; |
| 1080 | 1080 | $found = true; |
| 1081 | 1081 | } |
| 1082 | - if ($decode != '' && array_key_exists('Arrival airport',$decode)) { |
|
| 1082 | + if ($decode != '' && array_key_exists('Arrival airport', $decode)) { |
|
| 1083 | 1083 | $airport_info = $Spotter->getAllAirportInfo($decode['Arrival airport']); |
| 1084 | 1084 | if (isset($airport_info[0]['icao'])) $decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>'; |
| 1085 | 1085 | $found = true; |
| 1086 | 1086 | } |
| 1087 | - if ($decode != '' && array_key_exists('Airport/Waypoint name',$decode)) { |
|
| 1087 | + if ($decode != '' && array_key_exists('Airport/Waypoint name', $decode)) { |
|
| 1088 | 1088 | $airport_info = $Spotter->getAllAirportInfo($decode['Airport/Waypoint name']); |
| 1089 | 1089 | if (isset($airport_info[0]['icao'])) { |
| 1090 | 1090 | $decode['Airport/Waypoint name'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>'; |
@@ -1092,7 +1092,7 @@ discard block |
||
| 1092 | 1092 | } |
| 1093 | 1093 | } |
| 1094 | 1094 | if ($found) $row['decode'] = json_encode($decode); |
| 1095 | - $data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode'])); |
|
| 1095 | + $data = array_merge($data, array('registration' => $row['registration'], 'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode'])); |
|
| 1096 | 1096 | $result[] = $data; |
| 1097 | 1097 | $i++; |
| 1098 | 1098 | } |
@@ -1110,7 +1110,7 @@ discard block |
||
| 1110 | 1110 | * @param String $icao |
| 1111 | 1111 | * @param String $ICAOTypeCode |
| 1112 | 1112 | */ |
| 1113 | - public function addModeSData($ident,$registration,$icao = '',$ICAOTypeCode = '',$latitude = '', $longitude = '') { |
|
| 1113 | + public function addModeSData($ident, $registration, $icao = '', $ICAOTypeCode = '', $latitude = '', $longitude = '') { |
|
| 1114 | 1114 | global $globalDebug, $globalDBdriver; |
| 1115 | 1115 | $ident = trim($ident); |
| 1116 | 1116 | $Translation = new Translation($this->db); |
@@ -1123,7 +1123,7 @@ discard block |
||
| 1123 | 1123 | if ($globalDebug) echo "Ident or registration null, exit\n"; |
| 1124 | 1124 | return ''; |
| 1125 | 1125 | } |
| 1126 | - $registration = str_replace('.','',$registration); |
|
| 1126 | + $registration = str_replace('.', '', $registration); |
|
| 1127 | 1127 | $ident = $Translation->ident2icao($ident); |
| 1128 | 1128 | // Check if a flight with same registration is flying now, if ok check if callsign = name in ACARS, else add it to translation |
| 1129 | 1129 | if ($globalDebug) echo "Check if needed to add translation ".$ident.'... '; |
@@ -1132,7 +1132,7 @@ discard block |
||
| 1132 | 1132 | try { |
| 1133 | 1133 | $sthsi = $this->db->prepare($querysi); |
| 1134 | 1134 | $sthsi->execute($querysi_values); |
| 1135 | - } catch(PDOException $e) { |
|
| 1135 | + } catch (PDOException $e) { |
|
| 1136 | 1136 | if ($globalDebug) echo $e->getMessage(); |
| 1137 | 1137 | return "error : ".$e->getMessage(); |
| 1138 | 1138 | } |
@@ -1142,8 +1142,8 @@ discard block |
||
| 1142 | 1142 | $Translation = new Translation($this->db); |
| 1143 | 1143 | $trans_ident = $Translation->getOperator($resultsi['ident']); |
| 1144 | 1144 | if ($globalDebug) echo 'Add translation to table : '.$ident.' -> '.$resultsi['ident'].' '; |
| 1145 | - if ($ident != $trans_ident) $Translation->addOperator($resultsi['ident'],$ident,'ACARS'); |
|
| 1146 | - elseif ($trans_ident == $ident) $Translation->updateOperator($resultsi['ident'],$ident,'ACARS'); |
|
| 1145 | + if ($ident != $trans_ident) $Translation->addOperator($resultsi['ident'], $ident, 'ACARS'); |
|
| 1146 | + elseif ($trans_ident == $ident) $Translation->updateOperator($resultsi['ident'], $ident, 'ACARS'); |
|
| 1147 | 1147 | } else { |
| 1148 | 1148 | if ($registration != '' && $latitude != '' && $longitude != '') { |
| 1149 | 1149 | $query = "SELECT ModeS FROM aircraft_modes WHERE Registration = :registration LIMIT 1"; |
@@ -1151,7 +1151,7 @@ discard block |
||
| 1151 | 1151 | try { |
| 1152 | 1152 | $sth = $this->db->prepare($query); |
| 1153 | 1153 | $sth->execute($query_values); |
| 1154 | - } catch(PDOException $e) { |
|
| 1154 | + } catch (PDOException $e) { |
|
| 1155 | 1155 | if ($globalDebug) echo $e->getMessage(); |
| 1156 | 1156 | return "error : ".$e->getMessage(); |
| 1157 | 1157 | } |
@@ -1159,7 +1159,7 @@ discard block |
||
| 1159 | 1159 | $sth->closeCursor(); |
| 1160 | 1160 | if (isset($result['modes'])) $hex = $result['modes']; |
| 1161 | 1161 | else $hex = ''; |
| 1162 | - $SI_data = array('hex' => $hex,'ident' => $ident,'aircraft_icao' => $ICAOTypeCode,'registration' => $registration,'latitude' => $latitude,'$longitude' => $longitude,'format_source' => 'ACARS'); |
|
| 1162 | + $SI_data = array('hex' => $hex, 'ident' => $ident, 'aircraft_icao' => $ICAOTypeCode, 'registration' => $registration, 'latitude' => $latitude, '$longitude' => $longitude, 'format_source' => 'ACARS'); |
|
| 1163 | 1163 | if ($this->fromACARSscript) $this->SI->add($SI_data); |
| 1164 | 1164 | } |
| 1165 | 1165 | } |
@@ -1169,7 +1169,7 @@ discard block |
||
| 1169 | 1169 | try { |
| 1170 | 1170 | $sth = $this->db->prepare($query); |
| 1171 | 1171 | $sth->execute($query_values); |
| 1172 | - } catch(PDOException $e) { |
|
| 1172 | + } catch (PDOException $e) { |
|
| 1173 | 1173 | if ($globalDebug) echo $e->getMessage(); |
| 1174 | 1174 | return "error : ".$e->getMessage(); |
| 1175 | 1175 | } |
@@ -1179,7 +1179,7 @@ discard block |
||
| 1179 | 1179 | if (isset($result['ModeS'])) $ModeS = $result['ModeS']; |
| 1180 | 1180 | else $ModeS = ''; |
| 1181 | 1181 | if ($ModeS == '') { |
| 1182 | - $id = explode('-',$result['flightaware_id']); |
|
| 1182 | + $id = explode('-', $result['flightaware_id']); |
|
| 1183 | 1183 | $ModeS = $id[0]; |
| 1184 | 1184 | } |
| 1185 | 1185 | if ($ModeS != '') { |
@@ -1189,20 +1189,20 @@ discard block |
||
| 1189 | 1189 | try { |
| 1190 | 1190 | $sthc = $this->db->prepare($queryc); |
| 1191 | 1191 | $sthc->execute($queryc_values); |
| 1192 | - } catch(PDOException $e) { |
|
| 1192 | + } catch (PDOException $e) { |
|
| 1193 | 1193 | if ($globalDebug) echo $e->getMessage(); |
| 1194 | 1194 | return "error : ".$e->getMessage(); |
| 1195 | 1195 | } |
| 1196 | 1196 | $row = $sthc->fetch(PDO::FETCH_ASSOC); |
| 1197 | 1197 | $sthc->closeCursor(); |
| 1198 | - if (count($row) == 0) { |
|
| 1198 | + if (count($row) == 0) { |
|
| 1199 | 1199 | if ($globalDebug) echo " Add to ModeS table - "; |
| 1200 | 1200 | $queryi = "INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:ModeS,:ModeSCountry,:Registration, :ICAOTypeCode,'ACARS')"; |
| 1201 | - $queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode); |
|
| 1201 | + $queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode); |
|
| 1202 | 1202 | try { |
| 1203 | 1203 | $sthi = $this->db->prepare($queryi); |
| 1204 | 1204 | $sthi->execute($queryi_values); |
| 1205 | - } catch(PDOException $e) { |
|
| 1205 | + } catch (PDOException $e) { |
|
| 1206 | 1206 | if ($globalDebug) echo $e->getMessage(); |
| 1207 | 1207 | return "error : ".$e->getMessage(); |
| 1208 | 1208 | } |
@@ -1210,15 +1210,15 @@ discard block |
||
| 1210 | 1210 | if ($globalDebug) echo " Update ModeS table - "; |
| 1211 | 1211 | if ($ICAOTypeCode != '') { |
| 1212 | 1212 | $queryi = "UPDATE aircraft_modes SET ModeSCountry = :ModeSCountry,Registration = :Registration,ICAOTypeCode = :ICAOTypeCode,Source = 'ACARS',LastModified = NOW() WHERE ModeS = :ModeS"; |
| 1213 | - $queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode); |
|
| 1213 | + $queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode); |
|
| 1214 | 1214 | } else { |
| 1215 | 1215 | $queryi = "UPDATE aircraft_modes SET ModeSCountry = :ModeSCountry,Registration = :Registration,Source = 'ACARS',LastModified = NOW() WHERE ModeS = :ModeS"; |
| 1216 | - $queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration); |
|
| 1216 | + $queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration); |
|
| 1217 | 1217 | } |
| 1218 | 1218 | try { |
| 1219 | 1219 | $sthi = $this->db->prepare($queryi); |
| 1220 | 1220 | $sthi->execute($queryi_values); |
| 1221 | - } catch(PDOException $e) { |
|
| 1221 | + } catch (PDOException $e) { |
|
| 1222 | 1222 | if ($globalDebug) echo $e->getMessage(); |
| 1223 | 1223 | return "error : ".$e->getMessage(); |
| 1224 | 1224 | } |
@@ -1255,12 +1255,12 @@ discard block |
||
| 1255 | 1255 | elseif ($globalDBdriver == 'pgsql') { |
| 1256 | 1256 | $queryi = "UPDATE spotter_output SET registration = :Registration WHERE ident = :ident AND date >= NOW() AT TIME ZONE 'UTC' - INTERVAL '1 HOUR'"; |
| 1257 | 1257 | } |
| 1258 | - $queryi_values = array(':Registration' => $registration,':ident' => $icao); |
|
| 1258 | + $queryi_values = array(':Registration' => $registration, ':ident' => $icao); |
|
| 1259 | 1259 | } |
| 1260 | 1260 | try { |
| 1261 | 1261 | $sthi = $this->db->prepare($queryi); |
| 1262 | 1262 | $sthi->execute($queryi_values); |
| 1263 | - } catch(PDOException $e) { |
|
| 1263 | + } catch (PDOException $e) { |
|
| 1264 | 1264 | if ($globalDebug) echo $e->getMessage(); |
| 1265 | 1265 | return "error : ".$e->getMessage(); |
| 1266 | 1266 | } |
@@ -13,7 +13,9 @@ discard block |
||
| 13 | 13 | public function __construct($dbc = null,$fromACARSscript = false) { |
| 14 | 14 | $Connection = new Connection($dbc); |
| 15 | 15 | $this->db = $Connection->db(); |
| 16 | - if ($this->db === null) die('Error: No DB connection.'); |
|
| 16 | + if ($this->db === null) { |
|
| 17 | + die('Error: No DB connection.'); |
|
| 18 | + } |
|
| 17 | 19 | if ($fromACARSscript) { |
| 18 | 20 | $this->fromACARSscript = true; |
| 19 | 21 | $this->SI = new SpotterImport($this->db); |
@@ -27,14 +29,19 @@ discard block |
||
| 27 | 29 | */ |
| 28 | 30 | public function ident2icao($ident) { |
| 29 | 31 | if (substr($ident,0,2) == 'AF') { |
| 30 | - if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident; |
|
| 31 | - else $icao = 'AFR'.ltrim(substr($ident,2),'0'); |
|
| 32 | + if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) { |
|
| 33 | + $icao = $ident; |
|
| 34 | + } else { |
|
| 35 | + $icao = 'AFR'.ltrim(substr($ident,2),'0'); |
|
| 36 | + } |
|
| 32 | 37 | } else { |
| 33 | 38 | $Spotter = new Spotter($this->db); |
| 34 | 39 | $identicao = $Spotter->getAllAirlineInfo(substr($ident,0,2)); |
| 35 | 40 | if (isset($identicao[0])) { |
| 36 | 41 | $icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0'); |
| 37 | - } else $icao = $ident; |
|
| 42 | + } else { |
|
| 43 | + $icao = $ident; |
|
| 44 | + } |
|
| 38 | 45 | } |
| 39 | 46 | return $icao; |
| 40 | 47 | } |
@@ -107,14 +114,24 @@ discard block |
||
| 107 | 114 | $message = ''; |
| 108 | 115 | $result = array(); |
| 109 | 116 | $n = sscanf($data,'(null) %*d %*02d/%*02d/%*04d %*02d:%*02d:%*02d %*d %*[0-9-] %*[A-Z0-9] %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message); |
| 110 | - if ($n == 0) $n = sscanf($data,'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message); |
|
| 111 | - if ($n == 0) $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message); |
|
| 112 | - if ($n == 0) $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message); |
|
| 117 | + if ($n == 0) { |
|
| 118 | + $n = sscanf($data,'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message); |
|
| 119 | + } |
|
| 120 | + if ($n == 0) { |
|
| 121 | + $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message); |
|
| 122 | + } |
|
| 123 | + if ($n == 0) { |
|
| 124 | + $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message); |
|
| 125 | + } |
|
| 113 | 126 | if ($n != 0) { |
| 114 | 127 | $registration = str_replace('.','',$registration); |
| 115 | 128 | $result = array('registration' => $registration, 'ident' => $ident,'label' => $label, 'block_id' => $block_id,'msg_no' => $msg_no,'message' => $message); |
| 116 | - if ($globalDebug) echo "Reg. : ".$registration." - Ident : ".$ident." - Label : ".$label." - Message : ".$message."\n"; |
|
| 117 | - } else $message = $data; |
|
| 129 | + if ($globalDebug) { |
|
| 130 | + echo "Reg. : ".$registration." - Ident : ".$ident." - Label : ".$label." - Message : ".$message."\n"; |
|
| 131 | + } |
|
| 132 | + } else { |
|
| 133 | + $message = $data; |
|
| 134 | + } |
|
| 118 | 135 | $decode = array(); |
| 119 | 136 | $found = false; |
| 120 | 137 | // if ($registration != '' && $ident != '' && $registration != '!') { |
@@ -134,12 +151,21 @@ discard block |
||
| 134 | 151 | if ($n > 5 && ($lac == 'N' || $lac == 'S') && ($lnc == 'E' || $lnc == 'W')) { |
| 135 | 152 | $latitude = $la / 10000.0; |
| 136 | 153 | $longitude = $ln / 10000.0; |
| 137 | - if ($lac == 'S') $latitude = '-'.$latitude; |
|
| 138 | - if ($lnc == 'W') $longitude = '-'.$longitude; |
|
| 154 | + if ($lac == 'S') { |
|
| 155 | + $latitude = '-'.$latitude; |
|
| 156 | + } |
|
| 157 | + if ($lnc == 'W') { |
|
| 158 | + $longitude = '-'.$longitude; |
|
| 159 | + } |
|
| 139 | 160 | // Temp not always available |
| 140 | - if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude.' - airport depart : '.$dair.' - airport arrival : '.$darr.' - température : '.$temp."°C\n"; |
|
| 141 | - if ($temp == '') $decode = array('Latitude' => $latitude, 'Longitude' => $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr,'Altitude' => $alt); |
|
| 142 | - else $decode = array('Latitude' => $latitude, 'Longitude' => $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt,'Temperature' => $temp.'°C'); |
|
| 161 | + if ($globalDebug) { |
|
| 162 | + echo 'latitude : '.$latitude.' - longitude : '.$longitude.' - airport depart : '.$dair.' - airport arrival : '.$darr.' - température : '.$temp."°C\n"; |
|
| 163 | + } |
|
| 164 | + if ($temp == '') { |
|
| 165 | + $decode = array('Latitude' => $latitude, 'Longitude' => $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr,'Altitude' => $alt); |
|
| 166 | + } else { |
|
| 167 | + $decode = array('Latitude' => $latitude, 'Longitude' => $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt,'Temperature' => $temp.'°C'); |
|
| 168 | + } |
|
| 143 | 169 | |
| 144 | 170 | //$icao = $Translation->checkTranslation($ident); |
| 145 | 171 | //$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS'); |
@@ -153,25 +179,35 @@ discard block |
||
| 153 | 179 | $ahour = ''; |
| 154 | 180 | $n = sscanf($message, "ARR01 %4[A-Z]%4d %4[A-Z]%4d", $dair, $dhour, $darr,$ahour); |
| 155 | 181 | if ($n == 4 && strlen($darr) == 4) { |
| 156 | - if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2); |
|
| 157 | - if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2); |
|
| 158 | - if ($globalDebug) echo 'departure airport : '.$dair.' - arrival airport : '. $darr.' - departure hour : '. $dhour.' - arrival hour : '.$ahour."\n"; |
|
| 182 | + if ($dhour != '') { |
|
| 183 | + $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2); |
|
| 184 | + } |
|
| 185 | + if ($ahour != '') { |
|
| 186 | + $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2); |
|
| 187 | + } |
|
| 188 | + if ($globalDebug) { |
|
| 189 | + echo 'departure airport : '.$dair.' - arrival airport : '. $darr.' - departure hour : '. $dhour.' - arrival hour : '.$ahour."\n"; |
|
| 190 | + } |
|
| 159 | 191 | //$icao = ACARS->ident2icao($ident); |
| 160 | 192 | //$icao = $Translation->checkTranslation($ident); |
| 161 | 193 | //$Schedule->addSchedule($icao,$dair,$dhour,$darr,$ahour,'ACARS'); |
| 162 | 194 | $decode = array('Departure airport' => $dair, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour); |
| 163 | 195 | $found = true; |
| 164 | - } |
|
| 165 | - elseif ($n == 2 || $n == 4) { |
|
| 166 | - if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2); |
|
| 167 | - if ($globalDebug) echo 'airport arrival : '.$dair.' - arrival hour : '.$dhour."\n"; |
|
| 196 | + } elseif ($n == 2 || $n == 4) { |
|
| 197 | + if ($dhour != '') { |
|
| 198 | + $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2); |
|
| 199 | + } |
|
| 200 | + if ($globalDebug) { |
|
| 201 | + echo 'airport arrival : '.$dair.' - arrival hour : '.$dhour."\n"; |
|
| 202 | + } |
|
| 168 | 203 | //$icao = ACARS->ident2icao($ident); |
| 169 | 204 | //$icao = $Translation->checkTranslation($ident); |
| 170 | 205 | $decode = array('Arrival airport' => $dair, 'Arrival hour' => $dhour); |
| 171 | 206 | $found = true; |
| 172 | - } |
|
| 173 | - elseif ($n == 1) { |
|
| 174 | - if ($globalDebug) echo 'airport arrival : '.$darr."\n"; |
|
| 207 | + } elseif ($n == 1) { |
|
| 208 | + if ($globalDebug) { |
|
| 209 | + echo 'airport arrival : '.$darr."\n"; |
|
| 210 | + } |
|
| 175 | 211 | //$icao = ACARS->ident2icao($ident); |
| 176 | 212 | //$icao = $Translation->checkTranslation($ident); |
| 177 | 213 | $decode = array('Arrival airport' => $darr); |
@@ -189,7 +225,9 @@ discard block |
||
| 189 | 225 | $darr = ''; |
| 190 | 226 | $n = sscanf($message, "%4c,%4c,%*7s,%*d", $dair, $darr); |
| 191 | 227 | if ($n == 4) { |
| 192 | - if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n"; |
|
| 228 | + if ($globalDebug) { |
|
| 229 | + echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n"; |
|
| 230 | + } |
|
| 193 | 231 | //$icao = ACARS->ident2icao($ident); |
| 194 | 232 | //$icao = $Translation->checkTranslation($ident); |
| 195 | 233 | //$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS'); |
@@ -223,14 +261,23 @@ discard block |
||
| 223 | 261 | $apiste = ''; |
| 224 | 262 | $n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z]/%*3d/%4s/%*cSCH/%6[0-9A-Z ]/%4c/%4c/%5s/%4d%*3c/%4d/%4c/%[0-9A-Z ]/", $airicao,$aident,$dair, $darr, $ddate, $dhour,$ahour, $aair, $apiste); |
| 225 | 263 | if ($n > 8) { |
| 226 | - if ($globalDebug) echo 'airicao : '. $airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '. $darr.' - date depart : '.$ddate.' - departure hour : '. $dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n"; |
|
| 227 | - if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2); |
|
| 228 | - if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2); |
|
| 264 | + if ($globalDebug) { |
|
| 265 | + echo 'airicao : '. $airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '. $darr.' - date depart : '.$ddate.' - departure hour : '. $dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n"; |
|
| 266 | + } |
|
| 267 | + if ($dhour != '') { |
|
| 268 | + $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2); |
|
| 269 | + } |
|
| 270 | + if ($ahour != '') { |
|
| 271 | + $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2); |
|
| 272 | + } |
|
| 229 | 273 | $icao = trim($aident); |
| 230 | 274 | |
| 231 | 275 | //$decode = 'Departure airport : '.$dair.' ('.$ddate.' at '.$dhour.') - Arrival Airport : '.$aair.' (at '.$ahour.') way '.$apiste; |
| 232 | - if ($ahour == '') $decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr); |
|
| 233 | - else $decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour, 'Arrival way' => $apiste); |
|
| 276 | + if ($ahour == '') { |
|
| 277 | + $decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr); |
|
| 278 | + } else { |
|
| 279 | + $decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour, 'Arrival way' => $apiste); |
|
| 280 | + } |
|
| 234 | 281 | //$Schedule->addSchedule($icao,$dair,$dhour,$darr,$ahour,'ACARS'); |
| 235 | 282 | $decode['icao'] = $icao; |
| 236 | 283 | $found = true; |
@@ -252,9 +299,15 @@ discard block |
||
| 252 | 299 | $lns = $lns.'.'.$lns; |
| 253 | 300 | $latitude = $las / 1000.0; |
| 254 | 301 | $longitude = $lns / 1000.0; |
| 255 | - if ($lac == 'S') $latitude = '-'.$latitude; |
|
| 256 | - if ($lnc == 'W') $longitude = '-'.$longitude; |
|
| 257 | - if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude."\n"; |
|
| 302 | + if ($lac == 'S') { |
|
| 303 | + $latitude = '-'.$latitude; |
|
| 304 | + } |
|
| 305 | + if ($lnc == 'W') { |
|
| 306 | + $longitude = '-'.$longitude; |
|
| 307 | + } |
|
| 308 | + if ($globalDebug) { |
|
| 309 | + echo 'latitude : '.$latitude.' - longitude : '.$longitude."\n"; |
|
| 310 | + } |
|
| 258 | 311 | $decode = array('Latitude' => $latitude, 'Longitude' => $longitude); |
| 259 | 312 | $found = true; |
| 260 | 313 | } |
@@ -272,7 +325,9 @@ discard block |
||
| 272 | 325 | $darr = ''; |
| 273 | 326 | $n = sscanf($message, "%*[0-9A-Z ]/%*s %4c/%4c .", $dair, $darr); |
| 274 | 327 | if ($n == 4) { |
| 275 | - if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n"; |
|
| 328 | + if ($globalDebug) { |
|
| 329 | + echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n"; |
|
| 330 | + } |
|
| 276 | 331 | //$icao = $Translation->checkTranslation($ident); |
| 277 | 332 | //$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS'); |
| 278 | 333 | $decode = array('Departure airport' => $dair, 'Arrival airport' => $darr); |
@@ -285,7 +340,9 @@ discard block |
||
| 285 | 340 | $darr = ''; |
| 286 | 341 | $n = sscanf($message, "%*[0-9],%4c,%4c,", $dair, $darr); |
| 287 | 342 | if ($n == 4) { |
| 288 | - if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n"; |
|
| 343 | + if ($globalDebug) { |
|
| 344 | + echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n"; |
|
| 345 | + } |
|
| 289 | 346 | //$icao = $Translation->checkTranslation($ident); |
| 290 | 347 | //$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS'); |
| 291 | 348 | $decode = array('Departure airport' => $dair, 'Arrival airport' => $darr); |
@@ -298,7 +355,9 @@ discard block |
||
| 298 | 355 | $darr = ''; |
| 299 | 356 | $n = sscanf($message, "002AF %4c %4c ", $dair, $darr); |
| 300 | 357 | if ($n == 2) { |
| 301 | - if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n"; |
|
| 358 | + if ($globalDebug) { |
|
| 359 | + echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n"; |
|
| 360 | + } |
|
| 302 | 361 | //$icao = $Translation->checkTranslation($ident); |
| 303 | 362 | $decode = array('Departure airport' => $dair, 'Arrival airport' => $darr); |
| 304 | 363 | //$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS'); |
@@ -312,7 +371,9 @@ discard block |
||
| 312 | 371 | $darr = ''; |
| 313 | 372 | $n = sscanf($message, "#DFBA%*02d/%*[A-Z-],%*[0-9A-Z],%*d,%4c,%4c", $dair, $darr); |
| 314 | 373 | if ($n == 6) { |
| 315 | - if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n"; |
|
| 374 | + if ($globalDebug) { |
|
| 375 | + echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n"; |
|
| 376 | + } |
|
| 316 | 377 | //$icao = $Translation->checkTranslation($ident); |
| 317 | 378 | //$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS'); |
| 318 | 379 | $decode = array('Departure airport' => $dair, 'Arrival airport' => $darr); |
@@ -325,7 +386,9 @@ discard block |
||
| 325 | 386 | $darr = ''; |
| 326 | 387 | $n = sscanf($message, "#DFBA%*02d/%*[0-9A-Z,]/%*[A-Z-],%*[0-9A-Z],%*d,%4c,%4c", $dair, $darr); |
| 327 | 388 | if ($n == 7) { |
| 328 | - if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n"; |
|
| 389 | + if ($globalDebug) { |
|
| 390 | + echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n"; |
|
| 391 | + } |
|
| 329 | 392 | //$icao = $Translation->checkTranslation($ident); |
| 330 | 393 | //$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS'); |
| 331 | 394 | $decode = array('Departure airport' => $dair, 'Arrival airport' => $darr); |
@@ -353,8 +416,12 @@ discard block |
||
| 353 | 416 | $decode['icao'] = $icao; |
| 354 | 417 | $latitude = $las / 100.0; |
| 355 | 418 | $longitude = $lns / 100.0; |
| 356 | - if ($lac == 'S') $latitude = '-'.$latitude; |
|
| 357 | - if ($lnc == 'W') $longitude = '-'.$longitude; |
|
| 419 | + if ($lac == 'S') { |
|
| 420 | + $latitude = '-'.$latitude; |
|
| 421 | + } |
|
| 422 | + if ($lnc == 'W') { |
|
| 423 | + $longitude = '-'.$longitude; |
|
| 424 | + } |
|
| 358 | 425 | |
| 359 | 426 | $decode = array('Latitude' => $latitude,'Longitude' => $longitude,'Altitude' => 'FL'.$alt,'Fuel' => $fuel,'speed' => $speed); |
| 360 | 427 | $found = true; |
@@ -372,8 +439,12 @@ discard block |
||
| 372 | 439 | if ($n == 4) { |
| 373 | 440 | $latitude = $las; |
| 374 | 441 | $longitude = $lns; |
| 375 | - if ($lac == 'S') $latitude = '-'.$latitude; |
|
| 376 | - if ($lnc == 'W') $longitude = '-'.$longitude; |
|
| 442 | + if ($lac == 'S') { |
|
| 443 | + $latitude = '-'.$latitude; |
|
| 444 | + } |
|
| 445 | + if ($lnc == 'W') { |
|
| 446 | + $longitude = '-'.$longitude; |
|
| 447 | + } |
|
| 377 | 448 | |
| 378 | 449 | $decode = array('Latitude' => $latitude,'Longitude' => $longitude); |
| 379 | 450 | $found = true; |
@@ -389,7 +460,9 @@ discard block |
||
| 389 | 460 | $darr = ''; |
| 390 | 461 | $n = sscanf($message, "%*[0-9A-Z] NLINFO %*d/%*d %4c/%4c .", $dair, $darr); |
| 391 | 462 | if ($n == 5) { |
| 392 | - if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n"; |
|
| 463 | + if ($globalDebug) { |
|
| 464 | + echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n"; |
|
| 465 | + } |
|
| 393 | 466 | //$icao = $Translation->checkTranslation($ident); |
| 394 | 467 | //$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS'); |
| 395 | 468 | $decode = array('Departure airport' => $dair, 'Arrival airport' => $darr); |
@@ -410,7 +483,9 @@ discard block |
||
| 410 | 483 | $aident = ''; |
| 411 | 484 | $n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z],,%*[0-9A-Z],%*[0-9A-Z],%4s,%4s,.%*6s,%*4[A-Z],%[0-9A-Z],", $dair, $darr, $aident); |
| 412 | 485 | if ($n == 8) { |
| 413 | - if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n"; |
|
| 486 | + if ($globalDebug) { |
|
| 487 | + echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n"; |
|
| 488 | + } |
|
| 414 | 489 | $icao = trim($aident); |
| 415 | 490 | //$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS'); |
| 416 | 491 | $decode['icao'] = $icao; |
@@ -427,7 +502,9 @@ discard block |
||
| 427 | 502 | $darr = ''; |
| 428 | 503 | $n = sscanf($message, "%*d/%*d %4s/%4s .%*6s", $dair, $darr); |
| 429 | 504 | if ($n == 5) { |
| 430 | - if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n"; |
|
| 505 | + if ($globalDebug) { |
|
| 506 | + echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n"; |
|
| 507 | + } |
|
| 431 | 508 | //$icao = $Translation->checkTranslation($ident); |
| 432 | 509 | //$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS'); |
| 433 | 510 | $decode = array('Departure airport' => $dair, 'Arrival airport' => $darr); |
@@ -442,7 +519,9 @@ discard block |
||
| 442 | 519 | $darr = ''; |
| 443 | 520 | $n = sscanf($message,'%4[A-Z]%4[A-Z]%*4d',$dair,$darr); |
| 444 | 521 | if ($n == 3) { |
| 445 | - if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n"; |
|
| 522 | + if ($globalDebug) { |
|
| 523 | + echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n"; |
|
| 524 | + } |
|
| 446 | 525 | //$icao = $Translation->checkTranslation($ident); |
| 447 | 526 | //$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS'); |
| 448 | 527 | $decode = array('Departure airport' => $dair, 'Arrival airport' => $darr); |
@@ -457,7 +536,9 @@ discard block |
||
| 457 | 536 | $darr = ''; |
| 458 | 537 | $n = sscanf($message,'3J01 DSPTCH %*d/%*d %4s/%4s .%*6s',$dair,$darr); |
| 459 | 538 | if ($n == 3) { |
| 460 | - if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n"; |
|
| 539 | + if ($globalDebug) { |
|
| 540 | + echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n"; |
|
| 541 | + } |
|
| 461 | 542 | //$icao = $Translation->checkTranslation($ident); |
| 462 | 543 | //$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS'); |
| 463 | 544 | $decode = array('Departure airport' => $dair, 'Arrival airport' => $darr); |
@@ -467,7 +548,9 @@ discard block |
||
| 467 | 548 | if (!$found) { |
| 468 | 549 | $n = sscanf($message,'MET01%4c',$airport); |
| 469 | 550 | if ($n == 1) { |
| 470 | - if ($globalDebug) echo 'airport name : '.$airport; |
|
| 551 | + if ($globalDebug) { |
|
| 552 | + echo 'airport name : '.$airport; |
|
| 553 | + } |
|
| 471 | 554 | $decode = array('Airport/Waypoint name' => $airport); |
| 472 | 555 | $found = true; |
| 473 | 556 | } |
@@ -475,184 +558,126 @@ discard block |
||
| 475 | 558 | if ($label == 'H1') { |
| 476 | 559 | if (preg_match('/^#CFBFLR/',$message) || preg_match('/^#CFBWRN/',$message)) { |
| 477 | 560 | $decode = array_merge(array('Message nature' => 'Equipment failure'),$decode); |
| 478 | - } |
|
| 479 | - elseif (preg_match('/^#DFB\*TKO/',$message) || preg_match('/^#DFBTKO/',$message)) { |
|
| 561 | + } elseif (preg_match('/^#DFB\*TKO/',$message) || preg_match('/^#DFBTKO/',$message)) { |
|
| 480 | 562 | $decode = array_merge(array('Message nature' => 'Take off performance data'),$decode); |
| 481 | - } |
|
| 482 | - elseif (preg_match('/^#DFB\*CRZ/',$message) || preg_match('/^#DFBCRZ/',$message)) { |
|
| 563 | + } elseif (preg_match('/^#DFB\*CRZ/',$message) || preg_match('/^#DFBCRZ/',$message)) { |
|
| 483 | 564 | $decode = array_merge(array('Message nature' => 'Cruise performance data'),$decode); |
| 484 | - } |
|
| 485 | - elseif (preg_match('/^#DFB\*WOB/',$message) || preg_match('/^#DFBWOB/',$message)) { |
|
| 565 | + } elseif (preg_match('/^#DFB\*WOB/',$message) || preg_match('/^#DFBWOB/',$message)) { |
|
| 486 | 566 | $decode = array_merge(array('Message nature' => 'Weather observation'),$decode); |
| 487 | - } |
|
| 488 | - elseif (preg_match(':^#DFB/PIREP:',$message)) { |
|
| 567 | + } elseif (preg_match(':^#DFB/PIREP:',$message)) { |
|
| 489 | 568 | $decode = array_merge(array('Message nature' => 'Pilot Report'),$decode); |
| 490 | - } |
|
| 491 | - elseif (preg_match('/^#DFBEDA/',$message) || preg_match('/^#DFBENG/',$message)) { |
|
| 569 | + } elseif (preg_match('/^#DFBEDA/',$message) || preg_match('/^#DFBENG/',$message)) { |
|
| 492 | 570 | $decode = array_merge(array('Message nature' => 'Engine Data'),$decode); |
| 493 | - } |
|
| 494 | - elseif (preg_match(':^#M1AAEP:',$message)) { |
|
| 571 | + } elseif (preg_match(':^#M1AAEP:',$message)) { |
|
| 495 | 572 | $decode = array_merge(array('Message nature' => 'Position/Weather Report'),$decode); |
| 496 | - } |
|
| 497 | - elseif (preg_match(':^#M2APWD:',$message)) { |
|
| 573 | + } elseif (preg_match(':^#M2APWD:',$message)) { |
|
| 498 | 574 | $decode = array_merge(array('Message nature' => 'Flight plan predicted wind data'),$decode); |
| 499 | - } |
|
| 500 | - elseif (preg_match(':^#M1BREQPWI:',$message)) { |
|
| 575 | + } elseif (preg_match(':^#M1BREQPWI:',$message)) { |
|
| 501 | 576 | $decode = array_merge(array('Message nature' => 'Predicted wind info request'),$decode); |
| 502 | - } |
|
| 503 | - elseif (preg_match(':^#CF:',$message)) { |
|
| 577 | + } elseif (preg_match(':^#CF:',$message)) { |
|
| 504 | 578 | $decode = array_merge(array('Message nature' => 'Central Fault Display'),$decode); |
| 505 | - } |
|
| 506 | - elseif (preg_match(':^#DF:',$message)) { |
|
| 579 | + } elseif (preg_match(':^#DF:',$message)) { |
|
| 507 | 580 | $decode = array_merge(array('Message nature' => 'Digital Flight Data Acquisition Unit'),$decode); |
| 508 | - } |
|
| 509 | - elseif (preg_match(':^#EC:',$message)) { |
|
| 581 | + } elseif (preg_match(':^#EC:',$message)) { |
|
| 510 | 582 | $decode = array_merge(array('Message nature' => 'Engine Display System'),$decode); |
| 511 | - } |
|
| 512 | - elseif (preg_match(':^#EI:',$message)) { |
|
| 583 | + } elseif (preg_match(':^#EI:',$message)) { |
|
| 513 | 584 | $decode = array_merge(array('Message nature' => 'Engine Report'),$decode); |
| 514 | - } |
|
| 515 | - elseif (preg_match(':^#H1:',$message)) { |
|
| 585 | + } elseif (preg_match(':^#H1:',$message)) { |
|
| 516 | 586 | $decode = array_merge(array('Message nature' => 'HF Data Radio - Left'),$decode); |
| 517 | - } |
|
| 518 | - elseif (preg_match(':^#H2:',$message)) { |
|
| 587 | + } elseif (preg_match(':^#H2:',$message)) { |
|
| 519 | 588 | $decode = array_merge(array('Message nature' => 'HF Data Radio - Right'),$decode); |
| 520 | - } |
|
| 521 | - elseif (preg_match(':^#HD:',$message)) { |
|
| 589 | + } elseif (preg_match(':^#HD:',$message)) { |
|
| 522 | 590 | $decode = array_merge(array('Message nature' => 'HF Data Radio - Selected'),$decode); |
| 523 | - } |
|
| 524 | - elseif (preg_match(':^#M1:',$message)) { |
|
| 591 | + } elseif (preg_match(':^#M1:',$message)) { |
|
| 525 | 592 | $decode = array_merge(array('Message nature' => 'Flight Management Computer - Left'),$decode); |
| 526 | - } |
|
| 527 | - elseif (preg_match(':^#M2:',$message)) { |
|
| 593 | + } elseif (preg_match(':^#M2:',$message)) { |
|
| 528 | 594 | $decode = array_merge(array('Message nature' => 'Flight Management Computer - Right'),$decode); |
| 529 | - } |
|
| 530 | - elseif (preg_match(':^#M3:',$message)) { |
|
| 595 | + } elseif (preg_match(':^#M3:',$message)) { |
|
| 531 | 596 | $decode = array_merge(array('Message nature' => 'Flight Management Computer - Center'),$decode); |
| 532 | - } |
|
| 533 | - elseif (preg_match(':^#MD:',$message)) { |
|
| 597 | + } elseif (preg_match(':^#MD:',$message)) { |
|
| 534 | 598 | $decode = array_merge(array('Message nature' => 'Flight Management Computer - Selected'),$decode); |
| 535 | - } |
|
| 536 | - elseif (preg_match(':^#PS:',$message)) { |
|
| 599 | + } elseif (preg_match(':^#PS:',$message)) { |
|
| 537 | 600 | $decode = array_merge(array('Message nature' => 'Keyboard/Display Unit'),$decode); |
| 538 | - } |
|
| 539 | - elseif (preg_match(':^#S1:',$message)) { |
|
| 601 | + } elseif (preg_match(':^#S1:',$message)) { |
|
| 540 | 602 | $decode = array_merge(array('Message nature' => 'SDU - Left'),$decode); |
| 541 | - } |
|
| 542 | - elseif (preg_match(':^#S2:',$message)) { |
|
| 603 | + } elseif (preg_match(':^#S2:',$message)) { |
|
| 543 | 604 | $decode = array_merge(array('Message nature' => 'SDU - Right'),$decode); |
| 544 | - } |
|
| 545 | - elseif (preg_match(':^#SD:',$message)) { |
|
| 605 | + } elseif (preg_match(':^#SD:',$message)) { |
|
| 546 | 606 | $decode = array_merge(array('Message nature' => 'SDU - Selected'),$decode); |
| 547 | - } |
|
| 548 | - elseif (preg_match(':^#T[0-8]:',$message)) { |
|
| 607 | + } elseif (preg_match(':^#T[0-8]:',$message)) { |
|
| 549 | 608 | $decode = array_merge(array('Message nature' => 'Cabin Terminal Messages'),$decode); |
| 550 | - } |
|
| 551 | - elseif (preg_match(':^#WO:',$message)) { |
|
| 609 | + } elseif (preg_match(':^#WO:',$message)) { |
|
| 552 | 610 | $decode = array_merge(array('Message nature' => 'Weather Observation Report'),$decode); |
| 553 | - } |
|
| 554 | - elseif (preg_match(':^#A1:',$message)) { |
|
| 611 | + } elseif (preg_match(':^#A1:',$message)) { |
|
| 555 | 612 | $decode = array_merge(array('Message nature' => 'Oceanic Clearance'),$decode); |
| 556 | - } |
|
| 557 | - elseif (preg_match(':^#A3:',$message)) { |
|
| 613 | + } elseif (preg_match(':^#A3:',$message)) { |
|
| 558 | 614 | $decode = array_merge(array('Message nature' => 'Departure Clearance Response'),$decode); |
| 559 | - } |
|
| 560 | - elseif (preg_match(':^#A4:',$message)) { |
|
| 615 | + } elseif (preg_match(':^#A4:',$message)) { |
|
| 561 | 616 | $decode = array_merge(array('Message nature' => 'Flight Systems Message'),$decode); |
| 562 | - } |
|
| 563 | - elseif (preg_match(':^#A6:',$message)) { |
|
| 617 | + } elseif (preg_match(':^#A6:',$message)) { |
|
| 564 | 618 | $decode = array_merge(array('Message nature' => 'Request ADS Reports'),$decode); |
| 565 | - } |
|
| 566 | - elseif (preg_match(':^#A8:',$message)) { |
|
| 619 | + } elseif (preg_match(':^#A8:',$message)) { |
|
| 567 | 620 | $decode = array_merge(array('Message nature' => 'Deliver Departure Slot'),$decode); |
| 568 | - } |
|
| 569 | - elseif (preg_match(':^#A9:',$message)) { |
|
| 621 | + } elseif (preg_match(':^#A9:',$message)) { |
|
| 570 | 622 | $decode = array_merge(array('Message nature' => 'ATIS report'),$decode); |
| 571 | - } |
|
| 572 | - elseif (preg_match(':^#A0:',$message)) { |
|
| 623 | + } elseif (preg_match(':^#A0:',$message)) { |
|
| 573 | 624 | $decode = array_merge(array('Message nature' => 'ATIS Facility Notification (AFN)'),$decode); |
| 574 | - } |
|
| 575 | - elseif (preg_match(':^#AA:',$message)) { |
|
| 625 | + } elseif (preg_match(':^#AA:',$message)) { |
|
| 576 | 626 | $decode = array_merge(array('Message nature' => 'ATCComm'),$decode); |
| 577 | - } |
|
| 578 | - elseif (preg_match(':^#AB:',$message)) { |
|
| 627 | + } elseif (preg_match(':^#AB:',$message)) { |
|
| 579 | 628 | $decode = array_merge(array('Message nature' => 'TWIP Report'),$decode); |
| 580 | - } |
|
| 581 | - elseif (preg_match(':^#AC:',$message)) { |
|
| 629 | + } elseif (preg_match(':^#AC:',$message)) { |
|
| 582 | 630 | $decode = array_merge(array('Message nature' => 'Pushback Clearance'),$decode); |
| 583 | - } |
|
| 584 | - elseif (preg_match(':^#AD:',$message)) { |
|
| 631 | + } elseif (preg_match(':^#AD:',$message)) { |
|
| 585 | 632 | $decode = array_merge(array('Message nature' => 'Expected Taxi Clearance'),$decode); |
| 586 | - } |
|
| 587 | - elseif (preg_match(':^#AF:',$message)) { |
|
| 633 | + } elseif (preg_match(':^#AF:',$message)) { |
|
| 588 | 634 | $decode = array_merge(array('Message nature' => 'CPC Command/Response'),$decode); |
| 589 | - } |
|
| 590 | - elseif (preg_match(':^#B1:',$message)) { |
|
| 635 | + } elseif (preg_match(':^#B1:',$message)) { |
|
| 591 | 636 | $decode = array_merge(array('Message nature' => 'Request Oceanic Clearance'),$decode); |
| 592 | - } |
|
| 593 | - elseif (preg_match(':^#B2:',$message)) { |
|
| 637 | + } elseif (preg_match(':^#B2:',$message)) { |
|
| 594 | 638 | $decode = array_merge(array('Message nature' => 'Oceanic Clearance Readback'),$decode); |
| 595 | - } |
|
| 596 | - elseif (preg_match(':^#B3:',$message)) { |
|
| 639 | + } elseif (preg_match(':^#B3:',$message)) { |
|
| 597 | 640 | $decode = array_merge(array('Message nature' => 'Request Departure Clearance'),$decode); |
| 598 | - } |
|
| 599 | - elseif (preg_match(':^#B4:',$message)) { |
|
| 641 | + } elseif (preg_match(':^#B4:',$message)) { |
|
| 600 | 642 | $decode = array_merge(array('Message nature' => 'Departure Clearance Readback'),$decode); |
| 601 | - } |
|
| 602 | - elseif (preg_match(':^#B6:',$message)) { |
|
| 643 | + } elseif (preg_match(':^#B6:',$message)) { |
|
| 603 | 644 | $decode = array_merge(array('Message nature' => 'Provide ADS Report'),$decode); |
| 604 | - } |
|
| 605 | - elseif (preg_match(':^#B8:',$message)) { |
|
| 645 | + } elseif (preg_match(':^#B8:',$message)) { |
|
| 606 | 646 | $decode = array_merge(array('Message nature' => 'Request Departure Slot'),$decode); |
| 607 | - } |
|
| 608 | - elseif (preg_match(':^#B9:',$message)) { |
|
| 647 | + } elseif (preg_match(':^#B9:',$message)) { |
|
| 609 | 648 | $decode = array_merge(array('Message nature' => 'Request ATIS Report'),$decode); |
| 610 | - } |
|
| 611 | - elseif (preg_match(':^#B0:',$message)) { |
|
| 649 | + } elseif (preg_match(':^#B0:',$message)) { |
|
| 612 | 650 | $decode = array_merge(array('Message nature' => 'ATS Facility Notification'),$decode); |
| 613 | - } |
|
| 614 | - elseif (preg_match(':^#BA:',$message)) { |
|
| 651 | + } elseif (preg_match(':^#BA:',$message)) { |
|
| 615 | 652 | $decode = array_merge(array('Message nature' => 'ATCComm'),$decode); |
| 616 | - } |
|
| 617 | - elseif (preg_match(':^#BB:',$message)) { |
|
| 653 | + } elseif (preg_match(':^#BB:',$message)) { |
|
| 618 | 654 | $decode = array_merge(array('Message nature' => 'Request TWIP Report'),$decode); |
| 619 | - } |
|
| 620 | - elseif (preg_match(':^#BC:',$message)) { |
|
| 655 | + } elseif (preg_match(':^#BC:',$message)) { |
|
| 621 | 656 | $decode = array_merge(array('Message nature' => 'Pushback Clearance Request'),$decode); |
| 622 | - } |
|
| 623 | - elseif (preg_match(':^#BD:',$message)) { |
|
| 657 | + } elseif (preg_match(':^#BD:',$message)) { |
|
| 624 | 658 | $decode = array_merge(array('Message nature' => 'Expected Taxi Clearance Request'),$decode); |
| 625 | - } |
|
| 626 | - elseif (preg_match(':^#BE:',$message)) { |
|
| 659 | + } elseif (preg_match(':^#BE:',$message)) { |
|
| 627 | 660 | $decode = array_merge(array('Message nature' => 'CPC Aircraft Log-On/Off Request'),$decode); |
| 628 | - } |
|
| 629 | - elseif (preg_match(':^#BF:',$message)) { |
|
| 661 | + } elseif (preg_match(':^#BF:',$message)) { |
|
| 630 | 662 | $decode = array_merge(array('Message nature' => 'CPC WILCO/UNABLE Response'),$decode); |
| 631 | - } |
|
| 632 | - elseif (preg_match(':^#H3:',$message)) { |
|
| 663 | + } elseif (preg_match(':^#H3:',$message)) { |
|
| 633 | 664 | $decode = array_merge(array('Message nature' => 'Icing Report'),$decode); |
| 634 | 665 | } |
| 635 | 666 | } |
| 636 | 667 | if ($label == '10') { |
| 637 | 668 | if (preg_match(':^DTO01:',$message)) { |
| 638 | 669 | $decode = array_merge(array('Message nature' => 'Delayed Takeoff Report'),$decode); |
| 639 | - } |
|
| 640 | - elseif (preg_match(':^AIS01:',$message)) { |
|
| 670 | + } elseif (preg_match(':^AIS01:',$message)) { |
|
| 641 | 671 | $decode = array_merge(array('Message nature' => 'AIS Request'),$decode); |
| 642 | - } |
|
| 643 | - elseif (preg_match(':^FTX01:',$message)) { |
|
| 672 | + } elseif (preg_match(':^FTX01:',$message)) { |
|
| 644 | 673 | $decode = array_merge(array('Message nature' => 'Free Text Downlink'),$decode); |
| 645 | - } |
|
| 646 | - elseif (preg_match(':^FPL01:',$message)) { |
|
| 674 | + } elseif (preg_match(':^FPL01:',$message)) { |
|
| 647 | 675 | $decode = array_merge(array('Message nature' => 'Flight Plan Request'),$decode); |
| 648 | - } |
|
| 649 | - elseif (preg_match(':^WAB01:',$message)) { |
|
| 676 | + } elseif (preg_match(':^WAB01:',$message)) { |
|
| 650 | 677 | $decode = array_merge(array('Message nature' => 'Weight & Balance Request'),$decode); |
| 651 | - } |
|
| 652 | - elseif (preg_match(':^MET01:',$message)) { |
|
| 678 | + } elseif (preg_match(':^MET01:',$message)) { |
|
| 653 | 679 | $decode = array_merge(array('Message nature' => 'Weather Data Request'),$decode); |
| 654 | - } |
|
| 655 | - elseif (preg_match(':^WAB02:',$message)) { |
|
| 680 | + } elseif (preg_match(':^WAB02:',$message)) { |
|
| 656 | 681 | $decode = array_merge(array('Message nature' => 'Weight and Balance Acknowledgement'),$decode); |
| 657 | 682 | } |
| 658 | 683 | } |
@@ -667,38 +692,28 @@ discard block |
||
| 667 | 692 | $vsta = array('Version' => $version); |
| 668 | 693 | if ($state == 'E') { |
| 669 | 694 | $vsta = array_merge($vsta,array('Link state' => 'Established')); |
| 670 | - } |
|
| 671 | - elseif ($state == 'L') { |
|
| 695 | + } elseif ($state == 'L') { |
|
| 672 | 696 | $vsta = array_merge($vsta,array('Link state' => 'Lost')); |
| 673 | - } |
|
| 674 | - else { |
|
| 697 | + } else { |
|
| 675 | 698 | $vsta = array_merge($vsta,array('Link state' => 'Unknown')); |
| 676 | 699 | } |
| 677 | 700 | if ($type == 'V') { |
| 678 | 701 | $vsta = array_merge($vsta,array('Link type' => 'VHF ACARS')); |
| 679 | - } |
|
| 680 | - elseif ($type == 'S') { |
|
| 702 | + } elseif ($type == 'S') { |
|
| 681 | 703 | $vsta = array_merge($vsta,array('Link type' => 'Generic SATCOM')); |
| 682 | - } |
|
| 683 | - elseif ($type == 'H') { |
|
| 704 | + } elseif ($type == 'H') { |
|
| 684 | 705 | $vsta = array_merge($vsta,array('Link type' => 'HF')); |
| 685 | - } |
|
| 686 | - elseif ($type == 'G') { |
|
| 706 | + } elseif ($type == 'G') { |
|
| 687 | 707 | $vsta = array_merge($vsta,array('Link type' => 'GlobalStar SATCOM')); |
| 688 | - } |
|
| 689 | - elseif ($type == 'C') { |
|
| 708 | + } elseif ($type == 'C') { |
|
| 690 | 709 | $vsta = array_merge($vsta,array('Link type' => 'ICO SATCOM')); |
| 691 | - } |
|
| 692 | - elseif ($type == '2') { |
|
| 710 | + } elseif ($type == '2') { |
|
| 693 | 711 | $vsta = array_merge($vsta,array('Link type' => 'VDL Mode 2')); |
| 694 | - } |
|
| 695 | - elseif ($type == 'X') { |
|
| 712 | + } elseif ($type == 'X') { |
|
| 696 | 713 | $vsta = array_merge($vsta,array('Link type' => 'Inmarsat Aero')); |
| 697 | - } |
|
| 698 | - elseif ($type == 'I') { |
|
| 714 | + } elseif ($type == 'I') { |
|
| 699 | 715 | $vsta = array_merge($vsta,array('Link type' => 'Irridium SATCOM')); |
| 700 | - } |
|
| 701 | - else { |
|
| 716 | + } else { |
|
| 702 | 717 | $vsta = array_merge($vsta,array('Link type' => 'Unknown')); |
| 703 | 718 | } |
| 704 | 719 | $vsta = array_merge($vsta,array('Event occured at' => implode(':',str_split($at,2)))); |
@@ -707,7 +722,9 @@ discard block |
||
| 707 | 722 | } |
| 708 | 723 | |
| 709 | 724 | $title = $this->getTitlefromLabel($label); |
| 710 | - if ($title != '') $decode = array_merge(array('Message title' => $title),$decode); |
|
| 725 | + if ($title != '') { |
|
| 726 | + $decode = array_merge(array('Message title' => $title),$decode); |
|
| 727 | + } |
|
| 711 | 728 | /* |
| 712 | 729 | // Business jets always use GS0001 |
| 713 | 730 | if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude); |
@@ -742,31 +759,54 @@ discard block |
||
| 742 | 759 | $msg = $message['message']; |
| 743 | 760 | $decode = $message['decode']; |
| 744 | 761 | $registration = (string)$message['registration']; |
| 745 | - if (isset($decode['latitude'])) $latitude = $decode['latitude']; |
|
| 746 | - else $latitude = ''; |
|
| 747 | - if (isset($decode['longitude'])) $longitude = $decode['longitude']; |
|
| 748 | - else $longitude = ''; |
|
| 749 | - if (isset($decode['airicao'])) $airicao = $decode['airicao']; |
|
| 750 | - else $airicao = ''; |
|
| 751 | - if (isset($decode['icao'])) $icao = $decode['icao']; |
|
| 752 | - else $icao = $Translation->checkTranslation($ident); |
|
| 762 | + if (isset($decode['latitude'])) { |
|
| 763 | + $latitude = $decode['latitude']; |
|
| 764 | + } else { |
|
| 765 | + $latitude = ''; |
|
| 766 | + } |
|
| 767 | + if (isset($decode['longitude'])) { |
|
| 768 | + $longitude = $decode['longitude']; |
|
| 769 | + } else { |
|
| 770 | + $longitude = ''; |
|
| 771 | + } |
|
| 772 | + if (isset($decode['airicao'])) { |
|
| 773 | + $airicao = $decode['airicao']; |
|
| 774 | + } else { |
|
| 775 | + $airicao = ''; |
|
| 776 | + } |
|
| 777 | + if (isset($decode['icao'])) { |
|
| 778 | + $icao = $decode['icao']; |
|
| 779 | + } else { |
|
| 780 | + $icao = $Translation->checkTranslation($ident); |
|
| 781 | + } |
|
| 753 | 782 | $image_array = $Image->getSpotterImage($registration); |
| 754 | 783 | if (!isset($image_array[0]['registration'])) { |
| 755 | 784 | $Image->addSpotterImage($registration); |
| 756 | 785 | } |
| 757 | 786 | // Business jets always use GS0001 |
| 758 | - if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude); |
|
| 759 | - if ($globalDebug && isset($info) && $info != '') echo $info; |
|
| 760 | - if (count($decode) > 0) $decode_json = json_encode($decode); |
|
| 761 | - else $decode_json = ''; |
|
| 787 | + if ($ident != 'GS0001') { |
|
| 788 | + $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude); |
|
| 789 | + } |
|
| 790 | + if ($globalDebug && isset($info) && $info != '') { |
|
| 791 | + echo $info; |
|
| 792 | + } |
|
| 793 | + if (count($decode) > 0) { |
|
| 794 | + $decode_json = json_encode($decode); |
|
| 795 | + } else { |
|
| 796 | + $decode_json = ''; |
|
| 797 | + } |
|
| 762 | 798 | if (isset($decode['Departure airport']) && isset($decode['Departure hour']) && isset($decode['Arrival airport']) && isset($decode['Arrival hour'])) { |
| 763 | 799 | $Schedule->addSchedule($icao,$decode['Departure airport'],$decode['Departure hour'],$decode['Arrival airport'],$decode['Arrival hour'],'ACARS'); |
| 764 | 800 | } elseif (isset($decode['Departure airport']) && isset($decode['Arrival airport'])) { |
| 765 | 801 | $Schedule->addSchedule($icao,$decode['Departure airport'],'',$decode['Arrival airport'],'','ACARS'); |
| 766 | 802 | } |
| 767 | 803 | $result = $this->addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json); |
| 768 | - if (!isset($globalACARSArchive)) $globalACARSArchive = array('10','80','81','82','3F'); |
|
| 769 | - if ($result && in_array($label,$globalACARSArchive)) $this->addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json); |
|
| 804 | + if (!isset($globalACARSArchive)) { |
|
| 805 | + $globalACARSArchive = array('10','80','81','82','3F'); |
|
| 806 | + } |
|
| 807 | + if ($result && in_array($label,$globalACARSArchive)) { |
|
| 808 | + $this->addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json); |
|
| 809 | + } |
|
| 770 | 810 | if ($globalDebug && count($decode) > 0) { |
| 771 | 811 | echo "Human readable data : ".implode(' - ',$decode)."\n"; |
| 772 | 812 | } |
@@ -789,7 +829,9 @@ discard block |
||
| 789 | 829 | if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '') { |
| 790 | 830 | $Connection = new Connection($this->db); |
| 791 | 831 | $this->db = $Connection->db; |
| 792 | - if ($globalDebug) echo "Test if not already in Live ACARS table..."; |
|
| 832 | + if ($globalDebug) { |
|
| 833 | + echo "Test if not already in Live ACARS table..."; |
|
| 834 | + } |
|
| 793 | 835 | $query_test = "SELECT COUNT(*) as nb FROM acars_live WHERE ident = :ident AND registration = :registration AND message = :message"; |
| 794 | 836 | $query_test_values = array(':ident' => $ident,':registration' => $registration, ':message' => $message); |
| 795 | 837 | try { |
@@ -799,7 +841,9 @@ discard block |
||
| 799 | 841 | return "error : ".$e->getMessage(); |
| 800 | 842 | } |
| 801 | 843 | if ($stht->fetchColumn() == 0) { |
| 802 | - if ($globalDebug) echo "Add Live ACARS data..."; |
|
| 844 | + if ($globalDebug) { |
|
| 845 | + echo "Add Live ACARS data..."; |
|
| 846 | + } |
|
| 803 | 847 | $query = "INSERT INTO acars_live (ident,registration,label,block_id,msg_no,message,decode,date) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode,:date)"; |
| 804 | 848 | $query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode,':date' => date("Y-m-d H:i:s")); |
| 805 | 849 | try { |
@@ -809,10 +853,14 @@ discard block |
||
| 809 | 853 | return "error : ".$e->getMessage(); |
| 810 | 854 | } |
| 811 | 855 | } else { |
| 812 | - if ($globalDebug) echo "Data already in DB...\n"; |
|
| 856 | + if ($globalDebug) { |
|
| 857 | + echo "Data already in DB...\n"; |
|
| 858 | + } |
|
| 813 | 859 | return false; |
| 814 | 860 | } |
| 815 | - if ($globalDebug) echo "Done\n"; |
|
| 861 | + if ($globalDebug) { |
|
| 862 | + echo "Done\n"; |
|
| 863 | + } |
|
| 816 | 864 | return true; |
| 817 | 865 | } |
| 818 | 866 | } |
@@ -843,7 +891,9 @@ discard block |
||
| 843 | 891 | } |
| 844 | 892 | if ($stht->fetchColumn() == 0) { |
| 845 | 893 | */ |
| 846 | - if ($globalDebug) echo "Add Live ACARS data..."; |
|
| 894 | + if ($globalDebug) { |
|
| 895 | + echo "Add Live ACARS data..."; |
|
| 896 | + } |
|
| 847 | 897 | $query = "INSERT INTO acars_archive (ident,registration,label,block_id,msg_no,message,decode) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode)"; |
| 848 | 898 | $query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode); |
| 849 | 899 | try { |
@@ -852,7 +902,9 @@ discard block |
||
| 852 | 902 | } catch(PDOException $e) { |
| 853 | 903 | return "error : ".$e->getMessage(); |
| 854 | 904 | } |
| 855 | - if ($globalDebug) echo "Done\n"; |
|
| 905 | + if ($globalDebug) { |
|
| 906 | + echo "Done\n"; |
|
| 907 | + } |
|
| 856 | 908 | } |
| 857 | 909 | } |
| 858 | 910 | |
@@ -875,8 +927,11 @@ discard block |
||
| 875 | 927 | return ''; |
| 876 | 928 | } |
| 877 | 929 | $row = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 878 | - if (count($row) > 0) return $row[0]['title']; |
|
| 879 | - else return ''; |
|
| 930 | + if (count($row) > 0) { |
|
| 931 | + return $row[0]['title']; |
|
| 932 | + } else { |
|
| 933 | + return ''; |
|
| 934 | + } |
|
| 880 | 935 | } |
| 881 | 936 | |
| 882 | 937 | /** |
@@ -895,8 +950,11 @@ discard block |
||
| 895 | 950 | return array(); |
| 896 | 951 | } |
| 897 | 952 | $row = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 898 | - if (count($row) > 0) return $row; |
|
| 899 | - else return array(); |
|
| 953 | + if (count($row) > 0) { |
|
| 954 | + return $row; |
|
| 955 | + } else { |
|
| 956 | + return array(); |
|
| 957 | + } |
|
| 900 | 958 | } |
| 901 | 959 | |
| 902 | 960 | /** |
@@ -916,8 +974,11 @@ discard block |
||
| 916 | 974 | return array(); |
| 917 | 975 | } |
| 918 | 976 | $row = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 919 | - if (count($row) > 0) return $row[0]; |
|
| 920 | - else return array(); |
|
| 977 | + if (count($row) > 0) { |
|
| 978 | + return $row[0]; |
|
| 979 | + } else { |
|
| 980 | + return array(); |
|
| 981 | + } |
|
| 921 | 982 | } |
| 922 | 983 | |
| 923 | 984 | /** |
@@ -962,19 +1023,35 @@ discard block |
||
| 962 | 1023 | if ($row['registration'] != '') { |
| 963 | 1024 | $row['registration'] = str_replace('.','',$row['registration']); |
| 964 | 1025 | $image_array = $Image->getSpotterImage($row['registration']); |
| 965 | - if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website'])); |
|
| 966 | - else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => '')); |
|
| 967 | - } else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => '')); |
|
| 968 | - if ($row['registration'] == '') $row['registration'] = 'NA'; |
|
| 969 | - if ($row['ident'] == '') $row['ident'] = 'NA'; |
|
| 1026 | + if (count($image_array) > 0) { |
|
| 1027 | + $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website'])); |
|
| 1028 | + } else { |
|
| 1029 | + $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => '')); |
|
| 1030 | + } |
|
| 1031 | + } else { |
|
| 1032 | + $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => '')); |
|
| 1033 | + } |
|
| 1034 | + if ($row['registration'] == '') { |
|
| 1035 | + $row['registration'] = 'NA'; |
|
| 1036 | + } |
|
| 1037 | + if ($row['ident'] == '') { |
|
| 1038 | + $row['ident'] = 'NA'; |
|
| 1039 | + } |
|
| 970 | 1040 | $identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2)); |
| 971 | 1041 | if (isset($identicao[0])) { |
| 972 | 1042 | if (substr($row['ident'],0,2) == 'AF') { |
| 973 | - if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident']; |
|
| 974 | - else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0'); |
|
| 975 | - } else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0'); |
|
| 1043 | + if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) { |
|
| 1044 | + $icao = $row['ident']; |
|
| 1045 | + } else { |
|
| 1046 | + $icao = 'AFR'.ltrim(substr($row['ident'],2),'0'); |
|
| 1047 | + } |
|
| 1048 | + } else { |
|
| 1049 | + $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0'); |
|
| 1050 | + } |
|
| 976 | 1051 | $data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name'])); |
| 977 | - } else $icao = $row['ident']; |
|
| 1052 | + } else { |
|
| 1053 | + $icao = $row['ident']; |
|
| 1054 | + } |
|
| 978 | 1055 | $icao = $Translation->checkTranslation($icao,false); |
| 979 | 1056 | $decode = json_decode($row['decode'],true); |
| 980 | 1057 | $found = false; |
@@ -999,7 +1076,9 @@ discard block |
||
| 999 | 1076 | $found = true; |
| 1000 | 1077 | } |
| 1001 | 1078 | } |
| 1002 | - if ($found) $row['decode'] = json_encode($decode); |
|
| 1079 | + if ($found) { |
|
| 1080 | + $row['decode'] = json_encode($decode); |
|
| 1081 | + } |
|
| 1003 | 1082 | $data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode'])); |
| 1004 | 1083 | $result[] = $data; |
| 1005 | 1084 | $i++; |
@@ -1007,8 +1086,9 @@ discard block |
||
| 1007 | 1086 | if (isset($result)) { |
| 1008 | 1087 | $result[0]['query_number_rows'] = $i; |
| 1009 | 1088 | return $result; |
| 1089 | + } else { |
|
| 1090 | + return array(); |
|
| 1010 | 1091 | } |
| 1011 | - else return array(); |
|
| 1012 | 1092 | } |
| 1013 | 1093 | |
| 1014 | 1094 | /** |
@@ -1057,31 +1137,51 @@ discard block |
||
| 1057 | 1137 | if ($row['registration'] != '') { |
| 1058 | 1138 | $row['registration'] = str_replace('.','',$row['registration']); |
| 1059 | 1139 | $image_array = $Image->getSpotterImage($row['registration']); |
| 1060 | - if (count($image_array) > 0) $data = array_merge($data,array('image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website'])); |
|
| 1061 | - else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => '')); |
|
| 1062 | - } else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => '')); |
|
| 1140 | + if (count($image_array) > 0) { |
|
| 1141 | + $data = array_merge($data,array('image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website'])); |
|
| 1142 | + } else { |
|
| 1143 | + $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => '')); |
|
| 1144 | + } |
|
| 1145 | + } else { |
|
| 1146 | + $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => '')); |
|
| 1147 | + } |
|
| 1063 | 1148 | $icao = ''; |
| 1064 | - if ($row['registration'] == '') $row['registration'] = 'NA'; |
|
| 1065 | - if ($row['ident'] == '') $row['ident'] = 'NA'; |
|
| 1149 | + if ($row['registration'] == '') { |
|
| 1150 | + $row['registration'] = 'NA'; |
|
| 1151 | + } |
|
| 1152 | + if ($row['ident'] == '') { |
|
| 1153 | + $row['ident'] = 'NA'; |
|
| 1154 | + } |
|
| 1066 | 1155 | $identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2)); |
| 1067 | 1156 | if (isset($identicao[0])) { |
| 1068 | 1157 | if (substr($row['ident'],0,2) == 'AF') { |
| 1069 | - if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident']; |
|
| 1070 | - else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0'); |
|
| 1071 | - } else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0'); |
|
| 1158 | + if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) { |
|
| 1159 | + $icao = $row['ident']; |
|
| 1160 | + } else { |
|
| 1161 | + $icao = 'AFR'.ltrim(substr($row['ident'],2),'0'); |
|
| 1162 | + } |
|
| 1163 | + } else { |
|
| 1164 | + $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0'); |
|
| 1165 | + } |
|
| 1072 | 1166 | $data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name'])); |
| 1073 | - } else $icao = $row['ident']; |
|
| 1167 | + } else { |
|
| 1168 | + $icao = $row['ident']; |
|
| 1169 | + } |
|
| 1074 | 1170 | $icao = $Translation->checkTranslation($icao); |
| 1075 | 1171 | $decode = json_decode($row['decode'],true); |
| 1076 | 1172 | $found = false; |
| 1077 | 1173 | if ($decode != '' && array_key_exists('Departure airport',$decode)) { |
| 1078 | 1174 | $airport_info = $Spotter->getAllAirportInfo($decode['Departure airport']); |
| 1079 | - if (isset($airport_info[0]['icao'])) $decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>'; |
|
| 1175 | + if (isset($airport_info[0]['icao'])) { |
|
| 1176 | + $decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>'; |
|
| 1177 | + } |
|
| 1080 | 1178 | $found = true; |
| 1081 | 1179 | } |
| 1082 | 1180 | if ($decode != '' && array_key_exists('Arrival airport',$decode)) { |
| 1083 | 1181 | $airport_info = $Spotter->getAllAirportInfo($decode['Arrival airport']); |
| 1084 | - if (isset($airport_info[0]['icao'])) $decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>'; |
|
| 1182 | + if (isset($airport_info[0]['icao'])) { |
|
| 1183 | + $decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>'; |
|
| 1184 | + } |
|
| 1085 | 1185 | $found = true; |
| 1086 | 1186 | } |
| 1087 | 1187 | if ($decode != '' && array_key_exists('Airport/Waypoint name',$decode)) { |
@@ -1091,7 +1191,9 @@ discard block |
||
| 1091 | 1191 | $found = true; |
| 1092 | 1192 | } |
| 1093 | 1193 | } |
| 1094 | - if ($found) $row['decode'] = json_encode($decode); |
|
| 1194 | + if ($found) { |
|
| 1195 | + $row['decode'] = json_encode($decode); |
|
| 1196 | + } |
|
| 1095 | 1197 | $data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode'])); |
| 1096 | 1198 | $result[] = $data; |
| 1097 | 1199 | $i++; |
@@ -1099,7 +1201,9 @@ discard block |
||
| 1099 | 1201 | if (isset($result)) { |
| 1100 | 1202 | $result[0]['query_number_rows'] = $i; |
| 1101 | 1203 | return $result; |
| 1102 | - } else return array(); |
|
| 1204 | + } else { |
|
| 1205 | + return array(); |
|
| 1206 | + } |
|
| 1103 | 1207 | } |
| 1104 | 1208 | |
| 1105 | 1209 | /** |
@@ -1115,25 +1219,37 @@ discard block |
||
| 1115 | 1219 | $ident = trim($ident); |
| 1116 | 1220 | $Translation = new Translation($this->db); |
| 1117 | 1221 | $Spotter = new Spotter($this->db); |
| 1118 | - if ($globalDebug) echo "Test if we add ModeS data..."; |
|
| 1222 | + if ($globalDebug) { |
|
| 1223 | + echo "Test if we add ModeS data..."; |
|
| 1224 | + } |
|
| 1119 | 1225 | //if ($icao == '') $icao = ACARS->ident2icao($ident); |
| 1120 | - if ($icao == '') $icao = $Translation->checkTranslation($ident); |
|
| 1121 | - if ($globalDebug) echo '- Ident : '.$icao.' - '; |
|
| 1226 | + if ($icao == '') { |
|
| 1227 | + $icao = $Translation->checkTranslation($ident); |
|
| 1228 | + } |
|
| 1229 | + if ($globalDebug) { |
|
| 1230 | + echo '- Ident : '.$icao.' - '; |
|
| 1231 | + } |
|
| 1122 | 1232 | if ($ident == '' || $registration == '') { |
| 1123 | - if ($globalDebug) echo "Ident or registration null, exit\n"; |
|
| 1233 | + if ($globalDebug) { |
|
| 1234 | + echo "Ident or registration null, exit\n"; |
|
| 1235 | + } |
|
| 1124 | 1236 | return ''; |
| 1125 | 1237 | } |
| 1126 | 1238 | $registration = str_replace('.','',$registration); |
| 1127 | 1239 | $ident = $Translation->ident2icao($ident); |
| 1128 | 1240 | // Check if a flight with same registration is flying now, if ok check if callsign = name in ACARS, else add it to translation |
| 1129 | - if ($globalDebug) echo "Check if needed to add translation ".$ident.'... '; |
|
| 1241 | + if ($globalDebug) { |
|
| 1242 | + echo "Check if needed to add translation ".$ident.'... '; |
|
| 1243 | + } |
|
| 1130 | 1244 | $querysi = "SELECT ident FROM spotter_live s,aircraft_modes a WHERE a.ModeS = s.ModeS AND a.Registration = :registration AND s.format_source <> 'ACARS' LIMIT 1"; |
| 1131 | 1245 | $querysi_values = array(':registration' => $registration); |
| 1132 | 1246 | try { |
| 1133 | 1247 | $sthsi = $this->db->prepare($querysi); |
| 1134 | 1248 | $sthsi->execute($querysi_values); |
| 1135 | 1249 | } catch(PDOException $e) { |
| 1136 | - if ($globalDebug) echo $e->getMessage(); |
|
| 1250 | + if ($globalDebug) { |
|
| 1251 | + echo $e->getMessage(); |
|
| 1252 | + } |
|
| 1137 | 1253 | return "error : ".$e->getMessage(); |
| 1138 | 1254 | } |
| 1139 | 1255 | $resultsi = $sthsi->fetch(PDO::FETCH_ASSOC); |
@@ -1141,9 +1257,14 @@ discard block |
||
| 1141 | 1257 | if (count($resultsi) > 0 && $resultsi['ident'] != $ident && $resultsi['ident'] != '') { |
| 1142 | 1258 | $Translation = new Translation($this->db); |
| 1143 | 1259 | $trans_ident = $Translation->getOperator($resultsi['ident']); |
| 1144 | - if ($globalDebug) echo 'Add translation to table : '.$ident.' -> '.$resultsi['ident'].' '; |
|
| 1145 | - if ($ident != $trans_ident) $Translation->addOperator($resultsi['ident'],$ident,'ACARS'); |
|
| 1146 | - elseif ($trans_ident == $ident) $Translation->updateOperator($resultsi['ident'],$ident,'ACARS'); |
|
| 1260 | + if ($globalDebug) { |
|
| 1261 | + echo 'Add translation to table : '.$ident.' -> '.$resultsi['ident'].' '; |
|
| 1262 | + } |
|
| 1263 | + if ($ident != $trans_ident) { |
|
| 1264 | + $Translation->addOperator($resultsi['ident'],$ident,'ACARS'); |
|
| 1265 | + } elseif ($trans_ident == $ident) { |
|
| 1266 | + $Translation->updateOperator($resultsi['ident'],$ident,'ACARS'); |
|
| 1267 | + } |
|
| 1147 | 1268 | } else { |
| 1148 | 1269 | if ($registration != '' && $latitude != '' && $longitude != '') { |
| 1149 | 1270 | $query = "SELECT ModeS FROM aircraft_modes WHERE Registration = :registration LIMIT 1"; |
@@ -1152,32 +1273,46 @@ discard block |
||
| 1152 | 1273 | $sth = $this->db->prepare($query); |
| 1153 | 1274 | $sth->execute($query_values); |
| 1154 | 1275 | } catch(PDOException $e) { |
| 1155 | - if ($globalDebug) echo $e->getMessage(); |
|
| 1276 | + if ($globalDebug) { |
|
| 1277 | + echo $e->getMessage(); |
|
| 1278 | + } |
|
| 1156 | 1279 | return "error : ".$e->getMessage(); |
| 1157 | 1280 | } |
| 1158 | 1281 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
| 1159 | 1282 | $sth->closeCursor(); |
| 1160 | - if (isset($result['modes'])) $hex = $result['modes']; |
|
| 1161 | - else $hex = ''; |
|
| 1283 | + if (isset($result['modes'])) { |
|
| 1284 | + $hex = $result['modes']; |
|
| 1285 | + } else { |
|
| 1286 | + $hex = ''; |
|
| 1287 | + } |
|
| 1162 | 1288 | $SI_data = array('hex' => $hex,'ident' => $ident,'aircraft_icao' => $ICAOTypeCode,'registration' => $registration,'latitude' => $latitude,'$longitude' => $longitude,'format_source' => 'ACARS'); |
| 1163 | - if ($this->fromACARSscript) $this->SI->add($SI_data); |
|
| 1289 | + if ($this->fromACARSscript) { |
|
| 1290 | + $this->SI->add($SI_data); |
|
| 1291 | + } |
|
| 1164 | 1292 | } |
| 1165 | 1293 | } |
| 1166 | - if ($globalDebug) echo 'Done'."\n"; |
|
| 1294 | + if ($globalDebug) { |
|
| 1295 | + echo 'Done'."\n"; |
|
| 1296 | + } |
|
| 1167 | 1297 | $query = "SELECT flightaware_id, ModeS FROM spotter_output WHERE ident = :ident AND format_source <> 'ACARS' ORDER BY spotter_id DESC LIMIT 1"; |
| 1168 | 1298 | $query_values = array(':ident' => $icao); |
| 1169 | 1299 | try { |
| 1170 | 1300 | $sth = $this->db->prepare($query); |
| 1171 | 1301 | $sth->execute($query_values); |
| 1172 | 1302 | } catch(PDOException $e) { |
| 1173 | - if ($globalDebug) echo $e->getMessage(); |
|
| 1303 | + if ($globalDebug) { |
|
| 1304 | + echo $e->getMessage(); |
|
| 1305 | + } |
|
| 1174 | 1306 | return "error : ".$e->getMessage(); |
| 1175 | 1307 | } |
| 1176 | 1308 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
| 1177 | 1309 | $sth->closeCursor(); |
| 1178 | 1310 | if (isset($result['flightaware_id'])) { |
| 1179 | - if (isset($result['ModeS'])) $ModeS = $result['ModeS']; |
|
| 1180 | - else $ModeS = ''; |
|
| 1311 | + if (isset($result['ModeS'])) { |
|
| 1312 | + $ModeS = $result['ModeS']; |
|
| 1313 | + } else { |
|
| 1314 | + $ModeS = ''; |
|
| 1315 | + } |
|
| 1181 | 1316 | if ($ModeS == '') { |
| 1182 | 1317 | $id = explode('-',$result['flightaware_id']); |
| 1183 | 1318 | $ModeS = $id[0]; |
@@ -1190,24 +1325,32 @@ discard block |
||
| 1190 | 1325 | $sthc = $this->db->prepare($queryc); |
| 1191 | 1326 | $sthc->execute($queryc_values); |
| 1192 | 1327 | } catch(PDOException $e) { |
| 1193 | - if ($globalDebug) echo $e->getMessage(); |
|
| 1328 | + if ($globalDebug) { |
|
| 1329 | + echo $e->getMessage(); |
|
| 1330 | + } |
|
| 1194 | 1331 | return "error : ".$e->getMessage(); |
| 1195 | 1332 | } |
| 1196 | 1333 | $row = $sthc->fetch(PDO::FETCH_ASSOC); |
| 1197 | 1334 | $sthc->closeCursor(); |
| 1198 | 1335 | if (count($row) == 0) { |
| 1199 | - if ($globalDebug) echo " Add to ModeS table - "; |
|
| 1336 | + if ($globalDebug) { |
|
| 1337 | + echo " Add to ModeS table - "; |
|
| 1338 | + } |
|
| 1200 | 1339 | $queryi = "INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:ModeS,:ModeSCountry,:Registration, :ICAOTypeCode,'ACARS')"; |
| 1201 | 1340 | $queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode); |
| 1202 | 1341 | try { |
| 1203 | 1342 | $sthi = $this->db->prepare($queryi); |
| 1204 | 1343 | $sthi->execute($queryi_values); |
| 1205 | 1344 | } catch(PDOException $e) { |
| 1206 | - if ($globalDebug) echo $e->getMessage(); |
|
| 1345 | + if ($globalDebug) { |
|
| 1346 | + echo $e->getMessage(); |
|
| 1347 | + } |
|
| 1207 | 1348 | return "error : ".$e->getMessage(); |
| 1208 | 1349 | } |
| 1209 | 1350 | } else { |
| 1210 | - if ($globalDebug) echo " Update ModeS table - "; |
|
| 1351 | + if ($globalDebug) { |
|
| 1352 | + echo " Update ModeS table - "; |
|
| 1353 | + } |
|
| 1211 | 1354 | if ($ICAOTypeCode != '') { |
| 1212 | 1355 | $queryi = "UPDATE aircraft_modes SET ModeSCountry = :ModeSCountry,Registration = :Registration,ICAOTypeCode = :ICAOTypeCode,Source = 'ACARS',LastModified = NOW() WHERE ModeS = :ModeS"; |
| 1213 | 1356 | $queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode); |
@@ -1219,7 +1362,9 @@ discard block |
||
| 1219 | 1362 | $sthi = $this->db->prepare($queryi); |
| 1220 | 1363 | $sthi->execute($queryi_values); |
| 1221 | 1364 | } catch(PDOException $e) { |
| 1222 | - if ($globalDebug) echo $e->getMessage(); |
|
| 1365 | + if ($globalDebug) { |
|
| 1366 | + echo $e->getMessage(); |
|
| 1367 | + } |
|
| 1223 | 1368 | return "error : ".$e->getMessage(); |
| 1224 | 1369 | } |
| 1225 | 1370 | } |
@@ -1240,7 +1385,9 @@ discard block |
||
| 1240 | 1385 | return "error : ".$e->getMessage(); |
| 1241 | 1386 | } |
| 1242 | 1387 | */ |
| 1243 | - if ($globalDebug) echo " Update Spotter_output table - "; |
|
| 1388 | + if ($globalDebug) { |
|
| 1389 | + echo " Update Spotter_output table - "; |
|
| 1390 | + } |
|
| 1244 | 1391 | if ($ICAOTypeCode != '') { |
| 1245 | 1392 | if ($globalDBdriver == 'mysql') { |
| 1246 | 1393 | $queryi = "UPDATE spotter_output SET registration = :Registration,aircraft_icao = :ICAOTypeCode WHERE ident = :ident AND date >= date_sub(UTC_TIMESTAMP(), INTERVAL 1 HOUR)"; |
@@ -1251,8 +1398,7 @@ discard block |
||
| 1251 | 1398 | } else { |
| 1252 | 1399 | if ($globalDBdriver == 'mysql') { |
| 1253 | 1400 | $queryi = "UPDATE spotter_output SET registration = :Registration WHERE ident = :ident AND date >= date_sub(UTC_TIMESTAMP(), INTERVAL 1 HOUR)"; |
| 1254 | - } |
|
| 1255 | - elseif ($globalDBdriver == 'pgsql') { |
|
| 1401 | + } elseif ($globalDBdriver == 'pgsql') { |
|
| 1256 | 1402 | $queryi = "UPDATE spotter_output SET registration = :Registration WHERE ident = :ident AND date >= NOW() AT TIME ZONE 'UTC' - INTERVAL '1 HOUR'"; |
| 1257 | 1403 | } |
| 1258 | 1404 | $queryi_values = array(':Registration' => $registration,':ident' => $icao); |
@@ -1261,14 +1407,20 @@ discard block |
||
| 1261 | 1407 | $sthi = $this->db->prepare($queryi); |
| 1262 | 1408 | $sthi->execute($queryi_values); |
| 1263 | 1409 | } catch(PDOException $e) { |
| 1264 | - if ($globalDebug) echo $e->getMessage(); |
|
| 1410 | + if ($globalDebug) { |
|
| 1411 | + echo $e->getMessage(); |
|
| 1412 | + } |
|
| 1265 | 1413 | return "error : ".$e->getMessage(); |
| 1266 | 1414 | } |
| 1267 | 1415 | } |
| 1268 | 1416 | } else { |
| 1269 | - if ($globalDebug) echo " Can't find ModeS in spotter_output - "; |
|
| 1417 | + if ($globalDebug) { |
|
| 1418 | + echo " Can't find ModeS in spotter_output - "; |
|
| 1419 | + } |
|
| 1420 | + } |
|
| 1421 | + if ($globalDebug) { |
|
| 1422 | + echo "Done\n"; |
|
| 1270 | 1423 | } |
| 1271 | - if ($globalDebug) echo "Done\n"; |
|
| 1272 | 1424 | } |
| 1273 | 1425 | } |
| 1274 | 1426 | ?> |
