Ysurac /
FlightAirMap
@@ -8,7 +8,7 @@ |
||
| 8 | 8 | if (!isset($filter_name)) $filter_name = ''; |
| 9 | 9 | $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
| 10 | 10 | if ($airline_icao == '' && isset($globalFilter)) { |
| 11 | - if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
|
| 11 | + if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
|
| 12 | 12 | } |
| 13 | 13 | |
| 14 | 14 | $year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT); |
@@ -5,11 +5,15 @@ |
||
| 5 | 5 | $Stats = new Stats(); |
| 6 | 6 | $title = _("Statistics").' - '._("Most common Aircraft Manufacturer"); |
| 7 | 7 | |
| 8 | -if (!isset($filter_name)) $filter_name = ''; |
|
| 8 | +if (!isset($filter_name)) { |
|
| 9 | + $filter_name = ''; |
|
| 10 | +} |
|
| 9 | 11 | $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
| 10 | 12 | if ($airline_icao == '' && isset($globalFilter)) { |
| 11 | - if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
|
| 12 | -} |
|
| 13 | + if (isset($globalFilter['airline'])) { |
|
| 14 | + $airline_icao = $globalFilter['airline'][0]; |
|
| 15 | + } |
|
| 16 | + } |
|
| 13 | 17 | |
| 14 | 18 | $year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT); |
| 15 | 19 | $month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT); |
@@ -6,13 +6,13 @@ discard block |
||
| 6 | 6 | $title = _("Statistics").' - '._("Most common Aircraft Manufacturer"); |
| 7 | 7 | |
| 8 | 8 | if (!isset($filter_name)) $filter_name = ''; |
| 9 | -$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
|
| 9 | +$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING); |
|
| 10 | 10 | if ($airline_icao == '' && isset($globalFilter)) { |
| 11 | 11 | if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
| 12 | 12 | } |
| 13 | 13 | |
| 14 | -$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT); |
|
| 15 | -$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT); |
|
| 14 | +$year = filter_input(INPUT_GET, 'year', FILTER_SANITIZE_NUMBER_INT); |
|
| 15 | +$month = filter_input(INPUT_GET, 'month', FILTER_SANITIZE_NUMBER_INT); |
|
| 16 | 16 | |
| 17 | 17 | require_once('header.php'); |
| 18 | 18 | include('statistics-sub-menu.php'); |
@@ -24,10 +24,10 @@ discard block |
||
| 24 | 24 | </div> |
| 25 | 25 | <p>'._("Below are the <strong>Top 10</strong> most common aircraft manufacturers.").'</p>'; |
| 26 | 26 | |
| 27 | -$manufacturers_array = $Stats->countAllAircraftManufacturers(true,$airline_icao,$filter_name,$year,$month); |
|
| 27 | +$manufacturers_array = $Stats->countAllAircraftManufacturers(true, $airline_icao, $filter_name, $year, $month); |
|
| 28 | 28 | print '<div id="chart" class="chart" width="100%"></div><script>'; |
| 29 | 29 | $manufacturer_data = ''; |
| 30 | -foreach($manufacturers_array as $manufacturer_item) |
|
| 30 | +foreach ($manufacturers_array as $manufacturer_item) |
|
| 31 | 31 | { |
| 32 | 32 | $manufacturer_data .= '[ "'.$manufacturer_item['aircraft_manufacturer'].'",'.$manufacturer_item['aircraft_manufacturer_count'].'],'; |
| 33 | 33 | } |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | print '</thead>'; |
| 53 | 53 | print '<tbody>'; |
| 54 | 54 | $i = 1; |
| 55 | - foreach($manufacturers_array as $manufacturer_item) |
|
| 55 | + foreach ($manufacturers_array as $manufacturer_item) |
|
| 56 | 56 | { |
| 57 | 57 | print '<tr>'; |
| 58 | 58 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -5,11 +5,15 @@ |
||
| 5 | 5 | $Stats = new Stats(); |
| 6 | 6 | $title = _("Statistics").' - '._("Most common Pilots"); |
| 7 | 7 | |
| 8 | -if (!isset($filter_name)) $filter_name = ''; |
|
| 8 | +if (!isset($filter_name)) { |
|
| 9 | + $filter_name = ''; |
|
| 10 | +} |
|
| 9 | 11 | $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
| 10 | 12 | if ($airline_icao == '' && isset($globalFilter)) { |
| 11 | - if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
|
| 12 | -} |
|
| 13 | + if (isset($globalFilter['airline'])) { |
|
| 14 | + $airline_icao = $globalFilter['airline'][0]; |
|
| 15 | + } |
|
| 16 | + } |
|
| 13 | 17 | setcookie('stats_airline_icao',$airline_icao,time()+60*60*24,'/'); |
| 14 | 18 | $year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT); |
| 15 | 19 | $month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT); |
@@ -8,7 +8,7 @@ |
||
| 8 | 8 | if (!isset($filter_name)) $filter_name = ''; |
| 9 | 9 | $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
| 10 | 10 | if ($airline_icao == '' && isset($globalFilter)) { |
| 11 | - if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
|
| 11 | + if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
|
| 12 | 12 | } |
| 13 | 13 | setcookie('stats_airline_icao',$airline_icao,time()+60*60*24,'/'); |
| 14 | 14 | $year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT); |
@@ -6,13 +6,13 @@ discard block |
||
| 6 | 6 | $title = _("Statistics").' - '._("Most common Pilots"); |
| 7 | 7 | |
| 8 | 8 | if (!isset($filter_name)) $filter_name = ''; |
| 9 | -$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
|
| 9 | +$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING); |
|
| 10 | 10 | if ($airline_icao == '' && isset($globalFilter)) { |
| 11 | 11 | if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
| 12 | 12 | } |
| 13 | -setcookie('stats_airline_icao',$airline_icao,time()+60*60*24,'/'); |
|
| 14 | -$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT); |
|
| 15 | -$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT); |
|
| 13 | +setcookie('stats_airline_icao', $airline_icao, time() + 60*60*24, '/'); |
|
| 14 | +$year = filter_input(INPUT_GET, 'year', FILTER_SANITIZE_NUMBER_INT); |
|
| 15 | +$month = filter_input(INPUT_GET, 'month', FILTER_SANITIZE_NUMBER_INT); |
|
| 16 | 16 | require_once('header.php'); |
| 17 | 17 | include('statistics-sub-menu.php'); |
| 18 | 18 | print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>'; |
@@ -22,10 +22,10 @@ discard block |
||
| 22 | 22 | </div> |
| 23 | 23 | <p>'._("Below are the <strong>Top 10</strong> most common pilot.").'</p>'; |
| 24 | 24 | |
| 25 | -$pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name,$year,$month); |
|
| 25 | +$pilot_array = $Stats->countAllPilots(true, $airline_icao, $filter_name, $year, $month); |
|
| 26 | 26 | print '<div id="chart" class="chart" width="100%"></div><script>'; |
| 27 | 27 | $pilot_data = ''; |
| 28 | -foreach($pilot_array as $pilot_item) |
|
| 28 | +foreach ($pilot_array as $pilot_item) |
|
| 29 | 29 | { |
| 30 | 30 | $pilot_data .= '["'.$pilot_item['pilot_name'].' ('.$pilot_item['pilot_id'].')",'.$pilot_item['pilot_count'].'],'; |
| 31 | 31 | } |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | print '</thead>'; |
| 51 | 51 | print '<tbody>'; |
| 52 | 52 | $i = 1; |
| 53 | - foreach($pilot_array as $pilot_item) |
|
| 53 | + foreach ($pilot_array as $pilot_item) |
|
| 54 | 54 | { |
| 55 | 55 | print '<tr>'; |
| 56 | 56 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -8,7 +8,7 @@ |
||
| 8 | 8 | if (!isset($filter_name)) $filter_name = ''; |
| 9 | 9 | $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
| 10 | 10 | if ($airline_icao == '' && isset($globalFilter)) { |
| 11 | - if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
|
| 11 | + if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
|
| 12 | 12 | } |
| 13 | 13 | |
| 14 | 14 | require_once('header.php'); |
@@ -16,11 +16,15 @@ discard block |
||
| 16 | 16 | $Tracker = new Tracker(); |
| 17 | 17 | } |
| 18 | 18 | |
| 19 | -if (!isset($filter_name)) $filter_name = ''; |
|
| 19 | +if (!isset($filter_name)) { |
|
| 20 | + $filter_name = ''; |
|
| 21 | +} |
|
| 20 | 22 | $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
| 21 | 23 | if ($airline_icao == '' && isset($globalFilter)) { |
| 22 | - if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
|
| 23 | -} |
|
| 24 | + if (isset($globalFilter['airline'])) { |
|
| 25 | + $airline_icao = $globalFilter['airline'][0]; |
|
| 26 | + } |
|
| 27 | + } |
|
| 24 | 28 | |
| 25 | 29 | require_once('header.php'); |
| 26 | 30 | include('statistics-sub-menu.php'); |
@@ -33,9 +37,13 @@ discard block |
||
| 33 | 37 | </div> |
| 34 | 38 | <p>'._("Below is a list of the most common <strong>time of day</strong>.").'</p>'; |
| 35 | 39 | |
| 36 | -if ($type == 'aircraft') $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name); |
|
| 37 | -elseif ($type == 'marine') $hour_array = $Marine->countAllHours('hour',true); |
|
| 38 | -elseif ($type == 'tracker') $hour_array = $Tracker->countAllHours('hour',true); |
|
| 40 | +if ($type == 'aircraft') { |
|
| 41 | + $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name); |
|
| 42 | +} elseif ($type == 'marine') { |
|
| 43 | + $hour_array = $Marine->countAllHours('hour',true); |
|
| 44 | +} elseif ($type == 'tracker') { |
|
| 45 | + $hour_array = $Tracker->countAllHours('hour',true); |
|
| 46 | +} |
|
| 39 | 47 | print '<div id="chartHour" class="chart" width="100%"></div><script>'; |
| 40 | 48 | $hour_data = ''; |
| 41 | 49 | $hour_cnt = ''; |
@@ -53,9 +61,13 @@ discard block |
||
| 53 | 61 | axis: { x: { type: "category", categories: '.$hour_data.'},y: { label: "# of Flights"}},legend: { show: false }});'; |
| 54 | 62 | print '</script>'; |
| 55 | 63 | |
| 56 | -if ($type == 'aircraft') $hour_array = $Stats->countAllHours('count',true,$airline_icao,$filter_name); |
|
| 57 | -elseif ($type == 'marine') $hour_array = $Marine->countAllHours('count',true); |
|
| 58 | -elseif ($type == 'tracker') $hour_array = $Tracker->countAllHours('count',true); |
|
| 64 | +if ($type == 'aircraft') { |
|
| 65 | + $hour_array = $Stats->countAllHours('count',true,$airline_icao,$filter_name); |
|
| 66 | +} elseif ($type == 'marine') { |
|
| 67 | + $hour_array = $Marine->countAllHours('count',true); |
|
| 68 | +} elseif ($type == 'tracker') { |
|
| 69 | + $hour_array = $Tracker->countAllHours('count',true); |
|
| 70 | +} |
|
| 59 | 71 | if (!empty($hour_array)) |
| 60 | 72 | { |
| 61 | 73 | print '<div class="table-responsive">'; |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | if (!isset($filter_name)) $filter_name = ''; |
| 20 | -$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
|
| 20 | +$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING); |
|
| 21 | 21 | if ($airline_icao == '' && isset($globalFilter)) { |
| 22 | 22 | if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
| 23 | 23 | } |
@@ -33,16 +33,16 @@ discard block |
||
| 33 | 33 | </div> |
| 34 | 34 | <p>'._("Below is a list of the most common <strong>time of day</strong>.").'</p>'; |
| 35 | 35 | |
| 36 | -if ($type == 'aircraft') $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name); |
|
| 37 | -elseif ($type == 'marine') $hour_array = $Marine->countAllHours('hour',true); |
|
| 38 | -elseif ($type == 'tracker') $hour_array = $Tracker->countAllHours('hour',true); |
|
| 36 | +if ($type == 'aircraft') $hour_array = $Stats->countAllHours('hour', true, $airline_icao, $filter_name); |
|
| 37 | +elseif ($type == 'marine') $hour_array = $Marine->countAllHours('hour', true); |
|
| 38 | +elseif ($type == 'tracker') $hour_array = $Tracker->countAllHours('hour', true); |
|
| 39 | 39 | print '<div id="chartHour" class="chart" width="100%"></div><script>'; |
| 40 | 40 | $hour_data = ''; |
| 41 | 41 | $hour_cnt = ''; |
| 42 | 42 | $last = 0; |
| 43 | -foreach($hour_array as $hour_item) |
|
| 43 | +foreach ($hour_array as $hour_item) |
|
| 44 | 44 | { |
| 45 | - while($last != $hour_item['hour_name']) { |
|
| 45 | + while ($last != $hour_item['hour_name']) { |
|
| 46 | 46 | $hour_data .= '"'.$last.':00",'; |
| 47 | 47 | $hour_cnt .= '0,'; |
| 48 | 48 | $last++; |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | $hour_cnt .= $hour_item['hour_count'].','; |
| 53 | 53 | } |
| 54 | 54 | $hour_data = "[".substr($hour_data, 0, -1)."]"; |
| 55 | -$hour_cnt = "['flights',".substr($hour_cnt,0,-1)."]"; |
|
| 55 | +$hour_cnt = "['flights',".substr($hour_cnt, 0, -1)."]"; |
|
| 56 | 56 | print 'c3.generate({ |
| 57 | 57 | bindto: "#chartHour", |
| 58 | 58 | data: { |
@@ -60,9 +60,9 @@ discard block |
||
| 60 | 60 | axis: { x: { type: "category", categories: '.$hour_data.'},y: { label: "# of Flights"}},legend: { show: false }});'; |
| 61 | 61 | print '</script>'; |
| 62 | 62 | |
| 63 | -if ($type == 'aircraft') $hour_array = $Stats->countAllHours('count',true,$airline_icao,$filter_name); |
|
| 64 | -elseif ($type == 'marine') $hour_array = $Marine->countAllHours('count',true); |
|
| 65 | -elseif ($type == 'tracker') $hour_array = $Tracker->countAllHours('count',true); |
|
| 63 | +if ($type == 'aircraft') $hour_array = $Stats->countAllHours('count', true, $airline_icao, $filter_name); |
|
| 64 | +elseif ($type == 'marine') $hour_array = $Marine->countAllHours('count', true); |
|
| 65 | +elseif ($type == 'tracker') $hour_array = $Tracker->countAllHours('count', true); |
|
| 66 | 66 | if (!empty($hour_array)) |
| 67 | 67 | { |
| 68 | 68 | print '<div class="table-responsive">'; |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | print '</thead>'; |
| 75 | 75 | print '<tbody>'; |
| 76 | 76 | $i = 1; |
| 77 | - foreach($hour_array as $hour_item) |
|
| 77 | + foreach ($hour_array as $hour_item) |
|
| 78 | 78 | { |
| 79 | 79 | print '<tr>'; |
| 80 | 80 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -8,7 +8,7 @@ |
||
| 8 | 8 | if (!isset($filter_name)) $filter_name = ''; |
| 9 | 9 | $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
| 10 | 10 | if ($airline_icao == '' && isset($globalFilter)) { |
| 11 | - if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
|
| 11 | + if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
|
| 12 | 12 | } |
| 13 | 13 | |
| 14 | 14 | require_once('header.php'); |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | if (!isset($filter_name)) $filter_name = ''; |
| 20 | -$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
|
| 20 | +$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING); |
|
| 21 | 21 | if ($airline_icao == '' && isset($globalFilter)) { |
| 22 | 22 | if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
| 23 | 23 | } |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | </div> |
| 34 | 34 | <p>'._("Below is a chart that plots the busiest day during the <strong>last 7 days</strong>.").'</p>'; |
| 35 | 35 | |
| 36 | -if ($type == 'aircraft') $date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name); |
|
| 36 | +if ($type == 'aircraft') $date_array = $Stats->countAllDatesLast7Days($airline_icao, $filter_name); |
|
| 37 | 37 | elseif ($type == 'marine') $date_array = $Marine->countAllDatesLast7Days(); |
| 38 | 38 | elseif ($type == 'tracker') $date_array = $Tracker->countAllDatesLast7Days(); |
| 39 | 39 | if (count($date_array) == 0) { |
@@ -42,13 +42,13 @@ discard block |
||
| 42 | 42 | print '<div id="chart" class="chart" width="100%"></div><script>'; |
| 43 | 43 | $date_data = ''; |
| 44 | 44 | $date_cnt = ''; |
| 45 | -foreach($date_array as $date_item) |
|
| 45 | +foreach ($date_array as $date_item) |
|
| 46 | 46 | { |
| 47 | 47 | $date_data .= '"'.$date_item['date_name'].'",'; |
| 48 | 48 | $date_cnt .= $date_item['date_count'].','; |
| 49 | 49 | } |
| 50 | 50 | $date_data = "['x',".substr($date_data, 0, -1)."]"; |
| 51 | -$date_cnt = "['flights',".substr($date_cnt,0,-1)."]"; |
|
| 51 | +$date_cnt = "['flights',".substr($date_cnt, 0, -1)."]"; |
|
| 52 | 52 | print 'c3.generate({ |
| 53 | 53 | bindto: "#chart", |
| 54 | 54 | data: { x: "x", |
@@ -57,11 +57,11 @@ discard block |
||
| 57 | 57 | print '</script>'; |
| 58 | 58 | } |
| 59 | 59 | if (isset($globalDBArchiveMonths) && $globalDBArchiveMonths > 0) { |
| 60 | - print '<p>'.sprintf(_("Below are the <strong>Top 10</strong> most busiest dates of last %d month(s)."),$globalDBArchiveMonths).'</p>'; |
|
| 60 | + print '<p>'.sprintf(_("Below are the <strong>Top 10</strong> most busiest dates of last %d month(s)."), $globalDBArchiveMonths).'</p>'; |
|
| 61 | 61 | } else { |
| 62 | 62 | print '<p>'._("Below are the <strong>Top 10</strong> most busiest dates.").'</p>'; |
| 63 | 63 | } |
| 64 | -if ($type == 'aircraft') $date_array = $Stats->countAllDates($airline_icao,$filter_name); |
|
| 64 | +if ($type == 'aircraft') $date_array = $Stats->countAllDates($airline_icao, $filter_name); |
|
| 65 | 65 | elseif ($type == 'marine') $date_array = $Marine->countAllDates(); |
| 66 | 66 | elseif ($type == 'tracker') $date_array = $Tracker->countAllDates(); |
| 67 | 67 | if (!empty($date_array)) |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | print '</thead>'; |
| 76 | 76 | print '<tbody>'; |
| 77 | 77 | $i = 1; |
| 78 | - foreach($date_array as $date_item) |
|
| 78 | + foreach ($date_array as $date_item) |
|
| 79 | 79 | { |
| 80 | 80 | print '<tr>'; |
| 81 | 81 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -16,11 +16,15 @@ discard block |
||
| 16 | 16 | $Tracker = new Tracker(); |
| 17 | 17 | } |
| 18 | 18 | |
| 19 | -if (!isset($filter_name)) $filter_name = ''; |
|
| 19 | +if (!isset($filter_name)) { |
|
| 20 | + $filter_name = ''; |
|
| 21 | +} |
|
| 20 | 22 | $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
| 21 | 23 | if ($airline_icao == '' && isset($globalFilter)) { |
| 22 | - if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
|
| 23 | -} |
|
| 24 | + if (isset($globalFilter['airline'])) { |
|
| 25 | + $airline_icao = $globalFilter['airline'][0]; |
|
| 26 | + } |
|
| 27 | + } |
|
| 24 | 28 | |
| 25 | 29 | require_once('header.php'); |
| 26 | 30 | include('statistics-sub-menu.php'); |
@@ -33,9 +37,13 @@ discard block |
||
| 33 | 37 | </div> |
| 34 | 38 | <p>'._("Below is a chart that plots the busiest day during the <strong>last 7 days</strong>.").'</p>'; |
| 35 | 39 | |
| 36 | -if ($type == 'aircraft') $date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name); |
|
| 37 | -elseif ($type == 'marine') $date_array = $Marine->countAllDatesLast7Days(); |
|
| 38 | -elseif ($type == 'tracker') $date_array = $Tracker->countAllDatesLast7Days(); |
|
| 40 | +if ($type == 'aircraft') { |
|
| 41 | + $date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name); |
|
| 42 | +} elseif ($type == 'marine') { |
|
| 43 | + $date_array = $Marine->countAllDatesLast7Days(); |
|
| 44 | +} elseif ($type == 'tracker') { |
|
| 45 | + $date_array = $Tracker->countAllDatesLast7Days(); |
|
| 46 | +} |
|
| 39 | 47 | if (count($date_array) == 0) { |
| 40 | 48 | print _("No data available"); |
| 41 | 49 | } else { |
@@ -61,9 +69,13 @@ discard block |
||
| 61 | 69 | } else { |
| 62 | 70 | print '<p>'._("Below are the <strong>Top 10</strong> most busiest dates.").'</p>'; |
| 63 | 71 | } |
| 64 | -if ($type == 'aircraft') $date_array = $Stats->countAllDates($airline_icao,$filter_name); |
|
| 65 | -elseif ($type == 'marine') $date_array = $Marine->countAllDates(); |
|
| 66 | -elseif ($type == 'tracker') $date_array = $Tracker->countAllDates(); |
|
| 72 | +if ($type == 'aircraft') { |
|
| 73 | + $date_array = $Stats->countAllDates($airline_icao,$filter_name); |
|
| 74 | +} elseif ($type == 'marine') { |
|
| 75 | + $date_array = $Marine->countAllDates(); |
|
| 76 | +} elseif ($type == 'tracker') { |
|
| 77 | + $date_array = $Tracker->countAllDates(); |
|
| 78 | +} |
|
| 67 | 79 | if (!empty($date_array)) |
| 68 | 80 | { |
| 69 | 81 | print '<div class="table-responsive">'; |
@@ -8,7 +8,7 @@ |
||
| 8 | 8 | if (!isset($filter_name)) $filter_name = ''; |
| 9 | 9 | $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
| 10 | 10 | if ($airline_icao == '' && isset($globalFilter)) { |
| 11 | - if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
|
| 11 | + if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
|
| 12 | 12 | } |
| 13 | 13 | |
| 14 | 14 | require_once('header.php'); |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | |
| 19 | 19 | |
| 20 | 20 | if (!isset($filter_name)) $filter_name = ''; |
| 21 | -$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
|
| 21 | +$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING); |
|
| 22 | 22 | if ($airline_icao == '' && isset($globalFilter)) { |
| 23 | 23 | if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
| 24 | 24 | } |
@@ -33,19 +33,19 @@ discard block |
||
| 33 | 33 | </div> |
| 34 | 34 | <p>'._("Below is a chart that plots the busiest month during the <strong>last year</strong>.").'</p>'; |
| 35 | 35 | |
| 36 | -if ($type == 'aircraft') $date_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name); |
|
| 36 | +if ($type == 'aircraft') $date_array = $Stats->countAllMonthsLastYear(true, $airline_icao, $filter_name); |
|
| 37 | 37 | elseif ($type == 'marine') $date_array = $Marine->countAllMonthsLastYear(true); |
| 38 | 38 | elseif ($type == 'tracker') $date_array = $Tracker->countAllMonthsLastYear(true); |
| 39 | 39 | print '<div id="chart" class="chart" width="100%"></div><script>'; |
| 40 | 40 | $year_data = ''; |
| 41 | 41 | $year_cnt = ''; |
| 42 | -foreach($date_array as $year_item) |
|
| 42 | +foreach ($date_array as $year_item) |
|
| 43 | 43 | { |
| 44 | 44 | $year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",'; |
| 45 | 45 | $year_cnt .= $year_item['date_count'].','; |
| 46 | 46 | } |
| 47 | 47 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 48 | -$year_cnt = "['flights',".substr($year_cnt,0,-1)."]"; |
|
| 48 | +$year_cnt = "['flights',".substr($year_cnt, 0, -1)."]"; |
|
| 49 | 49 | print 'c3.generate({ |
| 50 | 50 | bindto: "#chart", |
| 51 | 51 | data: { x: "x", |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | print '</thead>'; |
| 69 | 69 | print '<tbody>'; |
| 70 | 70 | $i = 1; |
| 71 | - foreach($date_array as $date_item) |
|
| 71 | + foreach ($date_array as $date_item) |
|
| 72 | 72 | { |
| 73 | 73 | print '<tr>'; |
| 74 | 74 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -17,11 +17,15 @@ discard block |
||
| 17 | 17 | $title = _("Statistics").' - '._("Busiest Month of Last Year"); |
| 18 | 18 | |
| 19 | 19 | |
| 20 | -if (!isset($filter_name)) $filter_name = ''; |
|
| 20 | +if (!isset($filter_name)) { |
|
| 21 | + $filter_name = ''; |
|
| 22 | +} |
|
| 21 | 23 | $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
| 22 | 24 | if ($airline_icao == '' && isset($globalFilter)) { |
| 23 | - if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
|
| 24 | -} |
|
| 25 | + if (isset($globalFilter['airline'])) { |
|
| 26 | + $airline_icao = $globalFilter['airline'][0]; |
|
| 27 | + } |
|
| 28 | + } |
|
| 25 | 29 | |
| 26 | 30 | require_once('header.php'); |
| 27 | 31 | include('statistics-sub-menu.php'); |
@@ -33,9 +37,13 @@ discard block |
||
| 33 | 37 | </div> |
| 34 | 38 | <p>'._("Below is a chart that plots the busiest month during the <strong>last year</strong>.").'</p>'; |
| 35 | 39 | |
| 36 | -if ($type == 'aircraft') $date_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name); |
|
| 37 | -elseif ($type == 'marine') $date_array = $Marine->countAllMonthsLastYear(true); |
|
| 38 | -elseif ($type == 'tracker') $date_array = $Tracker->countAllMonthsLastYear(true); |
|
| 40 | +if ($type == 'aircraft') { |
|
| 41 | + $date_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name); |
|
| 42 | +} elseif ($type == 'marine') { |
|
| 43 | + $date_array = $Marine->countAllMonthsLastYear(true); |
|
| 44 | +} elseif ($type == 'tracker') { |
|
| 45 | + $date_array = $Tracker->countAllMonthsLastYear(true); |
|
| 46 | +} |
|
| 39 | 47 | print '<div id="chart" class="chart" width="100%"></div><script>'; |
| 40 | 48 | $year_data = ''; |
| 41 | 49 | $year_cnt = ''; |
@@ -53,9 +61,13 @@ discard block |
||
| 53 | 61 | axis: { x: { type: "timeseries", localtime: false,tick: { format: "%Y-%m"}}, y: { label: "#"}},legend: { show: false }});'; |
| 54 | 62 | print '</script>'; |
| 55 | 63 | |
| 56 | -if ($type == 'aircraft') $date_array = $Stats->countAllMonths($airline_icao); |
|
| 57 | -elseif ($type == 'marine') $date_array = $Marine->countAllMonths(); |
|
| 58 | -elseif ($type == 'tracker') $date_array = $Tracker->countAllMonths(); |
|
| 64 | +if ($type == 'aircraft') { |
|
| 65 | + $date_array = $Stats->countAllMonths($airline_icao); |
|
| 66 | +} elseif ($type == 'marine') { |
|
| 67 | + $date_array = $Marine->countAllMonths(); |
|
| 68 | +} elseif ($type == 'tracker') { |
|
| 69 | + $date_array = $Tracker->countAllMonths(); |
|
| 70 | +} |
|
| 59 | 71 | |
| 60 | 72 | if (!empty($date_array)) |
| 61 | 73 | { |
@@ -14,7 +14,7 @@ |
||
| 14 | 14 | /** |
| 15 | 15 | * Get SQL query part for filter used |
| 16 | 16 | * @param Array $filter the filter |
| 17 | - * @return Array the SQL part |
|
| 17 | + * @return string the SQL part |
|
| 18 | 18 | */ |
| 19 | 19 | public function getFilter($filter = array(),$where = false,$and = false) { |
| 20 | 20 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
@@ -13,10 +13,10 @@ discard block |
||
| 13 | 13 | |
| 14 | 14 | |
| 15 | 15 | /** |
| 16 | - * Get SQL query part for filter used |
|
| 17 | - * @param Array $filter the filter |
|
| 18 | - * @return Array the SQL part |
|
| 19 | - */ |
|
| 16 | + * Get SQL query part for filter used |
|
| 17 | + * @param Array $filter the filter |
|
| 18 | + * @return Array the SQL part |
|
| 19 | + */ |
|
| 20 | 20 | public function getFilter($filter = array(),$where = false,$and = false) { |
| 21 | 21 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 22 | 22 | $filters = array(); |
@@ -129,11 +129,11 @@ discard block |
||
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | /** |
| 132 | - * Gets all the spotter information based on the latest data entry |
|
| 133 | - * |
|
| 134 | - * @return Array the spotter information |
|
| 135 | - * |
|
| 136 | - */ |
|
| 132 | + * Gets all the spotter information based on the latest data entry |
|
| 133 | + * |
|
| 134 | + * @return Array the spotter information |
|
| 135 | + * |
|
| 136 | + */ |
|
| 137 | 137 | public function getLiveSpotterData($limit = '', $sort = '', $filter = array()) |
| 138 | 138 | { |
| 139 | 139 | global $globalDBdriver, $globalLiveInterval; |
@@ -176,11 +176,11 @@ discard block |
||
| 176 | 176 | } |
| 177 | 177 | |
| 178 | 178 | /** |
| 179 | - * Gets Minimal Live Spotter data |
|
| 180 | - * |
|
| 181 | - * @return Array the spotter information |
|
| 182 | - * |
|
| 183 | - */ |
|
| 179 | + * Gets Minimal Live Spotter data |
|
| 180 | + * |
|
| 181 | + * @return Array the spotter information |
|
| 182 | + * |
|
| 183 | + */ |
|
| 184 | 184 | public function getMinLiveSpotterData($filter = array()) |
| 185 | 185 | { |
| 186 | 186 | global $globalDBdriver, $globalLiveInterval, $globalArchive; |
@@ -217,11 +217,11 @@ discard block |
||
| 217 | 217 | } |
| 218 | 218 | |
| 219 | 219 | /** |
| 220 | - * Gets Minimal Live Spotter data since xx seconds |
|
| 221 | - * |
|
| 222 | - * @return Array the spotter information |
|
| 223 | - * |
|
| 224 | - */ |
|
| 220 | + * Gets Minimal Live Spotter data since xx seconds |
|
| 221 | + * |
|
| 222 | + * @return Array the spotter information |
|
| 223 | + * |
|
| 224 | + */ |
|
| 225 | 225 | public function getMinLastLiveSpotterData($coord = array(),$filter = array(), $limit = false) |
| 226 | 226 | { |
| 227 | 227 | global $globalDBdriver, $globalLiveInterval, $globalArchive, $globalMap3DAircraftsLimit; |
@@ -302,11 +302,11 @@ discard block |
||
| 302 | 302 | } |
| 303 | 303 | |
| 304 | 304 | /** |
| 305 | - * Gets number of latest data entry |
|
| 306 | - * |
|
| 307 | - * @return String number of entry |
|
| 308 | - * |
|
| 309 | - */ |
|
| 305 | + * Gets number of latest data entry |
|
| 306 | + * |
|
| 307 | + * @return String number of entry |
|
| 308 | + * |
|
| 309 | + */ |
|
| 310 | 310 | public function getLiveSpotterCount($filter = array()) |
| 311 | 311 | { |
| 312 | 312 | global $globalDBdriver, $globalLiveInterval; |
@@ -333,11 +333,11 @@ discard block |
||
| 333 | 333 | } |
| 334 | 334 | |
| 335 | 335 | /** |
| 336 | - * Gets all the spotter information based on the latest data entry and coord |
|
| 337 | - * |
|
| 338 | - * @return Array the spotter information |
|
| 339 | - * |
|
| 340 | - */ |
|
| 336 | + * Gets all the spotter information based on the latest data entry and coord |
|
| 337 | + * |
|
| 338 | + * @return Array the spotter information |
|
| 339 | + * |
|
| 340 | + */ |
|
| 341 | 341 | public function getLiveSpotterDatabyCoord($coord, $filter = array()) |
| 342 | 342 | { |
| 343 | 343 | global $globalDBdriver, $globalLiveInterval; |
@@ -362,11 +362,11 @@ discard block |
||
| 362 | 362 | } |
| 363 | 363 | |
| 364 | 364 | /** |
| 365 | - * Gets all the spotter information based on the latest data entry and coord |
|
| 366 | - * |
|
| 367 | - * @return Array the spotter information |
|
| 368 | - * |
|
| 369 | - */ |
|
| 365 | + * Gets all the spotter information based on the latest data entry and coord |
|
| 366 | + * |
|
| 367 | + * @return Array the spotter information |
|
| 368 | + * |
|
| 369 | + */ |
|
| 370 | 370 | public function getMinLiveSpotterDatabyCoord($coord, $filter = array()) |
| 371 | 371 | { |
| 372 | 372 | global $globalDBdriver, $globalLiveInterval, $globalArchive; |
@@ -431,11 +431,11 @@ discard block |
||
| 431 | 431 | } |
| 432 | 432 | |
| 433 | 433 | /** |
| 434 | - * Gets all the spotter information based on a user's latitude and longitude |
|
| 435 | - * |
|
| 436 | - * @return Array the spotter information |
|
| 437 | - * |
|
| 438 | - */ |
|
| 434 | + * Gets all the spotter information based on a user's latitude and longitude |
|
| 435 | + * |
|
| 436 | + * @return Array the spotter information |
|
| 437 | + * |
|
| 438 | + */ |
|
| 439 | 439 | public function getLatestSpotterForLayar($lat, $lng, $radius, $interval) |
| 440 | 440 | { |
| 441 | 441 | $Spotter = new Spotter($this->db); |
@@ -445,98 +445,98 @@ discard block |
||
| 445 | 445 | return false; |
| 446 | 446 | } |
| 447 | 447 | } |
| 448 | - if ($lng != '') |
|
| 449 | - { |
|
| 450 | - if (!is_numeric($lng)) |
|
| 451 | - { |
|
| 452 | - return false; |
|
| 453 | - } |
|
| 454 | - } |
|
| 455 | - |
|
| 456 | - if ($radius != '') |
|
| 457 | - { |
|
| 458 | - if (!is_numeric($radius)) |
|
| 459 | - { |
|
| 460 | - return false; |
|
| 461 | - } |
|
| 462 | - } |
|
| 448 | + if ($lng != '') |
|
| 449 | + { |
|
| 450 | + if (!is_numeric($lng)) |
|
| 451 | + { |
|
| 452 | + return false; |
|
| 453 | + } |
|
| 454 | + } |
|
| 455 | + |
|
| 456 | + if ($radius != '') |
|
| 457 | + { |
|
| 458 | + if (!is_numeric($radius)) |
|
| 459 | + { |
|
| 460 | + return false; |
|
| 461 | + } |
|
| 462 | + } |
|
| 463 | 463 | $additional_query = ''; |
| 464 | - if ($interval != '') |
|
| 465 | - { |
|
| 466 | - if (!is_string($interval)) |
|
| 467 | - { |
|
| 468 | - //$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
|
| 469 | - return false; |
|
| 470 | - } else { |
|
| 471 | - if ($interval == '1m') |
|
| 472 | - { |
|
| 473 | - $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
|
| 474 | - } else if ($interval == '15m'){ |
|
| 475 | - $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date '; |
|
| 476 | - } |
|
| 477 | - } |
|
| 478 | - } else { |
|
| 479 | - $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
|
| 480 | - } |
|
| 481 | - |
|
| 482 | - $query = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live |
|
| 464 | + if ($interval != '') |
|
| 465 | + { |
|
| 466 | + if (!is_string($interval)) |
|
| 467 | + { |
|
| 468 | + //$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
|
| 469 | + return false; |
|
| 470 | + } else { |
|
| 471 | + if ($interval == '1m') |
|
| 472 | + { |
|
| 473 | + $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
|
| 474 | + } else if ($interval == '15m'){ |
|
| 475 | + $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date '; |
|
| 476 | + } |
|
| 477 | + } |
|
| 478 | + } else { |
|
| 479 | + $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
|
| 480 | + } |
|
| 481 | + |
|
| 482 | + $query = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live |
|
| 483 | 483 | WHERE spotter_live.latitude <> '' |
| 484 | 484 | AND spotter_live.longitude <> '' |
| 485 | 485 | ".$additional_query." |
| 486 | 486 | HAVING distance < :radius |
| 487 | 487 | ORDER BY distance"; |
| 488 | 488 | |
| 489 | - $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius)); |
|
| 489 | + $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius)); |
|
| 490 | 490 | |
| 491 | - return $spotter_array; |
|
| 492 | - } |
|
| 491 | + return $spotter_array; |
|
| 492 | + } |
|
| 493 | 493 | |
| 494 | 494 | |
| 495 | - /** |
|
| 496 | - * Gets all the spotter information based on a particular callsign |
|
| 497 | - * |
|
| 498 | - * @return Array the spotter information |
|
| 499 | - * |
|
| 500 | - */ |
|
| 495 | + /** |
|
| 496 | + * Gets all the spotter information based on a particular callsign |
|
| 497 | + * |
|
| 498 | + * @return Array the spotter information |
|
| 499 | + * |
|
| 500 | + */ |
|
| 501 | 501 | public function getLastLiveSpotterDataByIdent($ident) |
| 502 | 502 | { |
| 503 | 503 | $Spotter = new Spotter($this->db); |
| 504 | 504 | date_default_timezone_set('UTC'); |
| 505 | 505 | |
| 506 | 506 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 507 | - $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 GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 507 | + $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 GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 508 | 508 | |
| 509 | 509 | $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident),'',true); |
| 510 | 510 | |
| 511 | 511 | return $spotter_array; |
| 512 | 512 | } |
| 513 | 513 | |
| 514 | - /** |
|
| 515 | - * Gets all the spotter information based on a particular callsign |
|
| 516 | - * |
|
| 517 | - * @return Array the spotter information |
|
| 518 | - * |
|
| 519 | - */ |
|
| 514 | + /** |
|
| 515 | + * Gets all the spotter information based on a particular callsign |
|
| 516 | + * |
|
| 517 | + * @return Array the spotter information |
|
| 518 | + * |
|
| 519 | + */ |
|
| 520 | 520 | public function getDateLiveSpotterDataByIdent($ident,$date) |
| 521 | 521 | { |
| 522 | 522 | $Spotter = new Spotter($this->db); |
| 523 | 523 | date_default_timezone_set('UTC'); |
| 524 | 524 | |
| 525 | 525 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 526 | - $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.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 526 | + $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.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 527 | 527 | |
| 528 | - $date = date('c',$date); |
|
| 528 | + $date = date('c',$date); |
|
| 529 | 529 | $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
| 530 | 530 | |
| 531 | 531 | return $spotter_array; |
| 532 | 532 | } |
| 533 | 533 | |
| 534 | - /** |
|
| 535 | - * Gets last spotter information based on a particular callsign |
|
| 536 | - * |
|
| 537 | - * @return Array the spotter information |
|
| 538 | - * |
|
| 539 | - */ |
|
| 534 | + /** |
|
| 535 | + * Gets last spotter information based on a particular callsign |
|
| 536 | + * |
|
| 537 | + * @return Array the spotter information |
|
| 538 | + * |
|
| 539 | + */ |
|
| 540 | 540 | public function getLastLiveSpotterDataById($id) |
| 541 | 541 | { |
| 542 | 542 | $Spotter = new Spotter($this->db); |
@@ -547,12 +547,12 @@ discard block |
||
| 547 | 547 | return $spotter_array; |
| 548 | 548 | } |
| 549 | 549 | |
| 550 | - /** |
|
| 551 | - * Gets last spotter information based on a particular callsign |
|
| 552 | - * |
|
| 553 | - * @return Array the spotter information |
|
| 554 | - * |
|
| 555 | - */ |
|
| 550 | + /** |
|
| 551 | + * Gets last spotter information based on a particular callsign |
|
| 552 | + * |
|
| 553 | + * @return Array the spotter information |
|
| 554 | + * |
|
| 555 | + */ |
|
| 556 | 556 | public function getDateLiveSpotterDataById($id,$date) |
| 557 | 557 | { |
| 558 | 558 | $Spotter = new Spotter($this->db); |
@@ -565,21 +565,21 @@ discard block |
||
| 565 | 565 | return $spotter_array; |
| 566 | 566 | } |
| 567 | 567 | |
| 568 | - /** |
|
| 569 | - * Gets altitude information based on a particular callsign |
|
| 570 | - * |
|
| 571 | - * @return Array the spotter information |
|
| 572 | - * |
|
| 573 | - */ |
|
| 568 | + /** |
|
| 569 | + * Gets altitude information based on a particular callsign |
|
| 570 | + * |
|
| 571 | + * @return Array the spotter information |
|
| 572 | + * |
|
| 573 | + */ |
|
| 574 | 574 | public function getAltitudeLiveSpotterDataByIdent($ident) |
| 575 | 575 | { |
| 576 | 576 | |
| 577 | 577 | date_default_timezone_set('UTC'); |
| 578 | 578 | |
| 579 | 579 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 580 | - $query = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident'; |
|
| 580 | + $query = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident'; |
|
| 581 | 581 | |
| 582 | - try { |
|
| 582 | + try { |
|
| 583 | 583 | |
| 584 | 584 | $sth = $this->db->prepare($query); |
| 585 | 585 | $sth->execute(array(':ident' => $ident)); |
@@ -592,12 +592,12 @@ discard block |
||
| 592 | 592 | return $spotter_array; |
| 593 | 593 | } |
| 594 | 594 | |
| 595 | - /** |
|
| 596 | - * Gets all the spotter information based on a particular id |
|
| 597 | - * |
|
| 598 | - * @return Array the spotter information |
|
| 599 | - * |
|
| 600 | - */ |
|
| 595 | + /** |
|
| 596 | + * Gets all the spotter information based on a particular id |
|
| 597 | + * |
|
| 598 | + * @return Array the spotter information |
|
| 599 | + * |
|
| 600 | + */ |
|
| 601 | 601 | public function getAllLiveSpotterDataById($id,$liveinterval = false) |
| 602 | 602 | { |
| 603 | 603 | global $globalDBdriver, $globalLiveInterval; |
@@ -625,18 +625,18 @@ discard block |
||
| 625 | 625 | return $spotter_array; |
| 626 | 626 | } |
| 627 | 627 | |
| 628 | - /** |
|
| 629 | - * Gets all the spotter information based on a particular ident |
|
| 630 | - * |
|
| 631 | - * @return Array the spotter information |
|
| 632 | - * |
|
| 633 | - */ |
|
| 628 | + /** |
|
| 629 | + * Gets all the spotter information based on a particular ident |
|
| 630 | + * |
|
| 631 | + * @return Array the spotter information |
|
| 632 | + * |
|
| 633 | + */ |
|
| 634 | 634 | public function getAllLiveSpotterDataByIdent($ident) |
| 635 | 635 | { |
| 636 | 636 | date_default_timezone_set('UTC'); |
| 637 | 637 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 638 | 638 | $query = self::$global_query.' WHERE spotter_live.ident = :ident'; |
| 639 | - try { |
|
| 639 | + try { |
|
| 640 | 640 | |
| 641 | 641 | $sth = $this->db->prepare($query); |
| 642 | 642 | $sth->execute(array(':ident' => $ident)); |
@@ -650,23 +650,23 @@ discard block |
||
| 650 | 650 | |
| 651 | 651 | |
| 652 | 652 | /** |
| 653 | - * Deletes all info in the table |
|
| 654 | - * |
|
| 655 | - * @return String success or false |
|
| 656 | - * |
|
| 657 | - */ |
|
| 653 | + * Deletes all info in the table |
|
| 654 | + * |
|
| 655 | + * @return String success or false |
|
| 656 | + * |
|
| 657 | + */ |
|
| 658 | 658 | public function deleteLiveSpotterData() |
| 659 | 659 | { |
| 660 | 660 | global $globalDBdriver; |
| 661 | 661 | if ($globalDBdriver == 'mysql') { |
| 662 | 662 | //$query = "DELETE FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE) >= spotter_live.date"; |
| 663 | 663 | $query = 'DELETE FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 9 HOUR) >= spotter_live.date'; |
| 664 | - //$query = "DELETE FROM spotter_live WHERE spotter_live.id IN (SELECT spotter_live.id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= spotter_live.date)"; |
|
| 664 | + //$query = "DELETE FROM spotter_live WHERE spotter_live.id IN (SELECT spotter_live.id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= spotter_live.date)"; |
|
| 665 | 665 | } else { |
| 666 | 666 | $query = "DELETE FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= spotter_live.date"; |
| 667 | 667 | } |
| 668 | 668 | |
| 669 | - try { |
|
| 669 | + try { |
|
| 670 | 670 | |
| 671 | 671 | $sth = $this->db->prepare($query); |
| 672 | 672 | $sth->execute(); |
@@ -678,18 +678,18 @@ discard block |
||
| 678 | 678 | } |
| 679 | 679 | |
| 680 | 680 | /** |
| 681 | - * Deletes all info in the table for aircraft not seen since 2 HOUR |
|
| 682 | - * |
|
| 683 | - * @return String success or false |
|
| 684 | - * |
|
| 685 | - */ |
|
| 681 | + * Deletes all info in the table for aircraft not seen since 2 HOUR |
|
| 682 | + * |
|
| 683 | + * @return String success or false |
|
| 684 | + * |
|
| 685 | + */ |
|
| 686 | 686 | public function deleteLiveSpotterDataNotUpdated() |
| 687 | 687 | { |
| 688 | 688 | global $globalDBdriver, $globalDebug; |
| 689 | 689 | if ($globalDBdriver == 'mysql') { |
| 690 | 690 | //$query = 'SELECT flightaware_id FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) >= spotter_live.date AND spotter_live.flightaware_id NOT IN (SELECT flightaware_id FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) < spotter_live.date) LIMIT 800 OFFSET 0'; |
| 691 | - $query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 2000 OFFSET 0"; |
|
| 692 | - try { |
|
| 691 | + $query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 2000 OFFSET 0"; |
|
| 692 | + try { |
|
| 693 | 693 | |
| 694 | 694 | $sth = $this->db->prepare($query); |
| 695 | 695 | $sth->execute(); |
@@ -697,8 +697,8 @@ discard block |
||
| 697 | 697 | return "error"; |
| 698 | 698 | } |
| 699 | 699 | $query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN ('; |
| 700 | - $i = 0; |
|
| 701 | - $j =0; |
|
| 700 | + $i = 0; |
|
| 701 | + $j =0; |
|
| 702 | 702 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 703 | 703 | foreach($all as $row) |
| 704 | 704 | { |
@@ -706,20 +706,20 @@ discard block |
||
| 706 | 706 | $j++; |
| 707 | 707 | if ($j == 30) { |
| 708 | 708 | if ($globalDebug) echo "."; |
| 709 | - try { |
|
| 709 | + try { |
|
| 710 | 710 | |
| 711 | 711 | $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
| 712 | 712 | $sth->execute(); |
| 713 | 713 | } catch(PDOException $e) { |
| 714 | 714 | return "error"; |
| 715 | 715 | } |
| 716 | - $query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN ('; |
|
| 717 | - $j = 0; |
|
| 716 | + $query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN ('; |
|
| 717 | + $j = 0; |
|
| 718 | 718 | } |
| 719 | 719 | $query_delete .= "'".$row['flightaware_id']."',"; |
| 720 | 720 | } |
| 721 | 721 | if ($i > 0) { |
| 722 | - try { |
|
| 722 | + try { |
|
| 723 | 723 | |
| 724 | 724 | $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
| 725 | 725 | $sth->execute(); |
@@ -730,9 +730,9 @@ discard block |
||
| 730 | 730 | return "success"; |
| 731 | 731 | } elseif ($globalDBdriver == 'pgsql') { |
| 732 | 732 | //$query = "SELECT flightaware_id FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= spotter_live.date AND spotter_live.flightaware_id NOT IN (SELECT flightaware_id FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' < spotter_live.date) LIMIT 800 OFFSET 0"; |
| 733 | - //$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0"; |
|
| 734 | - $query = "DELETE FROM spotter_live WHERE flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 2000 OFFSET 0)"; |
|
| 735 | - try { |
|
| 733 | + //$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0"; |
|
| 734 | + $query = "DELETE FROM spotter_live WHERE flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 2000 OFFSET 0)"; |
|
| 735 | + try { |
|
| 736 | 736 | |
| 737 | 737 | $sth = $this->db->prepare($query); |
| 738 | 738 | $sth->execute(); |
@@ -776,17 +776,17 @@ discard block |
||
| 776 | 776 | } |
| 777 | 777 | |
| 778 | 778 | /** |
| 779 | - * Deletes all info in the table for an ident |
|
| 780 | - * |
|
| 781 | - * @return String success or false |
|
| 782 | - * |
|
| 783 | - */ |
|
| 779 | + * Deletes all info in the table for an ident |
|
| 780 | + * |
|
| 781 | + * @return String success or false |
|
| 782 | + * |
|
| 783 | + */ |
|
| 784 | 784 | public function deleteLiveSpotterDataByIdent($ident) |
| 785 | 785 | { |
| 786 | 786 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 787 | 787 | $query = 'DELETE FROM spotter_live WHERE ident = :ident'; |
| 788 | 788 | |
| 789 | - try { |
|
| 789 | + try { |
|
| 790 | 790 | |
| 791 | 791 | $sth = $this->db->prepare($query); |
| 792 | 792 | $sth->execute(array(':ident' => $ident)); |
@@ -798,17 +798,17 @@ discard block |
||
| 798 | 798 | } |
| 799 | 799 | |
| 800 | 800 | /** |
| 801 | - * Deletes all info in the table for an id |
|
| 802 | - * |
|
| 803 | - * @return String success or false |
|
| 804 | - * |
|
| 805 | - */ |
|
| 801 | + * Deletes all info in the table for an id |
|
| 802 | + * |
|
| 803 | + * @return String success or false |
|
| 804 | + * |
|
| 805 | + */ |
|
| 806 | 806 | public function deleteLiveSpotterDataById($id) |
| 807 | 807 | { |
| 808 | 808 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 809 | 809 | $query = 'DELETE FROM spotter_live WHERE flightaware_id = :id'; |
| 810 | 810 | |
| 811 | - try { |
|
| 811 | + try { |
|
| 812 | 812 | |
| 813 | 813 | $sth = $this->db->prepare($query); |
| 814 | 814 | $sth->execute(array(':id' => $id)); |
@@ -821,11 +821,11 @@ discard block |
||
| 821 | 821 | |
| 822 | 822 | |
| 823 | 823 | /** |
| 824 | - * Gets the aircraft ident within the last hour |
|
| 825 | - * |
|
| 826 | - * @return String the ident |
|
| 827 | - * |
|
| 828 | - */ |
|
| 824 | + * Gets the aircraft ident within the last hour |
|
| 825 | + * |
|
| 826 | + * @return String the ident |
|
| 827 | + * |
|
| 828 | + */ |
|
| 829 | 829 | public function getIdentFromLastHour($ident) |
| 830 | 830 | { |
| 831 | 831 | global $globalDBdriver, $globalTimezone; |
@@ -851,14 +851,14 @@ discard block |
||
| 851 | 851 | $ident_result = $row['ident']; |
| 852 | 852 | } |
| 853 | 853 | return $ident_result; |
| 854 | - } |
|
| 854 | + } |
|
| 855 | 855 | |
| 856 | 856 | /** |
| 857 | - * Check recent aircraft |
|
| 858 | - * |
|
| 859 | - * @return String the ident |
|
| 860 | - * |
|
| 861 | - */ |
|
| 857 | + * Check recent aircraft |
|
| 858 | + * |
|
| 859 | + * @return String the ident |
|
| 860 | + * |
|
| 861 | + */ |
|
| 862 | 862 | public function checkIdentRecent($ident) |
| 863 | 863 | { |
| 864 | 864 | global $globalDBdriver, $globalTimezone; |
@@ -884,14 +884,14 @@ discard block |
||
| 884 | 884 | $ident_result = $row['flightaware_id']; |
| 885 | 885 | } |
| 886 | 886 | return $ident_result; |
| 887 | - } |
|
| 887 | + } |
|
| 888 | 888 | |
| 889 | 889 | /** |
| 890 | - * Check recent aircraft by id |
|
| 891 | - * |
|
| 892 | - * @return String the ident |
|
| 893 | - * |
|
| 894 | - */ |
|
| 890 | + * Check recent aircraft by id |
|
| 891 | + * |
|
| 892 | + * @return String the ident |
|
| 893 | + * |
|
| 894 | + */ |
|
| 895 | 895 | public function checkIdRecent($id) |
| 896 | 896 | { |
| 897 | 897 | global $globalDBdriver, $globalTimezone; |
@@ -917,14 +917,14 @@ discard block |
||
| 917 | 917 | $ident_result = $row['flightaware_id']; |
| 918 | 918 | } |
| 919 | 919 | return $ident_result; |
| 920 | - } |
|
| 920 | + } |
|
| 921 | 921 | |
| 922 | 922 | /** |
| 923 | - * Check recent aircraft by ModeS |
|
| 924 | - * |
|
| 925 | - * @return String the ModeS |
|
| 926 | - * |
|
| 927 | - */ |
|
| 923 | + * Check recent aircraft by ModeS |
|
| 924 | + * |
|
| 925 | + * @return String the ModeS |
|
| 926 | + * |
|
| 927 | + */ |
|
| 928 | 928 | public function checkModeSRecent($modes) |
| 929 | 929 | { |
| 930 | 930 | global $globalDBdriver, $globalTimezone; |
@@ -951,19 +951,19 @@ discard block |
||
| 951 | 951 | $ident_result = $row['flightaware_id']; |
| 952 | 952 | } |
| 953 | 953 | return $ident_result; |
| 954 | - } |
|
| 954 | + } |
|
| 955 | 955 | |
| 956 | 956 | /** |
| 957 | - * Adds a new spotter data |
|
| 958 | - * |
|
| 959 | - * @param String $flightaware_id the ID from flightaware |
|
| 960 | - * @param String $ident the flight ident |
|
| 961 | - * @param String $aircraft_icao the aircraft type |
|
| 962 | - * @param String $departure_airport_icao the departure airport |
|
| 963 | - * @param String $arrival_airport_icao the arrival airport |
|
| 964 | - * @return String success or false |
|
| 965 | - * |
|
| 966 | - */ |
|
| 957 | + * Adds a new spotter data |
|
| 958 | + * |
|
| 959 | + * @param String $flightaware_id the ID from flightaware |
|
| 960 | + * @param String $ident the flight ident |
|
| 961 | + * @param String $aircraft_icao the aircraft type |
|
| 962 | + * @param String $departure_airport_icao the departure airport |
|
| 963 | + * @param String $arrival_airport_icao the arrival airport |
|
| 964 | + * @return String success or false |
|
| 965 | + * |
|
| 966 | + */ |
|
| 967 | 967 | public function addLiveSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $altitude_real = '',$heading = '', $groundspeed = '', $date = '',$departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $ModeS = '', $putinarchive = false,$registration = '',$pilot_id = '', $pilot_name = '', $verticalrate = '', $noarchive = false, $ground = false,$format_source = '', $source_name = '', $over_country = '') |
| 968 | 968 | { |
| 969 | 969 | global $globalURL, $globalArchive, $globalDebug; |
@@ -1106,10 +1106,10 @@ discard block |
||
| 1106 | 1106 | $arrival_airport_country = ''; |
| 1107 | 1107 | |
| 1108 | 1108 | |
| 1109 | - if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL; |
|
| 1110 | - if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL; |
|
| 1111 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
| 1112 | - if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
| 1109 | + if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL; |
|
| 1110 | + if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL; |
|
| 1111 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
| 1112 | + if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
| 1113 | 1113 | |
| 1114 | 1114 | $query = ''; |
| 1115 | 1115 | if ($globalArchive) { |
@@ -1130,10 +1130,10 @@ discard block |
||
| 1130 | 1130 | return "error : ".$e->getMessage(); |
| 1131 | 1131 | } |
| 1132 | 1132 | if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) { |
| 1133 | - if ($globalDebug) echo '(Add to SBS archive : '; |
|
| 1134 | - $SpotterArchive = new SpotterArchive($this->db); |
|
| 1135 | - $result = $SpotterArchive->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, $altitude_real,$heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country); |
|
| 1136 | - if ($globalDebug) echo $result.')'; |
|
| 1133 | + if ($globalDebug) echo '(Add to SBS archive : '; |
|
| 1134 | + $SpotterArchive = new SpotterArchive($this->db); |
|
| 1135 | + $result = $SpotterArchive->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, $altitude_real,$heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country); |
|
| 1136 | + if ($globalDebug) echo $result.')'; |
|
| 1137 | 1137 | } elseif ($globalDebug && $putinarchive !== true) { |
| 1138 | 1138 | echo '(Not adding to archive)'; |
| 1139 | 1139 | } elseif ($globalDebug && $noarchive === true) { |
@@ -17,62 +17,62 @@ discard block |
||
| 17 | 17 | * @param Array $filter the filter |
| 18 | 18 | * @return Array the SQL part |
| 19 | 19 | */ |
| 20 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 20 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 21 | 21 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 22 | 22 | $filters = array(); |
| 23 | 23 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 24 | 24 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 25 | 25 | $filters = $globalStatsFilters[$globalFilterName]; |
| 26 | 26 | } else { |
| 27 | - $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
|
| 27 | + $filter = array_merge($filter, $globalStatsFilters[$globalFilterName]); |
|
| 28 | 28 | } |
| 29 | 29 | } |
| 30 | 30 | if (isset($filter[0]['source'])) { |
| 31 | - $filters = array_merge($filters,$filter); |
|
| 31 | + $filters = array_merge($filters, $filter); |
|
| 32 | 32 | } |
| 33 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 33 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 34 | 34 | $filter_query_join = ''; |
| 35 | 35 | $filter_query_where = ''; |
| 36 | - foreach($filters as $flt) { |
|
| 36 | + foreach ($filters as $flt) { |
|
| 37 | 37 | if (isset($flt['airlines']) && !empty($flt['airlines'])) { |
| 38 | 38 | if ($flt['airlines'][0] != '') { |
| 39 | 39 | if (isset($flt['source'])) { |
| 40 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$flt['airlines'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) saf ON saf.flightaware_id = spotter_live.flightaware_id"; |
|
| 40 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $flt['airlines'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) saf ON saf.flightaware_id = spotter_live.flightaware_id"; |
|
| 41 | 41 | } else { |
| 42 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$flt['airlines'])."')) saf ON saf.flightaware_id = spotter_live.flightaware_id"; |
|
| 42 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $flt['airlines'])."')) saf ON saf.flightaware_id = spotter_live.flightaware_id"; |
|
| 43 | 43 | } |
| 44 | 44 | } |
| 45 | 45 | } |
| 46 | 46 | if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) { |
| 47 | 47 | if (isset($flt['source'])) { |
| 48 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id"; |
|
| 48 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id"; |
|
| 49 | 49 | } else { |
| 50 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id"; |
|
| 50 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id"; |
|
| 51 | 51 | } |
| 52 | 52 | } |
| 53 | 53 | if (isset($flt['idents']) && !empty($flt['idents'])) { |
| 54 | 54 | if (isset($flt['source'])) { |
| 55 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) spid ON spid.flightaware_id = spotter_live.flightaware_id"; |
|
| 55 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','", $flt['idents'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) spid ON spid.flightaware_id = spotter_live.flightaware_id"; |
|
| 56 | 56 | } else { |
| 57 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','",$flt['idents'])."')) spid ON spid.flightaware_id = spotter_live.flightaware_id"; |
|
| 57 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','", $flt['idents'])."')) spid ON spid.flightaware_id = spotter_live.flightaware_id"; |
|
| 58 | 58 | } |
| 59 | 59 | } |
| 60 | 60 | if (isset($flt['registrations']) && !empty($flt['registrations'])) { |
| 61 | 61 | if (isset($flt['source'])) { |
| 62 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','",$flt['registrations'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) sre ON sre.flightaware_id = spotter_live.flightaware_id"; |
|
| 62 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','", $flt['registrations'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) sre ON sre.flightaware_id = spotter_live.flightaware_id"; |
|
| 63 | 63 | } else { |
| 64 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','",$flt['registrations'])."')) sre ON sre.flightaware_id = spotter_live.flightaware_id"; |
|
| 64 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','", $flt['registrations'])."')) sre ON sre.flightaware_id = spotter_live.flightaware_id"; |
|
| 65 | 65 | } |
| 66 | 66 | } |
| 67 | 67 | if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id']) && isset($flt['idents']) && empty($flt['idents'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']) && !isset($flt['idents']) && !isset($flt['registrations']))) { |
| 68 | 68 | if (isset($flt['source'])) { |
| 69 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) ssf ON ssf.flightaware_id = spotter_live.flightaware_id"; |
|
| 69 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.format_source IN ('".implode("','", $flt['source'])."')) ssf ON ssf.flightaware_id = spotter_live.flightaware_id"; |
|
| 70 | 70 | } |
| 71 | 71 | } |
| 72 | 72 | } |
| 73 | 73 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 74 | 74 | if ($filter['airlines'][0] != '') { |
| 75 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) sai ON sai.flightaware_id = spotter_live.flightaware_id"; |
|
| 75 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) sai ON sai.flightaware_id = spotter_live.flightaware_id"; |
|
| 76 | 76 | } |
| 77 | 77 | } |
| 78 | 78 | if (isset($filter['alliance']) && !empty($filter['alliance'])) { |
@@ -82,10 +82,10 @@ discard block |
||
| 82 | 82 | $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_live.flightaware_id "; |
| 83 | 83 | } |
| 84 | 84 | if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) { |
| 85 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) sp ON sp.flightaware_id = spotter_live.flightaware_id"; |
|
| 85 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $filter['pilots_id'])."')) sp ON sp.flightaware_id = spotter_live.flightaware_id"; |
|
| 86 | 86 | } |
| 87 | 87 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 88 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 88 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 89 | 89 | } |
| 90 | 90 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 91 | 91 | $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
@@ -114,15 +114,15 @@ discard block |
||
| 114 | 114 | $filter_query_date .= " AND EXTRACT(DAY FROM spotter_output.date) = '".$filter['day']."'"; |
| 115 | 115 | } |
| 116 | 116 | } |
| 117 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_live.flightaware_id"; |
|
| 117 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.flightaware_id = spotter_live.flightaware_id"; |
|
| 118 | 118 | } |
| 119 | 119 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 120 | - $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 120 | + $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 121 | 121 | } |
| 122 | 122 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 123 | 123 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
| 124 | 124 | if ($filter_query_where != '') { |
| 125 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
| 125 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
| 126 | 126 | } |
| 127 | 127 | $filter_query = $filter_query_join.$filter_query_where; |
| 128 | 128 | return $filter_query; |
@@ -145,8 +145,8 @@ discard block |
||
| 145 | 145 | if ($limit != '') |
| 146 | 146 | { |
| 147 | 147 | $limit_array = explode(',', $limit); |
| 148 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 149 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 148 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 149 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 150 | 150 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 151 | 151 | { |
| 152 | 152 | $limit_query = ' LIMIT '.$limit_array[1].' OFFSET '.$limit_array[0]; |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | } else { |
| 171 | 171 | $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate".$filter_query.$orderby_query; |
| 172 | 172 | } |
| 173 | - $spotter_array = $Spotter->getDataFromDB($query.$limit_query,array(),'',true); |
|
| 173 | + $spotter_array = $Spotter->getDataFromDB($query.$limit_query, array(), '', true); |
|
| 174 | 174 | |
| 175 | 175 | return $spotter_array; |
| 176 | 176 | } |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | { |
| 186 | 186 | global $globalDBdriver, $globalLiveInterval, $globalArchive; |
| 187 | 187 | date_default_timezone_set('UTC'); |
| 188 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 188 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 189 | 189 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 190 | 190 | if ($globalDBdriver == 'mysql') { |
| 191 | 191 | if (isset($globalArchive) && $globalArchive === TRUE) { |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | try { |
| 209 | 209 | $sth = $this->db->prepare($query); |
| 210 | 210 | $sth->execute(); |
| 211 | - } catch(PDOException $e) { |
|
| 211 | + } catch (PDOException $e) { |
|
| 212 | 212 | echo $e->getMessage(); |
| 213 | 213 | die; |
| 214 | 214 | } |
@@ -222,19 +222,19 @@ discard block |
||
| 222 | 222 | * @return Array the spotter information |
| 223 | 223 | * |
| 224 | 224 | */ |
| 225 | - public function getMinLastLiveSpotterData($coord = array(),$filter = array(), $limit = false) |
|
| 225 | + public function getMinLastLiveSpotterData($coord = array(), $filter = array(), $limit = false) |
|
| 226 | 226 | { |
| 227 | 227 | global $globalDBdriver, $globalLiveInterval, $globalArchive, $globalMap3DAircraftsLimit; |
| 228 | 228 | date_default_timezone_set('UTC'); |
| 229 | 229 | $usecoord = false; |
| 230 | 230 | if (is_array($coord) && !empty($coord)) { |
| 231 | - $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 232 | - $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 233 | - $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 234 | - $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 231 | + $minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 232 | + $minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 233 | + $maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 234 | + $maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 235 | 235 | $usecoord = true; |
| 236 | 236 | } |
| 237 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 237 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 238 | 238 | |
| 239 | 239 | if (!isset($globalLiveInterval) || $globalLiveInterval == '') $globalLiveInterval = '200'; |
| 240 | 240 | if (!isset($globalMap3DAircraftsLimit) || $globalMap3DAircraftsLimit == '') $globalMap3DAircraftsLimit = '300'; |
@@ -295,7 +295,7 @@ discard block |
||
| 295 | 295 | try { |
| 296 | 296 | $sth = $this->db->prepare($query); |
| 297 | 297 | $sth->execute(); |
| 298 | - } catch(PDOException $e) { |
|
| 298 | + } catch (PDOException $e) { |
|
| 299 | 299 | echo $e->getMessage(); |
| 300 | 300 | die; |
| 301 | 301 | } |
@@ -312,7 +312,7 @@ discard block |
||
| 312 | 312 | public function getLiveSpotterCount($filter = array()) |
| 313 | 313 | { |
| 314 | 314 | global $globalDBdriver, $globalLiveInterval; |
| 315 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 315 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 316 | 316 | |
| 317 | 317 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 318 | 318 | if ($globalDBdriver == 'mysql') { |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | try { |
| 326 | 326 | $sth = $this->db->prepare($query); |
| 327 | 327 | $sth->execute(); |
| 328 | - } catch(PDOException $e) { |
|
| 328 | + } catch (PDOException $e) { |
|
| 329 | 329 | echo $e->getMessage(); |
| 330 | 330 | die; |
| 331 | 331 | } |
@@ -348,10 +348,10 @@ discard block |
||
| 348 | 348 | $filter_query = $this->getFilter($filter); |
| 349 | 349 | |
| 350 | 350 | if (is_array($coord)) { |
| 351 | - $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 352 | - $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 353 | - $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 354 | - $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 351 | + $minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 352 | + $minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 353 | + $maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 354 | + $maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 355 | 355 | } else return array(); |
| 356 | 356 | if ($globalDBdriver == 'mysql') { |
| 357 | 357 | $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND spotter_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND spotter_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY spotter_live.flightaware_id'.$filter_query; |
@@ -374,23 +374,23 @@ discard block |
||
| 374 | 374 | global $globalDBdriver, $globalLiveInterval, $globalArchive; |
| 375 | 375 | $Spotter = new Spotter($this->db); |
| 376 | 376 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 377 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 377 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 378 | 378 | |
| 379 | 379 | if (is_array($coord)) { |
| 380 | - $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 381 | - $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 382 | - $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 383 | - $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 380 | + $minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 381 | + $minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 382 | + $maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 383 | + $maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 384 | 384 | } else return array(); |
| 385 | 385 | if ($globalDBdriver == 'mysql') { |
| 386 | 386 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 387 | - $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 387 | + $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 388 | 388 | FROM spotter_live |
| 389 | 389 | '.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= spotter_live.date |
| 390 | 390 | AND spotter_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND spotter_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' |
| 391 | 391 | AND spotter_live.latitude <> 0 AND spotter_live.longitude <> 0'; |
| 392 | 392 | } else { |
| 393 | - $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 393 | + $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 394 | 394 | FROM spotter_live |
| 395 | 395 | INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate |
| 396 | 396 | FROM spotter_live l |
@@ -402,14 +402,14 @@ discard block |
||
| 402 | 402 | } |
| 403 | 403 | } else { |
| 404 | 404 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 405 | - $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 405 | + $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 406 | 406 | FROM spotter_live |
| 407 | 407 | ".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date |
| 408 | 408 | AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." |
| 409 | 409 | AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong." |
| 410 | 410 | AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0'"; |
| 411 | 411 | } else { |
| 412 | - $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 412 | + $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 413 | 413 | FROM spotter_live |
| 414 | 414 | INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate |
| 415 | 415 | FROM spotter_live l |
@@ -424,7 +424,7 @@ discard block |
||
| 424 | 424 | try { |
| 425 | 425 | $sth = $this->db->prepare($query); |
| 426 | 426 | $sth->execute(); |
| 427 | - } catch(PDOException $e) { |
|
| 427 | + } catch (PDOException $e) { |
|
| 428 | 428 | echo $e->getMessage(); |
| 429 | 429 | die; |
| 430 | 430 | } |
@@ -473,7 +473,7 @@ discard block |
||
| 473 | 473 | if ($interval == '1m') |
| 474 | 474 | { |
| 475 | 475 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
| 476 | - } else if ($interval == '15m'){ |
|
| 476 | + } else if ($interval == '15m') { |
|
| 477 | 477 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date '; |
| 478 | 478 | } |
| 479 | 479 | } |
@@ -481,14 +481,14 @@ discard block |
||
| 481 | 481 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
| 482 | 482 | } |
| 483 | 483 | |
| 484 | - $query = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live |
|
| 484 | + $query = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live |
|
| 485 | 485 | WHERE spotter_live.latitude <> '' |
| 486 | 486 | AND spotter_live.longitude <> '' |
| 487 | 487 | ".$additional_query." |
| 488 | 488 | HAVING distance < :radius |
| 489 | 489 | ORDER BY distance"; |
| 490 | 490 | |
| 491 | - $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius)); |
|
| 491 | + $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng, ':radius' => $radius)); |
|
| 492 | 492 | |
| 493 | 493 | return $spotter_array; |
| 494 | 494 | } |
@@ -506,9 +506,9 @@ discard block |
||
| 506 | 506 | date_default_timezone_set('UTC'); |
| 507 | 507 | |
| 508 | 508 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 509 | - $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 GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 509 | + $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 GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 510 | 510 | |
| 511 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident),'',true); |
|
| 511 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident), '', true); |
|
| 512 | 512 | |
| 513 | 513 | return $spotter_array; |
| 514 | 514 | } |
@@ -519,16 +519,16 @@ discard block |
||
| 519 | 519 | * @return Array the spotter information |
| 520 | 520 | * |
| 521 | 521 | */ |
| 522 | - public function getDateLiveSpotterDataByIdent($ident,$date) |
|
| 522 | + public function getDateLiveSpotterDataByIdent($ident, $date) |
|
| 523 | 523 | { |
| 524 | 524 | $Spotter = new Spotter($this->db); |
| 525 | 525 | date_default_timezone_set('UTC'); |
| 526 | 526 | |
| 527 | 527 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 528 | - $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.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 528 | + $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.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 529 | 529 | |
| 530 | - $date = date('c',$date); |
|
| 531 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
|
| 530 | + $date = date('c', $date); |
|
| 531 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':date' => $date)); |
|
| 532 | 532 | |
| 533 | 533 | return $spotter_array; |
| 534 | 534 | } |
@@ -544,8 +544,8 @@ discard block |
||
| 544 | 544 | $Spotter = new Spotter($this->db); |
| 545 | 545 | date_default_timezone_set('UTC'); |
| 546 | 546 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 547 | - $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 548 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id),'',true); |
|
| 547 | + $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 548 | + $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id), '', true); |
|
| 549 | 549 | return $spotter_array; |
| 550 | 550 | } |
| 551 | 551 | |
@@ -555,15 +555,15 @@ discard block |
||
| 555 | 555 | * @return Array the spotter information |
| 556 | 556 | * |
| 557 | 557 | */ |
| 558 | - public function getDateLiveSpotterDataById($id,$date) |
|
| 558 | + public function getDateLiveSpotterDataById($id, $date) |
|
| 559 | 559 | { |
| 560 | 560 | $Spotter = new Spotter($this->db); |
| 561 | 561 | date_default_timezone_set('UTC'); |
| 562 | 562 | |
| 563 | 563 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 564 | - $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 565 | - $date = date('c',$date); |
|
| 566 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true); |
|
| 564 | + $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 565 | + $date = date('c', $date); |
|
| 566 | + $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id, ':date' => $date), '', true); |
|
| 567 | 567 | return $spotter_array; |
| 568 | 568 | } |
| 569 | 569 | |
@@ -579,13 +579,13 @@ discard block |
||
| 579 | 579 | date_default_timezone_set('UTC'); |
| 580 | 580 | |
| 581 | 581 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 582 | - $query = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident'; |
|
| 582 | + $query = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident'; |
|
| 583 | 583 | |
| 584 | 584 | try { |
| 585 | 585 | |
| 586 | 586 | $sth = $this->db->prepare($query); |
| 587 | 587 | $sth->execute(array(':ident' => $ident)); |
| 588 | - } catch(PDOException $e) { |
|
| 588 | + } catch (PDOException $e) { |
|
| 589 | 589 | echo $e->getMessage(); |
| 590 | 590 | die; |
| 591 | 591 | } |
@@ -600,7 +600,7 @@ discard block |
||
| 600 | 600 | * @return Array the spotter information |
| 601 | 601 | * |
| 602 | 602 | */ |
| 603 | - public function getAllLiveSpotterDataById($id,$liveinterval = false) |
|
| 603 | + public function getAllLiveSpotterDataById($id, $liveinterval = false) |
|
| 604 | 604 | { |
| 605 | 605 | global $globalDBdriver, $globalLiveInterval; |
| 606 | 606 | date_default_timezone_set('UTC'); |
@@ -619,7 +619,7 @@ discard block |
||
| 619 | 619 | try { |
| 620 | 620 | $sth = $this->db->prepare($query); |
| 621 | 621 | $sth->execute(array(':id' => $id)); |
| 622 | - } catch(PDOException $e) { |
|
| 622 | + } catch (PDOException $e) { |
|
| 623 | 623 | echo $e->getMessage(); |
| 624 | 624 | die; |
| 625 | 625 | } |
@@ -637,12 +637,12 @@ discard block |
||
| 637 | 637 | { |
| 638 | 638 | date_default_timezone_set('UTC'); |
| 639 | 639 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 640 | - $query = self::$global_query.' WHERE spotter_live.ident = :ident'; |
|
| 640 | + $query = self::$global_query.' WHERE spotter_live.ident = :ident'; |
|
| 641 | 641 | try { |
| 642 | 642 | |
| 643 | 643 | $sth = $this->db->prepare($query); |
| 644 | 644 | $sth->execute(array(':ident' => $ident)); |
| 645 | - } catch(PDOException $e) { |
|
| 645 | + } catch (PDOException $e) { |
|
| 646 | 646 | echo $e->getMessage(); |
| 647 | 647 | die; |
| 648 | 648 | } |
@@ -672,7 +672,7 @@ discard block |
||
| 672 | 672 | |
| 673 | 673 | $sth = $this->db->prepare($query); |
| 674 | 674 | $sth->execute(); |
| 675 | - } catch(PDOException $e) { |
|
| 675 | + } catch (PDOException $e) { |
|
| 676 | 676 | return "error"; |
| 677 | 677 | } |
| 678 | 678 | |
@@ -695,14 +695,14 @@ discard block |
||
| 695 | 695 | |
| 696 | 696 | $sth = $this->db->prepare($query); |
| 697 | 697 | $sth->execute(); |
| 698 | - } catch(PDOException $e) { |
|
| 698 | + } catch (PDOException $e) { |
|
| 699 | 699 | return "error"; |
| 700 | 700 | } |
| 701 | 701 | $query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN ('; |
| 702 | 702 | $i = 0; |
| 703 | - $j =0; |
|
| 703 | + $j = 0; |
|
| 704 | 704 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 705 | - foreach($all as $row) |
|
| 705 | + foreach ($all as $row) |
|
| 706 | 706 | { |
| 707 | 707 | $i++; |
| 708 | 708 | $j++; |
@@ -710,9 +710,9 @@ discard block |
||
| 710 | 710 | if ($globalDebug) echo "."; |
| 711 | 711 | try { |
| 712 | 712 | |
| 713 | - $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
|
| 713 | + $sth = $this->db->prepare(substr($query_delete, 0, -1).")"); |
|
| 714 | 714 | $sth->execute(); |
| 715 | - } catch(PDOException $e) { |
|
| 715 | + } catch (PDOException $e) { |
|
| 716 | 716 | return "error"; |
| 717 | 717 | } |
| 718 | 718 | $query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN ('; |
@@ -723,9 +723,9 @@ discard block |
||
| 723 | 723 | if ($i > 0) { |
| 724 | 724 | try { |
| 725 | 725 | |
| 726 | - $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
|
| 726 | + $sth = $this->db->prepare(substr($query_delete, 0, -1).")"); |
|
| 727 | 727 | $sth->execute(); |
| 728 | - } catch(PDOException $e) { |
|
| 728 | + } catch (PDOException $e) { |
|
| 729 | 729 | return "error"; |
| 730 | 730 | } |
| 731 | 731 | } |
@@ -738,7 +738,7 @@ discard block |
||
| 738 | 738 | |
| 739 | 739 | $sth = $this->db->prepare($query); |
| 740 | 740 | $sth->execute(); |
| 741 | - } catch(PDOException $e) { |
|
| 741 | + } catch (PDOException $e) { |
|
| 742 | 742 | return "error"; |
| 743 | 743 | } |
| 744 | 744 | /* $query_delete = "DELETE FROM spotter_live WHERE flightaware_id IN ("; |
@@ -786,13 +786,13 @@ discard block |
||
| 786 | 786 | public function deleteLiveSpotterDataByIdent($ident) |
| 787 | 787 | { |
| 788 | 788 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 789 | - $query = 'DELETE FROM spotter_live WHERE ident = :ident'; |
|
| 789 | + $query = 'DELETE FROM spotter_live WHERE ident = :ident'; |
|
| 790 | 790 | |
| 791 | 791 | try { |
| 792 | 792 | |
| 793 | 793 | $sth = $this->db->prepare($query); |
| 794 | 794 | $sth->execute(array(':ident' => $ident)); |
| 795 | - } catch(PDOException $e) { |
|
| 795 | + } catch (PDOException $e) { |
|
| 796 | 796 | return "error"; |
| 797 | 797 | } |
| 798 | 798 | |
@@ -808,13 +808,13 @@ discard block |
||
| 808 | 808 | public function deleteLiveSpotterDataById($id) |
| 809 | 809 | { |
| 810 | 810 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 811 | - $query = 'DELETE FROM spotter_live WHERE flightaware_id = :id'; |
|
| 811 | + $query = 'DELETE FROM spotter_live WHERE flightaware_id = :id'; |
|
| 812 | 812 | |
| 813 | 813 | try { |
| 814 | 814 | |
| 815 | 815 | $sth = $this->db->prepare($query); |
| 816 | 816 | $sth->execute(array(':id' => $id)); |
| 817 | - } catch(PDOException $e) { |
|
| 817 | + } catch (PDOException $e) { |
|
| 818 | 818 | return "error"; |
| 819 | 819 | } |
| 820 | 820 | |
@@ -832,13 +832,13 @@ discard block |
||
| 832 | 832 | { |
| 833 | 833 | global $globalDBdriver, $globalTimezone; |
| 834 | 834 | if ($globalDBdriver == 'mysql') { |
| 835 | - $query = 'SELECT spotter_live.ident FROM spotter_live |
|
| 835 | + $query = 'SELECT spotter_live.ident FROM spotter_live |
|
| 836 | 836 | WHERE spotter_live.ident = :ident |
| 837 | 837 | AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) |
| 838 | 838 | AND spotter_live.date < UTC_TIMESTAMP()'; |
| 839 | 839 | $query_data = array(':ident' => $ident); |
| 840 | 840 | } else { |
| 841 | - $query = "SELECT spotter_live.ident FROM spotter_live |
|
| 841 | + $query = "SELECT spotter_live.ident FROM spotter_live |
|
| 842 | 842 | WHERE spotter_live.ident = :ident |
| 843 | 843 | AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS' |
| 844 | 844 | AND spotter_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -847,8 +847,8 @@ discard block |
||
| 847 | 847 | |
| 848 | 848 | $sth = $this->db->prepare($query); |
| 849 | 849 | $sth->execute($query_data); |
| 850 | - $ident_result=''; |
|
| 851 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 850 | + $ident_result = ''; |
|
| 851 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 852 | 852 | { |
| 853 | 853 | $ident_result = $row['ident']; |
| 854 | 854 | } |
@@ -865,13 +865,13 @@ discard block |
||
| 865 | 865 | { |
| 866 | 866 | global $globalDBdriver, $globalTimezone; |
| 867 | 867 | if ($globalDBdriver == 'mysql') { |
| 868 | - $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 868 | + $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 869 | 869 | WHERE spotter_live.ident = :ident |
| 870 | 870 | AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE)'; |
| 871 | 871 | // AND spotter_live.date < UTC_TIMESTAMP()"; |
| 872 | 872 | $query_data = array(':ident' => $ident); |
| 873 | 873 | } else { |
| 874 | - $query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 874 | + $query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 875 | 875 | WHERE spotter_live.ident = :ident |
| 876 | 876 | AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '30 MINUTES'"; |
| 877 | 877 | // AND spotter_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -880,8 +880,8 @@ discard block |
||
| 880 | 880 | |
| 881 | 881 | $sth = $this->db->prepare($query); |
| 882 | 882 | $sth->execute($query_data); |
| 883 | - $ident_result=''; |
|
| 884 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 883 | + $ident_result = ''; |
|
| 884 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 885 | 885 | { |
| 886 | 886 | $ident_result = $row['flightaware_id']; |
| 887 | 887 | } |
@@ -898,13 +898,13 @@ discard block |
||
| 898 | 898 | { |
| 899 | 899 | global $globalDBdriver, $globalTimezone; |
| 900 | 900 | if ($globalDBdriver == 'mysql') { |
| 901 | - $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 901 | + $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 902 | 902 | WHERE spotter_live.flightaware_id = :id |
| 903 | 903 | AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 10 HOUR)'; |
| 904 | 904 | // AND spotter_live.date < UTC_TIMESTAMP()"; |
| 905 | 905 | $query_data = array(':id' => $id); |
| 906 | 906 | } else { |
| 907 | - $query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 907 | + $query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 908 | 908 | WHERE spotter_live.flightaware_id = :id |
| 909 | 909 | AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '10 HOUR'"; |
| 910 | 910 | // AND spotter_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -913,8 +913,8 @@ discard block |
||
| 913 | 913 | |
| 914 | 914 | $sth = $this->db->prepare($query); |
| 915 | 915 | $sth->execute($query_data); |
| 916 | - $ident_result=''; |
|
| 917 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 916 | + $ident_result = ''; |
|
| 917 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 918 | 918 | { |
| 919 | 919 | $ident_result = $row['flightaware_id']; |
| 920 | 920 | } |
@@ -931,13 +931,13 @@ discard block |
||
| 931 | 931 | { |
| 932 | 932 | global $globalDBdriver, $globalTimezone; |
| 933 | 933 | if ($globalDBdriver == 'mysql') { |
| 934 | - $query = 'SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live |
|
| 934 | + $query = 'SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live |
|
| 935 | 935 | WHERE spotter_live.ModeS = :modes |
| 936 | 936 | AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE)'; |
| 937 | 937 | // AND spotter_live.date < UTC_TIMESTAMP()"; |
| 938 | 938 | $query_data = array(':modes' => $modes); |
| 939 | 939 | } else { |
| 940 | - $query = "SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live |
|
| 940 | + $query = "SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live |
|
| 941 | 941 | WHERE spotter_live.ModeS = :modes |
| 942 | 942 | AND spotter_live.date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '30 MINUTE'"; |
| 943 | 943 | // // AND spotter_live.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'"; |
@@ -946,8 +946,8 @@ discard block |
||
| 946 | 946 | |
| 947 | 947 | $sth = $this->db->prepare($query); |
| 948 | 948 | $sth->execute($query_data); |
| 949 | - $ident_result=''; |
|
| 950 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 949 | + $ident_result = ''; |
|
| 950 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 951 | 951 | { |
| 952 | 952 | //$ident_result = $row['spotter_live_id']; |
| 953 | 953 | $ident_result = $row['flightaware_id']; |
@@ -966,7 +966,7 @@ discard block |
||
| 966 | 966 | * @return String success or false |
| 967 | 967 | * |
| 968 | 968 | */ |
| 969 | - public function addLiveSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $altitude_real = '',$heading = '', $groundspeed = '', $date = '',$departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $ModeS = '', $putinarchive = false,$registration = '',$pilot_id = '', $pilot_name = '', $verticalrate = '', $noarchive = false, $ground = false,$format_source = '', $source_name = '', $over_country = '') |
|
| 969 | + public function addLiveSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $altitude_real = '', $heading = '', $groundspeed = '', $date = '', $departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $ModeS = '', $putinarchive = false, $registration = '', $pilot_id = '', $pilot_name = '', $verticalrate = '', $noarchive = false, $ground = false, $format_source = '', $source_name = '', $over_country = '') |
|
| 970 | 970 | { |
| 971 | 971 | global $globalURL, $globalArchive, $globalDebug; |
| 972 | 972 | $Common = new Common(); |
@@ -1066,27 +1066,27 @@ discard block |
||
| 1066 | 1066 | if ($date == '') $date = date("Y-m-d H:i:s", time()); |
| 1067 | 1067 | |
| 1068 | 1068 | |
| 1069 | - $flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING); |
|
| 1070 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 1071 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 1072 | - $departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING); |
|
| 1073 | - $arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING); |
|
| 1074 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1075 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1076 | - $waypoints = filter_var($waypoints,FILTER_SANITIZE_STRING); |
|
| 1077 | - $altitude = filter_var($altitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1078 | - $altitude_real = filter_var($altitude_real,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1079 | - $heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT); |
|
| 1080 | - $groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1081 | - $squawk = filter_var($squawk,FILTER_SANITIZE_NUMBER_INT); |
|
| 1082 | - $route_stop = filter_var($route_stop,FILTER_SANITIZE_STRING); |
|
| 1083 | - $ModeS = filter_var($ModeS,FILTER_SANITIZE_STRING); |
|
| 1084 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_STRING); |
|
| 1085 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 1086 | - $format_source = filter_var($format_source,FILTER_SANITIZE_STRING); |
|
| 1087 | - $source_name = filter_var($source_name,FILTER_SANITIZE_STRING); |
|
| 1088 | - $over_country = filter_var($over_country,FILTER_SANITIZE_STRING); |
|
| 1089 | - $verticalrate = filter_var($verticalrate,FILTER_SANITIZE_NUMBER_INT); |
|
| 1069 | + $flightaware_id = filter_var($flightaware_id, FILTER_SANITIZE_STRING); |
|
| 1070 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 1071 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 1072 | + $departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING); |
|
| 1073 | + $arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING); |
|
| 1074 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1075 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1076 | + $waypoints = filter_var($waypoints, FILTER_SANITIZE_STRING); |
|
| 1077 | + $altitude = filter_var($altitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1078 | + $altitude_real = filter_var($altitude_real, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1079 | + $heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT); |
|
| 1080 | + $groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1081 | + $squawk = filter_var($squawk, FILTER_SANITIZE_NUMBER_INT); |
|
| 1082 | + $route_stop = filter_var($route_stop, FILTER_SANITIZE_STRING); |
|
| 1083 | + $ModeS = filter_var($ModeS, FILTER_SANITIZE_STRING); |
|
| 1084 | + $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_STRING); |
|
| 1085 | + $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING); |
|
| 1086 | + $format_source = filter_var($format_source, FILTER_SANITIZE_STRING); |
|
| 1087 | + $source_name = filter_var($source_name, FILTER_SANITIZE_STRING); |
|
| 1088 | + $over_country = filter_var($over_country, FILTER_SANITIZE_STRING); |
|
| 1089 | + $verticalrate = filter_var($verticalrate, FILTER_SANITIZE_NUMBER_INT); |
|
| 1090 | 1090 | |
| 1091 | 1091 | $airline_name = ''; |
| 1092 | 1092 | $airline_icao = ''; |
@@ -1108,10 +1108,10 @@ discard block |
||
| 1108 | 1108 | $arrival_airport_country = ''; |
| 1109 | 1109 | |
| 1110 | 1110 | |
| 1111 | - if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL; |
|
| 1112 | - if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL; |
|
| 1113 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
| 1114 | - if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
| 1111 | + if ($squawk == '' || $Common->isInteger($squawk) === false) $squawk = NULL; |
|
| 1112 | + if ($verticalrate == '' || $Common->isInteger($verticalrate) === false) $verticalrate = NULL; |
|
| 1113 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
|
| 1114 | + if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
|
| 1115 | 1115 | |
| 1116 | 1116 | $query = ''; |
| 1117 | 1117 | if ($globalArchive) { |
@@ -1122,19 +1122,19 @@ discard block |
||
| 1122 | 1122 | $query .= 'INSERT INTO spotter_live (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, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, latitude, longitude, waypoints, altitude, heading, ground_speed, date, departure_airport_time, arrival_airport_time, squawk, route_stop, ModeS, pilot_id, pilot_name, verticalrate, ground, format_source, source_name, over_country, real_altitude) |
| 1123 | 1123 | VALUES (:flightaware_id,:ident,:registration,:airline_name,:airline_icao,:airline_country,:airline_type,:aircraft_icao,:aircraft_shadow,:aircraft_type,:aircraft_manufacturer,:departure_airport_icao,:departure_airport_name, :departure_airport_city, :departure_airport_country, :arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :latitude,:longitude,:waypoints,:altitude,:heading,:groundspeed,:date,:departure_airport_time,:arrival_airport_time,:squawk,:route_stop,:ModeS, :pilot_id, :pilot_name, :verticalrate, :ground, :format_source, :source_name, :over_country, :real_altitude)'; |
| 1124 | 1124 | |
| 1125 | - $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_type' => $aircraft_type,':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,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_name' => $arrival_airport_name,':arrival_airport_city' => $arrival_airport_city,':arrival_airport_country' => $arrival_airport_country,':latitude' => $latitude,':longitude' => $longitude, ':waypoints' => $waypoints,':altitude' => $altitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date, ':departure_airport_time' => $departure_airport_time,':arrival_airport_time' => $arrival_airport_time, ':squawk' => $squawk,':route_stop' => $route_stop,':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source,':ground' => $ground, ':source_name' => $source_name, ':over_country' => $over_country,':real_altitude' => $altitude_real); |
|
| 1125 | + $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_type' => $aircraft_type, ':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, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_time' => $arrival_airport_time, ':squawk' => $squawk, ':route_stop' => $route_stop, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':ground' => $ground, ':source_name' => $source_name, ':over_country' => $over_country, ':real_altitude' => $altitude_real); |
|
| 1126 | 1126 | try { |
| 1127 | 1127 | |
| 1128 | 1128 | $sth = $this->db->prepare($query); |
| 1129 | 1129 | $sth->execute($query_values); |
| 1130 | 1130 | $sth->closeCursor(); |
| 1131 | - } catch(PDOException $e) { |
|
| 1131 | + } catch (PDOException $e) { |
|
| 1132 | 1132 | return "error : ".$e->getMessage(); |
| 1133 | 1133 | } |
| 1134 | 1134 | if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) { |
| 1135 | 1135 | if ($globalDebug) echo '(Add to SBS archive : '; |
| 1136 | 1136 | $SpotterArchive = new SpotterArchive($this->db); |
| 1137 | - $result = $SpotterArchive->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, $altitude_real,$heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country); |
|
| 1137 | + $result = $SpotterArchive->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, $altitude_real, $heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name, $verticalrate, $format_source, $source_name, $over_country); |
|
| 1138 | 1138 | if ($globalDebug) echo $result.')'; |
| 1139 | 1139 | } elseif ($globalDebug && $putinarchive !== true) { |
| 1140 | 1140 | echo '(Not adding to archive)'; |
@@ -1147,7 +1147,7 @@ discard block |
||
| 1147 | 1147 | |
| 1148 | 1148 | public function getOrderBy() |
| 1149 | 1149 | { |
| 1150 | - $orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY spotter_live.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY spotter_live.aircraft_icao DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY spotter_live.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY spotter_live.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY spotter_live.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY spotter_live.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY spotter_live.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY spotter_live.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY spotter_live.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY spotter_live.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY spotter_live.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY spotter_live.date DESC")); |
|
| 1150 | + $orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY spotter_live.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY spotter_live.aircraft_icao DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY spotter_live.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY spotter_live.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY spotter_live.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY spotter_live.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY spotter_live.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY spotter_live.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY spotter_live.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY spotter_live.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY spotter_live.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY spotter_live.date DESC")); |
|
| 1151 | 1151 | return $orderby; |
| 1152 | 1152 | } |
| 1153 | 1153 | |
@@ -8,7 +8,9 @@ discard block |
||
| 8 | 8 | public function __construct($dbc = null) { |
| 9 | 9 | $Connection = new Connection($dbc); |
| 10 | 10 | $this->db = $Connection->db(); |
| 11 | - if ($this->db === null) die('Error: No DB connection.'); |
|
| 11 | + if ($this->db === null) { |
|
| 12 | + die('Error: No DB connection.'); |
|
| 13 | + } |
|
| 12 | 14 | } |
| 13 | 15 | |
| 14 | 16 | |
@@ -30,7 +32,9 @@ discard block |
||
| 30 | 32 | if (isset($filter[0]['source'])) { |
| 31 | 33 | $filters = array_merge($filters,$filter); |
| 32 | 34 | } |
| 33 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 35 | + if (is_array($globalFilter)) { |
|
| 36 | + $filter = array_merge($filter,$globalFilter); |
|
| 37 | + } |
|
| 34 | 38 | $filter_query_join = ''; |
| 35 | 39 | $filter_query_where = ''; |
| 36 | 40 | foreach($filters as $flt) { |
@@ -119,8 +123,11 @@ discard block |
||
| 119 | 123 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 120 | 124 | $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
| 121 | 125 | } |
| 122 | - if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
|
| 123 | - elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
|
| 126 | + if ($filter_query_where == '' && $where) { |
|
| 127 | + $filter_query_where = ' WHERE'; |
|
| 128 | + } elseif ($filter_query_where != '' && $and) { |
|
| 129 | + $filter_query_where .= ' AND'; |
|
| 130 | + } |
|
| 124 | 131 | if ($filter_query_where != '') { |
| 125 | 132 | $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
| 126 | 133 | } |
@@ -161,9 +168,13 @@ discard block |
||
| 161 | 168 | $orderby_query = ' '.$search_orderby_array[$sort]['sql']; |
| 162 | 169 | } |
| 163 | 170 | } |
| 164 | - if ($orderby_query == '') $orderby_query = ' ORDER BY date DESC'; |
|
| 171 | + if ($orderby_query == '') { |
|
| 172 | + $orderby_query = ' ORDER BY date DESC'; |
|
| 173 | + } |
|
| 165 | 174 | |
| 166 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 175 | + if (!isset($globalLiveInterval)) { |
|
| 176 | + $globalLiveInterval = '200'; |
|
| 177 | + } |
|
| 167 | 178 | if ($globalDBdriver == 'mysql') { |
| 168 | 179 | //$query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate"; |
| 169 | 180 | $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate'.$filter_query.$orderby_query; |
@@ -186,7 +197,9 @@ discard block |
||
| 186 | 197 | global $globalDBdriver, $globalLiveInterval, $globalArchive; |
| 187 | 198 | date_default_timezone_set('UTC'); |
| 188 | 199 | $filter_query = $this->getFilter($filter,true,true); |
| 189 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 200 | + if (!isset($globalLiveInterval)) { |
|
| 201 | + $globalLiveInterval = '200'; |
|
| 202 | + } |
|
| 190 | 203 | if ($globalDBdriver == 'mysql') { |
| 191 | 204 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 192 | 205 | $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
@@ -236,8 +249,12 @@ discard block |
||
| 236 | 249 | } |
| 237 | 250 | $filter_query = $this->getFilter($filter,true,true); |
| 238 | 251 | |
| 239 | - if (!isset($globalLiveInterval) || $globalLiveInterval == '') $globalLiveInterval = '200'; |
|
| 240 | - if (!isset($globalMap3DAircraftsLimit) || $globalMap3DAircraftsLimit == '') $globalMap3DAircraftsLimit = '300'; |
|
| 252 | + if (!isset($globalLiveInterval) || $globalLiveInterval == '') { |
|
| 253 | + $globalLiveInterval = '200'; |
|
| 254 | + } |
|
| 255 | + if (!isset($globalMap3DAircraftsLimit) || $globalMap3DAircraftsLimit == '') { |
|
| 256 | + $globalMap3DAircraftsLimit = '300'; |
|
| 257 | + } |
|
| 241 | 258 | if ($globalDBdriver == 'mysql') { |
| 242 | 259 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 243 | 260 | /* |
@@ -248,22 +265,32 @@ discard block |
||
| 248 | 265 | */ |
| 249 | 266 | $query = 'SELECT * FROM (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, spotter_archive.date, spotter_archive.format_source |
| 250 | 267 | FROM spotter_archive INNER JOIN (SELECT flightaware_id FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date) l ON l.flightaware_id = spotter_archive.flightaware_id "; |
| 251 | - if ($usecoord) $query .= "AND spotter_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." "; |
|
| 268 | + if ($usecoord) { |
|
| 269 | + $query .= "AND spotter_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." "; |
|
| 270 | + } |
|
| 252 | 271 | $query .= "UNION |
| 253 | 272 | SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
| 254 | 273 | FROM spotter_live".$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date"; |
| 255 | - if ($usecoord) $query .= " AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong; |
|
| 274 | + if ($usecoord) { |
|
| 275 | + $query .= " AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong; |
|
| 276 | + } |
|
| 256 | 277 | $query .= ") AS spotter |
| 257 | 278 | WHERE latitude <> '0' AND longitude <> '0' |
| 258 | 279 | ORDER BY flightaware_id, date"; |
| 259 | - if ($limit) $query .= " LIMIT ".$globalMap3DAircraftsLimit; |
|
| 280 | + if ($limit) { |
|
| 281 | + $query .= " LIMIT ".$globalMap3DAircraftsLimit; |
|
| 282 | + } |
|
| 260 | 283 | } else { |
| 261 | 284 | $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
| 262 | 285 | FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date "; |
| 263 | - if ($usecoord) $query .= "AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong." "; |
|
| 286 | + if ($usecoord) { |
|
| 287 | + $query .= "AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong." "; |
|
| 288 | + } |
|
| 264 | 289 | $query .= "AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' |
| 265 | 290 | ORDER BY spotter_live.flightaware_id, spotter_live.date"; |
| 266 | - if ($limit) $query .= " LIMIT ".$globalMap3DAircraftsLimit; |
|
| 291 | + if ($limit) { |
|
| 292 | + $query .= " LIMIT ".$globalMap3DAircraftsLimit; |
|
| 293 | + } |
|
| 267 | 294 | } |
| 268 | 295 | } else { |
| 269 | 296 | if (isset($globalArchive) && $globalArchive === TRUE) { |
@@ -275,21 +302,31 @@ discard block |
||
| 275 | 302 | */ |
| 276 | 303 | $query = "SELECT * FROM (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, spotter_archive.date, spotter_archive.format_source |
| 277 | 304 | FROM spotter_archive INNER JOIN (SELECT flightaware_id FROM spotter_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date) l ON l.flightaware_id = spotter_archive.flightaware_id "; |
| 278 | - if ($usecoord) $query .= "AND spotter_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." "; |
|
| 305 | + if ($usecoord) { |
|
| 306 | + $query .= "AND spotter_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." "; |
|
| 307 | + } |
|
| 279 | 308 | $query .= "UNION |
| 280 | 309 | SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
| 281 | 310 | FROM spotter_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date"; |
| 282 | - if ($usecoord) $query .= " AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong; |
|
| 311 | + if ($usecoord) { |
|
| 312 | + $query .= " AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong; |
|
| 313 | + } |
|
| 283 | 314 | $query .= ") AS spotter WHERE latitude <> '0' AND longitude <> '0' "; |
| 284 | 315 | $query .= "ORDER BY flightaware_id, date"; |
| 285 | - if ($limit) $query .= " LIMIT ".$globalMap3DAircraftsLimit; |
|
| 316 | + if ($limit) { |
|
| 317 | + $query .= " LIMIT ".$globalMap3DAircraftsLimit; |
|
| 318 | + } |
|
| 286 | 319 | } else { |
| 287 | 320 | $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
| 288 | 321 | FROM spotter_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date "; |
| 289 | - if ($usecoord) $query .= "AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong." "; |
|
| 322 | + if ($usecoord) { |
|
| 323 | + $query .= "AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong." "; |
|
| 324 | + } |
|
| 290 | 325 | $query .= "AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' |
| 291 | 326 | ORDER BY spotter_live.flightaware_id, spotter_live.date"; |
| 292 | - if ($limit) $query .= " LIMIT ".$globalMap3DAircraftsLimit; |
|
| 327 | + if ($limit) { |
|
| 328 | + $query .= " LIMIT ".$globalMap3DAircraftsLimit; |
|
| 329 | + } |
|
| 293 | 330 | } |
| 294 | 331 | } |
| 295 | 332 | try { |
@@ -314,7 +351,9 @@ discard block |
||
| 314 | 351 | global $globalDBdriver, $globalLiveInterval; |
| 315 | 352 | $filter_query = $this->getFilter($filter,true,true); |
| 316 | 353 | |
| 317 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 354 | + if (!isset($globalLiveInterval)) { |
|
| 355 | + $globalLiveInterval = '200'; |
|
| 356 | + } |
|
| 318 | 357 | if ($globalDBdriver == 'mysql') { |
| 319 | 358 | //$query = 'SELECT COUNT(*) as nb FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate'.$filter_query; |
| 320 | 359 | $query = 'SELECT COUNT(DISTINCT spotter_live.flightaware_id) as nb FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date'; |
@@ -344,7 +383,9 @@ discard block |
||
| 344 | 383 | { |
| 345 | 384 | global $globalDBdriver, $globalLiveInterval; |
| 346 | 385 | $Spotter = new Spotter($this->db); |
| 347 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 386 | + if (!isset($globalLiveInterval)) { |
|
| 387 | + $globalLiveInterval = '200'; |
|
| 388 | + } |
|
| 348 | 389 | $filter_query = $this->getFilter($filter); |
| 349 | 390 | |
| 350 | 391 | if (is_array($coord)) { |
@@ -352,7 +393,9 @@ discard block |
||
| 352 | 393 | $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 353 | 394 | $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 354 | 395 | $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 355 | - } else return array(); |
|
| 396 | + } else { |
|
| 397 | + return array(); |
|
| 398 | + } |
|
| 356 | 399 | if ($globalDBdriver == 'mysql') { |
| 357 | 400 | $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND spotter_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND spotter_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY spotter_live.flightaware_id'.$filter_query; |
| 358 | 401 | } else { |
@@ -373,7 +416,9 @@ discard block |
||
| 373 | 416 | { |
| 374 | 417 | global $globalDBdriver, $globalLiveInterval, $globalArchive; |
| 375 | 418 | $Spotter = new Spotter($this->db); |
| 376 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 419 | + if (!isset($globalLiveInterval)) { |
|
| 420 | + $globalLiveInterval = '200'; |
|
| 421 | + } |
|
| 377 | 422 | $filter_query = $this->getFilter($filter,true,true); |
| 378 | 423 | |
| 379 | 424 | if (is_array($coord)) { |
@@ -381,7 +426,9 @@ discard block |
||
| 381 | 426 | $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 382 | 427 | $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 383 | 428 | $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 384 | - } else return array(); |
|
| 429 | + } else { |
|
| 430 | + return array(); |
|
| 431 | + } |
|
| 385 | 432 | if ($globalDBdriver == 'mysql') { |
| 386 | 433 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 387 | 434 | $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
@@ -608,11 +655,15 @@ discard block |
||
| 608 | 655 | //$query = self::$global_query.' WHERE spotter_live.flightaware_id = :id ORDER BY date'; |
| 609 | 656 | if ($globalDBdriver == 'mysql') { |
| 610 | 657 | $query = 'SELECT spotter_live.* FROM spotter_live WHERE spotter_live.flightaware_id = :id'; |
| 611 | - if ($liveinterval) $query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date'; |
|
| 658 | + if ($liveinterval) { |
|
| 659 | + $query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date'; |
|
| 660 | + } |
|
| 612 | 661 | $query .= ' ORDER BY date'; |
| 613 | 662 | } else { |
| 614 | 663 | $query = 'SELECT spotter_live.* FROM spotter_live WHERE spotter_live.flightaware_id = :id'; |
| 615 | - if ($liveinterval) $query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date"; |
|
| 664 | + if ($liveinterval) { |
|
| 665 | + $query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date"; |
|
| 666 | + } |
|
| 616 | 667 | $query .= ' ORDER BY date'; |
| 617 | 668 | } |
| 618 | 669 | |
@@ -707,7 +758,9 @@ discard block |
||
| 707 | 758 | $i++; |
| 708 | 759 | $j++; |
| 709 | 760 | if ($j == 30) { |
| 710 | - if ($globalDebug) echo "."; |
|
| 761 | + if ($globalDebug) { |
|
| 762 | + echo "."; |
|
| 763 | + } |
|
| 711 | 764 | try { |
| 712 | 765 | |
| 713 | 766 | $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
@@ -1014,7 +1067,9 @@ discard block |
||
| 1014 | 1067 | { |
| 1015 | 1068 | return false; |
| 1016 | 1069 | } |
| 1017 | - } else return ''; |
|
| 1070 | + } else { |
|
| 1071 | + return ''; |
|
| 1072 | + } |
|
| 1018 | 1073 | |
| 1019 | 1074 | if ($longitude != '') |
| 1020 | 1075 | { |
@@ -1022,7 +1077,9 @@ discard block |
||
| 1022 | 1077 | { |
| 1023 | 1078 | return false; |
| 1024 | 1079 | } |
| 1025 | - } else return ''; |
|
| 1080 | + } else { |
|
| 1081 | + return ''; |
|
| 1082 | + } |
|
| 1026 | 1083 | |
| 1027 | 1084 | if ($waypoints != '') |
| 1028 | 1085 | { |
@@ -1038,14 +1095,18 @@ discard block |
||
| 1038 | 1095 | { |
| 1039 | 1096 | return false; |
| 1040 | 1097 | } |
| 1041 | - } else $altitude = 0; |
|
| 1098 | + } else { |
|
| 1099 | + $altitude = 0; |
|
| 1100 | + } |
|
| 1042 | 1101 | if ($altitude_real != '') |
| 1043 | 1102 | { |
| 1044 | 1103 | if (!is_numeric($altitude_real)) |
| 1045 | 1104 | { |
| 1046 | 1105 | return false; |
| 1047 | 1106 | } |
| 1048 | - } else $altitude_real = 0; |
|
| 1107 | + } else { |
|
| 1108 | + $altitude_real = 0; |
|
| 1109 | + } |
|
| 1049 | 1110 | |
| 1050 | 1111 | if ($heading != '') |
| 1051 | 1112 | { |
@@ -1053,7 +1114,9 @@ discard block |
||
| 1053 | 1114 | { |
| 1054 | 1115 | return false; |
| 1055 | 1116 | } |
| 1056 | - } else $heading = 0; |
|
| 1117 | + } else { |
|
| 1118 | + $heading = 0; |
|
| 1119 | + } |
|
| 1057 | 1120 | |
| 1058 | 1121 | if ($groundspeed != '') |
| 1059 | 1122 | { |
@@ -1061,9 +1124,13 @@ discard block |
||
| 1061 | 1124 | { |
| 1062 | 1125 | return false; |
| 1063 | 1126 | } |
| 1064 | - } else $groundspeed = 0; |
|
| 1127 | + } else { |
|
| 1128 | + $groundspeed = 0; |
|
| 1129 | + } |
|
| 1065 | 1130 | date_default_timezone_set('UTC'); |
| 1066 | - if ($date == '') $date = date("Y-m-d H:i:s", time()); |
|
| 1131 | + if ($date == '') { |
|
| 1132 | + $date = date("Y-m-d H:i:s", time()); |
|
| 1133 | + } |
|
| 1067 | 1134 | |
| 1068 | 1135 | |
| 1069 | 1136 | $flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING); |
@@ -1108,14 +1175,24 @@ discard block |
||
| 1108 | 1175 | $arrival_airport_country = ''; |
| 1109 | 1176 | |
| 1110 | 1177 | |
| 1111 | - if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL; |
|
| 1112 | - if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL; |
|
| 1113 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
| 1114 | - if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
| 1178 | + if ($squawk == '' || $Common->isInteger($squawk) === false ) { |
|
| 1179 | + $squawk = NULL; |
|
| 1180 | + } |
|
| 1181 | + if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) { |
|
| 1182 | + $verticalrate = NULL; |
|
| 1183 | + } |
|
| 1184 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) { |
|
| 1185 | + $groundspeed = 0; |
|
| 1186 | + } |
|
| 1187 | + if ($heading == '' || $Common->isInteger($heading) === false ) { |
|
| 1188 | + $heading = 0; |
|
| 1189 | + } |
|
| 1115 | 1190 | |
| 1116 | 1191 | $query = ''; |
| 1117 | 1192 | if ($globalArchive) { |
| 1118 | - if ($globalDebug) echo '-- Delete previous data -- '; |
|
| 1193 | + if ($globalDebug) { |
|
| 1194 | + echo '-- Delete previous data -- '; |
|
| 1195 | + } |
|
| 1119 | 1196 | $query .= 'DELETE FROM spotter_live WHERE flightaware_id = :flightaware_id;'; |
| 1120 | 1197 | } |
| 1121 | 1198 | |
@@ -1132,10 +1209,14 @@ discard block |
||
| 1132 | 1209 | return "error : ".$e->getMessage(); |
| 1133 | 1210 | } |
| 1134 | 1211 | if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) { |
| 1135 | - if ($globalDebug) echo '(Add to SBS archive : '; |
|
| 1212 | + if ($globalDebug) { |
|
| 1213 | + echo '(Add to SBS archive : '; |
|
| 1214 | + } |
|
| 1136 | 1215 | $SpotterArchive = new SpotterArchive($this->db); |
| 1137 | 1216 | $result = $SpotterArchive->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, $altitude_real,$heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country); |
| 1138 | - if ($globalDebug) echo $result.')'; |
|
| 1217 | + if ($globalDebug) { |
|
| 1218 | + echo $result.')'; |
|
| 1219 | + } |
|
| 1139 | 1220 | } elseif ($globalDebug && $putinarchive !== true) { |
| 1140 | 1221 | echo '(Not adding to archive)'; |
| 1141 | 1222 | } elseif ($globalDebug && $noarchive === true) { |
@@ -11,7 +11,7 @@ |
||
| 11 | 11 | /** |
| 12 | 12 | * Get SQL query part for filter used |
| 13 | 13 | * @param Array $filter the filter |
| 14 | - * @return Array the SQL part |
|
| 14 | + * @return string the SQL part |
|
| 15 | 15 | */ |
| 16 | 16 | public function getFilter($filter = array(),$where = false,$and = false) { |
| 17 | 17 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
@@ -6,7 +6,9 @@ discard block |
||
| 6 | 6 | public function __construct($dbc = null) { |
| 7 | 7 | $Connection = new Connection($dbc); |
| 8 | 8 | $this->db = $Connection->db; |
| 9 | - if ($this->db === null) die('Error: No DB connection.'); |
|
| 9 | + if ($this->db === null) { |
|
| 10 | + die('Error: No DB connection.'); |
|
| 11 | + } |
|
| 10 | 12 | } |
| 11 | 13 | |
| 12 | 14 | /** |
@@ -27,7 +29,9 @@ discard block |
||
| 27 | 29 | if (isset($filter[0]['source'])) { |
| 28 | 30 | $filters = array_merge($filters,$filter); |
| 29 | 31 | } |
| 30 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 32 | + if (is_array($globalFilter)) { |
|
| 33 | + $filter = array_merge($filter,$globalFilter); |
|
| 34 | + } |
|
| 31 | 35 | $filter_query_join = ''; |
| 32 | 36 | $filter_query_where = ''; |
| 33 | 37 | foreach($filters as $flt) { |
@@ -114,8 +118,11 @@ discard block |
||
| 114 | 118 | } |
| 115 | 119 | $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"; |
| 116 | 120 | } |
| 117 | - if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
|
| 118 | - elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
|
| 121 | + if ($filter_query_where == '' && $where) { |
|
| 122 | + $filter_query_where = ' WHERE'; |
|
| 123 | + } elseif ($filter_query_where != '' && $and) { |
|
| 124 | + $filter_query_where .= ' AND'; |
|
| 125 | + } |
|
| 119 | 126 | if ($filter_query_where != '') { |
| 120 | 127 | $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
| 121 | 128 | } |
@@ -129,10 +136,17 @@ discard block |
||
| 129 | 136 | if ($over_country == '') { |
| 130 | 137 | $Spotter = new Spotter($this->db); |
| 131 | 138 | $data_country = $Spotter->getCountryFromLatitudeLongitude($latitude,$longitude); |
| 132 | - if (!empty($data_country)) $country = $data_country['iso2']; |
|
| 133 | - else $country = ''; |
|
| 134 | - } else $country = $over_country; |
|
| 135 | - if ($airline_type === NULL) $airline_type =''; |
|
| 139 | + if (!empty($data_country)) { |
|
| 140 | + $country = $data_country['iso2']; |
|
| 141 | + } else { |
|
| 142 | + $country = ''; |
|
| 143 | + } |
|
| 144 | + } else { |
|
| 145 | + $country = $over_country; |
|
| 146 | + } |
|
| 147 | + if ($airline_type === NULL) { |
|
| 148 | + $airline_type =''; |
|
| 149 | + } |
|
| 136 | 150 | |
| 137 | 151 | //if ($country == '') echo "\n".'************ UNKNOW COUNTRY ****************'."\n"; |
| 138 | 152 | //else echo "\n".'*/*/*/*/*/*/*/ Country : '.$country.' */*/*/*/*/*/*/*/*/'."\n"; |
@@ -639,7 +653,9 @@ discard block |
||
| 639 | 653 | $additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR "; |
| 640 | 654 | $additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR "; |
| 641 | 655 | $translate = $Translation->ident2icao($q_item); |
| 642 | - if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR "; |
|
| 656 | + if ($translate != $q_item) { |
|
| 657 | + $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR "; |
|
| 658 | + } |
|
| 643 | 659 | $additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')"; |
| 644 | 660 | $additional_query .= ")"; |
| 645 | 661 | } |
@@ -857,7 +873,9 @@ discard block |
||
| 857 | 873 | date_default_timezone_set($globalTimezone); |
| 858 | 874 | $datetime = new DateTime(); |
| 859 | 875 | $offset = $datetime->format('P'); |
| 860 | - } else $offset = '+00:00'; |
|
| 876 | + } else { |
|
| 877 | + $offset = '+00:00'; |
|
| 878 | + } |
|
| 861 | 879 | |
| 862 | 880 | |
| 863 | 881 | if ($date_array[1] != "") |
@@ -1133,9 +1151,13 @@ discard block |
||
| 1133 | 1151 | $query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1134 | 1152 | } |
| 1135 | 1153 | } |
| 1136 | - if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
| 1154 | + if ($sincedate != '') { |
|
| 1155 | + $query .= "AND date > '".$sincedate."' "; |
|
| 1156 | + } |
|
| 1137 | 1157 | $query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1138 | - if ($limit) $query .= " LIMIT 0,10"; |
|
| 1158 | + if ($limit) { |
|
| 1159 | + $query .= " LIMIT 0,10"; |
|
| 1160 | + } |
|
| 1139 | 1161 | |
| 1140 | 1162 | |
| 1141 | 1163 | $sth = $this->db->prepare($query); |
@@ -1179,9 +1201,13 @@ discard block |
||
| 1179 | 1201 | $query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1180 | 1202 | } |
| 1181 | 1203 | } |
| 1182 | - if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' "; |
|
| 1204 | + if ($sincedate != '') { |
|
| 1205 | + $query .= "AND s.date > '".$sincedate."' "; |
|
| 1206 | + } |
|
| 1183 | 1207 | $query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1184 | - if ($limit) $query .= " LIMIT 0,10"; |
|
| 1208 | + if ($limit) { |
|
| 1209 | + $query .= " LIMIT 0,10"; |
|
| 1210 | + } |
|
| 1185 | 1211 | |
| 1186 | 1212 | |
| 1187 | 1213 | $sth = $this->db->prepare($query); |
@@ -9,12 +9,12 @@ discard block |
||
| 9 | 9 | if ($this->db === null) die('Error: No DB connection.'); |
| 10 | 10 | } |
| 11 | 11 | |
| 12 | - /** |
|
| 13 | - * Get SQL query part for filter used |
|
| 14 | - * @param Array $filter the filter |
|
| 15 | - * @return Array the SQL part |
|
| 16 | - */ |
|
| 17 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 12 | + /** |
|
| 13 | + * Get SQL query part for filter used |
|
| 14 | + * @param Array $filter the filter |
|
| 15 | + * @return Array the SQL part |
|
| 16 | + */ |
|
| 17 | + public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 18 | 18 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 19 | 19 | $filters = array(); |
| 20 | 20 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
@@ -31,88 +31,88 @@ discard block |
||
| 31 | 31 | $filter_query_join = ''; |
| 32 | 32 | $filter_query_where = ''; |
| 33 | 33 | foreach($filters as $flt) { |
| 34 | - if (isset($flt['airlines']) && !empty($flt['airlines'])) { |
|
| 34 | + if (isset($flt['airlines']) && !empty($flt['airlines'])) { |
|
| 35 | 35 | if ($flt['airlines'][0] != '') { |
| 36 | - if (isset($flt['source'])) { |
|
| 36 | + if (isset($flt['source'])) { |
|
| 37 | 37 | $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"; |
| 38 | - } else { |
|
| 38 | + } else { |
|
| 39 | 39 | $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"; |
| 40 | - } |
|
| 40 | + } |
|
| 41 | + } |
|
| 41 | 42 | } |
| 42 | - } |
|
| 43 | - if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) { |
|
| 43 | + if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) { |
|
| 44 | 44 | if (isset($flt['source'])) { |
| 45 | - $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 | + $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"; |
|
| 46 | 46 | } else { |
| 47 | - $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 | + $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"; |
|
| 48 | 48 | } |
| 49 | - } |
|
| 50 | - if (isset($flt['idents']) && !empty($flt['idents'])) { |
|
| 49 | + } |
|
| 50 | + if (isset($flt['idents']) && !empty($flt['idents'])) { |
|
| 51 | 51 | if (isset($flt['source'])) { |
| 52 | - $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 | + $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"; |
|
| 53 | 53 | } else { |
| 54 | - $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 | + $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"; |
|
| 55 | + } |
|
| 55 | 56 | } |
| 56 | - } |
|
| 57 | - if (isset($flt['registrations']) && !empty($flt['registrations'])) { |
|
| 57 | + if (isset($flt['registrations']) && !empty($flt['registrations'])) { |
|
| 58 | 58 | if (isset($flt['source'])) { |
| 59 | - $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 | + $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"; |
|
| 60 | 60 | } else { |
| 61 | - $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 | + $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"; |
|
| 62 | + } |
|
| 62 | 63 | } |
| 63 | - } |
|
| 64 | - 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 | + 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']))) { |
|
| 65 | 65 | if (isset($flt['source'])) { |
| 66 | - $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 | + $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"; |
|
| 67 | + } |
|
| 67 | 68 | } |
| 68 | - } |
|
| 69 | 69 | } |
| 70 | 70 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 71 | - if ($filter['airlines'][0] != '') { |
|
| 71 | + if ($filter['airlines'][0] != '') { |
|
| 72 | 72 | $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"; |
| 73 | - } |
|
| 73 | + } |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 77 | - $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 | + $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 "; |
|
| 78 | 78 | } |
| 79 | 79 | if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) { |
| 80 | - $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 | + $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"; |
|
| 81 | 81 | } |
| 82 | 82 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 83 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 83 | + $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 84 | 84 | } |
| 85 | 85 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 86 | - $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
|
| 86 | + $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
|
| 87 | 87 | } |
| 88 | 88 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 89 | 89 | $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
| 90 | 90 | } |
| 91 | 91 | if ((isset($filter['year']) && $filter['year'] != '') || (isset($filter['month']) && $filter['month'] != '') || (isset($filter['day']) && $filter['day'] != '')) { |
| 92 | - $filter_query_date = ''; |
|
| 92 | + $filter_query_date = ''; |
|
| 93 | 93 | |
| 94 | - if (isset($filter['year']) && $filter['year'] != '') { |
|
| 94 | + if (isset($filter['year']) && $filter['year'] != '') { |
|
| 95 | 95 | if ($globalDBdriver == 'mysql') { |
| 96 | - $filter_query_date .= " AND YEAR(spotter_archive_output.date) = '".$filter['year']."'"; |
|
| 96 | + $filter_query_date .= " AND YEAR(spotter_archive_output.date) = '".$filter['year']."'"; |
|
| 97 | 97 | } else { |
| 98 | - $filter_query_date .= " AND EXTRACT(YEAR FROM spotter_archive_output.date) = '".$filter['year']."'"; |
|
| 98 | + $filter_query_date .= " AND EXTRACT(YEAR FROM spotter_archive_output.date) = '".$filter['year']."'"; |
|
| 99 | + } |
|
| 99 | 100 | } |
| 100 | - } |
|
| 101 | - if (isset($filter['month']) && $filter['month'] != '') { |
|
| 101 | + if (isset($filter['month']) && $filter['month'] != '') { |
|
| 102 | 102 | if ($globalDBdriver == 'mysql') { |
| 103 | - $filter_query_date .= " AND MONTH(spotter_archive_output.date) = '".$filter['month']."'"; |
|
| 103 | + $filter_query_date .= " AND MONTH(spotter_archive_output.date) = '".$filter['month']."'"; |
|
| 104 | 104 | } else { |
| 105 | - $filter_query_date .= " AND EXTRACT(MONTH FROM spotter_archive_output.date) = '".$filter['month']."'"; |
|
| 105 | + $filter_query_date .= " AND EXTRACT(MONTH FROM spotter_archive_output.date) = '".$filter['month']."'"; |
|
| 106 | 106 | } |
| 107 | - } |
|
| 108 | - if (isset($filter['day']) && $filter['day'] != '') { |
|
| 107 | + } |
|
| 108 | + if (isset($filter['day']) && $filter['day'] != '') { |
|
| 109 | 109 | if ($globalDBdriver == 'mysql') { |
| 110 | - $filter_query_date .= " AND DAY(spotter_archive_output.date) = '".$filter['day']."'"; |
|
| 110 | + $filter_query_date .= " AND DAY(spotter_archive_output.date) = '".$filter['day']."'"; |
|
| 111 | 111 | } else { |
| 112 | - $filter_query_date .= " AND EXTRACT(DAY FROM spotter_archive_output.date) = '".$filter['day']."'"; |
|
| 112 | + $filter_query_date .= " AND EXTRACT(DAY FROM spotter_archive_output.date) = '".$filter['day']."'"; |
|
| 113 | + } |
|
| 113 | 114 | } |
| 114 | - } |
|
| 115 | - $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 | + $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"; |
|
| 116 | 116 | } |
| 117 | 117 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 118 | 118 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | } |
| 122 | 122 | $filter_query = $filter_query_join.$filter_query_where; |
| 123 | 123 | return $filter_query; |
| 124 | - } |
|
| 124 | + } |
|
| 125 | 125 | |
| 126 | 126 | // Spotter_archive |
| 127 | 127 | 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 = '') { |
@@ -153,44 +153,44 @@ discard block |
||
| 153 | 153 | } |
| 154 | 154 | |
| 155 | 155 | |
| 156 | - /** |
|
| 157 | - * Gets all the spotter information based on a particular callsign |
|
| 158 | - * |
|
| 159 | - * @return Array the spotter information |
|
| 160 | - * |
|
| 161 | - */ |
|
| 162 | - public function getLastArchiveSpotterDataByIdent($ident) |
|
| 163 | - { |
|
| 156 | + /** |
|
| 157 | + * Gets all the spotter information based on a particular callsign |
|
| 158 | + * |
|
| 159 | + * @return Array the spotter information |
|
| 160 | + * |
|
| 161 | + */ |
|
| 162 | + public function getLastArchiveSpotterDataByIdent($ident) |
|
| 163 | + { |
|
| 164 | 164 | $Spotter = new Spotter($this->db); |
| 165 | - date_default_timezone_set('UTC'); |
|
| 165 | + date_default_timezone_set('UTC'); |
|
| 166 | 166 | |
| 167 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 168 | - //$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"; |
|
| 169 | - $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 167 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 168 | + //$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"; |
|
| 169 | + $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 170 | 170 | |
| 171 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident)); |
|
| 171 | + $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident)); |
|
| 172 | 172 | |
| 173 | - return $spotter_array; |
|
| 174 | - } |
|
| 173 | + return $spotter_array; |
|
| 174 | + } |
|
| 175 | 175 | |
| 176 | 176 | |
| 177 | - /** |
|
| 178 | - * Gets last the spotter information based on a particular id |
|
| 179 | - * |
|
| 180 | - * @return Array the spotter information |
|
| 181 | - * |
|
| 182 | - */ |
|
| 183 | - public function getLastArchiveSpotterDataById($id) |
|
| 184 | - { |
|
| 185 | - $Spotter = new Spotter($this->db); |
|
| 186 | - date_default_timezone_set('UTC'); |
|
| 187 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 188 | - //$query = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id"; |
|
| 189 | - //$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"; |
|
| 190 | - $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 177 | + /** |
|
| 178 | + * Gets last the spotter information based on a particular id |
|
| 179 | + * |
|
| 180 | + * @return Array the spotter information |
|
| 181 | + * |
|
| 182 | + */ |
|
| 183 | + public function getLastArchiveSpotterDataById($id) |
|
| 184 | + { |
|
| 185 | + $Spotter = new Spotter($this->db); |
|
| 186 | + date_default_timezone_set('UTC'); |
|
| 187 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 188 | + //$query = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id"; |
|
| 189 | + //$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"; |
|
| 190 | + $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 191 | 191 | |
| 192 | 192 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 193 | - /* |
|
| 193 | + /* |
|
| 194 | 194 | try { |
| 195 | 195 | $Connection = new Connection(); |
| 196 | 196 | $sth = Connection->$db->prepare($query); |
@@ -200,235 +200,235 @@ discard block |
||
| 200 | 200 | } |
| 201 | 201 | $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC); |
| 202 | 202 | */ |
| 203 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id)); |
|
| 204 | - |
|
| 205 | - return $spotter_array; |
|
| 206 | - } |
|
| 207 | - |
|
| 208 | - /** |
|
| 209 | - * Gets all the spotter information based on a particular id |
|
| 210 | - * |
|
| 211 | - * @return Array the spotter information |
|
| 212 | - * |
|
| 213 | - */ |
|
| 214 | - public function getAllArchiveSpotterDataById($id) |
|
| 203 | + $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id)); |
|
| 204 | + |
|
| 205 | + return $spotter_array; |
|
| 206 | + } |
|
| 207 | + |
|
| 208 | + /** |
|
| 209 | + * Gets all the spotter information based on a particular id |
|
| 210 | + * |
|
| 211 | + * @return Array the spotter information |
|
| 212 | + * |
|
| 213 | + */ |
|
| 214 | + public function getAllArchiveSpotterDataById($id) |
|
| 215 | 215 | { |
| 216 | - date_default_timezone_set('UTC'); |
|
| 217 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 218 | - $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 216 | + date_default_timezone_set('UTC'); |
|
| 217 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 218 | + $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 219 | 219 | |
| 220 | 220 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 221 | 221 | |
| 222 | - try { |
|
| 223 | - $sth = $this->db->prepare($query); |
|
| 224 | - $sth->execute(array(':id' => $id)); |
|
| 225 | - } catch(PDOException $e) { |
|
| 226 | - echo $e->getMessage(); |
|
| 227 | - die; |
|
| 228 | - } |
|
| 229 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 230 | - |
|
| 231 | - return $spotter_array; |
|
| 232 | - } |
|
| 233 | - |
|
| 234 | - /** |
|
| 235 | - * Gets coordinate & time spotter information based on a particular id |
|
| 236 | - * |
|
| 237 | - * @return Array the spotter information |
|
| 238 | - * |
|
| 239 | - */ |
|
| 240 | - public function getCoordArchiveSpotterDataById($id) |
|
| 241 | - { |
|
| 242 | - date_default_timezone_set('UTC'); |
|
| 243 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 244 | - $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id"; |
|
| 222 | + try { |
|
| 223 | + $sth = $this->db->prepare($query); |
|
| 224 | + $sth->execute(array(':id' => $id)); |
|
| 225 | + } catch(PDOException $e) { |
|
| 226 | + echo $e->getMessage(); |
|
| 227 | + die; |
|
| 228 | + } |
|
| 229 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 230 | + |
|
| 231 | + return $spotter_array; |
|
| 232 | + } |
|
| 233 | + |
|
| 234 | + /** |
|
| 235 | + * Gets coordinate & time spotter information based on a particular id |
|
| 236 | + * |
|
| 237 | + * @return Array the spotter information |
|
| 238 | + * |
|
| 239 | + */ |
|
| 240 | + public function getCoordArchiveSpotterDataById($id) |
|
| 241 | + { |
|
| 242 | + date_default_timezone_set('UTC'); |
|
| 243 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 244 | + $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id"; |
|
| 245 | 245 | |
| 246 | 246 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 247 | 247 | |
| 248 | - try { |
|
| 249 | - $sth = $this->db->prepare($query); |
|
| 250 | - $sth->execute(array(':id' => $id)); |
|
| 251 | - } catch(PDOException $e) { |
|
| 252 | - echo $e->getMessage(); |
|
| 253 | - die; |
|
| 254 | - } |
|
| 255 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 248 | + try { |
|
| 249 | + $sth = $this->db->prepare($query); |
|
| 250 | + $sth->execute(array(':id' => $id)); |
|
| 251 | + } catch(PDOException $e) { |
|
| 252 | + echo $e->getMessage(); |
|
| 253 | + die; |
|
| 254 | + } |
|
| 255 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 256 | 256 | |
| 257 | - return $spotter_array; |
|
| 258 | - } |
|
| 257 | + return $spotter_array; |
|
| 258 | + } |
|
| 259 | 259 | |
| 260 | 260 | |
| 261 | - /** |
|
| 262 | - * Gets altitude information based on a particular callsign |
|
| 263 | - * |
|
| 264 | - * @return Array the spotter information |
|
| 265 | - * |
|
| 266 | - */ |
|
| 267 | - public function getAltitudeArchiveSpotterDataByIdent($ident) |
|
| 268 | - { |
|
| 261 | + /** |
|
| 262 | + * Gets altitude information based on a particular callsign |
|
| 263 | + * |
|
| 264 | + * @return Array the spotter information |
|
| 265 | + * |
|
| 266 | + */ |
|
| 267 | + public function getAltitudeArchiveSpotterDataByIdent($ident) |
|
| 268 | + { |
|
| 269 | 269 | |
| 270 | - date_default_timezone_set('UTC'); |
|
| 270 | + date_default_timezone_set('UTC'); |
|
| 271 | 271 | |
| 272 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 273 | - $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 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 273 | + $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"; |
|
| 274 | 274 | |
| 275 | - try { |
|
| 276 | - $sth = $this->db->prepare($query); |
|
| 277 | - $sth->execute(array(':ident' => $ident)); |
|
| 278 | - } catch(PDOException $e) { |
|
| 279 | - echo $e->getMessage(); |
|
| 280 | - die; |
|
| 281 | - } |
|
| 282 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 275 | + try { |
|
| 276 | + $sth = $this->db->prepare($query); |
|
| 277 | + $sth->execute(array(':ident' => $ident)); |
|
| 278 | + } catch(PDOException $e) { |
|
| 279 | + echo $e->getMessage(); |
|
| 280 | + die; |
|
| 281 | + } |
|
| 282 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 283 | 283 | |
| 284 | - return $spotter_array; |
|
| 285 | - } |
|
| 284 | + return $spotter_array; |
|
| 285 | + } |
|
| 286 | 286 | |
| 287 | - /** |
|
| 288 | - * Gets altitude information based on a particular id |
|
| 289 | - * |
|
| 290 | - * @return Array the spotter information |
|
| 291 | - * |
|
| 292 | - */ |
|
| 293 | - public function getAltitudeArchiveSpotterDataById($id) |
|
| 294 | - { |
|
| 287 | + /** |
|
| 288 | + * Gets altitude information based on a particular id |
|
| 289 | + * |
|
| 290 | + * @return Array the spotter information |
|
| 291 | + * |
|
| 292 | + */ |
|
| 293 | + public function getAltitudeArchiveSpotterDataById($id) |
|
| 294 | + { |
|
| 295 | 295 | |
| 296 | - date_default_timezone_set('UTC'); |
|
| 296 | + date_default_timezone_set('UTC'); |
|
| 297 | 297 | |
| 298 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 299 | - $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 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 299 | + $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"; |
|
| 300 | 300 | |
| 301 | - try { |
|
| 302 | - $sth = $this->db->prepare($query); |
|
| 303 | - $sth->execute(array(':id' => $id)); |
|
| 304 | - } catch(PDOException $e) { |
|
| 305 | - echo $e->getMessage(); |
|
| 306 | - die; |
|
| 307 | - } |
|
| 308 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 301 | + try { |
|
| 302 | + $sth = $this->db->prepare($query); |
|
| 303 | + $sth->execute(array(':id' => $id)); |
|
| 304 | + } catch(PDOException $e) { |
|
| 305 | + echo $e->getMessage(); |
|
| 306 | + die; |
|
| 307 | + } |
|
| 308 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 309 | 309 | |
| 310 | - return $spotter_array; |
|
| 311 | - } |
|
| 310 | + return $spotter_array; |
|
| 311 | + } |
|
| 312 | 312 | |
| 313 | - /** |
|
| 314 | - * Gets altitude & speed information based on a particular id |
|
| 315 | - * |
|
| 316 | - * @return Array the spotter information |
|
| 317 | - * |
|
| 318 | - */ |
|
| 319 | - public function getAltitudeSpeedArchiveSpotterDataById($id) |
|
| 320 | - { |
|
| 313 | + /** |
|
| 314 | + * Gets altitude & speed information based on a particular id |
|
| 315 | + * |
|
| 316 | + * @return Array the spotter information |
|
| 317 | + * |
|
| 318 | + */ |
|
| 319 | + public function getAltitudeSpeedArchiveSpotterDataById($id) |
|
| 320 | + { |
|
| 321 | 321 | |
| 322 | - date_default_timezone_set('UTC'); |
|
| 322 | + date_default_timezone_set('UTC'); |
|
| 323 | 323 | |
| 324 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 325 | - $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 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 325 | + $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"; |
|
| 326 | 326 | |
| 327 | - try { |
|
| 328 | - $sth = $this->db->prepare($query); |
|
| 329 | - $sth->execute(array(':id' => $id)); |
|
| 330 | - } catch(PDOException $e) { |
|
| 331 | - echo $e->getMessage(); |
|
| 332 | - die; |
|
| 333 | - } |
|
| 334 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 327 | + try { |
|
| 328 | + $sth = $this->db->prepare($query); |
|
| 329 | + $sth->execute(array(':id' => $id)); |
|
| 330 | + } catch(PDOException $e) { |
|
| 331 | + echo $e->getMessage(); |
|
| 332 | + die; |
|
| 333 | + } |
|
| 334 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 335 | 335 | |
| 336 | - return $spotter_array; |
|
| 337 | - } |
|
| 336 | + return $spotter_array; |
|
| 337 | + } |
|
| 338 | 338 | |
| 339 | 339 | |
| 340 | - /** |
|
| 341 | - * Gets altitude information based on a particular callsign |
|
| 342 | - * |
|
| 343 | - * @return Array the spotter information |
|
| 344 | - * |
|
| 345 | - */ |
|
| 346 | - public function getLastAltitudeArchiveSpotterDataByIdent($ident) |
|
| 347 | - { |
|
| 340 | + /** |
|
| 341 | + * Gets altitude information based on a particular callsign |
|
| 342 | + * |
|
| 343 | + * @return Array the spotter information |
|
| 344 | + * |
|
| 345 | + */ |
|
| 346 | + public function getLastAltitudeArchiveSpotterDataByIdent($ident) |
|
| 347 | + { |
|
| 348 | 348 | |
| 349 | - date_default_timezone_set('UTC'); |
|
| 349 | + date_default_timezone_set('UTC'); |
|
| 350 | 350 | |
| 351 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 352 | - $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 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 352 | + $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"; |
|
| 353 | 353 | // $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident"; |
| 354 | 354 | |
| 355 | - try { |
|
| 356 | - $sth = $this->db->prepare($query); |
|
| 357 | - $sth->execute(array(':ident' => $ident)); |
|
| 358 | - } catch(PDOException $e) { |
|
| 359 | - echo $e->getMessage(); |
|
| 360 | - die; |
|
| 361 | - } |
|
| 362 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 355 | + try { |
|
| 356 | + $sth = $this->db->prepare($query); |
|
| 357 | + $sth->execute(array(':ident' => $ident)); |
|
| 358 | + } catch(PDOException $e) { |
|
| 359 | + echo $e->getMessage(); |
|
| 360 | + die; |
|
| 361 | + } |
|
| 362 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 363 | 363 | |
| 364 | - return $spotter_array; |
|
| 365 | - } |
|
| 364 | + return $spotter_array; |
|
| 365 | + } |
|
| 366 | 366 | |
| 367 | 367 | |
| 368 | 368 | |
| 369 | - /** |
|
| 370 | - * Gets all the archive spotter information |
|
| 371 | - * |
|
| 372 | - * @return Array the spotter information |
|
| 373 | - * |
|
| 374 | - */ |
|
| 375 | - public function getSpotterArchiveData($ident,$flightaware_id,$date) |
|
| 376 | - { |
|
| 377 | - $Spotter = new Spotter($this->db); |
|
| 378 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 379 | - $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"; |
|
| 369 | + /** |
|
| 370 | + * Gets all the archive spotter information |
|
| 371 | + * |
|
| 372 | + * @return Array the spotter information |
|
| 373 | + * |
|
| 374 | + */ |
|
| 375 | + public function getSpotterArchiveData($ident,$flightaware_id,$date) |
|
| 376 | + { |
|
| 377 | + $Spotter = new Spotter($this->db); |
|
| 378 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 379 | + $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"; |
|
| 380 | 380 | |
| 381 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':flightaware_id' => $flightaware_id,':date' => $date.'%')); |
|
| 381 | + $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':flightaware_id' => $flightaware_id,':date' => $date.'%')); |
|
| 382 | 382 | |
| 383 | - return $spotter_array; |
|
| 384 | - } |
|
| 383 | + return $spotter_array; |
|
| 384 | + } |
|
| 385 | 385 | |
| 386 | - public function deleteSpotterArchiveTrackData() |
|
| 387 | - { |
|
| 386 | + public function deleteSpotterArchiveTrackData() |
|
| 387 | + { |
|
| 388 | 388 | global $globalArchiveKeepTrackMonths, $globalDBdriver; |
| 389 | 389 | if ($globalDBdriver == 'mysql') { |
| 390 | 390 | $query = 'DELETE FROM spotter_archive WHERE spotter_archive.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepTrackMonths.' MONTH)'; |
| 391 | 391 | } else { |
| 392 | 392 | $query = "DELETE FROM spotter_archive WHERE spotter_archive.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveKeepTrackMonths." MONTH'"; |
| 393 | 393 | } |
| 394 | - try { |
|
| 395 | - $sth = $this->db->prepare($query); |
|
| 396 | - $sth->execute(); |
|
| 397 | - } catch(PDOException $e) { |
|
| 398 | - echo $e->getMessage(); |
|
| 399 | - die; |
|
| 400 | - } |
|
| 394 | + try { |
|
| 395 | + $sth = $this->db->prepare($query); |
|
| 396 | + $sth->execute(); |
|
| 397 | + } catch(PDOException $e) { |
|
| 398 | + echo $e->getMessage(); |
|
| 399 | + die; |
|
| 400 | + } |
|
| 401 | 401 | } |
| 402 | 402 | |
| 403 | 403 | /** |
| 404 | - * Gets Minimal Live Spotter data |
|
| 405 | - * |
|
| 406 | - * @return Array the spotter information |
|
| 407 | - * |
|
| 408 | - */ |
|
| 409 | - public function getMinLiveSpotterData($begindate,$enddate,$filter = array()) |
|
| 410 | - { |
|
| 411 | - global $globalDBdriver, $globalLiveInterval; |
|
| 412 | - date_default_timezone_set('UTC'); |
|
| 413 | - |
|
| 414 | - $filter_query = ''; |
|
| 415 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 416 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 417 | - } |
|
| 418 | - // Use spotter_output also ? |
|
| 419 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 420 | - $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 "; |
|
| 421 | - } |
|
| 422 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 423 | - $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 "; |
|
| 424 | - } |
|
| 425 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 426 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 427 | - } |
|
| 428 | - |
|
| 429 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 430 | - if ($globalDBdriver == 'mysql') { |
|
| 431 | - /* |
|
| 404 | + * Gets Minimal Live Spotter data |
|
| 405 | + * |
|
| 406 | + * @return Array the spotter information |
|
| 407 | + * |
|
| 408 | + */ |
|
| 409 | + public function getMinLiveSpotterData($begindate,$enddate,$filter = array()) |
|
| 410 | + { |
|
| 411 | + global $globalDBdriver, $globalLiveInterval; |
|
| 412 | + date_default_timezone_set('UTC'); |
|
| 413 | + |
|
| 414 | + $filter_query = ''; |
|
| 415 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 416 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 417 | + } |
|
| 418 | + // Use spotter_output also ? |
|
| 419 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 420 | + $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 "; |
|
| 421 | + } |
|
| 422 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 423 | + $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 "; |
|
| 424 | + } |
|
| 425 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 426 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 427 | + } |
|
| 428 | + |
|
| 429 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 430 | + if ($globalDBdriver == 'mysql') { |
|
| 431 | + /* |
|
| 432 | 432 | $query = 'SELECT a.aircraft_shadow, spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk |
| 433 | 433 | FROM spotter_archive |
| 434 | 434 | 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'; |
@@ -447,56 +447,56 @@ discard block |
||
| 447 | 447 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao |
| 448 | 448 | WHERE spotter_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' |
| 449 | 449 | '.$filter_query.' ORDER BY flightaware_id'; |
| 450 | - } else { |
|
| 451 | - //$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'; |
|
| 452 | - $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 |
|
| 450 | + } else { |
|
| 451 | + //$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'; |
|
| 452 | + $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 |
|
| 453 | 453 | FROM spotter_archive |
| 454 | 454 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao |
| 455 | 455 | WHERE spotter_archive.date >= '."'".$begindate."'".' AND spotter_archive.date <= '."'".$enddate."'".' |
| 456 | 456 | '.$filter_query.' ORDER BY flightaware_id'; |
| 457 | - } |
|
| 458 | - //echo $query; |
|
| 459 | - try { |
|
| 460 | - $sth = $this->db->prepare($query); |
|
| 461 | - $sth->execute(); |
|
| 462 | - } catch(PDOException $e) { |
|
| 463 | - echo $e->getMessage(); |
|
| 464 | - die; |
|
| 465 | - } |
|
| 466 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 467 | - |
|
| 468 | - return $spotter_array; |
|
| 469 | - } |
|
| 457 | + } |
|
| 458 | + //echo $query; |
|
| 459 | + try { |
|
| 460 | + $sth = $this->db->prepare($query); |
|
| 461 | + $sth->execute(); |
|
| 462 | + } catch(PDOException $e) { |
|
| 463 | + echo $e->getMessage(); |
|
| 464 | + die; |
|
| 465 | + } |
|
| 466 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 467 | + |
|
| 468 | + return $spotter_array; |
|
| 469 | + } |
|
| 470 | 470 | |
| 471 | 471 | /** |
| 472 | - * Gets Minimal Live Spotter data |
|
| 473 | - * |
|
| 474 | - * @return Array the spotter information |
|
| 475 | - * |
|
| 476 | - */ |
|
| 477 | - public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array()) |
|
| 478 | - { |
|
| 479 | - global $globalDBdriver, $globalLiveInterval; |
|
| 480 | - date_default_timezone_set('UTC'); |
|
| 481 | - |
|
| 482 | - $filter_query = ''; |
|
| 483 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 484 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 485 | - } |
|
| 486 | - // Should use spotter_output also ? |
|
| 487 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 488 | - $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 "; |
|
| 489 | - } |
|
| 490 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 491 | - $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 "; |
|
| 492 | - } |
|
| 493 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 494 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 495 | - } |
|
| 496 | - |
|
| 497 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 498 | - if ($globalDBdriver == 'mysql') { |
|
| 499 | - /* |
|
| 472 | + * Gets Minimal Live Spotter data |
|
| 473 | + * |
|
| 474 | + * @return Array the spotter information |
|
| 475 | + * |
|
| 476 | + */ |
|
| 477 | + public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array()) |
|
| 478 | + { |
|
| 479 | + global $globalDBdriver, $globalLiveInterval; |
|
| 480 | + date_default_timezone_set('UTC'); |
|
| 481 | + |
|
| 482 | + $filter_query = ''; |
|
| 483 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 484 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 485 | + } |
|
| 486 | + // Should use spotter_output also ? |
|
| 487 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 488 | + $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 "; |
|
| 489 | + } |
|
| 490 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 491 | + $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 "; |
|
| 492 | + } |
|
| 493 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 494 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 495 | + } |
|
| 496 | + |
|
| 497 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 498 | + if ($globalDBdriver == 'mysql') { |
|
| 499 | + /* |
|
| 500 | 500 | $query = 'SELECT a.aircraft_shadow, spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk |
| 501 | 501 | FROM spotter_archive |
| 502 | 502 | 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'; |
@@ -507,95 +507,95 @@ discard block |
||
| 507 | 507 | WHERE (spotter_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') |
| 508 | 508 | '.$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'; |
| 509 | 509 | |
| 510 | - } else { |
|
| 511 | - //$query = 'SELECT spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow FROM spotter_archive_output INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive_output.flightaware_id = s.flightaware_id AND spotter_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao'; |
|
| 512 | - /* |
|
| 510 | + } else { |
|
| 511 | + //$query = 'SELECT spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow FROM spotter_archive_output INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive_output.flightaware_id = s.flightaware_id AND spotter_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao'; |
|
| 512 | + /* |
|
| 513 | 513 | $query = 'SELECT spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
| 514 | 514 | FROM spotter_archive_output |
| 515 | 515 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao |
| 516 | 516 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
| 517 | 517 | '.$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'; |
| 518 | 518 | */ |
| 519 | - $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 | + $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 |
|
| 520 | 520 | FROM spotter_archive_output |
| 521 | 521 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao |
| 522 | 522 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
| 523 | 523 | '.$filter_query.' LIMIT 200 OFFSET 0'; |
| 524 | 524 | // .' GROUP BY spotter_output.flightaware_id, spotter_output.ident, spotter_output.aircraft_icao, spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao, spotter_output.latitude, spotter_output.longitude, spotter_output.altitude, spotter_output.heading, spotter_output.ground_speed, spotter_output.squawk, a.aircraft_shadow'; |
| 525 | 525 | |
| 526 | - } |
|
| 527 | - //echo $query; |
|
| 528 | - try { |
|
| 529 | - $sth = $this->db->prepare($query); |
|
| 530 | - $sth->execute(); |
|
| 531 | - } catch(PDOException $e) { |
|
| 532 | - echo $e->getMessage(); |
|
| 533 | - die; |
|
| 534 | - } |
|
| 535 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 536 | - |
|
| 537 | - return $spotter_array; |
|
| 538 | - } |
|
| 526 | + } |
|
| 527 | + //echo $query; |
|
| 528 | + try { |
|
| 529 | + $sth = $this->db->prepare($query); |
|
| 530 | + $sth->execute(); |
|
| 531 | + } catch(PDOException $e) { |
|
| 532 | + echo $e->getMessage(); |
|
| 533 | + die; |
|
| 534 | + } |
|
| 535 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 536 | + |
|
| 537 | + return $spotter_array; |
|
| 538 | + } |
|
| 539 | 539 | |
| 540 | 540 | /** |
| 541 | - * Gets count Live Spotter data |
|
| 542 | - * |
|
| 543 | - * @return Array the spotter information |
|
| 544 | - * |
|
| 545 | - */ |
|
| 546 | - public function getLiveSpotterCount($begindate,$enddate,$filter = array()) |
|
| 547 | - { |
|
| 548 | - global $globalDBdriver, $globalLiveInterval; |
|
| 549 | - date_default_timezone_set('UTC'); |
|
| 550 | - |
|
| 551 | - $filter_query = ''; |
|
| 552 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 553 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 554 | - } |
|
| 555 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 556 | - $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 "; |
|
| 557 | - } |
|
| 558 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 559 | - $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 "; |
|
| 560 | - } |
|
| 561 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 562 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 563 | - } |
|
| 564 | - |
|
| 565 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 566 | - if ($globalDBdriver == 'mysql') { |
|
| 541 | + * Gets count Live Spotter data |
|
| 542 | + * |
|
| 543 | + * @return Array the spotter information |
|
| 544 | + * |
|
| 545 | + */ |
|
| 546 | + public function getLiveSpotterCount($begindate,$enddate,$filter = array()) |
|
| 547 | + { |
|
| 548 | + global $globalDBdriver, $globalLiveInterval; |
|
| 549 | + date_default_timezone_set('UTC'); |
|
| 550 | + |
|
| 551 | + $filter_query = ''; |
|
| 552 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 553 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 554 | + } |
|
| 555 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 556 | + $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 "; |
|
| 557 | + } |
|
| 558 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 559 | + $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 "; |
|
| 560 | + } |
|
| 561 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 562 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 563 | + } |
|
| 564 | + |
|
| 565 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 566 | + if ($globalDBdriver == 'mysql') { |
|
| 567 | 567 | $query = 'SELECT COUNT(DISTINCT flightaware_id) as nb |
| 568 | 568 | FROM spotter_archive l |
| 569 | 569 | WHERE (l.date BETWEEN DATE_SUB('."'".$begindate."'".',INTERVAL '.$globalLiveInterval.' SECOND) AND '."'".$begindate."'".')'.$filter_query; |
| 570 | - } else { |
|
| 570 | + } else { |
|
| 571 | 571 | $query = 'SELECT COUNT(DISTINCT flightaware_id) as nb FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."' - INTERVAL '".$globalLiveInterval." SECONDS' AND "."'".$enddate."'".')'.$filter_query; |
| 572 | - } |
|
| 573 | - //echo $query; |
|
| 574 | - try { |
|
| 575 | - $sth = $this->db->prepare($query); |
|
| 576 | - $sth->execute(); |
|
| 577 | - } catch(PDOException $e) { |
|
| 578 | - echo $e->getMessage(); |
|
| 579 | - die; |
|
| 580 | - } |
|
| 572 | + } |
|
| 573 | + //echo $query; |
|
| 574 | + try { |
|
| 575 | + $sth = $this->db->prepare($query); |
|
| 576 | + $sth->execute(); |
|
| 577 | + } catch(PDOException $e) { |
|
| 578 | + echo $e->getMessage(); |
|
| 579 | + die; |
|
| 580 | + } |
|
| 581 | 581 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
| 582 | 582 | $sth->closeCursor(); |
| 583 | - return $result['nb']; |
|
| 583 | + return $result['nb']; |
|
| 584 | 584 | |
| 585 | - } |
|
| 585 | + } |
|
| 586 | 586 | |
| 587 | 587 | |
| 588 | 588 | |
| 589 | 589 | // Spotter_Archive_output |
| 590 | 590 | |
| 591 | - /** |
|
| 592 | - * Gets all the spotter information |
|
| 593 | - * |
|
| 594 | - * @return Array the spotter information |
|
| 595 | - * |
|
| 596 | - */ |
|
| 597 | - 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()) |
|
| 598 | - { |
|
| 591 | + /** |
|
| 592 | + * Gets all the spotter information |
|
| 593 | + * |
|
| 594 | + * @return Array the spotter information |
|
| 595 | + * |
|
| 596 | + */ |
|
| 597 | + 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()) |
|
| 598 | + { |
|
| 599 | 599 | global $globalTimezone, $globalDBdriver; |
| 600 | 600 | require_once(dirname(__FILE__).'/class.Translation.php'); |
| 601 | 601 | $Translation = new Translation($this->db); |
@@ -609,159 +609,159 @@ discard block |
||
| 609 | 609 | $filter_query = $this->getFilter($filters); |
| 610 | 610 | if ($q != "") |
| 611 | 611 | { |
| 612 | - if (!is_string($q)) |
|
| 613 | - { |
|
| 612 | + if (!is_string($q)) |
|
| 613 | + { |
|
| 614 | 614 | return false; |
| 615 | - } else { |
|
| 615 | + } else { |
|
| 616 | 616 | |
| 617 | 617 | $q_array = explode(" ", $q); |
| 618 | 618 | |
| 619 | 619 | foreach ($q_array as $q_item){ |
| 620 | - $additional_query .= " AND ("; |
|
| 621 | - $additional_query .= "(spotter_archive_output.spotter_id like '%".$q_item."%') OR "; |
|
| 622 | - $additional_query .= "(spotter_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
|
| 623 | - $additional_query .= "(spotter_archive_output.aircraft_name like '%".$q_item."%') OR "; |
|
| 624 | - $additional_query .= "(spotter_archive_output.aircraft_manufacturer like '%".$q_item."%') OR "; |
|
| 625 | - $additional_query .= "(spotter_archive_output.airline_icao like '%".$q_item."%') OR "; |
|
| 626 | - $additional_query .= "(spotter_archive_output.airline_name like '%".$q_item."%') OR "; |
|
| 627 | - $additional_query .= "(spotter_archive_output.airline_country like '%".$q_item."%') OR "; |
|
| 628 | - $additional_query .= "(spotter_archive_output.departure_airport_icao like '%".$q_item."%') OR "; |
|
| 629 | - $additional_query .= "(spotter_archive_output.departure_airport_name like '%".$q_item."%') OR "; |
|
| 630 | - $additional_query .= "(spotter_archive_output.departure_airport_city like '%".$q_item."%') OR "; |
|
| 631 | - $additional_query .= "(spotter_archive_output.departure_airport_country like '%".$q_item."%') OR "; |
|
| 632 | - $additional_query .= "(spotter_archive_output.arrival_airport_icao like '%".$q_item."%') OR "; |
|
| 633 | - $additional_query .= "(spotter_archive_output.arrival_airport_name like '%".$q_item."%') OR "; |
|
| 634 | - $additional_query .= "(spotter_archive_output.arrival_airport_city like '%".$q_item."%') OR "; |
|
| 635 | - $additional_query .= "(spotter_archive_output.arrival_airport_country like '%".$q_item."%') OR "; |
|
| 636 | - $additional_query .= "(spotter_archive_output.registration like '%".$q_item."%') OR "; |
|
| 637 | - $additional_query .= "(spotter_archive_output.owner_name like '%".$q_item."%') OR "; |
|
| 638 | - $additional_query .= "(spotter_archive_output.pilot_id like '%".$q_item."%') OR "; |
|
| 639 | - $additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR "; |
|
| 640 | - $additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR "; |
|
| 641 | - $translate = $Translation->ident2icao($q_item); |
|
| 642 | - if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR "; |
|
| 643 | - $additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')"; |
|
| 644 | - $additional_query .= ")"; |
|
| 645 | - } |
|
| 646 | - } |
|
| 620 | + $additional_query .= " AND ("; |
|
| 621 | + $additional_query .= "(spotter_archive_output.spotter_id like '%".$q_item."%') OR "; |
|
| 622 | + $additional_query .= "(spotter_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
|
| 623 | + $additional_query .= "(spotter_archive_output.aircraft_name like '%".$q_item."%') OR "; |
|
| 624 | + $additional_query .= "(spotter_archive_output.aircraft_manufacturer like '%".$q_item."%') OR "; |
|
| 625 | + $additional_query .= "(spotter_archive_output.airline_icao like '%".$q_item."%') OR "; |
|
| 626 | + $additional_query .= "(spotter_archive_output.airline_name like '%".$q_item."%') OR "; |
|
| 627 | + $additional_query .= "(spotter_archive_output.airline_country like '%".$q_item."%') OR "; |
|
| 628 | + $additional_query .= "(spotter_archive_output.departure_airport_icao like '%".$q_item."%') OR "; |
|
| 629 | + $additional_query .= "(spotter_archive_output.departure_airport_name like '%".$q_item."%') OR "; |
|
| 630 | + $additional_query .= "(spotter_archive_output.departure_airport_city like '%".$q_item."%') OR "; |
|
| 631 | + $additional_query .= "(spotter_archive_output.departure_airport_country like '%".$q_item."%') OR "; |
|
| 632 | + $additional_query .= "(spotter_archive_output.arrival_airport_icao like '%".$q_item."%') OR "; |
|
| 633 | + $additional_query .= "(spotter_archive_output.arrival_airport_name like '%".$q_item."%') OR "; |
|
| 634 | + $additional_query .= "(spotter_archive_output.arrival_airport_city like '%".$q_item."%') OR "; |
|
| 635 | + $additional_query .= "(spotter_archive_output.arrival_airport_country like '%".$q_item."%') OR "; |
|
| 636 | + $additional_query .= "(spotter_archive_output.registration like '%".$q_item."%') OR "; |
|
| 637 | + $additional_query .= "(spotter_archive_output.owner_name like '%".$q_item."%') OR "; |
|
| 638 | + $additional_query .= "(spotter_archive_output.pilot_id like '%".$q_item."%') OR "; |
|
| 639 | + $additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR "; |
|
| 640 | + $additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR "; |
|
| 641 | + $translate = $Translation->ident2icao($q_item); |
|
| 642 | + if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR "; |
|
| 643 | + $additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')"; |
|
| 644 | + $additional_query .= ")"; |
|
| 645 | + } |
|
| 646 | + } |
|
| 647 | 647 | } |
| 648 | 648 | |
| 649 | 649 | if ($registration != "") |
| 650 | 650 | { |
| 651 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 652 | - if (!is_string($registration)) |
|
| 653 | - { |
|
| 651 | + $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 652 | + if (!is_string($registration)) |
|
| 653 | + { |
|
| 654 | 654 | return false; |
| 655 | - } else { |
|
| 655 | + } else { |
|
| 656 | 656 | $additional_query .= " AND (spotter_archive_output.registration = '".$registration."')"; |
| 657 | - } |
|
| 657 | + } |
|
| 658 | 658 | } |
| 659 | 659 | |
| 660 | 660 | if ($aircraft_icao != "") |
| 661 | 661 | { |
| 662 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 663 | - if (!is_string($aircraft_icao)) |
|
| 664 | - { |
|
| 662 | + $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 663 | + if (!is_string($aircraft_icao)) |
|
| 664 | + { |
|
| 665 | 665 | return false; |
| 666 | - } else { |
|
| 666 | + } else { |
|
| 667 | 667 | $additional_query .= " AND (spotter_archive_output.aircraft_icao = '".$aircraft_icao."')"; |
| 668 | - } |
|
| 668 | + } |
|
| 669 | 669 | } |
| 670 | 670 | |
| 671 | 671 | if ($aircraft_manufacturer != "") |
| 672 | 672 | { |
| 673 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 674 | - if (!is_string($aircraft_manufacturer)) |
|
| 675 | - { |
|
| 673 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 674 | + if (!is_string($aircraft_manufacturer)) |
|
| 675 | + { |
|
| 676 | 676 | return false; |
| 677 | - } else { |
|
| 677 | + } else { |
|
| 678 | 678 | $additional_query .= " AND (spotter_archive_output.aircraft_manufacturer = '".$aircraft_manufacturer."')"; |
| 679 | - } |
|
| 679 | + } |
|
| 680 | 680 | } |
| 681 | 681 | |
| 682 | 682 | if ($highlights == "true") |
| 683 | 683 | { |
| 684 | - if (!is_string($highlights)) |
|
| 685 | - { |
|
| 684 | + if (!is_string($highlights)) |
|
| 685 | + { |
|
| 686 | 686 | return false; |
| 687 | - } else { |
|
| 687 | + } else { |
|
| 688 | 688 | $additional_query .= " AND (spotter_archive_output.highlight <> '')"; |
| 689 | - } |
|
| 689 | + } |
|
| 690 | 690 | } |
| 691 | 691 | |
| 692 | 692 | if ($airline_icao != "") |
| 693 | 693 | { |
| 694 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 695 | - if (!is_string($airline_icao)) |
|
| 696 | - { |
|
| 694 | + $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 695 | + if (!is_string($airline_icao)) |
|
| 696 | + { |
|
| 697 | 697 | return false; |
| 698 | - } else { |
|
| 698 | + } else { |
|
| 699 | 699 | $additional_query .= " AND (spotter_archive_output.airline_icao = '".$airline_icao."')"; |
| 700 | - } |
|
| 700 | + } |
|
| 701 | 701 | } |
| 702 | 702 | |
| 703 | 703 | if ($airline_country != "") |
| 704 | 704 | { |
| 705 | - $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 706 | - if (!is_string($airline_country)) |
|
| 707 | - { |
|
| 705 | + $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 706 | + if (!is_string($airline_country)) |
|
| 707 | + { |
|
| 708 | 708 | return false; |
| 709 | - } else { |
|
| 709 | + } else { |
|
| 710 | 710 | $additional_query .= " AND (spotter_archive_output.airline_country = '".$airline_country."')"; |
| 711 | - } |
|
| 711 | + } |
|
| 712 | 712 | } |
| 713 | 713 | |
| 714 | 714 | if ($airline_type != "") |
| 715 | 715 | { |
| 716 | - $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 717 | - if (!is_string($airline_type)) |
|
| 718 | - { |
|
| 716 | + $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 717 | + if (!is_string($airline_type)) |
|
| 718 | + { |
|
| 719 | 719 | return false; |
| 720 | - } else { |
|
| 720 | + } else { |
|
| 721 | 721 | if ($airline_type == "passenger") |
| 722 | 722 | { |
| 723 | - $additional_query .= " AND (spotter_archive_output.airline_type = 'passenger')"; |
|
| 723 | + $additional_query .= " AND (spotter_archive_output.airline_type = 'passenger')"; |
|
| 724 | 724 | } |
| 725 | 725 | if ($airline_type == "cargo") |
| 726 | 726 | { |
| 727 | - $additional_query .= " AND (spotter_archive_output.airline_type = 'cargo')"; |
|
| 727 | + $additional_query .= " AND (spotter_archive_output.airline_type = 'cargo')"; |
|
| 728 | 728 | } |
| 729 | 729 | if ($airline_type == "military") |
| 730 | 730 | { |
| 731 | - $additional_query .= " AND (spotter_archive_output.airline_type = 'military')"; |
|
| 731 | + $additional_query .= " AND (spotter_archive_output.airline_type = 'military')"; |
|
| 732 | + } |
|
| 732 | 733 | } |
| 733 | - } |
|
| 734 | 734 | } |
| 735 | 735 | |
| 736 | 736 | if ($airport != "") |
| 737 | 737 | { |
| 738 | - $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 739 | - if (!is_string($airport)) |
|
| 740 | - { |
|
| 738 | + $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 739 | + if (!is_string($airport)) |
|
| 740 | + { |
|
| 741 | 741 | return false; |
| 742 | - } else { |
|
| 742 | + } else { |
|
| 743 | 743 | $additional_query .= " AND ((spotter_archive_output.departure_airport_icao = '".$airport."') OR (spotter_archive_output.arrival_airport_icao = '".$airport."'))"; |
| 744 | - } |
|
| 744 | + } |
|
| 745 | 745 | } |
| 746 | 746 | |
| 747 | 747 | if ($airport_country != "") |
| 748 | 748 | { |
| 749 | - $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 750 | - if (!is_string($airport_country)) |
|
| 751 | - { |
|
| 749 | + $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 750 | + if (!is_string($airport_country)) |
|
| 751 | + { |
|
| 752 | 752 | return false; |
| 753 | - } else { |
|
| 753 | + } else { |
|
| 754 | 754 | $additional_query .= " AND ((spotter_archive_output.departure_airport_country = '".$airport_country."') OR (spotter_archive_output.arrival_airport_country = '".$airport_country."'))"; |
| 755 | - } |
|
| 755 | + } |
|
| 756 | 756 | } |
| 757 | 757 | |
| 758 | 758 | if ($callsign != "") |
| 759 | 759 | { |
| 760 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 761 | - if (!is_string($callsign)) |
|
| 762 | - { |
|
| 760 | + $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 761 | + if (!is_string($callsign)) |
|
| 762 | + { |
|
| 763 | 763 | return false; |
| 764 | - } else { |
|
| 764 | + } else { |
|
| 765 | 765 | $translate = $Translation->ident2icao($callsign); |
| 766 | 766 | if ($translate != $callsign) { |
| 767 | 767 | $additional_query .= " AND (spotter_archive_output.ident = :callsign OR spotter_archive_output.ident = :translate)"; |
@@ -769,99 +769,99 @@ discard block |
||
| 769 | 769 | } else { |
| 770 | 770 | $additional_query .= " AND (spotter_archive_output.ident = '".$callsign."')"; |
| 771 | 771 | } |
| 772 | - } |
|
| 772 | + } |
|
| 773 | 773 | } |
| 774 | 774 | |
| 775 | 775 | if ($owner != "") |
| 776 | 776 | { |
| 777 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 778 | - if (!is_string($owner)) |
|
| 779 | - { |
|
| 777 | + $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 778 | + if (!is_string($owner)) |
|
| 779 | + { |
|
| 780 | 780 | return false; |
| 781 | - } else { |
|
| 781 | + } else { |
|
| 782 | 782 | $additional_query .= " AND (spotter_archive_output.owner_name = '".$owner."')"; |
| 783 | - } |
|
| 783 | + } |
|
| 784 | 784 | } |
| 785 | 785 | |
| 786 | 786 | if ($pilot_name != "") |
| 787 | 787 | { |
| 788 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 789 | - if (!is_string($pilot_name)) |
|
| 790 | - { |
|
| 788 | + $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 789 | + if (!is_string($pilot_name)) |
|
| 790 | + { |
|
| 791 | 791 | return false; |
| 792 | - } else { |
|
| 792 | + } else { |
|
| 793 | 793 | $additional_query .= " AND (spotter_archive_output.pilot_name = '".$pilot_name."')"; |
| 794 | - } |
|
| 794 | + } |
|
| 795 | 795 | } |
| 796 | 796 | |
| 797 | 797 | if ($pilot_id != "") |
| 798 | 798 | { |
| 799 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 800 | - if (!is_string($pilot_id)) |
|
| 801 | - { |
|
| 799 | + $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 800 | + if (!is_string($pilot_id)) |
|
| 801 | + { |
|
| 802 | 802 | return false; |
| 803 | - } else { |
|
| 803 | + } else { |
|
| 804 | 804 | $additional_query .= " AND (spotter_archive_output.pilot_id = '".$pilot_id."')"; |
| 805 | - } |
|
| 805 | + } |
|
| 806 | 806 | } |
| 807 | 807 | |
| 808 | 808 | if ($departure_airport_route != "") |
| 809 | 809 | { |
| 810 | - $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 811 | - if (!is_string($departure_airport_route)) |
|
| 812 | - { |
|
| 810 | + $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 811 | + if (!is_string($departure_airport_route)) |
|
| 812 | + { |
|
| 813 | 813 | return false; |
| 814 | - } else { |
|
| 814 | + } else { |
|
| 815 | 815 | $additional_query .= " AND (spotter_archive_output.departure_airport_icao = '".$departure_airport_route."')"; |
| 816 | - } |
|
| 816 | + } |
|
| 817 | 817 | } |
| 818 | 818 | |
| 819 | 819 | if ($arrival_airport_route != "") |
| 820 | 820 | { |
| 821 | - $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 822 | - if (!is_string($arrival_airport_route)) |
|
| 823 | - { |
|
| 821 | + $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 822 | + if (!is_string($arrival_airport_route)) |
|
| 823 | + { |
|
| 824 | 824 | return false; |
| 825 | - } else { |
|
| 825 | + } else { |
|
| 826 | 826 | $additional_query .= " AND (spotter_archive_output.arrival_airport_icao = '".$arrival_airport_route."')"; |
| 827 | - } |
|
| 827 | + } |
|
| 828 | 828 | } |
| 829 | 829 | |
| 830 | 830 | if ($altitude != "") |
| 831 | 831 | { |
| 832 | - $altitude_array = explode(",", $altitude); |
|
| 832 | + $altitude_array = explode(",", $altitude); |
|
| 833 | 833 | |
| 834 | - $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 835 | - $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 834 | + $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 835 | + $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 836 | 836 | |
| 837 | 837 | |
| 838 | - if ($altitude_array[1] != "") |
|
| 839 | - { |
|
| 838 | + if ($altitude_array[1] != "") |
|
| 839 | + { |
|
| 840 | 840 | $altitude_array[0] = substr($altitude_array[0], 0, -2); |
| 841 | 841 | $altitude_array[1] = substr($altitude_array[1], 0, -2); |
| 842 | 842 | $additional_query .= " AND altitude BETWEEN '".$altitude_array[0]."' AND '".$altitude_array[1]."' "; |
| 843 | - } else { |
|
| 843 | + } else { |
|
| 844 | 844 | $altitude_array[0] = substr($altitude_array[0], 0, -2); |
| 845 | 845 | $additional_query .= " AND altitude <= '".$altitude_array[0]."' "; |
| 846 | - } |
|
| 846 | + } |
|
| 847 | 847 | } |
| 848 | 848 | |
| 849 | 849 | if ($date_posted != "") |
| 850 | 850 | { |
| 851 | - $date_array = explode(",", $date_posted); |
|
| 851 | + $date_array = explode(",", $date_posted); |
|
| 852 | 852 | |
| 853 | - $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 854 | - $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 853 | + $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 854 | + $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 855 | 855 | |
| 856 | - if ($globalTimezone != '') { |
|
| 856 | + if ($globalTimezone != '') { |
|
| 857 | 857 | date_default_timezone_set($globalTimezone); |
| 858 | 858 | $datetime = new DateTime(); |
| 859 | 859 | $offset = $datetime->format('P'); |
| 860 | - } else $offset = '+00:00'; |
|
| 860 | + } else $offset = '+00:00'; |
|
| 861 | 861 | |
| 862 | 862 | |
| 863 | - if ($date_array[1] != "") |
|
| 864 | - { |
|
| 863 | + if ($date_array[1] != "") |
|
| 864 | + { |
|
| 865 | 865 | $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0])); |
| 866 | 866 | $date_array[1] = date("Y-m-d H:i:s", strtotime($date_array[1])); |
| 867 | 867 | if ($globalDBdriver == 'mysql') { |
@@ -869,28 +869,28 @@ discard block |
||
| 869 | 869 | } else { |
| 870 | 870 | $additional_query .= " AND spotter_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) AND spotter_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." <= CAST('".$date_array[1]."' AS TIMESTAMP) "; |
| 871 | 871 | } |
| 872 | - } else { |
|
| 872 | + } else { |
|
| 873 | 873 | $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0])); |
| 874 | - if ($globalDBdriver == 'mysql') { |
|
| 874 | + if ($globalDBdriver == 'mysql') { |
|
| 875 | 875 | $additional_query .= " AND TIMESTAMP(CONVERT_TZ(spotter_archive_output.date,'+00:00', '".$offset."')) >= '".$date_array[0]."' "; |
| 876 | 876 | } else { |
| 877 | 877 | $additional_query .= " AND spotter_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) "; |
| 878 | 878 | } |
| 879 | - } |
|
| 879 | + } |
|
| 880 | 880 | } |
| 881 | 881 | |
| 882 | 882 | if ($limit != "") |
| 883 | 883 | { |
| 884 | - $limit_array = explode(",", $limit); |
|
| 884 | + $limit_array = explode(",", $limit); |
|
| 885 | 885 | |
| 886 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 887 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 886 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 887 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 888 | 888 | |
| 889 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 890 | - { |
|
| 889 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 890 | + { |
|
| 891 | 891 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 892 | 892 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 893 | - } |
|
| 893 | + } |
|
| 894 | 894 | } |
| 895 | 895 | |
| 896 | 896 | |
@@ -921,33 +921,33 @@ discard block |
||
| 921 | 921 | $spotter_array = $Spotter->getDataFromDB($query, $query_values,$limit_query); |
| 922 | 922 | |
| 923 | 923 | return $spotter_array; |
| 924 | - } |
|
| 924 | + } |
|
| 925 | 925 | |
| 926 | - public function deleteSpotterArchiveData() |
|
| 927 | - { |
|
| 926 | + public function deleteSpotterArchiveData() |
|
| 927 | + { |
|
| 928 | 928 | global $globalArchiveKeepMonths, $globalDBdriver; |
| 929 | - date_default_timezone_set('UTC'); |
|
| 930 | - if ($globalDBdriver == 'mysql') { |
|
| 929 | + date_default_timezone_set('UTC'); |
|
| 930 | + if ($globalDBdriver == 'mysql') { |
|
| 931 | 931 | $query = 'DELETE FROM spotter_archive_output WHERE spotter_archive_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepMonths.' MONTH)'; |
| 932 | 932 | } else { |
| 933 | 933 | $query = "DELETE FROM spotter_archive_output WHERE spotter_archive_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveKeepMonths." MONTH'"; |
| 934 | 934 | } |
| 935 | - try { |
|
| 936 | - $sth = $this->db->prepare($query); |
|
| 937 | - $sth->execute(); |
|
| 938 | - } catch(PDOException $e) { |
|
| 939 | - return "error"; |
|
| 940 | - } |
|
| 935 | + try { |
|
| 936 | + $sth = $this->db->prepare($query); |
|
| 937 | + $sth->execute(); |
|
| 938 | + } catch(PDOException $e) { |
|
| 939 | + return "error"; |
|
| 940 | + } |
|
| 941 | 941 | } |
| 942 | 942 | |
| 943 | - /** |
|
| 944 | - * Gets all the spotter information based on the callsign |
|
| 945 | - * |
|
| 946 | - * @return Array the spotter information |
|
| 947 | - * |
|
| 948 | - */ |
|
| 949 | - public function getSpotterDataByIdent($ident = '', $limit = '', $sort = '') |
|
| 950 | - { |
|
| 943 | + /** |
|
| 944 | + * Gets all the spotter information based on the callsign |
|
| 945 | + * |
|
| 946 | + * @return Array the spotter information |
|
| 947 | + * |
|
| 948 | + */ |
|
| 949 | + public function getSpotterDataByIdent($ident = '', $limit = '', $sort = '') |
|
| 950 | + { |
|
| 951 | 951 | $global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output"; |
| 952 | 952 | |
| 953 | 953 | date_default_timezone_set('UTC'); |
@@ -959,35 +959,35 @@ discard block |
||
| 959 | 959 | |
| 960 | 960 | if ($ident != "") |
| 961 | 961 | { |
| 962 | - if (!is_string($ident)) |
|
| 963 | - { |
|
| 962 | + if (!is_string($ident)) |
|
| 963 | + { |
|
| 964 | 964 | return false; |
| 965 | - } else { |
|
| 965 | + } else { |
|
| 966 | 966 | $additional_query = " AND (spotter_archive_output.ident = :ident)"; |
| 967 | 967 | $query_values = array(':ident' => $ident); |
| 968 | - } |
|
| 968 | + } |
|
| 969 | 969 | } |
| 970 | 970 | |
| 971 | 971 | if ($limit != "") |
| 972 | 972 | { |
| 973 | - $limit_array = explode(",", $limit); |
|
| 973 | + $limit_array = explode(",", $limit); |
|
| 974 | 974 | |
| 975 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 976 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 975 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 976 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 977 | 977 | |
| 978 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 979 | - { |
|
| 978 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 979 | + { |
|
| 980 | 980 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 981 | 981 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 982 | - } |
|
| 982 | + } |
|
| 983 | 983 | } |
| 984 | 984 | |
| 985 | 985 | if ($sort != "") |
| 986 | 986 | { |
| 987 | - $search_orderby_array = $Spotter->getOrderBy(); |
|
| 988 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 987 | + $search_orderby_array = $Spotter->getOrderBy(); |
|
| 988 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 989 | 989 | } else { |
| 990 | - $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 990 | + $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 991 | 991 | } |
| 992 | 992 | |
| 993 | 993 | $query = $global_query." WHERE spotter_archive_output.ident <> '' ".$additional_query." ".$orderby_query; |
@@ -995,17 +995,17 @@ discard block |
||
| 995 | 995 | $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
| 996 | 996 | |
| 997 | 997 | return $spotter_array; |
| 998 | - } |
|
| 998 | + } |
|
| 999 | 999 | |
| 1000 | 1000 | |
| 1001 | - /** |
|
| 1002 | - * Gets all the spotter information based on the owner |
|
| 1003 | - * |
|
| 1004 | - * @return Array the spotter information |
|
| 1005 | - * |
|
| 1006 | - */ |
|
| 1007 | - public function getSpotterDataByOwner($owner = '', $limit = '', $sort = '', $filter = array()) |
|
| 1008 | - { |
|
| 1001 | + /** |
|
| 1002 | + * Gets all the spotter information based on the owner |
|
| 1003 | + * |
|
| 1004 | + * @return Array the spotter information |
|
| 1005 | + * |
|
| 1006 | + */ |
|
| 1007 | + public function getSpotterDataByOwner($owner = '', $limit = '', $sort = '', $filter = array()) |
|
| 1008 | + { |
|
| 1009 | 1009 | $global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output"; |
| 1010 | 1010 | |
| 1011 | 1011 | date_default_timezone_set('UTC'); |
@@ -1018,35 +1018,35 @@ discard block |
||
| 1018 | 1018 | |
| 1019 | 1019 | if ($owner != "") |
| 1020 | 1020 | { |
| 1021 | - if (!is_string($owner)) |
|
| 1022 | - { |
|
| 1021 | + if (!is_string($owner)) |
|
| 1022 | + { |
|
| 1023 | 1023 | return false; |
| 1024 | - } else { |
|
| 1024 | + } else { |
|
| 1025 | 1025 | $additional_query = " AND (spotter_archive_output.owner_name = :owner)"; |
| 1026 | 1026 | $query_values = array(':owner' => $owner); |
| 1027 | - } |
|
| 1027 | + } |
|
| 1028 | 1028 | } |
| 1029 | 1029 | |
| 1030 | 1030 | if ($limit != "") |
| 1031 | 1031 | { |
| 1032 | - $limit_array = explode(",", $limit); |
|
| 1032 | + $limit_array = explode(",", $limit); |
|
| 1033 | 1033 | |
| 1034 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1035 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1034 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1035 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1036 | 1036 | |
| 1037 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1038 | - { |
|
| 1037 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1038 | + { |
|
| 1039 | 1039 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 1040 | 1040 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 1041 | - } |
|
| 1041 | + } |
|
| 1042 | 1042 | } |
| 1043 | 1043 | |
| 1044 | 1044 | if ($sort != "") |
| 1045 | 1045 | { |
| 1046 | - $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1047 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1046 | + $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1047 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1048 | 1048 | } else { |
| 1049 | - $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1049 | + $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1050 | 1050 | } |
| 1051 | 1051 | |
| 1052 | 1052 | $query = $global_query.$filter_query." spotter_archive_output.owner_name <> '' ".$additional_query." ".$orderby_query; |
@@ -1054,16 +1054,16 @@ discard block |
||
| 1054 | 1054 | $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
| 1055 | 1055 | |
| 1056 | 1056 | return $spotter_array; |
| 1057 | - } |
|
| 1058 | - |
|
| 1059 | - /** |
|
| 1060 | - * Gets all the spotter information based on the pilot |
|
| 1061 | - * |
|
| 1062 | - * @return Array the spotter information |
|
| 1063 | - * |
|
| 1064 | - */ |
|
| 1065 | - public function getSpotterDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array()) |
|
| 1066 | - { |
|
| 1057 | + } |
|
| 1058 | + |
|
| 1059 | + /** |
|
| 1060 | + * Gets all the spotter information based on the pilot |
|
| 1061 | + * |
|
| 1062 | + * @return Array the spotter information |
|
| 1063 | + * |
|
| 1064 | + */ |
|
| 1065 | + public function getSpotterDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array()) |
|
| 1066 | + { |
|
| 1067 | 1067 | $global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output"; |
| 1068 | 1068 | |
| 1069 | 1069 | date_default_timezone_set('UTC'); |
@@ -1082,24 +1082,24 @@ discard block |
||
| 1082 | 1082 | |
| 1083 | 1083 | if ($limit != "") |
| 1084 | 1084 | { |
| 1085 | - $limit_array = explode(",", $limit); |
|
| 1085 | + $limit_array = explode(",", $limit); |
|
| 1086 | 1086 | |
| 1087 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1088 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1087 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1088 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1089 | 1089 | |
| 1090 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1091 | - { |
|
| 1090 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1091 | + { |
|
| 1092 | 1092 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 1093 | 1093 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 1094 | - } |
|
| 1094 | + } |
|
| 1095 | 1095 | } |
| 1096 | 1096 | |
| 1097 | 1097 | if ($sort != "") |
| 1098 | 1098 | { |
| 1099 | - $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1100 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1099 | + $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1100 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1101 | 1101 | } else { |
| 1102 | - $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1102 | + $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1103 | 1103 | } |
| 1104 | 1104 | |
| 1105 | 1105 | $query = $global_query.$filter_query." spotter_archive_output.pilot_name <> '' ".$additional_query." ".$orderby_query; |
@@ -1107,16 +1107,16 @@ discard block |
||
| 1107 | 1107 | $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
| 1108 | 1108 | |
| 1109 | 1109 | return $spotter_array; |
| 1110 | - } |
|
| 1111 | - |
|
| 1112 | - /** |
|
| 1113 | - * Gets all number of flight over countries |
|
| 1114 | - * |
|
| 1115 | - * @return Array the airline country list |
|
| 1116 | - * |
|
| 1117 | - */ |
|
| 1118 | - public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1119 | - { |
|
| 1110 | + } |
|
| 1111 | + |
|
| 1112 | + /** |
|
| 1113 | + * Gets all number of flight over countries |
|
| 1114 | + * |
|
| 1115 | + * @return Array the airline country list |
|
| 1116 | + * |
|
| 1117 | + */ |
|
| 1118 | + public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1119 | + { |
|
| 1120 | 1120 | global $globalDBdriver; |
| 1121 | 1121 | /* |
| 1122 | 1122 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
@@ -1126,14 +1126,14 @@ discard block |
||
| 1126 | 1126 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
| 1127 | 1127 | FROM countries c, spotter_archive s |
| 1128 | 1128 | WHERE c.iso2 = s.over_country "; |
| 1129 | - if ($olderthanmonths > 0) { |
|
| 1130 | - if ($globalDBdriver == 'mysql') { |
|
| 1129 | + if ($olderthanmonths > 0) { |
|
| 1130 | + if ($globalDBdriver == 'mysql') { |
|
| 1131 | 1131 | $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) '; |
| 1132 | 1132 | } else { |
| 1133 | 1133 | $query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1134 | 1134 | } |
| 1135 | 1135 | } |
| 1136 | - if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
| 1136 | + if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
| 1137 | 1137 | $query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1138 | 1138 | if ($limit) $query .= " LIMIT 0,10"; |
| 1139 | 1139 | |
@@ -1146,23 +1146,23 @@ discard block |
||
| 1146 | 1146 | |
| 1147 | 1147 | while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
| 1148 | 1148 | { |
| 1149 | - $temp_array['flight_count'] = $row['nb']; |
|
| 1150 | - $temp_array['flight_country'] = $row['name']; |
|
| 1151 | - $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1152 | - $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1153 | - $flight_array[] = $temp_array; |
|
| 1149 | + $temp_array['flight_count'] = $row['nb']; |
|
| 1150 | + $temp_array['flight_country'] = $row['name']; |
|
| 1151 | + $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1152 | + $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1153 | + $flight_array[] = $temp_array; |
|
| 1154 | 1154 | } |
| 1155 | 1155 | return $flight_array; |
| 1156 | - } |
|
| 1157 | - |
|
| 1158 | - /** |
|
| 1159 | - * Gets all number of flight over countries |
|
| 1160 | - * |
|
| 1161 | - * @return Array the airline country list |
|
| 1162 | - * |
|
| 1163 | - */ |
|
| 1164 | - public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1165 | - { |
|
| 1156 | + } |
|
| 1157 | + |
|
| 1158 | + /** |
|
| 1159 | + * Gets all number of flight over countries |
|
| 1160 | + * |
|
| 1161 | + * @return Array the airline country list |
|
| 1162 | + * |
|
| 1163 | + */ |
|
| 1164 | + public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1165 | + { |
|
| 1166 | 1166 | global $globalDBdriver; |
| 1167 | 1167 | /* |
| 1168 | 1168 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
@@ -1172,14 +1172,14 @@ discard block |
||
| 1172 | 1172 | $query = "SELECT o.airline_icao,c.name, c.iso3, c.iso2, count(c.name) as nb |
| 1173 | 1173 | FROM countries c, spotter_archive s, spotter_output o |
| 1174 | 1174 | WHERE c.iso2 = s.over_country AND o.airline_icao <> '' AND o.flightaware_id = s.flightaware_id "; |
| 1175 | - if ($olderthanmonths > 0) { |
|
| 1176 | - if ($globalDBdriver == 'mysql') { |
|
| 1175 | + if ($olderthanmonths > 0) { |
|
| 1176 | + if ($globalDBdriver == 'mysql') { |
|
| 1177 | 1177 | $query .= 'AND s.date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) '; |
| 1178 | 1178 | } else { |
| 1179 | 1179 | $query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1180 | 1180 | } |
| 1181 | 1181 | } |
| 1182 | - if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' "; |
|
| 1182 | + if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' "; |
|
| 1183 | 1183 | $query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1184 | 1184 | if ($limit) $query .= " LIMIT 0,10"; |
| 1185 | 1185 | |
@@ -1192,24 +1192,24 @@ discard block |
||
| 1192 | 1192 | |
| 1193 | 1193 | while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
| 1194 | 1194 | { |
| 1195 | - $temp_array['airline_icao'] = $row['airline_icao']; |
|
| 1196 | - $temp_array['flight_count'] = $row['nb']; |
|
| 1197 | - $temp_array['flight_country'] = $row['name']; |
|
| 1198 | - $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1199 | - $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1200 | - $flight_array[] = $temp_array; |
|
| 1195 | + $temp_array['airline_icao'] = $row['airline_icao']; |
|
| 1196 | + $temp_array['flight_count'] = $row['nb']; |
|
| 1197 | + $temp_array['flight_country'] = $row['name']; |
|
| 1198 | + $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1199 | + $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1200 | + $flight_array[] = $temp_array; |
|
| 1201 | 1201 | } |
| 1202 | 1202 | return $flight_array; |
| 1203 | - } |
|
| 1204 | - |
|
| 1205 | - /** |
|
| 1206 | - * Gets last spotter information based on a particular callsign |
|
| 1207 | - * |
|
| 1208 | - * @return Array the spotter information |
|
| 1209 | - * |
|
| 1210 | - */ |
|
| 1211 | - public function getDateArchiveSpotterDataById($id,$date) |
|
| 1212 | - { |
|
| 1203 | + } |
|
| 1204 | + |
|
| 1205 | + /** |
|
| 1206 | + * Gets last spotter information based on a particular callsign |
|
| 1207 | + * |
|
| 1208 | + * @return Array the spotter information |
|
| 1209 | + * |
|
| 1210 | + */ |
|
| 1211 | + public function getDateArchiveSpotterDataById($id,$date) |
|
| 1212 | + { |
|
| 1213 | 1213 | $Spotter = new Spotter($this->db); |
| 1214 | 1214 | date_default_timezone_set('UTC'); |
| 1215 | 1215 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
@@ -1217,16 +1217,16 @@ discard block |
||
| 1217 | 1217 | $date = date('c',$date); |
| 1218 | 1218 | $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date)); |
| 1219 | 1219 | return $spotter_array; |
| 1220 | - } |
|
| 1221 | - |
|
| 1222 | - /** |
|
| 1223 | - * Gets all the spotter information based on a particular callsign |
|
| 1224 | - * |
|
| 1225 | - * @return Array the spotter information |
|
| 1226 | - * |
|
| 1227 | - */ |
|
| 1228 | - public function getDateArchiveSpotterDataByIdent($ident,$date) |
|
| 1229 | - { |
|
| 1220 | + } |
|
| 1221 | + |
|
| 1222 | + /** |
|
| 1223 | + * Gets all the spotter information based on a particular callsign |
|
| 1224 | + * |
|
| 1225 | + * @return Array the spotter information |
|
| 1226 | + * |
|
| 1227 | + */ |
|
| 1228 | + public function getDateArchiveSpotterDataByIdent($ident,$date) |
|
| 1229 | + { |
|
| 1230 | 1230 | $Spotter = new Spotter($this->db); |
| 1231 | 1231 | date_default_timezone_set('UTC'); |
| 1232 | 1232 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
@@ -1234,16 +1234,16 @@ discard block |
||
| 1234 | 1234 | $date = date('c',$date); |
| 1235 | 1235 | $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
| 1236 | 1236 | return $spotter_array; |
| 1237 | - } |
|
| 1238 | - |
|
| 1239 | - /** |
|
| 1240 | - * Gets all the spotter information based on the airport |
|
| 1241 | - * |
|
| 1242 | - * @return Array the spotter information |
|
| 1243 | - * |
|
| 1244 | - */ |
|
| 1245 | - public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1246 | - { |
|
| 1237 | + } |
|
| 1238 | + |
|
| 1239 | + /** |
|
| 1240 | + * Gets all the spotter information based on the airport |
|
| 1241 | + * |
|
| 1242 | + * @return Array the spotter information |
|
| 1243 | + * |
|
| 1244 | + */ |
|
| 1245 | + public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1246 | + { |
|
| 1247 | 1247 | global $global_query; |
| 1248 | 1248 | $Spotter = new Spotter($this->db); |
| 1249 | 1249 | date_default_timezone_set('UTC'); |
@@ -1254,35 +1254,35 @@ discard block |
||
| 1254 | 1254 | |
| 1255 | 1255 | if ($airport != "") |
| 1256 | 1256 | { |
| 1257 | - if (!is_string($airport)) |
|
| 1258 | - { |
|
| 1257 | + if (!is_string($airport)) |
|
| 1258 | + { |
|
| 1259 | 1259 | return false; |
| 1260 | - } else { |
|
| 1260 | + } else { |
|
| 1261 | 1261 | $additional_query .= " AND ((spotter_archive_output.departure_airport_icao = :airport) OR (spotter_archive_output.arrival_airport_icao = :airport))"; |
| 1262 | 1262 | $query_values = array(':airport' => $airport); |
| 1263 | - } |
|
| 1263 | + } |
|
| 1264 | 1264 | } |
| 1265 | 1265 | |
| 1266 | 1266 | if ($limit != "") |
| 1267 | 1267 | { |
| 1268 | - $limit_array = explode(",", $limit); |
|
| 1268 | + $limit_array = explode(",", $limit); |
|
| 1269 | 1269 | |
| 1270 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1271 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1270 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1271 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1272 | 1272 | |
| 1273 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1274 | - { |
|
| 1273 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1274 | + { |
|
| 1275 | 1275 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 1276 | 1276 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 1277 | - } |
|
| 1277 | + } |
|
| 1278 | 1278 | } |
| 1279 | 1279 | |
| 1280 | 1280 | if ($sort != "") |
| 1281 | 1281 | { |
| 1282 | - $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1283 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1282 | + $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1283 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1284 | 1284 | } else { |
| 1285 | - $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1285 | + $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1286 | 1286 | } |
| 1287 | 1287 | |
| 1288 | 1288 | $query = $global_query.$filter_query." spotter_archive_output.ident <> '' ".$additional_query." AND ((spotter_archive_output.departure_airport_icao <> 'NA') AND (spotter_archive_output.arrival_airport_icao <> 'NA')) ".$orderby_query; |
@@ -1290,6 +1290,6 @@ discard block |
||
| 1290 | 1290 | $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
| 1291 | 1291 | |
| 1292 | 1292 | return $spotter_array; |
| 1293 | - } |
|
| 1293 | + } |
|
| 1294 | 1294 | } |
| 1295 | 1295 | ?> |
| 1296 | 1296 | \ No newline at end of file |
@@ -14,62 +14,62 @@ discard block |
||
| 14 | 14 | * @param Array $filter the filter |
| 15 | 15 | * @return Array the SQL part |
| 16 | 16 | */ |
| 17 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 17 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 18 | 18 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 19 | 19 | $filters = array(); |
| 20 | 20 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 21 | 21 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 22 | 22 | $filters = $globalStatsFilters[$globalFilterName]; |
| 23 | 23 | } else { |
| 24 | - $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
|
| 24 | + $filter = array_merge($filter, $globalStatsFilters[$globalFilterName]); |
|
| 25 | 25 | } |
| 26 | 26 | } |
| 27 | 27 | if (isset($filter[0]['source'])) { |
| 28 | - $filters = array_merge($filters,$filter); |
|
| 28 | + $filters = array_merge($filters, $filter); |
|
| 29 | 29 | } |
| 30 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 30 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 31 | 31 | $filter_query_join = ''; |
| 32 | 32 | $filter_query_where = ''; |
| 33 | - foreach($filters as $flt) { |
|
| 33 | + foreach ($filters as $flt) { |
|
| 34 | 34 | if (isset($flt['airlines']) && !empty($flt['airlines'])) { |
| 35 | 35 | if ($flt['airlines'][0] != '') { |
| 36 | 36 | if (isset($flt['source'])) { |
| 37 | - $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 | + $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"; |
|
| 38 | 38 | } else { |
| 39 | - $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 | + $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"; |
|
| 40 | 40 | } |
| 41 | 41 | } |
| 42 | 42 | } |
| 43 | 43 | if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) { |
| 44 | 44 | if (isset($flt['source'])) { |
| 45 | - $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 | + $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"; |
|
| 46 | 46 | } else { |
| 47 | - $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 | + $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"; |
|
| 48 | 48 | } |
| 49 | 49 | } |
| 50 | 50 | if (isset($flt['idents']) && !empty($flt['idents'])) { |
| 51 | 51 | if (isset($flt['source'])) { |
| 52 | - $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 | + $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"; |
|
| 53 | 53 | } else { |
| 54 | - $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 | + $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"; |
|
| 55 | 55 | } |
| 56 | 56 | } |
| 57 | 57 | if (isset($flt['registrations']) && !empty($flt['registrations'])) { |
| 58 | 58 | if (isset($flt['source'])) { |
| 59 | - $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 | + $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"; |
|
| 60 | 60 | } else { |
| 61 | - $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 | + $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"; |
|
| 62 | 62 | } |
| 63 | 63 | } |
| 64 | 64 | 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']))) { |
| 65 | 65 | if (isset($flt['source'])) { |
| 66 | - $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 | + $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"; |
|
| 67 | 67 | } |
| 68 | 68 | } |
| 69 | 69 | } |
| 70 | 70 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 71 | 71 | if ($filter['airlines'][0] != '') { |
| 72 | - $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 | + $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"; |
|
| 73 | 73 | } |
| 74 | 74 | } |
| 75 | 75 | |
@@ -77,16 +77,16 @@ discard block |
||
| 77 | 77 | $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 "; |
| 78 | 78 | } |
| 79 | 79 | if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) { |
| 80 | - $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 | + $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"; |
|
| 81 | 81 | } |
| 82 | 82 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 83 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 83 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 84 | 84 | } |
| 85 | 85 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 86 | 86 | $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
| 87 | 87 | } |
| 88 | 88 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 89 | - $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 89 | + $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 90 | 90 | } |
| 91 | 91 | if ((isset($filter['year']) && $filter['year'] != '') || (isset($filter['month']) && $filter['month'] != '') || (isset($filter['day']) && $filter['day'] != '')) { |
| 92 | 92 | $filter_query_date = ''; |
@@ -112,41 +112,41 @@ discard block |
||
| 112 | 112 | $filter_query_date .= " AND EXTRACT(DAY FROM spotter_archive_output.date) = '".$filter['day']."'"; |
| 113 | 113 | } |
| 114 | 114 | } |
| 115 | - $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 | + $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"; |
|
| 116 | 116 | } |
| 117 | 117 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 118 | 118 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
| 119 | 119 | if ($filter_query_where != '') { |
| 120 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
| 120 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
| 121 | 121 | } |
| 122 | 122 | $filter_query = $filter_query_join.$filter_query_where; |
| 123 | 123 | return $filter_query; |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | // Spotter_archive |
| 127 | - 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 | + 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 = '') { |
|
| 128 | 128 | require_once(dirname(__FILE__).'/class.Spotter.php'); |
| 129 | 129 | if ($over_country == '') { |
| 130 | 130 | $Spotter = new Spotter($this->db); |
| 131 | - $data_country = $Spotter->getCountryFromLatitudeLongitude($latitude,$longitude); |
|
| 131 | + $data_country = $Spotter->getCountryFromLatitudeLongitude($latitude, $longitude); |
|
| 132 | 132 | if (!empty($data_country)) $country = $data_country['iso2']; |
| 133 | 133 | else $country = ''; |
| 134 | 134 | } else $country = $over_country; |
| 135 | - if ($airline_type === NULL) $airline_type =''; |
|
| 135 | + if ($airline_type === NULL) $airline_type = ''; |
|
| 136 | 136 | |
| 137 | 137 | //if ($country == '') echo "\n".'************ UNKNOW COUNTRY ****************'."\n"; |
| 138 | 138 | //else echo "\n".'*/*/*/*/*/*/*/ Country : '.$country.' */*/*/*/*/*/*/*/*/'."\n"; |
| 139 | 139 | |
| 140 | 140 | // Route is not added in spotter_archive |
| 141 | - $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 | + $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) |
|
| 142 | 142 | 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)"; |
| 143 | 143 | |
| 144 | - $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 | + $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); |
|
| 145 | 145 | try { |
| 146 | 146 | $sth = $this->db->prepare($query); |
| 147 | 147 | $sth->execute($query_values); |
| 148 | 148 | $sth->closeCursor(); |
| 149 | - } catch(PDOException $e) { |
|
| 149 | + } catch (PDOException $e) { |
|
| 150 | 150 | return "error : ".$e->getMessage(); |
| 151 | 151 | } |
| 152 | 152 | return "success"; |
@@ -166,9 +166,9 @@ discard block |
||
| 166 | 166 | |
| 167 | 167 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 168 | 168 | //$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"; |
| 169 | - $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 169 | + $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 170 | 170 | |
| 171 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident)); |
|
| 171 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident)); |
|
| 172 | 172 | |
| 173 | 173 | return $spotter_array; |
| 174 | 174 | } |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 188 | 188 | //$query = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id"; |
| 189 | 189 | //$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"; |
| 190 | - $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 190 | + $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 191 | 191 | |
| 192 | 192 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 193 | 193 | /* |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | } |
| 201 | 201 | $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC); |
| 202 | 202 | */ |
| 203 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id)); |
|
| 203 | + $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id)); |
|
| 204 | 204 | |
| 205 | 205 | return $spotter_array; |
| 206 | 206 | } |
@@ -215,14 +215,14 @@ discard block |
||
| 215 | 215 | { |
| 216 | 216 | date_default_timezone_set('UTC'); |
| 217 | 217 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 218 | - $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 218 | + $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 219 | 219 | |
| 220 | 220 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 221 | 221 | |
| 222 | 222 | try { |
| 223 | 223 | $sth = $this->db->prepare($query); |
| 224 | 224 | $sth->execute(array(':id' => $id)); |
| 225 | - } catch(PDOException $e) { |
|
| 225 | + } catch (PDOException $e) { |
|
| 226 | 226 | echo $e->getMessage(); |
| 227 | 227 | die; |
| 228 | 228 | } |
@@ -241,14 +241,14 @@ discard block |
||
| 241 | 241 | { |
| 242 | 242 | date_default_timezone_set('UTC'); |
| 243 | 243 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 244 | - $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id"; |
|
| 244 | + $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id"; |
|
| 245 | 245 | |
| 246 | 246 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 247 | 247 | |
| 248 | 248 | try { |
| 249 | 249 | $sth = $this->db->prepare($query); |
| 250 | 250 | $sth->execute(array(':id' => $id)); |
| 251 | - } catch(PDOException $e) { |
|
| 251 | + } catch (PDOException $e) { |
|
| 252 | 252 | echo $e->getMessage(); |
| 253 | 253 | die; |
| 254 | 254 | } |
@@ -270,12 +270,12 @@ discard block |
||
| 270 | 270 | date_default_timezone_set('UTC'); |
| 271 | 271 | |
| 272 | 272 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 273 | - $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 | + $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"; |
|
| 274 | 274 | |
| 275 | 275 | try { |
| 276 | 276 | $sth = $this->db->prepare($query); |
| 277 | 277 | $sth->execute(array(':ident' => $ident)); |
| 278 | - } catch(PDOException $e) { |
|
| 278 | + } catch (PDOException $e) { |
|
| 279 | 279 | echo $e->getMessage(); |
| 280 | 280 | die; |
| 281 | 281 | } |
@@ -296,12 +296,12 @@ discard block |
||
| 296 | 296 | date_default_timezone_set('UTC'); |
| 297 | 297 | |
| 298 | 298 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 299 | - $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 | + $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"; |
|
| 300 | 300 | |
| 301 | 301 | try { |
| 302 | 302 | $sth = $this->db->prepare($query); |
| 303 | 303 | $sth->execute(array(':id' => $id)); |
| 304 | - } catch(PDOException $e) { |
|
| 304 | + } catch (PDOException $e) { |
|
| 305 | 305 | echo $e->getMessage(); |
| 306 | 306 | die; |
| 307 | 307 | } |
@@ -322,12 +322,12 @@ discard block |
||
| 322 | 322 | date_default_timezone_set('UTC'); |
| 323 | 323 | |
| 324 | 324 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 325 | - $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 | + $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"; |
|
| 326 | 326 | |
| 327 | 327 | try { |
| 328 | 328 | $sth = $this->db->prepare($query); |
| 329 | 329 | $sth->execute(array(':id' => $id)); |
| 330 | - } catch(PDOException $e) { |
|
| 330 | + } catch (PDOException $e) { |
|
| 331 | 331 | echo $e->getMessage(); |
| 332 | 332 | die; |
| 333 | 333 | } |
@@ -349,13 +349,13 @@ discard block |
||
| 349 | 349 | date_default_timezone_set('UTC'); |
| 350 | 350 | |
| 351 | 351 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 352 | - $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 | + $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"; |
|
| 353 | 353 | // $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident"; |
| 354 | 354 | |
| 355 | 355 | try { |
| 356 | 356 | $sth = $this->db->prepare($query); |
| 357 | 357 | $sth->execute(array(':ident' => $ident)); |
| 358 | - } catch(PDOException $e) { |
|
| 358 | + } catch (PDOException $e) { |
|
| 359 | 359 | echo $e->getMessage(); |
| 360 | 360 | die; |
| 361 | 361 | } |
@@ -372,13 +372,13 @@ discard block |
||
| 372 | 372 | * @return Array the spotter information |
| 373 | 373 | * |
| 374 | 374 | */ |
| 375 | - public function getSpotterArchiveData($ident,$flightaware_id,$date) |
|
| 375 | + public function getSpotterArchiveData($ident, $flightaware_id, $date) |
|
| 376 | 376 | { |
| 377 | 377 | $Spotter = new Spotter($this->db); |
| 378 | 378 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 379 | - $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 | + $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"; |
|
| 380 | 380 | |
| 381 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':flightaware_id' => $flightaware_id,':date' => $date.'%')); |
|
| 381 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':flightaware_id' => $flightaware_id, ':date' => $date.'%')); |
|
| 382 | 382 | |
| 383 | 383 | return $spotter_array; |
| 384 | 384 | } |
@@ -394,7 +394,7 @@ discard block |
||
| 394 | 394 | try { |
| 395 | 395 | $sth = $this->db->prepare($query); |
| 396 | 396 | $sth->execute(); |
| 397 | - } catch(PDOException $e) { |
|
| 397 | + } catch (PDOException $e) { |
|
| 398 | 398 | echo $e->getMessage(); |
| 399 | 399 | die; |
| 400 | 400 | } |
@@ -406,24 +406,24 @@ discard block |
||
| 406 | 406 | * @return Array the spotter information |
| 407 | 407 | * |
| 408 | 408 | */ |
| 409 | - public function getMinLiveSpotterData($begindate,$enddate,$filter = array()) |
|
| 409 | + public function getMinLiveSpotterData($begindate, $enddate, $filter = array()) |
|
| 410 | 410 | { |
| 411 | 411 | global $globalDBdriver, $globalLiveInterval; |
| 412 | 412 | date_default_timezone_set('UTC'); |
| 413 | 413 | |
| 414 | 414 | $filter_query = ''; |
| 415 | 415 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 416 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 416 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 417 | 417 | } |
| 418 | 418 | // Use spotter_output also ? |
| 419 | 419 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 420 | - $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 | + $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 "; |
|
| 421 | 421 | } |
| 422 | 422 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 423 | 423 | $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 "; |
| 424 | 424 | } |
| 425 | 425 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 426 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 426 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 427 | 427 | } |
| 428 | 428 | |
| 429 | 429 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -442,14 +442,14 @@ discard block |
||
| 442 | 442 | GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id |
| 443 | 443 | AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao'; |
| 444 | 444 | */ |
| 445 | - $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 | + $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 |
|
| 446 | 446 | FROM spotter_archive |
| 447 | 447 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao |
| 448 | 448 | WHERE spotter_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' |
| 449 | 449 | '.$filter_query.' ORDER BY flightaware_id'; |
| 450 | 450 | } else { |
| 451 | 451 | //$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'; |
| 452 | - $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 | + $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 |
|
| 453 | 453 | FROM spotter_archive |
| 454 | 454 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao |
| 455 | 455 | WHERE spotter_archive.date >= '."'".$begindate."'".' AND spotter_archive.date <= '."'".$enddate."'".' |
@@ -459,7 +459,7 @@ discard block |
||
| 459 | 459 | try { |
| 460 | 460 | $sth = $this->db->prepare($query); |
| 461 | 461 | $sth->execute(); |
| 462 | - } catch(PDOException $e) { |
|
| 462 | + } catch (PDOException $e) { |
|
| 463 | 463 | echo $e->getMessage(); |
| 464 | 464 | die; |
| 465 | 465 | } |
@@ -474,24 +474,24 @@ discard block |
||
| 474 | 474 | * @return Array the spotter information |
| 475 | 475 | * |
| 476 | 476 | */ |
| 477 | - public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array()) |
|
| 477 | + public function getMinLiveSpotterDataPlayback($begindate, $enddate, $filter = array()) |
|
| 478 | 478 | { |
| 479 | 479 | global $globalDBdriver, $globalLiveInterval; |
| 480 | 480 | date_default_timezone_set('UTC'); |
| 481 | 481 | |
| 482 | 482 | $filter_query = ''; |
| 483 | 483 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 484 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 484 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 485 | 485 | } |
| 486 | 486 | // Should use spotter_output also ? |
| 487 | 487 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 488 | - $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 | + $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 "; |
|
| 489 | 489 | } |
| 490 | 490 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 491 | 491 | $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 "; |
| 492 | 492 | } |
| 493 | 493 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 494 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 494 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 495 | 495 | } |
| 496 | 496 | |
| 497 | 497 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -501,7 +501,7 @@ discard block |
||
| 501 | 501 | FROM spotter_archive |
| 502 | 502 | 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'; |
| 503 | 503 | */ |
| 504 | - $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 | + $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 |
|
| 505 | 505 | FROM spotter_archive_output |
| 506 | 506 | LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive_output.aircraft_icao = a.icao |
| 507 | 507 | WHERE (spotter_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') |
@@ -516,7 +516,7 @@ discard block |
||
| 516 | 516 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
| 517 | 517 | '.$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'; |
| 518 | 518 | */ |
| 519 | - $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 | + $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 |
|
| 520 | 520 | FROM spotter_archive_output |
| 521 | 521 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao |
| 522 | 522 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
@@ -528,7 +528,7 @@ discard block |
||
| 528 | 528 | try { |
| 529 | 529 | $sth = $this->db->prepare($query); |
| 530 | 530 | $sth->execute(); |
| 531 | - } catch(PDOException $e) { |
|
| 531 | + } catch (PDOException $e) { |
|
| 532 | 532 | echo $e->getMessage(); |
| 533 | 533 | die; |
| 534 | 534 | } |
@@ -543,23 +543,23 @@ discard block |
||
| 543 | 543 | * @return Array the spotter information |
| 544 | 544 | * |
| 545 | 545 | */ |
| 546 | - public function getLiveSpotterCount($begindate,$enddate,$filter = array()) |
|
| 546 | + public function getLiveSpotterCount($begindate, $enddate, $filter = array()) |
|
| 547 | 547 | { |
| 548 | 548 | global $globalDBdriver, $globalLiveInterval; |
| 549 | 549 | date_default_timezone_set('UTC'); |
| 550 | 550 | |
| 551 | 551 | $filter_query = ''; |
| 552 | 552 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 553 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 553 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 554 | 554 | } |
| 555 | 555 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 556 | - $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 | + $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 "; |
|
| 557 | 557 | } |
| 558 | 558 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 559 | 559 | $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 "; |
| 560 | 560 | } |
| 561 | 561 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 562 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 562 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 563 | 563 | } |
| 564 | 564 | |
| 565 | 565 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -574,7 +574,7 @@ discard block |
||
| 574 | 574 | try { |
| 575 | 575 | $sth = $this->db->prepare($query); |
| 576 | 576 | $sth->execute(); |
| 577 | - } catch(PDOException $e) { |
|
| 577 | + } catch (PDOException $e) { |
|
| 578 | 578 | echo $e->getMessage(); |
| 579 | 579 | die; |
| 580 | 580 | } |
@@ -594,7 +594,7 @@ discard block |
||
| 594 | 594 | * @return Array the spotter information |
| 595 | 595 | * |
| 596 | 596 | */ |
| 597 | - 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 | + 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()) |
|
| 598 | 598 | { |
| 599 | 599 | global $globalTimezone, $globalDBdriver; |
| 600 | 600 | require_once(dirname(__FILE__).'/class.Translation.php'); |
@@ -616,7 +616,7 @@ discard block |
||
| 616 | 616 | |
| 617 | 617 | $q_array = explode(" ", $q); |
| 618 | 618 | |
| 619 | - foreach ($q_array as $q_item){ |
|
| 619 | + foreach ($q_array as $q_item) { |
|
| 620 | 620 | $additional_query .= " AND ("; |
| 621 | 621 | $additional_query .= "(spotter_archive_output.spotter_id like '%".$q_item."%') OR "; |
| 622 | 622 | $additional_query .= "(spotter_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
@@ -648,7 +648,7 @@ discard block |
||
| 648 | 648 | |
| 649 | 649 | if ($registration != "") |
| 650 | 650 | { |
| 651 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 651 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 652 | 652 | if (!is_string($registration)) |
| 653 | 653 | { |
| 654 | 654 | return false; |
@@ -659,7 +659,7 @@ discard block |
||
| 659 | 659 | |
| 660 | 660 | if ($aircraft_icao != "") |
| 661 | 661 | { |
| 662 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 662 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 663 | 663 | if (!is_string($aircraft_icao)) |
| 664 | 664 | { |
| 665 | 665 | return false; |
@@ -670,7 +670,7 @@ discard block |
||
| 670 | 670 | |
| 671 | 671 | if ($aircraft_manufacturer != "") |
| 672 | 672 | { |
| 673 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 673 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 674 | 674 | if (!is_string($aircraft_manufacturer)) |
| 675 | 675 | { |
| 676 | 676 | return false; |
@@ -691,7 +691,7 @@ discard block |
||
| 691 | 691 | |
| 692 | 692 | if ($airline_icao != "") |
| 693 | 693 | { |
| 694 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 694 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 695 | 695 | if (!is_string($airline_icao)) |
| 696 | 696 | { |
| 697 | 697 | return false; |
@@ -702,7 +702,7 @@ discard block |
||
| 702 | 702 | |
| 703 | 703 | if ($airline_country != "") |
| 704 | 704 | { |
| 705 | - $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 705 | + $airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING); |
|
| 706 | 706 | if (!is_string($airline_country)) |
| 707 | 707 | { |
| 708 | 708 | return false; |
@@ -713,7 +713,7 @@ discard block |
||
| 713 | 713 | |
| 714 | 714 | if ($airline_type != "") |
| 715 | 715 | { |
| 716 | - $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 716 | + $airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING); |
|
| 717 | 717 | if (!is_string($airline_type)) |
| 718 | 718 | { |
| 719 | 719 | return false; |
@@ -735,7 +735,7 @@ discard block |
||
| 735 | 735 | |
| 736 | 736 | if ($airport != "") |
| 737 | 737 | { |
| 738 | - $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 738 | + $airport = filter_var($airport, FILTER_SANITIZE_STRING); |
|
| 739 | 739 | if (!is_string($airport)) |
| 740 | 740 | { |
| 741 | 741 | return false; |
@@ -746,7 +746,7 @@ discard block |
||
| 746 | 746 | |
| 747 | 747 | if ($airport_country != "") |
| 748 | 748 | { |
| 749 | - $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 749 | + $airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING); |
|
| 750 | 750 | if (!is_string($airport_country)) |
| 751 | 751 | { |
| 752 | 752 | return false; |
@@ -757,7 +757,7 @@ discard block |
||
| 757 | 757 | |
| 758 | 758 | if ($callsign != "") |
| 759 | 759 | { |
| 760 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 760 | + $callsign = filter_var($callsign, FILTER_SANITIZE_STRING); |
|
| 761 | 761 | if (!is_string($callsign)) |
| 762 | 762 | { |
| 763 | 763 | return false; |
@@ -765,7 +765,7 @@ discard block |
||
| 765 | 765 | $translate = $Translation->ident2icao($callsign); |
| 766 | 766 | if ($translate != $callsign) { |
| 767 | 767 | $additional_query .= " AND (spotter_archive_output.ident = :callsign OR spotter_archive_output.ident = :translate)"; |
| 768 | - $query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate)); |
|
| 768 | + $query_values = array_merge($query_values, array(':callsign' => $callsign, ':translate' => $translate)); |
|
| 769 | 769 | } else { |
| 770 | 770 | $additional_query .= " AND (spotter_archive_output.ident = '".$callsign."')"; |
| 771 | 771 | } |
@@ -774,7 +774,7 @@ discard block |
||
| 774 | 774 | |
| 775 | 775 | if ($owner != "") |
| 776 | 776 | { |
| 777 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 777 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 778 | 778 | if (!is_string($owner)) |
| 779 | 779 | { |
| 780 | 780 | return false; |
@@ -785,7 +785,7 @@ discard block |
||
| 785 | 785 | |
| 786 | 786 | if ($pilot_name != "") |
| 787 | 787 | { |
| 788 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 788 | + $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING); |
|
| 789 | 789 | if (!is_string($pilot_name)) |
| 790 | 790 | { |
| 791 | 791 | return false; |
@@ -796,7 +796,7 @@ discard block |
||
| 796 | 796 | |
| 797 | 797 | if ($pilot_id != "") |
| 798 | 798 | { |
| 799 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 799 | + $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT); |
|
| 800 | 800 | if (!is_string($pilot_id)) |
| 801 | 801 | { |
| 802 | 802 | return false; |
@@ -807,7 +807,7 @@ discard block |
||
| 807 | 807 | |
| 808 | 808 | if ($departure_airport_route != "") |
| 809 | 809 | { |
| 810 | - $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 810 | + $departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING); |
|
| 811 | 811 | if (!is_string($departure_airport_route)) |
| 812 | 812 | { |
| 813 | 813 | return false; |
@@ -818,7 +818,7 @@ discard block |
||
| 818 | 818 | |
| 819 | 819 | if ($arrival_airport_route != "") |
| 820 | 820 | { |
| 821 | - $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 821 | + $arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING); |
|
| 822 | 822 | if (!is_string($arrival_airport_route)) |
| 823 | 823 | { |
| 824 | 824 | return false; |
@@ -831,8 +831,8 @@ discard block |
||
| 831 | 831 | { |
| 832 | 832 | $altitude_array = explode(",", $altitude); |
| 833 | 833 | |
| 834 | - $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 835 | - $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 834 | + $altitude_array[0] = filter_var($altitude_array[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 835 | + $altitude_array[1] = filter_var($altitude_array[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 836 | 836 | |
| 837 | 837 | |
| 838 | 838 | if ($altitude_array[1] != "") |
@@ -850,8 +850,8 @@ discard block |
||
| 850 | 850 | { |
| 851 | 851 | $date_array = explode(",", $date_posted); |
| 852 | 852 | |
| 853 | - $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 854 | - $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 853 | + $date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING); |
|
| 854 | + $date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING); |
|
| 855 | 855 | |
| 856 | 856 | if ($globalTimezone != '') { |
| 857 | 857 | date_default_timezone_set($globalTimezone); |
@@ -883,8 +883,8 @@ discard block |
||
| 883 | 883 | { |
| 884 | 884 | $limit_array = explode(",", $limit); |
| 885 | 885 | |
| 886 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 887 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 886 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 887 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 888 | 888 | |
| 889 | 889 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 890 | 890 | { |
@@ -895,8 +895,8 @@ discard block |
||
| 895 | 895 | |
| 896 | 896 | |
| 897 | 897 | if ($origLat != "" && $origLon != "" && $dist != "") { |
| 898 | - $dist = number_format($dist*0.621371,2,'.',''); |
|
| 899 | - $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 |
|
| 898 | + $dist = number_format($dist*0.621371, 2, '.', ''); |
|
| 899 | + $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 |
|
| 900 | 900 | 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)) |
| 901 | 901 | 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"; |
| 902 | 902 | } else { |
@@ -913,12 +913,12 @@ discard block |
||
| 913 | 913 | $additional_query .= " AND (spotter_archive_output.waypoints <> '')"; |
| 914 | 914 | } |
| 915 | 915 | |
| 916 | - $query = "SELECT spotter_archive_output.* FROM spotter_archive_output |
|
| 916 | + $query = "SELECT spotter_archive_output.* FROM spotter_archive_output |
|
| 917 | 917 | WHERE spotter_archive_output.ident <> '' |
| 918 | 918 | ".$additional_query." |
| 919 | 919 | ".$filter_query.$orderby_query; |
| 920 | 920 | } |
| 921 | - $spotter_array = $Spotter->getDataFromDB($query, $query_values,$limit_query); |
|
| 921 | + $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
|
| 922 | 922 | |
| 923 | 923 | return $spotter_array; |
| 924 | 924 | } |
@@ -935,7 +935,7 @@ discard block |
||
| 935 | 935 | try { |
| 936 | 936 | $sth = $this->db->prepare($query); |
| 937 | 937 | $sth->execute(); |
| 938 | - } catch(PDOException $e) { |
|
| 938 | + } catch (PDOException $e) { |
|
| 939 | 939 | return "error"; |
| 940 | 940 | } |
| 941 | 941 | } |
@@ -972,8 +972,8 @@ discard block |
||
| 972 | 972 | { |
| 973 | 973 | $limit_array = explode(",", $limit); |
| 974 | 974 | |
| 975 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 976 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 975 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 976 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 977 | 977 | |
| 978 | 978 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 979 | 979 | { |
@@ -1014,7 +1014,7 @@ discard block |
||
| 1014 | 1014 | $query_values = array(); |
| 1015 | 1015 | $limit_query = ''; |
| 1016 | 1016 | $additional_query = ''; |
| 1017 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 1017 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 1018 | 1018 | |
| 1019 | 1019 | if ($owner != "") |
| 1020 | 1020 | { |
@@ -1031,8 +1031,8 @@ discard block |
||
| 1031 | 1031 | { |
| 1032 | 1032 | $limit_array = explode(",", $limit); |
| 1033 | 1033 | |
| 1034 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1035 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1034 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1035 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1036 | 1036 | |
| 1037 | 1037 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1038 | 1038 | { |
@@ -1072,7 +1072,7 @@ discard block |
||
| 1072 | 1072 | $query_values = array(); |
| 1073 | 1073 | $limit_query = ''; |
| 1074 | 1074 | $additional_query = ''; |
| 1075 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 1075 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 1076 | 1076 | |
| 1077 | 1077 | if ($pilot != "") |
| 1078 | 1078 | { |
@@ -1084,8 +1084,8 @@ discard block |
||
| 1084 | 1084 | { |
| 1085 | 1085 | $limit_array = explode(",", $limit); |
| 1086 | 1086 | |
| 1087 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1088 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1087 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1088 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1089 | 1089 | |
| 1090 | 1090 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1091 | 1091 | { |
@@ -1115,7 +1115,7 @@ discard block |
||
| 1115 | 1115 | * @return Array the airline country list |
| 1116 | 1116 | * |
| 1117 | 1117 | */ |
| 1118 | - public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1118 | + public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '') |
|
| 1119 | 1119 | { |
| 1120 | 1120 | global $globalDBdriver; |
| 1121 | 1121 | /* |
@@ -1144,7 +1144,7 @@ discard block |
||
| 1144 | 1144 | $flight_array = array(); |
| 1145 | 1145 | $temp_array = array(); |
| 1146 | 1146 | |
| 1147 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1147 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1148 | 1148 | { |
| 1149 | 1149 | $temp_array['flight_count'] = $row['nb']; |
| 1150 | 1150 | $temp_array['flight_country'] = $row['name']; |
@@ -1161,7 +1161,7 @@ discard block |
||
| 1161 | 1161 | * @return Array the airline country list |
| 1162 | 1162 | * |
| 1163 | 1163 | */ |
| 1164 | - public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1164 | + public function countAllFlightOverCountriesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '') |
|
| 1165 | 1165 | { |
| 1166 | 1166 | global $globalDBdriver; |
| 1167 | 1167 | /* |
@@ -1190,7 +1190,7 @@ discard block |
||
| 1190 | 1190 | $flight_array = array(); |
| 1191 | 1191 | $temp_array = array(); |
| 1192 | 1192 | |
| 1193 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1193 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1194 | 1194 | { |
| 1195 | 1195 | $temp_array['airline_icao'] = $row['airline_icao']; |
| 1196 | 1196 | $temp_array['flight_count'] = $row['nb']; |
@@ -1208,14 +1208,14 @@ discard block |
||
| 1208 | 1208 | * @return Array the spotter information |
| 1209 | 1209 | * |
| 1210 | 1210 | */ |
| 1211 | - public function getDateArchiveSpotterDataById($id,$date) |
|
| 1211 | + public function getDateArchiveSpotterDataById($id, $date) |
|
| 1212 | 1212 | { |
| 1213 | 1213 | $Spotter = new Spotter($this->db); |
| 1214 | 1214 | date_default_timezone_set('UTC'); |
| 1215 | 1215 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 1216 | - $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'; |
|
| 1217 | - $date = date('c',$date); |
|
| 1218 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date)); |
|
| 1216 | + $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'; |
|
| 1217 | + $date = date('c', $date); |
|
| 1218 | + $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id, ':date' => $date)); |
|
| 1219 | 1219 | return $spotter_array; |
| 1220 | 1220 | } |
| 1221 | 1221 | |
@@ -1225,14 +1225,14 @@ discard block |
||
| 1225 | 1225 | * @return Array the spotter information |
| 1226 | 1226 | * |
| 1227 | 1227 | */ |
| 1228 | - public function getDateArchiveSpotterDataByIdent($ident,$date) |
|
| 1228 | + public function getDateArchiveSpotterDataByIdent($ident, $date) |
|
| 1229 | 1229 | { |
| 1230 | 1230 | $Spotter = new Spotter($this->db); |
| 1231 | 1231 | date_default_timezone_set('UTC'); |
| 1232 | 1232 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 1233 | - $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'; |
|
| 1234 | - $date = date('c',$date); |
|
| 1235 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
|
| 1233 | + $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'; |
|
| 1234 | + $date = date('c', $date); |
|
| 1235 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':date' => $date)); |
|
| 1236 | 1236 | return $spotter_array; |
| 1237 | 1237 | } |
| 1238 | 1238 | |
@@ -1242,7 +1242,7 @@ discard block |
||
| 1242 | 1242 | * @return Array the spotter information |
| 1243 | 1243 | * |
| 1244 | 1244 | */ |
| 1245 | - public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1245 | + public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '', $filters = array()) |
|
| 1246 | 1246 | { |
| 1247 | 1247 | global $global_query; |
| 1248 | 1248 | $Spotter = new Spotter($this->db); |
@@ -1250,7 +1250,7 @@ discard block |
||
| 1250 | 1250 | $query_values = array(); |
| 1251 | 1251 | $limit_query = ''; |
| 1252 | 1252 | $additional_query = ''; |
| 1253 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1253 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1254 | 1254 | |
| 1255 | 1255 | if ($airport != "") |
| 1256 | 1256 | { |
@@ -1267,8 +1267,8 @@ discard block |
||
| 1267 | 1267 | { |
| 1268 | 1268 | $limit_array = explode(",", $limit); |
| 1269 | 1269 | |
| 1270 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1271 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1270 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1271 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1272 | 1272 | |
| 1273 | 1273 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1274 | 1274 | { |
@@ -7,14 +7,14 @@ discard block |
||
| 7 | 7 | //require_once('require/class.SpotterLive.php'); |
| 8 | 8 | require_once('require/class.SpotterArchive.php'); |
| 9 | 9 | |
| 10 | -if (!isset($_GET['owner'])){ |
|
| 10 | +if (!isset($_GET['owner'])) { |
|
| 11 | 11 | header('Location: '.$globalURL.''); |
| 12 | 12 | } else { |
| 13 | 13 | $Spotter = new Spotter(); |
| 14 | 14 | $SpotterArchive = new SpotterArchive(); |
| 15 | 15 | //$Translation = new Translation(); |
| 16 | 16 | //calculuation for the pagination |
| 17 | - if(!isset($_GET['limit'])) |
|
| 17 | + if (!isset($_GET['limit'])) |
|
| 18 | 18 | { |
| 19 | 19 | $limit_start = 0; |
| 20 | 20 | $limit_end = 25; |
@@ -35,29 +35,29 @@ discard block |
||
| 35 | 35 | |
| 36 | 36 | $page_url = $globalURL.'/owner/'.$_GET['owner']; |
| 37 | 37 | |
| 38 | - $owner = filter_input(INPUT_GET,'owner',FILTER_SANITIZE_STRING); |
|
| 39 | - $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
|
| 40 | - $year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT); |
|
| 41 | - $month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT); |
|
| 38 | + $owner = filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING); |
|
| 39 | + $sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING); |
|
| 40 | + $year = filter_input(INPUT_GET, 'year', FILTER_SANITIZE_NUMBER_INT); |
|
| 41 | + $month = filter_input(INPUT_GET, 'month', FILTER_SANITIZE_NUMBER_INT); |
|
| 42 | 42 | $filter = array(); |
| 43 | - if ($year != '') $filter = array_merge($filter,array('year' => $year)); |
|
| 44 | - if ($month != '') $filter = array_merge($filter,array('month' => $month)); |
|
| 43 | + if ($year != '') $filter = array_merge($filter, array('year' => $year)); |
|
| 44 | + if ($month != '') $filter = array_merge($filter, array('month' => $month)); |
|
| 45 | 45 | if ($sort != '') |
| 46 | 46 | { |
| 47 | - $spotter_array = $Spotter->getSpotterDataByOwner($owner,$limit_start.",".$absolute_difference, $sort,$filter); |
|
| 47 | + $spotter_array = $Spotter->getSpotterDataByOwner($owner, $limit_start.",".$absolute_difference, $sort, $filter); |
|
| 48 | 48 | if (empty($spotter_array)) { |
| 49 | - $spotter_array = $SpotterArchive->getSpotterDataByOwner($owner,$limit_start.",".$absolute_difference, $sort,$filter); |
|
| 49 | + $spotter_array = $SpotterArchive->getSpotterDataByOwner($owner, $limit_start.",".$absolute_difference, $sort, $filter); |
|
| 50 | 50 | } |
| 51 | 51 | } else { |
| 52 | - $spotter_array = $Spotter->getSpotterDataByOwner($owner,$limit_start.",".$absolute_difference,'',$filter); |
|
| 52 | + $spotter_array = $Spotter->getSpotterDataByOwner($owner, $limit_start.",".$absolute_difference, '', $filter); |
|
| 53 | 53 | if (empty($spotter_array)) { |
| 54 | - $spotter_array = $SpotterArchive->getSpotterDataByOwner($owner,$limit_start.",".$absolute_difference,'',$filter); |
|
| 54 | + $spotter_array = $SpotterArchive->getSpotterDataByOwner($owner, $limit_start.",".$absolute_difference, '', $filter); |
|
| 55 | 55 | } |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | if (!empty($spotter_array)) |
| 59 | 59 | { |
| 60 | - $title = sprintf(_("Detailed View for %s"),$spotter_array[0]['aircraft_owner']); |
|
| 60 | + $title = sprintf(_("Detailed View for %s"), $spotter_array[0]['aircraft_owner']); |
|
| 61 | 61 | //$ident = $spotter_array[0]['ident']; |
| 62 | 62 | if (isset($spotter_array[0]['latitude'])) $latitude = $spotter_array[0]['latitude']; |
| 63 | 63 | if (isset($spotter_array[0]['longitude'])) $longitude = $spotter_array[0]['longitude']; |
@@ -117,23 +117,23 @@ discard block |
||
| 117 | 117 | $Stats = new Stats(); |
| 118 | 118 | if ($year == '' && $month == '') $flights = $Stats->getStatsOwner($owner); |
| 119 | 119 | else $flights = 0; |
| 120 | - if ($flights == 0) $flights = $Spotter->countFlightsByOwner($owner,$filter); |
|
| 120 | + if ($flights == 0) $flights = $Spotter->countFlightsByOwner($owner, $filter); |
|
| 121 | 121 | print '<div><span class="label">'._("Flights").'</span>'.$flights.'</div>'; |
| 122 | - $aircraft_type = count($Spotter->countAllAircraftTypesByOwner($owner,$filter)); |
|
| 122 | + $aircraft_type = count($Spotter->countAllAircraftTypesByOwner($owner, $filter)); |
|
| 123 | 123 | print '<div><span class="label">'._("Aircrafts type").'</span>'.$aircraft_type.'</div>'; |
| 124 | - $aircraft_registration = count($Spotter->countAllAircraftRegistrationByOwner($owner,$filter)); |
|
| 124 | + $aircraft_registration = count($Spotter->countAllAircraftRegistrationByOwner($owner, $filter)); |
|
| 125 | 125 | print '<div><span class="label">'._("Aircrafts").'</span>'.$aircraft_registration.'</div>'; |
| 126 | - $aircraft_manufacturer = count($Spotter->countAllAircraftManufacturerByOwner($owner,$filter)); |
|
| 126 | + $aircraft_manufacturer = count($Spotter->countAllAircraftManufacturerByOwner($owner, $filter)); |
|
| 127 | 127 | print '<div><span class="label">'._("Manufacturers").'</span>'.$aircraft_manufacturer.'</div>'; |
| 128 | - $airlines = count($Spotter->countAllAirlinesByOwner($owner,$filter)); |
|
| 128 | + $airlines = count($Spotter->countAllAirlinesByOwner($owner, $filter)); |
|
| 129 | 129 | print '<div><span class="label">'._("Airlines").'</span>'.$airlines.'</div>'; |
| 130 | - $duration = $Spotter->getFlightDurationByOwner($owner,$filter); |
|
| 130 | + $duration = $Spotter->getFlightDurationByOwner($owner, $filter); |
|
| 131 | 131 | if ($duration != '0') print '<div><span class="label">'._("Total flights spotted duration").'</span>'.$duration.'</div>'; |
| 132 | 132 | print '</div>'; |
| 133 | 133 | |
| 134 | 134 | include('owner-sub-menu.php'); |
| 135 | 135 | print '<div class="table column">'; |
| 136 | - print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the owner <strong>%s</strong>."),$spotter_array[0]['aircraft_owner']).'</p>'; |
|
| 136 | + print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the owner <strong>%s</strong>."), $spotter_array[0]['aircraft_owner']).'</p>'; |
|
| 137 | 137 | |
| 138 | 138 | include('table-output.php'); |
| 139 | 139 | print '<div class="pagination">'; |
@@ -40,8 +40,12 @@ discard block |
||
| 40 | 40 | $year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT); |
| 41 | 41 | $month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT); |
| 42 | 42 | $filter = array(); |
| 43 | - if ($year != '') $filter = array_merge($filter,array('year' => $year)); |
|
| 44 | - if ($month != '') $filter = array_merge($filter,array('month' => $month)); |
|
| 43 | + if ($year != '') { |
|
| 44 | + $filter = array_merge($filter,array('year' => $year)); |
|
| 45 | + } |
|
| 46 | + if ($month != '') { |
|
| 47 | + $filter = array_merge($filter,array('month' => $month)); |
|
| 48 | + } |
|
| 45 | 49 | if ($sort != '') |
| 46 | 50 | { |
| 47 | 51 | $spotter_array = $Spotter->getSpotterDataByOwner($owner,$limit_start.",".$absolute_difference, $sort,$filter); |
@@ -59,8 +63,12 @@ discard block |
||
| 59 | 63 | { |
| 60 | 64 | $title = sprintf(_("Detailed View for %s"),$spotter_array[0]['aircraft_owner']); |
| 61 | 65 | //$ident = $spotter_array[0]['ident']; |
| 62 | - if (isset($spotter_array[0]['latitude'])) $latitude = $spotter_array[0]['latitude']; |
|
| 63 | - if (isset($spotter_array[0]['longitude'])) $longitude = $spotter_array[0]['longitude']; |
|
| 66 | + if (isset($spotter_array[0]['latitude'])) { |
|
| 67 | + $latitude = $spotter_array[0]['latitude']; |
|
| 68 | + } |
|
| 69 | + if (isset($spotter_array[0]['longitude'])) { |
|
| 70 | + $longitude = $spotter_array[0]['longitude']; |
|
| 71 | + } |
|
| 64 | 72 | require_once('header.php'); |
| 65 | 73 | /* |
| 66 | 74 | if (isset($globalArchive) && $globalArchive) { |
@@ -115,9 +123,14 @@ discard block |
||
| 115 | 123 | print '<h1>'.$spotter_array[0]['aircraft_owner'].'</h1>'; |
| 116 | 124 | //print '<div><span class="label">'._("Owner").'</span>'.$spotter_array[0]['aircraft_owner'].'</div>'; |
| 117 | 125 | $Stats = new Stats(); |
| 118 | - if ($year == '' && $month == '') $flights = $Stats->getStatsOwner($owner); |
|
| 119 | - else $flights = 0; |
|
| 120 | - if ($flights == 0) $flights = $Spotter->countFlightsByOwner($owner,$filter); |
|
| 126 | + if ($year == '' && $month == '') { |
|
| 127 | + $flights = $Stats->getStatsOwner($owner); |
|
| 128 | + } else { |
|
| 129 | + $flights = 0; |
|
| 130 | + } |
|
| 131 | + if ($flights == 0) { |
|
| 132 | + $flights = $Spotter->countFlightsByOwner($owner,$filter); |
|
| 133 | + } |
|
| 121 | 134 | print '<div><span class="label">'._("Flights").'</span>'.$flights.'</div>'; |
| 122 | 135 | $aircraft_type = count($Spotter->countAllAircraftTypesByOwner($owner,$filter)); |
| 123 | 136 | print '<div><span class="label">'._("Aircrafts type").'</span>'.$aircraft_type.'</div>'; |
@@ -128,7 +141,9 @@ discard block |
||
| 128 | 141 | $airlines = count($Spotter->countAllAirlinesByOwner($owner,$filter)); |
| 129 | 142 | print '<div><span class="label">'._("Airlines").'</span>'.$airlines.'</div>'; |
| 130 | 143 | $duration = $Spotter->getFlightDurationByOwner($owner,$filter); |
| 131 | - if ($duration != '0') print '<div><span class="label">'._("Total flights spotted duration").'</span>'.$duration.'</div>'; |
|
| 144 | + if ($duration != '0') { |
|
| 145 | + print '<div><span class="label">'._("Total flights spotted duration").'</span>'.$duration.'</div>'; |
|
| 146 | + } |
|
| 132 | 147 | print '</div>'; |
| 133 | 148 | |
| 134 | 149 | include('owner-sub-menu.php'); |
@@ -3,7 +3,7 @@ |
||
| 3 | 3 | </span> |
| 4 | 4 | <div class="sub-menu sub-menu-container"> |
| 5 | 5 | <ul class="nav nav-pills"> |
| 6 | - <li><a href="<?php print $globalURL; ?>/flightid/<?php print $id; ?>" <?php if (strtolower($current_page) == "flightid-overview"){ print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li> |
|
| 6 | + <li><a href="<?php print $globalURL; ?>/flightid/<?php print $id; ?>" <?php if (strtolower($current_page) == "flightid-overview") { print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li> |
|
| 7 | 7 | <?php if ($globalFlightAware) { ?> |
| 8 | 8 | <li><a href="http://flightaware.com/live/flight/id/<?php print $spotter_array[0]['flightaware_id']; ?>" target="_blank"><?php echo _("Flight Status"); ?>»</a></li> |
| 9 | 9 | <li><a href="http://flightaware.com/live/flight/id/<?php print $spotter_array[0]['flightaware_id']; ?>/tracklog" target="_blank"><?php echo _("Flight Log"); ?>»</a></li> |
