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").' - '._("Busiest Time of the Day"); |
| 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 | require_once('header.php'); |
| 15 | 19 | include('statistics-sub-menu.php'); |
@@ -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'); |
@@ -6,7 +6,7 @@ discard block |
||
| 6 | 6 | $title = _("Statistics").' - '._("Busiest Time of the Day"); |
| 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 | } |
@@ -22,17 +22,17 @@ discard block |
||
| 22 | 22 | </div> |
| 23 | 23 | <p>'._("Below is a list of the most common <strong>time of day</strong>.").'</p>'; |
| 24 | 24 | |
| 25 | -$hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name); |
|
| 25 | +$hour_array = $Stats->countAllHours('hour', true, $airline_icao, $filter_name); |
|
| 26 | 26 | print '<div id="chartHour" class="chart" width="100%"></div><script>'; |
| 27 | 27 | $hour_data = ''; |
| 28 | 28 | $hour_cnt = ''; |
| 29 | -foreach($hour_array as $hour_item) |
|
| 29 | +foreach ($hour_array as $hour_item) |
|
| 30 | 30 | { |
| 31 | 31 | $hour_data .= '"'.$hour_item['hour_name'].':00",'; |
| 32 | 32 | $hour_cnt .= $hour_item['hour_count'].','; |
| 33 | 33 | } |
| 34 | 34 | $hour_data = "[".substr($hour_data, 0, -1)."]"; |
| 35 | -$hour_cnt = "['flights',".substr($hour_cnt,0,-1)."]"; |
|
| 35 | +$hour_cnt = "['flights',".substr($hour_cnt, 0, -1)."]"; |
|
| 36 | 36 | print 'c3.generate({ |
| 37 | 37 | bindto: "#chartHour", |
| 38 | 38 | data: { |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | axis: { x: { type: "category", categories: '.$hour_data.'},y: { label: "# of Flights"}},legend: { show: false }});'; |
| 41 | 41 | print '</script>'; |
| 42 | 42 | |
| 43 | -$hour_array = $Stats->countAllHours('count',true,$airline_icao,$filter_name); |
|
| 43 | +$hour_array = $Stats->countAllHours('count', true, $airline_icao, $filter_name); |
|
| 44 | 44 | if (!empty($hour_array)) |
| 45 | 45 | { |
| 46 | 46 | print '<div class="table-responsive">'; |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | print '</thead>'; |
| 53 | 53 | print '<tbody>'; |
| 54 | 54 | $i = 1; |
| 55 | - foreach($hour_array as $hour_item) |
|
| 55 | + foreach ($hour_array as $hour_item) |
|
| 56 | 56 | { |
| 57 | 57 | print '<tr>'; |
| 58 | 58 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | </form> |
| 33 | 33 | </div> |
| 34 | 34 | <?php |
| 35 | - if (!isset($year) || (isset($year) && $year == '') && !isset($month) || (isset($month) && $month == '')) { |
|
| 35 | + if (!isset($year) || (isset($year) && $year == '') && !isset($month) || (isset($month) && $month == '')) { |
|
| 36 | 36 | ?> |
| 37 | 37 | <div class="sub-menu sub-menu-container"> |
| 38 | 38 | <ul class="nav"> |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | </ul> |
| 88 | 88 | </li> |
| 89 | 89 | <?php |
| 90 | - if (isset($globalAccidents) && $globalAccidents && (!isset($airline_icao) || $airline_icao == '' || $airline_icao == 'all')) { |
|
| 90 | + if (isset($globalAccidents) && $globalAccidents && (!isset($airline_icao) || $airline_icao == '' || $airline_icao == 'all')) { |
|
| 91 | 91 | ?> |
| 92 | 92 | <li class="dropdown"> |
| 93 | 93 | <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-fatalities-year" || strtolower($current_page) == "statistics-fatalities-month"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
@@ -99,12 +99,12 @@ discard block |
||
| 99 | 99 | </ul> |
| 100 | 100 | </li> |
| 101 | 101 | <?php |
| 102 | - } |
|
| 102 | + } |
|
| 103 | 103 | ?> |
| 104 | 104 | </ul> |
| 105 | 105 | </div> |
| 106 | 106 | <?php |
| 107 | - } else { |
|
| 107 | + } else { |
|
| 108 | 108 | ?> |
| 109 | 109 | <div class="sub-menu sub-menu-container"> |
| 110 | 110 | <ul class="nav"> |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | </li> |
| 164 | 164 | --> |
| 165 | 165 | <?php |
| 166 | - if (isset($globalAccidents) && $globalAccidents && (!isset($airline_icao) || $airline_icao == '' || $airline_icao == 'all')) { |
|
| 166 | + if (isset($globalAccidents) && $globalAccidents && (!isset($airline_icao) || $airline_icao == '' || $airline_icao == 'all')) { |
|
| 167 | 167 | ?> |
| 168 | 168 | <!-- |
| 169 | 169 | <li class="dropdown"> |
@@ -177,10 +177,10 @@ discard block |
||
| 177 | 177 | </li> |
| 178 | 178 | --> |
| 179 | 179 | <?php |
| 180 | - } |
|
| 180 | + } |
|
| 181 | 181 | ?> |
| 182 | 182 | </ul> |
| 183 | 183 | </div> |
| 184 | 184 | <?php |
| 185 | - } |
|
| 185 | + } |
|
| 186 | 186 | ?> |
| 187 | 187 | \ No newline at end of file |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | } else { |
| 21 | 21 | print '<option value="all">All</option>'; |
| 22 | 22 | } |
| 23 | - foreach($airlines as $airline) { |
|
| 23 | + foreach ($airlines as $airline) { |
|
| 24 | 24 | if (isset($airline_icao) && $airline_icao == $airline['airline_icao']) { |
| 25 | 25 | print '<option value="'.$airline['airline_icao'].'" selected>'.$airline['airline_name'].'</option>'; |
| 26 | 26 | } else { |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | <div class="sub-menu sub-menu-container"> |
| 38 | 38 | <ul class="nav"> |
| 39 | 39 | <li class="dropdown"> |
| 40 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-aircraft" || strtolower($current_page) == "statistics-registration" || strtolower($current_page) == "statistics-manufacturer"){ print 'active'; } ?>" data-toggle="dropdown" href="#" > |
|
| 40 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-aircraft" || strtolower($current_page) == "statistics-registration" || strtolower($current_page) == "statistics-manufacturer") { print 'active'; } ?>" data-toggle="dropdown" href="#" > |
|
| 41 | 41 | <?php echo _("Aircraft"); ?> <span class="caret"></span> |
| 42 | 42 | </a> |
| 43 | 43 | <ul class="dropdown-menu"> |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | </ul> |
| 49 | 49 | </li> |
| 50 | 50 | <li class="dropdown"> |
| 51 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-airline" || strtolower($current_page) == "statistics-airline-country" || strtolower($current_page) == "statistics-callsign"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 51 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-airline" || strtolower($current_page) == "statistics-airline-country" || strtolower($current_page) == "statistics-callsign") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 52 | 52 | <?php echo _("Airline"); ?> <span class="caret"></span> |
| 53 | 53 | </a> |
| 54 | 54 | <ul class="dropdown-menu" role="menu"> |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | </ul> |
| 59 | 59 | </li> |
| 60 | 60 | <li class="dropdown"> |
| 61 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-airport-departure" || strtolower($current_page) == "statistics-airport-departure-country" || strtolower($current_page) == "statistics-airport-arrival" || strtolower($current_page) == "statistics-airport-arrival-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 61 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-airport-departure" || strtolower($current_page) == "statistics-airport-departure-country" || strtolower($current_page) == "statistics-airport-arrival" || strtolower($current_page) == "statistics-airport-arrival-country") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 62 | 62 | <?php echo _("Airport"); ?> <span class="caret"></span> |
| 63 | 63 | </a> |
| 64 | 64 | <ul class="dropdown-menu" role="menu"> |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | </ul> |
| 70 | 70 | </li> |
| 71 | 71 | <li class="dropdown"> |
| 72 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-route-airport" || strtolower($current_page) == "statistics-route-waypoint"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 72 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-route-airport" || strtolower($current_page) == "statistics-route-waypoint") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 73 | 73 | <?php echo _("Route"); ?> <span class="caret"></span> |
| 74 | 74 | </a> |
| 75 | 75 | <ul class="dropdown-menu" role="menu"> |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | </ul> |
| 79 | 79 | </li> |
| 80 | 80 | <li class="dropdown"> |
| 81 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 81 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 82 | 82 | <?php echo _("Date & Time"); ?> <span class="caret"></span> |
| 83 | 83 | </a> |
| 84 | 84 | <ul class="dropdown-menu" role="menu"> |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | if (isset($globalAccidents) && $globalAccidents && (!isset($airline_icao) || $airline_icao == '' || $airline_icao == 'all')) { |
| 91 | 91 | ?> |
| 92 | 92 | <li class="dropdown"> |
| 93 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-fatalities-year" || strtolower($current_page) == "statistics-fatalities-month"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 93 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-fatalities-year" || strtolower($current_page) == "statistics-fatalities-month") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 94 | 94 | <?php echo _("Fatalities"); ?> <span class="caret"></span> |
| 95 | 95 | </a> |
| 96 | 96 | <ul class="dropdown-menu" role="menu"> |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | <div class="sub-menu sub-menu-container"> |
| 110 | 110 | <ul class="nav"> |
| 111 | 111 | <li class="dropdown"> |
| 112 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-aircraft" || strtolower($current_page) == "statistics-registration" || strtolower($current_page) == "statistics-manufacturer"){ print 'active'; } ?>" data-toggle="dropdown" href="#" > |
|
| 112 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-aircraft" || strtolower($current_page) == "statistics-registration" || strtolower($current_page) == "statistics-manufacturer") { print 'active'; } ?>" data-toggle="dropdown" href="#" > |
|
| 113 | 113 | <?php echo _("Aircraft"); ?> <span class="caret"></span> |
| 114 | 114 | </a> |
| 115 | 115 | <ul class="dropdown-menu"> |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | </ul> |
| 121 | 121 | </li> |
| 122 | 122 | <li class="dropdown"> |
| 123 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-airline" || strtolower($current_page) == "statistics-airline-country" || strtolower($current_page) == "statistics-callsign"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 123 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-airline" || strtolower($current_page) == "statistics-airline-country" || strtolower($current_page) == "statistics-callsign") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 124 | 124 | <?php echo _("Airline"); ?> <span class="caret"></span> |
| 125 | 125 | </a> |
| 126 | 126 | <ul class="dropdown-menu" role="menu"> |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | </ul> |
| 131 | 131 | </li> |
| 132 | 132 | <li class="dropdown"> |
| 133 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-airport-departure" || strtolower($current_page) == "statistics-airport-departure-country" || strtolower($current_page) == "statistics-airport-arrival" || strtolower($current_page) == "statistics-airport-arrival-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 133 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-airport-departure" || strtolower($current_page) == "statistics-airport-departure-country" || strtolower($current_page) == "statistics-airport-arrival" || strtolower($current_page) == "statistics-airport-arrival-country") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 134 | 134 | <?php echo _("Airport"); ?> <span class="caret"></span> |
| 135 | 135 | </a> |
| 136 | 136 | <ul class="dropdown-menu" role="menu"> |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | </li> |
| 143 | 143 | <!-- |
| 144 | 144 | <li class="dropdown"> |
| 145 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-route-airport" || strtolower($current_page) == "statistics-route-waypoint"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 145 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-route-airport" || strtolower($current_page) == "statistics-route-waypoint") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 146 | 146 | <?php echo _("Route"); ?> <span class="caret"></span> |
| 147 | 147 | </a> |
| 148 | 148 | <ul class="dropdown-menu" role="menu"> |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | --> |
| 154 | 154 | <!-- |
| 155 | 155 | <li class="dropdown"> |
| 156 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 156 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 157 | 157 | <?php echo _("Date & Time"); ?> <span class="caret"></span> |
| 158 | 158 | </a> |
| 159 | 159 | <ul class="dropdown-menu" role="menu"> |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | ?> |
| 168 | 168 | <!-- |
| 169 | 169 | <li class="dropdown"> |
| 170 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-fatalities-year" || strtolower($current_page) == "statistics-fatalities-month"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 170 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-fatalities-year" || strtolower($current_page) == "statistics-fatalities-month") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 171 | 171 | <?php echo _("Fatalities"); ?> <span class="caret"></span> |
| 172 | 172 | </a> |
| 173 | 173 | <ul class="dropdown-menu" role="menu"> |
@@ -4,7 +4,13 @@ discard block |
||
| 4 | 4 | <div class="stats_airline"> |
| 5 | 5 | |
| 6 | 6 | <form id="changedate" method="post"> |
| 7 | - <input type="month" name="date" onchange="statsdatechange(this);" value="<?php if (isset($year) && $year != '') echo $year.'-'; ?><?php if (isset($month) && $month != '') echo $month; ?>" /> |
|
| 7 | + <input type="month" name="date" onchange="statsdatechange(this);" value="<?php if (isset($year) && $year != '') { |
|
| 8 | + echo $year.'-'; |
|
| 9 | +} |
|
| 10 | +?><?php if (isset($month) && $month != '') { |
|
| 11 | + echo $month; |
|
| 12 | +} |
|
| 13 | +?>" /> |
|
| 8 | 14 | </form> |
| 9 | 15 | |
| 10 | 16 | <form id="changeairline" method="post"> |
@@ -13,7 +19,9 @@ discard block |
||
| 13 | 19 | <?php |
| 14 | 20 | require_once('require/class.Stats.php'); |
| 15 | 21 | $Stats = new Stats(); |
| 16 | - if (!isset($filter_name)) $filter_name = ''; |
|
| 22 | + if (!isset($filter_name)) { |
|
| 23 | + $filter_name = ''; |
|
| 24 | + } |
|
| 17 | 25 | $airlines = $Stats->getAllAirlineNames($filter_name); |
| 18 | 26 | if (isset($airline_icao) && ($airline_icao == '' || $airline_icao == 'all')) { |
| 19 | 27 | print '<option value="all" selected>All</option>'; |
@@ -41,10 +49,22 @@ discard block |
||
| 41 | 49 | <?php echo _("Aircraft"); ?> <span class="caret"></span> |
| 42 | 50 | </a> |
| 43 | 51 | <ul class="dropdown-menu"> |
| 44 | - <li><a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Aircraft"); ?></a></li> |
|
| 45 | - <li><a href="<?php print $globalURL; ?>/statistics/registration<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Registration"); ?></a></li> |
|
| 46 | - <li><a href="<?php print $globalURL; ?>/statistics/manufacturer<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Manufacturer"); ?></a></li> |
|
| 47 | - <li><a href="<?php print $globalURL; ?>/statistics/country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Country"); ?></a></li> |
|
| 52 | + <li><a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 53 | + echo '/'.$airline_icao; |
|
| 54 | +} |
|
| 55 | +?>"><?php echo _("Aircraft"); ?></a></li> |
|
| 56 | + <li><a href="<?php print $globalURL; ?>/statistics/registration<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 57 | + echo '/'.$airline_icao; |
|
| 58 | +} |
|
| 59 | +?>"><?php echo _("Registration"); ?></a></li> |
|
| 60 | + <li><a href="<?php print $globalURL; ?>/statistics/manufacturer<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 61 | + echo '/'.$airline_icao; |
|
| 62 | +} |
|
| 63 | +?>"><?php echo _("Manufacturer"); ?></a></li> |
|
| 64 | + <li><a href="<?php print $globalURL; ?>/statistics/country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 65 | + echo '/'.$airline_icao; |
|
| 66 | +} |
|
| 67 | +?>"><?php echo _("Country"); ?></a></li> |
|
| 48 | 68 | </ul> |
| 49 | 69 | </li> |
| 50 | 70 | <li class="dropdown"> |
@@ -52,9 +72,18 @@ discard block |
||
| 52 | 72 | <?php echo _("Airline"); ?> <span class="caret"></span> |
| 53 | 73 | </a> |
| 54 | 74 | <ul class="dropdown-menu" role="menu"> |
| 55 | - <li><a href="<?php print $globalURL; ?>/statistics/airline<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Airline"); ?></a></li> |
|
| 56 | - <li><a href="<?php print $globalURL; ?>/statistics/airline-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Airline by Country"); ?></a></li> |
|
| 57 | - <li><a href="<?php print $globalURL; ?>/statistics/callsign<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Callsign"); ?></a></li> |
|
| 75 | + <li><a href="<?php print $globalURL; ?>/statistics/airline<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 76 | + echo '/'.$airline_icao; |
|
| 77 | +} |
|
| 78 | +?>"><?php echo _("Airline"); ?></a></li> |
|
| 79 | + <li><a href="<?php print $globalURL; ?>/statistics/airline-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 80 | + echo '/'.$airline_icao; |
|
| 81 | +} |
|
| 82 | +?>"><?php echo _("Airline by Country"); ?></a></li> |
|
| 83 | + <li><a href="<?php print $globalURL; ?>/statistics/callsign<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 84 | + echo '/'.$airline_icao; |
|
| 85 | +} |
|
| 86 | +?>"><?php echo _("Callsign"); ?></a></li> |
|
| 58 | 87 | </ul> |
| 59 | 88 | </li> |
| 60 | 89 | <li class="dropdown"> |
@@ -62,10 +91,22 @@ discard block |
||
| 62 | 91 | <?php echo _("Airport"); ?> <span class="caret"></span> |
| 63 | 92 | </a> |
| 64 | 93 | <ul class="dropdown-menu" role="menu"> |
| 65 | - <li><a href="<?php print $globalURL; ?>/statistics/airport-departure<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Departure Airport"); ?></a></li> |
|
| 66 | - <li><a href="<?php print $globalURL; ?>/statistics/airport-departure-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Departure Airport by Country"); ?></a></li> |
|
| 67 | - <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Arrival Airport"); ?></a></li> |
|
| 68 | - <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li> |
|
| 94 | + <li><a href="<?php print $globalURL; ?>/statistics/airport-departure<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 95 | + echo '/'.$airline_icao; |
|
| 96 | +} |
|
| 97 | +?>"><?php echo _("Departure Airport"); ?></a></li> |
|
| 98 | + <li><a href="<?php print $globalURL; ?>/statistics/airport-departure-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 99 | + echo '/'.$airline_icao; |
|
| 100 | +} |
|
| 101 | +?>"><?php echo _("Departure Airport by Country"); ?></a></li> |
|
| 102 | + <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 103 | + echo '/'.$airline_icao; |
|
| 104 | +} |
|
| 105 | +?>"><?php echo _("Arrival Airport"); ?></a></li> |
|
| 106 | + <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 107 | + echo '/'.$airline_icao; |
|
| 108 | +} |
|
| 109 | +?>"><?php echo _("Arrival Airport by Country"); ?></a></li> |
|
| 69 | 110 | </ul> |
| 70 | 111 | </li> |
| 71 | 112 | <li class="dropdown"> |
@@ -73,8 +114,14 @@ discard block |
||
| 73 | 114 | <?php echo _("Route"); ?> <span class="caret"></span> |
| 74 | 115 | </a> |
| 75 | 116 | <ul class="dropdown-menu" role="menu"> |
| 76 | - <li><a href="<?php print $globalURL; ?>/statistics/route-airport<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Route by Airport"); ?></a></li> |
|
| 77 | - <li><a href="<?php print $globalURL; ?>/statistics/route-waypoint<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Route by Waypoint"); ?></a></li> |
|
| 117 | + <li><a href="<?php print $globalURL; ?>/statistics/route-airport<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 118 | + echo '/'.$airline_icao; |
|
| 119 | +} |
|
| 120 | +?>"><?php echo _("Route by Airport"); ?></a></li> |
|
| 121 | + <li><a href="<?php print $globalURL; ?>/statistics/route-waypoint<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 122 | + echo '/'.$airline_icao; |
|
| 123 | +} |
|
| 124 | +?>"><?php echo _("Route by Waypoint"); ?></a></li> |
|
| 78 | 125 | </ul> |
| 79 | 126 | </li> |
| 80 | 127 | <li class="dropdown"> |
@@ -82,8 +129,14 @@ discard block |
||
| 82 | 129 | <?php echo _("Date & Time"); ?> <span class="caret"></span> |
| 83 | 130 | </a> |
| 84 | 131 | <ul class="dropdown-menu" role="menu"> |
| 85 | - <li><a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Date"); ?></a></li> |
|
| 86 | - <li><a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Time"); ?></a></li> |
|
| 132 | + <li><a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 133 | + echo '/'.$airline_icao; |
|
| 134 | +} |
|
| 135 | +?>"><?php echo _("Date"); ?></a></li> |
|
| 136 | + <li><a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 137 | + echo '/'.$airline_icao; |
|
| 138 | +} |
|
| 139 | +?>"><?php echo _("Time"); ?></a></li> |
|
| 87 | 140 | </ul> |
| 88 | 141 | </li> |
| 89 | 142 | <?php |
@@ -113,9 +166,18 @@ discard block |
||
| 113 | 166 | <?php echo _("Aircraft"); ?> <span class="caret"></span> |
| 114 | 167 | </a> |
| 115 | 168 | <ul class="dropdown-menu"> |
| 116 | - <li><a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Aircraft"); ?></a></li> |
|
| 117 | - <li><a href="<?php print $globalURL; ?>/statistics/registration<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Registration"); ?></a></li> |
|
| 118 | - <li><a href="<?php print $globalURL; ?>/statistics/manufacturer<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Manufacturer"); ?></a></li> |
|
| 169 | + <li><a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 170 | + echo '/'.$airline_icao; |
|
| 171 | +} |
|
| 172 | +?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Aircraft"); ?></a></li> |
|
| 173 | + <li><a href="<?php print $globalURL; ?>/statistics/registration<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 174 | + echo '/'.$airline_icao; |
|
| 175 | +} |
|
| 176 | +?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Registration"); ?></a></li> |
|
| 177 | + <li><a href="<?php print $globalURL; ?>/statistics/manufacturer<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 178 | + echo '/'.$airline_icao; |
|
| 179 | +} |
|
| 180 | +?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Manufacturer"); ?></a></li> |
|
| 119 | 181 | <!-- <li><a href="<?php print $globalURL; ?>/statistics/country"><?php echo _("Country"); ?></a></li> --> |
| 120 | 182 | </ul> |
| 121 | 183 | </li> |
@@ -124,9 +186,18 @@ discard block |
||
| 124 | 186 | <?php echo _("Airline"); ?> <span class="caret"></span> |
| 125 | 187 | </a> |
| 126 | 188 | <ul class="dropdown-menu" role="menu"> |
| 127 | - <li><a href="<?php print $globalURL; ?>/statistics/airline<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Airline"); ?></a></li> |
|
| 128 | - <li><a href="<?php print $globalURL; ?>/statistics/airline-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Airline by Country"); ?></a></li> |
|
| 129 | - <li><a href="<?php print $globalURL; ?>/statistics/callsign<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Callsign"); ?></a></li> |
|
| 189 | + <li><a href="<?php print $globalURL; ?>/statistics/airline<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 190 | + echo '/'.$airline_icao; |
|
| 191 | +} |
|
| 192 | +?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Airline"); ?></a></li> |
|
| 193 | + <li><a href="<?php print $globalURL; ?>/statistics/airline-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 194 | + echo '/'.$airline_icao; |
|
| 195 | +} |
|
| 196 | +?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Airline by Country"); ?></a></li> |
|
| 197 | + <li><a href="<?php print $globalURL; ?>/statistics/callsign<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 198 | + echo '/'.$airline_icao; |
|
| 199 | +} |
|
| 200 | +?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Callsign"); ?></a></li> |
|
| 130 | 201 | </ul> |
| 131 | 202 | </li> |
| 132 | 203 | <li class="dropdown"> |
@@ -134,10 +205,22 @@ discard block |
||
| 134 | 205 | <?php echo _("Airport"); ?> <span class="caret"></span> |
| 135 | 206 | </a> |
| 136 | 207 | <ul class="dropdown-menu" role="menu"> |
| 137 | - <li><a href="<?php print $globalURL; ?>/statistics/airport-departure<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Departure Airport"); ?></a></li> |
|
| 138 | - <li><a href="<?php print $globalURL; ?>/statistics/airport-departure-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Departure Airport by Country"); ?></a></li> |
|
| 139 | - <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Arrival Airport"); ?></a></li> |
|
| 140 | - <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li> |
|
| 208 | + <li><a href="<?php print $globalURL; ?>/statistics/airport-departure<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 209 | + echo '/'.$airline_icao; |
|
| 210 | +} |
|
| 211 | +?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Departure Airport"); ?></a></li> |
|
| 212 | + <li><a href="<?php print $globalURL; ?>/statistics/airport-departure-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 213 | + echo '/'.$airline_icao; |
|
| 214 | +} |
|
| 215 | +?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Departure Airport by Country"); ?></a></li> |
|
| 216 | + <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 217 | + echo '/'.$airline_icao; |
|
| 218 | +} |
|
| 219 | +?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Arrival Airport"); ?></a></li> |
|
| 220 | + <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 221 | + echo '/'.$airline_icao; |
|
| 222 | +} |
|
| 223 | +?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li> |
|
| 141 | 224 | </ul> |
| 142 | 225 | </li> |
| 143 | 226 | <!-- |
@@ -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>'; |
@@ -7,109 +7,109 @@ discard block |
||
| 7 | 7 | public $db; |
| 8 | 8 | |
| 9 | 9 | protected $texts = Array( |
| 10 | - 'MI' => 'Shallow', |
|
| 11 | - 'PR' => 'Partial', |
|
| 12 | - 'BC' => 'Low drifting', |
|
| 13 | - 'BL' => 'Blowing', |
|
| 14 | - 'SH' => 'Showers', |
|
| 15 | - 'TS' => 'Thunderstorm', |
|
| 16 | - 'FZ' => 'Freezing', |
|
| 17 | - 'DZ' => 'Drizzle', |
|
| 18 | - 'RA' => 'Rain', |
|
| 19 | - 'SN' => 'Snow', |
|
| 20 | - 'SG' => 'Snow Grains', |
|
| 21 | - 'IC' => 'Ice crystals', |
|
| 22 | - 'PL' => 'Ice pellets', |
|
| 23 | - 'GR' => 'Hail', |
|
| 24 | - 'GS' => 'Small hail', |
|
| 25 | - 'UP' => 'Unknown', |
|
| 26 | - 'BR' => 'Mist', |
|
| 27 | - 'FG' => 'Fog', |
|
| 28 | - 'FU' => 'Smoke', |
|
| 29 | - 'VA' => 'Volcanic ash', |
|
| 30 | - 'DU' => 'Widespread dust', |
|
| 31 | - 'SA' => 'Sand', |
|
| 32 | - 'HZ' => 'Haze', |
|
| 33 | - 'PY' => 'Spray', |
|
| 34 | - 'PO' => 'Well developed dust / sand whirls', |
|
| 35 | - 'SQ' => 'Squalls', |
|
| 36 | - 'FC' => 'Funnel clouds inc tornadoes or waterspouts', |
|
| 37 | - 'SS' => 'Sandstorm', |
|
| 38 | - 'DS' => 'Duststorm' |
|
| 10 | + 'MI' => 'Shallow', |
|
| 11 | + 'PR' => 'Partial', |
|
| 12 | + 'BC' => 'Low drifting', |
|
| 13 | + 'BL' => 'Blowing', |
|
| 14 | + 'SH' => 'Showers', |
|
| 15 | + 'TS' => 'Thunderstorm', |
|
| 16 | + 'FZ' => 'Freezing', |
|
| 17 | + 'DZ' => 'Drizzle', |
|
| 18 | + 'RA' => 'Rain', |
|
| 19 | + 'SN' => 'Snow', |
|
| 20 | + 'SG' => 'Snow Grains', |
|
| 21 | + 'IC' => 'Ice crystals', |
|
| 22 | + 'PL' => 'Ice pellets', |
|
| 23 | + 'GR' => 'Hail', |
|
| 24 | + 'GS' => 'Small hail', |
|
| 25 | + 'UP' => 'Unknown', |
|
| 26 | + 'BR' => 'Mist', |
|
| 27 | + 'FG' => 'Fog', |
|
| 28 | + 'FU' => 'Smoke', |
|
| 29 | + 'VA' => 'Volcanic ash', |
|
| 30 | + 'DU' => 'Widespread dust', |
|
| 31 | + 'SA' => 'Sand', |
|
| 32 | + 'HZ' => 'Haze', |
|
| 33 | + 'PY' => 'Spray', |
|
| 34 | + 'PO' => 'Well developed dust / sand whirls', |
|
| 35 | + 'SQ' => 'Squalls', |
|
| 36 | + 'FC' => 'Funnel clouds inc tornadoes or waterspouts', |
|
| 37 | + 'SS' => 'Sandstorm', |
|
| 38 | + 'DS' => 'Duststorm' |
|
| 39 | 39 | ); |
| 40 | 40 | |
| 41 | 41 | public function __construct($dbc = null) { |
| 42 | - $Connection = new Connection($dbc); |
|
| 43 | - $this->db = $Connection->db; |
|
| 44 | - } |
|
| 42 | + $Connection = new Connection($dbc); |
|
| 43 | + $this->db = $Connection->db; |
|
| 44 | + } |
|
| 45 | 45 | |
| 46 | - public static function check_last_update() { |
|
| 47 | - global $globalDBdriver; |
|
| 48 | - if ($globalDBdriver == 'mysql') { |
|
| 46 | + public static function check_last_update() { |
|
| 47 | + global $globalDBdriver; |
|
| 48 | + if ($globalDBdriver == 'mysql') { |
|
| 49 | 49 | $query = "SELECT COUNT(*) as nb FROM config WHERE name = 'last_update_metar' AND value > DATE_SUB(NOW(), INTERVAL 20 MINUTE)"; |
| 50 | 50 | } else { |
| 51 | 51 | $query = "SELECT COUNT(*) as nb FROM config WHERE name = 'last_update_metar' AND value::timestamp > CURRENT_TIMESTAMP - INTERVAL '20 MINUTES'"; |
| 52 | 52 | } |
| 53 | - try { |
|
| 54 | - $Connection = new Connection(); |
|
| 55 | - $sth = $Connection->db->prepare($query); |
|
| 56 | - $sth->execute(); |
|
| 57 | - } catch(PDOException $e) { |
|
| 58 | - return "error : ".$e->getMessage(); |
|
| 59 | - } |
|
| 60 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 61 | - $sth->closeCursor(); |
|
| 62 | - if ($row['nb'] > 0) return false; |
|
| 63 | - else return true; |
|
| 64 | - } |
|
| 53 | + try { |
|
| 54 | + $Connection = new Connection(); |
|
| 55 | + $sth = $Connection->db->prepare($query); |
|
| 56 | + $sth->execute(); |
|
| 57 | + } catch(PDOException $e) { |
|
| 58 | + return "error : ".$e->getMessage(); |
|
| 59 | + } |
|
| 60 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 61 | + $sth->closeCursor(); |
|
| 62 | + if ($row['nb'] > 0) return false; |
|
| 63 | + else return true; |
|
| 64 | + } |
|
| 65 | 65 | |
| 66 | - public static function insert_last_update() { |
|
| 67 | - $query = "DELETE FROM config WHERE name = 'last_update_metar'; |
|
| 66 | + public static function insert_last_update() { |
|
| 67 | + $query = "DELETE FROM config WHERE name = 'last_update_metar'; |
|
| 68 | 68 | INSERT INTO config (name,value) VALUES ('last_update_metar',NOW());"; |
| 69 | - try { |
|
| 70 | - $Connection = new Connection(); |
|
| 71 | - $sth = $Connection->db->prepare($query); |
|
| 72 | - $sth->execute(); |
|
| 73 | - } catch(PDOException $e) { |
|
| 74 | - return "error : ".$e->getMessage(); |
|
| 75 | - } |
|
| 76 | - } |
|
| 69 | + try { |
|
| 70 | + $Connection = new Connection(); |
|
| 71 | + $sth = $Connection->db->prepare($query); |
|
| 72 | + $sth->execute(); |
|
| 73 | + } catch(PDOException $e) { |
|
| 74 | + return "error : ".$e->getMessage(); |
|
| 75 | + } |
|
| 76 | + } |
|
| 77 | 77 | |
| 78 | 78 | |
| 79 | 79 | |
| 80 | - public function parse($data) { |
|
| 81 | - //$data = str_replace(array('\n','\r','\r','\n'),'',$data); |
|
| 82 | - $codes = implode('|', array_keys($this->texts)); |
|
| 83 | - $regWeather = '#^(\+|\-|VC)?(' . $codes . ')(' . $codes . ')?$#'; |
|
| 84 | - //$pieces = explode(' ',$data); |
|
| 85 | - $pieces = preg_split('/\s/',$data); |
|
| 86 | - $pos = 0; |
|
| 87 | - if ($pieces[0] == 'METAR') $pos++; |
|
| 88 | - elseif ($pieces[0] == 'SPECI') $pos++; |
|
| 89 | - if (strlen($pieces[$pos]) != 4) $pos++; |
|
| 90 | - $result = array(); |
|
| 91 | - $result['location'] = $pieces[$pos]; |
|
| 92 | - $pos++; |
|
| 93 | - $result['dayofmonth'] = substr($pieces[$pos],0,2); |
|
| 94 | - $result['time'] = substr($pieces[$pos],2,4); |
|
| 95 | - $c = count($pieces); |
|
| 96 | - for($pos++; $pos < $c; $pos++) { |
|
| 97 | - $piece = $pieces[$pos]; |
|
| 98 | - if ($piece == 'RMK') break; |
|
| 99 | - if ($piece == 'AUTO') $result['auto'] = true; |
|
| 100 | - if ($piece == 'COR') $result['correction'] = true; |
|
| 101 | - // Wind Speed |
|
| 102 | - if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) { |
|
| 103 | - $result['wind']['direction'] = (float)$matches[1]; |
|
| 80 | + public function parse($data) { |
|
| 81 | + //$data = str_replace(array('\n','\r','\r','\n'),'',$data); |
|
| 82 | + $codes = implode('|', array_keys($this->texts)); |
|
| 83 | + $regWeather = '#^(\+|\-|VC)?(' . $codes . ')(' . $codes . ')?$#'; |
|
| 84 | + //$pieces = explode(' ',$data); |
|
| 85 | + $pieces = preg_split('/\s/',$data); |
|
| 86 | + $pos = 0; |
|
| 87 | + if ($pieces[0] == 'METAR') $pos++; |
|
| 88 | + elseif ($pieces[0] == 'SPECI') $pos++; |
|
| 89 | + if (strlen($pieces[$pos]) != 4) $pos++; |
|
| 90 | + $result = array(); |
|
| 91 | + $result['location'] = $pieces[$pos]; |
|
| 92 | + $pos++; |
|
| 93 | + $result['dayofmonth'] = substr($pieces[$pos],0,2); |
|
| 94 | + $result['time'] = substr($pieces[$pos],2,4); |
|
| 95 | + $c = count($pieces); |
|
| 96 | + for($pos++; $pos < $c; $pos++) { |
|
| 97 | + $piece = $pieces[$pos]; |
|
| 98 | + if ($piece == 'RMK') break; |
|
| 99 | + if ($piece == 'AUTO') $result['auto'] = true; |
|
| 100 | + if ($piece == 'COR') $result['correction'] = true; |
|
| 101 | + // Wind Speed |
|
| 102 | + if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) { |
|
| 103 | + $result['wind']['direction'] = (float)$matches[1]; |
|
| 104 | 104 | $result['wind']['unit'] = $matches[4]; |
| 105 | - if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2); |
|
| 106 | - elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2); |
|
| 107 | - elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2); |
|
| 105 | + if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2); |
|
| 106 | + elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2); |
|
| 107 | + elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2); |
|
| 108 | 108 | $result['wind']['gust'] = (float)$matches[3]; |
| 109 | 109 | $result['wind']['unit'] = $matches[4]; |
| 110 | 110 | $result['wind']['min_variation'] = array_key_exists(5,$matches) ? $matches[5] : 0; |
| 111 | 111 | $result['wind']['max_variation'] = array_key_exists(6,$matches) ? $matches[6] : 0; |
| 112 | - } |
|
| 112 | + } |
|
| 113 | 113 | |
| 114 | 114 | /* if (preg_match('#^([0-9]{3})([0-9]{2})(G([0-9]{2}))?(KT|MPS)$#', $piece, $matches)) { |
| 115 | 115 | $result['wind_direction'] = (float)$matches[1]; |
@@ -126,35 +126,35 @@ discard block |
||
| 126 | 126 | } |
| 127 | 127 | } |
| 128 | 128 | */ |
| 129 | - // Temperature |
|
| 130 | - if (preg_match('#^(M?[0-9]{2,})/(M?[0-9]{2,})$#', $piece, $matches)) { |
|
| 131 | - $temp = (float)$matches[1]; |
|
| 129 | + // Temperature |
|
| 130 | + if (preg_match('#^(M?[0-9]{2,})/(M?[0-9]{2,})$#', $piece, $matches)) { |
|
| 131 | + $temp = (float)$matches[1]; |
|
| 132 | 132 | if ($matches[1]{0} == 'M') { |
| 133 | 133 | $temp = ((float)substr($matches[1], 1)) * -1; |
| 134 | 134 | } |
| 135 | - $result['temperature'] = $temp; |
|
| 136 | - $dew = (float)$matches[2]; |
|
| 135 | + $result['temperature'] = $temp; |
|
| 136 | + $dew = (float)$matches[2]; |
|
| 137 | 137 | if ($matches[2]{0} == 'M') { |
| 138 | 138 | $dew = ((float)substr($matches[2], 1)) * -1; |
| 139 | 139 | } |
| 140 | 140 | $result['dew'] = $dew; |
| 141 | - } |
|
| 142 | - // QNH |
|
| 143 | - if (preg_match('#^(A|Q)([0-9]{4})$#', $piece, $matches)) { |
|
| 144 | - // #^(Q|A)(////|[0-9]{4})( )# |
|
| 145 | - if ($matches[1] == 'Q') { |
|
| 146 | - // hPa |
|
| 147 | - $result['QNH'] = $matches[2]; |
|
| 148 | - } else { |
|
| 149 | - // inHg |
|
| 150 | - $result['QNH'] = round(($matches[2] / 100)*33.86389,2); |
|
| 151 | 141 | } |
| 152 | - /* |
|
| 142 | + // QNH |
|
| 143 | + if (preg_match('#^(A|Q)([0-9]{4})$#', $piece, $matches)) { |
|
| 144 | + // #^(Q|A)(////|[0-9]{4})( )# |
|
| 145 | + if ($matches[1] == 'Q') { |
|
| 146 | + // hPa |
|
| 147 | + $result['QNH'] = $matches[2]; |
|
| 148 | + } else { |
|
| 149 | + // inHg |
|
| 150 | + $result['QNH'] = round(($matches[2] / 100)*33.86389,2); |
|
| 151 | + } |
|
| 152 | + /* |
|
| 153 | 153 | $result['QNH'] = $matches[1] == 'Q' ? $matches[2] : ($matches[2] / 100); |
| 154 | 154 | $result['QNH_format'] = $matches[1] == 'Q' ? 'hPa' : 'inHg'; |
| 155 | 155 | */ |
| 156 | - } |
|
| 157 | - /* |
|
| 156 | + } |
|
| 157 | + /* |
|
| 158 | 158 | // Wind Direction |
| 159 | 159 | if (preg_match('#^([0-9]{3})V([0-9]{3})$#', $piece, $matches)) { |
| 160 | 160 | $result['wind_direction'] = $matches[1]; |
@@ -165,9 +165,9 @@ discard block |
||
| 165 | 165 | $result['speed_variable'] = $matches[1]; |
| 166 | 166 | } |
| 167 | 167 | */ |
| 168 | - // Visibility |
|
| 169 | - if (preg_match('#^([0-9]{4})|(([0-9]{1,4})SM)$#', $piece, $matches)) { |
|
| 170 | - if (isset($matches[3]) && strlen($matches[3]) > 0) { |
|
| 168 | + // Visibility |
|
| 169 | + if (preg_match('#^([0-9]{4})|(([0-9]{1,4})SM)$#', $piece, $matches)) { |
|
| 170 | + if (isset($matches[3]) && strlen($matches[3]) > 0) { |
|
| 171 | 171 | $result['visibility'] = (float)$matches[3] * 1609.34; |
| 172 | 172 | } else { |
| 173 | 173 | if ($matches[1] == '9999') { |
@@ -180,28 +180,28 @@ discard block |
||
| 180 | 180 | $result['visibility'] = '> 10000'; |
| 181 | 181 | $result['weather'] = "CAVOK"; |
| 182 | 182 | } |
| 183 | - } |
|
| 184 | - // Cloud Coverage |
|
| 185 | - if (preg_match('#^(SKC|CLR|FEW|SCT|BKN|OVC|VV)([0-9]{3})(CB|TCU|CU|CI)?$#', $piece, $matches)) { |
|
| 186 | - //$this->addCloudCover($matches[1], ((float)$matches[2]) * 100, isset($matches[3]) ? $matches[3] : ''); |
|
| 187 | - $type = $matches[1]; |
|
| 188 | - $cloud = array(); |
|
| 189 | - if ($type == 'SKC') $cloud['type'] = 'No cloud/Sky clear'; |
|
| 190 | - elseif ($type == 'CLR') $cloud['type'] = 'No cloud below 12,000ft (3700m)'; |
|
| 191 | - elseif ($type == 'NSC') $cloud['type'] = 'No significant cloud'; |
|
| 192 | - elseif ($type == 'FEW') $cloud['type'] = 'Few'; |
|
| 193 | - elseif ($type == 'SCT') $cloud['type'] = 'Scattered'; |
|
| 194 | - elseif ($type == 'BKN') $cloud['type'] = 'Broken'; |
|
| 195 | - elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage'; |
|
| 196 | - elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility'; |
|
| 197 | - $cloud['type_code'] = $type; |
|
| 198 | - $cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048); |
|
| 199 | - $cloud['significant'] = isset($matches[3]) ? $matches[3] : ''; |
|
| 200 | - $result['cloud'][] = $cloud; |
|
| 201 | - } |
|
| 202 | - // RVR |
|
| 203 | - if (preg_match('#^(R.+)/([M|P])?(\d{4})(?:V(\d+)|[UDN])?(FT)?$#', $piece, $matches)) { |
|
| 204 | - $rvr = array(); |
|
| 183 | + } |
|
| 184 | + // Cloud Coverage |
|
| 185 | + if (preg_match('#^(SKC|CLR|FEW|SCT|BKN|OVC|VV)([0-9]{3})(CB|TCU|CU|CI)?$#', $piece, $matches)) { |
|
| 186 | + //$this->addCloudCover($matches[1], ((float)$matches[2]) * 100, isset($matches[3]) ? $matches[3] : ''); |
|
| 187 | + $type = $matches[1]; |
|
| 188 | + $cloud = array(); |
|
| 189 | + if ($type == 'SKC') $cloud['type'] = 'No cloud/Sky clear'; |
|
| 190 | + elseif ($type == 'CLR') $cloud['type'] = 'No cloud below 12,000ft (3700m)'; |
|
| 191 | + elseif ($type == 'NSC') $cloud['type'] = 'No significant cloud'; |
|
| 192 | + elseif ($type == 'FEW') $cloud['type'] = 'Few'; |
|
| 193 | + elseif ($type == 'SCT') $cloud['type'] = 'Scattered'; |
|
| 194 | + elseif ($type == 'BKN') $cloud['type'] = 'Broken'; |
|
| 195 | + elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage'; |
|
| 196 | + elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility'; |
|
| 197 | + $cloud['type_code'] = $type; |
|
| 198 | + $cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048); |
|
| 199 | + $cloud['significant'] = isset($matches[3]) ? $matches[3] : ''; |
|
| 200 | + $result['cloud'][] = $cloud; |
|
| 201 | + } |
|
| 202 | + // RVR |
|
| 203 | + if (preg_match('#^(R.+)/([M|P])?(\d{4})(?:V(\d+)|[UDN])?(FT)?$#', $piece, $matches)) { |
|
| 204 | + $rvr = array(); |
|
| 205 | 205 | $rvr['runway'] = $matches[1]; |
| 206 | 206 | $rvr['assessment'] = $matches[2]; |
| 207 | 207 | $rvr['rvr'] = $matches[3]; |
@@ -210,33 +210,33 @@ discard block |
||
| 210 | 210 | $result['RVR'] = $rvr; |
| 211 | 211 | } |
| 212 | 212 | |
| 213 | - //if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) { |
|
| 214 | - if (preg_match('#^R(\d{2}[LRC]?)/([\d/])([\d/])([\d/]{2})([\d/]{2})$#', $piece, $matches)) { |
|
| 215 | - //print_r($matches); |
|
| 216 | - // https://github.com/davidmegginson/metar-taf/blob/master/Metar.php |
|
| 217 | - $result['RVR']['runway'] = $matches[1]; |
|
| 218 | - $result['RVR']['deposits'] = $matches[2]; |
|
| 219 | - $result['RVR']['extent'] = $matches[3]; |
|
| 220 | - $result['RVR']['depth'] = $matches[4]; |
|
| 221 | - $result['RVR']['friction'] = $matches[5]; |
|
| 222 | - } |
|
| 223 | - if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) { |
|
| 224 | - //echo $piece; |
|
| 225 | - //print_r($matches); |
|
| 226 | - if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M'); |
|
| 227 | - else $range = array('exact' => (float)$matches[2], 'unit' => 'M'); |
|
| 213 | + //if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) { |
|
| 214 | + if (preg_match('#^R(\d{2}[LRC]?)/([\d/])([\d/])([\d/]{2})([\d/]{2})$#', $piece, $matches)) { |
|
| 215 | + //print_r($matches); |
|
| 216 | + // https://github.com/davidmegginson/metar-taf/blob/master/Metar.php |
|
| 217 | + $result['RVR']['runway'] = $matches[1]; |
|
| 218 | + $result['RVR']['deposits'] = $matches[2]; |
|
| 219 | + $result['RVR']['extent'] = $matches[3]; |
|
| 220 | + $result['RVR']['depth'] = $matches[4]; |
|
| 221 | + $result['RVR']['friction'] = $matches[5]; |
|
| 222 | + } |
|
| 223 | + if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) { |
|
| 224 | + //echo $piece; |
|
| 225 | + //print_r($matches); |
|
| 226 | + if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M'); |
|
| 227 | + else $range = array('exact' => (float)$matches[2], 'unit' => 'M'); |
|
| 228 | 228 | if (isset($matches[3])) { |
| 229 | 229 | $range = Array( |
| 230 | - 'from' => (float)$matches[2], |
|
| 231 | - 'to' => (float)$matches[4], |
|
| 232 | - 'unit' => $matches[5] ? 'FT' : 'M' |
|
| 230 | + 'from' => (float)$matches[2], |
|
| 231 | + 'to' => (float)$matches[4], |
|
| 232 | + 'unit' => $matches[5] ? 'FT' : 'M' |
|
| 233 | 233 | ); |
| 234 | 234 | } |
| 235 | 235 | $result['RVR'] = $matches[1]; |
| 236 | 236 | $result['RVR_range'] = $range; |
| 237 | - } |
|
| 238 | - // Weather |
|
| 239 | - if (preg_match($regWeather, $piece, $matches)) { |
|
| 237 | + } |
|
| 238 | + // Weather |
|
| 239 | + if (preg_match($regWeather, $piece, $matches)) { |
|
| 240 | 240 | $text = Array(); |
| 241 | 241 | switch ($matches[1]) { |
| 242 | 242 | case '+': |
@@ -259,35 +259,35 @@ discard block |
||
| 259 | 259 | } |
| 260 | 260 | if (!isset($result['weather'])) $result['weather'] = implode(' ', $text); |
| 261 | 261 | else $result['weather'] = $result['weather'].' / '.implode(' ', $text); |
| 262 | - } |
|
| 263 | - } |
|
| 264 | - return $result; |
|
| 262 | + } |
|
| 263 | + } |
|
| 264 | + return $result; |
|
| 265 | 265 | |
| 266 | - } |
|
| 266 | + } |
|
| 267 | 267 | |
| 268 | 268 | public function getMETAR($icao) { |
| 269 | - global $globalMETARcycle, $globalDBdriver; |
|
| 270 | - if (isset($globalMETARcycle) && $globalMETARcycle) { |
|
| 271 | - $query = "SELECT * FROM metar WHERE metar_location = :icao"; |
|
| 272 | - } else { |
|
| 273 | - if ($globalDBdriver == 'mysql') $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1"; |
|
| 274 | - else $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1"; |
|
| 275 | - } |
|
| 276 | - $query_values = array(':icao' => $icao); |
|
| 277 | - try { |
|
| 278 | - $sth = $this->db->prepare($query); |
|
| 279 | - $sth->execute($query_values); |
|
| 280 | - } catch(PDOException $e) { |
|
| 281 | - return "error : ".$e->getMessage(); |
|
| 282 | - } |
|
| 283 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 284 | - if ((!isset($globalMETARcycle) || $globalMETARcycle === false) && count($all) == 0) { |
|
| 285 | - $all = $this->downloadMETAR($icao); |
|
| 286 | - } |
|
| 287 | - return $all; |
|
| 288 | - } |
|
| 269 | + global $globalMETARcycle, $globalDBdriver; |
|
| 270 | + if (isset($globalMETARcycle) && $globalMETARcycle) { |
|
| 271 | + $query = "SELECT * FROM metar WHERE metar_location = :icao"; |
|
| 272 | + } else { |
|
| 273 | + if ($globalDBdriver == 'mysql') $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1"; |
|
| 274 | + else $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1"; |
|
| 275 | + } |
|
| 276 | + $query_values = array(':icao' => $icao); |
|
| 277 | + try { |
|
| 278 | + $sth = $this->db->prepare($query); |
|
| 279 | + $sth->execute($query_values); |
|
| 280 | + } catch(PDOException $e) { |
|
| 281 | + return "error : ".$e->getMessage(); |
|
| 282 | + } |
|
| 283 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 284 | + if ((!isset($globalMETARcycle) || $globalMETARcycle === false) && count($all) == 0) { |
|
| 285 | + $all = $this->downloadMETAR($icao); |
|
| 286 | + } |
|
| 287 | + return $all; |
|
| 288 | + } |
|
| 289 | 289 | |
| 290 | - public function addMETAR($location,$metar,$date) { |
|
| 290 | + public function addMETAR($location,$metar,$date) { |
|
| 291 | 291 | global $globalDBdriver; |
| 292 | 292 | $date = date('Y-m-d H:i:s',strtotime($date)); |
| 293 | 293 | if ($globalDBdriver == 'mysql') { |
@@ -295,106 +295,106 @@ discard block |
||
| 295 | 295 | } else { |
| 296 | 296 | $query = "UPDATE metar SET metar_date = :date, metar = metar WHERE metar_location = :location;INSERT INTO metar (metar_location,metar_date,metar) SELECT :location,:date,:metar WHERE NOT EXISTS (SELECT 1 FROM metar WHERE metar_location = :location);"; |
| 297 | 297 | } |
| 298 | - $query_values = array(':location' => $location,':date' => $date,':metar' => utf8_encode($metar)); |
|
| 299 | - try { |
|
| 300 | - $sth = $this->db->prepare($query); |
|
| 301 | - $sth->execute($query_values); |
|
| 302 | - } catch(PDOException $e) { |
|
| 303 | - return "error : ".$e->getMessage(); |
|
| 304 | - } |
|
| 305 | - } |
|
| 298 | + $query_values = array(':location' => $location,':date' => $date,':metar' => utf8_encode($metar)); |
|
| 299 | + try { |
|
| 300 | + $sth = $this->db->prepare($query); |
|
| 301 | + $sth->execute($query_values); |
|
| 302 | + } catch(PDOException $e) { |
|
| 303 | + return "error : ".$e->getMessage(); |
|
| 304 | + } |
|
| 305 | + } |
|
| 306 | 306 | |
| 307 | - public function deleteMETAR($id) { |
|
| 308 | - $query = "DELETE FROM metar WHERE id = :id"; |
|
| 309 | - $query_values = array(':id' => $id); |
|
| 310 | - try { |
|
| 311 | - $sth = $this->db->prepare($query); |
|
| 312 | - $sth->execute($query_values); |
|
| 313 | - } catch(PDOException $e) { |
|
| 314 | - return "error : ".$e->getMessage(); |
|
| 315 | - } |
|
| 316 | - } |
|
| 317 | - public function deleteAllMETARLocation() { |
|
| 318 | - $query = "DELETE FROM metar"; |
|
| 319 | - try { |
|
| 320 | - $sth = $this->db->prepare($query); |
|
| 321 | - $sth->execute(); |
|
| 322 | - } catch(PDOException $e) { |
|
| 323 | - return "error : ".$e->getMessage(); |
|
| 324 | - } |
|
| 325 | - } |
|
| 307 | + public function deleteMETAR($id) { |
|
| 308 | + $query = "DELETE FROM metar WHERE id = :id"; |
|
| 309 | + $query_values = array(':id' => $id); |
|
| 310 | + try { |
|
| 311 | + $sth = $this->db->prepare($query); |
|
| 312 | + $sth->execute($query_values); |
|
| 313 | + } catch(PDOException $e) { |
|
| 314 | + return "error : ".$e->getMessage(); |
|
| 315 | + } |
|
| 316 | + } |
|
| 317 | + public function deleteAllMETARLocation() { |
|
| 318 | + $query = "DELETE FROM metar"; |
|
| 319 | + try { |
|
| 320 | + $sth = $this->db->prepare($query); |
|
| 321 | + $sth->execute(); |
|
| 322 | + } catch(PDOException $e) { |
|
| 323 | + return "error : ".$e->getMessage(); |
|
| 324 | + } |
|
| 325 | + } |
|
| 326 | 326 | |
| 327 | - public function addMETARCycle() { |
|
| 328 | - global $globalDebug, $globalIVAO, $globalTransaction; |
|
| 329 | - if (isset($globalDebug) && $globalDebug) echo "Downloading METAR cycle..."; |
|
| 330 | - date_default_timezone_set("UTC"); |
|
| 331 | - $Common = new Common(); |
|
| 332 | - if (isset($globalIVAO) && $globalIVAO) { |
|
| 333 | - //$cycle = $Common->getData('http://wx.ivao.aero/metar.php'); |
|
| 327 | + public function addMETARCycle() { |
|
| 328 | + global $globalDebug, $globalIVAO, $globalTransaction; |
|
| 329 | + if (isset($globalDebug) && $globalDebug) echo "Downloading METAR cycle..."; |
|
| 330 | + date_default_timezone_set("UTC"); |
|
| 331 | + $Common = new Common(); |
|
| 332 | + if (isset($globalIVAO) && $globalIVAO) { |
|
| 333 | + //$cycle = $Common->getData('http://wx.ivao.aero/metar.php'); |
|
| 334 | 334 | $Common->download('http://wx.ivao.aero/metar.php',dirname(__FILE__).'/../install/tmp/ivaometar.txt'); |
| 335 | - $handle = fopen(dirname(__FILE__).'/../install/tmp/ivaometar.txt',"r"); |
|
| 336 | - } else { |
|
| 335 | + $handle = fopen(dirname(__FILE__).'/../install/tmp/ivaometar.txt',"r"); |
|
| 336 | + } else { |
|
| 337 | 337 | //$cycle = $Common->getData('http://tgftp.nws.noaa.gov/data/observations/metar/cycles/'.date('H').'Z.TXT'); |
| 338 | 338 | $Common->download('http://tgftp.nws.noaa.gov/data/observations/metar/cycles/'.date('H').'Z.TXT',dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT'); |
| 339 | - $handle = fopen(dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT',"r"); |
|
| 340 | - } |
|
| 341 | - if ($handle) { |
|
| 339 | + $handle = fopen(dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT',"r"); |
|
| 340 | + } |
|
| 341 | + if ($handle) { |
|
| 342 | 342 | if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB..."; |
| 343 | 343 | $date = ''; |
| 344 | - //foreach(explode("\n",$cycle) as $line) { |
|
| 345 | - if ($globalTransaction) $this->db->beginTransaction(); |
|
| 346 | - while(($line = fgets($handle,4096)) !== false) { |
|
| 344 | + //foreach(explode("\n",$cycle) as $line) { |
|
| 345 | + if ($globalTransaction) $this->db->beginTransaction(); |
|
| 346 | + while(($line = fgets($handle,4096)) !== false) { |
|
| 347 | 347 | if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) { |
| 348 | 348 | $date = $line; |
| 349 | - } elseif ($line != '') { |
|
| 350 | - //$this->parse($line); |
|
| 351 | - if ($date == '') $date = date('Y/m/d H:m'); |
|
| 352 | - $pos = 0; |
|
| 353 | - $pieces = preg_split('/\s/',$line); |
|
| 354 | - if ($pieces[0] == 'METAR') $pos++; |
|
| 355 | - if (strlen($pieces[$pos]) != 4) $pos++; |
|
| 356 | - $location = $pieces[$pos]; |
|
| 357 | - echo $this->addMETAR($location,$line,$date); |
|
| 358 | - } |
|
| 359 | - } |
|
| 360 | - fclose($handle); |
|
| 361 | - if ($globalTransaction) $this->db->commit(); |
|
| 362 | - } |
|
| 363 | - if (isset($globalDebug) && $globalDebug) echo "Done\n"; |
|
| 349 | + } elseif ($line != '') { |
|
| 350 | + //$this->parse($line); |
|
| 351 | + if ($date == '') $date = date('Y/m/d H:m'); |
|
| 352 | + $pos = 0; |
|
| 353 | + $pieces = preg_split('/\s/',$line); |
|
| 354 | + if ($pieces[0] == 'METAR') $pos++; |
|
| 355 | + if (strlen($pieces[$pos]) != 4) $pos++; |
|
| 356 | + $location = $pieces[$pos]; |
|
| 357 | + echo $this->addMETAR($location,$line,$date); |
|
| 358 | + } |
|
| 359 | + } |
|
| 360 | + fclose($handle); |
|
| 361 | + if ($globalTransaction) $this->db->commit(); |
|
| 362 | + } |
|
| 363 | + if (isset($globalDebug) && $globalDebug) echo "Done\n"; |
|
| 364 | 364 | |
| 365 | - } |
|
| 366 | - public function downloadMETAR($icao) { |
|
| 367 | - global $globalMETARurl; |
|
| 368 | - if ($globalMETARurl == '') return array(); |
|
| 369 | - date_default_timezone_set("UTC"); |
|
| 370 | - $Common = new Common(); |
|
| 371 | - $url = str_replace('{icao}',$icao,$globalMETARurl); |
|
| 372 | - $cycle = $Common->getData($url); |
|
| 373 | - $date = ''; |
|
| 374 | - foreach(explode("\n",$cycle) as $line) { |
|
| 375 | - if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) { |
|
| 376 | - //echo "date : ".$line."\n"; |
|
| 377 | - $date = $line; |
|
| 378 | - } |
|
| 379 | - if ($line != '') { |
|
| 380 | - //$this->parse($line); |
|
| 381 | - //echo $line; |
|
| 382 | - if ($date == '') $date = date('Y/m/d H:m'); |
|
| 383 | - $pos = 0; |
|
| 384 | - $pieces = preg_split('/\s/',$line); |
|
| 385 | - if ($pieces[0] == 'METAR') $pos++; |
|
| 386 | - if (strlen($pieces[$pos]) != 4) $pos++; |
|
| 387 | - $location = $pieces[$pos]; |
|
| 388 | - if (strlen($location == 4)) { |
|
| 389 | - $this->addMETAR($location,$line,$date); |
|
| 390 | - return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line)); |
|
| 391 | - } else return array(); |
|
| 392 | - } |
|
| 393 | - //echo $line."\n"; |
|
| 394 | - } |
|
| 395 | - return array(); |
|
| 365 | + } |
|
| 366 | + public function downloadMETAR($icao) { |
|
| 367 | + global $globalMETARurl; |
|
| 368 | + if ($globalMETARurl == '') return array(); |
|
| 369 | + date_default_timezone_set("UTC"); |
|
| 370 | + $Common = new Common(); |
|
| 371 | + $url = str_replace('{icao}',$icao,$globalMETARurl); |
|
| 372 | + $cycle = $Common->getData($url); |
|
| 373 | + $date = ''; |
|
| 374 | + foreach(explode("\n",$cycle) as $line) { |
|
| 375 | + if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) { |
|
| 376 | + //echo "date : ".$line."\n"; |
|
| 377 | + $date = $line; |
|
| 378 | + } |
|
| 379 | + if ($line != '') { |
|
| 380 | + //$this->parse($line); |
|
| 381 | + //echo $line; |
|
| 382 | + if ($date == '') $date = date('Y/m/d H:m'); |
|
| 383 | + $pos = 0; |
|
| 384 | + $pieces = preg_split('/\s/',$line); |
|
| 385 | + if ($pieces[0] == 'METAR') $pos++; |
|
| 386 | + if (strlen($pieces[$pos]) != 4) $pos++; |
|
| 387 | + $location = $pieces[$pos]; |
|
| 388 | + if (strlen($location == 4)) { |
|
| 389 | + $this->addMETAR($location,$line,$date); |
|
| 390 | + return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line)); |
|
| 391 | + } else return array(); |
|
| 392 | + } |
|
| 393 | + //echo $line."\n"; |
|
| 394 | + } |
|
| 395 | + return array(); |
|
| 396 | 396 | |
| 397 | - } |
|
| 397 | + } |
|
| 398 | 398 | } |
| 399 | 399 | /* |
| 400 | 400 | $METAR = new METAR(); |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | $Connection = new Connection(); |
| 55 | 55 | $sth = $Connection->db->prepare($query); |
| 56 | 56 | $sth->execute(); |
| 57 | - } catch(PDOException $e) { |
|
| 57 | + } catch (PDOException $e) { |
|
| 58 | 58 | return "error : ".$e->getMessage(); |
| 59 | 59 | } |
| 60 | 60 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | $Connection = new Connection(); |
| 71 | 71 | $sth = $Connection->db->prepare($query); |
| 72 | 72 | $sth->execute(); |
| 73 | - } catch(PDOException $e) { |
|
| 73 | + } catch (PDOException $e) { |
|
| 74 | 74 | return "error : ".$e->getMessage(); |
| 75 | 75 | } |
| 76 | 76 | } |
@@ -80,9 +80,9 @@ discard block |
||
| 80 | 80 | public function parse($data) { |
| 81 | 81 | //$data = str_replace(array('\n','\r','\r','\n'),'',$data); |
| 82 | 82 | $codes = implode('|', array_keys($this->texts)); |
| 83 | - $regWeather = '#^(\+|\-|VC)?(' . $codes . ')(' . $codes . ')?$#'; |
|
| 83 | + $regWeather = '#^(\+|\-|VC)?('.$codes.')('.$codes.')?$#'; |
|
| 84 | 84 | //$pieces = explode(' ',$data); |
| 85 | - $pieces = preg_split('/\s/',$data); |
|
| 85 | + $pieces = preg_split('/\s/', $data); |
|
| 86 | 86 | $pos = 0; |
| 87 | 87 | if ($pieces[0] == 'METAR') $pos++; |
| 88 | 88 | elseif ($pieces[0] == 'SPECI') $pos++; |
@@ -90,25 +90,25 @@ discard block |
||
| 90 | 90 | $result = array(); |
| 91 | 91 | $result['location'] = $pieces[$pos]; |
| 92 | 92 | $pos++; |
| 93 | - $result['dayofmonth'] = substr($pieces[$pos],0,2); |
|
| 94 | - $result['time'] = substr($pieces[$pos],2,4); |
|
| 93 | + $result['dayofmonth'] = substr($pieces[$pos], 0, 2); |
|
| 94 | + $result['time'] = substr($pieces[$pos], 2, 4); |
|
| 95 | 95 | $c = count($pieces); |
| 96 | - for($pos++; $pos < $c; $pos++) { |
|
| 96 | + for ($pos++; $pos < $c; $pos++) { |
|
| 97 | 97 | $piece = $pieces[$pos]; |
| 98 | 98 | if ($piece == 'RMK') break; |
| 99 | 99 | if ($piece == 'AUTO') $result['auto'] = true; |
| 100 | 100 | if ($piece == 'COR') $result['correction'] = true; |
| 101 | 101 | // Wind Speed |
| 102 | 102 | if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) { |
| 103 | - $result['wind']['direction'] = (float)$matches[1]; |
|
| 103 | + $result['wind']['direction'] = (float) $matches[1]; |
|
| 104 | 104 | $result['wind']['unit'] = $matches[4]; |
| 105 | - if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2); |
|
| 106 | - elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2); |
|
| 107 | - elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2); |
|
| 108 | - $result['wind']['gust'] = (float)$matches[3]; |
|
| 105 | + if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float) $matches[2])*0.51444444444, 2); |
|
| 106 | + elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float) $matches[2])*1000, 2); |
|
| 107 | + elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float) $matches[2]), 2); |
|
| 108 | + $result['wind']['gust'] = (float) $matches[3]; |
|
| 109 | 109 | $result['wind']['unit'] = $matches[4]; |
| 110 | - $result['wind']['min_variation'] = array_key_exists(5,$matches) ? $matches[5] : 0; |
|
| 111 | - $result['wind']['max_variation'] = array_key_exists(6,$matches) ? $matches[6] : 0; |
|
| 110 | + $result['wind']['min_variation'] = array_key_exists(5, $matches) ? $matches[5] : 0; |
|
| 111 | + $result['wind']['max_variation'] = array_key_exists(6, $matches) ? $matches[6] : 0; |
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | /* if (preg_match('#^([0-9]{3})([0-9]{2})(G([0-9]{2}))?(KT|MPS)$#', $piece, $matches)) { |
@@ -128,14 +128,14 @@ discard block |
||
| 128 | 128 | */ |
| 129 | 129 | // Temperature |
| 130 | 130 | if (preg_match('#^(M?[0-9]{2,})/(M?[0-9]{2,})$#', $piece, $matches)) { |
| 131 | - $temp = (float)$matches[1]; |
|
| 131 | + $temp = (float) $matches[1]; |
|
| 132 | 132 | if ($matches[1]{0} == 'M') { |
| 133 | - $temp = ((float)substr($matches[1], 1)) * -1; |
|
| 133 | + $temp = ((float) substr($matches[1], 1))*-1; |
|
| 134 | 134 | } |
| 135 | 135 | $result['temperature'] = $temp; |
| 136 | - $dew = (float)$matches[2]; |
|
| 136 | + $dew = (float) $matches[2]; |
|
| 137 | 137 | if ($matches[2]{0} == 'M') { |
| 138 | - $dew = ((float)substr($matches[2], 1)) * -1; |
|
| 138 | + $dew = ((float) substr($matches[2], 1))*-1; |
|
| 139 | 139 | } |
| 140 | 140 | $result['dew'] = $dew; |
| 141 | 141 | } |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | $result['QNH'] = $matches[2]; |
| 148 | 148 | } else { |
| 149 | 149 | // inHg |
| 150 | - $result['QNH'] = round(($matches[2] / 100)*33.86389,2); |
|
| 150 | + $result['QNH'] = round(($matches[2]/100)*33.86389, 2); |
|
| 151 | 151 | } |
| 152 | 152 | /* |
| 153 | 153 | $result['QNH'] = $matches[1] == 'Q' ? $matches[2] : ($matches[2] / 100); |
@@ -168,12 +168,12 @@ discard block |
||
| 168 | 168 | // Visibility |
| 169 | 169 | if (preg_match('#^([0-9]{4})|(([0-9]{1,4})SM)$#', $piece, $matches)) { |
| 170 | 170 | if (isset($matches[3]) && strlen($matches[3]) > 0) { |
| 171 | - $result['visibility'] = (float)$matches[3] * 1609.34; |
|
| 171 | + $result['visibility'] = (float) $matches[3]*1609.34; |
|
| 172 | 172 | } else { |
| 173 | 173 | if ($matches[1] == '9999') { |
| 174 | 174 | $result['visibility'] = '> 10000'; |
| 175 | 175 | } else { |
| 176 | - $result['visibility'] = (float)$matches[1]; |
|
| 176 | + $result['visibility'] = (float) $matches[1]; |
|
| 177 | 177 | } |
| 178 | 178 | } |
| 179 | 179 | if (preg_match('#^CAVOK$#', $piece, $matches)) { |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage'; |
| 196 | 196 | elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility'; |
| 197 | 197 | $cloud['type_code'] = $type; |
| 198 | - $cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048); |
|
| 198 | + $cloud['level'] = round(((float) $matches[2])*100*0.3048); |
|
| 199 | 199 | $cloud['significant'] = isset($matches[3]) ? $matches[3] : ''; |
| 200 | 200 | $result['cloud'][] = $cloud; |
| 201 | 201 | } |
@@ -205,8 +205,8 @@ discard block |
||
| 205 | 205 | $rvr['runway'] = $matches[1]; |
| 206 | 206 | $rvr['assessment'] = $matches[2]; |
| 207 | 207 | $rvr['rvr'] = $matches[3]; |
| 208 | - $rvr['rvr_max'] = array_key_exists(4,$matches) ? $matches[4] : 0; |
|
| 209 | - $rvr['unit'] = array_key_exists(5,$matches) ? $matches[5] : ''; |
|
| 208 | + $rvr['rvr_max'] = array_key_exists(4, $matches) ? $matches[4] : 0; |
|
| 209 | + $rvr['unit'] = array_key_exists(5, $matches) ? $matches[5] : ''; |
|
| 210 | 210 | $result['RVR'] = $rvr; |
| 211 | 211 | } |
| 212 | 212 | |
@@ -223,12 +223,12 @@ discard block |
||
| 223 | 223 | if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) { |
| 224 | 224 | //echo $piece; |
| 225 | 225 | //print_r($matches); |
| 226 | - if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M'); |
|
| 227 | - else $range = array('exact' => (float)$matches[2], 'unit' => 'M'); |
|
| 226 | + if (isset($matches[5])) $range = array('exact' => (float) $matches[2], 'unit' => $matches[5] ? 'FT' : 'M'); |
|
| 227 | + else $range = array('exact' => (float) $matches[2], 'unit' => 'M'); |
|
| 228 | 228 | if (isset($matches[3])) { |
| 229 | 229 | $range = Array( |
| 230 | - 'from' => (float)$matches[2], |
|
| 231 | - 'to' => (float)$matches[4], |
|
| 230 | + 'from' => (float) $matches[2], |
|
| 231 | + 'to' => (float) $matches[4], |
|
| 232 | 232 | 'unit' => $matches[5] ? 'FT' : 'M' |
| 233 | 233 | ); |
| 234 | 234 | } |
@@ -277,7 +277,7 @@ discard block |
||
| 277 | 277 | try { |
| 278 | 278 | $sth = $this->db->prepare($query); |
| 279 | 279 | $sth->execute($query_values); |
| 280 | - } catch(PDOException $e) { |
|
| 280 | + } catch (PDOException $e) { |
|
| 281 | 281 | return "error : ".$e->getMessage(); |
| 282 | 282 | } |
| 283 | 283 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -287,19 +287,19 @@ discard block |
||
| 287 | 287 | return $all; |
| 288 | 288 | } |
| 289 | 289 | |
| 290 | - public function addMETAR($location,$metar,$date) { |
|
| 290 | + public function addMETAR($location, $metar, $date) { |
|
| 291 | 291 | global $globalDBdriver; |
| 292 | - $date = date('Y-m-d H:i:s',strtotime($date)); |
|
| 292 | + $date = date('Y-m-d H:i:s', strtotime($date)); |
|
| 293 | 293 | if ($globalDBdriver == 'mysql') { |
| 294 | 294 | $query = "INSERT INTO metar (metar_location,metar_date,metar) VALUES (:location,:date,:metar) ON DUPLICATE KEY UPDATE metar_date = :date, metar = :metar"; |
| 295 | 295 | } else { |
| 296 | 296 | $query = "UPDATE metar SET metar_date = :date, metar = metar WHERE metar_location = :location;INSERT INTO metar (metar_location,metar_date,metar) SELECT :location,:date,:metar WHERE NOT EXISTS (SELECT 1 FROM metar WHERE metar_location = :location);"; |
| 297 | 297 | } |
| 298 | - $query_values = array(':location' => $location,':date' => $date,':metar' => utf8_encode($metar)); |
|
| 298 | + $query_values = array(':location' => $location, ':date' => $date, ':metar' => utf8_encode($metar)); |
|
| 299 | 299 | try { |
| 300 | 300 | $sth = $this->db->prepare($query); |
| 301 | 301 | $sth->execute($query_values); |
| 302 | - } catch(PDOException $e) { |
|
| 302 | + } catch (PDOException $e) { |
|
| 303 | 303 | return "error : ".$e->getMessage(); |
| 304 | 304 | } |
| 305 | 305 | } |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | try { |
| 311 | 311 | $sth = $this->db->prepare($query); |
| 312 | 312 | $sth->execute($query_values); |
| 313 | - } catch(PDOException $e) { |
|
| 313 | + } catch (PDOException $e) { |
|
| 314 | 314 | return "error : ".$e->getMessage(); |
| 315 | 315 | } |
| 316 | 316 | } |
@@ -319,7 +319,7 @@ discard block |
||
| 319 | 319 | try { |
| 320 | 320 | $sth = $this->db->prepare($query); |
| 321 | 321 | $sth->execute(); |
| 322 | - } catch(PDOException $e) { |
|
| 322 | + } catch (PDOException $e) { |
|
| 323 | 323 | return "error : ".$e->getMessage(); |
| 324 | 324 | } |
| 325 | 325 | } |
@@ -331,30 +331,30 @@ discard block |
||
| 331 | 331 | $Common = new Common(); |
| 332 | 332 | if (isset($globalIVAO) && $globalIVAO) { |
| 333 | 333 | //$cycle = $Common->getData('http://wx.ivao.aero/metar.php'); |
| 334 | - $Common->download('http://wx.ivao.aero/metar.php',dirname(__FILE__).'/../install/tmp/ivaometar.txt'); |
|
| 335 | - $handle = fopen(dirname(__FILE__).'/../install/tmp/ivaometar.txt',"r"); |
|
| 334 | + $Common->download('http://wx.ivao.aero/metar.php', dirname(__FILE__).'/../install/tmp/ivaometar.txt'); |
|
| 335 | + $handle = fopen(dirname(__FILE__).'/../install/tmp/ivaometar.txt', "r"); |
|
| 336 | 336 | } else { |
| 337 | 337 | //$cycle = $Common->getData('http://tgftp.nws.noaa.gov/data/observations/metar/cycles/'.date('H').'Z.TXT'); |
| 338 | - $Common->download('http://tgftp.nws.noaa.gov/data/observations/metar/cycles/'.date('H').'Z.TXT',dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT'); |
|
| 339 | - $handle = fopen(dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT',"r"); |
|
| 338 | + $Common->download('http://tgftp.nws.noaa.gov/data/observations/metar/cycles/'.date('H').'Z.TXT', dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT'); |
|
| 339 | + $handle = fopen(dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT', "r"); |
|
| 340 | 340 | } |
| 341 | 341 | if ($handle) { |
| 342 | 342 | if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB..."; |
| 343 | 343 | $date = ''; |
| 344 | 344 | //foreach(explode("\n",$cycle) as $line) { |
| 345 | 345 | if ($globalTransaction) $this->db->beginTransaction(); |
| 346 | - while(($line = fgets($handle,4096)) !== false) { |
|
| 347 | - if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) { |
|
| 346 | + while (($line = fgets($handle, 4096)) !== false) { |
|
| 347 | + if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#', $line)) { |
|
| 348 | 348 | $date = $line; |
| 349 | 349 | } elseif ($line != '') { |
| 350 | 350 | //$this->parse($line); |
| 351 | 351 | if ($date == '') $date = date('Y/m/d H:m'); |
| 352 | 352 | $pos = 0; |
| 353 | - $pieces = preg_split('/\s/',$line); |
|
| 353 | + $pieces = preg_split('/\s/', $line); |
|
| 354 | 354 | if ($pieces[0] == 'METAR') $pos++; |
| 355 | 355 | if (strlen($pieces[$pos]) != 4) $pos++; |
| 356 | 356 | $location = $pieces[$pos]; |
| 357 | - echo $this->addMETAR($location,$line,$date); |
|
| 357 | + echo $this->addMETAR($location, $line, $date); |
|
| 358 | 358 | } |
| 359 | 359 | } |
| 360 | 360 | fclose($handle); |
@@ -368,11 +368,11 @@ discard block |
||
| 368 | 368 | if ($globalMETARurl == '') return array(); |
| 369 | 369 | date_default_timezone_set("UTC"); |
| 370 | 370 | $Common = new Common(); |
| 371 | - $url = str_replace('{icao}',$icao,$globalMETARurl); |
|
| 371 | + $url = str_replace('{icao}', $icao, $globalMETARurl); |
|
| 372 | 372 | $cycle = $Common->getData($url); |
| 373 | 373 | $date = ''; |
| 374 | - foreach(explode("\n",$cycle) as $line) { |
|
| 375 | - if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) { |
|
| 374 | + foreach (explode("\n", $cycle) as $line) { |
|
| 375 | + if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#', $line)) { |
|
| 376 | 376 | //echo "date : ".$line."\n"; |
| 377 | 377 | $date = $line; |
| 378 | 378 | } |
@@ -381,12 +381,12 @@ discard block |
||
| 381 | 381 | //echo $line; |
| 382 | 382 | if ($date == '') $date = date('Y/m/d H:m'); |
| 383 | 383 | $pos = 0; |
| 384 | - $pieces = preg_split('/\s/',$line); |
|
| 384 | + $pieces = preg_split('/\s/', $line); |
|
| 385 | 385 | if ($pieces[0] == 'METAR') $pos++; |
| 386 | 386 | if (strlen($pieces[$pos]) != 4) $pos++; |
| 387 | 387 | $location = $pieces[$pos]; |
| 388 | 388 | if (strlen($location == 4)) { |
| 389 | - $this->addMETAR($location,$line,$date); |
|
| 389 | + $this->addMETAR($location, $line, $date); |
|
| 390 | 390 | return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line)); |
| 391 | 391 | } else return array(); |
| 392 | 392 | } |
@@ -59,8 +59,11 @@ discard block |
||
| 59 | 59 | } |
| 60 | 60 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 61 | 61 | $sth->closeCursor(); |
| 62 | - if ($row['nb'] > 0) return false; |
|
| 63 | - else return true; |
|
| 62 | + if ($row['nb'] > 0) { |
|
| 63 | + return false; |
|
| 64 | + } else { |
|
| 65 | + return true; |
|
| 66 | + } |
|
| 64 | 67 | } |
| 65 | 68 | |
| 66 | 69 | public static function insert_last_update() { |
@@ -84,9 +87,14 @@ discard block |
||
| 84 | 87 | //$pieces = explode(' ',$data); |
| 85 | 88 | $pieces = preg_split('/\s/',$data); |
| 86 | 89 | $pos = 0; |
| 87 | - if ($pieces[0] == 'METAR') $pos++; |
|
| 88 | - elseif ($pieces[0] == 'SPECI') $pos++; |
|
| 89 | - if (strlen($pieces[$pos]) != 4) $pos++; |
|
| 90 | + if ($pieces[0] == 'METAR') { |
|
| 91 | + $pos++; |
|
| 92 | + } elseif ($pieces[0] == 'SPECI') { |
|
| 93 | + $pos++; |
|
| 94 | + } |
|
| 95 | + if (strlen($pieces[$pos]) != 4) { |
|
| 96 | + $pos++; |
|
| 97 | + } |
|
| 90 | 98 | $result = array(); |
| 91 | 99 | $result['location'] = $pieces[$pos]; |
| 92 | 100 | $pos++; |
@@ -95,16 +103,26 @@ discard block |
||
| 95 | 103 | $c = count($pieces); |
| 96 | 104 | for($pos++; $pos < $c; $pos++) { |
| 97 | 105 | $piece = $pieces[$pos]; |
| 98 | - if ($piece == 'RMK') break; |
|
| 99 | - if ($piece == 'AUTO') $result['auto'] = true; |
|
| 100 | - if ($piece == 'COR') $result['correction'] = true; |
|
| 106 | + if ($piece == 'RMK') { |
|
| 107 | + break; |
|
| 108 | + } |
|
| 109 | + if ($piece == 'AUTO') { |
|
| 110 | + $result['auto'] = true; |
|
| 111 | + } |
|
| 112 | + if ($piece == 'COR') { |
|
| 113 | + $result['correction'] = true; |
|
| 114 | + } |
|
| 101 | 115 | // Wind Speed |
| 102 | 116 | if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) { |
| 103 | 117 | $result['wind']['direction'] = (float)$matches[1]; |
| 104 | 118 | $result['wind']['unit'] = $matches[4]; |
| 105 | - if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2); |
|
| 106 | - elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2); |
|
| 107 | - elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2); |
|
| 119 | + if ($result['wind']['unit'] == 'KT') { |
|
| 120 | + $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2); |
|
| 121 | + } elseif ($result['wind']['unit'] == 'KPH') { |
|
| 122 | + $result['wind']['speed'] = round(((float)$matches[2])*1000,2); |
|
| 123 | + } elseif ($result['wind']['unit'] == 'MPS') { |
|
| 124 | + $result['wind']['speed'] = round(((float)$matches[2]),2); |
|
| 125 | + } |
|
| 108 | 126 | $result['wind']['gust'] = (float)$matches[3]; |
| 109 | 127 | $result['wind']['unit'] = $matches[4]; |
| 110 | 128 | $result['wind']['min_variation'] = array_key_exists(5,$matches) ? $matches[5] : 0; |
@@ -186,14 +204,23 @@ discard block |
||
| 186 | 204 | //$this->addCloudCover($matches[1], ((float)$matches[2]) * 100, isset($matches[3]) ? $matches[3] : ''); |
| 187 | 205 | $type = $matches[1]; |
| 188 | 206 | $cloud = array(); |
| 189 | - if ($type == 'SKC') $cloud['type'] = 'No cloud/Sky clear'; |
|
| 190 | - elseif ($type == 'CLR') $cloud['type'] = 'No cloud below 12,000ft (3700m)'; |
|
| 191 | - elseif ($type == 'NSC') $cloud['type'] = 'No significant cloud'; |
|
| 192 | - elseif ($type == 'FEW') $cloud['type'] = 'Few'; |
|
| 193 | - elseif ($type == 'SCT') $cloud['type'] = 'Scattered'; |
|
| 194 | - elseif ($type == 'BKN') $cloud['type'] = 'Broken'; |
|
| 195 | - elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage'; |
|
| 196 | - elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility'; |
|
| 207 | + if ($type == 'SKC') { |
|
| 208 | + $cloud['type'] = 'No cloud/Sky clear'; |
|
| 209 | + } elseif ($type == 'CLR') { |
|
| 210 | + $cloud['type'] = 'No cloud below 12,000ft (3700m)'; |
|
| 211 | + } elseif ($type == 'NSC') { |
|
| 212 | + $cloud['type'] = 'No significant cloud'; |
|
| 213 | + } elseif ($type == 'FEW') { |
|
| 214 | + $cloud['type'] = 'Few'; |
|
| 215 | + } elseif ($type == 'SCT') { |
|
| 216 | + $cloud['type'] = 'Scattered'; |
|
| 217 | + } elseif ($type == 'BKN') { |
|
| 218 | + $cloud['type'] = 'Broken'; |
|
| 219 | + } elseif ($type == 'OVC') { |
|
| 220 | + $cloud['type'] = 'Overcast/Full cloud coverage'; |
|
| 221 | + } elseif ($type == 'VV') { |
|
| 222 | + $cloud['type'] = 'Vertical visibility'; |
|
| 223 | + } |
|
| 197 | 224 | $cloud['type_code'] = $type; |
| 198 | 225 | $cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048); |
| 199 | 226 | $cloud['significant'] = isset($matches[3]) ? $matches[3] : ''; |
@@ -223,8 +250,11 @@ discard block |
||
| 223 | 250 | if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) { |
| 224 | 251 | //echo $piece; |
| 225 | 252 | //print_r($matches); |
| 226 | - if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M'); |
|
| 227 | - else $range = array('exact' => (float)$matches[2], 'unit' => 'M'); |
|
| 253 | + if (isset($matches[5])) { |
|
| 254 | + $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M'); |
|
| 255 | + } else { |
|
| 256 | + $range = array('exact' => (float)$matches[2], 'unit' => 'M'); |
|
| 257 | + } |
|
| 228 | 258 | if (isset($matches[3])) { |
| 229 | 259 | $range = Array( |
| 230 | 260 | 'from' => (float)$matches[2], |
@@ -257,8 +287,11 @@ discard block |
||
| 257 | 287 | if (isset($matches[3])) { |
| 258 | 288 | $text[] = $this->texts[$matches[3]]; |
| 259 | 289 | } |
| 260 | - if (!isset($result['weather'])) $result['weather'] = implode(' ', $text); |
|
| 261 | - else $result['weather'] = $result['weather'].' / '.implode(' ', $text); |
|
| 290 | + if (!isset($result['weather'])) { |
|
| 291 | + $result['weather'] = implode(' ', $text); |
|
| 292 | + } else { |
|
| 293 | + $result['weather'] = $result['weather'].' / '.implode(' ', $text); |
|
| 294 | + } |
|
| 262 | 295 | } |
| 263 | 296 | } |
| 264 | 297 | return $result; |
@@ -270,8 +303,11 @@ discard block |
||
| 270 | 303 | if (isset($globalMETARcycle) && $globalMETARcycle) { |
| 271 | 304 | $query = "SELECT * FROM metar WHERE metar_location = :icao"; |
| 272 | 305 | } else { |
| 273 | - if ($globalDBdriver == 'mysql') $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1"; |
|
| 274 | - else $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1"; |
|
| 306 | + if ($globalDBdriver == 'mysql') { |
|
| 307 | + $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1"; |
|
| 308 | + } else { |
|
| 309 | + $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1"; |
|
| 310 | + } |
|
| 275 | 311 | } |
| 276 | 312 | $query_values = array(':icao' => $icao); |
| 277 | 313 | try { |
@@ -326,7 +362,9 @@ discard block |
||
| 326 | 362 | |
| 327 | 363 | public function addMETARCycle() { |
| 328 | 364 | global $globalDebug, $globalIVAO, $globalTransaction; |
| 329 | - if (isset($globalDebug) && $globalDebug) echo "Downloading METAR cycle..."; |
|
| 365 | + if (isset($globalDebug) && $globalDebug) { |
|
| 366 | + echo "Downloading METAR cycle..."; |
|
| 367 | + } |
|
| 330 | 368 | date_default_timezone_set("UTC"); |
| 331 | 369 | $Common = new Common(); |
| 332 | 370 | if (isset($globalIVAO) && $globalIVAO) { |
@@ -339,33 +377,49 @@ discard block |
||
| 339 | 377 | $handle = fopen(dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT',"r"); |
| 340 | 378 | } |
| 341 | 379 | if ($handle) { |
| 342 | - if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB..."; |
|
| 380 | + if (isset($globalDebug) && $globalDebug) { |
|
| 381 | + echo "Done - Updating DB..."; |
|
| 382 | + } |
|
| 343 | 383 | $date = ''; |
| 344 | 384 | //foreach(explode("\n",$cycle) as $line) { |
| 345 | - if ($globalTransaction) $this->db->beginTransaction(); |
|
| 385 | + if ($globalTransaction) { |
|
| 386 | + $this->db->beginTransaction(); |
|
| 387 | + } |
|
| 346 | 388 | while(($line = fgets($handle,4096)) !== false) { |
| 347 | 389 | if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) { |
| 348 | 390 | $date = $line; |
| 349 | 391 | } elseif ($line != '') { |
| 350 | 392 | //$this->parse($line); |
| 351 | - if ($date == '') $date = date('Y/m/d H:m'); |
|
| 393 | + if ($date == '') { |
|
| 394 | + $date = date('Y/m/d H:m'); |
|
| 395 | + } |
|
| 352 | 396 | $pos = 0; |
| 353 | 397 | $pieces = preg_split('/\s/',$line); |
| 354 | - if ($pieces[0] == 'METAR') $pos++; |
|
| 355 | - if (strlen($pieces[$pos]) != 4) $pos++; |
|
| 398 | + if ($pieces[0] == 'METAR') { |
|
| 399 | + $pos++; |
|
| 400 | + } |
|
| 401 | + if (strlen($pieces[$pos]) != 4) { |
|
| 402 | + $pos++; |
|
| 403 | + } |
|
| 356 | 404 | $location = $pieces[$pos]; |
| 357 | 405 | echo $this->addMETAR($location,$line,$date); |
| 358 | 406 | } |
| 359 | 407 | } |
| 360 | 408 | fclose($handle); |
| 361 | - if ($globalTransaction) $this->db->commit(); |
|
| 409 | + if ($globalTransaction) { |
|
| 410 | + $this->db->commit(); |
|
| 411 | + } |
|
| 412 | + } |
|
| 413 | + if (isset($globalDebug) && $globalDebug) { |
|
| 414 | + echo "Done\n"; |
|
| 362 | 415 | } |
| 363 | - if (isset($globalDebug) && $globalDebug) echo "Done\n"; |
|
| 364 | 416 | |
| 365 | 417 | } |
| 366 | 418 | public function downloadMETAR($icao) { |
| 367 | 419 | global $globalMETARurl; |
| 368 | - if ($globalMETARurl == '') return array(); |
|
| 420 | + if ($globalMETARurl == '') { |
|
| 421 | + return array(); |
|
| 422 | + } |
|
| 369 | 423 | date_default_timezone_set("UTC"); |
| 370 | 424 | $Common = new Common(); |
| 371 | 425 | $url = str_replace('{icao}',$icao,$globalMETARurl); |
@@ -379,16 +433,24 @@ discard block |
||
| 379 | 433 | if ($line != '') { |
| 380 | 434 | //$this->parse($line); |
| 381 | 435 | //echo $line; |
| 382 | - if ($date == '') $date = date('Y/m/d H:m'); |
|
| 436 | + if ($date == '') { |
|
| 437 | + $date = date('Y/m/d H:m'); |
|
| 438 | + } |
|
| 383 | 439 | $pos = 0; |
| 384 | 440 | $pieces = preg_split('/\s/',$line); |
| 385 | - if ($pieces[0] == 'METAR') $pos++; |
|
| 386 | - if (strlen($pieces[$pos]) != 4) $pos++; |
|
| 441 | + if ($pieces[0] == 'METAR') { |
|
| 442 | + $pos++; |
|
| 443 | + } |
|
| 444 | + if (strlen($pieces[$pos]) != 4) { |
|
| 445 | + $pos++; |
|
| 446 | + } |
|
| 387 | 447 | $location = $pieces[$pos]; |
| 388 | 448 | if (strlen($location == 4)) { |
| 389 | 449 | $this->addMETAR($location,$line,$date); |
| 390 | 450 | return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line)); |
| 391 | - } else return array(); |
|
| 451 | + } else { |
|
| 452 | + return array(); |
|
| 453 | + } |
|
| 392 | 454 | } |
| 393 | 455 | //echo $line."\n"; |
| 394 | 456 | } |
@@ -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; |
@@ -12,10 +12,10 @@ discard block |
||
| 12 | 12 | |
| 13 | 13 | |
| 14 | 14 | /** |
| 15 | - * Get SQL query part for filter used |
|
| 16 | - * @param Array $filter the filter |
|
| 17 | - * @return Array the SQL part |
|
| 18 | - */ |
|
| 15 | + * Get SQL query part for filter used |
|
| 16 | + * @param Array $filter the filter |
|
| 17 | + * @return Array the SQL part |
|
| 18 | + */ |
|
| 19 | 19 | public function getFilter($filter = array(),$where = false,$and = false) { |
| 20 | 20 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 21 | 21 | $filters = array(); |
@@ -128,11 +128,11 @@ discard block |
||
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | /** |
| 131 | - * Gets all the spotter information based on the latest data entry |
|
| 132 | - * |
|
| 133 | - * @return Array the spotter information |
|
| 134 | - * |
|
| 135 | - */ |
|
| 131 | + * Gets all the spotter information based on the latest data entry |
|
| 132 | + * |
|
| 133 | + * @return Array the spotter information |
|
| 134 | + * |
|
| 135 | + */ |
|
| 136 | 136 | public function getLiveSpotterData($limit = '', $sort = '', $filter = array()) |
| 137 | 137 | { |
| 138 | 138 | global $globalDBdriver, $globalLiveInterval; |
@@ -174,11 +174,11 @@ discard block |
||
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | /** |
| 177 | - * Gets Minimal Live Spotter data |
|
| 178 | - * |
|
| 179 | - * @return Array the spotter information |
|
| 180 | - * |
|
| 181 | - */ |
|
| 177 | + * Gets Minimal Live Spotter data |
|
| 178 | + * |
|
| 179 | + * @return Array the spotter information |
|
| 180 | + * |
|
| 181 | + */ |
|
| 182 | 182 | public function getMinLiveSpotterData($filter = array()) |
| 183 | 183 | { |
| 184 | 184 | global $globalDBdriver, $globalLiveInterval; |
@@ -231,11 +231,11 @@ discard block |
||
| 231 | 231 | } |
| 232 | 232 | |
| 233 | 233 | /** |
| 234 | - * Gets Minimal Live Spotter data since xx seconds |
|
| 235 | - * |
|
| 236 | - * @return Array the spotter information |
|
| 237 | - * |
|
| 238 | - */ |
|
| 234 | + * Gets Minimal Live Spotter data since xx seconds |
|
| 235 | + * |
|
| 236 | + * @return Array the spotter information |
|
| 237 | + * |
|
| 238 | + */ |
|
| 239 | 239 | public function getMinLastLiveSpotterData($filter = array()) |
| 240 | 240 | { |
| 241 | 241 | global $globalDBdriver, $globalLiveInterval; |
@@ -253,7 +253,7 @@ discard block |
||
| 253 | 253 | $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 |
| 254 | 254 | FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' |
| 255 | 255 | ORDER BY spotter_live.flightaware_id, spotter_live.date"; |
| 256 | - } else { |
|
| 256 | + } else { |
|
| 257 | 257 | /* |
| 258 | 258 | $query = "SELECT a.aircraft_shadow, a.engine_type, a.engine_count, a.wake_category, 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 |
| 259 | 259 | FROM spotter_live LEFT JOIN (SELECT aircraft_shadow,engine_type, engine_count, wake_category, icao FROM aircraft) a ON spotter_live.aircraft_icao = a.icao".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | // echo $query; |
| 266 | 266 | } |
| 267 | 267 | |
| 268 | - try { |
|
| 268 | + try { |
|
| 269 | 269 | $sth = $this->db->prepare($query); |
| 270 | 270 | $sth->execute(); |
| 271 | 271 | } catch(PDOException $e) { |
@@ -277,11 +277,11 @@ discard block |
||
| 277 | 277 | } |
| 278 | 278 | |
| 279 | 279 | /** |
| 280 | - * Gets number of latest data entry |
|
| 281 | - * |
|
| 282 | - * @return String number of entry |
|
| 283 | - * |
|
| 284 | - */ |
|
| 280 | + * Gets number of latest data entry |
|
| 281 | + * |
|
| 282 | + * @return String number of entry |
|
| 283 | + * |
|
| 284 | + */ |
|
| 285 | 285 | public function getLiveSpotterCount($filter = array()) |
| 286 | 286 | { |
| 287 | 287 | global $globalDBdriver, $globalLiveInterval; |
@@ -308,11 +308,11 @@ discard block |
||
| 308 | 308 | } |
| 309 | 309 | |
| 310 | 310 | /** |
| 311 | - * Gets all the spotter information based on the latest data entry and coord |
|
| 312 | - * |
|
| 313 | - * @return Array the spotter information |
|
| 314 | - * |
|
| 315 | - */ |
|
| 311 | + * Gets all the spotter information based on the latest data entry and coord |
|
| 312 | + * |
|
| 313 | + * @return Array the spotter information |
|
| 314 | + * |
|
| 315 | + */ |
|
| 316 | 316 | public function getLiveSpotterDatabyCoord($coord, $filter = array()) |
| 317 | 317 | { |
| 318 | 318 | global $globalDBdriver, $globalLiveInterval; |
@@ -337,11 +337,11 @@ discard block |
||
| 337 | 337 | } |
| 338 | 338 | |
| 339 | 339 | /** |
| 340 | - * Gets all the spotter information based on the latest data entry and coord |
|
| 341 | - * |
|
| 342 | - * @return Array the spotter information |
|
| 343 | - * |
|
| 344 | - */ |
|
| 340 | + * Gets all the spotter information based on the latest data entry and coord |
|
| 341 | + * |
|
| 342 | + * @return Array the spotter information |
|
| 343 | + * |
|
| 344 | + */ |
|
| 345 | 345 | public function getMinLiveSpotterDatabyCoord($coord, $filter = array()) |
| 346 | 346 | { |
| 347 | 347 | global $globalDBdriver, $globalLiveInterval; |
@@ -382,11 +382,11 @@ discard block |
||
| 382 | 382 | } |
| 383 | 383 | |
| 384 | 384 | /** |
| 385 | - * Gets all the spotter information based on a user's latitude and longitude |
|
| 386 | - * |
|
| 387 | - * @return Array the spotter information |
|
| 388 | - * |
|
| 389 | - */ |
|
| 385 | + * Gets all the spotter information based on a user's latitude and longitude |
|
| 386 | + * |
|
| 387 | + * @return Array the spotter information |
|
| 388 | + * |
|
| 389 | + */ |
|
| 390 | 390 | public function getLatestSpotterForLayar($lat, $lng, $radius, $interval) |
| 391 | 391 | { |
| 392 | 392 | $Spotter = new Spotter($this->db); |
@@ -396,145 +396,145 @@ discard block |
||
| 396 | 396 | return false; |
| 397 | 397 | } |
| 398 | 398 | } |
| 399 | - if ($lng != '') |
|
| 400 | - { |
|
| 401 | - if (!is_numeric($lng)) |
|
| 402 | - { |
|
| 403 | - return false; |
|
| 404 | - } |
|
| 405 | - } |
|
| 406 | - |
|
| 407 | - if ($radius != '') |
|
| 408 | - { |
|
| 409 | - if (!is_numeric($radius)) |
|
| 410 | - { |
|
| 411 | - return false; |
|
| 412 | - } |
|
| 413 | - } |
|
| 399 | + if ($lng != '') |
|
| 400 | + { |
|
| 401 | + if (!is_numeric($lng)) |
|
| 402 | + { |
|
| 403 | + return false; |
|
| 404 | + } |
|
| 405 | + } |
|
| 406 | + |
|
| 407 | + if ($radius != '') |
|
| 408 | + { |
|
| 409 | + if (!is_numeric($radius)) |
|
| 410 | + { |
|
| 411 | + return false; |
|
| 412 | + } |
|
| 413 | + } |
|
| 414 | 414 | $additional_query = ''; |
| 415 | - if ($interval != '') |
|
| 416 | - { |
|
| 417 | - if (!is_string($interval)) |
|
| 418 | - { |
|
| 419 | - //$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
|
| 420 | - return false; |
|
| 421 | - } else { |
|
| 422 | - if ($interval == '1m') |
|
| 423 | - { |
|
| 424 | - $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
|
| 425 | - } else if ($interval == '15m'){ |
|
| 426 | - $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date '; |
|
| 427 | - } |
|
| 428 | - } |
|
| 429 | - } else { |
|
| 430 | - $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
|
| 431 | - } |
|
| 432 | - |
|
| 433 | - $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 |
|
| 415 | + if ($interval != '') |
|
| 416 | + { |
|
| 417 | + if (!is_string($interval)) |
|
| 418 | + { |
|
| 419 | + //$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
|
| 420 | + return false; |
|
| 421 | + } else { |
|
| 422 | + if ($interval == '1m') |
|
| 423 | + { |
|
| 424 | + $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
|
| 425 | + } else if ($interval == '15m'){ |
|
| 426 | + $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date '; |
|
| 427 | + } |
|
| 428 | + } |
|
| 429 | + } else { |
|
| 430 | + $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
|
| 431 | + } |
|
| 432 | + |
|
| 433 | + $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 |
|
| 434 | 434 | WHERE spotter_live.latitude <> '' |
| 435 | 435 | AND spotter_live.longitude <> '' |
| 436 | 436 | ".$additional_query." |
| 437 | 437 | HAVING distance < :radius |
| 438 | 438 | ORDER BY distance"; |
| 439 | 439 | |
| 440 | - $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius)); |
|
| 440 | + $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius)); |
|
| 441 | 441 | |
| 442 | - return $spotter_array; |
|
| 443 | - } |
|
| 442 | + return $spotter_array; |
|
| 443 | + } |
|
| 444 | 444 | |
| 445 | 445 | |
| 446 | - /** |
|
| 447 | - * Gets all the spotter information based on a particular callsign |
|
| 448 | - * |
|
| 449 | - * @return Array the spotter information |
|
| 450 | - * |
|
| 451 | - */ |
|
| 446 | + /** |
|
| 447 | + * Gets all the spotter information based on a particular callsign |
|
| 448 | + * |
|
| 449 | + * @return Array the spotter information |
|
| 450 | + * |
|
| 451 | + */ |
|
| 452 | 452 | public function getLastLiveSpotterDataByIdent($ident) |
| 453 | 453 | { |
| 454 | 454 | $Spotter = new Spotter($this->db); |
| 455 | 455 | date_default_timezone_set('UTC'); |
| 456 | 456 | |
| 457 | 457 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 458 | - $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'; |
|
| 458 | + $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'; |
|
| 459 | 459 | |
| 460 | 460 | $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident),'',true); |
| 461 | 461 | |
| 462 | 462 | return $spotter_array; |
| 463 | 463 | } |
| 464 | 464 | |
| 465 | - /** |
|
| 466 | - * Gets all the spotter information based on a particular callsign |
|
| 467 | - * |
|
| 468 | - * @return Array the spotter information |
|
| 469 | - * |
|
| 470 | - */ |
|
| 465 | + /** |
|
| 466 | + * Gets all the spotter information based on a particular callsign |
|
| 467 | + * |
|
| 468 | + * @return Array the spotter information |
|
| 469 | + * |
|
| 470 | + */ |
|
| 471 | 471 | public function getDateLiveSpotterDataByIdent($ident,$date) |
| 472 | 472 | { |
| 473 | 473 | $Spotter = new Spotter($this->db); |
| 474 | 474 | date_default_timezone_set('UTC'); |
| 475 | 475 | |
| 476 | 476 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 477 | - $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'; |
|
| 477 | + $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'; |
|
| 478 | 478 | |
| 479 | - $date = date('c',$date); |
|
| 479 | + $date = date('c',$date); |
|
| 480 | 480 | $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
| 481 | 481 | |
| 482 | 482 | return $spotter_array; |
| 483 | 483 | } |
| 484 | 484 | |
| 485 | - /** |
|
| 486 | - * Gets last spotter information based on a particular callsign |
|
| 487 | - * |
|
| 488 | - * @return Array the spotter information |
|
| 489 | - * |
|
| 490 | - */ |
|
| 485 | + /** |
|
| 486 | + * Gets last spotter information based on a particular callsign |
|
| 487 | + * |
|
| 488 | + * @return Array the spotter information |
|
| 489 | + * |
|
| 490 | + */ |
|
| 491 | 491 | public function getLastLiveSpotterDataById($id) |
| 492 | 492 | { |
| 493 | 493 | $Spotter = new Spotter($this->db); |
| 494 | 494 | date_default_timezone_set('UTC'); |
| 495 | 495 | |
| 496 | 496 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 497 | - $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'; |
|
| 497 | + $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'; |
|
| 498 | 498 | |
| 499 | 499 | $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id),'',true); |
| 500 | 500 | |
| 501 | 501 | return $spotter_array; |
| 502 | 502 | } |
| 503 | 503 | |
| 504 | - /** |
|
| 505 | - * Gets last spotter information based on a particular callsign |
|
| 506 | - * |
|
| 507 | - * @return Array the spotter information |
|
| 508 | - * |
|
| 509 | - */ |
|
| 504 | + /** |
|
| 505 | + * Gets last spotter information based on a particular callsign |
|
| 506 | + * |
|
| 507 | + * @return Array the spotter information |
|
| 508 | + * |
|
| 509 | + */ |
|
| 510 | 510 | public function getDateLiveSpotterDataById($id,$date) |
| 511 | 511 | { |
| 512 | 512 | $Spotter = new Spotter($this->db); |
| 513 | 513 | date_default_timezone_set('UTC'); |
| 514 | 514 | |
| 515 | 515 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 516 | - $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'; |
|
| 517 | - $date = date('c',$date); |
|
| 516 | + $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'; |
|
| 517 | + $date = date('c',$date); |
|
| 518 | 518 | $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true); |
| 519 | 519 | |
| 520 | 520 | return $spotter_array; |
| 521 | 521 | } |
| 522 | 522 | |
| 523 | - /** |
|
| 524 | - * Gets altitude information based on a particular callsign |
|
| 525 | - * |
|
| 526 | - * @return Array the spotter information |
|
| 527 | - * |
|
| 528 | - */ |
|
| 523 | + /** |
|
| 524 | + * Gets altitude information based on a particular callsign |
|
| 525 | + * |
|
| 526 | + * @return Array the spotter information |
|
| 527 | + * |
|
| 528 | + */ |
|
| 529 | 529 | public function getAltitudeLiveSpotterDataByIdent($ident) |
| 530 | 530 | { |
| 531 | 531 | |
| 532 | 532 | date_default_timezone_set('UTC'); |
| 533 | 533 | |
| 534 | 534 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 535 | - $query = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident'; |
|
| 535 | + $query = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident'; |
|
| 536 | 536 | |
| 537 | - try { |
|
| 537 | + try { |
|
| 538 | 538 | |
| 539 | 539 | $sth = $this->db->prepare($query); |
| 540 | 540 | $sth->execute(array(':ident' => $ident)); |
@@ -547,12 +547,12 @@ discard block |
||
| 547 | 547 | return $spotter_array; |
| 548 | 548 | } |
| 549 | 549 | |
| 550 | - /** |
|
| 551 | - * Gets all the spotter information based on a particular id |
|
| 552 | - * |
|
| 553 | - * @return Array the spotter information |
|
| 554 | - * |
|
| 555 | - */ |
|
| 550 | + /** |
|
| 551 | + * Gets all the spotter information based on a particular id |
|
| 552 | + * |
|
| 553 | + * @return Array the spotter information |
|
| 554 | + * |
|
| 555 | + */ |
|
| 556 | 556 | public function getAllLiveSpotterDataById($id,$liveinterval = false) |
| 557 | 557 | { |
| 558 | 558 | global $globalDBdriver, $globalLiveInterval; |
@@ -580,18 +580,18 @@ discard block |
||
| 580 | 580 | return $spotter_array; |
| 581 | 581 | } |
| 582 | 582 | |
| 583 | - /** |
|
| 584 | - * Gets all the spotter information based on a particular ident |
|
| 585 | - * |
|
| 586 | - * @return Array the spotter information |
|
| 587 | - * |
|
| 588 | - */ |
|
| 583 | + /** |
|
| 584 | + * Gets all the spotter information based on a particular ident |
|
| 585 | + * |
|
| 586 | + * @return Array the spotter information |
|
| 587 | + * |
|
| 588 | + */ |
|
| 589 | 589 | public function getAllLiveSpotterDataByIdent($ident) |
| 590 | 590 | { |
| 591 | 591 | date_default_timezone_set('UTC'); |
| 592 | 592 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 593 | 593 | $query = self::$global_query.' WHERE spotter_live.ident = :ident'; |
| 594 | - try { |
|
| 594 | + try { |
|
| 595 | 595 | |
| 596 | 596 | $sth = $this->db->prepare($query); |
| 597 | 597 | $sth->execute(array(':ident' => $ident)); |
@@ -605,23 +605,23 @@ discard block |
||
| 605 | 605 | |
| 606 | 606 | |
| 607 | 607 | /** |
| 608 | - * Deletes all info in the table |
|
| 609 | - * |
|
| 610 | - * @return String success or false |
|
| 611 | - * |
|
| 612 | - */ |
|
| 608 | + * Deletes all info in the table |
|
| 609 | + * |
|
| 610 | + * @return String success or false |
|
| 611 | + * |
|
| 612 | + */ |
|
| 613 | 613 | public function deleteLiveSpotterData() |
| 614 | 614 | { |
| 615 | 615 | global $globalDBdriver; |
| 616 | 616 | if ($globalDBdriver == 'mysql') { |
| 617 | 617 | //$query = "DELETE FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE) >= spotter_live.date"; |
| 618 | 618 | $query = 'DELETE FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 9 HOUR) >= spotter_live.date'; |
| 619 | - //$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)"; |
|
| 619 | + //$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)"; |
|
| 620 | 620 | } else { |
| 621 | 621 | $query = "DELETE FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= spotter_live.date"; |
| 622 | 622 | } |
| 623 | 623 | |
| 624 | - try { |
|
| 624 | + try { |
|
| 625 | 625 | |
| 626 | 626 | $sth = $this->db->prepare($query); |
| 627 | 627 | $sth->execute(); |
@@ -633,18 +633,18 @@ discard block |
||
| 633 | 633 | } |
| 634 | 634 | |
| 635 | 635 | /** |
| 636 | - * Deletes all info in the table for aircraft not seen since 2 HOUR |
|
| 637 | - * |
|
| 638 | - * @return String success or false |
|
| 639 | - * |
|
| 640 | - */ |
|
| 636 | + * Deletes all info in the table for aircraft not seen since 2 HOUR |
|
| 637 | + * |
|
| 638 | + * @return String success or false |
|
| 639 | + * |
|
| 640 | + */ |
|
| 641 | 641 | public function deleteLiveSpotterDataNotUpdated() |
| 642 | 642 | { |
| 643 | 643 | global $globalDBdriver, $globalDebug; |
| 644 | 644 | if ($globalDBdriver == 'mysql') { |
| 645 | 645 | //$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'; |
| 646 | - $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 1200 OFFSET 0"; |
|
| 647 | - try { |
|
| 646 | + $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 1200 OFFSET 0"; |
|
| 647 | + try { |
|
| 648 | 648 | |
| 649 | 649 | $sth = $this->db->prepare($query); |
| 650 | 650 | $sth->execute(); |
@@ -652,8 +652,8 @@ discard block |
||
| 652 | 652 | return "error"; |
| 653 | 653 | } |
| 654 | 654 | $query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN ('; |
| 655 | - $i = 0; |
|
| 656 | - $j =0; |
|
| 655 | + $i = 0; |
|
| 656 | + $j =0; |
|
| 657 | 657 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 658 | 658 | foreach($all as $row) |
| 659 | 659 | { |
@@ -661,20 +661,20 @@ discard block |
||
| 661 | 661 | $j++; |
| 662 | 662 | if ($j == 30) { |
| 663 | 663 | if ($globalDebug) echo "."; |
| 664 | - try { |
|
| 664 | + try { |
|
| 665 | 665 | |
| 666 | 666 | $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
| 667 | 667 | $sth->execute(); |
| 668 | 668 | } catch(PDOException $e) { |
| 669 | 669 | return "error"; |
| 670 | 670 | } |
| 671 | - $query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN ('; |
|
| 672 | - $j = 0; |
|
| 671 | + $query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN ('; |
|
| 672 | + $j = 0; |
|
| 673 | 673 | } |
| 674 | 674 | $query_delete .= "'".$row['flightaware_id']."',"; |
| 675 | 675 | } |
| 676 | 676 | if ($i > 0) { |
| 677 | - try { |
|
| 677 | + try { |
|
| 678 | 678 | |
| 679 | 679 | $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
| 680 | 680 | $sth->execute(); |
@@ -685,9 +685,9 @@ discard block |
||
| 685 | 685 | return "success"; |
| 686 | 686 | } elseif ($globalDBdriver == 'pgsql') { |
| 687 | 687 | //$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"; |
| 688 | - //$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"; |
|
| 689 | - $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 800 OFFSET 0)"; |
|
| 690 | - try { |
|
| 688 | + //$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"; |
|
| 689 | + $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 800 OFFSET 0)"; |
|
| 690 | + try { |
|
| 691 | 691 | |
| 692 | 692 | $sth = $this->db->prepare($query); |
| 693 | 693 | $sth->execute(); |
@@ -731,17 +731,17 @@ discard block |
||
| 731 | 731 | } |
| 732 | 732 | |
| 733 | 733 | /** |
| 734 | - * Deletes all info in the table for an ident |
|
| 735 | - * |
|
| 736 | - * @return String success or false |
|
| 737 | - * |
|
| 738 | - */ |
|
| 734 | + * Deletes all info in the table for an ident |
|
| 735 | + * |
|
| 736 | + * @return String success or false |
|
| 737 | + * |
|
| 738 | + */ |
|
| 739 | 739 | public function deleteLiveSpotterDataByIdent($ident) |
| 740 | 740 | { |
| 741 | 741 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 742 | 742 | $query = 'DELETE FROM spotter_live WHERE ident = :ident'; |
| 743 | 743 | |
| 744 | - try { |
|
| 744 | + try { |
|
| 745 | 745 | |
| 746 | 746 | $sth = $this->db->prepare($query); |
| 747 | 747 | $sth->execute(array(':ident' => $ident)); |
@@ -753,17 +753,17 @@ discard block |
||
| 753 | 753 | } |
| 754 | 754 | |
| 755 | 755 | /** |
| 756 | - * Deletes all info in the table for an id |
|
| 757 | - * |
|
| 758 | - * @return String success or false |
|
| 759 | - * |
|
| 760 | - */ |
|
| 756 | + * Deletes all info in the table for an id |
|
| 757 | + * |
|
| 758 | + * @return String success or false |
|
| 759 | + * |
|
| 760 | + */ |
|
| 761 | 761 | public function deleteLiveSpotterDataById($id) |
| 762 | 762 | { |
| 763 | 763 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 764 | 764 | $query = 'DELETE FROM spotter_live WHERE flightaware_id = :id'; |
| 765 | 765 | |
| 766 | - try { |
|
| 766 | + try { |
|
| 767 | 767 | |
| 768 | 768 | $sth = $this->db->prepare($query); |
| 769 | 769 | $sth->execute(array(':id' => $id)); |
@@ -776,11 +776,11 @@ discard block |
||
| 776 | 776 | |
| 777 | 777 | |
| 778 | 778 | /** |
| 779 | - * Gets the aircraft ident within the last hour |
|
| 780 | - * |
|
| 781 | - * @return String the ident |
|
| 782 | - * |
|
| 783 | - */ |
|
| 779 | + * Gets the aircraft ident within the last hour |
|
| 780 | + * |
|
| 781 | + * @return String the ident |
|
| 782 | + * |
|
| 783 | + */ |
|
| 784 | 784 | public function getIdentFromLastHour($ident) |
| 785 | 785 | { |
| 786 | 786 | global $globalDBdriver, $globalTimezone; |
@@ -806,14 +806,14 @@ discard block |
||
| 806 | 806 | $ident_result = $row['ident']; |
| 807 | 807 | } |
| 808 | 808 | return $ident_result; |
| 809 | - } |
|
| 809 | + } |
|
| 810 | 810 | |
| 811 | 811 | /** |
| 812 | - * Check recent aircraft |
|
| 813 | - * |
|
| 814 | - * @return String the ident |
|
| 815 | - * |
|
| 816 | - */ |
|
| 812 | + * Check recent aircraft |
|
| 813 | + * |
|
| 814 | + * @return String the ident |
|
| 815 | + * |
|
| 816 | + */ |
|
| 817 | 817 | public function checkIdentRecent($ident) |
| 818 | 818 | { |
| 819 | 819 | global $globalDBdriver, $globalTimezone; |
@@ -839,14 +839,14 @@ discard block |
||
| 839 | 839 | $ident_result = $row['flightaware_id']; |
| 840 | 840 | } |
| 841 | 841 | return $ident_result; |
| 842 | - } |
|
| 842 | + } |
|
| 843 | 843 | |
| 844 | 844 | /** |
| 845 | - * Check recent aircraft by id |
|
| 846 | - * |
|
| 847 | - * @return String the ident |
|
| 848 | - * |
|
| 849 | - */ |
|
| 845 | + * Check recent aircraft by id |
|
| 846 | + * |
|
| 847 | + * @return String the ident |
|
| 848 | + * |
|
| 849 | + */ |
|
| 850 | 850 | public function checkIdRecent($id) |
| 851 | 851 | { |
| 852 | 852 | global $globalDBdriver, $globalTimezone; |
@@ -872,14 +872,14 @@ discard block |
||
| 872 | 872 | $ident_result = $row['flightaware_id']; |
| 873 | 873 | } |
| 874 | 874 | return $ident_result; |
| 875 | - } |
|
| 875 | + } |
|
| 876 | 876 | |
| 877 | 877 | /** |
| 878 | - * Check recent aircraft by ModeS |
|
| 879 | - * |
|
| 880 | - * @return String the ModeS |
|
| 881 | - * |
|
| 882 | - */ |
|
| 878 | + * Check recent aircraft by ModeS |
|
| 879 | + * |
|
| 880 | + * @return String the ModeS |
|
| 881 | + * |
|
| 882 | + */ |
|
| 883 | 883 | public function checkModeSRecent($modes) |
| 884 | 884 | { |
| 885 | 885 | global $globalDBdriver, $globalTimezone; |
@@ -906,19 +906,19 @@ discard block |
||
| 906 | 906 | $ident_result = $row['flightaware_id']; |
| 907 | 907 | } |
| 908 | 908 | return $ident_result; |
| 909 | - } |
|
| 909 | + } |
|
| 910 | 910 | |
| 911 | 911 | /** |
| 912 | - * Adds a new spotter data |
|
| 913 | - * |
|
| 914 | - * @param String $flightaware_id the ID from flightaware |
|
| 915 | - * @param String $ident the flight ident |
|
| 916 | - * @param String $aircraft_icao the aircraft type |
|
| 917 | - * @param String $departure_airport_icao the departure airport |
|
| 918 | - * @param String $arrival_airport_icao the arrival airport |
|
| 919 | - * @return String success or false |
|
| 920 | - * |
|
| 921 | - */ |
|
| 912 | + * Adds a new spotter data |
|
| 913 | + * |
|
| 914 | + * @param String $flightaware_id the ID from flightaware |
|
| 915 | + * @param String $ident the flight ident |
|
| 916 | + * @param String $aircraft_icao the aircraft type |
|
| 917 | + * @param String $departure_airport_icao the departure airport |
|
| 918 | + * @param String $arrival_airport_icao the arrival airport |
|
| 919 | + * @return String success or false |
|
| 920 | + * |
|
| 921 | + */ |
|
| 922 | 922 | 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 = '') |
| 923 | 923 | { |
| 924 | 924 | global $globalURL, $globalArchive, $globalDebug; |
@@ -1053,10 +1053,10 @@ discard block |
||
| 1053 | 1053 | $arrival_airport_country = ''; |
| 1054 | 1054 | |
| 1055 | 1055 | |
| 1056 | - if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL; |
|
| 1057 | - if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL; |
|
| 1058 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
| 1059 | - if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
| 1056 | + if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL; |
|
| 1057 | + if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL; |
|
| 1058 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
| 1059 | + if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
| 1060 | 1060 | |
| 1061 | 1061 | $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) |
| 1062 | 1062 | 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)'; |
@@ -1066,14 +1066,14 @@ discard block |
||
| 1066 | 1066 | |
| 1067 | 1067 | $sth = $this->db->prepare($query); |
| 1068 | 1068 | $sth->execute($query_values); |
| 1069 | - } catch(PDOException $e) { |
|
| 1070 | - return "error : ".$e->getMessage(); |
|
| 1071 | - } |
|
| 1069 | + } catch(PDOException $e) { |
|
| 1070 | + return "error : ".$e->getMessage(); |
|
| 1071 | + } |
|
| 1072 | 1072 | if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) { |
| 1073 | - if ($globalDebug) echo '(Add to SBS archive : '; |
|
| 1074 | - $SpotterArchive = new SpotterArchive($this->db); |
|
| 1075 | - $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, $heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country); |
|
| 1076 | - if ($globalDebug) echo $result.')'; |
|
| 1073 | + if ($globalDebug) echo '(Add to SBS archive : '; |
|
| 1074 | + $SpotterArchive = new SpotterArchive($this->db); |
|
| 1075 | + $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, $heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country); |
|
| 1076 | + if ($globalDebug) echo $result.')'; |
|
| 1077 | 1077 | } |
| 1078 | 1078 | return "success"; |
| 1079 | 1079 | |
@@ -16,62 +16,62 @@ discard block |
||
| 16 | 16 | * @param Array $filter the filter |
| 17 | 17 | * @return Array the SQL part |
| 18 | 18 | */ |
| 19 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 19 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 20 | 20 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 21 | 21 | $filters = array(); |
| 22 | 22 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 23 | 23 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 24 | 24 | $filters = $globalStatsFilters[$globalFilterName]; |
| 25 | 25 | } else { |
| 26 | - $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
|
| 26 | + $filter = array_merge($filter, $globalStatsFilters[$globalFilterName]); |
|
| 27 | 27 | } |
| 28 | 28 | } |
| 29 | 29 | if (isset($filter[0]['source'])) { |
| 30 | - $filters = array_merge($filters,$filter); |
|
| 30 | + $filters = array_merge($filters, $filter); |
|
| 31 | 31 | } |
| 32 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 32 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 33 | 33 | $filter_query_join = ''; |
| 34 | 34 | $filter_query_where = ''; |
| 35 | - foreach($filters as $flt) { |
|
| 35 | + foreach ($filters as $flt) { |
|
| 36 | 36 | if (isset($flt['airlines']) && !empty($flt['airlines'])) { |
| 37 | 37 | if ($flt['airlines'][0] != '') { |
| 38 | 38 | if (isset($flt['source'])) { |
| 39 | - $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"; |
|
| 39 | + $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 | 40 | } else { |
| 41 | - $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"; |
|
| 41 | + $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 | 42 | } |
| 43 | 43 | } |
| 44 | 44 | } |
| 45 | 45 | if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) { |
| 46 | 46 | if (isset($flt['source'])) { |
| 47 | - $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"; |
|
| 47 | + $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 | 48 | } else { |
| 49 | - $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"; |
|
| 49 | + $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 | 50 | } |
| 51 | 51 | } |
| 52 | 52 | if (isset($flt['idents']) && !empty($flt['idents'])) { |
| 53 | 53 | if (isset($flt['source'])) { |
| 54 | - $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"; |
|
| 54 | + $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 | 55 | } else { |
| 56 | - $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"; |
|
| 56 | + $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 | 57 | } |
| 58 | 58 | } |
| 59 | 59 | if (isset($flt['registrations']) && !empty($flt['registrations'])) { |
| 60 | 60 | if (isset($flt['source'])) { |
| 61 | - $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"; |
|
| 61 | + $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 | 62 | } else { |
| 63 | - $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"; |
|
| 63 | + $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 | 64 | } |
| 65 | 65 | } |
| 66 | 66 | 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']))) { |
| 67 | 67 | if (isset($flt['source'])) { |
| 68 | - $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"; |
|
| 68 | + $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 | 69 | } |
| 70 | 70 | } |
| 71 | 71 | } |
| 72 | 72 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 73 | 73 | if ($filter['airlines'][0] != '') { |
| 74 | - $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"; |
|
| 74 | + $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 | 75 | } |
| 76 | 76 | } |
| 77 | 77 | if (isset($filter['alliance']) && !empty($filter['alliance'])) { |
@@ -81,10 +81,10 @@ discard block |
||
| 81 | 81 | $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 "; |
| 82 | 82 | } |
| 83 | 83 | if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) { |
| 84 | - $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"; |
|
| 84 | + $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 | 85 | } |
| 86 | 86 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 87 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 87 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 88 | 88 | } |
| 89 | 89 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 90 | 90 | $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
@@ -113,15 +113,15 @@ discard block |
||
| 113 | 113 | $filter_query_date .= " AND EXTRACT(DAY FROM spotter_output.date) = '".$filter['day']."'"; |
| 114 | 114 | } |
| 115 | 115 | } |
| 116 | - $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"; |
|
| 116 | + $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 | 117 | } |
| 118 | 118 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 119 | - $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 119 | + $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 120 | 120 | } |
| 121 | 121 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 122 | 122 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
| 123 | 123 | if ($filter_query_where != '') { |
| 124 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
| 124 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
| 125 | 125 | } |
| 126 | 126 | $filter_query = $filter_query_join.$filter_query_where; |
| 127 | 127 | return $filter_query; |
@@ -144,8 +144,8 @@ discard block |
||
| 144 | 144 | if ($limit != '') |
| 145 | 145 | { |
| 146 | 146 | $limit_array = explode(',', $limit); |
| 147 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 148 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 147 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 148 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 149 | 149 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 150 | 150 | { |
| 151 | 151 | $limit_query = ' LIMIT '.$limit_array[1].' OFFSET '.$limit_array[0]; |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | } else { |
| 169 | 169 | $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; |
| 170 | 170 | } |
| 171 | - $spotter_array = $Spotter->getDataFromDB($query.$limit_query,array(),'',true); |
|
| 171 | + $spotter_array = $Spotter->getDataFromDB($query.$limit_query, array(), '', true); |
|
| 172 | 172 | |
| 173 | 173 | return $spotter_array; |
| 174 | 174 | } |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | global $globalDBdriver, $globalLiveInterval; |
| 185 | 185 | date_default_timezone_set('UTC'); |
| 186 | 186 | |
| 187 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 187 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 188 | 188 | |
| 189 | 189 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 190 | 190 | if ($globalDBdriver == 'mysql') { |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | $query = 'SELECT a.aircraft_shadow, 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 |
| 196 | 196 | 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 LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_live.aircraft_icao = a.icao'.$filter_query." spotter_live.latitude <> 0 AND spotter_live.longitude <> 0"; |
| 197 | 197 | */ |
| 198 | - $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 |
|
| 198 | + $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 |
|
| 199 | 199 | 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." spotter_live.latitude <> 0 AND spotter_live.longitude <> 0"; |
| 200 | 200 | |
| 201 | 201 | // $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 FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= spotter_live.date ORDER BY spotter_live.date GROUP BY spotter_live.flightaware_id'.$filter_query; |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | 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 LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_live.aircraft_icao = a.icao".$filter_query." spotter_live.latitude <> '0' AND spotter_live.longitude <> '0'"; |
| 211 | 211 | */ |
| 212 | 212 | |
| 213 | - $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 |
|
| 213 | + $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 |
|
| 214 | 214 | 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." spotter_live.latitude <> '0' AND spotter_live.longitude <> '0'"; |
| 215 | 215 | |
| 216 | 216 | |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | try { |
| 222 | 222 | $sth = $this->db->prepare($query); |
| 223 | 223 | $sth->execute(); |
| 224 | - } catch(PDOException $e) { |
|
| 224 | + } catch (PDOException $e) { |
|
| 225 | 225 | echo $e->getMessage(); |
| 226 | 226 | die; |
| 227 | 227 | } |
@@ -241,7 +241,7 @@ discard block |
||
| 241 | 241 | global $globalDBdriver, $globalLiveInterval; |
| 242 | 242 | date_default_timezone_set('UTC'); |
| 243 | 243 | |
| 244 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 244 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 245 | 245 | |
| 246 | 246 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 247 | 247 | if ($globalDBdriver == 'mysql') { |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | FROM spotter_live LEFT JOIN (SELECT aircraft_shadow,engine_type, engine_count, wake_category,icao FROM aircraft) a ON spotter_live.aircraft_icao = a.icao'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' |
| 251 | 251 | ORDER BY spotter_live.flightaware_id, spotter_live.date"; |
| 252 | 252 | */ |
| 253 | - $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 |
|
| 253 | + $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 |
|
| 254 | 254 | FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' |
| 255 | 255 | ORDER BY spotter_live.flightaware_id, spotter_live.date"; |
| 256 | 256 | } else { |
@@ -259,7 +259,7 @@ discard block |
||
| 259 | 259 | FROM spotter_live LEFT JOIN (SELECT aircraft_shadow,engine_type, engine_count, wake_category, icao FROM aircraft) a ON spotter_live.aircraft_icao = a.icao".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' |
| 260 | 260 | ORDER BY spotter_live.flightaware_id, spotter_live.date"; |
| 261 | 261 | */ |
| 262 | - $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 | + $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 |
|
| 263 | 263 | FROM spotter_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' |
| 264 | 264 | ORDER BY spotter_live.flightaware_id, spotter_live.date"; |
| 265 | 265 | // echo $query; |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | try { |
| 269 | 269 | $sth = $this->db->prepare($query); |
| 270 | 270 | $sth->execute(); |
| 271 | - } catch(PDOException $e) { |
|
| 271 | + } catch (PDOException $e) { |
|
| 272 | 272 | echo $e->getMessage(); |
| 273 | 273 | die; |
| 274 | 274 | } |
@@ -285,7 +285,7 @@ discard block |
||
| 285 | 285 | public function getLiveSpotterCount($filter = array()) |
| 286 | 286 | { |
| 287 | 287 | global $globalDBdriver, $globalLiveInterval; |
| 288 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 288 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 289 | 289 | |
| 290 | 290 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 291 | 291 | if ($globalDBdriver == 'mysql') { |
@@ -298,7 +298,7 @@ discard block |
||
| 298 | 298 | try { |
| 299 | 299 | $sth = $this->db->prepare($query); |
| 300 | 300 | $sth->execute(); |
| 301 | - } catch(PDOException $e) { |
|
| 301 | + } catch (PDOException $e) { |
|
| 302 | 302 | echo $e->getMessage(); |
| 303 | 303 | die; |
| 304 | 304 | } |
@@ -321,10 +321,10 @@ discard block |
||
| 321 | 321 | $filter_query = $this->getFilter($filter); |
| 322 | 322 | |
| 323 | 323 | if (is_array($coord)) { |
| 324 | - $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 325 | - $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 326 | - $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 327 | - $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 324 | + $minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 325 | + $minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 326 | + $maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 327 | + $maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 328 | 328 | } else return array(); |
| 329 | 329 | if ($globalDBdriver == 'mysql') { |
| 330 | 330 | $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; |
@@ -347,13 +347,13 @@ discard block |
||
| 347 | 347 | global $globalDBdriver, $globalLiveInterval; |
| 348 | 348 | $Spotter = new Spotter($this->db); |
| 349 | 349 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 350 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 350 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 351 | 351 | |
| 352 | 352 | if (is_array($coord)) { |
| 353 | - $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 354 | - $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 355 | - $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 356 | - $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 353 | + $minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 354 | + $minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 355 | + $maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 356 | + $maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 357 | 357 | } else return array(); |
| 358 | 358 | if ($globalDBdriver == 'mysql') { |
| 359 | 359 | $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 |
@@ -373,7 +373,7 @@ discard block |
||
| 373 | 373 | try { |
| 374 | 374 | $sth = $this->db->prepare($query); |
| 375 | 375 | $sth->execute(); |
| 376 | - } catch(PDOException $e) { |
|
| 376 | + } catch (PDOException $e) { |
|
| 377 | 377 | echo $e->getMessage(); |
| 378 | 378 | die; |
| 379 | 379 | } |
@@ -422,7 +422,7 @@ discard block |
||
| 422 | 422 | if ($interval == '1m') |
| 423 | 423 | { |
| 424 | 424 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
| 425 | - } else if ($interval == '15m'){ |
|
| 425 | + } else if ($interval == '15m') { |
|
| 426 | 426 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date '; |
| 427 | 427 | } |
| 428 | 428 | } |
@@ -430,14 +430,14 @@ discard block |
||
| 430 | 430 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
| 431 | 431 | } |
| 432 | 432 | |
| 433 | - $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 |
|
| 433 | + $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 |
|
| 434 | 434 | WHERE spotter_live.latitude <> '' |
| 435 | 435 | AND spotter_live.longitude <> '' |
| 436 | 436 | ".$additional_query." |
| 437 | 437 | HAVING distance < :radius |
| 438 | 438 | ORDER BY distance"; |
| 439 | 439 | |
| 440 | - $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius)); |
|
| 440 | + $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng, ':radius' => $radius)); |
|
| 441 | 441 | |
| 442 | 442 | return $spotter_array; |
| 443 | 443 | } |
@@ -455,9 +455,9 @@ discard block |
||
| 455 | 455 | date_default_timezone_set('UTC'); |
| 456 | 456 | |
| 457 | 457 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 458 | - $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'; |
|
| 458 | + $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'; |
|
| 459 | 459 | |
| 460 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident),'',true); |
|
| 460 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident), '', true); |
|
| 461 | 461 | |
| 462 | 462 | return $spotter_array; |
| 463 | 463 | } |
@@ -468,16 +468,16 @@ discard block |
||
| 468 | 468 | * @return Array the spotter information |
| 469 | 469 | * |
| 470 | 470 | */ |
| 471 | - public function getDateLiveSpotterDataByIdent($ident,$date) |
|
| 471 | + public function getDateLiveSpotterDataByIdent($ident, $date) |
|
| 472 | 472 | { |
| 473 | 473 | $Spotter = new Spotter($this->db); |
| 474 | 474 | date_default_timezone_set('UTC'); |
| 475 | 475 | |
| 476 | 476 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 477 | - $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'; |
|
| 477 | + $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'; |
|
| 478 | 478 | |
| 479 | - $date = date('c',$date); |
|
| 480 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
|
| 479 | + $date = date('c', $date); |
|
| 480 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':date' => $date)); |
|
| 481 | 481 | |
| 482 | 482 | return $spotter_array; |
| 483 | 483 | } |
@@ -494,9 +494,9 @@ discard block |
||
| 494 | 494 | date_default_timezone_set('UTC'); |
| 495 | 495 | |
| 496 | 496 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 497 | - $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'; |
|
| 497 | + $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'; |
|
| 498 | 498 | |
| 499 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id),'',true); |
|
| 499 | + $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id), '', true); |
|
| 500 | 500 | |
| 501 | 501 | return $spotter_array; |
| 502 | 502 | } |
@@ -507,15 +507,15 @@ discard block |
||
| 507 | 507 | * @return Array the spotter information |
| 508 | 508 | * |
| 509 | 509 | */ |
| 510 | - public function getDateLiveSpotterDataById($id,$date) |
|
| 510 | + public function getDateLiveSpotterDataById($id, $date) |
|
| 511 | 511 | { |
| 512 | 512 | $Spotter = new Spotter($this->db); |
| 513 | 513 | date_default_timezone_set('UTC'); |
| 514 | 514 | |
| 515 | 515 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 516 | - $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'; |
|
| 517 | - $date = date('c',$date); |
|
| 518 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true); |
|
| 516 | + $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'; |
|
| 517 | + $date = date('c', $date); |
|
| 518 | + $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id, ':date' => $date), '', true); |
|
| 519 | 519 | |
| 520 | 520 | return $spotter_array; |
| 521 | 521 | } |
@@ -532,13 +532,13 @@ discard block |
||
| 532 | 532 | date_default_timezone_set('UTC'); |
| 533 | 533 | |
| 534 | 534 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 535 | - $query = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident'; |
|
| 535 | + $query = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident'; |
|
| 536 | 536 | |
| 537 | 537 | try { |
| 538 | 538 | |
| 539 | 539 | $sth = $this->db->prepare($query); |
| 540 | 540 | $sth->execute(array(':ident' => $ident)); |
| 541 | - } catch(PDOException $e) { |
|
| 541 | + } catch (PDOException $e) { |
|
| 542 | 542 | echo $e->getMessage(); |
| 543 | 543 | die; |
| 544 | 544 | } |
@@ -553,7 +553,7 @@ discard block |
||
| 553 | 553 | * @return Array the spotter information |
| 554 | 554 | * |
| 555 | 555 | */ |
| 556 | - public function getAllLiveSpotterDataById($id,$liveinterval = false) |
|
| 556 | + public function getAllLiveSpotterDataById($id, $liveinterval = false) |
|
| 557 | 557 | { |
| 558 | 558 | global $globalDBdriver, $globalLiveInterval; |
| 559 | 559 | date_default_timezone_set('UTC'); |
@@ -572,7 +572,7 @@ discard block |
||
| 572 | 572 | try { |
| 573 | 573 | $sth = $this->db->prepare($query); |
| 574 | 574 | $sth->execute(array(':id' => $id)); |
| 575 | - } catch(PDOException $e) { |
|
| 575 | + } catch (PDOException $e) { |
|
| 576 | 576 | echo $e->getMessage(); |
| 577 | 577 | die; |
| 578 | 578 | } |
@@ -590,12 +590,12 @@ discard block |
||
| 590 | 590 | { |
| 591 | 591 | date_default_timezone_set('UTC'); |
| 592 | 592 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 593 | - $query = self::$global_query.' WHERE spotter_live.ident = :ident'; |
|
| 593 | + $query = self::$global_query.' WHERE spotter_live.ident = :ident'; |
|
| 594 | 594 | try { |
| 595 | 595 | |
| 596 | 596 | $sth = $this->db->prepare($query); |
| 597 | 597 | $sth->execute(array(':ident' => $ident)); |
| 598 | - } catch(PDOException $e) { |
|
| 598 | + } catch (PDOException $e) { |
|
| 599 | 599 | echo $e->getMessage(); |
| 600 | 600 | die; |
| 601 | 601 | } |
@@ -625,7 +625,7 @@ discard block |
||
| 625 | 625 | |
| 626 | 626 | $sth = $this->db->prepare($query); |
| 627 | 627 | $sth->execute(); |
| 628 | - } catch(PDOException $e) { |
|
| 628 | + } catch (PDOException $e) { |
|
| 629 | 629 | return "error"; |
| 630 | 630 | } |
| 631 | 631 | |
@@ -648,14 +648,14 @@ discard block |
||
| 648 | 648 | |
| 649 | 649 | $sth = $this->db->prepare($query); |
| 650 | 650 | $sth->execute(); |
| 651 | - } catch(PDOException $e) { |
|
| 651 | + } catch (PDOException $e) { |
|
| 652 | 652 | return "error"; |
| 653 | 653 | } |
| 654 | 654 | $query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN ('; |
| 655 | 655 | $i = 0; |
| 656 | - $j =0; |
|
| 656 | + $j = 0; |
|
| 657 | 657 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 658 | - foreach($all as $row) |
|
| 658 | + foreach ($all as $row) |
|
| 659 | 659 | { |
| 660 | 660 | $i++; |
| 661 | 661 | $j++; |
@@ -663,9 +663,9 @@ discard block |
||
| 663 | 663 | if ($globalDebug) echo "."; |
| 664 | 664 | try { |
| 665 | 665 | |
| 666 | - $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
|
| 666 | + $sth = $this->db->prepare(substr($query_delete, 0, -1).")"); |
|
| 667 | 667 | $sth->execute(); |
| 668 | - } catch(PDOException $e) { |
|
| 668 | + } catch (PDOException $e) { |
|
| 669 | 669 | return "error"; |
| 670 | 670 | } |
| 671 | 671 | $query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN ('; |
@@ -676,9 +676,9 @@ discard block |
||
| 676 | 676 | if ($i > 0) { |
| 677 | 677 | try { |
| 678 | 678 | |
| 679 | - $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
|
| 679 | + $sth = $this->db->prepare(substr($query_delete, 0, -1).")"); |
|
| 680 | 680 | $sth->execute(); |
| 681 | - } catch(PDOException $e) { |
|
| 681 | + } catch (PDOException $e) { |
|
| 682 | 682 | return "error"; |
| 683 | 683 | } |
| 684 | 684 | } |
@@ -691,7 +691,7 @@ discard block |
||
| 691 | 691 | |
| 692 | 692 | $sth = $this->db->prepare($query); |
| 693 | 693 | $sth->execute(); |
| 694 | - } catch(PDOException $e) { |
|
| 694 | + } catch (PDOException $e) { |
|
| 695 | 695 | return "error"; |
| 696 | 696 | } |
| 697 | 697 | /* $query_delete = "DELETE FROM spotter_live WHERE flightaware_id IN ("; |
@@ -739,13 +739,13 @@ discard block |
||
| 739 | 739 | public function deleteLiveSpotterDataByIdent($ident) |
| 740 | 740 | { |
| 741 | 741 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 742 | - $query = 'DELETE FROM spotter_live WHERE ident = :ident'; |
|
| 742 | + $query = 'DELETE FROM spotter_live WHERE ident = :ident'; |
|
| 743 | 743 | |
| 744 | 744 | try { |
| 745 | 745 | |
| 746 | 746 | $sth = $this->db->prepare($query); |
| 747 | 747 | $sth->execute(array(':ident' => $ident)); |
| 748 | - } catch(PDOException $e) { |
|
| 748 | + } catch (PDOException $e) { |
|
| 749 | 749 | return "error"; |
| 750 | 750 | } |
| 751 | 751 | |
@@ -761,13 +761,13 @@ discard block |
||
| 761 | 761 | public function deleteLiveSpotterDataById($id) |
| 762 | 762 | { |
| 763 | 763 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 764 | - $query = 'DELETE FROM spotter_live WHERE flightaware_id = :id'; |
|
| 764 | + $query = 'DELETE FROM spotter_live WHERE flightaware_id = :id'; |
|
| 765 | 765 | |
| 766 | 766 | try { |
| 767 | 767 | |
| 768 | 768 | $sth = $this->db->prepare($query); |
| 769 | 769 | $sth->execute(array(':id' => $id)); |
| 770 | - } catch(PDOException $e) { |
|
| 770 | + } catch (PDOException $e) { |
|
| 771 | 771 | return "error"; |
| 772 | 772 | } |
| 773 | 773 | |
@@ -785,13 +785,13 @@ discard block |
||
| 785 | 785 | { |
| 786 | 786 | global $globalDBdriver, $globalTimezone; |
| 787 | 787 | if ($globalDBdriver == 'mysql') { |
| 788 | - $query = 'SELECT spotter_live.ident FROM spotter_live |
|
| 788 | + $query = 'SELECT spotter_live.ident FROM spotter_live |
|
| 789 | 789 | WHERE spotter_live.ident = :ident |
| 790 | 790 | AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) |
| 791 | 791 | AND spotter_live.date < UTC_TIMESTAMP()'; |
| 792 | 792 | $query_data = array(':ident' => $ident); |
| 793 | 793 | } else { |
| 794 | - $query = "SELECT spotter_live.ident FROM spotter_live |
|
| 794 | + $query = "SELECT spotter_live.ident FROM spotter_live |
|
| 795 | 795 | WHERE spotter_live.ident = :ident |
| 796 | 796 | AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS' |
| 797 | 797 | AND spotter_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -800,8 +800,8 @@ discard block |
||
| 800 | 800 | |
| 801 | 801 | $sth = $this->db->prepare($query); |
| 802 | 802 | $sth->execute($query_data); |
| 803 | - $ident_result=''; |
|
| 804 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 803 | + $ident_result = ''; |
|
| 804 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 805 | 805 | { |
| 806 | 806 | $ident_result = $row['ident']; |
| 807 | 807 | } |
@@ -818,13 +818,13 @@ discard block |
||
| 818 | 818 | { |
| 819 | 819 | global $globalDBdriver, $globalTimezone; |
| 820 | 820 | if ($globalDBdriver == 'mysql') { |
| 821 | - $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 821 | + $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 822 | 822 | WHERE spotter_live.ident = :ident |
| 823 | 823 | AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE)'; |
| 824 | 824 | // AND spotter_live.date < UTC_TIMESTAMP()"; |
| 825 | 825 | $query_data = array(':ident' => $ident); |
| 826 | 826 | } else { |
| 827 | - $query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 827 | + $query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 828 | 828 | WHERE spotter_live.ident = :ident |
| 829 | 829 | AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '30 MINUTES'"; |
| 830 | 830 | // AND spotter_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -833,8 +833,8 @@ discard block |
||
| 833 | 833 | |
| 834 | 834 | $sth = $this->db->prepare($query); |
| 835 | 835 | $sth->execute($query_data); |
| 836 | - $ident_result=''; |
|
| 837 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 836 | + $ident_result = ''; |
|
| 837 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 838 | 838 | { |
| 839 | 839 | $ident_result = $row['flightaware_id']; |
| 840 | 840 | } |
@@ -851,13 +851,13 @@ discard block |
||
| 851 | 851 | { |
| 852 | 852 | global $globalDBdriver, $globalTimezone; |
| 853 | 853 | if ($globalDBdriver == 'mysql') { |
| 854 | - $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 854 | + $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 855 | 855 | WHERE spotter_live.flightaware_id = :id |
| 856 | 856 | AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 10 HOUR)'; |
| 857 | 857 | // AND spotter_live.date < UTC_TIMESTAMP()"; |
| 858 | 858 | $query_data = array(':id' => $id); |
| 859 | 859 | } else { |
| 860 | - $query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 860 | + $query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 861 | 861 | WHERE spotter_live.flightaware_id = :id |
| 862 | 862 | AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '10 HOUR'"; |
| 863 | 863 | // AND spotter_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -866,8 +866,8 @@ discard block |
||
| 866 | 866 | |
| 867 | 867 | $sth = $this->db->prepare($query); |
| 868 | 868 | $sth->execute($query_data); |
| 869 | - $ident_result=''; |
|
| 870 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 869 | + $ident_result = ''; |
|
| 870 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 871 | 871 | { |
| 872 | 872 | $ident_result = $row['flightaware_id']; |
| 873 | 873 | } |
@@ -884,13 +884,13 @@ discard block |
||
| 884 | 884 | { |
| 885 | 885 | global $globalDBdriver, $globalTimezone; |
| 886 | 886 | if ($globalDBdriver == 'mysql') { |
| 887 | - $query = 'SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live |
|
| 887 | + $query = 'SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live |
|
| 888 | 888 | WHERE spotter_live.ModeS = :modes |
| 889 | 889 | AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE)'; |
| 890 | 890 | // AND spotter_live.date < UTC_TIMESTAMP()"; |
| 891 | 891 | $query_data = array(':modes' => $modes); |
| 892 | 892 | } else { |
| 893 | - $query = "SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live |
|
| 893 | + $query = "SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live |
|
| 894 | 894 | WHERE spotter_live.ModeS = :modes |
| 895 | 895 | AND spotter_live.date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '30 MINUTE'"; |
| 896 | 896 | // // AND spotter_live.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'"; |
@@ -899,8 +899,8 @@ discard block |
||
| 899 | 899 | |
| 900 | 900 | $sth = $this->db->prepare($query); |
| 901 | 901 | $sth->execute($query_data); |
| 902 | - $ident_result=''; |
|
| 903 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 902 | + $ident_result = ''; |
|
| 903 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 904 | 904 | { |
| 905 | 905 | //$ident_result = $row['spotter_live_id']; |
| 906 | 906 | $ident_result = $row['flightaware_id']; |
@@ -919,7 +919,7 @@ discard block |
||
| 919 | 919 | * @return String success or false |
| 920 | 920 | * |
| 921 | 921 | */ |
| 922 | - 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 = '') |
|
| 922 | + 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 = '') |
|
| 923 | 923 | { |
| 924 | 924 | global $globalURL, $globalArchive, $globalDebug; |
| 925 | 925 | $Common = new Common(); |
@@ -1012,26 +1012,26 @@ discard block |
||
| 1012 | 1012 | if ($date == '') $date = date("Y-m-d H:i:s", time()); |
| 1013 | 1013 | |
| 1014 | 1014 | |
| 1015 | - $flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING); |
|
| 1016 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 1017 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 1018 | - $departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING); |
|
| 1019 | - $arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING); |
|
| 1020 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1021 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1022 | - $waypoints = filter_var($waypoints,FILTER_SANITIZE_STRING); |
|
| 1023 | - $altitude = filter_var($altitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1024 | - $heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT); |
|
| 1025 | - $groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1026 | - $squawk = filter_var($squawk,FILTER_SANITIZE_NUMBER_INT); |
|
| 1027 | - $route_stop = filter_var($route_stop,FILTER_SANITIZE_STRING); |
|
| 1028 | - $ModeS = filter_var($ModeS,FILTER_SANITIZE_STRING); |
|
| 1029 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_STRING); |
|
| 1030 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 1031 | - $format_source = filter_var($format_source,FILTER_SANITIZE_STRING); |
|
| 1032 | - $source_name = filter_var($source_name,FILTER_SANITIZE_STRING); |
|
| 1033 | - $over_country = filter_var($over_country,FILTER_SANITIZE_STRING); |
|
| 1034 | - $verticalrate = filter_var($verticalrate,FILTER_SANITIZE_NUMBER_INT); |
|
| 1015 | + $flightaware_id = filter_var($flightaware_id, FILTER_SANITIZE_STRING); |
|
| 1016 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 1017 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 1018 | + $departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING); |
|
| 1019 | + $arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING); |
|
| 1020 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1021 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1022 | + $waypoints = filter_var($waypoints, FILTER_SANITIZE_STRING); |
|
| 1023 | + $altitude = filter_var($altitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1024 | + $heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT); |
|
| 1025 | + $groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1026 | + $squawk = filter_var($squawk, FILTER_SANITIZE_NUMBER_INT); |
|
| 1027 | + $route_stop = filter_var($route_stop, FILTER_SANITIZE_STRING); |
|
| 1028 | + $ModeS = filter_var($ModeS, FILTER_SANITIZE_STRING); |
|
| 1029 | + $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_STRING); |
|
| 1030 | + $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING); |
|
| 1031 | + $format_source = filter_var($format_source, FILTER_SANITIZE_STRING); |
|
| 1032 | + $source_name = filter_var($source_name, FILTER_SANITIZE_STRING); |
|
| 1033 | + $over_country = filter_var($over_country, FILTER_SANITIZE_STRING); |
|
| 1034 | + $verticalrate = filter_var($verticalrate, FILTER_SANITIZE_NUMBER_INT); |
|
| 1035 | 1035 | |
| 1036 | 1036 | $airline_name = ''; |
| 1037 | 1037 | $airline_icao = ''; |
@@ -1053,26 +1053,26 @@ discard block |
||
| 1053 | 1053 | $arrival_airport_country = ''; |
| 1054 | 1054 | |
| 1055 | 1055 | |
| 1056 | - if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL; |
|
| 1057 | - if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL; |
|
| 1058 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
| 1059 | - if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
| 1056 | + if ($squawk == '' || $Common->isInteger($squawk) === false) $squawk = NULL; |
|
| 1057 | + if ($verticalrate == '' || $Common->isInteger($verticalrate) === false) $verticalrate = NULL; |
|
| 1058 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
|
| 1059 | + if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
|
| 1060 | 1060 | |
| 1061 | - $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) |
|
| 1061 | + $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) |
|
| 1062 | 1062 | 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)'; |
| 1063 | 1063 | |
| 1064 | - $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); |
|
| 1064 | + $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); |
|
| 1065 | 1065 | try { |
| 1066 | 1066 | |
| 1067 | 1067 | $sth = $this->db->prepare($query); |
| 1068 | 1068 | $sth->execute($query_values); |
| 1069 | - } catch(PDOException $e) { |
|
| 1069 | + } catch (PDOException $e) { |
|
| 1070 | 1070 | return "error : ".$e->getMessage(); |
| 1071 | 1071 | } |
| 1072 | 1072 | if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) { |
| 1073 | 1073 | if ($globalDebug) echo '(Add to SBS archive : '; |
| 1074 | 1074 | $SpotterArchive = new SpotterArchive($this->db); |
| 1075 | - $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, $heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country); |
|
| 1075 | + $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, $heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name, $verticalrate, $format_source, $source_name, $over_country); |
|
| 1076 | 1076 | if ($globalDebug) echo $result.')'; |
| 1077 | 1077 | } |
| 1078 | 1078 | return "success"; |
@@ -1081,7 +1081,7 @@ discard block |
||
| 1081 | 1081 | |
| 1082 | 1082 | public function getOrderBy() |
| 1083 | 1083 | { |
| 1084 | - $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")); |
|
| 1084 | + $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")); |
|
| 1085 | 1085 | return $orderby; |
| 1086 | 1086 | } |
| 1087 | 1087 | |
@@ -29,7 +29,9 @@ discard block |
||
| 29 | 29 | if (isset($filter[0]['source'])) { |
| 30 | 30 | $filters = array_merge($filters,$filter); |
| 31 | 31 | } |
| 32 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 32 | + if (is_array($globalFilter)) { |
|
| 33 | + $filter = array_merge($filter,$globalFilter); |
|
| 34 | + } |
|
| 33 | 35 | $filter_query_join = ''; |
| 34 | 36 | $filter_query_where = ''; |
| 35 | 37 | foreach($filters as $flt) { |
@@ -118,8 +120,11 @@ discard block |
||
| 118 | 120 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 119 | 121 | $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
| 120 | 122 | } |
| 121 | - if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
|
| 122 | - elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
|
| 123 | + if ($filter_query_where == '' && $where) { |
|
| 124 | + $filter_query_where = ' WHERE'; |
|
| 125 | + } elseif ($filter_query_where != '' && $and) { |
|
| 126 | + $filter_query_where .= ' AND'; |
|
| 127 | + } |
|
| 123 | 128 | if ($filter_query_where != '') { |
| 124 | 129 | $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
| 125 | 130 | } |
@@ -161,7 +166,9 @@ discard block |
||
| 161 | 166 | } |
| 162 | 167 | } |
| 163 | 168 | |
| 164 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 169 | + if (!isset($globalLiveInterval)) { |
|
| 170 | + $globalLiveInterval = '200'; |
|
| 171 | + } |
|
| 165 | 172 | if ($globalDBdriver == 'mysql') { |
| 166 | 173 | //$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"; |
| 167 | 174 | $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 +193,9 @@ discard block |
||
| 186 | 193 | |
| 187 | 194 | $filter_query = $this->getFilter($filter,true,true); |
| 188 | 195 | |
| 189 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 196 | + if (!isset($globalLiveInterval)) { |
|
| 197 | + $globalLiveInterval = '200'; |
|
| 198 | + } |
|
| 190 | 199 | if ($globalDBdriver == 'mysql') { |
| 191 | 200 | // $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$orderby_query"; |
| 192 | 201 | // $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, a.aircraft_shadow 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 INNER JOIN (SELECT * FROM aircraft) a on spotter_live.aircraft_icao = a.icao'; |
@@ -243,7 +252,9 @@ discard block |
||
| 243 | 252 | |
| 244 | 253 | $filter_query = $this->getFilter($filter,true,true); |
| 245 | 254 | |
| 246 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 255 | + if (!isset($globalLiveInterval)) { |
|
| 256 | + $globalLiveInterval = '200'; |
|
| 257 | + } |
|
| 247 | 258 | if ($globalDBdriver == 'mysql') { |
| 248 | 259 | /* |
| 249 | 260 | $query = 'SELECT a.aircraft_shadow, a.engine_type, a.engine_count, a.wake_category, 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 |
@@ -287,7 +298,9 @@ discard block |
||
| 287 | 298 | global $globalDBdriver, $globalLiveInterval; |
| 288 | 299 | $filter_query = $this->getFilter($filter,true,true); |
| 289 | 300 | |
| 290 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 301 | + if (!isset($globalLiveInterval)) { |
|
| 302 | + $globalLiveInterval = '200'; |
|
| 303 | + } |
|
| 291 | 304 | if ($globalDBdriver == 'mysql') { |
| 292 | 305 | //$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; |
| 293 | 306 | $query = 'SELECT COUNT(DISTINCT spotter_live.flightaware_id) as nb FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date'; |
@@ -317,7 +330,9 @@ discard block |
||
| 317 | 330 | { |
| 318 | 331 | global $globalDBdriver, $globalLiveInterval; |
| 319 | 332 | $Spotter = new Spotter($this->db); |
| 320 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 333 | + if (!isset($globalLiveInterval)) { |
|
| 334 | + $globalLiveInterval = '200'; |
|
| 335 | + } |
|
| 321 | 336 | $filter_query = $this->getFilter($filter); |
| 322 | 337 | |
| 323 | 338 | if (is_array($coord)) { |
@@ -325,7 +340,9 @@ discard block |
||
| 325 | 340 | $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 326 | 341 | $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 327 | 342 | $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 328 | - } else return array(); |
|
| 343 | + } else { |
|
| 344 | + return array(); |
|
| 345 | + } |
|
| 329 | 346 | if ($globalDBdriver == 'mysql') { |
| 330 | 347 | $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; |
| 331 | 348 | } else { |
@@ -346,7 +363,9 @@ discard block |
||
| 346 | 363 | { |
| 347 | 364 | global $globalDBdriver, $globalLiveInterval; |
| 348 | 365 | $Spotter = new Spotter($this->db); |
| 349 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 366 | + if (!isset($globalLiveInterval)) { |
|
| 367 | + $globalLiveInterval = '200'; |
|
| 368 | + } |
|
| 350 | 369 | $filter_query = $this->getFilter($filter,true,true); |
| 351 | 370 | |
| 352 | 371 | if (is_array($coord)) { |
@@ -354,7 +373,9 @@ discard block |
||
| 354 | 373 | $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 355 | 374 | $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 356 | 375 | $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 357 | - } else return array(); |
|
| 376 | + } else { |
|
| 377 | + return array(); |
|
| 378 | + } |
|
| 358 | 379 | if ($globalDBdriver == 'mysql') { |
| 359 | 380 | $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 |
| 360 | 381 | 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.' spotter_live.latitude <> 0 AND spotter_live.longitude <> 0 AND spotter_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND spotter_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.''; |
@@ -561,11 +582,15 @@ discard block |
||
| 561 | 582 | //$query = self::$global_query.' WHERE spotter_live.flightaware_id = :id ORDER BY date'; |
| 562 | 583 | if ($globalDBdriver == 'mysql') { |
| 563 | 584 | $query = 'SELECT spotter_live.* FROM spotter_live WHERE spotter_live.flightaware_id = :id'; |
| 564 | - if ($liveinterval) $query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date'; |
|
| 585 | + if ($liveinterval) { |
|
| 586 | + $query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date'; |
|
| 587 | + } |
|
| 565 | 588 | $query .= ' ORDER BY date'; |
| 566 | 589 | } else { |
| 567 | 590 | $query = 'SELECT spotter_live.* FROM spotter_live WHERE spotter_live.flightaware_id = :id'; |
| 568 | - if ($liveinterval) $query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date"; |
|
| 591 | + if ($liveinterval) { |
|
| 592 | + $query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date"; |
|
| 593 | + } |
|
| 569 | 594 | $query .= ' ORDER BY date'; |
| 570 | 595 | } |
| 571 | 596 | |
@@ -660,7 +685,9 @@ discard block |
||
| 660 | 685 | $i++; |
| 661 | 686 | $j++; |
| 662 | 687 | if ($j == 30) { |
| 663 | - if ($globalDebug) echo "."; |
|
| 688 | + if ($globalDebug) { |
|
| 689 | + echo "."; |
|
| 690 | + } |
|
| 664 | 691 | try { |
| 665 | 692 | |
| 666 | 693 | $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
@@ -967,7 +994,9 @@ discard block |
||
| 967 | 994 | { |
| 968 | 995 | return false; |
| 969 | 996 | } |
| 970 | - } else return ''; |
|
| 997 | + } else { |
|
| 998 | + return ''; |
|
| 999 | + } |
|
| 971 | 1000 | |
| 972 | 1001 | if ($longitude != '') |
| 973 | 1002 | { |
@@ -975,7 +1004,9 @@ discard block |
||
| 975 | 1004 | { |
| 976 | 1005 | return false; |
| 977 | 1006 | } |
| 978 | - } else return ''; |
|
| 1007 | + } else { |
|
| 1008 | + return ''; |
|
| 1009 | + } |
|
| 979 | 1010 | |
| 980 | 1011 | if ($waypoints != '') |
| 981 | 1012 | { |
@@ -991,7 +1022,9 @@ discard block |
||
| 991 | 1022 | { |
| 992 | 1023 | return false; |
| 993 | 1024 | } |
| 994 | - } else $altitude = 0; |
|
| 1025 | + } else { |
|
| 1026 | + $altitude = 0; |
|
| 1027 | + } |
|
| 995 | 1028 | |
| 996 | 1029 | if ($heading != '') |
| 997 | 1030 | { |
@@ -999,7 +1032,9 @@ discard block |
||
| 999 | 1032 | { |
| 1000 | 1033 | return false; |
| 1001 | 1034 | } |
| 1002 | - } else $heading = 0; |
|
| 1035 | + } else { |
|
| 1036 | + $heading = 0; |
|
| 1037 | + } |
|
| 1003 | 1038 | |
| 1004 | 1039 | if ($groundspeed != '') |
| 1005 | 1040 | { |
@@ -1007,9 +1042,13 @@ discard block |
||
| 1007 | 1042 | { |
| 1008 | 1043 | return false; |
| 1009 | 1044 | } |
| 1010 | - } else $groundspeed = 0; |
|
| 1045 | + } else { |
|
| 1046 | + $groundspeed = 0; |
|
| 1047 | + } |
|
| 1011 | 1048 | date_default_timezone_set('UTC'); |
| 1012 | - if ($date == '') $date = date("Y-m-d H:i:s", time()); |
|
| 1049 | + if ($date == '') { |
|
| 1050 | + $date = date("Y-m-d H:i:s", time()); |
|
| 1051 | + } |
|
| 1013 | 1052 | |
| 1014 | 1053 | |
| 1015 | 1054 | $flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING); |
@@ -1053,10 +1092,18 @@ discard block |
||
| 1053 | 1092 | $arrival_airport_country = ''; |
| 1054 | 1093 | |
| 1055 | 1094 | |
| 1056 | - if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL; |
|
| 1057 | - if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL; |
|
| 1058 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
| 1059 | - if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
| 1095 | + if ($squawk == '' || $Common->isInteger($squawk) === false ) { |
|
| 1096 | + $squawk = NULL; |
|
| 1097 | + } |
|
| 1098 | + if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) { |
|
| 1099 | + $verticalrate = NULL; |
|
| 1100 | + } |
|
| 1101 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) { |
|
| 1102 | + $groundspeed = 0; |
|
| 1103 | + } |
|
| 1104 | + if ($heading == '' || $Common->isInteger($heading) === false ) { |
|
| 1105 | + $heading = 0; |
|
| 1106 | + } |
|
| 1060 | 1107 | |
| 1061 | 1108 | $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) |
| 1062 | 1109 | 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)'; |
@@ -1070,10 +1117,14 @@ discard block |
||
| 1070 | 1117 | return "error : ".$e->getMessage(); |
| 1071 | 1118 | } |
| 1072 | 1119 | if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) { |
| 1073 | - if ($globalDebug) echo '(Add to SBS archive : '; |
|
| 1120 | + if ($globalDebug) { |
|
| 1121 | + echo '(Add to SBS archive : '; |
|
| 1122 | + } |
|
| 1074 | 1123 | $SpotterArchive = new SpotterArchive($this->db); |
| 1075 | 1124 | $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, $heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country); |
| 1076 | - if ($globalDebug) echo $result.')'; |
|
| 1125 | + if ($globalDebug) { |
|
| 1126 | + echo $result.')'; |
|
| 1127 | + } |
|
| 1077 | 1128 | } |
| 1078 | 1129 | return "success"; |
| 1079 | 1130 | |
@@ -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; |
@@ -26,7 +26,9 @@ discard block |
||
| 26 | 26 | if (isset($filter[0]['source'])) { |
| 27 | 27 | $filters = array_merge($filters,$filter); |
| 28 | 28 | } |
| 29 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 29 | + if (is_array($globalFilter)) { |
|
| 30 | + $filter = array_merge($filter,$globalFilter); |
|
| 31 | + } |
|
| 30 | 32 | $filter_query_join = ''; |
| 31 | 33 | $filter_query_where = ''; |
| 32 | 34 | foreach($filters as $flt) { |
@@ -99,8 +101,11 @@ discard block |
||
| 99 | 101 | } |
| 100 | 102 | $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"; |
| 101 | 103 | } |
| 102 | - if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
|
| 103 | - elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
|
| 104 | + if ($filter_query_where == '' && $where) { |
|
| 105 | + $filter_query_where = ' WHERE'; |
|
| 106 | + } elseif ($filter_query_where != '' && $and) { |
|
| 107 | + $filter_query_where .= ' AND'; |
|
| 108 | + } |
|
| 104 | 109 | if ($filter_query_where != '') { |
| 105 | 110 | $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
| 106 | 111 | } |
@@ -114,10 +119,17 @@ discard block |
||
| 114 | 119 | if ($over_country == '') { |
| 115 | 120 | $Spotter = new Spotter($this->db); |
| 116 | 121 | $data_country = $Spotter->getCountryFromLatitudeLongitude($latitude,$longitude); |
| 117 | - if (!empty($data_country)) $country = $data_country['iso2']; |
|
| 118 | - else $country = ''; |
|
| 119 | - } else $country = $over_country; |
|
| 120 | - if ($airline_type === NULL) $airline_type =''; |
|
| 122 | + if (!empty($data_country)) { |
|
| 123 | + $country = $data_country['iso2']; |
|
| 124 | + } else { |
|
| 125 | + $country = ''; |
|
| 126 | + } |
|
| 127 | + } else { |
|
| 128 | + $country = $over_country; |
|
| 129 | + } |
|
| 130 | + if ($airline_type === NULL) { |
|
| 131 | + $airline_type =''; |
|
| 132 | + } |
|
| 121 | 133 | |
| 122 | 134 | //if ($country == '') echo "\n".'************ UNKNOW COUNTRY ****************'."\n"; |
| 123 | 135 | //else echo "\n".'*/*/*/*/*/*/*/ Country : '.$country.' */*/*/*/*/*/*/*/*/'."\n"; |
@@ -620,7 +632,9 @@ discard block |
||
| 620 | 632 | $additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR "; |
| 621 | 633 | $additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR "; |
| 622 | 634 | $translate = $Translation->ident2icao($q_item); |
| 623 | - if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR "; |
|
| 635 | + if ($translate != $q_item) { |
|
| 636 | + $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR "; |
|
| 637 | + } |
|
| 624 | 638 | $additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')"; |
| 625 | 639 | $additional_query .= ")"; |
| 626 | 640 | } |
@@ -838,7 +852,9 @@ discard block |
||
| 838 | 852 | date_default_timezone_set($globalTimezone); |
| 839 | 853 | $datetime = new DateTime(); |
| 840 | 854 | $offset = $datetime->format('P'); |
| 841 | - } else $offset = '+00:00'; |
|
| 855 | + } else { |
|
| 856 | + $offset = '+00:00'; |
|
| 857 | + } |
|
| 842 | 858 | |
| 843 | 859 | |
| 844 | 860 | if ($date_array[1] != "") |
@@ -1114,9 +1130,13 @@ discard block |
||
| 1114 | 1130 | $query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1115 | 1131 | } |
| 1116 | 1132 | } |
| 1117 | - if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
| 1133 | + if ($sincedate != '') { |
|
| 1134 | + $query .= "AND date > '".$sincedate."' "; |
|
| 1135 | + } |
|
| 1118 | 1136 | $query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1119 | - if ($limit) $query .= " LIMIT 0,10"; |
|
| 1137 | + if ($limit) { |
|
| 1138 | + $query .= " LIMIT 0,10"; |
|
| 1139 | + } |
|
| 1120 | 1140 | |
| 1121 | 1141 | |
| 1122 | 1142 | $sth = $this->db->prepare($query); |
@@ -1160,9 +1180,13 @@ discard block |
||
| 1160 | 1180 | $query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1161 | 1181 | } |
| 1162 | 1182 | } |
| 1163 | - if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' "; |
|
| 1183 | + if ($sincedate != '') { |
|
| 1184 | + $query .= "AND s.date > '".$sincedate."' "; |
|
| 1185 | + } |
|
| 1164 | 1186 | $query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1165 | - if ($limit) $query .= " LIMIT 0,10"; |
|
| 1187 | + if ($limit) { |
|
| 1188 | + $query .= " LIMIT 0,10"; |
|
| 1189 | + } |
|
| 1166 | 1190 | |
| 1167 | 1191 | |
| 1168 | 1192 | $sth = $this->db->prepare($query); |
@@ -8,12 +8,12 @@ discard block |
||
| 8 | 8 | $this->db = $Connection->db; |
| 9 | 9 | } |
| 10 | 10 | |
| 11 | - /** |
|
| 12 | - * Get SQL query part for filter used |
|
| 13 | - * @param Array $filter the filter |
|
| 14 | - * @return Array the SQL part |
|
| 15 | - */ |
|
| 16 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 11 | + /** |
|
| 12 | + * Get SQL query part for filter used |
|
| 13 | + * @param Array $filter the filter |
|
| 14 | + * @return Array the SQL part |
|
| 15 | + */ |
|
| 16 | + public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 17 | 17 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 18 | 18 | $filters = array(); |
| 19 | 19 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
@@ -30,88 +30,88 @@ discard block |
||
| 30 | 30 | $filter_query_join = ''; |
| 31 | 31 | $filter_query_where = ''; |
| 32 | 32 | foreach($filters as $flt) { |
| 33 | - if (isset($flt['airlines']) && !empty($flt['airlines'])) { |
|
| 33 | + if (isset($flt['airlines']) && !empty($flt['airlines'])) { |
|
| 34 | 34 | if ($flt['airlines'][0] != '') { |
| 35 | - if (isset($flt['source'])) { |
|
| 35 | + if (isset($flt['source'])) { |
|
| 36 | 36 | $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
| 37 | - } else { |
|
| 37 | + } else { |
|
| 38 | 38 | $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
| 39 | - } |
|
| 39 | + } |
|
| 40 | + } |
|
| 40 | 41 | } |
| 41 | - } |
|
| 42 | - if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) { |
|
| 42 | + if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) { |
|
| 43 | 43 | if (isset($flt['source'])) { |
| 44 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 44 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 45 | 45 | } else { |
| 46 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 46 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 47 | 47 | } |
| 48 | - } |
|
| 49 | - if (isset($flt['idents']) && !empty($flt['idents'])) { |
|
| 48 | + } |
|
| 49 | + if (isset($flt['idents']) && !empty($flt['idents'])) { |
|
| 50 | 50 | if (isset($flt['source'])) { |
| 51 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 51 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 52 | 52 | } else { |
| 53 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 53 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 54 | + } |
|
| 54 | 55 | } |
| 55 | - } |
|
| 56 | - if (isset($flt['registrations']) && !empty($flt['registrations'])) { |
|
| 56 | + if (isset($flt['registrations']) && !empty($flt['registrations'])) { |
|
| 57 | 57 | if (isset($flt['source'])) { |
| 58 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 58 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 59 | 59 | } else { |
| 60 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 60 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 61 | + } |
|
| 61 | 62 | } |
| 62 | - } |
|
| 63 | - 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']))) { |
|
| 63 | + if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id']) && isset($flt['idents']) && empty($flt['idents']) && isset($flt['registrations']) && empty($flt['registrations'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']) && !isset($flt['idents']) && !isset($flt['registrations']))) { |
|
| 64 | 64 | if (isset($flt['source'])) { |
| 65 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) saa ON saa.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 65 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) saa ON saa.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 66 | + } |
|
| 66 | 67 | } |
| 67 | - } |
|
| 68 | 68 | } |
| 69 | 69 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 70 | - if ($filter['airlines'][0] != '') { |
|
| 70 | + if ($filter['airlines'][0] != '') { |
|
| 71 | 71 | $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) saf ON saf.flightaware_id = spotter_archive_output.flightaware_id"; |
| 72 | - } |
|
| 72 | + } |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 76 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive_output.flightaware_id "; |
|
| 76 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive_output.flightaware_id "; |
|
| 77 | 77 | } |
| 78 | 78 | if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) { |
| 79 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 79 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 80 | 80 | } |
| 81 | 81 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 82 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 82 | + $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 83 | 83 | } |
| 84 | 84 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 85 | - $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
|
| 85 | + $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
|
| 86 | 86 | } |
| 87 | 87 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 88 | 88 | $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
| 89 | 89 | } |
| 90 | 90 | if ((isset($filter['year']) && $filter['year'] != '') || (isset($filter['month']) && $filter['month'] != '') || (isset($filter['day']) && $filter['day'] != '')) { |
| 91 | - $filter_query_date = ''; |
|
| 91 | + $filter_query_date = ''; |
|
| 92 | 92 | |
| 93 | - if (isset($filter['year']) && $filter['year'] != '') { |
|
| 93 | + if (isset($filter['year']) && $filter['year'] != '') { |
|
| 94 | 94 | if ($globalDBdriver == 'mysql') { |
| 95 | - $filter_query_date .= " AND YEAR(spotter_archive_output.date) = '".$filter['year']."'"; |
|
| 95 | + $filter_query_date .= " AND YEAR(spotter_archive_output.date) = '".$filter['year']."'"; |
|
| 96 | 96 | } else { |
| 97 | - $filter_query_date .= " AND EXTRACT(YEAR FROM spotter_archive_output.date) = '".$filter['year']."'"; |
|
| 97 | + $filter_query_date .= " AND EXTRACT(YEAR FROM spotter_archive_output.date) = '".$filter['year']."'"; |
|
| 98 | + } |
|
| 98 | 99 | } |
| 99 | - } |
|
| 100 | - if (isset($filter['month']) && $filter['month'] != '') { |
|
| 100 | + if (isset($filter['month']) && $filter['month'] != '') { |
|
| 101 | 101 | if ($globalDBdriver == 'mysql') { |
| 102 | - $filter_query_date .= " AND MONTH(spotter_archive_output.date) = '".$filter['month']."'"; |
|
| 102 | + $filter_query_date .= " AND MONTH(spotter_archive_output.date) = '".$filter['month']."'"; |
|
| 103 | 103 | } else { |
| 104 | - $filter_query_date .= " AND EXTRACT(MONTH FROM spotter_archive_output.date) = '".$filter['month']."'"; |
|
| 104 | + $filter_query_date .= " AND EXTRACT(MONTH FROM spotter_archive_output.date) = '".$filter['month']."'"; |
|
| 105 | 105 | } |
| 106 | - } |
|
| 107 | - if (isset($filter['day']) && $filter['day'] != '') { |
|
| 106 | + } |
|
| 107 | + if (isset($filter['day']) && $filter['day'] != '') { |
|
| 108 | 108 | if ($globalDBdriver == 'mysql') { |
| 109 | - $filter_query_date .= " AND DAY(spotter_archive_output.date) = '".$filter['day']."'"; |
|
| 109 | + $filter_query_date .= " AND DAY(spotter_archive_output.date) = '".$filter['day']."'"; |
|
| 110 | 110 | } else { |
| 111 | - $filter_query_date .= " AND EXTRACT(DAY FROM spotter_archive_output.date) = '".$filter['day']."'"; |
|
| 111 | + $filter_query_date .= " AND EXTRACT(DAY FROM spotter_archive_output.date) = '".$filter['day']."'"; |
|
| 112 | + } |
|
| 112 | 113 | } |
| 113 | - } |
|
| 114 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 114 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 115 | 115 | } |
| 116 | 116 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 117 | 117 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | } |
| 121 | 121 | $filter_query = $filter_query_join.$filter_query_where; |
| 122 | 122 | return $filter_query; |
| 123 | - } |
|
| 123 | + } |
|
| 124 | 124 | |
| 125 | 125 | // Spotter_archive |
| 126 | 126 | public function addSpotterArchiveData($flightaware_id = '', $ident = '', $registration = '', $airline_name = '', $airline_icao = '', $airline_country = '', $airline_type = '', $aircraft_icao = '', $aircraft_shadow = '', $aircraft_name = '', $aircraft_manufacturer = '', $departure_airport_icao = '', $departure_airport_name = '', $departure_airport_city = '', $departure_airport_country = '', $departure_airport_time = '',$arrival_airport_icao = '', $arrival_airport_name = '', $arrival_airport_city ='', $arrival_airport_country = '', $arrival_airport_time = '', $route_stop = '', $date = '',$latitude = '', $longitude = '', $waypoints = '', $altitude = '', $heading = '', $ground_speed = '', $squawk = '', $ModeS = '', $pilot_id = '', $pilot_name = '',$verticalrate = '',$format_source = '', $source_name = '', $over_country = '') { |
@@ -151,44 +151,44 @@ discard block |
||
| 151 | 151 | } |
| 152 | 152 | |
| 153 | 153 | |
| 154 | - /** |
|
| 155 | - * Gets all the spotter information based on a particular callsign |
|
| 156 | - * |
|
| 157 | - * @return Array the spotter information |
|
| 158 | - * |
|
| 159 | - */ |
|
| 160 | - public function getLastArchiveSpotterDataByIdent($ident) |
|
| 161 | - { |
|
| 154 | + /** |
|
| 155 | + * Gets all the spotter information based on a particular callsign |
|
| 156 | + * |
|
| 157 | + * @return Array the spotter information |
|
| 158 | + * |
|
| 159 | + */ |
|
| 160 | + public function getLastArchiveSpotterDataByIdent($ident) |
|
| 161 | + { |
|
| 162 | 162 | $Spotter = new Spotter($this->db); |
| 163 | - date_default_timezone_set('UTC'); |
|
| 163 | + date_default_timezone_set('UTC'); |
|
| 164 | 164 | |
| 165 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 166 | - //$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"; |
|
| 167 | - $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 165 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 166 | + //$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"; |
|
| 167 | + $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 168 | 168 | |
| 169 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident)); |
|
| 169 | + $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident)); |
|
| 170 | 170 | |
| 171 | - return $spotter_array; |
|
| 172 | - } |
|
| 171 | + return $spotter_array; |
|
| 172 | + } |
|
| 173 | 173 | |
| 174 | 174 | |
| 175 | - /** |
|
| 176 | - * Gets last the spotter information based on a particular id |
|
| 177 | - * |
|
| 178 | - * @return Array the spotter information |
|
| 179 | - * |
|
| 180 | - */ |
|
| 181 | - public function getLastArchiveSpotterDataById($id) |
|
| 182 | - { |
|
| 183 | - $Spotter = new Spotter($this->db); |
|
| 184 | - date_default_timezone_set('UTC'); |
|
| 185 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 186 | - //$query = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id"; |
|
| 187 | - //$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"; |
|
| 188 | - $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 175 | + /** |
|
| 176 | + * Gets last the spotter information based on a particular id |
|
| 177 | + * |
|
| 178 | + * @return Array the spotter information |
|
| 179 | + * |
|
| 180 | + */ |
|
| 181 | + public function getLastArchiveSpotterDataById($id) |
|
| 182 | + { |
|
| 183 | + $Spotter = new Spotter($this->db); |
|
| 184 | + date_default_timezone_set('UTC'); |
|
| 185 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 186 | + //$query = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id"; |
|
| 187 | + //$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"; |
|
| 188 | + $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 189 | 189 | |
| 190 | 190 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 191 | - /* |
|
| 191 | + /* |
|
| 192 | 192 | try { |
| 193 | 193 | $Connection = new Connection(); |
| 194 | 194 | $sth = Connection->$db->prepare($query); |
@@ -198,232 +198,232 @@ discard block |
||
| 198 | 198 | } |
| 199 | 199 | $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC); |
| 200 | 200 | */ |
| 201 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id)); |
|
| 202 | - |
|
| 203 | - return $spotter_array; |
|
| 204 | - } |
|
| 205 | - |
|
| 206 | - /** |
|
| 207 | - * Gets all the spotter information based on a particular id |
|
| 208 | - * |
|
| 209 | - * @return Array the spotter information |
|
| 210 | - * |
|
| 211 | - */ |
|
| 212 | - public function getAllArchiveSpotterDataById($id) |
|
| 213 | - { |
|
| 214 | - date_default_timezone_set('UTC'); |
|
| 215 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 216 | - $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id"; |
|
| 201 | + $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id)); |
|
| 202 | + |
|
| 203 | + return $spotter_array; |
|
| 204 | + } |
|
| 205 | + |
|
| 206 | + /** |
|
| 207 | + * Gets all the spotter information based on a particular id |
|
| 208 | + * |
|
| 209 | + * @return Array the spotter information |
|
| 210 | + * |
|
| 211 | + */ |
|
| 212 | + public function getAllArchiveSpotterDataById($id) |
|
| 213 | + { |
|
| 214 | + date_default_timezone_set('UTC'); |
|
| 215 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 216 | + $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id"; |
|
| 217 | 217 | |
| 218 | 218 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 219 | 219 | |
| 220 | - try { |
|
| 221 | - $sth = $this->db->prepare($query); |
|
| 222 | - $sth->execute(array(':id' => $id)); |
|
| 223 | - } catch(PDOException $e) { |
|
| 224 | - echo $e->getMessage(); |
|
| 225 | - die; |
|
| 226 | - } |
|
| 227 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 228 | - |
|
| 229 | - return $spotter_array; |
|
| 230 | - } |
|
| 231 | - |
|
| 232 | - /** |
|
| 233 | - * Gets coordinate & time spotter information based on a particular id |
|
| 234 | - * |
|
| 235 | - * @return Array the spotter information |
|
| 236 | - * |
|
| 237 | - */ |
|
| 238 | - public function getCoordArchiveSpotterDataById($id) |
|
| 239 | - { |
|
| 240 | - date_default_timezone_set('UTC'); |
|
| 241 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 242 | - $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id"; |
|
| 220 | + try { |
|
| 221 | + $sth = $this->db->prepare($query); |
|
| 222 | + $sth->execute(array(':id' => $id)); |
|
| 223 | + } catch(PDOException $e) { |
|
| 224 | + echo $e->getMessage(); |
|
| 225 | + die; |
|
| 226 | + } |
|
| 227 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 228 | + |
|
| 229 | + return $spotter_array; |
|
| 230 | + } |
|
| 231 | + |
|
| 232 | + /** |
|
| 233 | + * Gets coordinate & time spotter information based on a particular id |
|
| 234 | + * |
|
| 235 | + * @return Array the spotter information |
|
| 236 | + * |
|
| 237 | + */ |
|
| 238 | + public function getCoordArchiveSpotterDataById($id) |
|
| 239 | + { |
|
| 240 | + date_default_timezone_set('UTC'); |
|
| 241 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 242 | + $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id"; |
|
| 243 | 243 | |
| 244 | 244 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 245 | 245 | |
| 246 | - try { |
|
| 247 | - $sth = $this->db->prepare($query); |
|
| 248 | - $sth->execute(array(':id' => $id)); |
|
| 249 | - } catch(PDOException $e) { |
|
| 250 | - echo $e->getMessage(); |
|
| 251 | - die; |
|
| 252 | - } |
|
| 253 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 246 | + try { |
|
| 247 | + $sth = $this->db->prepare($query); |
|
| 248 | + $sth->execute(array(':id' => $id)); |
|
| 249 | + } catch(PDOException $e) { |
|
| 250 | + echo $e->getMessage(); |
|
| 251 | + die; |
|
| 252 | + } |
|
| 253 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 254 | 254 | |
| 255 | - return $spotter_array; |
|
| 256 | - } |
|
| 255 | + return $spotter_array; |
|
| 256 | + } |
|
| 257 | 257 | |
| 258 | 258 | |
| 259 | - /** |
|
| 260 | - * Gets altitude information based on a particular callsign |
|
| 261 | - * |
|
| 262 | - * @return Array the spotter information |
|
| 263 | - * |
|
| 264 | - */ |
|
| 265 | - public function getAltitudeArchiveSpotterDataByIdent($ident) |
|
| 266 | - { |
|
| 259 | + /** |
|
| 260 | + * Gets altitude information based on a particular callsign |
|
| 261 | + * |
|
| 262 | + * @return Array the spotter information |
|
| 263 | + * |
|
| 264 | + */ |
|
| 265 | + public function getAltitudeArchiveSpotterDataByIdent($ident) |
|
| 266 | + { |
|
| 267 | 267 | |
| 268 | - date_default_timezone_set('UTC'); |
|
| 268 | + date_default_timezone_set('UTC'); |
|
| 269 | 269 | |
| 270 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 271 | - $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"; |
|
| 270 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 271 | + $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 | 272 | |
| 273 | - try { |
|
| 274 | - $sth = $this->db->prepare($query); |
|
| 275 | - $sth->execute(array(':ident' => $ident)); |
|
| 276 | - } catch(PDOException $e) { |
|
| 277 | - echo $e->getMessage(); |
|
| 278 | - die; |
|
| 279 | - } |
|
| 280 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 273 | + try { |
|
| 274 | + $sth = $this->db->prepare($query); |
|
| 275 | + $sth->execute(array(':ident' => $ident)); |
|
| 276 | + } catch(PDOException $e) { |
|
| 277 | + echo $e->getMessage(); |
|
| 278 | + die; |
|
| 279 | + } |
|
| 280 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 281 | 281 | |
| 282 | - return $spotter_array; |
|
| 283 | - } |
|
| 282 | + return $spotter_array; |
|
| 283 | + } |
|
| 284 | 284 | |
| 285 | - /** |
|
| 286 | - * Gets altitude information based on a particular id |
|
| 287 | - * |
|
| 288 | - * @return Array the spotter information |
|
| 289 | - * |
|
| 290 | - */ |
|
| 291 | - public function getAltitudeArchiveSpotterDataById($id) |
|
| 292 | - { |
|
| 285 | + /** |
|
| 286 | + * Gets altitude information based on a particular id |
|
| 287 | + * |
|
| 288 | + * @return Array the spotter information |
|
| 289 | + * |
|
| 290 | + */ |
|
| 291 | + public function getAltitudeArchiveSpotterDataById($id) |
|
| 292 | + { |
|
| 293 | 293 | |
| 294 | - date_default_timezone_set('UTC'); |
|
| 294 | + date_default_timezone_set('UTC'); |
|
| 295 | 295 | |
| 296 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 297 | - $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"; |
|
| 296 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 297 | + $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 | 298 | |
| 299 | - try { |
|
| 300 | - $sth = $this->db->prepare($query); |
|
| 301 | - $sth->execute(array(':id' => $id)); |
|
| 302 | - } catch(PDOException $e) { |
|
| 303 | - echo $e->getMessage(); |
|
| 304 | - die; |
|
| 305 | - } |
|
| 306 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 299 | + try { |
|
| 300 | + $sth = $this->db->prepare($query); |
|
| 301 | + $sth->execute(array(':id' => $id)); |
|
| 302 | + } catch(PDOException $e) { |
|
| 303 | + echo $e->getMessage(); |
|
| 304 | + die; |
|
| 305 | + } |
|
| 306 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 307 | 307 | |
| 308 | - return $spotter_array; |
|
| 309 | - } |
|
| 308 | + return $spotter_array; |
|
| 309 | + } |
|
| 310 | 310 | |
| 311 | - /** |
|
| 312 | - * Gets altitude & speed information based on a particular id |
|
| 313 | - * |
|
| 314 | - * @return Array the spotter information |
|
| 315 | - * |
|
| 316 | - */ |
|
| 317 | - public function getAltitudeSpeedArchiveSpotterDataById($id) |
|
| 318 | - { |
|
| 311 | + /** |
|
| 312 | + * Gets altitude & speed information based on a particular id |
|
| 313 | + * |
|
| 314 | + * @return Array the spotter information |
|
| 315 | + * |
|
| 316 | + */ |
|
| 317 | + public function getAltitudeSpeedArchiveSpotterDataById($id) |
|
| 318 | + { |
|
| 319 | 319 | |
| 320 | - date_default_timezone_set('UTC'); |
|
| 320 | + date_default_timezone_set('UTC'); |
|
| 321 | 321 | |
| 322 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 323 | - $query = "SELECT spotter_archive.altitude, spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 322 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 323 | + $query = "SELECT spotter_archive.altitude, spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 324 | 324 | |
| 325 | - try { |
|
| 326 | - $sth = $this->db->prepare($query); |
|
| 327 | - $sth->execute(array(':id' => $id)); |
|
| 328 | - } catch(PDOException $e) { |
|
| 329 | - echo $e->getMessage(); |
|
| 330 | - die; |
|
| 331 | - } |
|
| 332 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 325 | + try { |
|
| 326 | + $sth = $this->db->prepare($query); |
|
| 327 | + $sth->execute(array(':id' => $id)); |
|
| 328 | + } catch(PDOException $e) { |
|
| 329 | + echo $e->getMessage(); |
|
| 330 | + die; |
|
| 331 | + } |
|
| 332 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 333 | 333 | |
| 334 | - return $spotter_array; |
|
| 335 | - } |
|
| 334 | + return $spotter_array; |
|
| 335 | + } |
|
| 336 | 336 | |
| 337 | 337 | |
| 338 | - /** |
|
| 339 | - * Gets altitude information based on a particular callsign |
|
| 340 | - * |
|
| 341 | - * @return Array the spotter information |
|
| 342 | - * |
|
| 343 | - */ |
|
| 344 | - public function getLastAltitudeArchiveSpotterDataByIdent($ident) |
|
| 345 | - { |
|
| 338 | + /** |
|
| 339 | + * Gets altitude information based on a particular callsign |
|
| 340 | + * |
|
| 341 | + * @return Array the spotter information |
|
| 342 | + * |
|
| 343 | + */ |
|
| 344 | + public function getLastAltitudeArchiveSpotterDataByIdent($ident) |
|
| 345 | + { |
|
| 346 | 346 | |
| 347 | - date_default_timezone_set('UTC'); |
|
| 347 | + date_default_timezone_set('UTC'); |
|
| 348 | 348 | |
| 349 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 350 | - $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"; |
|
| 349 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 350 | + $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 | 351 | // $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident"; |
| 352 | 352 | |
| 353 | - try { |
|
| 354 | - $sth = $this->db->prepare($query); |
|
| 355 | - $sth->execute(array(':ident' => $ident)); |
|
| 356 | - } catch(PDOException $e) { |
|
| 357 | - echo $e->getMessage(); |
|
| 358 | - die; |
|
| 359 | - } |
|
| 360 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 353 | + try { |
|
| 354 | + $sth = $this->db->prepare($query); |
|
| 355 | + $sth->execute(array(':ident' => $ident)); |
|
| 356 | + } catch(PDOException $e) { |
|
| 357 | + echo $e->getMessage(); |
|
| 358 | + die; |
|
| 359 | + } |
|
| 360 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 361 | 361 | |
| 362 | - return $spotter_array; |
|
| 363 | - } |
|
| 362 | + return $spotter_array; |
|
| 363 | + } |
|
| 364 | 364 | |
| 365 | 365 | |
| 366 | 366 | |
| 367 | - /** |
|
| 368 | - * Gets all the archive spotter information |
|
| 369 | - * |
|
| 370 | - * @return Array the spotter information |
|
| 371 | - * |
|
| 372 | - */ |
|
| 373 | - public function getSpotterArchiveData($ident,$flightaware_id,$date) |
|
| 374 | - { |
|
| 375 | - $Spotter = new Spotter($this->db); |
|
| 376 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 377 | - $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"; |
|
| 367 | + /** |
|
| 368 | + * Gets all the archive spotter information |
|
| 369 | + * |
|
| 370 | + * @return Array the spotter information |
|
| 371 | + * |
|
| 372 | + */ |
|
| 373 | + public function getSpotterArchiveData($ident,$flightaware_id,$date) |
|
| 374 | + { |
|
| 375 | + $Spotter = new Spotter($this->db); |
|
| 376 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 377 | + $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate"; |
|
| 378 | 378 | |
| 379 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':flightaware_id' => $flightaware_id,':date' => $date.'%')); |
|
| 379 | + $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':flightaware_id' => $flightaware_id,':date' => $date.'%')); |
|
| 380 | 380 | |
| 381 | - return $spotter_array; |
|
| 382 | - } |
|
| 381 | + return $spotter_array; |
|
| 382 | + } |
|
| 383 | 383 | |
| 384 | - public function deleteSpotterArchiveTrackData() |
|
| 385 | - { |
|
| 384 | + public function deleteSpotterArchiveTrackData() |
|
| 385 | + { |
|
| 386 | 386 | global $globalArchiveKeepTrackMonths; |
| 387 | - date_default_timezone_set('UTC'); |
|
| 387 | + date_default_timezone_set('UTC'); |
|
| 388 | 388 | $query = 'DELETE FROM spotter_archive WHERE spotter_archive.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepTrackMonths.' MONTH)'; |
| 389 | - try { |
|
| 390 | - $sth = $this->db->prepare($query); |
|
| 391 | - $sth->execute(); |
|
| 392 | - } catch(PDOException $e) { |
|
| 393 | - echo $e->getMessage(); |
|
| 394 | - die; |
|
| 395 | - } |
|
| 389 | + try { |
|
| 390 | + $sth = $this->db->prepare($query); |
|
| 391 | + $sth->execute(); |
|
| 392 | + } catch(PDOException $e) { |
|
| 393 | + echo $e->getMessage(); |
|
| 394 | + die; |
|
| 395 | + } |
|
| 396 | 396 | } |
| 397 | 397 | |
| 398 | 398 | /** |
| 399 | - * Gets Minimal Live Spotter data |
|
| 400 | - * |
|
| 401 | - * @return Array the spotter information |
|
| 402 | - * |
|
| 403 | - */ |
|
| 404 | - public function getMinLiveSpotterData($begindate,$enddate,$filter = array()) |
|
| 405 | - { |
|
| 406 | - global $globalDBdriver, $globalLiveInterval; |
|
| 407 | - date_default_timezone_set('UTC'); |
|
| 408 | - |
|
| 409 | - $filter_query = ''; |
|
| 410 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 411 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 412 | - } |
|
| 413 | - // Use spotter_output also ? |
|
| 414 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 415 | - $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 "; |
|
| 416 | - } |
|
| 417 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 418 | - $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 "; |
|
| 419 | - } |
|
| 420 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 421 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 422 | - } |
|
| 423 | - |
|
| 424 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 425 | - if ($globalDBdriver == 'mysql') { |
|
| 426 | - /* |
|
| 399 | + * Gets Minimal Live Spotter data |
|
| 400 | + * |
|
| 401 | + * @return Array the spotter information |
|
| 402 | + * |
|
| 403 | + */ |
|
| 404 | + public function getMinLiveSpotterData($begindate,$enddate,$filter = array()) |
|
| 405 | + { |
|
| 406 | + global $globalDBdriver, $globalLiveInterval; |
|
| 407 | + date_default_timezone_set('UTC'); |
|
| 408 | + |
|
| 409 | + $filter_query = ''; |
|
| 410 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 411 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 412 | + } |
|
| 413 | + // Use spotter_output also ? |
|
| 414 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 415 | + $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 "; |
|
| 416 | + } |
|
| 417 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 418 | + $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 "; |
|
| 419 | + } |
|
| 420 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 421 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 422 | + } |
|
| 423 | + |
|
| 424 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 425 | + if ($globalDBdriver == 'mysql') { |
|
| 426 | + /* |
|
| 427 | 427 | $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 |
| 428 | 428 | FROM spotter_archive |
| 429 | 429 | 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'; |
@@ -442,56 +442,56 @@ discard block |
||
| 442 | 442 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao |
| 443 | 443 | WHERE spotter_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' |
| 444 | 444 | '.$filter_query.' ORDER BY flightaware_id'; |
| 445 | - } else { |
|
| 446 | - //$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'; |
|
| 447 | - $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 | + } else { |
|
| 446 | + //$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'; |
|
| 447 | + $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 |
|
| 448 | 448 | FROM spotter_archive |
| 449 | 449 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao |
| 450 | 450 | WHERE spotter_archive.date >= '."'".$begindate."'".' AND spotter_archive.date <= '."'".$enddate."'".' |
| 451 | 451 | '.$filter_query.' ORDER BY flightaware_id'; |
| 452 | - } |
|
| 453 | - //echo $query; |
|
| 454 | - try { |
|
| 455 | - $sth = $this->db->prepare($query); |
|
| 456 | - $sth->execute(); |
|
| 457 | - } catch(PDOException $e) { |
|
| 458 | - echo $e->getMessage(); |
|
| 459 | - die; |
|
| 460 | - } |
|
| 461 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 462 | - |
|
| 463 | - return $spotter_array; |
|
| 464 | - } |
|
| 452 | + } |
|
| 453 | + //echo $query; |
|
| 454 | + try { |
|
| 455 | + $sth = $this->db->prepare($query); |
|
| 456 | + $sth->execute(); |
|
| 457 | + } catch(PDOException $e) { |
|
| 458 | + echo $e->getMessage(); |
|
| 459 | + die; |
|
| 460 | + } |
|
| 461 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 462 | + |
|
| 463 | + return $spotter_array; |
|
| 464 | + } |
|
| 465 | 465 | |
| 466 | 466 | /** |
| 467 | - * Gets Minimal Live Spotter data |
|
| 468 | - * |
|
| 469 | - * @return Array the spotter information |
|
| 470 | - * |
|
| 471 | - */ |
|
| 472 | - public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array()) |
|
| 473 | - { |
|
| 474 | - global $globalDBdriver, $globalLiveInterval; |
|
| 475 | - date_default_timezone_set('UTC'); |
|
| 476 | - |
|
| 477 | - $filter_query = ''; |
|
| 478 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 479 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 480 | - } |
|
| 481 | - // Should use spotter_output also ? |
|
| 482 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 483 | - $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 "; |
|
| 484 | - } |
|
| 485 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 486 | - $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 "; |
|
| 487 | - } |
|
| 488 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 489 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 490 | - } |
|
| 491 | - |
|
| 492 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 493 | - if ($globalDBdriver == 'mysql') { |
|
| 494 | - /* |
|
| 467 | + * Gets Minimal Live Spotter data |
|
| 468 | + * |
|
| 469 | + * @return Array the spotter information |
|
| 470 | + * |
|
| 471 | + */ |
|
| 472 | + public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array()) |
|
| 473 | + { |
|
| 474 | + global $globalDBdriver, $globalLiveInterval; |
|
| 475 | + date_default_timezone_set('UTC'); |
|
| 476 | + |
|
| 477 | + $filter_query = ''; |
|
| 478 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 479 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 480 | + } |
|
| 481 | + // Should use spotter_output also ? |
|
| 482 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 483 | + $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 "; |
|
| 484 | + } |
|
| 485 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 486 | + $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 "; |
|
| 487 | + } |
|
| 488 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 489 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 490 | + } |
|
| 491 | + |
|
| 492 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 493 | + if ($globalDBdriver == 'mysql') { |
|
| 494 | + /* |
|
| 495 | 495 | $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 |
| 496 | 496 | FROM spotter_archive |
| 497 | 497 | INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao'; |
@@ -502,95 +502,95 @@ discard block |
||
| 502 | 502 | WHERE (spotter_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') |
| 503 | 503 | '.$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'; |
| 504 | 504 | |
| 505 | - } else { |
|
| 506 | - //$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'; |
|
| 507 | - /* |
|
| 505 | + } else { |
|
| 506 | + //$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'; |
|
| 507 | + /* |
|
| 508 | 508 | $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 |
| 509 | 509 | FROM spotter_archive_output |
| 510 | 510 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao |
| 511 | 511 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
| 512 | 512 | '.$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'; |
| 513 | 513 | */ |
| 514 | - $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 |
|
| 514 | + $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 |
|
| 515 | 515 | FROM spotter_archive_output |
| 516 | 516 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao |
| 517 | 517 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
| 518 | 518 | '.$filter_query.' LIMIT 200 OFFSET 0'; |
| 519 | 519 | // .' 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'; |
| 520 | 520 | |
| 521 | - } |
|
| 522 | - //echo $query; |
|
| 523 | - try { |
|
| 524 | - $sth = $this->db->prepare($query); |
|
| 525 | - $sth->execute(); |
|
| 526 | - } catch(PDOException $e) { |
|
| 527 | - echo $e->getMessage(); |
|
| 528 | - die; |
|
| 529 | - } |
|
| 530 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 531 | - |
|
| 532 | - return $spotter_array; |
|
| 533 | - } |
|
| 521 | + } |
|
| 522 | + //echo $query; |
|
| 523 | + try { |
|
| 524 | + $sth = $this->db->prepare($query); |
|
| 525 | + $sth->execute(); |
|
| 526 | + } catch(PDOException $e) { |
|
| 527 | + echo $e->getMessage(); |
|
| 528 | + die; |
|
| 529 | + } |
|
| 530 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 531 | + |
|
| 532 | + return $spotter_array; |
|
| 533 | + } |
|
| 534 | 534 | |
| 535 | 535 | /** |
| 536 | - * Gets count Live Spotter data |
|
| 537 | - * |
|
| 538 | - * @return Array the spotter information |
|
| 539 | - * |
|
| 540 | - */ |
|
| 541 | - public function getLiveSpotterCount($begindate,$enddate,$filter = array()) |
|
| 542 | - { |
|
| 543 | - global $globalDBdriver, $globalLiveInterval; |
|
| 544 | - date_default_timezone_set('UTC'); |
|
| 545 | - |
|
| 546 | - $filter_query = ''; |
|
| 547 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 548 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 549 | - } |
|
| 550 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 551 | - $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 "; |
|
| 552 | - } |
|
| 553 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 554 | - $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 "; |
|
| 555 | - } |
|
| 556 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 557 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 558 | - } |
|
| 559 | - |
|
| 560 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 561 | - if ($globalDBdriver == 'mysql') { |
|
| 536 | + * Gets count Live Spotter data |
|
| 537 | + * |
|
| 538 | + * @return Array the spotter information |
|
| 539 | + * |
|
| 540 | + */ |
|
| 541 | + public function getLiveSpotterCount($begindate,$enddate,$filter = array()) |
|
| 542 | + { |
|
| 543 | + global $globalDBdriver, $globalLiveInterval; |
|
| 544 | + date_default_timezone_set('UTC'); |
|
| 545 | + |
|
| 546 | + $filter_query = ''; |
|
| 547 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 548 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 549 | + } |
|
| 550 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 551 | + $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 "; |
|
| 552 | + } |
|
| 553 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 554 | + $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 "; |
|
| 555 | + } |
|
| 556 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 557 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 558 | + } |
|
| 559 | + |
|
| 560 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 561 | + if ($globalDBdriver == 'mysql') { |
|
| 562 | 562 | $query = 'SELECT COUNT(DISTINCT flightaware_id) as nb |
| 563 | 563 | FROM spotter_archive l |
| 564 | 564 | WHERE (l.date BETWEEN DATE_SUB('."'".$begindate."'".',INTERVAL '.$globalLiveInterval.' SECOND) AND '."'".$begindate."'".')'.$filter_query; |
| 565 | - } else { |
|
| 565 | + } else { |
|
| 566 | 566 | $query = 'SELECT COUNT(DISTINCT flightaware_id) as nb FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."' - INTERVAL '".$globalLiveInterval." SECONDS' AND "."'".$enddate."'".')'.$filter_query; |
| 567 | - } |
|
| 568 | - //echo $query; |
|
| 569 | - try { |
|
| 570 | - $sth = $this->db->prepare($query); |
|
| 571 | - $sth->execute(); |
|
| 572 | - } catch(PDOException $e) { |
|
| 573 | - echo $e->getMessage(); |
|
| 574 | - die; |
|
| 575 | - } |
|
| 567 | + } |
|
| 568 | + //echo $query; |
|
| 569 | + try { |
|
| 570 | + $sth = $this->db->prepare($query); |
|
| 571 | + $sth->execute(); |
|
| 572 | + } catch(PDOException $e) { |
|
| 573 | + echo $e->getMessage(); |
|
| 574 | + die; |
|
| 575 | + } |
|
| 576 | 576 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
| 577 | 577 | $sth->closeCursor(); |
| 578 | - return $result['nb']; |
|
| 578 | + return $result['nb']; |
|
| 579 | 579 | |
| 580 | - } |
|
| 580 | + } |
|
| 581 | 581 | |
| 582 | 582 | |
| 583 | 583 | |
| 584 | 584 | // Spotter_Archive_output |
| 585 | 585 | |
| 586 | - /** |
|
| 587 | - * Gets all the spotter information |
|
| 588 | - * |
|
| 589 | - * @return Array the spotter information |
|
| 590 | - * |
|
| 591 | - */ |
|
| 592 | - 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()) |
|
| 593 | - { |
|
| 586 | + /** |
|
| 587 | + * Gets all the spotter information |
|
| 588 | + * |
|
| 589 | + * @return Array the spotter information |
|
| 590 | + * |
|
| 591 | + */ |
|
| 592 | + 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()) |
|
| 593 | + { |
|
| 594 | 594 | global $globalTimezone, $globalDBdriver; |
| 595 | 595 | require_once(dirname(__FILE__).'/class.Translation.php'); |
| 596 | 596 | $Translation = new Translation(); |
@@ -604,159 +604,159 @@ discard block |
||
| 604 | 604 | $filter_query = $this->getFilter($filters); |
| 605 | 605 | if ($q != "") |
| 606 | 606 | { |
| 607 | - if (!is_string($q)) |
|
| 608 | - { |
|
| 607 | + if (!is_string($q)) |
|
| 608 | + { |
|
| 609 | 609 | return false; |
| 610 | - } else { |
|
| 610 | + } else { |
|
| 611 | 611 | |
| 612 | 612 | $q_array = explode(" ", $q); |
| 613 | 613 | |
| 614 | 614 | foreach ($q_array as $q_item){ |
| 615 | - $additional_query .= " AND ("; |
|
| 616 | - $additional_query .= "(spotter_archive_output.spotter_id like '%".$q_item."%') OR "; |
|
| 617 | - $additional_query .= "(spotter_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
|
| 618 | - $additional_query .= "(spotter_archive_output.aircraft_name like '%".$q_item."%') OR "; |
|
| 619 | - $additional_query .= "(spotter_archive_output.aircraft_manufacturer like '%".$q_item."%') OR "; |
|
| 620 | - $additional_query .= "(spotter_archive_output.airline_icao like '%".$q_item."%') OR "; |
|
| 621 | - $additional_query .= "(spotter_archive_output.airline_name like '%".$q_item."%') OR "; |
|
| 622 | - $additional_query .= "(spotter_archive_output.airline_country like '%".$q_item."%') OR "; |
|
| 623 | - $additional_query .= "(spotter_archive_output.departure_airport_icao like '%".$q_item."%') OR "; |
|
| 624 | - $additional_query .= "(spotter_archive_output.departure_airport_name like '%".$q_item."%') OR "; |
|
| 625 | - $additional_query .= "(spotter_archive_output.departure_airport_city like '%".$q_item."%') OR "; |
|
| 626 | - $additional_query .= "(spotter_archive_output.departure_airport_country like '%".$q_item."%') OR "; |
|
| 627 | - $additional_query .= "(spotter_archive_output.arrival_airport_icao like '%".$q_item."%') OR "; |
|
| 628 | - $additional_query .= "(spotter_archive_output.arrival_airport_name like '%".$q_item."%') OR "; |
|
| 629 | - $additional_query .= "(spotter_archive_output.arrival_airport_city like '%".$q_item."%') OR "; |
|
| 630 | - $additional_query .= "(spotter_archive_output.arrival_airport_country like '%".$q_item."%') OR "; |
|
| 631 | - $additional_query .= "(spotter_archive_output.registration like '%".$q_item."%') OR "; |
|
| 632 | - $additional_query .= "(spotter_archive_output.owner_name like '%".$q_item."%') OR "; |
|
| 633 | - $additional_query .= "(spotter_archive_output.pilot_id like '%".$q_item."%') OR "; |
|
| 634 | - $additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR "; |
|
| 635 | - $additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR "; |
|
| 636 | - $translate = $Translation->ident2icao($q_item); |
|
| 637 | - if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR "; |
|
| 638 | - $additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')"; |
|
| 639 | - $additional_query .= ")"; |
|
| 640 | - } |
|
| 641 | - } |
|
| 615 | + $additional_query .= " AND ("; |
|
| 616 | + $additional_query .= "(spotter_archive_output.spotter_id like '%".$q_item."%') OR "; |
|
| 617 | + $additional_query .= "(spotter_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
|
| 618 | + $additional_query .= "(spotter_archive_output.aircraft_name like '%".$q_item."%') OR "; |
|
| 619 | + $additional_query .= "(spotter_archive_output.aircraft_manufacturer like '%".$q_item."%') OR "; |
|
| 620 | + $additional_query .= "(spotter_archive_output.airline_icao like '%".$q_item."%') OR "; |
|
| 621 | + $additional_query .= "(spotter_archive_output.airline_name like '%".$q_item."%') OR "; |
|
| 622 | + $additional_query .= "(spotter_archive_output.airline_country like '%".$q_item."%') OR "; |
|
| 623 | + $additional_query .= "(spotter_archive_output.departure_airport_icao like '%".$q_item."%') OR "; |
|
| 624 | + $additional_query .= "(spotter_archive_output.departure_airport_name like '%".$q_item."%') OR "; |
|
| 625 | + $additional_query .= "(spotter_archive_output.departure_airport_city like '%".$q_item."%') OR "; |
|
| 626 | + $additional_query .= "(spotter_archive_output.departure_airport_country like '%".$q_item."%') OR "; |
|
| 627 | + $additional_query .= "(spotter_archive_output.arrival_airport_icao like '%".$q_item."%') OR "; |
|
| 628 | + $additional_query .= "(spotter_archive_output.arrival_airport_name like '%".$q_item."%') OR "; |
|
| 629 | + $additional_query .= "(spotter_archive_output.arrival_airport_city like '%".$q_item."%') OR "; |
|
| 630 | + $additional_query .= "(spotter_archive_output.arrival_airport_country like '%".$q_item."%') OR "; |
|
| 631 | + $additional_query .= "(spotter_archive_output.registration like '%".$q_item."%') OR "; |
|
| 632 | + $additional_query .= "(spotter_archive_output.owner_name like '%".$q_item."%') OR "; |
|
| 633 | + $additional_query .= "(spotter_archive_output.pilot_id like '%".$q_item."%') OR "; |
|
| 634 | + $additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR "; |
|
| 635 | + $additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR "; |
|
| 636 | + $translate = $Translation->ident2icao($q_item); |
|
| 637 | + if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR "; |
|
| 638 | + $additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')"; |
|
| 639 | + $additional_query .= ")"; |
|
| 640 | + } |
|
| 641 | + } |
|
| 642 | 642 | } |
| 643 | 643 | |
| 644 | 644 | if ($registration != "") |
| 645 | 645 | { |
| 646 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 647 | - if (!is_string($registration)) |
|
| 648 | - { |
|
| 646 | + $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 647 | + if (!is_string($registration)) |
|
| 648 | + { |
|
| 649 | 649 | return false; |
| 650 | - } else { |
|
| 650 | + } else { |
|
| 651 | 651 | $additional_query .= " AND (spotter_archive_output.registration = '".$registration."')"; |
| 652 | - } |
|
| 652 | + } |
|
| 653 | 653 | } |
| 654 | 654 | |
| 655 | 655 | if ($aircraft_icao != "") |
| 656 | 656 | { |
| 657 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 658 | - if (!is_string($aircraft_icao)) |
|
| 659 | - { |
|
| 657 | + $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 658 | + if (!is_string($aircraft_icao)) |
|
| 659 | + { |
|
| 660 | 660 | return false; |
| 661 | - } else { |
|
| 661 | + } else { |
|
| 662 | 662 | $additional_query .= " AND (spotter_archive_output.aircraft_icao = '".$aircraft_icao."')"; |
| 663 | - } |
|
| 663 | + } |
|
| 664 | 664 | } |
| 665 | 665 | |
| 666 | 666 | if ($aircraft_manufacturer != "") |
| 667 | 667 | { |
| 668 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 669 | - if (!is_string($aircraft_manufacturer)) |
|
| 670 | - { |
|
| 668 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 669 | + if (!is_string($aircraft_manufacturer)) |
|
| 670 | + { |
|
| 671 | 671 | return false; |
| 672 | - } else { |
|
| 672 | + } else { |
|
| 673 | 673 | $additional_query .= " AND (spotter_archive_output.aircraft_manufacturer = '".$aircraft_manufacturer."')"; |
| 674 | - } |
|
| 674 | + } |
|
| 675 | 675 | } |
| 676 | 676 | |
| 677 | 677 | if ($highlights == "true") |
| 678 | 678 | { |
| 679 | - if (!is_string($highlights)) |
|
| 680 | - { |
|
| 679 | + if (!is_string($highlights)) |
|
| 680 | + { |
|
| 681 | 681 | return false; |
| 682 | - } else { |
|
| 682 | + } else { |
|
| 683 | 683 | $additional_query .= " AND (spotter_archive_output.highlight <> '')"; |
| 684 | - } |
|
| 684 | + } |
|
| 685 | 685 | } |
| 686 | 686 | |
| 687 | 687 | if ($airline_icao != "") |
| 688 | 688 | { |
| 689 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 690 | - if (!is_string($airline_icao)) |
|
| 691 | - { |
|
| 689 | + $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 690 | + if (!is_string($airline_icao)) |
|
| 691 | + { |
|
| 692 | 692 | return false; |
| 693 | - } else { |
|
| 693 | + } else { |
|
| 694 | 694 | $additional_query .= " AND (spotter_archive_output.airline_icao = '".$airline_icao."')"; |
| 695 | - } |
|
| 695 | + } |
|
| 696 | 696 | } |
| 697 | 697 | |
| 698 | 698 | if ($airline_country != "") |
| 699 | 699 | { |
| 700 | - $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 701 | - if (!is_string($airline_country)) |
|
| 702 | - { |
|
| 700 | + $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 701 | + if (!is_string($airline_country)) |
|
| 702 | + { |
|
| 703 | 703 | return false; |
| 704 | - } else { |
|
| 704 | + } else { |
|
| 705 | 705 | $additional_query .= " AND (spotter_archive_output.airline_country = '".$airline_country."')"; |
| 706 | - } |
|
| 706 | + } |
|
| 707 | 707 | } |
| 708 | 708 | |
| 709 | 709 | if ($airline_type != "") |
| 710 | 710 | { |
| 711 | - $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 712 | - if (!is_string($airline_type)) |
|
| 713 | - { |
|
| 711 | + $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 712 | + if (!is_string($airline_type)) |
|
| 713 | + { |
|
| 714 | 714 | return false; |
| 715 | - } else { |
|
| 715 | + } else { |
|
| 716 | 716 | if ($airline_type == "passenger") |
| 717 | 717 | { |
| 718 | - $additional_query .= " AND (spotter_archive_output.airline_type = 'passenger')"; |
|
| 718 | + $additional_query .= " AND (spotter_archive_output.airline_type = 'passenger')"; |
|
| 719 | 719 | } |
| 720 | 720 | if ($airline_type == "cargo") |
| 721 | 721 | { |
| 722 | - $additional_query .= " AND (spotter_archive_output.airline_type = 'cargo')"; |
|
| 722 | + $additional_query .= " AND (spotter_archive_output.airline_type = 'cargo')"; |
|
| 723 | 723 | } |
| 724 | 724 | if ($airline_type == "military") |
| 725 | 725 | { |
| 726 | - $additional_query .= " AND (spotter_archive_output.airline_type = 'military')"; |
|
| 726 | + $additional_query .= " AND (spotter_archive_output.airline_type = 'military')"; |
|
| 727 | + } |
|
| 727 | 728 | } |
| 728 | - } |
|
| 729 | 729 | } |
| 730 | 730 | |
| 731 | 731 | if ($airport != "") |
| 732 | 732 | { |
| 733 | - $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 734 | - if (!is_string($airport)) |
|
| 735 | - { |
|
| 733 | + $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 734 | + if (!is_string($airport)) |
|
| 735 | + { |
|
| 736 | 736 | return false; |
| 737 | - } else { |
|
| 737 | + } else { |
|
| 738 | 738 | $additional_query .= " AND ((spotter_archive_output.departure_airport_icao = '".$airport."') OR (spotter_archive_output.arrival_airport_icao = '".$airport."'))"; |
| 739 | - } |
|
| 739 | + } |
|
| 740 | 740 | } |
| 741 | 741 | |
| 742 | 742 | if ($airport_country != "") |
| 743 | 743 | { |
| 744 | - $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 745 | - if (!is_string($airport_country)) |
|
| 746 | - { |
|
| 744 | + $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 745 | + if (!is_string($airport_country)) |
|
| 746 | + { |
|
| 747 | 747 | return false; |
| 748 | - } else { |
|
| 748 | + } else { |
|
| 749 | 749 | $additional_query .= " AND ((spotter_archive_output.departure_airport_country = '".$airport_country."') OR (spotter_archive_output.arrival_airport_country = '".$airport_country."'))"; |
| 750 | - } |
|
| 750 | + } |
|
| 751 | 751 | } |
| 752 | 752 | |
| 753 | 753 | if ($callsign != "") |
| 754 | 754 | { |
| 755 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 756 | - if (!is_string($callsign)) |
|
| 757 | - { |
|
| 755 | + $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 756 | + if (!is_string($callsign)) |
|
| 757 | + { |
|
| 758 | 758 | return false; |
| 759 | - } else { |
|
| 759 | + } else { |
|
| 760 | 760 | $translate = $Translation->ident2icao($callsign); |
| 761 | 761 | if ($translate != $callsign) { |
| 762 | 762 | $additional_query .= " AND (spotter_archive_output.ident = :callsign OR spotter_archive_output.ident = :translate)"; |
@@ -764,99 +764,99 @@ discard block |
||
| 764 | 764 | } else { |
| 765 | 765 | $additional_query .= " AND (spotter_archive_output.ident = '".$callsign."')"; |
| 766 | 766 | } |
| 767 | - } |
|
| 767 | + } |
|
| 768 | 768 | } |
| 769 | 769 | |
| 770 | 770 | if ($owner != "") |
| 771 | 771 | { |
| 772 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 773 | - if (!is_string($owner)) |
|
| 774 | - { |
|
| 772 | + $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 773 | + if (!is_string($owner)) |
|
| 774 | + { |
|
| 775 | 775 | return false; |
| 776 | - } else { |
|
| 776 | + } else { |
|
| 777 | 777 | $additional_query .= " AND (spotter_archive_output.owner_name = '".$owner."')"; |
| 778 | - } |
|
| 778 | + } |
|
| 779 | 779 | } |
| 780 | 780 | |
| 781 | 781 | if ($pilot_name != "") |
| 782 | 782 | { |
| 783 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 784 | - if (!is_string($pilot_name)) |
|
| 785 | - { |
|
| 783 | + $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 784 | + if (!is_string($pilot_name)) |
|
| 785 | + { |
|
| 786 | 786 | return false; |
| 787 | - } else { |
|
| 787 | + } else { |
|
| 788 | 788 | $additional_query .= " AND (spotter_archive_output.pilot_name = '".$pilot_name."')"; |
| 789 | - } |
|
| 789 | + } |
|
| 790 | 790 | } |
| 791 | 791 | |
| 792 | 792 | if ($pilot_id != "") |
| 793 | 793 | { |
| 794 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 795 | - if (!is_string($pilot_id)) |
|
| 796 | - { |
|
| 794 | + $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 795 | + if (!is_string($pilot_id)) |
|
| 796 | + { |
|
| 797 | 797 | return false; |
| 798 | - } else { |
|
| 798 | + } else { |
|
| 799 | 799 | $additional_query .= " AND (spotter_archive_output.pilot_id = '".$pilot_id."')"; |
| 800 | - } |
|
| 800 | + } |
|
| 801 | 801 | } |
| 802 | 802 | |
| 803 | 803 | if ($departure_airport_route != "") |
| 804 | 804 | { |
| 805 | - $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 806 | - if (!is_string($departure_airport_route)) |
|
| 807 | - { |
|
| 805 | + $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 806 | + if (!is_string($departure_airport_route)) |
|
| 807 | + { |
|
| 808 | 808 | return false; |
| 809 | - } else { |
|
| 809 | + } else { |
|
| 810 | 810 | $additional_query .= " AND (spotter_archive_output.departure_airport_icao = '".$departure_airport_route."')"; |
| 811 | - } |
|
| 811 | + } |
|
| 812 | 812 | } |
| 813 | 813 | |
| 814 | 814 | if ($arrival_airport_route != "") |
| 815 | 815 | { |
| 816 | - $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 817 | - if (!is_string($arrival_airport_route)) |
|
| 818 | - { |
|
| 816 | + $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 817 | + if (!is_string($arrival_airport_route)) |
|
| 818 | + { |
|
| 819 | 819 | return false; |
| 820 | - } else { |
|
| 820 | + } else { |
|
| 821 | 821 | $additional_query .= " AND (spotter_archive_output.arrival_airport_icao = '".$arrival_airport_route."')"; |
| 822 | - } |
|
| 822 | + } |
|
| 823 | 823 | } |
| 824 | 824 | |
| 825 | 825 | if ($altitude != "") |
| 826 | 826 | { |
| 827 | - $altitude_array = explode(",", $altitude); |
|
| 827 | + $altitude_array = explode(",", $altitude); |
|
| 828 | 828 | |
| 829 | - $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 830 | - $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 829 | + $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 830 | + $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 831 | 831 | |
| 832 | 832 | |
| 833 | - if ($altitude_array[1] != "") |
|
| 834 | - { |
|
| 833 | + if ($altitude_array[1] != "") |
|
| 834 | + { |
|
| 835 | 835 | $altitude_array[0] = substr($altitude_array[0], 0, -2); |
| 836 | 836 | $altitude_array[1] = substr($altitude_array[1], 0, -2); |
| 837 | 837 | $additional_query .= " AND altitude BETWEEN '".$altitude_array[0]."' AND '".$altitude_array[1]."' "; |
| 838 | - } else { |
|
| 838 | + } else { |
|
| 839 | 839 | $altitude_array[0] = substr($altitude_array[0], 0, -2); |
| 840 | 840 | $additional_query .= " AND altitude <= '".$altitude_array[0]."' "; |
| 841 | - } |
|
| 841 | + } |
|
| 842 | 842 | } |
| 843 | 843 | |
| 844 | 844 | if ($date_posted != "") |
| 845 | 845 | { |
| 846 | - $date_array = explode(",", $date_posted); |
|
| 846 | + $date_array = explode(",", $date_posted); |
|
| 847 | 847 | |
| 848 | - $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 849 | - $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 848 | + $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 849 | + $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 850 | 850 | |
| 851 | - if ($globalTimezone != '') { |
|
| 851 | + if ($globalTimezone != '') { |
|
| 852 | 852 | date_default_timezone_set($globalTimezone); |
| 853 | 853 | $datetime = new DateTime(); |
| 854 | 854 | $offset = $datetime->format('P'); |
| 855 | - } else $offset = '+00:00'; |
|
| 855 | + } else $offset = '+00:00'; |
|
| 856 | 856 | |
| 857 | 857 | |
| 858 | - if ($date_array[1] != "") |
|
| 859 | - { |
|
| 858 | + if ($date_array[1] != "") |
|
| 859 | + { |
|
| 860 | 860 | $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0])); |
| 861 | 861 | $date_array[1] = date("Y-m-d H:i:s", strtotime($date_array[1])); |
| 862 | 862 | if ($globalDBdriver == 'mysql') { |
@@ -864,28 +864,28 @@ discard block |
||
| 864 | 864 | } else { |
| 865 | 865 | $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) "; |
| 866 | 866 | } |
| 867 | - } else { |
|
| 867 | + } else { |
|
| 868 | 868 | $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0])); |
| 869 | - if ($globalDBdriver == 'mysql') { |
|
| 869 | + if ($globalDBdriver == 'mysql') { |
|
| 870 | 870 | $additional_query .= " AND TIMESTAMP(CONVERT_TZ(spotter_archive_output.date,'+00:00', '".$offset."')) >= '".$date_array[0]."' "; |
| 871 | 871 | } else { |
| 872 | 872 | $additional_query .= " AND spotter_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) "; |
| 873 | 873 | } |
| 874 | - } |
|
| 874 | + } |
|
| 875 | 875 | } |
| 876 | 876 | |
| 877 | 877 | if ($limit != "") |
| 878 | 878 | { |
| 879 | - $limit_array = explode(",", $limit); |
|
| 879 | + $limit_array = explode(",", $limit); |
|
| 880 | 880 | |
| 881 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 882 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 881 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 882 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 883 | 883 | |
| 884 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 885 | - { |
|
| 884 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 885 | + { |
|
| 886 | 886 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 887 | 887 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 888 | - } |
|
| 888 | + } |
|
| 889 | 889 | } |
| 890 | 890 | |
| 891 | 891 | |
@@ -916,33 +916,33 @@ discard block |
||
| 916 | 916 | $spotter_array = $Spotter->getDataFromDB($query, $query_values,$limit_query); |
| 917 | 917 | |
| 918 | 918 | return $spotter_array; |
| 919 | - } |
|
| 919 | + } |
|
| 920 | 920 | |
| 921 | - public function deleteSpotterArchiveData() |
|
| 922 | - { |
|
| 921 | + public function deleteSpotterArchiveData() |
|
| 922 | + { |
|
| 923 | 923 | global $globalArchiveKeepMonths, $globalDBdriver; |
| 924 | - date_default_timezone_set('UTC'); |
|
| 925 | - if ($globalDBdriver == 'mysql') { |
|
| 924 | + date_default_timezone_set('UTC'); |
|
| 925 | + if ($globalDBdriver == 'mysql') { |
|
| 926 | 926 | $query = 'DELETE FROM spotter_archive_output WHERE spotter_archive_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepMonths.' MONTH)'; |
| 927 | 927 | } else { |
| 928 | 928 | $query = "DELETE FROM spotter_archive_output WHERE spotter_archive_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveKeepMonths." MONTH'"; |
| 929 | 929 | } |
| 930 | - try { |
|
| 931 | - $sth = $this->db->prepare($query); |
|
| 932 | - $sth->execute(); |
|
| 933 | - } catch(PDOException $e) { |
|
| 934 | - return "error"; |
|
| 935 | - } |
|
| 930 | + try { |
|
| 931 | + $sth = $this->db->prepare($query); |
|
| 932 | + $sth->execute(); |
|
| 933 | + } catch(PDOException $e) { |
|
| 934 | + return "error"; |
|
| 935 | + } |
|
| 936 | 936 | } |
| 937 | 937 | |
| 938 | - /** |
|
| 939 | - * Gets all the spotter information based on the callsign |
|
| 940 | - * |
|
| 941 | - * @return Array the spotter information |
|
| 942 | - * |
|
| 943 | - */ |
|
| 944 | - public function getSpotterDataByIdent($ident = '', $limit = '', $sort = '') |
|
| 945 | - { |
|
| 938 | + /** |
|
| 939 | + * Gets all the spotter information based on the callsign |
|
| 940 | + * |
|
| 941 | + * @return Array the spotter information |
|
| 942 | + * |
|
| 943 | + */ |
|
| 944 | + public function getSpotterDataByIdent($ident = '', $limit = '', $sort = '') |
|
| 945 | + { |
|
| 946 | 946 | $global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output"; |
| 947 | 947 | |
| 948 | 948 | date_default_timezone_set('UTC'); |
@@ -954,35 +954,35 @@ discard block |
||
| 954 | 954 | |
| 955 | 955 | if ($ident != "") |
| 956 | 956 | { |
| 957 | - if (!is_string($ident)) |
|
| 958 | - { |
|
| 957 | + if (!is_string($ident)) |
|
| 958 | + { |
|
| 959 | 959 | return false; |
| 960 | - } else { |
|
| 960 | + } else { |
|
| 961 | 961 | $additional_query = " AND (spotter_archive_output.ident = :ident)"; |
| 962 | 962 | $query_values = array(':ident' => $ident); |
| 963 | - } |
|
| 963 | + } |
|
| 964 | 964 | } |
| 965 | 965 | |
| 966 | 966 | if ($limit != "") |
| 967 | 967 | { |
| 968 | - $limit_array = explode(",", $limit); |
|
| 968 | + $limit_array = explode(",", $limit); |
|
| 969 | 969 | |
| 970 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 971 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 970 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 971 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 972 | 972 | |
| 973 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 974 | - { |
|
| 973 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 974 | + { |
|
| 975 | 975 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 976 | 976 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 977 | - } |
|
| 977 | + } |
|
| 978 | 978 | } |
| 979 | 979 | |
| 980 | 980 | if ($sort != "") |
| 981 | 981 | { |
| 982 | - $search_orderby_array = $Spotter->getOrderBy(); |
|
| 983 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 982 | + $search_orderby_array = $Spotter->getOrderBy(); |
|
| 983 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 984 | 984 | } else { |
| 985 | - $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 985 | + $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 986 | 986 | } |
| 987 | 987 | |
| 988 | 988 | $query = $global_query." WHERE spotter_archive_output.ident <> '' ".$additional_query." ".$orderby_query; |
@@ -990,17 +990,17 @@ discard block |
||
| 990 | 990 | $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
| 991 | 991 | |
| 992 | 992 | return $spotter_array; |
| 993 | - } |
|
| 993 | + } |
|
| 994 | 994 | |
| 995 | 995 | |
| 996 | - /** |
|
| 997 | - * Gets all the spotter information based on the owner |
|
| 998 | - * |
|
| 999 | - * @return Array the spotter information |
|
| 1000 | - * |
|
| 1001 | - */ |
|
| 1002 | - public function getSpotterDataByOwner($owner = '', $limit = '', $sort = '', $filter = array()) |
|
| 1003 | - { |
|
| 996 | + /** |
|
| 997 | + * Gets all the spotter information based on the owner |
|
| 998 | + * |
|
| 999 | + * @return Array the spotter information |
|
| 1000 | + * |
|
| 1001 | + */ |
|
| 1002 | + public function getSpotterDataByOwner($owner = '', $limit = '', $sort = '', $filter = array()) |
|
| 1003 | + { |
|
| 1004 | 1004 | $global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output"; |
| 1005 | 1005 | |
| 1006 | 1006 | date_default_timezone_set('UTC'); |
@@ -1013,35 +1013,35 @@ discard block |
||
| 1013 | 1013 | |
| 1014 | 1014 | if ($owner != "") |
| 1015 | 1015 | { |
| 1016 | - if (!is_string($owner)) |
|
| 1017 | - { |
|
| 1016 | + if (!is_string($owner)) |
|
| 1017 | + { |
|
| 1018 | 1018 | return false; |
| 1019 | - } else { |
|
| 1019 | + } else { |
|
| 1020 | 1020 | $additional_query = " AND (spotter_archive_output.owner_name = :owner)"; |
| 1021 | 1021 | $query_values = array(':owner' => $owner); |
| 1022 | - } |
|
| 1022 | + } |
|
| 1023 | 1023 | } |
| 1024 | 1024 | |
| 1025 | 1025 | if ($limit != "") |
| 1026 | 1026 | { |
| 1027 | - $limit_array = explode(",", $limit); |
|
| 1027 | + $limit_array = explode(",", $limit); |
|
| 1028 | 1028 | |
| 1029 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1030 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1029 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1030 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1031 | 1031 | |
| 1032 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1033 | - { |
|
| 1032 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1033 | + { |
|
| 1034 | 1034 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 1035 | 1035 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 1036 | - } |
|
| 1036 | + } |
|
| 1037 | 1037 | } |
| 1038 | 1038 | |
| 1039 | 1039 | if ($sort != "") |
| 1040 | 1040 | { |
| 1041 | - $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1042 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1041 | + $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1042 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1043 | 1043 | } else { |
| 1044 | - $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1044 | + $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1045 | 1045 | } |
| 1046 | 1046 | |
| 1047 | 1047 | $query = $global_query.$filter_query." spotter_archive_output.owner_name <> '' ".$additional_query." ".$orderby_query; |
@@ -1049,16 +1049,16 @@ discard block |
||
| 1049 | 1049 | $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
| 1050 | 1050 | |
| 1051 | 1051 | return $spotter_array; |
| 1052 | - } |
|
| 1053 | - |
|
| 1054 | - /** |
|
| 1055 | - * Gets all the spotter information based on the pilot |
|
| 1056 | - * |
|
| 1057 | - * @return Array the spotter information |
|
| 1058 | - * |
|
| 1059 | - */ |
|
| 1060 | - public function getSpotterDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array()) |
|
| 1061 | - { |
|
| 1052 | + } |
|
| 1053 | + |
|
| 1054 | + /** |
|
| 1055 | + * Gets all the spotter information based on the pilot |
|
| 1056 | + * |
|
| 1057 | + * @return Array the spotter information |
|
| 1058 | + * |
|
| 1059 | + */ |
|
| 1060 | + public function getSpotterDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array()) |
|
| 1061 | + { |
|
| 1062 | 1062 | $global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output"; |
| 1063 | 1063 | |
| 1064 | 1064 | date_default_timezone_set('UTC'); |
@@ -1077,24 +1077,24 @@ discard block |
||
| 1077 | 1077 | |
| 1078 | 1078 | if ($limit != "") |
| 1079 | 1079 | { |
| 1080 | - $limit_array = explode(",", $limit); |
|
| 1080 | + $limit_array = explode(",", $limit); |
|
| 1081 | 1081 | |
| 1082 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1083 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1082 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1083 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1084 | 1084 | |
| 1085 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1086 | - { |
|
| 1085 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1086 | + { |
|
| 1087 | 1087 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 1088 | 1088 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 1089 | - } |
|
| 1089 | + } |
|
| 1090 | 1090 | } |
| 1091 | 1091 | |
| 1092 | 1092 | if ($sort != "") |
| 1093 | 1093 | { |
| 1094 | - $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1095 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1094 | + $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1095 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1096 | 1096 | } else { |
| 1097 | - $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1097 | + $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1098 | 1098 | } |
| 1099 | 1099 | |
| 1100 | 1100 | $query = $global_query.$filter_query." spotter_archive_output.pilot_name <> '' ".$additional_query." ".$orderby_query; |
@@ -1102,16 +1102,16 @@ discard block |
||
| 1102 | 1102 | $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
| 1103 | 1103 | |
| 1104 | 1104 | return $spotter_array; |
| 1105 | - } |
|
| 1106 | - |
|
| 1107 | - /** |
|
| 1108 | - * Gets all number of flight over countries |
|
| 1109 | - * |
|
| 1110 | - * @return Array the airline country list |
|
| 1111 | - * |
|
| 1112 | - */ |
|
| 1113 | - public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1114 | - { |
|
| 1105 | + } |
|
| 1106 | + |
|
| 1107 | + /** |
|
| 1108 | + * Gets all number of flight over countries |
|
| 1109 | + * |
|
| 1110 | + * @return Array the airline country list |
|
| 1111 | + * |
|
| 1112 | + */ |
|
| 1113 | + public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1114 | + { |
|
| 1115 | 1115 | global $globalDBdriver; |
| 1116 | 1116 | /* |
| 1117 | 1117 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
@@ -1121,14 +1121,14 @@ discard block |
||
| 1121 | 1121 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
| 1122 | 1122 | FROM countries c, spotter_archive s |
| 1123 | 1123 | WHERE c.iso2 = s.over_country "; |
| 1124 | - if ($olderthanmonths > 0) { |
|
| 1125 | - if ($globalDBdriver == 'mysql') { |
|
| 1124 | + if ($olderthanmonths > 0) { |
|
| 1125 | + if ($globalDBdriver == 'mysql') { |
|
| 1126 | 1126 | $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) '; |
| 1127 | 1127 | } else { |
| 1128 | 1128 | $query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1129 | 1129 | } |
| 1130 | 1130 | } |
| 1131 | - if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
| 1131 | + if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
| 1132 | 1132 | $query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1133 | 1133 | if ($limit) $query .= " LIMIT 0,10"; |
| 1134 | 1134 | |
@@ -1141,23 +1141,23 @@ discard block |
||
| 1141 | 1141 | |
| 1142 | 1142 | while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
| 1143 | 1143 | { |
| 1144 | - $temp_array['flight_count'] = $row['nb']; |
|
| 1145 | - $temp_array['flight_country'] = $row['name']; |
|
| 1146 | - $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1147 | - $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1148 | - $flight_array[] = $temp_array; |
|
| 1144 | + $temp_array['flight_count'] = $row['nb']; |
|
| 1145 | + $temp_array['flight_country'] = $row['name']; |
|
| 1146 | + $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1147 | + $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1148 | + $flight_array[] = $temp_array; |
|
| 1149 | 1149 | } |
| 1150 | 1150 | return $flight_array; |
| 1151 | - } |
|
| 1152 | - |
|
| 1153 | - /** |
|
| 1154 | - * Gets all number of flight over countries |
|
| 1155 | - * |
|
| 1156 | - * @return Array the airline country list |
|
| 1157 | - * |
|
| 1158 | - */ |
|
| 1159 | - public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1160 | - { |
|
| 1151 | + } |
|
| 1152 | + |
|
| 1153 | + /** |
|
| 1154 | + * Gets all number of flight over countries |
|
| 1155 | + * |
|
| 1156 | + * @return Array the airline country list |
|
| 1157 | + * |
|
| 1158 | + */ |
|
| 1159 | + public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1160 | + { |
|
| 1161 | 1161 | global $globalDBdriver; |
| 1162 | 1162 | /* |
| 1163 | 1163 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
@@ -1167,14 +1167,14 @@ discard block |
||
| 1167 | 1167 | $query = "SELECT o.airline_icao,c.name, c.iso3, c.iso2, count(c.name) as nb |
| 1168 | 1168 | FROM countries c, spotter_archive s, spotter_output o |
| 1169 | 1169 | WHERE c.iso2 = s.over_country AND o.airline_icao <> '' AND o.flightaware_id = s.flightaware_id "; |
| 1170 | - if ($olderthanmonths > 0) { |
|
| 1171 | - if ($globalDBdriver == 'mysql') { |
|
| 1170 | + if ($olderthanmonths > 0) { |
|
| 1171 | + if ($globalDBdriver == 'mysql') { |
|
| 1172 | 1172 | $query .= 'AND s.date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) '; |
| 1173 | 1173 | } else { |
| 1174 | 1174 | $query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1175 | 1175 | } |
| 1176 | 1176 | } |
| 1177 | - if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' "; |
|
| 1177 | + if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' "; |
|
| 1178 | 1178 | $query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1179 | 1179 | if ($limit) $query .= " LIMIT 0,10"; |
| 1180 | 1180 | |
@@ -1187,24 +1187,24 @@ discard block |
||
| 1187 | 1187 | |
| 1188 | 1188 | while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
| 1189 | 1189 | { |
| 1190 | - $temp_array['airline_icao'] = $row['airline_icao']; |
|
| 1191 | - $temp_array['flight_count'] = $row['nb']; |
|
| 1192 | - $temp_array['flight_country'] = $row['name']; |
|
| 1193 | - $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1194 | - $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1195 | - $flight_array[] = $temp_array; |
|
| 1190 | + $temp_array['airline_icao'] = $row['airline_icao']; |
|
| 1191 | + $temp_array['flight_count'] = $row['nb']; |
|
| 1192 | + $temp_array['flight_country'] = $row['name']; |
|
| 1193 | + $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1194 | + $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1195 | + $flight_array[] = $temp_array; |
|
| 1196 | 1196 | } |
| 1197 | 1197 | return $flight_array; |
| 1198 | - } |
|
| 1199 | - |
|
| 1200 | - /** |
|
| 1201 | - * Gets last spotter information based on a particular callsign |
|
| 1202 | - * |
|
| 1203 | - * @return Array the spotter information |
|
| 1204 | - * |
|
| 1205 | - */ |
|
| 1206 | - public function getDateArchiveSpotterDataById($id,$date) |
|
| 1207 | - { |
|
| 1198 | + } |
|
| 1199 | + |
|
| 1200 | + /** |
|
| 1201 | + * Gets last spotter information based on a particular callsign |
|
| 1202 | + * |
|
| 1203 | + * @return Array the spotter information |
|
| 1204 | + * |
|
| 1205 | + */ |
|
| 1206 | + public function getDateArchiveSpotterDataById($id,$date) |
|
| 1207 | + { |
|
| 1208 | 1208 | $Spotter = new Spotter($this->db); |
| 1209 | 1209 | date_default_timezone_set('UTC'); |
| 1210 | 1210 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
@@ -1212,16 +1212,16 @@ discard block |
||
| 1212 | 1212 | $date = date('c',$date); |
| 1213 | 1213 | $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date)); |
| 1214 | 1214 | return $spotter_array; |
| 1215 | - } |
|
| 1216 | - |
|
| 1217 | - /** |
|
| 1218 | - * Gets all the spotter information based on a particular callsign |
|
| 1219 | - * |
|
| 1220 | - * @return Array the spotter information |
|
| 1221 | - * |
|
| 1222 | - */ |
|
| 1223 | - public function getDateArchiveSpotterDataByIdent($ident,$date) |
|
| 1224 | - { |
|
| 1215 | + } |
|
| 1216 | + |
|
| 1217 | + /** |
|
| 1218 | + * Gets all the spotter information based on a particular callsign |
|
| 1219 | + * |
|
| 1220 | + * @return Array the spotter information |
|
| 1221 | + * |
|
| 1222 | + */ |
|
| 1223 | + public function getDateArchiveSpotterDataByIdent($ident,$date) |
|
| 1224 | + { |
|
| 1225 | 1225 | $Spotter = new Spotter($this->db); |
| 1226 | 1226 | date_default_timezone_set('UTC'); |
| 1227 | 1227 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
@@ -1229,16 +1229,16 @@ discard block |
||
| 1229 | 1229 | $date = date('c',$date); |
| 1230 | 1230 | $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
| 1231 | 1231 | return $spotter_array; |
| 1232 | - } |
|
| 1233 | - |
|
| 1234 | - /** |
|
| 1235 | - * Gets all the spotter information based on the airport |
|
| 1236 | - * |
|
| 1237 | - * @return Array the spotter information |
|
| 1238 | - * |
|
| 1239 | - */ |
|
| 1240 | - public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1241 | - { |
|
| 1232 | + } |
|
| 1233 | + |
|
| 1234 | + /** |
|
| 1235 | + * Gets all the spotter information based on the airport |
|
| 1236 | + * |
|
| 1237 | + * @return Array the spotter information |
|
| 1238 | + * |
|
| 1239 | + */ |
|
| 1240 | + public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1241 | + { |
|
| 1242 | 1242 | global $global_query; |
| 1243 | 1243 | $Spotter = new Spotter(); |
| 1244 | 1244 | date_default_timezone_set('UTC'); |
@@ -1249,35 +1249,35 @@ discard block |
||
| 1249 | 1249 | |
| 1250 | 1250 | if ($airport != "") |
| 1251 | 1251 | { |
| 1252 | - if (!is_string($airport)) |
|
| 1253 | - { |
|
| 1252 | + if (!is_string($airport)) |
|
| 1253 | + { |
|
| 1254 | 1254 | return false; |
| 1255 | - } else { |
|
| 1255 | + } else { |
|
| 1256 | 1256 | $additional_query .= " AND ((spotter_archive_output.departure_airport_icao = :airport) OR (spotter_archive_output.arrival_airport_icao = :airport))"; |
| 1257 | 1257 | $query_values = array(':airport' => $airport); |
| 1258 | - } |
|
| 1258 | + } |
|
| 1259 | 1259 | } |
| 1260 | 1260 | |
| 1261 | 1261 | if ($limit != "") |
| 1262 | 1262 | { |
| 1263 | - $limit_array = explode(",", $limit); |
|
| 1263 | + $limit_array = explode(",", $limit); |
|
| 1264 | 1264 | |
| 1265 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1266 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1265 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1266 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1267 | 1267 | |
| 1268 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1269 | - { |
|
| 1268 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1269 | + { |
|
| 1270 | 1270 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 1271 | 1271 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 1272 | - } |
|
| 1272 | + } |
|
| 1273 | 1273 | } |
| 1274 | 1274 | |
| 1275 | 1275 | if ($sort != "") |
| 1276 | 1276 | { |
| 1277 | - $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1278 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1277 | + $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1278 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1279 | 1279 | } else { |
| 1280 | - $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1280 | + $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1281 | 1281 | } |
| 1282 | 1282 | |
| 1283 | 1283 | $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; |
@@ -1285,6 +1285,6 @@ discard block |
||
| 1285 | 1285 | $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
| 1286 | 1286 | |
| 1287 | 1287 | return $spotter_array; |
| 1288 | - } |
|
| 1288 | + } |
|
| 1289 | 1289 | } |
| 1290 | 1290 | ?> |
| 1291 | 1291 | \ No newline at end of file |
@@ -13,62 +13,62 @@ discard block |
||
| 13 | 13 | * @param Array $filter the filter |
| 14 | 14 | * @return Array the SQL part |
| 15 | 15 | */ |
| 16 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 16 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 17 | 17 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 18 | 18 | $filters = array(); |
| 19 | 19 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 20 | 20 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 21 | 21 | $filters = $globalStatsFilters[$globalFilterName]; |
| 22 | 22 | } else { |
| 23 | - $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
|
| 23 | + $filter = array_merge($filter, $globalStatsFilters[$globalFilterName]); |
|
| 24 | 24 | } |
| 25 | 25 | } |
| 26 | 26 | if (isset($filter[0]['source'])) { |
| 27 | - $filters = array_merge($filters,$filter); |
|
| 27 | + $filters = array_merge($filters, $filter); |
|
| 28 | 28 | } |
| 29 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 29 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 30 | 30 | $filter_query_join = ''; |
| 31 | 31 | $filter_query_where = ''; |
| 32 | - foreach($filters as $flt) { |
|
| 32 | + foreach ($filters as $flt) { |
|
| 33 | 33 | if (isset($flt['airlines']) && !empty($flt['airlines'])) { |
| 34 | 34 | if ($flt['airlines'][0] != '') { |
| 35 | 35 | if (isset($flt['source'])) { |
| 36 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 36 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $flt['airlines'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 37 | 37 | } else { |
| 38 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 38 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $flt['airlines'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 39 | 39 | } |
| 40 | 40 | } |
| 41 | 41 | } |
| 42 | 42 | if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) { |
| 43 | 43 | if (isset($flt['source'])) { |
| 44 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 44 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 45 | 45 | } else { |
| 46 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 46 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 47 | 47 | } |
| 48 | 48 | } |
| 49 | 49 | if (isset($flt['idents']) && !empty($flt['idents'])) { |
| 50 | 50 | if (isset($flt['source'])) { |
| 51 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 51 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','", $flt['idents'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 52 | 52 | } else { |
| 53 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 53 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','", $flt['idents'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | 56 | if (isset($flt['registrations']) && !empty($flt['registrations'])) { |
| 57 | 57 | if (isset($flt['source'])) { |
| 58 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 58 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','", $flt['registrations'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 59 | 59 | } else { |
| 60 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 60 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','", $flt['registrations'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 61 | 61 | } |
| 62 | 62 | } |
| 63 | 63 | if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id']) && isset($flt['idents']) && empty($flt['idents']) && isset($flt['registrations']) && empty($flt['registrations'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']) && !isset($flt['idents']) && !isset($flt['registrations']))) { |
| 64 | 64 | if (isset($flt['source'])) { |
| 65 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) saa ON saa.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 65 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_output.format_source IN ('".implode("','", $flt['source'])."')) saa ON saa.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | 68 | } |
| 69 | 69 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 70 | 70 | if ($filter['airlines'][0] != '') { |
| 71 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) saf ON saf.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 71 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) saf ON saf.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 72 | 72 | } |
| 73 | 73 | } |
| 74 | 74 | |
@@ -76,16 +76,16 @@ discard block |
||
| 76 | 76 | $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive_output.flightaware_id "; |
| 77 | 77 | } |
| 78 | 78 | if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) { |
| 79 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 79 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $filter['pilots_id'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 80 | 80 | } |
| 81 | 81 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 82 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 82 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 83 | 83 | } |
| 84 | 84 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 85 | 85 | $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
| 86 | 86 | } |
| 87 | 87 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 88 | - $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 88 | + $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 89 | 89 | } |
| 90 | 90 | if ((isset($filter['year']) && $filter['year'] != '') || (isset($filter['month']) && $filter['month'] != '') || (isset($filter['day']) && $filter['day'] != '')) { |
| 91 | 91 | $filter_query_date = ''; |
@@ -111,40 +111,40 @@ discard block |
||
| 111 | 111 | $filter_query_date .= " AND EXTRACT(DAY FROM spotter_archive_output.date) = '".$filter['day']."'"; |
| 112 | 112 | } |
| 113 | 113 | } |
| 114 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 114 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 115 | 115 | } |
| 116 | 116 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 117 | 117 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
| 118 | 118 | if ($filter_query_where != '') { |
| 119 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
| 119 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
| 120 | 120 | } |
| 121 | 121 | $filter_query = $filter_query_join.$filter_query_where; |
| 122 | 122 | return $filter_query; |
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | // Spotter_archive |
| 126 | - public function addSpotterArchiveData($flightaware_id = '', $ident = '', $registration = '', $airline_name = '', $airline_icao = '', $airline_country = '', $airline_type = '', $aircraft_icao = '', $aircraft_shadow = '', $aircraft_name = '', $aircraft_manufacturer = '', $departure_airport_icao = '', $departure_airport_name = '', $departure_airport_city = '', $departure_airport_country = '', $departure_airport_time = '',$arrival_airport_icao = '', $arrival_airport_name = '', $arrival_airport_city ='', $arrival_airport_country = '', $arrival_airport_time = '', $route_stop = '', $date = '',$latitude = '', $longitude = '', $waypoints = '', $altitude = '', $heading = '', $ground_speed = '', $squawk = '', $ModeS = '', $pilot_id = '', $pilot_name = '',$verticalrate = '',$format_source = '', $source_name = '', $over_country = '') { |
|
| 126 | + public function addSpotterArchiveData($flightaware_id = '', $ident = '', $registration = '', $airline_name = '', $airline_icao = '', $airline_country = '', $airline_type = '', $aircraft_icao = '', $aircraft_shadow = '', $aircraft_name = '', $aircraft_manufacturer = '', $departure_airport_icao = '', $departure_airport_name = '', $departure_airport_city = '', $departure_airport_country = '', $departure_airport_time = '', $arrival_airport_icao = '', $arrival_airport_name = '', $arrival_airport_city = '', $arrival_airport_country = '', $arrival_airport_time = '', $route_stop = '', $date = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $heading = '', $ground_speed = '', $squawk = '', $ModeS = '', $pilot_id = '', $pilot_name = '', $verticalrate = '', $format_source = '', $source_name = '', $over_country = '') { |
|
| 127 | 127 | require_once(dirname(__FILE__).'/class.Spotter.php'); |
| 128 | 128 | if ($over_country == '') { |
| 129 | 129 | $Spotter = new Spotter($this->db); |
| 130 | - $data_country = $Spotter->getCountryFromLatitudeLongitude($latitude,$longitude); |
|
| 130 | + $data_country = $Spotter->getCountryFromLatitudeLongitude($latitude, $longitude); |
|
| 131 | 131 | if (!empty($data_country)) $country = $data_country['iso2']; |
| 132 | 132 | else $country = ''; |
| 133 | 133 | } else $country = $over_country; |
| 134 | - if ($airline_type === NULL) $airline_type =''; |
|
| 134 | + if ($airline_type === NULL) $airline_type = ''; |
|
| 135 | 135 | |
| 136 | 136 | //if ($country == '') echo "\n".'************ UNKNOW COUNTRY ****************'."\n"; |
| 137 | 137 | //else echo "\n".'*/*/*/*/*/*/*/ Country : '.$country.' */*/*/*/*/*/*/*/*/'."\n"; |
| 138 | 138 | |
| 139 | 139 | // Route is not added in spotter_archive |
| 140 | - $query = "INSERT INTO spotter_archive (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, departure_airport_time,arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, arrival_airport_time, route_stop, date,latitude, longitude, waypoints, altitude, heading, ground_speed, squawk, ModeS, pilot_id, pilot_name, verticalrate,format_source,over_country,source_name) |
|
| 140 | + $query = "INSERT INTO spotter_archive (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, departure_airport_time,arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, arrival_airport_time, route_stop, date,latitude, longitude, waypoints, altitude, heading, ground_speed, squawk, ModeS, pilot_id, pilot_name, verticalrate,format_source,over_country,source_name) |
|
| 141 | 141 | VALUES (:flightaware_id, :ident, :registration, :airline_name, :airline_icao, :airline_country, :airline_type, :aircraft_icao, :aircraft_shadow, :aircraft_name, :aircraft_manufacturer, :departure_airport_icao, :departure_airport_name, :departure_airport_city, :departure_airport_country, :departure_airport_time,:arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :arrival_airport_time, :route_stop, :date,:latitude, :longitude, :waypoints, :altitude, :heading, :ground_speed, :squawk, :ModeS, :pilot_id, :pilot_name, :verticalrate, :format_source, :over_country, :source_name)"; |
| 142 | 142 | |
| 143 | - $query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_shadow' => $aircraft_shadow, ':aircraft_name' => $aircraft_name, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':arrival_airport_time' => $arrival_airport_time, ':route_stop' => $route_stop, ':date' => $date,':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':ground_speed' => $ground_speed, ':squawk' => $squawk, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':over_country' => $country, ':source_name' => $source_name); |
|
| 143 | + $query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_shadow' => $aircraft_shadow, ':aircraft_name' => $aircraft_name, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':arrival_airport_time' => $arrival_airport_time, ':route_stop' => $route_stop, ':date' => $date, ':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':ground_speed' => $ground_speed, ':squawk' => $squawk, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':over_country' => $country, ':source_name' => $source_name); |
|
| 144 | 144 | try { |
| 145 | 145 | $sth = $this->db->prepare($query); |
| 146 | 146 | $sth->execute($query_values); |
| 147 | - } catch(PDOException $e) { |
|
| 147 | + } catch (PDOException $e) { |
|
| 148 | 148 | return "error : ".$e->getMessage(); |
| 149 | 149 | } |
| 150 | 150 | return "success"; |
@@ -164,9 +164,9 @@ discard block |
||
| 164 | 164 | |
| 165 | 165 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 166 | 166 | //$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"; |
| 167 | - $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 167 | + $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 168 | 168 | |
| 169 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident)); |
|
| 169 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident)); |
|
| 170 | 170 | |
| 171 | 171 | return $spotter_array; |
| 172 | 172 | } |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 186 | 186 | //$query = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id"; |
| 187 | 187 | //$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"; |
| 188 | - $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 188 | + $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 189 | 189 | |
| 190 | 190 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 191 | 191 | /* |
@@ -198,7 +198,7 @@ discard block |
||
| 198 | 198 | } |
| 199 | 199 | $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC); |
| 200 | 200 | */ |
| 201 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id)); |
|
| 201 | + $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id)); |
|
| 202 | 202 | |
| 203 | 203 | return $spotter_array; |
| 204 | 204 | } |
@@ -213,14 +213,14 @@ discard block |
||
| 213 | 213 | { |
| 214 | 214 | date_default_timezone_set('UTC'); |
| 215 | 215 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 216 | - $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id"; |
|
| 216 | + $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id"; |
|
| 217 | 217 | |
| 218 | 218 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 219 | 219 | |
| 220 | 220 | try { |
| 221 | 221 | $sth = $this->db->prepare($query); |
| 222 | 222 | $sth->execute(array(':id' => $id)); |
| 223 | - } catch(PDOException $e) { |
|
| 223 | + } catch (PDOException $e) { |
|
| 224 | 224 | echo $e->getMessage(); |
| 225 | 225 | die; |
| 226 | 226 | } |
@@ -239,14 +239,14 @@ discard block |
||
| 239 | 239 | { |
| 240 | 240 | date_default_timezone_set('UTC'); |
| 241 | 241 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 242 | - $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id"; |
|
| 242 | + $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id"; |
|
| 243 | 243 | |
| 244 | 244 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 245 | 245 | |
| 246 | 246 | try { |
| 247 | 247 | $sth = $this->db->prepare($query); |
| 248 | 248 | $sth->execute(array(':id' => $id)); |
| 249 | - } catch(PDOException $e) { |
|
| 249 | + } catch (PDOException $e) { |
|
| 250 | 250 | echo $e->getMessage(); |
| 251 | 251 | die; |
| 252 | 252 | } |
@@ -268,12 +268,12 @@ discard block |
||
| 268 | 268 | date_default_timezone_set('UTC'); |
| 269 | 269 | |
| 270 | 270 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 271 | - $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"; |
|
| 271 | + $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 | 272 | |
| 273 | 273 | try { |
| 274 | 274 | $sth = $this->db->prepare($query); |
| 275 | 275 | $sth->execute(array(':ident' => $ident)); |
| 276 | - } catch(PDOException $e) { |
|
| 276 | + } catch (PDOException $e) { |
|
| 277 | 277 | echo $e->getMessage(); |
| 278 | 278 | die; |
| 279 | 279 | } |
@@ -294,12 +294,12 @@ discard block |
||
| 294 | 294 | date_default_timezone_set('UTC'); |
| 295 | 295 | |
| 296 | 296 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 297 | - $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"; |
|
| 297 | + $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 | 298 | |
| 299 | 299 | try { |
| 300 | 300 | $sth = $this->db->prepare($query); |
| 301 | 301 | $sth->execute(array(':id' => $id)); |
| 302 | - } catch(PDOException $e) { |
|
| 302 | + } catch (PDOException $e) { |
|
| 303 | 303 | echo $e->getMessage(); |
| 304 | 304 | die; |
| 305 | 305 | } |
@@ -320,12 +320,12 @@ discard block |
||
| 320 | 320 | date_default_timezone_set('UTC'); |
| 321 | 321 | |
| 322 | 322 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 323 | - $query = "SELECT spotter_archive.altitude, spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 323 | + $query = "SELECT spotter_archive.altitude, spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 324 | 324 | |
| 325 | 325 | try { |
| 326 | 326 | $sth = $this->db->prepare($query); |
| 327 | 327 | $sth->execute(array(':id' => $id)); |
| 328 | - } catch(PDOException $e) { |
|
| 328 | + } catch (PDOException $e) { |
|
| 329 | 329 | echo $e->getMessage(); |
| 330 | 330 | die; |
| 331 | 331 | } |
@@ -347,13 +347,13 @@ discard block |
||
| 347 | 347 | date_default_timezone_set('UTC'); |
| 348 | 348 | |
| 349 | 349 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 350 | - $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"; |
|
| 350 | + $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 | 351 | // $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident"; |
| 352 | 352 | |
| 353 | 353 | try { |
| 354 | 354 | $sth = $this->db->prepare($query); |
| 355 | 355 | $sth->execute(array(':ident' => $ident)); |
| 356 | - } catch(PDOException $e) { |
|
| 356 | + } catch (PDOException $e) { |
|
| 357 | 357 | echo $e->getMessage(); |
| 358 | 358 | die; |
| 359 | 359 | } |
@@ -370,13 +370,13 @@ discard block |
||
| 370 | 370 | * @return Array the spotter information |
| 371 | 371 | * |
| 372 | 372 | */ |
| 373 | - public function getSpotterArchiveData($ident,$flightaware_id,$date) |
|
| 373 | + public function getSpotterArchiveData($ident, $flightaware_id, $date) |
|
| 374 | 374 | { |
| 375 | 375 | $Spotter = new Spotter($this->db); |
| 376 | 376 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 377 | - $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"; |
|
| 377 | + $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate"; |
|
| 378 | 378 | |
| 379 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':flightaware_id' => $flightaware_id,':date' => $date.'%')); |
|
| 379 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':flightaware_id' => $flightaware_id, ':date' => $date.'%')); |
|
| 380 | 380 | |
| 381 | 381 | return $spotter_array; |
| 382 | 382 | } |
@@ -389,7 +389,7 @@ discard block |
||
| 389 | 389 | try { |
| 390 | 390 | $sth = $this->db->prepare($query); |
| 391 | 391 | $sth->execute(); |
| 392 | - } catch(PDOException $e) { |
|
| 392 | + } catch (PDOException $e) { |
|
| 393 | 393 | echo $e->getMessage(); |
| 394 | 394 | die; |
| 395 | 395 | } |
@@ -401,24 +401,24 @@ discard block |
||
| 401 | 401 | * @return Array the spotter information |
| 402 | 402 | * |
| 403 | 403 | */ |
| 404 | - public function getMinLiveSpotterData($begindate,$enddate,$filter = array()) |
|
| 404 | + public function getMinLiveSpotterData($begindate, $enddate, $filter = array()) |
|
| 405 | 405 | { |
| 406 | 406 | global $globalDBdriver, $globalLiveInterval; |
| 407 | 407 | date_default_timezone_set('UTC'); |
| 408 | 408 | |
| 409 | 409 | $filter_query = ''; |
| 410 | 410 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 411 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 411 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 412 | 412 | } |
| 413 | 413 | // Use spotter_output also ? |
| 414 | 414 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 415 | - $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 "; |
|
| 415 | + $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 "; |
|
| 416 | 416 | } |
| 417 | 417 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 418 | 418 | $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 "; |
| 419 | 419 | } |
| 420 | 420 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 421 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 421 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 422 | 422 | } |
| 423 | 423 | |
| 424 | 424 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -437,14 +437,14 @@ discard block |
||
| 437 | 437 | GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id |
| 438 | 438 | AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao'; |
| 439 | 439 | */ |
| 440 | - $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 |
|
| 440 | + $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 |
|
| 441 | 441 | FROM spotter_archive |
| 442 | 442 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao |
| 443 | 443 | WHERE spotter_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' |
| 444 | 444 | '.$filter_query.' ORDER BY flightaware_id'; |
| 445 | 445 | } else { |
| 446 | 446 | //$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'; |
| 447 | - $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 |
|
| 447 | + $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 |
|
| 448 | 448 | FROM spotter_archive |
| 449 | 449 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao |
| 450 | 450 | WHERE spotter_archive.date >= '."'".$begindate."'".' AND spotter_archive.date <= '."'".$enddate."'".' |
@@ -454,7 +454,7 @@ discard block |
||
| 454 | 454 | try { |
| 455 | 455 | $sth = $this->db->prepare($query); |
| 456 | 456 | $sth->execute(); |
| 457 | - } catch(PDOException $e) { |
|
| 457 | + } catch (PDOException $e) { |
|
| 458 | 458 | echo $e->getMessage(); |
| 459 | 459 | die; |
| 460 | 460 | } |
@@ -469,24 +469,24 @@ discard block |
||
| 469 | 469 | * @return Array the spotter information |
| 470 | 470 | * |
| 471 | 471 | */ |
| 472 | - public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array()) |
|
| 472 | + public function getMinLiveSpotterDataPlayback($begindate, $enddate, $filter = array()) |
|
| 473 | 473 | { |
| 474 | 474 | global $globalDBdriver, $globalLiveInterval; |
| 475 | 475 | date_default_timezone_set('UTC'); |
| 476 | 476 | |
| 477 | 477 | $filter_query = ''; |
| 478 | 478 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 479 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 479 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 480 | 480 | } |
| 481 | 481 | // Should use spotter_output also ? |
| 482 | 482 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 483 | - $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 "; |
|
| 483 | + $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 "; |
|
| 484 | 484 | } |
| 485 | 485 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 486 | 486 | $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 "; |
| 487 | 487 | } |
| 488 | 488 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 489 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 489 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 490 | 490 | } |
| 491 | 491 | |
| 492 | 492 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -496,7 +496,7 @@ discard block |
||
| 496 | 496 | FROM spotter_archive |
| 497 | 497 | 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'; |
| 498 | 498 | */ |
| 499 | - $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 |
|
| 499 | + $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 |
|
| 500 | 500 | FROM spotter_archive_output |
| 501 | 501 | LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive_output.aircraft_icao = a.icao |
| 502 | 502 | WHERE (spotter_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') |
@@ -511,7 +511,7 @@ discard block |
||
| 511 | 511 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
| 512 | 512 | '.$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'; |
| 513 | 513 | */ |
| 514 | - $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 |
|
| 514 | + $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 |
|
| 515 | 515 | FROM spotter_archive_output |
| 516 | 516 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao |
| 517 | 517 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
@@ -523,7 +523,7 @@ discard block |
||
| 523 | 523 | try { |
| 524 | 524 | $sth = $this->db->prepare($query); |
| 525 | 525 | $sth->execute(); |
| 526 | - } catch(PDOException $e) { |
|
| 526 | + } catch (PDOException $e) { |
|
| 527 | 527 | echo $e->getMessage(); |
| 528 | 528 | die; |
| 529 | 529 | } |
@@ -538,23 +538,23 @@ discard block |
||
| 538 | 538 | * @return Array the spotter information |
| 539 | 539 | * |
| 540 | 540 | */ |
| 541 | - public function getLiveSpotterCount($begindate,$enddate,$filter = array()) |
|
| 541 | + public function getLiveSpotterCount($begindate, $enddate, $filter = array()) |
|
| 542 | 542 | { |
| 543 | 543 | global $globalDBdriver, $globalLiveInterval; |
| 544 | 544 | date_default_timezone_set('UTC'); |
| 545 | 545 | |
| 546 | 546 | $filter_query = ''; |
| 547 | 547 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 548 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 548 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 549 | 549 | } |
| 550 | 550 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 551 | - $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 "; |
|
| 551 | + $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 "; |
|
| 552 | 552 | } |
| 553 | 553 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 554 | 554 | $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 "; |
| 555 | 555 | } |
| 556 | 556 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 557 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 557 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 558 | 558 | } |
| 559 | 559 | |
| 560 | 560 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -569,7 +569,7 @@ discard block |
||
| 569 | 569 | try { |
| 570 | 570 | $sth = $this->db->prepare($query); |
| 571 | 571 | $sth->execute(); |
| 572 | - } catch(PDOException $e) { |
|
| 572 | + } catch (PDOException $e) { |
|
| 573 | 573 | echo $e->getMessage(); |
| 574 | 574 | die; |
| 575 | 575 | } |
@@ -589,7 +589,7 @@ discard block |
||
| 589 | 589 | * @return Array the spotter information |
| 590 | 590 | * |
| 591 | 591 | */ |
| 592 | - 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()) |
|
| 592 | + 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()) |
|
| 593 | 593 | { |
| 594 | 594 | global $globalTimezone, $globalDBdriver; |
| 595 | 595 | require_once(dirname(__FILE__).'/class.Translation.php'); |
@@ -611,7 +611,7 @@ discard block |
||
| 611 | 611 | |
| 612 | 612 | $q_array = explode(" ", $q); |
| 613 | 613 | |
| 614 | - foreach ($q_array as $q_item){ |
|
| 614 | + foreach ($q_array as $q_item) { |
|
| 615 | 615 | $additional_query .= " AND ("; |
| 616 | 616 | $additional_query .= "(spotter_archive_output.spotter_id like '%".$q_item."%') OR "; |
| 617 | 617 | $additional_query .= "(spotter_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
@@ -643,7 +643,7 @@ discard block |
||
| 643 | 643 | |
| 644 | 644 | if ($registration != "") |
| 645 | 645 | { |
| 646 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 646 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 647 | 647 | if (!is_string($registration)) |
| 648 | 648 | { |
| 649 | 649 | return false; |
@@ -654,7 +654,7 @@ discard block |
||
| 654 | 654 | |
| 655 | 655 | if ($aircraft_icao != "") |
| 656 | 656 | { |
| 657 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 657 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 658 | 658 | if (!is_string($aircraft_icao)) |
| 659 | 659 | { |
| 660 | 660 | return false; |
@@ -665,7 +665,7 @@ discard block |
||
| 665 | 665 | |
| 666 | 666 | if ($aircraft_manufacturer != "") |
| 667 | 667 | { |
| 668 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 668 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 669 | 669 | if (!is_string($aircraft_manufacturer)) |
| 670 | 670 | { |
| 671 | 671 | return false; |
@@ -686,7 +686,7 @@ discard block |
||
| 686 | 686 | |
| 687 | 687 | if ($airline_icao != "") |
| 688 | 688 | { |
| 689 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 689 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 690 | 690 | if (!is_string($airline_icao)) |
| 691 | 691 | { |
| 692 | 692 | return false; |
@@ -697,7 +697,7 @@ discard block |
||
| 697 | 697 | |
| 698 | 698 | if ($airline_country != "") |
| 699 | 699 | { |
| 700 | - $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 700 | + $airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING); |
|
| 701 | 701 | if (!is_string($airline_country)) |
| 702 | 702 | { |
| 703 | 703 | return false; |
@@ -708,7 +708,7 @@ discard block |
||
| 708 | 708 | |
| 709 | 709 | if ($airline_type != "") |
| 710 | 710 | { |
| 711 | - $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 711 | + $airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING); |
|
| 712 | 712 | if (!is_string($airline_type)) |
| 713 | 713 | { |
| 714 | 714 | return false; |
@@ -730,7 +730,7 @@ discard block |
||
| 730 | 730 | |
| 731 | 731 | if ($airport != "") |
| 732 | 732 | { |
| 733 | - $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 733 | + $airport = filter_var($airport, FILTER_SANITIZE_STRING); |
|
| 734 | 734 | if (!is_string($airport)) |
| 735 | 735 | { |
| 736 | 736 | return false; |
@@ -741,7 +741,7 @@ discard block |
||
| 741 | 741 | |
| 742 | 742 | if ($airport_country != "") |
| 743 | 743 | { |
| 744 | - $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 744 | + $airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING); |
|
| 745 | 745 | if (!is_string($airport_country)) |
| 746 | 746 | { |
| 747 | 747 | return false; |
@@ -752,7 +752,7 @@ discard block |
||
| 752 | 752 | |
| 753 | 753 | if ($callsign != "") |
| 754 | 754 | { |
| 755 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 755 | + $callsign = filter_var($callsign, FILTER_SANITIZE_STRING); |
|
| 756 | 756 | if (!is_string($callsign)) |
| 757 | 757 | { |
| 758 | 758 | return false; |
@@ -760,7 +760,7 @@ discard block |
||
| 760 | 760 | $translate = $Translation->ident2icao($callsign); |
| 761 | 761 | if ($translate != $callsign) { |
| 762 | 762 | $additional_query .= " AND (spotter_archive_output.ident = :callsign OR spotter_archive_output.ident = :translate)"; |
| 763 | - $query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate)); |
|
| 763 | + $query_values = array_merge($query_values, array(':callsign' => $callsign, ':translate' => $translate)); |
|
| 764 | 764 | } else { |
| 765 | 765 | $additional_query .= " AND (spotter_archive_output.ident = '".$callsign."')"; |
| 766 | 766 | } |
@@ -769,7 +769,7 @@ discard block |
||
| 769 | 769 | |
| 770 | 770 | if ($owner != "") |
| 771 | 771 | { |
| 772 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 772 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 773 | 773 | if (!is_string($owner)) |
| 774 | 774 | { |
| 775 | 775 | return false; |
@@ -780,7 +780,7 @@ discard block |
||
| 780 | 780 | |
| 781 | 781 | if ($pilot_name != "") |
| 782 | 782 | { |
| 783 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 783 | + $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING); |
|
| 784 | 784 | if (!is_string($pilot_name)) |
| 785 | 785 | { |
| 786 | 786 | return false; |
@@ -791,7 +791,7 @@ discard block |
||
| 791 | 791 | |
| 792 | 792 | if ($pilot_id != "") |
| 793 | 793 | { |
| 794 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 794 | + $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT); |
|
| 795 | 795 | if (!is_string($pilot_id)) |
| 796 | 796 | { |
| 797 | 797 | return false; |
@@ -802,7 +802,7 @@ discard block |
||
| 802 | 802 | |
| 803 | 803 | if ($departure_airport_route != "") |
| 804 | 804 | { |
| 805 | - $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 805 | + $departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING); |
|
| 806 | 806 | if (!is_string($departure_airport_route)) |
| 807 | 807 | { |
| 808 | 808 | return false; |
@@ -813,7 +813,7 @@ discard block |
||
| 813 | 813 | |
| 814 | 814 | if ($arrival_airport_route != "") |
| 815 | 815 | { |
| 816 | - $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 816 | + $arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING); |
|
| 817 | 817 | if (!is_string($arrival_airport_route)) |
| 818 | 818 | { |
| 819 | 819 | return false; |
@@ -826,8 +826,8 @@ discard block |
||
| 826 | 826 | { |
| 827 | 827 | $altitude_array = explode(",", $altitude); |
| 828 | 828 | |
| 829 | - $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 830 | - $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 829 | + $altitude_array[0] = filter_var($altitude_array[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 830 | + $altitude_array[1] = filter_var($altitude_array[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 831 | 831 | |
| 832 | 832 | |
| 833 | 833 | if ($altitude_array[1] != "") |
@@ -845,8 +845,8 @@ discard block |
||
| 845 | 845 | { |
| 846 | 846 | $date_array = explode(",", $date_posted); |
| 847 | 847 | |
| 848 | - $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 849 | - $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 848 | + $date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING); |
|
| 849 | + $date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING); |
|
| 850 | 850 | |
| 851 | 851 | if ($globalTimezone != '') { |
| 852 | 852 | date_default_timezone_set($globalTimezone); |
@@ -878,8 +878,8 @@ discard block |
||
| 878 | 878 | { |
| 879 | 879 | $limit_array = explode(",", $limit); |
| 880 | 880 | |
| 881 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 882 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 881 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 882 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 883 | 883 | |
| 884 | 884 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 885 | 885 | { |
@@ -890,8 +890,8 @@ discard block |
||
| 890 | 890 | |
| 891 | 891 | |
| 892 | 892 | if ($origLat != "" && $origLon != "" && $dist != "") { |
| 893 | - $dist = number_format($dist*0.621371,2,'.',''); |
|
| 894 | - $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 |
|
| 893 | + $dist = number_format($dist*0.621371, 2, '.', ''); |
|
| 894 | + $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 |
|
| 895 | 895 | 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)) |
| 896 | 896 | 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"; |
| 897 | 897 | } else { |
@@ -908,12 +908,12 @@ discard block |
||
| 908 | 908 | $additional_query .= " AND (spotter_archive_output.waypoints <> '')"; |
| 909 | 909 | } |
| 910 | 910 | |
| 911 | - $query = "SELECT spotter_archive_output.* FROM spotter_archive_output |
|
| 911 | + $query = "SELECT spotter_archive_output.* FROM spotter_archive_output |
|
| 912 | 912 | WHERE spotter_archive_output.ident <> '' |
| 913 | 913 | ".$additional_query." |
| 914 | 914 | ".$filter_query.$orderby_query; |
| 915 | 915 | } |
| 916 | - $spotter_array = $Spotter->getDataFromDB($query, $query_values,$limit_query); |
|
| 916 | + $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
|
| 917 | 917 | |
| 918 | 918 | return $spotter_array; |
| 919 | 919 | } |
@@ -930,7 +930,7 @@ discard block |
||
| 930 | 930 | try { |
| 931 | 931 | $sth = $this->db->prepare($query); |
| 932 | 932 | $sth->execute(); |
| 933 | - } catch(PDOException $e) { |
|
| 933 | + } catch (PDOException $e) { |
|
| 934 | 934 | return "error"; |
| 935 | 935 | } |
| 936 | 936 | } |
@@ -967,8 +967,8 @@ discard block |
||
| 967 | 967 | { |
| 968 | 968 | $limit_array = explode(",", $limit); |
| 969 | 969 | |
| 970 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 971 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 970 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 971 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 972 | 972 | |
| 973 | 973 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 974 | 974 | { |
@@ -1009,7 +1009,7 @@ discard block |
||
| 1009 | 1009 | $query_values = array(); |
| 1010 | 1010 | $limit_query = ''; |
| 1011 | 1011 | $additional_query = ''; |
| 1012 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 1012 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 1013 | 1013 | |
| 1014 | 1014 | if ($owner != "") |
| 1015 | 1015 | { |
@@ -1026,8 +1026,8 @@ discard block |
||
| 1026 | 1026 | { |
| 1027 | 1027 | $limit_array = explode(",", $limit); |
| 1028 | 1028 | |
| 1029 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1030 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1029 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1030 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1031 | 1031 | |
| 1032 | 1032 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1033 | 1033 | { |
@@ -1067,7 +1067,7 @@ discard block |
||
| 1067 | 1067 | $query_values = array(); |
| 1068 | 1068 | $limit_query = ''; |
| 1069 | 1069 | $additional_query = ''; |
| 1070 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 1070 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 1071 | 1071 | |
| 1072 | 1072 | if ($pilot != "") |
| 1073 | 1073 | { |
@@ -1079,8 +1079,8 @@ discard block |
||
| 1079 | 1079 | { |
| 1080 | 1080 | $limit_array = explode(",", $limit); |
| 1081 | 1081 | |
| 1082 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1083 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1082 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1083 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1084 | 1084 | |
| 1085 | 1085 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1086 | 1086 | { |
@@ -1110,7 +1110,7 @@ discard block |
||
| 1110 | 1110 | * @return Array the airline country list |
| 1111 | 1111 | * |
| 1112 | 1112 | */ |
| 1113 | - public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1113 | + public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '') |
|
| 1114 | 1114 | { |
| 1115 | 1115 | global $globalDBdriver; |
| 1116 | 1116 | /* |
@@ -1139,7 +1139,7 @@ discard block |
||
| 1139 | 1139 | $flight_array = array(); |
| 1140 | 1140 | $temp_array = array(); |
| 1141 | 1141 | |
| 1142 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1142 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1143 | 1143 | { |
| 1144 | 1144 | $temp_array['flight_count'] = $row['nb']; |
| 1145 | 1145 | $temp_array['flight_country'] = $row['name']; |
@@ -1156,7 +1156,7 @@ discard block |
||
| 1156 | 1156 | * @return Array the airline country list |
| 1157 | 1157 | * |
| 1158 | 1158 | */ |
| 1159 | - public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1159 | + public function countAllFlightOverCountriesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '') |
|
| 1160 | 1160 | { |
| 1161 | 1161 | global $globalDBdriver; |
| 1162 | 1162 | /* |
@@ -1185,7 +1185,7 @@ discard block |
||
| 1185 | 1185 | $flight_array = array(); |
| 1186 | 1186 | $temp_array = array(); |
| 1187 | 1187 | |
| 1188 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1188 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1189 | 1189 | { |
| 1190 | 1190 | $temp_array['airline_icao'] = $row['airline_icao']; |
| 1191 | 1191 | $temp_array['flight_count'] = $row['nb']; |
@@ -1203,14 +1203,14 @@ discard block |
||
| 1203 | 1203 | * @return Array the spotter information |
| 1204 | 1204 | * |
| 1205 | 1205 | */ |
| 1206 | - public function getDateArchiveSpotterDataById($id,$date) |
|
| 1206 | + public function getDateArchiveSpotterDataById($id, $date) |
|
| 1207 | 1207 | { |
| 1208 | 1208 | $Spotter = new Spotter($this->db); |
| 1209 | 1209 | date_default_timezone_set('UTC'); |
| 1210 | 1210 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 1211 | - $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'; |
|
| 1212 | - $date = date('c',$date); |
|
| 1213 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date)); |
|
| 1211 | + $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'; |
|
| 1212 | + $date = date('c', $date); |
|
| 1213 | + $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id, ':date' => $date)); |
|
| 1214 | 1214 | return $spotter_array; |
| 1215 | 1215 | } |
| 1216 | 1216 | |
@@ -1220,14 +1220,14 @@ discard block |
||
| 1220 | 1220 | * @return Array the spotter information |
| 1221 | 1221 | * |
| 1222 | 1222 | */ |
| 1223 | - public function getDateArchiveSpotterDataByIdent($ident,$date) |
|
| 1223 | + public function getDateArchiveSpotterDataByIdent($ident, $date) |
|
| 1224 | 1224 | { |
| 1225 | 1225 | $Spotter = new Spotter($this->db); |
| 1226 | 1226 | date_default_timezone_set('UTC'); |
| 1227 | 1227 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 1228 | - $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'; |
|
| 1229 | - $date = date('c',$date); |
|
| 1230 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
|
| 1228 | + $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'; |
|
| 1229 | + $date = date('c', $date); |
|
| 1230 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':date' => $date)); |
|
| 1231 | 1231 | return $spotter_array; |
| 1232 | 1232 | } |
| 1233 | 1233 | |
@@ -1237,7 +1237,7 @@ discard block |
||
| 1237 | 1237 | * @return Array the spotter information |
| 1238 | 1238 | * |
| 1239 | 1239 | */ |
| 1240 | - public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1240 | + public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '', $filters = array()) |
|
| 1241 | 1241 | { |
| 1242 | 1242 | global $global_query; |
| 1243 | 1243 | $Spotter = new Spotter(); |
@@ -1245,7 +1245,7 @@ discard block |
||
| 1245 | 1245 | $query_values = array(); |
| 1246 | 1246 | $limit_query = ''; |
| 1247 | 1247 | $additional_query = ''; |
| 1248 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1248 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1249 | 1249 | |
| 1250 | 1250 | if ($airport != "") |
| 1251 | 1251 | { |
@@ -1262,8 +1262,8 @@ discard block |
||
| 1262 | 1262 | { |
| 1263 | 1263 | $limit_array = explode(",", $limit); |
| 1264 | 1264 | |
| 1265 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1266 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1265 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1266 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1267 | 1267 | |
| 1268 | 1268 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1269 | 1269 | { |
@@ -6,14 +6,14 @@ discard block |
||
| 6 | 6 | //require_once('require/class.SpotterLive.php'); |
| 7 | 7 | require_once('require/class.SpotterArchive.php'); |
| 8 | 8 | |
| 9 | -if (!isset($_GET['pilot'])){ |
|
| 9 | +if (!isset($_GET['pilot'])) { |
|
| 10 | 10 | header('Location: '.$globalURL.'/'); |
| 11 | 11 | } else { |
| 12 | 12 | $Spotter = new Spotter(); |
| 13 | 13 | $SpotterArchive = new SpotterArchive(); |
| 14 | 14 | $Translation = new Translation(); |
| 15 | 15 | //calculuation for the pagination |
| 16 | - if(!isset($_GET['limit'])) |
|
| 16 | + if (!isset($_GET['limit'])) |
|
| 17 | 17 | { |
| 18 | 18 | $limit_start = 0; |
| 19 | 19 | $limit_end = 25; |
@@ -34,29 +34,29 @@ discard block |
||
| 34 | 34 | |
| 35 | 35 | $page_url = $globalURL.'/pilot/'.$_GET['pilot']; |
| 36 | 36 | |
| 37 | - $pilot = filter_input(INPUT_GET,'pilot',FILTER_SANITIZE_STRING); |
|
| 38 | - $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
|
| 39 | - $year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT); |
|
| 40 | - $month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT); |
|
| 37 | + $pilot = filter_input(INPUT_GET, 'pilot', FILTER_SANITIZE_STRING); |
|
| 38 | + $sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING); |
|
| 39 | + $year = filter_input(INPUT_GET, 'year', FILTER_SANITIZE_NUMBER_INT); |
|
| 40 | + $month = filter_input(INPUT_GET, 'month', FILTER_SANITIZE_NUMBER_INT); |
|
| 41 | 41 | $filter = array(); |
| 42 | - if ($year != '') $filter = array_merge($filter,array('year' => $year)); |
|
| 43 | - if ($month != '') $filter = array_merge($filter,array('month' => $month)); |
|
| 42 | + if ($year != '') $filter = array_merge($filter, array('year' => $year)); |
|
| 43 | + if ($month != '') $filter = array_merge($filter, array('month' => $month)); |
|
| 44 | 44 | if ($sort != '') |
| 45 | 45 | { |
| 46 | - $spotter_array = $Spotter->getSpotterDataByPilot($pilot,$limit_start.",".$absolute_difference, $sort,$filter); |
|
| 46 | + $spotter_array = $Spotter->getSpotterDataByPilot($pilot, $limit_start.",".$absolute_difference, $sort, $filter); |
|
| 47 | 47 | if (empty($spotter_array)) { |
| 48 | - $spotter_array = $SpotterArchive->getSpotterDataByPilot($pilot,$limit_start.",".$absolute_difference, $sort,$filter); |
|
| 48 | + $spotter_array = $SpotterArchive->getSpotterDataByPilot($pilot, $limit_start.",".$absolute_difference, $sort, $filter); |
|
| 49 | 49 | } |
| 50 | 50 | } else { |
| 51 | - $spotter_array = $Spotter->getSpotterDataByPilot($pilot,$limit_start.",".$absolute_difference,'',$filter); |
|
| 51 | + $spotter_array = $Spotter->getSpotterDataByPilot($pilot, $limit_start.",".$absolute_difference, '', $filter); |
|
| 52 | 52 | if (empty($spotter_array)) { |
| 53 | - $spotter_array = $SpotterArchive->getSpotterDataByPilot($pilot,$limit_start.",".$absolute_difference,'',$filter); |
|
| 53 | + $spotter_array = $SpotterArchive->getSpotterDataByPilot($pilot, $limit_start.",".$absolute_difference, '', $filter); |
|
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | if (!empty($spotter_array)) |
| 58 | 58 | { |
| 59 | - $title = sprintf(_("Detailed View for %s"),$spotter_array[0]['pilot_name']); |
|
| 59 | + $title = sprintf(_("Detailed View for %s"), $spotter_array[0]['pilot_name']); |
|
| 60 | 60 | $ident = $spotter_array[0]['ident']; |
| 61 | 61 | if (isset($spotter_array[0]['latitude'])) $latitude = $spotter_array[0]['latitude']; |
| 62 | 62 | if (isset($spotter_array[0]['longitude'])) $longitude = $spotter_array[0]['longitude']; |
@@ -117,23 +117,23 @@ discard block |
||
| 117 | 117 | $Stats = new Stats(); |
| 118 | 118 | $flights = $Stats->getStatsPilot($pilot); |
| 119 | 119 | } else $flights = 0; |
| 120 | - if ($flight == 0) $flights = $Spotter->countFlightsByPilot($pilot,$filter); |
|
| 120 | + if ($flight == 0) $flights = $Spotter->countFlightsByPilot($pilot, $filter); |
|
| 121 | 121 | print '<div><span class="label">'._("Flights").'</span>'.$flights.'</div>'; |
| 122 | - $aircraft_type = count($Spotter->countAllAircraftTypesByPilot($pilot,$filter)); |
|
| 122 | + $aircraft_type = count($Spotter->countAllAircraftTypesByPilot($pilot, $filter)); |
|
| 123 | 123 | print '<div><span class="label">'._("Aircrafts type").'</span>'.$aircraft_type.'</div>'; |
| 124 | - $aircraft_registration = count($Spotter->countAllAircraftRegistrationByPilot($pilot,$filter)); |
|
| 124 | + $aircraft_registration = count($Spotter->countAllAircraftRegistrationByPilot($pilot, $filter)); |
|
| 125 | 125 | print '<div><span class="label">'._("Aircrafts").'</span>'.$aircraft_registration.'</div>'; |
| 126 | - $aircraft_manufacturer = count($Spotter->countAllAircraftManufacturerByPilot($pilot,$filter)); |
|
| 126 | + $aircraft_manufacturer = count($Spotter->countAllAircraftManufacturerByPilot($pilot, $filter)); |
|
| 127 | 127 | print '<div><span class="label">'._("Manufacturers").'</span>'.$aircraft_manufacturer.'</div>'; |
| 128 | - $airlines = count($Spotter->countAllAirlinesByPilot($pilot,$filter)); |
|
| 128 | + $airlines = count($Spotter->countAllAirlinesByPilot($pilot, $filter)); |
|
| 129 | 129 | print '<div><span class="label">'._("Airlines").'</span>'.$airlines.'</div>'; |
| 130 | - $duration = $Spotter->getFlightDurationByPilot($pilot,$filter); |
|
| 130 | + $duration = $Spotter->getFlightDurationByPilot($pilot, $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 pilot <strong>%s</strong>."),$spotter_array[0]['pilot_name']).'</p>'; |
|
| 136 | + print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the pilot <strong>%s</strong>."), $spotter_array[0]['pilot_name']).'</p>'; |
|
| 137 | 137 | |
| 138 | 138 | include('table-output.php'); |
| 139 | 139 | print '<div class="pagination">'; |
@@ -39,8 +39,12 @@ discard block |
||
| 39 | 39 | $year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT); |
| 40 | 40 | $month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT); |
| 41 | 41 | $filter = array(); |
| 42 | - if ($year != '') $filter = array_merge($filter,array('year' => $year)); |
|
| 43 | - if ($month != '') $filter = array_merge($filter,array('month' => $month)); |
|
| 42 | + if ($year != '') { |
|
| 43 | + $filter = array_merge($filter,array('year' => $year)); |
|
| 44 | + } |
|
| 45 | + if ($month != '') { |
|
| 46 | + $filter = array_merge($filter,array('month' => $month)); |
|
| 47 | + } |
|
| 44 | 48 | if ($sort != '') |
| 45 | 49 | { |
| 46 | 50 | $spotter_array = $Spotter->getSpotterDataByPilot($pilot,$limit_start.",".$absolute_difference, $sort,$filter); |
@@ -58,8 +62,12 @@ discard block |
||
| 58 | 62 | { |
| 59 | 63 | $title = sprintf(_("Detailed View for %s"),$spotter_array[0]['pilot_name']); |
| 60 | 64 | $ident = $spotter_array[0]['ident']; |
| 61 | - if (isset($spotter_array[0]['latitude'])) $latitude = $spotter_array[0]['latitude']; |
|
| 62 | - if (isset($spotter_array[0]['longitude'])) $longitude = $spotter_array[0]['longitude']; |
|
| 65 | + if (isset($spotter_array[0]['latitude'])) { |
|
| 66 | + $latitude = $spotter_array[0]['latitude']; |
|
| 67 | + } |
|
| 68 | + if (isset($spotter_array[0]['longitude'])) { |
|
| 69 | + $longitude = $spotter_array[0]['longitude']; |
|
| 70 | + } |
|
| 63 | 71 | require_once('header.php'); |
| 64 | 72 | /* |
| 65 | 73 | if (isset($globalArchive) && $globalArchive) { |
@@ -112,12 +120,18 @@ discard block |
||
| 112 | 120 | */ |
| 113 | 121 | print '<div class="info column">'; |
| 114 | 122 | print '<h1>'.$spotter_array[0]['pilot_name'].'</h1>'; |
| 115 | - if (isset($spotter_array[0]['pilot_id']) && $spotter_array[0]['pilot_id'] != '') print '<div><span class="label">'._("Pilot ID").'</span>'.$spotter_array[0]['pilot_id'].'</div>'; |
|
| 123 | + if (isset($spotter_array[0]['pilot_id']) && $spotter_array[0]['pilot_id'] != '') { |
|
| 124 | + print '<div><span class="label">'._("Pilot ID").'</span>'.$spotter_array[0]['pilot_id'].'</div>'; |
|
| 125 | + } |
|
| 116 | 126 | if ($year == '' && $month == '') { |
| 117 | 127 | $Stats = new Stats(); |
| 118 | 128 | $flights = $Stats->getStatsPilot($pilot); |
| 119 | - } else $flights = 0; |
|
| 120 | - if ($flight == 0) $flights = $Spotter->countFlightsByPilot($pilot,$filter); |
|
| 129 | + } else { |
|
| 130 | + $flights = 0; |
|
| 131 | + } |
|
| 132 | + if ($flight == 0) { |
|
| 133 | + $flights = $Spotter->countFlightsByPilot($pilot,$filter); |
|
| 134 | + } |
|
| 121 | 135 | print '<div><span class="label">'._("Flights").'</span>'.$flights.'</div>'; |
| 122 | 136 | $aircraft_type = count($Spotter->countAllAircraftTypesByPilot($pilot,$filter)); |
| 123 | 137 | print '<div><span class="label">'._("Aircrafts type").'</span>'.$aircraft_type.'</div>'; |
@@ -128,7 +142,9 @@ discard block |
||
| 128 | 142 | $airlines = count($Spotter->countAllAirlinesByPilot($pilot,$filter)); |
| 129 | 143 | print '<div><span class="label">'._("Airlines").'</span>'.$airlines.'</div>'; |
| 130 | 144 | $duration = $Spotter->getFlightDurationByPilot($pilot,$filter); |
| 131 | - if ($duration != '0') print '<div><span class="label">'._("Total flights spotted duration").'</span>'.$duration.'</div>'; |
|
| 145 | + if ($duration != '0') { |
|
| 146 | + print '<div><span class="label">'._("Total flights spotted duration").'</span>'.$duration.'</div>'; |
|
| 147 | + } |
|
| 132 | 148 | print '</div>'; |
| 133 | 149 | |
| 134 | 150 | include('owner-sub-menu.php'); |
@@ -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'); |
