Ysurac /
FlightAirMap
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -$id = filter_input(INPUT_GET,'id',FILTER_SANITIZE_STRING); |
|
| 2 | +$id = filter_input(INPUT_GET, 'id', FILTER_SANITIZE_STRING); |
|
| 3 | 3 | if ($id == "") |
| 4 | 4 | { |
| 5 | 5 | header('Location: /'); |
@@ -16,30 +16,30 @@ discard block |
||
| 16 | 16 | |
| 17 | 17 | if (!empty($spotter_array)) |
| 18 | 18 | { |
| 19 | - if(isset($spotter_array[0]['flightaware_id'])) { |
|
| 19 | + if (isset($spotter_array[0]['flightaware_id'])) { |
|
| 20 | 20 | $flightaware_id = $spotter_array[0]['flightaware_id']; |
| 21 | 21 | } |
| 22 | - if(isset($spotter_array[0]['last_latitude']) && $spotter_array[0]['last_latitude'] != '') { |
|
| 22 | + if (isset($spotter_array[0]['last_latitude']) && $spotter_array[0]['last_latitude'] != '') { |
|
| 23 | 23 | $latitude = $spotter_array[0]['last_latitude']; |
| 24 | - } elseif(isset($spotter_array[0]['latitude'])) { |
|
| 24 | + } elseif (isset($spotter_array[0]['latitude'])) { |
|
| 25 | 25 | $latitude = $spotter_array[0]['latitude']; |
| 26 | 26 | } |
| 27 | - if(isset($spotter_array[0]['last_longitude']) && $spotter_array[0]['last_longitude'] != '') { |
|
| 27 | + if (isset($spotter_array[0]['last_longitude']) && $spotter_array[0]['last_longitude'] != '') { |
|
| 28 | 28 | $longitude = $spotter_array[0]['last_longitude']; |
| 29 | - } elseif(isset($spotter_array[0]['longitude'])) { |
|
| 29 | + } elseif (isset($spotter_array[0]['longitude'])) { |
|
| 30 | 30 | $longitude = $spotter_array[0]['longitude']; |
| 31 | 31 | } |
| 32 | 32 | $title = ''; |
| 33 | - if(isset($spotter_array[0]['ident'])) { |
|
| 33 | + if (isset($spotter_array[0]['ident'])) { |
|
| 34 | 34 | $title .= $spotter_array[0]['ident']; |
| 35 | 35 | } |
| 36 | - if(isset($spotter_array[0]['airline_name'])) { |
|
| 36 | + if (isset($spotter_array[0]['airline_name'])) { |
|
| 37 | 37 | $title .= ' - '.$spotter_array[0]['airline_name']; |
| 38 | 38 | } |
| 39 | - if(isset($spotter_array[0]['aircraft_name']) && $spotter_array[0]['aircraft_name'] != 'Not Available') { |
|
| 39 | + if (isset($spotter_array[0]['aircraft_name']) && $spotter_array[0]['aircraft_name'] != 'Not Available') { |
|
| 40 | 40 | $title .= ' - '.$spotter_array[0]['aircraft_name'].' ('.$spotter_array[0]['aircraft_type'].')'; |
| 41 | 41 | } |
| 42 | - if(isset($spotter_array[0]['registration']) && $spotter_array[0]['registration'] != 'NA' && $spotter_array[0]['registration'] != 'N/A') { |
|
| 42 | + if (isset($spotter_array[0]['registration']) && $spotter_array[0]['registration'] != 'NA' && $spotter_array[0]['registration'] != 'N/A') { |
|
| 43 | 43 | $title .= ' - '.$spotter_array[0]['registration']; |
| 44 | 44 | } |
| 45 | 45 | //$facebook_meta_image = $spotter_array[0]['image']; |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | $altitude_data = ''; |
| 60 | 60 | $hour_data = ''; |
| 61 | 61 | $speed_data = ''; |
| 62 | - foreach($all_data as $data) |
|
| 62 | + foreach ($all_data as $data) |
|
| 63 | 63 | { |
| 64 | 64 | $hour_data .= '"'.$data['date'].'",'; |
| 65 | 65 | if (isset($data['real_altitude']) && $data['real_altitude'] != '') { |
@@ -87,8 +87,8 @@ discard block |
||
| 87 | 87 | $speed_data .= $speed.','; |
| 88 | 88 | } |
| 89 | 89 | $hour_data = "['x',".substr($hour_data, 0, -1)."]"; |
| 90 | - $altitude_data = "['altitude',".substr($altitude_data,0,-1)."]"; |
|
| 91 | - $speed_data = "['speed',".substr($speed_data,0,-1)."]"; |
|
| 90 | + $altitude_data = "['altitude',".substr($altitude_data, 0, -1)."]"; |
|
| 91 | + $speed_data = "['speed',".substr($speed_data, 0, -1)."]"; |
|
| 92 | 92 | print 'c3.generate({ |
| 93 | 93 | bindto: "#chart", |
| 94 | 94 | data: { |
@@ -134,16 +134,16 @@ discard block |
||
| 134 | 134 | print '<a href="'.$globalURL.'/airline/'.$spotter_array[0]['airline_icao'].'">'.$spotter_array[0]['airline_name'].'</a> '; |
| 135 | 135 | } |
| 136 | 136 | } |
| 137 | - if(isset($spotter_array[0]['ident'])) { |
|
| 137 | + if (isset($spotter_array[0]['ident'])) { |
|
| 138 | 138 | print $spotter_array[0]['ident']; |
| 139 | 139 | } |
| 140 | - if(isset($spotter_array[0]['airline_name'])) { |
|
| 140 | + if (isset($spotter_array[0]['airline_name'])) { |
|
| 141 | 141 | print ' - '.$spotter_array[0]['airline_name']; |
| 142 | 142 | } |
| 143 | - if(isset($spotter_array[0]['aircraft_name']) && $spotter_array[0]['aircraft_name'] != 'Not Available') { |
|
| 143 | + if (isset($spotter_array[0]['aircraft_name']) && $spotter_array[0]['aircraft_name'] != 'Not Available') { |
|
| 144 | 144 | print ' - '.$spotter_array[0]['aircraft_name'].' ('.$spotter_array[0]['aircraft_type'].')'; |
| 145 | 145 | } |
| 146 | - if(isset($spotter_array[0]['registration']) && $spotter_array[0]['registration'] != 'NA') { |
|
| 146 | + if (isset($spotter_array[0]['registration']) && $spotter_array[0]['registration'] != 'NA') { |
|
| 147 | 147 | print ' - '.$spotter_array[0]['registration']; |
| 148 | 148 | } |
| 149 | 149 | print '</h1>'; |
@@ -297,7 +297,7 @@ discard block |
||
| 297 | 297 | print '</div>'; |
| 298 | 298 | */ |
| 299 | 299 | |
| 300 | - foreach($spotter_array as $spotter_item) |
|
| 300 | + foreach ($spotter_array as $spotter_item) |
|
| 301 | 301 | { |
| 302 | 302 | print '<div class="details">'; |
| 303 | 303 | print '<h3>'._("Flight Information").'</h3>'; |
@@ -397,7 +397,7 @@ discard block |
||
| 397 | 397 | if (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != '') { |
| 398 | 398 | if ($spotter_item['departure_airport_time'] > 2460) { |
| 399 | 399 | print '<div class="time">'; |
| 400 | - print 'at '.date('H:m',$spotter_item['departure_airport_time']); |
|
| 400 | + print 'at '.date('H:m', $spotter_item['departure_airport_time']); |
|
| 401 | 401 | print '</div>'; |
| 402 | 402 | } else { |
| 403 | 403 | print '<div class="time">'; |
@@ -546,19 +546,19 @@ discard block |
||
| 546 | 546 | $departure_airport_info = $Spotter->getAllAirportInfo($spotter_item['departure_airport']); |
| 547 | 547 | if (isset($spotter_item['last_latitude']) && $spotter_item['last_latitude'] != '') { |
| 548 | 548 | if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
| 549 | - print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'nm').' nm'; |
|
| 549 | + print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'nm').' nm'; |
|
| 550 | 550 | } elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) { |
| 551 | - print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'mi').' mi'; |
|
| 551 | + print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'mi').' mi'; |
|
| 552 | 552 | } else { |
| 553 | - print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'km').' km'; |
|
| 553 | + print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'km').' km'; |
|
| 554 | 554 | } |
| 555 | 555 | } else { |
| 556 | 556 | if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
| 557 | - print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'nm').' nm'; |
|
| 557 | + print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'nm').' nm'; |
|
| 558 | 558 | } elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) { |
| 559 | - print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'mi').' mi'; |
|
| 559 | + print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'mi').' mi'; |
|
| 560 | 560 | } else { |
| 561 | - print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'km').' km'; |
|
| 561 | + print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'km').' km'; |
|
| 562 | 562 | } |
| 563 | 563 | } |
| 564 | 564 | print '</div>'; |
@@ -572,19 +572,19 @@ discard block |
||
| 572 | 572 | $arrival_airport_info = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']); |
| 573 | 573 | if (isset($spotter_item['last_latitude']) && $spotter_item['last_latitude'] != '') { |
| 574 | 574 | if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
| 575 | - print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'nm').' nm'; |
|
| 575 | + print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'nm').' nm'; |
|
| 576 | 576 | } elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) { |
| 577 | - print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'mi').' mi'; |
|
| 577 | + print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'mi').' mi'; |
|
| 578 | 578 | } else { |
| 579 | - print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'km').' km'; |
|
| 579 | + print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'km').' km'; |
|
| 580 | 580 | } |
| 581 | 581 | } else { |
| 582 | 582 | if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
| 583 | - print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'nm').' nm'; |
|
| 583 | + print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'nm').' nm'; |
|
| 584 | 584 | } elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) { |
| 585 | - print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'mi').' mi'; |
|
| 585 | + print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'mi').' mi'; |
|
| 586 | 586 | } else { |
| 587 | - print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'km').' km'; |
|
| 587 | + print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'km').' km'; |
|
| 588 | 588 | } |
| 589 | 589 | } |
| 590 | 590 | print '</div>'; |
@@ -603,7 +603,7 @@ discard block |
||
| 603 | 603 | print '<div class="last-flights">'; |
| 604 | 604 | print '<h3>'._("Last 5 Flights of this Aircraft").' ('.$spotter_array[0]['registration'].')</h3>'; |
| 605 | 605 | $hide_th_links = true; |
| 606 | - $spotter_array = $Spotter->getSpotterDataByRegistration($spotter_array[0]['registration'],"0,5", ""); |
|
| 606 | + $spotter_array = $Spotter->getSpotterDataByRegistration($spotter_array[0]['registration'], "0,5", ""); |
|
| 607 | 607 | include('table-output.php'); |
| 608 | 608 | print '<div class="more">'; |
| 609 | 609 | print '<a href="'.$globalURL.'/registration/'.$spotter_array[0]['registration'].'" class="btn btn-default btn" role="button">See all Flights»</a>'; |
@@ -13,62 +13,62 @@ discard block |
||
| 13 | 13 | * @param Array $filter the filter |
| 14 | 14 | * @return Array the SQL part |
| 15 | 15 | */ |
| 16 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 16 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 17 | 17 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 18 | 18 | $filters = array(); |
| 19 | 19 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 20 | 20 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 21 | 21 | $filters = $globalStatsFilters[$globalFilterName]; |
| 22 | 22 | } else { |
| 23 | - $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
|
| 23 | + $filter = array_merge($filter, $globalStatsFilters[$globalFilterName]); |
|
| 24 | 24 | } |
| 25 | 25 | } |
| 26 | 26 | if (isset($filter[0]['source'])) { |
| 27 | - $filters = array_merge($filters,$filter); |
|
| 27 | + $filters = array_merge($filters, $filter); |
|
| 28 | 28 | } |
| 29 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 29 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 30 | 30 | $filter_query_join = ''; |
| 31 | 31 | $filter_query_where = ''; |
| 32 | - foreach($filters as $flt) { |
|
| 32 | + foreach ($filters as $flt) { |
|
| 33 | 33 | if (isset($flt['airlines']) && !empty($flt['airlines'])) { |
| 34 | 34 | if ($flt['airlines'][0] != '') { |
| 35 | 35 | if (isset($flt['source'])) { |
| 36 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 36 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $flt['airlines'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 37 | 37 | } else { |
| 38 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 38 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $flt['airlines'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 39 | 39 | } |
| 40 | 40 | } |
| 41 | 41 | } |
| 42 | 42 | if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) { |
| 43 | 43 | if (isset($flt['source'])) { |
| 44 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 44 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 45 | 45 | } else { |
| 46 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 46 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 47 | 47 | } |
| 48 | 48 | } |
| 49 | 49 | if (isset($flt['idents']) && !empty($flt['idents'])) { |
| 50 | 50 | if (isset($flt['source'])) { |
| 51 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 51 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','", $flt['idents'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 52 | 52 | } else { |
| 53 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 53 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','", $flt['idents'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | 56 | if (isset($flt['registrations']) && !empty($flt['registrations'])) { |
| 57 | 57 | if (isset($flt['source'])) { |
| 58 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 58 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','", $flt['registrations'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 59 | 59 | } else { |
| 60 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 60 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','", $flt['registrations'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 61 | 61 | } |
| 62 | 62 | } |
| 63 | 63 | if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id']) && isset($flt['idents']) && empty($flt['idents']) && isset($flt['registrations']) && empty($flt['registrations'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']) && !isset($flt['idents']) && !isset($flt['registrations']))) { |
| 64 | 64 | if (isset($flt['source'])) { |
| 65 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) saa ON saa.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 65 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_output.format_source IN ('".implode("','", $flt['source'])."')) saa ON saa.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | 68 | } |
| 69 | 69 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 70 | 70 | if ($filter['airlines'][0] != '') { |
| 71 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) saf ON saf.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 71 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) saf ON saf.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 72 | 72 | } |
| 73 | 73 | } |
| 74 | 74 | |
@@ -76,16 +76,16 @@ discard block |
||
| 76 | 76 | $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive_output.flightaware_id "; |
| 77 | 77 | } |
| 78 | 78 | if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) { |
| 79 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 79 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $filter['pilots_id'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 80 | 80 | } |
| 81 | 81 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 82 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 82 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 83 | 83 | } |
| 84 | 84 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 85 | 85 | $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
| 86 | 86 | } |
| 87 | 87 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 88 | - $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 88 | + $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 89 | 89 | } |
| 90 | 90 | if ((isset($filter['year']) && $filter['year'] != '') || (isset($filter['month']) && $filter['month'] != '') || (isset($filter['day']) && $filter['day'] != '')) { |
| 91 | 91 | $filter_query_date = ''; |
@@ -111,41 +111,41 @@ discard block |
||
| 111 | 111 | $filter_query_date .= " AND EXTRACT(DAY FROM spotter_archive_output.date) = '".$filter['day']."'"; |
| 112 | 112 | } |
| 113 | 113 | } |
| 114 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 114 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 115 | 115 | } |
| 116 | 116 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 117 | 117 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
| 118 | 118 | if ($filter_query_where != '') { |
| 119 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
| 119 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
| 120 | 120 | } |
| 121 | 121 | $filter_query = $filter_query_join.$filter_query_where; |
| 122 | 122 | return $filter_query; |
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | // Spotter_archive |
| 126 | - public function addSpotterArchiveData($flightaware_id = '', $ident = '', $registration = '', $airline_name = '', $airline_icao = '', $airline_country = '', $airline_type = '', $aircraft_icao = '', $aircraft_shadow = '', $aircraft_name = '', $aircraft_manufacturer = '', $departure_airport_icao = '', $departure_airport_name = '', $departure_airport_city = '', $departure_airport_country = '', $departure_airport_time = '',$arrival_airport_icao = '', $arrival_airport_name = '', $arrival_airport_city ='', $arrival_airport_country = '', $arrival_airport_time = '', $route_stop = '', $date = '',$latitude = '', $longitude = '', $waypoints = '', $altitude = '', $real_altitude = '',$heading = '', $ground_speed = '', $squawk = '', $ModeS = '', $pilot_id = '', $pilot_name = '',$verticalrate = '',$format_source = '', $source_name = '', $over_country = '') { |
|
| 126 | + public function addSpotterArchiveData($flightaware_id = '', $ident = '', $registration = '', $airline_name = '', $airline_icao = '', $airline_country = '', $airline_type = '', $aircraft_icao = '', $aircraft_shadow = '', $aircraft_name = '', $aircraft_manufacturer = '', $departure_airport_icao = '', $departure_airport_name = '', $departure_airport_city = '', $departure_airport_country = '', $departure_airport_time = '', $arrival_airport_icao = '', $arrival_airport_name = '', $arrival_airport_city = '', $arrival_airport_country = '', $arrival_airport_time = '', $route_stop = '', $date = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $real_altitude = '', $heading = '', $ground_speed = '', $squawk = '', $ModeS = '', $pilot_id = '', $pilot_name = '', $verticalrate = '', $format_source = '', $source_name = '', $over_country = '') { |
|
| 127 | 127 | require_once(dirname(__FILE__).'/class.Spotter.php'); |
| 128 | 128 | if ($over_country == '') { |
| 129 | 129 | $Spotter = new Spotter($this->db); |
| 130 | - $data_country = $Spotter->getCountryFromLatitudeLongitude($latitude,$longitude); |
|
| 130 | + $data_country = $Spotter->getCountryFromLatitudeLongitude($latitude, $longitude); |
|
| 131 | 131 | if (!empty($data_country)) $country = $data_country['iso2']; |
| 132 | 132 | else $country = ''; |
| 133 | 133 | } else $country = $over_country; |
| 134 | - if ($airline_type === NULL) $airline_type =''; |
|
| 134 | + if ($airline_type === NULL) $airline_type = ''; |
|
| 135 | 135 | |
| 136 | 136 | //if ($country == '') echo "\n".'************ UNKNOW COUNTRY ****************'."\n"; |
| 137 | 137 | //else echo "\n".'*/*/*/*/*/*/*/ Country : '.$country.' */*/*/*/*/*/*/*/*/'."\n"; |
| 138 | 138 | |
| 139 | 139 | // Route is not added in spotter_archive |
| 140 | - $query = "INSERT INTO spotter_archive (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, departure_airport_time,arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, arrival_airport_time, route_stop, date,latitude, longitude, waypoints, altitude, heading, ground_speed, squawk, ModeS, pilot_id, pilot_name, verticalrate,format_source,over_country,source_name,real_altitude) |
|
| 140 | + $query = "INSERT INTO spotter_archive (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, departure_airport_time,arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, arrival_airport_time, route_stop, date,latitude, longitude, waypoints, altitude, heading, ground_speed, squawk, ModeS, pilot_id, pilot_name, verticalrate,format_source,over_country,source_name,real_altitude) |
|
| 141 | 141 | VALUES (:flightaware_id, :ident, :registration, :airline_name, :airline_icao, :airline_country, :airline_type, :aircraft_icao, :aircraft_shadow, :aircraft_name, :aircraft_manufacturer, :departure_airport_icao, :departure_airport_name, :departure_airport_city, :departure_airport_country, :departure_airport_time,:arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :arrival_airport_time, :route_stop, :date,:latitude, :longitude, :waypoints, :altitude, :heading, :ground_speed, :squawk, :ModeS, :pilot_id, :pilot_name, :verticalrate, :format_source, :over_country, :source_name,:real_altitude)"; |
| 142 | 142 | |
| 143 | - $query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_shadow' => $aircraft_shadow, ':aircraft_name' => $aircraft_name, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':arrival_airport_time' => $arrival_airport_time, ':route_stop' => $route_stop, ':date' => $date,':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':ground_speed' => $ground_speed, ':squawk' => $squawk, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':over_country' => $country, ':source_name' => $source_name,':real_altitude' => $real_altitude); |
|
| 143 | + $query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_shadow' => $aircraft_shadow, ':aircraft_name' => $aircraft_name, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':arrival_airport_time' => $arrival_airport_time, ':route_stop' => $route_stop, ':date' => $date, ':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':ground_speed' => $ground_speed, ':squawk' => $squawk, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':over_country' => $country, ':source_name' => $source_name, ':real_altitude' => $real_altitude); |
|
| 144 | 144 | try { |
| 145 | 145 | $sth = $this->db->prepare($query); |
| 146 | 146 | $sth->execute($query_values); |
| 147 | 147 | $sth->closeCursor(); |
| 148 | - } catch(PDOException $e) { |
|
| 148 | + } catch (PDOException $e) { |
|
| 149 | 149 | return "error : ".$e->getMessage(); |
| 150 | 150 | } |
| 151 | 151 | return "success"; |
@@ -165,9 +165,9 @@ discard block |
||
| 165 | 165 | |
| 166 | 166 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 167 | 167 | //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
| 168 | - $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 168 | + $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 169 | 169 | |
| 170 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident)); |
|
| 170 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident)); |
|
| 171 | 171 | |
| 172 | 172 | return $spotter_array; |
| 173 | 173 | } |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 187 | 187 | //$query = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id"; |
| 188 | 188 | //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
| 189 | - $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 189 | + $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 190 | 190 | |
| 191 | 191 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 192 | 192 | /* |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | } |
| 200 | 200 | $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC); |
| 201 | 201 | */ |
| 202 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id)); |
|
| 202 | + $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id)); |
|
| 203 | 203 | |
| 204 | 204 | return $spotter_array; |
| 205 | 205 | } |
@@ -214,14 +214,14 @@ discard block |
||
| 214 | 214 | { |
| 215 | 215 | date_default_timezone_set('UTC'); |
| 216 | 216 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 217 | - $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 217 | + $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 218 | 218 | |
| 219 | 219 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 220 | 220 | |
| 221 | 221 | try { |
| 222 | 222 | $sth = $this->db->prepare($query); |
| 223 | 223 | $sth->execute(array(':id' => $id)); |
| 224 | - } catch(PDOException $e) { |
|
| 224 | + } catch (PDOException $e) { |
|
| 225 | 225 | echo $e->getMessage(); |
| 226 | 226 | die; |
| 227 | 227 | } |
@@ -240,14 +240,14 @@ discard block |
||
| 240 | 240 | { |
| 241 | 241 | date_default_timezone_set('UTC'); |
| 242 | 242 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 243 | - $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id"; |
|
| 243 | + $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id"; |
|
| 244 | 244 | |
| 245 | 245 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 246 | 246 | |
| 247 | 247 | try { |
| 248 | 248 | $sth = $this->db->prepare($query); |
| 249 | 249 | $sth->execute(array(':id' => $id)); |
| 250 | - } catch(PDOException $e) { |
|
| 250 | + } catch (PDOException $e) { |
|
| 251 | 251 | echo $e->getMessage(); |
| 252 | 252 | die; |
| 253 | 253 | } |
@@ -269,12 +269,12 @@ discard block |
||
| 269 | 269 | date_default_timezone_set('UTC'); |
| 270 | 270 | |
| 271 | 271 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 272 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 272 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 273 | 273 | |
| 274 | 274 | try { |
| 275 | 275 | $sth = $this->db->prepare($query); |
| 276 | 276 | $sth->execute(array(':ident' => $ident)); |
| 277 | - } catch(PDOException $e) { |
|
| 277 | + } catch (PDOException $e) { |
|
| 278 | 278 | echo $e->getMessage(); |
| 279 | 279 | die; |
| 280 | 280 | } |
@@ -295,12 +295,12 @@ discard block |
||
| 295 | 295 | date_default_timezone_set('UTC'); |
| 296 | 296 | |
| 297 | 297 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 298 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 298 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 299 | 299 | |
| 300 | 300 | try { |
| 301 | 301 | $sth = $this->db->prepare($query); |
| 302 | 302 | $sth->execute(array(':id' => $id)); |
| 303 | - } catch(PDOException $e) { |
|
| 303 | + } catch (PDOException $e) { |
|
| 304 | 304 | echo $e->getMessage(); |
| 305 | 305 | die; |
| 306 | 306 | } |
@@ -321,12 +321,12 @@ discard block |
||
| 321 | 321 | date_default_timezone_set('UTC'); |
| 322 | 322 | |
| 323 | 323 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 324 | - $query = "SELECT spotter_archive.altitude, spotter_archive.real_altitude,spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 324 | + $query = "SELECT spotter_archive.altitude, spotter_archive.real_altitude,spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 325 | 325 | |
| 326 | 326 | try { |
| 327 | 327 | $sth = $this->db->prepare($query); |
| 328 | 328 | $sth->execute(array(':id' => $id)); |
| 329 | - } catch(PDOException $e) { |
|
| 329 | + } catch (PDOException $e) { |
|
| 330 | 330 | echo $e->getMessage(); |
| 331 | 331 | die; |
| 332 | 332 | } |
@@ -348,13 +348,13 @@ discard block |
||
| 348 | 348 | date_default_timezone_set('UTC'); |
| 349 | 349 | |
| 350 | 350 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 351 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 351 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 352 | 352 | // $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident"; |
| 353 | 353 | |
| 354 | 354 | try { |
| 355 | 355 | $sth = $this->db->prepare($query); |
| 356 | 356 | $sth->execute(array(':ident' => $ident)); |
| 357 | - } catch(PDOException $e) { |
|
| 357 | + } catch (PDOException $e) { |
|
| 358 | 358 | echo $e->getMessage(); |
| 359 | 359 | die; |
| 360 | 360 | } |
@@ -371,13 +371,13 @@ discard block |
||
| 371 | 371 | * @return Array the spotter information |
| 372 | 372 | * |
| 373 | 373 | */ |
| 374 | - public function getSpotterArchiveData($ident,$flightaware_id,$date) |
|
| 374 | + public function getSpotterArchiveData($ident, $flightaware_id, $date) |
|
| 375 | 375 | { |
| 376 | 376 | $Spotter = new Spotter($this->db); |
| 377 | 377 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 378 | - $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate"; |
|
| 378 | + $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate"; |
|
| 379 | 379 | |
| 380 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':flightaware_id' => $flightaware_id,':date' => $date.'%')); |
|
| 380 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':flightaware_id' => $flightaware_id, ':date' => $date.'%')); |
|
| 381 | 381 | |
| 382 | 382 | return $spotter_array; |
| 383 | 383 | } |
@@ -393,7 +393,7 @@ discard block |
||
| 393 | 393 | try { |
| 394 | 394 | $sth = $this->db->prepare($query); |
| 395 | 395 | $sth->execute(); |
| 396 | - } catch(PDOException $e) { |
|
| 396 | + } catch (PDOException $e) { |
|
| 397 | 397 | echo $e->getMessage(); |
| 398 | 398 | die; |
| 399 | 399 | } |
@@ -405,24 +405,24 @@ discard block |
||
| 405 | 405 | * @return Array the spotter information |
| 406 | 406 | * |
| 407 | 407 | */ |
| 408 | - public function getMinLiveSpotterData($begindate,$enddate,$filter = array()) |
|
| 408 | + public function getMinLiveSpotterData($begindate, $enddate, $filter = array()) |
|
| 409 | 409 | { |
| 410 | 410 | global $globalDBdriver, $globalLiveInterval; |
| 411 | 411 | date_default_timezone_set('UTC'); |
| 412 | 412 | |
| 413 | 413 | $filter_query = ''; |
| 414 | 414 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 415 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 415 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 416 | 416 | } |
| 417 | 417 | // Use spotter_output also ? |
| 418 | 418 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 419 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 419 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 420 | 420 | } |
| 421 | 421 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 422 | 422 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
| 423 | 423 | } |
| 424 | 424 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 425 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 425 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 426 | 426 | } |
| 427 | 427 | |
| 428 | 428 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -441,14 +441,14 @@ discard block |
||
| 441 | 441 | GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id |
| 442 | 442 | AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao'; |
| 443 | 443 | */ |
| 444 | - $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 444 | + $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 445 | 445 | FROM spotter_archive |
| 446 | 446 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao |
| 447 | 447 | WHERE spotter_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' |
| 448 | 448 | '.$filter_query.' ORDER BY flightaware_id'; |
| 449 | 449 | } else { |
| 450 | 450 | //$query = 'SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao'; |
| 451 | - $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 451 | + $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 452 | 452 | FROM spotter_archive |
| 453 | 453 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao |
| 454 | 454 | WHERE spotter_archive.date >= '."'".$begindate."'".' AND spotter_archive.date <= '."'".$enddate."'".' |
@@ -458,7 +458,7 @@ discard block |
||
| 458 | 458 | try { |
| 459 | 459 | $sth = $this->db->prepare($query); |
| 460 | 460 | $sth->execute(); |
| 461 | - } catch(PDOException $e) { |
|
| 461 | + } catch (PDOException $e) { |
|
| 462 | 462 | echo $e->getMessage(); |
| 463 | 463 | die; |
| 464 | 464 | } |
@@ -473,24 +473,24 @@ discard block |
||
| 473 | 473 | * @return Array the spotter information |
| 474 | 474 | * |
| 475 | 475 | */ |
| 476 | - public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array()) |
|
| 476 | + public function getMinLiveSpotterDataPlayback($begindate, $enddate, $filter = array()) |
|
| 477 | 477 | { |
| 478 | 478 | global $globalDBdriver, $globalLiveInterval; |
| 479 | 479 | date_default_timezone_set('UTC'); |
| 480 | 480 | |
| 481 | 481 | $filter_query = ''; |
| 482 | 482 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 483 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 483 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 484 | 484 | } |
| 485 | 485 | // Should use spotter_output also ? |
| 486 | 486 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 487 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 487 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 488 | 488 | } |
| 489 | 489 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 490 | 490 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
| 491 | 491 | } |
| 492 | 492 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 493 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 493 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 494 | 494 | } |
| 495 | 495 | |
| 496 | 496 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -500,7 +500,7 @@ discard block |
||
| 500 | 500 | FROM spotter_archive |
| 501 | 501 | INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao'; |
| 502 | 502 | */ |
| 503 | - $query = 'SELECT a.aircraft_shadow, spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk |
|
| 503 | + $query = 'SELECT a.aircraft_shadow, spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk |
|
| 504 | 504 | FROM spotter_archive_output |
| 505 | 505 | LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive_output.aircraft_icao = a.icao |
| 506 | 506 | WHERE (spotter_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') |
@@ -515,7 +515,7 @@ discard block |
||
| 515 | 515 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
| 516 | 516 | '.$filter_query.' GROUP BY spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao, spotter_archive_output.arrival_airport_icao, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow'; |
| 517 | 517 | */ |
| 518 | - $query = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
|
| 518 | + $query = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
|
| 519 | 519 | FROM spotter_archive_output |
| 520 | 520 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao |
| 521 | 521 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
@@ -527,7 +527,7 @@ discard block |
||
| 527 | 527 | try { |
| 528 | 528 | $sth = $this->db->prepare($query); |
| 529 | 529 | $sth->execute(); |
| 530 | - } catch(PDOException $e) { |
|
| 530 | + } catch (PDOException $e) { |
|
| 531 | 531 | echo $e->getMessage(); |
| 532 | 532 | die; |
| 533 | 533 | } |
@@ -542,23 +542,23 @@ discard block |
||
| 542 | 542 | * @return Array the spotter information |
| 543 | 543 | * |
| 544 | 544 | */ |
| 545 | - public function getLiveSpotterCount($begindate,$enddate,$filter = array()) |
|
| 545 | + public function getLiveSpotterCount($begindate, $enddate, $filter = array()) |
|
| 546 | 546 | { |
| 547 | 547 | global $globalDBdriver, $globalLiveInterval; |
| 548 | 548 | date_default_timezone_set('UTC'); |
| 549 | 549 | |
| 550 | 550 | $filter_query = ''; |
| 551 | 551 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 552 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 552 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 553 | 553 | } |
| 554 | 554 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 555 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 555 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 556 | 556 | } |
| 557 | 557 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 558 | 558 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
| 559 | 559 | } |
| 560 | 560 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 561 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 561 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 562 | 562 | } |
| 563 | 563 | |
| 564 | 564 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -573,7 +573,7 @@ discard block |
||
| 573 | 573 | try { |
| 574 | 574 | $sth = $this->db->prepare($query); |
| 575 | 575 | $sth->execute(); |
| 576 | - } catch(PDOException $e) { |
|
| 576 | + } catch (PDOException $e) { |
|
| 577 | 577 | echo $e->getMessage(); |
| 578 | 578 | die; |
| 579 | 579 | } |
@@ -593,7 +593,7 @@ discard block |
||
| 593 | 593 | * @return Array the spotter information |
| 594 | 594 | * |
| 595 | 595 | */ |
| 596 | - public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array()) |
|
| 596 | + public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '', $pilot_id = '', $pilot_name = '', $altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '', $filters = array()) |
|
| 597 | 597 | { |
| 598 | 598 | global $globalTimezone, $globalDBdriver; |
| 599 | 599 | require_once(dirname(__FILE__).'/class.Translation.php'); |
@@ -615,7 +615,7 @@ discard block |
||
| 615 | 615 | |
| 616 | 616 | $q_array = explode(" ", $q); |
| 617 | 617 | |
| 618 | - foreach ($q_array as $q_item){ |
|
| 618 | + foreach ($q_array as $q_item) { |
|
| 619 | 619 | $additional_query .= " AND ("; |
| 620 | 620 | $additional_query .= "(spotter_archive_output.spotter_id like '%".$q_item."%') OR "; |
| 621 | 621 | $additional_query .= "(spotter_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
@@ -647,7 +647,7 @@ discard block |
||
| 647 | 647 | |
| 648 | 648 | if ($registration != "") |
| 649 | 649 | { |
| 650 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 650 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 651 | 651 | if (!is_string($registration)) |
| 652 | 652 | { |
| 653 | 653 | return false; |
@@ -658,7 +658,7 @@ discard block |
||
| 658 | 658 | |
| 659 | 659 | if ($aircraft_icao != "") |
| 660 | 660 | { |
| 661 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 661 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 662 | 662 | if (!is_string($aircraft_icao)) |
| 663 | 663 | { |
| 664 | 664 | return false; |
@@ -669,7 +669,7 @@ discard block |
||
| 669 | 669 | |
| 670 | 670 | if ($aircraft_manufacturer != "") |
| 671 | 671 | { |
| 672 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 672 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 673 | 673 | if (!is_string($aircraft_manufacturer)) |
| 674 | 674 | { |
| 675 | 675 | return false; |
@@ -690,7 +690,7 @@ discard block |
||
| 690 | 690 | |
| 691 | 691 | if ($airline_icao != "") |
| 692 | 692 | { |
| 693 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 693 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 694 | 694 | if (!is_string($airline_icao)) |
| 695 | 695 | { |
| 696 | 696 | return false; |
@@ -701,7 +701,7 @@ discard block |
||
| 701 | 701 | |
| 702 | 702 | if ($airline_country != "") |
| 703 | 703 | { |
| 704 | - $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 704 | + $airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING); |
|
| 705 | 705 | if (!is_string($airline_country)) |
| 706 | 706 | { |
| 707 | 707 | return false; |
@@ -712,7 +712,7 @@ discard block |
||
| 712 | 712 | |
| 713 | 713 | if ($airline_type != "") |
| 714 | 714 | { |
| 715 | - $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 715 | + $airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING); |
|
| 716 | 716 | if (!is_string($airline_type)) |
| 717 | 717 | { |
| 718 | 718 | return false; |
@@ -734,7 +734,7 @@ discard block |
||
| 734 | 734 | |
| 735 | 735 | if ($airport != "") |
| 736 | 736 | { |
| 737 | - $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 737 | + $airport = filter_var($airport, FILTER_SANITIZE_STRING); |
|
| 738 | 738 | if (!is_string($airport)) |
| 739 | 739 | { |
| 740 | 740 | return false; |
@@ -745,7 +745,7 @@ discard block |
||
| 745 | 745 | |
| 746 | 746 | if ($airport_country != "") |
| 747 | 747 | { |
| 748 | - $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 748 | + $airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING); |
|
| 749 | 749 | if (!is_string($airport_country)) |
| 750 | 750 | { |
| 751 | 751 | return false; |
@@ -756,7 +756,7 @@ discard block |
||
| 756 | 756 | |
| 757 | 757 | if ($callsign != "") |
| 758 | 758 | { |
| 759 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 759 | + $callsign = filter_var($callsign, FILTER_SANITIZE_STRING); |
|
| 760 | 760 | if (!is_string($callsign)) |
| 761 | 761 | { |
| 762 | 762 | return false; |
@@ -764,7 +764,7 @@ discard block |
||
| 764 | 764 | $translate = $Translation->ident2icao($callsign); |
| 765 | 765 | if ($translate != $callsign) { |
| 766 | 766 | $additional_query .= " AND (spotter_archive_output.ident = :callsign OR spotter_archive_output.ident = :translate)"; |
| 767 | - $query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate)); |
|
| 767 | + $query_values = array_merge($query_values, array(':callsign' => $callsign, ':translate' => $translate)); |
|
| 768 | 768 | } else { |
| 769 | 769 | $additional_query .= " AND (spotter_archive_output.ident = '".$callsign."')"; |
| 770 | 770 | } |
@@ -773,7 +773,7 @@ discard block |
||
| 773 | 773 | |
| 774 | 774 | if ($owner != "") |
| 775 | 775 | { |
| 776 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 776 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 777 | 777 | if (!is_string($owner)) |
| 778 | 778 | { |
| 779 | 779 | return false; |
@@ -784,7 +784,7 @@ discard block |
||
| 784 | 784 | |
| 785 | 785 | if ($pilot_name != "") |
| 786 | 786 | { |
| 787 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 787 | + $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING); |
|
| 788 | 788 | if (!is_string($pilot_name)) |
| 789 | 789 | { |
| 790 | 790 | return false; |
@@ -795,7 +795,7 @@ discard block |
||
| 795 | 795 | |
| 796 | 796 | if ($pilot_id != "") |
| 797 | 797 | { |
| 798 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 798 | + $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT); |
|
| 799 | 799 | if (!is_string($pilot_id)) |
| 800 | 800 | { |
| 801 | 801 | return false; |
@@ -806,7 +806,7 @@ discard block |
||
| 806 | 806 | |
| 807 | 807 | if ($departure_airport_route != "") |
| 808 | 808 | { |
| 809 | - $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 809 | + $departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING); |
|
| 810 | 810 | if (!is_string($departure_airport_route)) |
| 811 | 811 | { |
| 812 | 812 | return false; |
@@ -817,7 +817,7 @@ discard block |
||
| 817 | 817 | |
| 818 | 818 | if ($arrival_airport_route != "") |
| 819 | 819 | { |
| 820 | - $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 820 | + $arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING); |
|
| 821 | 821 | if (!is_string($arrival_airport_route)) |
| 822 | 822 | { |
| 823 | 823 | return false; |
@@ -830,8 +830,8 @@ discard block |
||
| 830 | 830 | { |
| 831 | 831 | $altitude_array = explode(",", $altitude); |
| 832 | 832 | |
| 833 | - $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 834 | - $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 833 | + $altitude_array[0] = filter_var($altitude_array[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 834 | + $altitude_array[1] = filter_var($altitude_array[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 835 | 835 | |
| 836 | 836 | |
| 837 | 837 | if ($altitude_array[1] != "") |
@@ -849,8 +849,8 @@ discard block |
||
| 849 | 849 | { |
| 850 | 850 | $date_array = explode(",", $date_posted); |
| 851 | 851 | |
| 852 | - $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 853 | - $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 852 | + $date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING); |
|
| 853 | + $date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING); |
|
| 854 | 854 | |
| 855 | 855 | if ($globalTimezone != '') { |
| 856 | 856 | date_default_timezone_set($globalTimezone); |
@@ -882,8 +882,8 @@ discard block |
||
| 882 | 882 | { |
| 883 | 883 | $limit_array = explode(",", $limit); |
| 884 | 884 | |
| 885 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 886 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 885 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 886 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 887 | 887 | |
| 888 | 888 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 889 | 889 | { |
@@ -894,8 +894,8 @@ discard block |
||
| 894 | 894 | |
| 895 | 895 | |
| 896 | 896 | if ($origLat != "" && $origLon != "" && $dist != "") { |
| 897 | - $dist = number_format($dist*0.621371,2,'.',''); |
|
| 898 | - $query="SELECT spotter_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
| 897 | + $dist = number_format($dist*0.621371, 2, '.', ''); |
|
| 898 | + $query = "SELECT spotter_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
| 899 | 899 | FROM spotter_archive_output, spotter_archive WHERE spotter_output_archive.flightaware_id = spotter_archive.flightaware_id AND spotter_output.ident <> '' ".$additional_query."AND CAST(spotter_archive.longitude as double precision) between ($origLon-$dist/ABS(cos(radians($origLat))*69)) and ($origLon+$dist/ABS(cos(radians($origLat))*69)) and CAST(spotter_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) |
| 900 | 900 | AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query." ORDER BY distance"; |
| 901 | 901 | } else { |
@@ -912,12 +912,12 @@ discard block |
||
| 912 | 912 | $additional_query .= " AND (spotter_archive_output.waypoints <> '')"; |
| 913 | 913 | } |
| 914 | 914 | |
| 915 | - $query = "SELECT spotter_archive_output.* FROM spotter_archive_output |
|
| 915 | + $query = "SELECT spotter_archive_output.* FROM spotter_archive_output |
|
| 916 | 916 | WHERE spotter_archive_output.ident <> '' |
| 917 | 917 | ".$additional_query." |
| 918 | 918 | ".$filter_query.$orderby_query; |
| 919 | 919 | } |
| 920 | - $spotter_array = $Spotter->getDataFromDB($query, $query_values,$limit_query); |
|
| 920 | + $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
|
| 921 | 921 | |
| 922 | 922 | return $spotter_array; |
| 923 | 923 | } |
@@ -934,7 +934,7 @@ discard block |
||
| 934 | 934 | try { |
| 935 | 935 | $sth = $this->db->prepare($query); |
| 936 | 936 | $sth->execute(); |
| 937 | - } catch(PDOException $e) { |
|
| 937 | + } catch (PDOException $e) { |
|
| 938 | 938 | return "error"; |
| 939 | 939 | } |
| 940 | 940 | } |
@@ -971,8 +971,8 @@ discard block |
||
| 971 | 971 | { |
| 972 | 972 | $limit_array = explode(",", $limit); |
| 973 | 973 | |
| 974 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 975 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 974 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 975 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 976 | 976 | |
| 977 | 977 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 978 | 978 | { |
@@ -1013,7 +1013,7 @@ discard block |
||
| 1013 | 1013 | $query_values = array(); |
| 1014 | 1014 | $limit_query = ''; |
| 1015 | 1015 | $additional_query = ''; |
| 1016 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 1016 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 1017 | 1017 | |
| 1018 | 1018 | if ($owner != "") |
| 1019 | 1019 | { |
@@ -1030,8 +1030,8 @@ discard block |
||
| 1030 | 1030 | { |
| 1031 | 1031 | $limit_array = explode(",", $limit); |
| 1032 | 1032 | |
| 1033 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1034 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1033 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1034 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1035 | 1035 | |
| 1036 | 1036 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1037 | 1037 | { |
@@ -1071,7 +1071,7 @@ discard block |
||
| 1071 | 1071 | $query_values = array(); |
| 1072 | 1072 | $limit_query = ''; |
| 1073 | 1073 | $additional_query = ''; |
| 1074 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 1074 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 1075 | 1075 | |
| 1076 | 1076 | if ($pilot != "") |
| 1077 | 1077 | { |
@@ -1083,8 +1083,8 @@ discard block |
||
| 1083 | 1083 | { |
| 1084 | 1084 | $limit_array = explode(",", $limit); |
| 1085 | 1085 | |
| 1086 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1087 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1086 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1087 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1088 | 1088 | |
| 1089 | 1089 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1090 | 1090 | { |
@@ -1114,7 +1114,7 @@ discard block |
||
| 1114 | 1114 | * @return Array the airline country list |
| 1115 | 1115 | * |
| 1116 | 1116 | */ |
| 1117 | - public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1117 | + public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '') |
|
| 1118 | 1118 | { |
| 1119 | 1119 | global $globalDBdriver; |
| 1120 | 1120 | /* |
@@ -1143,7 +1143,7 @@ discard block |
||
| 1143 | 1143 | $flight_array = array(); |
| 1144 | 1144 | $temp_array = array(); |
| 1145 | 1145 | |
| 1146 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1146 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1147 | 1147 | { |
| 1148 | 1148 | $temp_array['flight_count'] = $row['nb']; |
| 1149 | 1149 | $temp_array['flight_country'] = $row['name']; |
@@ -1160,7 +1160,7 @@ discard block |
||
| 1160 | 1160 | * @return Array the airline country list |
| 1161 | 1161 | * |
| 1162 | 1162 | */ |
| 1163 | - public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1163 | + public function countAllFlightOverCountriesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '') |
|
| 1164 | 1164 | { |
| 1165 | 1165 | global $globalDBdriver; |
| 1166 | 1166 | /* |
@@ -1189,7 +1189,7 @@ discard block |
||
| 1189 | 1189 | $flight_array = array(); |
| 1190 | 1190 | $temp_array = array(); |
| 1191 | 1191 | |
| 1192 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1192 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1193 | 1193 | { |
| 1194 | 1194 | $temp_array['airline_icao'] = $row['airline_icao']; |
| 1195 | 1195 | $temp_array['flight_count'] = $row['nb']; |
@@ -1207,14 +1207,14 @@ discard block |
||
| 1207 | 1207 | * @return Array the spotter information |
| 1208 | 1208 | * |
| 1209 | 1209 | */ |
| 1210 | - public function getDateArchiveSpotterDataById($id,$date) |
|
| 1210 | + public function getDateArchiveSpotterDataById($id, $date) |
|
| 1211 | 1211 | { |
| 1212 | 1212 | $Spotter = new Spotter($this->db); |
| 1213 | 1213 | date_default_timezone_set('UTC'); |
| 1214 | 1214 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 1215 | - $query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC'; |
|
| 1216 | - $date = date('c',$date); |
|
| 1217 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date)); |
|
| 1215 | + $query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC'; |
|
| 1216 | + $date = date('c', $date); |
|
| 1217 | + $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id, ':date' => $date)); |
|
| 1218 | 1218 | return $spotter_array; |
| 1219 | 1219 | } |
| 1220 | 1220 | |
@@ -1224,14 +1224,14 @@ discard block |
||
| 1224 | 1224 | * @return Array the spotter information |
| 1225 | 1225 | * |
| 1226 | 1226 | */ |
| 1227 | - public function getDateArchiveSpotterDataByIdent($ident,$date) |
|
| 1227 | + public function getDateArchiveSpotterDataByIdent($ident, $date) |
|
| 1228 | 1228 | { |
| 1229 | 1229 | $Spotter = new Spotter($this->db); |
| 1230 | 1230 | date_default_timezone_set('UTC'); |
| 1231 | 1231 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 1232 | - $query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC'; |
|
| 1233 | - $date = date('c',$date); |
|
| 1234 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
|
| 1232 | + $query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC'; |
|
| 1233 | + $date = date('c', $date); |
|
| 1234 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':date' => $date)); |
|
| 1235 | 1235 | return $spotter_array; |
| 1236 | 1236 | } |
| 1237 | 1237 | |
@@ -1241,7 +1241,7 @@ discard block |
||
| 1241 | 1241 | * @return Array the spotter information |
| 1242 | 1242 | * |
| 1243 | 1243 | */ |
| 1244 | - public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1244 | + public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '', $filters = array()) |
|
| 1245 | 1245 | { |
| 1246 | 1246 | global $global_query; |
| 1247 | 1247 | $Spotter = new Spotter(); |
@@ -1249,7 +1249,7 @@ discard block |
||
| 1249 | 1249 | $query_values = array(); |
| 1250 | 1250 | $limit_query = ''; |
| 1251 | 1251 | $additional_query = ''; |
| 1252 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1252 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1253 | 1253 | |
| 1254 | 1254 | if ($airport != "") |
| 1255 | 1255 | { |
@@ -1266,8 +1266,8 @@ discard block |
||
| 1266 | 1266 | { |
| 1267 | 1267 | $limit_array = explode(",", $limit); |
| 1268 | 1268 | |
| 1269 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1270 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1269 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1270 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1271 | 1271 | |
| 1272 | 1272 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1273 | 1273 | { |
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | require_once('require/class.Language.php'); |
| 4 | 4 | require_once('require/class.Translation.php'); |
| 5 | 5 | $type = ''; |
| 6 | -$ident = urldecode(filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING)); |
|
| 6 | +$ident = urldecode(filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING)); |
|
| 7 | 7 | if (isset($_GET['marine'])) { |
| 8 | 8 | require_once('require/class.Marine.php'); |
| 9 | 9 | require_once('require/class.MarineLive.php'); |
@@ -30,12 +30,12 @@ discard block |
||
| 30 | 30 | $page_url = $globalURL.'/ident/'.$_GET['ident']; |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | -if (!isset($_GET['ident'])){ |
|
| 33 | +if (!isset($_GET['ident'])) { |
|
| 34 | 34 | header('Location: '.$globalURL.''); |
| 35 | 35 | } else { |
| 36 | 36 | $Translation = new Translation(); |
| 37 | 37 | //calculuation for the pagination |
| 38 | - if(!isset($_GET['limit'])) |
|
| 38 | + if (!isset($_GET['limit'])) |
|
| 39 | 39 | { |
| 40 | 40 | $limit_start = 0; |
| 41 | 41 | $limit_end = 25; |
@@ -54,18 +54,18 @@ discard block |
||
| 54 | 54 | $limit_previous_1 = $limit_start - $absolute_difference; |
| 55 | 55 | $limit_previous_2 = $limit_end - $absolute_difference; |
| 56 | 56 | |
| 57 | - $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
|
| 57 | + $sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING); |
|
| 58 | 58 | if ($type == 'aircraft') { |
| 59 | 59 | if ($sort != '') |
| 60 | 60 | { |
| 61 | - $spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort); |
|
| 61 | + $spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort); |
|
| 62 | 62 | if (empty($spotter_array)) { |
| 63 | - $spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort); |
|
| 63 | + $spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort); |
|
| 64 | 64 | } |
| 65 | 65 | } else { |
| 66 | - $spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference); |
|
| 66 | + $spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference); |
|
| 67 | 67 | if (empty($spotter_array)) { |
| 68 | - $spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference); |
|
| 68 | + $spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference); |
|
| 69 | 69 | } |
| 70 | 70 | } |
| 71 | 71 | if (empty($spotter_array)) { |
@@ -74,14 +74,14 @@ discard block |
||
| 74 | 74 | $ident = $new_ident; |
| 75 | 75 | if ($sort != '') |
| 76 | 76 | { |
| 77 | - $spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort); |
|
| 77 | + $spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort); |
|
| 78 | 78 | if (empty($spotter_array)) { |
| 79 | - $spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort); |
|
| 79 | + $spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort); |
|
| 80 | 80 | } |
| 81 | 81 | } else { |
| 82 | - $spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference); |
|
| 82 | + $spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference); |
|
| 83 | 83 | if (empty($spotter_array)) { |
| 84 | - $spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference); |
|
| 84 | + $spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference); |
|
| 85 | 85 | } |
| 86 | 86 | } |
| 87 | 87 | } |
@@ -89,34 +89,34 @@ discard block |
||
| 89 | 89 | } elseif ($type == 'marine') { |
| 90 | 90 | if ($sort != '') |
| 91 | 91 | { |
| 92 | - $spotter_array = $Marine->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference, $sort); |
|
| 92 | + $spotter_array = $Marine->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference, $sort); |
|
| 93 | 93 | if (empty($spotter_array)) { |
| 94 | - $spotter_array = $MarineArchive->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference, $sort); |
|
| 94 | + $spotter_array = $MarineArchive->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference, $sort); |
|
| 95 | 95 | } |
| 96 | 96 | } else { |
| 97 | - $spotter_array = $Marine->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference); |
|
| 97 | + $spotter_array = $Marine->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference); |
|
| 98 | 98 | if (empty($spotter_array)) { |
| 99 | - $spotter_array = $MarineArchive->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference); |
|
| 99 | + $spotter_array = $MarineArchive->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference); |
|
| 100 | 100 | } |
| 101 | 101 | } |
| 102 | 102 | } elseif ($type == 'tracker') { |
| 103 | 103 | if ($sort != '') |
| 104 | 104 | { |
| 105 | - $spotter_array = $Tracker->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference, $sort); |
|
| 105 | + $spotter_array = $Tracker->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference, $sort); |
|
| 106 | 106 | if (empty($spotter_array)) { |
| 107 | - $spotter_array = $TrackerArchive->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference, $sort); |
|
| 107 | + $spotter_array = $TrackerArchive->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference, $sort); |
|
| 108 | 108 | } |
| 109 | 109 | } else { |
| 110 | - $spotter_array = $Tracker->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference); |
|
| 110 | + $spotter_array = $Tracker->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference); |
|
| 111 | 111 | if (empty($spotter_array)) { |
| 112 | - $spotter_array = $TrackerArchive->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference); |
|
| 112 | + $spotter_array = $TrackerArchive->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference); |
|
| 113 | 113 | } |
| 114 | 114 | } |
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | if (!empty($spotter_array)) |
| 118 | 118 | { |
| 119 | - $title = sprintf(_("Detailed View for %s"),$spotter_array[0]['ident']); |
|
| 119 | + $title = sprintf(_("Detailed View for %s"), $spotter_array[0]['ident']); |
|
| 120 | 120 | $ident = $spotter_array[0]['ident']; |
| 121 | 121 | if (isset($spotter_array[0]['latitude'])) $latitude = $spotter_array[0]['latitude']; |
| 122 | 122 | if (isset($spotter_array[0]['longitude'])) $longitude = $spotter_array[0]['longitude']; |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | $altitude_data = ''; |
| 137 | 137 | $hour_data = ''; |
| 138 | 138 | $speed_data = ''; |
| 139 | - foreach($all_data as $data) |
|
| 139 | + foreach ($all_data as $data) |
|
| 140 | 140 | { |
| 141 | 141 | $hour_data .= '"'.$data['date'].'",'; |
| 142 | 142 | if (isset($data['real_altitude']) && $data['real_altitude'] != '') { |
@@ -164,8 +164,8 @@ discard block |
||
| 164 | 164 | $speed_data .= $speed.','; |
| 165 | 165 | } |
| 166 | 166 | $hour_data = "['x',".substr($hour_data, 0, -1)."]"; |
| 167 | - $altitude_data = "['altitude',".substr($altitude_data,0,-1)."]"; |
|
| 168 | - $speed_data = "['speed',".substr($speed_data,0,-1)."]"; |
|
| 167 | + $altitude_data = "['altitude',".substr($altitude_data, 0, -1)."]"; |
|
| 168 | + $speed_data = "['speed',".substr($speed_data, 0, -1)."]"; |
|
| 169 | 169 | print 'c3.generate({ |
| 170 | 170 | bindto: "#chart", |
| 171 | 171 | data: { |
@@ -209,9 +209,9 @@ discard block |
||
| 209 | 209 | |
| 210 | 210 | if ($type == 'aircraft') include('ident-sub-menu.php'); |
| 211 | 211 | print '<div class="table column">'; |
| 212 | - if ($type == 'aircraft') print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>'; |
|
| 213 | - elseif ($type == 'marine') print '<p>'.sprintf(_("The table below shows the detailed information of all vessels with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>'; |
|
| 214 | - elseif ($type == 'tracker') print '<p>'.sprintf(_("The table below shows the detailed information of all trackers with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>'; |
|
| 212 | + if ($type == 'aircraft') print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the ident/callsign of <strong>%s</strong>."), $spotter_array[0]['ident']).'</p>'; |
|
| 213 | + elseif ($type == 'marine') print '<p>'.sprintf(_("The table below shows the detailed information of all vessels with the ident/callsign of <strong>%s</strong>."), $spotter_array[0]['ident']).'</p>'; |
|
| 214 | + elseif ($type == 'tracker') print '<p>'.sprintf(_("The table below shows the detailed information of all trackers with the ident/callsign of <strong>%s</strong>."), $spotter_array[0]['ident']).'</p>'; |
|
| 215 | 215 | |
| 216 | 216 | include('table-output.php'); |
| 217 | 217 | print '<div class="pagination">'; |
