Ysurac /
FlightAirMap
@@ -5,23 +5,23 @@ discard block |
||
| 5 | 5 | $marine = false; |
| 6 | 6 | $usecoord = false; |
| 7 | 7 | if (isset($_GET['tracker'])) { |
| 8 | - $tracker = true; |
|
| 8 | + $tracker = true; |
|
| 9 | 9 | } |
| 10 | 10 | if (isset($_GET['marine'])) { |
| 11 | - $marine = true; |
|
| 11 | + $marine = true; |
|
| 12 | 12 | } |
| 13 | 13 | if ($tracker) { |
| 14 | - require_once('require/class.Tracker.php'); |
|
| 15 | - require_once('require/class.TrackerLive.php'); |
|
| 16 | - //require_once('require/class.TrackerArchive.php'); |
|
| 14 | + require_once('require/class.Tracker.php'); |
|
| 15 | + require_once('require/class.TrackerLive.php'); |
|
| 16 | + //require_once('require/class.TrackerArchive.php'); |
|
| 17 | 17 | } elseif ($marine) { |
| 18 | - require_once('require/class.Marine.php'); |
|
| 19 | - require_once('require/class.MarineLive.php'); |
|
| 20 | - //require_once('require/class.MarineArchive.php'); |
|
| 18 | + require_once('require/class.Marine.php'); |
|
| 19 | + require_once('require/class.MarineLive.php'); |
|
| 20 | + //require_once('require/class.MarineArchive.php'); |
|
| 21 | 21 | } else { |
| 22 | - require_once('require/class.Spotter.php'); |
|
| 23 | - require_once('require/class.SpotterLive.php'); |
|
| 24 | - require_once('require/class.SpotterArchive.php'); |
|
| 22 | + require_once('require/class.Spotter.php'); |
|
| 23 | + require_once('require/class.SpotterLive.php'); |
|
| 24 | + require_once('require/class.SpotterArchive.php'); |
|
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | $begintime = microtime(true); |
@@ -41,10 +41,10 @@ discard block |
||
| 41 | 41 | $Common = new Common(); |
| 42 | 42 | |
| 43 | 43 | if (isset($_GET['download'])) { |
| 44 | - if ($_GET['download'] == "true") |
|
| 45 | - { |
|
| 44 | + if ($_GET['download'] == "true") |
|
| 45 | + { |
|
| 46 | 46 | header('Content-disposition: attachment; filename="flightairmap.json"'); |
| 47 | - } |
|
| 47 | + } |
|
| 48 | 48 | } |
| 49 | 49 | header('Content-Type: text/javascript'); |
| 50 | 50 | |
@@ -497,17 +497,17 @@ discard block |
||
| 497 | 497 | if ($history == '' && isset($_COOKIE['history'])) $history = $_COOKIE['history']; |
| 498 | 498 | |
| 499 | 499 | if ( |
| 500 | - (isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') |
|
| 501 | - || ((isset($globalMapHistory) && $globalMapHistory) || $allhistory) |
|
| 500 | + (isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') |
|
| 501 | + || ((isset($globalMapHistory) && $globalMapHistory) || $allhistory) |
|
| 502 | 502 | // || (isset($history) && $history != '' && $history != 'NA' && ($history == $spotter_item['ident'] || $history == $spotter_item['flightaware_id'])) |
| 503 | 503 | // || (isset($history) && $history != '' && $history != 'NA' && $history == $spotter_item['ident']) |
| 504 | - || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id'])) |
|
| 505 | - || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']) |
|
| 506 | - || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['fammarine_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['fammarine_id'])) |
|
| 507 | - || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['fammarine_id']) && $_GET['fammarine_id'] == $spotter_item['fammarine_id']) |
|
| 508 | - || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['famtrackid']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['famtrackid'])) |
|
| 509 | - || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['famtrackid']) && $_GET['famtrackid'] == $spotter_item['famtrackid']) |
|
| 510 | - ) { |
|
| 504 | + || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id'])) |
|
| 505 | + || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id']) |
|
| 506 | + || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['fammarine_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['fammarine_id'])) |
|
| 507 | + || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['fammarine_id']) && $_GET['fammarine_id'] == $spotter_item['fammarine_id']) |
|
| 508 | + || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['famtrackid']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['famtrackid'])) |
|
| 509 | + || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['famtrackid']) && $_GET['famtrackid'] == $spotter_item['famtrackid']) |
|
| 510 | + ) { |
|
| 511 | 511 | if ($tracker) { |
| 512 | 512 | $spotter_history_array = $TrackerLive->getAllLiveTrackerDataById($spotter_item['famtrackid']); |
| 513 | 513 | } elseif ($marine) { |
@@ -592,26 +592,26 @@ discard block |
||
| 592 | 592 | } |
| 593 | 593 | |
| 594 | 594 | if (isset($history) && $history == $spotter_item['ident'] && isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA' && isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA' && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true") || (!isset($_COOKIE['MapRoute']) && (!isset($globalMapRoute) || (isset($globalMapRoute) && $globalMapRoute))))) { |
| 595 | - $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": ['; |
|
| 596 | - if (isset($spotter_item['departure_airport_latitude'])) { |
|
| 595 | + $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": ['; |
|
| 596 | + if (isset($spotter_item['departure_airport_latitude'])) { |
|
| 597 | 597 | $output_air .= '['.$spotter_item['departure_airport_longitude'].','.$spotter_item['departure_airport_latitude'].'],'; |
| 598 | - } elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') { |
|
| 598 | + } elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') { |
|
| 599 | 599 | $dairport = $Spotter->getAllAirportInfo($spotter_item['departure_airport']); |
| 600 | 600 | if (isset($dairport[0]['latitude'])) { |
| 601 | - $output_air .= '['.$dairport[0]['longitude'].','.$dairport[0]['latitude'].'],'; |
|
| 601 | + $output_air .= '['.$dairport[0]['longitude'].','.$dairport[0]['latitude'].'],'; |
|
| 602 | 602 | } |
| 603 | - } |
|
| 604 | - if (isset($spotter_item['arrival_airport_latitude'])) { |
|
| 603 | + } |
|
| 604 | + if (isset($spotter_item['arrival_airport_latitude'])) { |
|
| 605 | 605 | $output_air .= '['.$spotter_item['arrival_airport_longitude'].','.$spotter_item['arrival_airport_latitude'].']'; |
| 606 | - } elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') { |
|
| 606 | + } elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') { |
|
| 607 | 607 | $aairport = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']); |
| 608 | 608 | if (isset($aairport[0]['latitude'])) { |
| 609 | - $output_air .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].']'; |
|
| 609 | + $output_air .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].']'; |
|
| 610 | 610 | } |
| 611 | - } |
|
| 612 | - $output_air .= ']}},'; |
|
| 613 | - $output .= $output_air; |
|
| 614 | - unset($output_air); |
|
| 611 | + } |
|
| 612 | + $output_air .= ']}},'; |
|
| 613 | + $output .= $output_air; |
|
| 614 | + unset($output_air); |
|
| 615 | 615 | } |
| 616 | 616 | } |
| 617 | 617 | $output = substr($output, 0, -1); |
@@ -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(); |
@@ -86,11 +86,11 @@ discard block |
||
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | /** |
| 89 | - * Gets all the spotter information based on the latest data entry |
|
| 90 | - * |
|
| 91 | - * @return Array the spotter information |
|
| 92 | - * |
|
| 93 | - */ |
|
| 89 | + * Gets all the spotter information based on the latest data entry |
|
| 90 | + * |
|
| 91 | + * @return Array the spotter information |
|
| 92 | + * |
|
| 93 | + */ |
|
| 94 | 94 | public function getLiveMarineData($limit = '', $sort = '', $filter = array()) |
| 95 | 95 | { |
| 96 | 96 | global $globalDBdriver, $globalLiveInterval; |
@@ -132,11 +132,11 @@ discard block |
||
| 132 | 132 | } |
| 133 | 133 | |
| 134 | 134 | /** |
| 135 | - * Gets Minimal Live Spotter data |
|
| 136 | - * |
|
| 137 | - * @return Array the spotter information |
|
| 138 | - * |
|
| 139 | - */ |
|
| 135 | + * Gets Minimal Live Spotter data |
|
| 136 | + * |
|
| 137 | + * @return Array the spotter information |
|
| 138 | + * |
|
| 139 | + */ |
|
| 140 | 140 | public function getMinLiveMarineData($filter = array()) |
| 141 | 141 | { |
| 142 | 142 | global $globalDBdriver, $globalLiveInterval; |
@@ -166,11 +166,11 @@ discard block |
||
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | /** |
| 169 | - * Gets Minimal Live Spotter data since xx seconds |
|
| 170 | - * |
|
| 171 | - * @return Array the spotter information |
|
| 172 | - * |
|
| 173 | - */ |
|
| 169 | + * Gets Minimal Live Spotter data since xx seconds |
|
| 170 | + * |
|
| 171 | + * @return Array the spotter information |
|
| 172 | + * |
|
| 173 | + */ |
|
| 174 | 174 | public function getMinLastLiveMarineData($filter = array()) |
| 175 | 175 | { |
| 176 | 176 | global $globalDBdriver, $globalLiveInterval; |
@@ -183,13 +183,13 @@ discard block |
||
| 183 | 183 | $query = 'SELECT marine_live.ident, marine_live.fammarine_id,marine_live.type, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source |
| 184 | 184 | FROM marine_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= marine_live.date AND marine_live.latitude <> '0' AND marine_live.longitude <> '0' |
| 185 | 185 | ORDER BY marine_live.fammarine_id, marine_live.date"; |
| 186 | - } else { |
|
| 186 | + } else { |
|
| 187 | 187 | $query = "SELECT marine_live.ident, marine_live.fammarine_id, marine_live.type,marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source |
| 188 | 188 | FROM marine_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= marine_live.date AND marine_live.latitude <> '0' AND marine_live.longitude <> '0' |
| 189 | 189 | ORDER BY marine_live.fammarine_id, marine_live.date"; |
| 190 | 190 | } |
| 191 | 191 | |
| 192 | - try { |
|
| 192 | + try { |
|
| 193 | 193 | $sth = $this->db->prepare($query); |
| 194 | 194 | $sth->execute(); |
| 195 | 195 | } catch(PDOException $e) { |
@@ -201,11 +201,11 @@ discard block |
||
| 201 | 201 | } |
| 202 | 202 | |
| 203 | 203 | /** |
| 204 | - * Gets number of latest data entry |
|
| 205 | - * |
|
| 206 | - * @return String number of entry |
|
| 207 | - * |
|
| 208 | - */ |
|
| 204 | + * Gets number of latest data entry |
|
| 205 | + * |
|
| 206 | + * @return String number of entry |
|
| 207 | + * |
|
| 208 | + */ |
|
| 209 | 209 | public function getLiveMarineCount($filter = array()) |
| 210 | 210 | { |
| 211 | 211 | global $globalDBdriver, $globalLiveInterval; |
@@ -230,11 +230,11 @@ discard block |
||
| 230 | 230 | } |
| 231 | 231 | |
| 232 | 232 | /** |
| 233 | - * Gets all the spotter information based on the latest data entry and coord |
|
| 234 | - * |
|
| 235 | - * @return Array the spotter information |
|
| 236 | - * |
|
| 237 | - */ |
|
| 233 | + * Gets all the spotter information based on the latest data entry and coord |
|
| 234 | + * |
|
| 235 | + * @return Array the spotter information |
|
| 236 | + * |
|
| 237 | + */ |
|
| 238 | 238 | public function getLiveMarineDatabyCoord($coord, $filter = array()) |
| 239 | 239 | { |
| 240 | 240 | global $globalDBdriver, $globalLiveInterval; |
@@ -258,11 +258,11 @@ discard block |
||
| 258 | 258 | } |
| 259 | 259 | |
| 260 | 260 | /** |
| 261 | - * Gets all the spotter information based on the latest data entry and coord |
|
| 262 | - * |
|
| 263 | - * @return Array the spotter information |
|
| 264 | - * |
|
| 265 | - */ |
|
| 261 | + * Gets all the spotter information based on the latest data entry and coord |
|
| 262 | + * |
|
| 263 | + * @return Array the spotter information |
|
| 264 | + * |
|
| 265 | + */ |
|
| 266 | 266 | public function getMinLiveMarineDatabyCoord($coord, $filter = array()) |
| 267 | 267 | { |
| 268 | 268 | global $globalDBdriver, $globalLiveInterval; |
@@ -290,11 +290,11 @@ discard block |
||
| 290 | 290 | } |
| 291 | 291 | |
| 292 | 292 | /** |
| 293 | - * Gets all the spotter information based on a user's latitude and longitude |
|
| 294 | - * |
|
| 295 | - * @return Array the spotter information |
|
| 296 | - * |
|
| 297 | - */ |
|
| 293 | + * Gets all the spotter information based on a user's latitude and longitude |
|
| 294 | + * |
|
| 295 | + * @return Array the spotter information |
|
| 296 | + * |
|
| 297 | + */ |
|
| 298 | 298 | public function getLatestMarineForLayar($lat, $lng, $radius, $interval) |
| 299 | 299 | { |
| 300 | 300 | $Marine = new Marine($this->db); |
@@ -307,134 +307,134 @@ discard block |
||
| 307 | 307 | if ($lng != '') |
| 308 | 308 | { |
| 309 | 309 | if (!is_numeric($lng)) |
| 310 | - { |
|
| 311 | - return false; |
|
| 312 | - } |
|
| 313 | - } |
|
| 314 | - |
|
| 315 | - if ($radius != '') |
|
| 316 | - { |
|
| 317 | - if (!is_numeric($radius)) |
|
| 318 | - { |
|
| 319 | - return false; |
|
| 320 | - } |
|
| 321 | - } |
|
| 310 | + { |
|
| 311 | + return false; |
|
| 312 | + } |
|
| 313 | + } |
|
| 314 | + |
|
| 315 | + if ($radius != '') |
|
| 316 | + { |
|
| 317 | + if (!is_numeric($radius)) |
|
| 318 | + { |
|
| 319 | + return false; |
|
| 320 | + } |
|
| 321 | + } |
|
| 322 | 322 | $additional_query = ''; |
| 323 | 323 | if ($interval != '') |
| 324 | - { |
|
| 325 | - if (!is_string($interval)) |
|
| 326 | - { |
|
| 327 | - //$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date '; |
|
| 328 | - return false; |
|
| 329 | - } else { |
|
| 330 | - if ($interval == '1m') |
|
| 331 | - { |
|
| 332 | - $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date '; |
|
| 333 | - } else if ($interval == '15m'){ |
|
| 334 | - $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= marine_live.date '; |
|
| 335 | - } |
|
| 336 | - } |
|
| 337 | - } else { |
|
| 338 | - $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date '; |
|
| 339 | - } |
|
| 340 | - |
|
| 341 | - $query = "SELECT marine_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM marine_live |
|
| 324 | + { |
|
| 325 | + if (!is_string($interval)) |
|
| 326 | + { |
|
| 327 | + //$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date '; |
|
| 328 | + return false; |
|
| 329 | + } else { |
|
| 330 | + if ($interval == '1m') |
|
| 331 | + { |
|
| 332 | + $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date '; |
|
| 333 | + } else if ($interval == '15m'){ |
|
| 334 | + $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= marine_live.date '; |
|
| 335 | + } |
|
| 336 | + } |
|
| 337 | + } else { |
|
| 338 | + $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date '; |
|
| 339 | + } |
|
| 340 | + |
|
| 341 | + $query = "SELECT marine_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM marine_live |
|
| 342 | 342 | WHERE marine_live.latitude <> '' |
| 343 | 343 | AND marine_live.longitude <> '' |
| 344 | 344 | ".$additional_query." |
| 345 | 345 | HAVING distance < :radius |
| 346 | 346 | ORDER BY distance"; |
| 347 | 347 | |
| 348 | - $spotter_array = $Marine->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius)); |
|
| 348 | + $spotter_array = $Marine->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius)); |
|
| 349 | 349 | |
| 350 | - return $spotter_array; |
|
| 351 | - } |
|
| 350 | + return $spotter_array; |
|
| 351 | + } |
|
| 352 | 352 | |
| 353 | 353 | |
| 354 | - /** |
|
| 355 | - * Gets all the spotter information based on a particular callsign |
|
| 356 | - * |
|
| 357 | - * @return Array the spotter information |
|
| 358 | - * |
|
| 359 | - */ |
|
| 354 | + /** |
|
| 355 | + * Gets all the spotter information based on a particular callsign |
|
| 356 | + * |
|
| 357 | + * @return Array the spotter information |
|
| 358 | + * |
|
| 359 | + */ |
|
| 360 | 360 | public function getLastLiveMarineDataByIdent($ident) |
| 361 | 361 | { |
| 362 | 362 | $Marine = new Marine($this->db); |
| 363 | 363 | date_default_timezone_set('UTC'); |
| 364 | 364 | |
| 365 | 365 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 366 | - $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
| 366 | + $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
| 367 | 367 | |
| 368 | 368 | $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident),'',true); |
| 369 | 369 | |
| 370 | 370 | return $spotter_array; |
| 371 | 371 | } |
| 372 | 372 | |
| 373 | - /** |
|
| 374 | - * Gets all the spotter information based on a particular callsign |
|
| 375 | - * |
|
| 376 | - * @return Array the spotter information |
|
| 377 | - * |
|
| 378 | - */ |
|
| 373 | + /** |
|
| 374 | + * Gets all the spotter information based on a particular callsign |
|
| 375 | + * |
|
| 376 | + * @return Array the spotter information |
|
| 377 | + * |
|
| 378 | + */ |
|
| 379 | 379 | public function getDateLiveMarineDataByIdent($ident,$date) |
| 380 | 380 | { |
| 381 | 381 | $Marine = new Marine($this->db); |
| 382 | 382 | date_default_timezone_set('UTC'); |
| 383 | 383 | |
| 384 | 384 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 385 | - $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
| 385 | + $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
| 386 | 386 | |
| 387 | - $date = date('c',$date); |
|
| 387 | + $date = date('c',$date); |
|
| 388 | 388 | $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
| 389 | 389 | |
| 390 | 390 | return $spotter_array; |
| 391 | 391 | } |
| 392 | 392 | |
| 393 | - /** |
|
| 394 | - * Gets last spotter information based on a particular callsign |
|
| 395 | - * |
|
| 396 | - * @return Array the spotter information |
|
| 397 | - * |
|
| 398 | - */ |
|
| 393 | + /** |
|
| 394 | + * Gets last spotter information based on a particular callsign |
|
| 395 | + * |
|
| 396 | + * @return Array the spotter information |
|
| 397 | + * |
|
| 398 | + */ |
|
| 399 | 399 | public function getLastLiveMarineDataById($id) |
| 400 | 400 | { |
| 401 | 401 | $Marine = new Marine($this->db); |
| 402 | 402 | date_default_timezone_set('UTC'); |
| 403 | 403 | |
| 404 | 404 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 405 | - $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
| 405 | + $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
| 406 | 406 | |
| 407 | 407 | $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id),'',true); |
| 408 | 408 | |
| 409 | 409 | return $spotter_array; |
| 410 | 410 | } |
| 411 | 411 | |
| 412 | - /** |
|
| 413 | - * Gets last spotter information based on a particular callsign |
|
| 414 | - * |
|
| 415 | - * @return Array the spotter information |
|
| 416 | - * |
|
| 417 | - */ |
|
| 412 | + /** |
|
| 413 | + * Gets last spotter information based on a particular callsign |
|
| 414 | + * |
|
| 415 | + * @return Array the spotter information |
|
| 416 | + * |
|
| 417 | + */ |
|
| 418 | 418 | public function getDateLiveMarineDataById($id,$date) |
| 419 | 419 | { |
| 420 | 420 | $Marine = new Marine($this->db); |
| 421 | 421 | date_default_timezone_set('UTC'); |
| 422 | 422 | |
| 423 | 423 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 424 | - $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
| 425 | - $date = date('c',$date); |
|
| 424 | + $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
| 425 | + $date = date('c',$date); |
|
| 426 | 426 | $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true); |
| 427 | 427 | |
| 428 | 428 | return $spotter_array; |
| 429 | 429 | } |
| 430 | 430 | |
| 431 | 431 | |
| 432 | - /** |
|
| 433 | - * Gets all the spotter information based on a particular id |
|
| 434 | - * |
|
| 435 | - * @return Array the spotter information |
|
| 436 | - * |
|
| 437 | - */ |
|
| 432 | + /** |
|
| 433 | + * Gets all the spotter information based on a particular id |
|
| 434 | + * |
|
| 435 | + * @return Array the spotter information |
|
| 436 | + * |
|
| 437 | + */ |
|
| 438 | 438 | public function getAllLiveMarineDataById($id,$liveinterval = false) |
| 439 | 439 | { |
| 440 | 440 | global $globalDBdriver, $globalLiveInterval; |
@@ -462,18 +462,18 @@ discard block |
||
| 462 | 462 | return $spotter_array; |
| 463 | 463 | } |
| 464 | 464 | |
| 465 | - /** |
|
| 466 | - * Gets all the spotter information based on a particular ident |
|
| 467 | - * |
|
| 468 | - * @return Array the spotter information |
|
| 469 | - * |
|
| 470 | - */ |
|
| 465 | + /** |
|
| 466 | + * Gets all the spotter information based on a particular ident |
|
| 467 | + * |
|
| 468 | + * @return Array the spotter information |
|
| 469 | + * |
|
| 470 | + */ |
|
| 471 | 471 | public function getAllLiveMarineDataByIdent($ident) |
| 472 | 472 | { |
| 473 | 473 | date_default_timezone_set('UTC'); |
| 474 | 474 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 475 | 475 | $query = self::$global_query.' WHERE marine_live.ident = :ident'; |
| 476 | - try { |
|
| 476 | + try { |
|
| 477 | 477 | |
| 478 | 478 | $sth = $this->db->prepare($query); |
| 479 | 479 | $sth->execute(array(':ident' => $ident)); |
@@ -487,23 +487,23 @@ discard block |
||
| 487 | 487 | |
| 488 | 488 | |
| 489 | 489 | /** |
| 490 | - * Deletes all info in the table |
|
| 491 | - * |
|
| 492 | - * @return String success or false |
|
| 493 | - * |
|
| 494 | - */ |
|
| 490 | + * Deletes all info in the table |
|
| 491 | + * |
|
| 492 | + * @return String success or false |
|
| 493 | + * |
|
| 494 | + */ |
|
| 495 | 495 | public function deleteLiveMarineData() |
| 496 | 496 | { |
| 497 | 497 | global $globalDBdriver; |
| 498 | 498 | if ($globalDBdriver == 'mysql') { |
| 499 | 499 | //$query = "DELETE FROM marine_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE) >= marine_live.date"; |
| 500 | 500 | $query = 'DELETE FROM marine_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 9 HOUR) >= marine_live.date'; |
| 501 | - //$query = "DELETE FROM marine_live WHERE marine_live.id IN (SELECT marine_live.id FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= marine_live.date)"; |
|
| 501 | + //$query = "DELETE FROM marine_live WHERE marine_live.id IN (SELECT marine_live.id FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= marine_live.date)"; |
|
| 502 | 502 | } else { |
| 503 | 503 | $query = "DELETE FROM marine_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= marine_live.date"; |
| 504 | 504 | } |
| 505 | 505 | |
| 506 | - try { |
|
| 506 | + try { |
|
| 507 | 507 | |
| 508 | 508 | $sth = $this->db->prepare($query); |
| 509 | 509 | $sth->execute(); |
@@ -515,18 +515,18 @@ discard block |
||
| 515 | 515 | } |
| 516 | 516 | |
| 517 | 517 | /** |
| 518 | - * Deletes all info in the table for aircraft not seen since 2 HOUR |
|
| 519 | - * |
|
| 520 | - * @return String success or false |
|
| 521 | - * |
|
| 522 | - */ |
|
| 518 | + * Deletes all info in the table for aircraft not seen since 2 HOUR |
|
| 519 | + * |
|
| 520 | + * @return String success or false |
|
| 521 | + * |
|
| 522 | + */ |
|
| 523 | 523 | public function deleteLiveMarineDataNotUpdated() |
| 524 | 524 | { |
| 525 | 525 | global $globalDBdriver, $globalDebug; |
| 526 | 526 | if ($globalDBdriver == 'mysql') { |
| 527 | 527 | //$query = 'SELECT fammarine_id FROM marine_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) >= marine_live.date AND marine_live.fammarine_id NOT IN (SELECT fammarine_id FROM marine_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) < marine_live.date) LIMIT 800 OFFSET 0'; |
| 528 | - $query = "SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 1200 OFFSET 0"; |
|
| 529 | - try { |
|
| 528 | + $query = "SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 1200 OFFSET 0"; |
|
| 529 | + try { |
|
| 530 | 530 | |
| 531 | 531 | $sth = $this->db->prepare($query); |
| 532 | 532 | $sth->execute(); |
@@ -534,8 +534,8 @@ discard block |
||
| 534 | 534 | return "error"; |
| 535 | 535 | } |
| 536 | 536 | $query_delete = 'DELETE FROM marine_live WHERE fammarine_id IN ('; |
| 537 | - $i = 0; |
|
| 538 | - $j =0; |
|
| 537 | + $i = 0; |
|
| 538 | + $j =0; |
|
| 539 | 539 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 540 | 540 | foreach($all as $row) |
| 541 | 541 | { |
@@ -543,20 +543,20 @@ discard block |
||
| 543 | 543 | $j++; |
| 544 | 544 | if ($j == 30) { |
| 545 | 545 | if ($globalDebug) echo "."; |
| 546 | - try { |
|
| 546 | + try { |
|
| 547 | 547 | |
| 548 | 548 | $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
| 549 | 549 | $sth->execute(); |
| 550 | 550 | } catch(PDOException $e) { |
| 551 | 551 | return "error"; |
| 552 | 552 | } |
| 553 | - $query_delete = 'DELETE FROM marine_live WHERE fammarine_id IN ('; |
|
| 554 | - $j = 0; |
|
| 553 | + $query_delete = 'DELETE FROM marine_live WHERE fammarine_id IN ('; |
|
| 554 | + $j = 0; |
|
| 555 | 555 | } |
| 556 | 556 | $query_delete .= "'".$row['fammarine_id']."',"; |
| 557 | 557 | } |
| 558 | 558 | if ($i > 0) { |
| 559 | - try { |
|
| 559 | + try { |
|
| 560 | 560 | |
| 561 | 561 | $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
| 562 | 562 | $sth->execute(); |
@@ -567,9 +567,9 @@ discard block |
||
| 567 | 567 | return "success"; |
| 568 | 568 | } elseif ($globalDBdriver == 'pgsql') { |
| 569 | 569 | //$query = "SELECT fammarine_id FROM marine_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= marine_live.date AND marine_live.fammarine_id NOT IN (SELECT fammarine_id FROM marine_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' < marine_live.date) LIMIT 800 OFFSET 0"; |
| 570 | - //$query = "SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0"; |
|
| 571 | - $query = "DELETE FROM marine_live WHERE fammarine_id IN (SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0)"; |
|
| 572 | - try { |
|
| 570 | + //$query = "SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0"; |
|
| 571 | + $query = "DELETE FROM marine_live WHERE fammarine_id IN (SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0)"; |
|
| 572 | + try { |
|
| 573 | 573 | |
| 574 | 574 | $sth = $this->db->prepare($query); |
| 575 | 575 | $sth->execute(); |
@@ -613,17 +613,17 @@ discard block |
||
| 613 | 613 | } |
| 614 | 614 | |
| 615 | 615 | /** |
| 616 | - * Deletes all info in the table for an ident |
|
| 617 | - * |
|
| 618 | - * @return String success or false |
|
| 619 | - * |
|
| 620 | - */ |
|
| 616 | + * Deletes all info in the table for an ident |
|
| 617 | + * |
|
| 618 | + * @return String success or false |
|
| 619 | + * |
|
| 620 | + */ |
|
| 621 | 621 | public function deleteLiveMarineDataByIdent($ident) |
| 622 | 622 | { |
| 623 | 623 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 624 | 624 | $query = 'DELETE FROM marine_live WHERE ident = :ident'; |
| 625 | 625 | |
| 626 | - try { |
|
| 626 | + try { |
|
| 627 | 627 | |
| 628 | 628 | $sth = $this->db->prepare($query); |
| 629 | 629 | $sth->execute(array(':ident' => $ident)); |
@@ -635,17 +635,17 @@ discard block |
||
| 635 | 635 | } |
| 636 | 636 | |
| 637 | 637 | /** |
| 638 | - * Deletes all info in the table for an id |
|
| 639 | - * |
|
| 640 | - * @return String success or false |
|
| 641 | - * |
|
| 642 | - */ |
|
| 638 | + * Deletes all info in the table for an id |
|
| 639 | + * |
|
| 640 | + * @return String success or false |
|
| 641 | + * |
|
| 642 | + */ |
|
| 643 | 643 | public function deleteLiveMarineDataById($id) |
| 644 | 644 | { |
| 645 | 645 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 646 | 646 | $query = 'DELETE FROM marine_live WHERE fammarine_id = :id'; |
| 647 | 647 | |
| 648 | - try { |
|
| 648 | + try { |
|
| 649 | 649 | |
| 650 | 650 | $sth = $this->db->prepare($query); |
| 651 | 651 | $sth->execute(array(':id' => $id)); |
@@ -658,11 +658,11 @@ discard block |
||
| 658 | 658 | |
| 659 | 659 | |
| 660 | 660 | /** |
| 661 | - * Gets the aircraft ident within the last hour |
|
| 662 | - * |
|
| 663 | - * @return String the ident |
|
| 664 | - * |
|
| 665 | - */ |
|
| 661 | + * Gets the aircraft ident within the last hour |
|
| 662 | + * |
|
| 663 | + * @return String the ident |
|
| 664 | + * |
|
| 665 | + */ |
|
| 666 | 666 | public function getIdentFromLastHour($ident) |
| 667 | 667 | { |
| 668 | 668 | global $globalDBdriver, $globalTimezone; |
@@ -688,14 +688,14 @@ discard block |
||
| 688 | 688 | $ident_result = $row['ident']; |
| 689 | 689 | } |
| 690 | 690 | return $ident_result; |
| 691 | - } |
|
| 691 | + } |
|
| 692 | 692 | |
| 693 | 693 | /** |
| 694 | - * Check recent aircraft |
|
| 695 | - * |
|
| 696 | - * @return String the ident |
|
| 697 | - * |
|
| 698 | - */ |
|
| 694 | + * Check recent aircraft |
|
| 695 | + * |
|
| 696 | + * @return String the ident |
|
| 697 | + * |
|
| 698 | + */ |
|
| 699 | 699 | public function checkIdentRecent($ident) |
| 700 | 700 | { |
| 701 | 701 | global $globalDBdriver, $globalTimezone; |
@@ -721,14 +721,14 @@ discard block |
||
| 721 | 721 | $ident_result = $row['fammarine_id']; |
| 722 | 722 | } |
| 723 | 723 | return $ident_result; |
| 724 | - } |
|
| 724 | + } |
|
| 725 | 725 | |
| 726 | 726 | /** |
| 727 | - * Check recent aircraft by id |
|
| 728 | - * |
|
| 729 | - * @return String the ident |
|
| 730 | - * |
|
| 731 | - */ |
|
| 727 | + * Check recent aircraft by id |
|
| 728 | + * |
|
| 729 | + * @return String the ident |
|
| 730 | + * |
|
| 731 | + */ |
|
| 732 | 732 | public function checkIdRecent($id) |
| 733 | 733 | { |
| 734 | 734 | global $globalDBdriver, $globalTimezone; |
@@ -754,14 +754,14 @@ discard block |
||
| 754 | 754 | $ident_result = $row['fammarine_id']; |
| 755 | 755 | } |
| 756 | 756 | return $ident_result; |
| 757 | - } |
|
| 757 | + } |
|
| 758 | 758 | |
| 759 | 759 | /** |
| 760 | - * Check recent aircraft by mmsi |
|
| 761 | - * |
|
| 762 | - * @return String the ident |
|
| 763 | - * |
|
| 764 | - */ |
|
| 760 | + * Check recent aircraft by mmsi |
|
| 761 | + * |
|
| 762 | + * @return String the ident |
|
| 763 | + * |
|
| 764 | + */ |
|
| 765 | 765 | public function checkMMSIRecent($mmsi) |
| 766 | 766 | { |
| 767 | 767 | global $globalDBdriver, $globalTimezone; |
@@ -787,19 +787,19 @@ discard block |
||
| 787 | 787 | $ident_result = $row['fammarine_id']; |
| 788 | 788 | } |
| 789 | 789 | return $ident_result; |
| 790 | - } |
|
| 790 | + } |
|
| 791 | 791 | |
| 792 | 792 | /** |
| 793 | - * Adds a new spotter data |
|
| 794 | - * |
|
| 795 | - * @param String $fammarine_id the ID from flightaware |
|
| 796 | - * @param String $ident the flight ident |
|
| 797 | - * @param String $aircraft_icao the aircraft type |
|
| 798 | - * @param String $departure_airport_icao the departure airport |
|
| 799 | - * @param String $arrival_airport_icao the arrival airport |
|
| 800 | - * @return String success or false |
|
| 801 | - * |
|
| 802 | - */ |
|
| 793 | + * Adds a new spotter data |
|
| 794 | + * |
|
| 795 | + * @param String $fammarine_id the ID from flightaware |
|
| 796 | + * @param String $ident the flight ident |
|
| 797 | + * @param String $aircraft_icao the aircraft type |
|
| 798 | + * @param String $departure_airport_icao the departure airport |
|
| 799 | + * @param String $arrival_airport_icao the arrival airport |
|
| 800 | + * @return String success or false |
|
| 801 | + * |
|
| 802 | + */ |
|
| 803 | 803 | public function addLiveMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $mmsi = '',$type = '',$typeid = '',$imo = '', $callsign = '',$arrival_code = '',$arrival_date = '',$status = '',$noarchive = false,$format_source = '', $source_name = '', $over_country = '') |
| 804 | 804 | { |
| 805 | 805 | global $globalURL, $globalArchive, $globalDebug; |
@@ -870,10 +870,10 @@ discard block |
||
| 870 | 870 | $arrival_date = filter_var($arrival_date,FILTER_SANITIZE_STRING); |
| 871 | 871 | |
| 872 | 872 | |
| 873 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
| 874 | - if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
| 875 | - if ($arrival_date == '') $arrival_date = NULL; |
|
| 876 | - $query = ''; |
|
| 873 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
| 874 | + if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
| 875 | + if ($arrival_date == '') $arrival_date = NULL; |
|
| 876 | + $query = ''; |
|
| 877 | 877 | if ($globalArchive) { |
| 878 | 878 | if ($globalDebug) echo '-- Delete previous data -- '; |
| 879 | 879 | $query .= 'DELETE FROM marine_live WHERE fammarine_id = :fammarine_id;'; |
@@ -8,11 +8,11 @@ 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 | - */ |
|
| 11 | + /** |
|
| 12 | + * Get SQL query part for filter used |
|
| 13 | + * @param Array $filter the filter |
|
| 14 | + * @return Array the SQL part |
|
| 15 | + */ |
|
| 16 | 16 | /* |
| 17 | 17 | public function getFilter($filter = array(),$where = false,$and = false) { |
| 18 | 18 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
@@ -122,44 +122,44 @@ discard block |
||
| 122 | 122 | } |
| 123 | 123 | |
| 124 | 124 | |
| 125 | - /** |
|
| 126 | - * Gets all the spotter information based on a particular callsign |
|
| 127 | - * |
|
| 128 | - * @return Array the spotter information |
|
| 129 | - * |
|
| 130 | - */ |
|
| 131 | - public function getLastArchiveMarineDataByIdent($ident) |
|
| 132 | - { |
|
| 125 | + /** |
|
| 126 | + * Gets all the spotter information based on a particular callsign |
|
| 127 | + * |
|
| 128 | + * @return Array the spotter information |
|
| 129 | + * |
|
| 130 | + */ |
|
| 131 | + public function getLastArchiveMarineDataByIdent($ident) |
|
| 132 | + { |
|
| 133 | 133 | $Marine = new Marine($this->db); |
| 134 | - date_default_timezone_set('UTC'); |
|
| 134 | + date_default_timezone_set('UTC'); |
|
| 135 | 135 | |
| 136 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 137 | - //$query = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1"; |
|
| 138 | - $query = "SELECT marine_archive.* FROM marine_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 136 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 137 | + //$query = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1"; |
|
| 138 | + $query = "SELECT marine_archive.* FROM marine_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 139 | 139 | |
| 140 | - $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident)); |
|
| 140 | + $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident)); |
|
| 141 | 141 | |
| 142 | - return $spotter_array; |
|
| 143 | - } |
|
| 142 | + return $spotter_array; |
|
| 143 | + } |
|
| 144 | 144 | |
| 145 | 145 | |
| 146 | - /** |
|
| 147 | - * Gets last the spotter information based on a particular id |
|
| 148 | - * |
|
| 149 | - * @return Array the spotter information |
|
| 150 | - * |
|
| 151 | - */ |
|
| 152 | - public function getLastArchiveMarineDataById($id) |
|
| 153 | - { |
|
| 154 | - $Marine = new Marine($this->db); |
|
| 155 | - date_default_timezone_set('UTC'); |
|
| 156 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 157 | - //$query = MarineArchive->$global_query." WHERE marine_archive.fammarine_id = :id"; |
|
| 158 | - //$query = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1"; |
|
| 159 | - $query = "SELECT * FROM marine_archive WHERE fammarine_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 146 | + /** |
|
| 147 | + * Gets last the spotter information based on a particular id |
|
| 148 | + * |
|
| 149 | + * @return Array the spotter information |
|
| 150 | + * |
|
| 151 | + */ |
|
| 152 | + public function getLastArchiveMarineDataById($id) |
|
| 153 | + { |
|
| 154 | + $Marine = new Marine($this->db); |
|
| 155 | + date_default_timezone_set('UTC'); |
|
| 156 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 157 | + //$query = MarineArchive->$global_query." WHERE marine_archive.fammarine_id = :id"; |
|
| 158 | + //$query = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1"; |
|
| 159 | + $query = "SELECT * FROM marine_archive WHERE fammarine_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 160 | 160 | |
| 161 | 161 | // $spotter_array = Marine->getDataFromDB($query,array(':id' => $id)); |
| 162 | - /* |
|
| 162 | + /* |
|
| 163 | 163 | try { |
| 164 | 164 | $Connection = new Connection(); |
| 165 | 165 | $sth = Connection->$db->prepare($query); |
@@ -169,232 +169,232 @@ discard block |
||
| 169 | 169 | } |
| 170 | 170 | $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC); |
| 171 | 171 | */ |
| 172 | - $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id)); |
|
| 173 | - |
|
| 174 | - return $spotter_array; |
|
| 175 | - } |
|
| 176 | - |
|
| 177 | - /** |
|
| 178 | - * Gets all the spotter information based on a particular id |
|
| 179 | - * |
|
| 180 | - * @return Array the spotter information |
|
| 181 | - * |
|
| 182 | - */ |
|
| 183 | - public function getAllArchiveMarineDataById($id) |
|
| 172 | + $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id)); |
|
| 173 | + |
|
| 174 | + return $spotter_array; |
|
| 175 | + } |
|
| 176 | + |
|
| 177 | + /** |
|
| 178 | + * Gets all the spotter information based on a particular id |
|
| 179 | + * |
|
| 180 | + * @return Array the spotter information |
|
| 181 | + * |
|
| 182 | + */ |
|
| 183 | + public function getAllArchiveMarineDataById($id) |
|
| 184 | 184 | { |
| 185 | - date_default_timezone_set('UTC'); |
|
| 186 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 187 | - $query = $this->global_query." WHERE marine_archive.fammarine_id = :id ORDER BY date"; |
|
| 185 | + date_default_timezone_set('UTC'); |
|
| 186 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 187 | + $query = $this->global_query." WHERE marine_archive.fammarine_id = :id ORDER BY date"; |
|
| 188 | 188 | |
| 189 | 189 | // $spotter_array = Marine->getDataFromDB($query,array(':id' => $id)); |
| 190 | 190 | |
| 191 | - try { |
|
| 192 | - $sth = $this->db->prepare($query); |
|
| 193 | - $sth->execute(array(':id' => $id)); |
|
| 194 | - } catch(PDOException $e) { |
|
| 195 | - echo $e->getMessage(); |
|
| 196 | - die; |
|
| 197 | - } |
|
| 198 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 199 | - |
|
| 200 | - return $spotter_array; |
|
| 201 | - } |
|
| 202 | - |
|
| 203 | - /** |
|
| 204 | - * Gets coordinate & time spotter information based on a particular id |
|
| 205 | - * |
|
| 206 | - * @return Array the spotter information |
|
| 207 | - * |
|
| 208 | - */ |
|
| 209 | - public function getCoordArchiveMarineDataById($id) |
|
| 210 | - { |
|
| 211 | - date_default_timezone_set('UTC'); |
|
| 212 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 213 | - $query = "SELECT marine_archive.latitude, marine_archive.longitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id"; |
|
| 191 | + try { |
|
| 192 | + $sth = $this->db->prepare($query); |
|
| 193 | + $sth->execute(array(':id' => $id)); |
|
| 194 | + } catch(PDOException $e) { |
|
| 195 | + echo $e->getMessage(); |
|
| 196 | + die; |
|
| 197 | + } |
|
| 198 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 199 | + |
|
| 200 | + return $spotter_array; |
|
| 201 | + } |
|
| 202 | + |
|
| 203 | + /** |
|
| 204 | + * Gets coordinate & time spotter information based on a particular id |
|
| 205 | + * |
|
| 206 | + * @return Array the spotter information |
|
| 207 | + * |
|
| 208 | + */ |
|
| 209 | + public function getCoordArchiveMarineDataById($id) |
|
| 210 | + { |
|
| 211 | + date_default_timezone_set('UTC'); |
|
| 212 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 213 | + $query = "SELECT marine_archive.latitude, marine_archive.longitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id"; |
|
| 214 | 214 | |
| 215 | 215 | // $spotter_array = Marine->getDataFromDB($query,array(':id' => $id)); |
| 216 | 216 | |
| 217 | - try { |
|
| 218 | - $sth = $this->db->prepare($query); |
|
| 219 | - $sth->execute(array(':id' => $id)); |
|
| 220 | - } catch(PDOException $e) { |
|
| 221 | - echo $e->getMessage(); |
|
| 222 | - die; |
|
| 223 | - } |
|
| 224 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 217 | + try { |
|
| 218 | + $sth = $this->db->prepare($query); |
|
| 219 | + $sth->execute(array(':id' => $id)); |
|
| 220 | + } catch(PDOException $e) { |
|
| 221 | + echo $e->getMessage(); |
|
| 222 | + die; |
|
| 223 | + } |
|
| 224 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 225 | 225 | |
| 226 | - return $spotter_array; |
|
| 227 | - } |
|
| 226 | + return $spotter_array; |
|
| 227 | + } |
|
| 228 | 228 | |
| 229 | 229 | |
| 230 | - /** |
|
| 231 | - * Gets altitude information based on a particular callsign |
|
| 232 | - * |
|
| 233 | - * @return Array the spotter information |
|
| 234 | - * |
|
| 235 | - */ |
|
| 236 | - public function getAltitudeArchiveMarineDataByIdent($ident) |
|
| 237 | - { |
|
| 230 | + /** |
|
| 231 | + * Gets altitude information based on a particular callsign |
|
| 232 | + * |
|
| 233 | + * @return Array the spotter information |
|
| 234 | + * |
|
| 235 | + */ |
|
| 236 | + public function getAltitudeArchiveMarineDataByIdent($ident) |
|
| 237 | + { |
|
| 238 | 238 | |
| 239 | - date_default_timezone_set('UTC'); |
|
| 239 | + date_default_timezone_set('UTC'); |
|
| 240 | 240 | |
| 241 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 242 | - $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date"; |
|
| 241 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 242 | + $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date"; |
|
| 243 | 243 | |
| 244 | - try { |
|
| 245 | - $sth = $this->db->prepare($query); |
|
| 246 | - $sth->execute(array(':ident' => $ident)); |
|
| 247 | - } catch(PDOException $e) { |
|
| 248 | - echo $e->getMessage(); |
|
| 249 | - die; |
|
| 250 | - } |
|
| 251 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 244 | + try { |
|
| 245 | + $sth = $this->db->prepare($query); |
|
| 246 | + $sth->execute(array(':ident' => $ident)); |
|
| 247 | + } catch(PDOException $e) { |
|
| 248 | + echo $e->getMessage(); |
|
| 249 | + die; |
|
| 250 | + } |
|
| 251 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 252 | 252 | |
| 253 | - return $spotter_array; |
|
| 254 | - } |
|
| 253 | + return $spotter_array; |
|
| 254 | + } |
|
| 255 | 255 | |
| 256 | - /** |
|
| 257 | - * Gets altitude information based on a particular id |
|
| 258 | - * |
|
| 259 | - * @return Array the spotter information |
|
| 260 | - * |
|
| 261 | - */ |
|
| 262 | - public function getAltitudeArchiveMarineDataById($id) |
|
| 263 | - { |
|
| 256 | + /** |
|
| 257 | + * Gets altitude information based on a particular id |
|
| 258 | + * |
|
| 259 | + * @return Array the spotter information |
|
| 260 | + * |
|
| 261 | + */ |
|
| 262 | + public function getAltitudeArchiveMarineDataById($id) |
|
| 263 | + { |
|
| 264 | 264 | |
| 265 | - date_default_timezone_set('UTC'); |
|
| 265 | + date_default_timezone_set('UTC'); |
|
| 266 | 266 | |
| 267 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 268 | - $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date"; |
|
| 267 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 268 | + $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date"; |
|
| 269 | 269 | |
| 270 | - try { |
|
| 271 | - $sth = $this->db->prepare($query); |
|
| 272 | - $sth->execute(array(':id' => $id)); |
|
| 273 | - } catch(PDOException $e) { |
|
| 274 | - echo $e->getMessage(); |
|
| 275 | - die; |
|
| 276 | - } |
|
| 277 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 270 | + try { |
|
| 271 | + $sth = $this->db->prepare($query); |
|
| 272 | + $sth->execute(array(':id' => $id)); |
|
| 273 | + } catch(PDOException $e) { |
|
| 274 | + echo $e->getMessage(); |
|
| 275 | + die; |
|
| 276 | + } |
|
| 277 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 278 | 278 | |
| 279 | - return $spotter_array; |
|
| 280 | - } |
|
| 279 | + return $spotter_array; |
|
| 280 | + } |
|
| 281 | 281 | |
| 282 | - /** |
|
| 283 | - * Gets altitude & speed information based on a particular id |
|
| 284 | - * |
|
| 285 | - * @return Array the spotter information |
|
| 286 | - * |
|
| 287 | - */ |
|
| 288 | - public function getAltitudeSpeedArchiveMarineDataById($id) |
|
| 289 | - { |
|
| 282 | + /** |
|
| 283 | + * Gets altitude & speed information based on a particular id |
|
| 284 | + * |
|
| 285 | + * @return Array the spotter information |
|
| 286 | + * |
|
| 287 | + */ |
|
| 288 | + public function getAltitudeSpeedArchiveMarineDataById($id) |
|
| 289 | + { |
|
| 290 | 290 | |
| 291 | - date_default_timezone_set('UTC'); |
|
| 291 | + date_default_timezone_set('UTC'); |
|
| 292 | 292 | |
| 293 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 294 | - $query = "SELECT marine_archive.altitude, marine_archive.ground_speed, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id ORDER BY date"; |
|
| 293 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 294 | + $query = "SELECT marine_archive.altitude, marine_archive.ground_speed, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id ORDER BY date"; |
|
| 295 | 295 | |
| 296 | - try { |
|
| 297 | - $sth = $this->db->prepare($query); |
|
| 298 | - $sth->execute(array(':id' => $id)); |
|
| 299 | - } catch(PDOException $e) { |
|
| 300 | - echo $e->getMessage(); |
|
| 301 | - die; |
|
| 302 | - } |
|
| 303 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 296 | + try { |
|
| 297 | + $sth = $this->db->prepare($query); |
|
| 298 | + $sth->execute(array(':id' => $id)); |
|
| 299 | + } catch(PDOException $e) { |
|
| 300 | + echo $e->getMessage(); |
|
| 301 | + die; |
|
| 302 | + } |
|
| 303 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 304 | 304 | |
| 305 | - return $spotter_array; |
|
| 306 | - } |
|
| 305 | + return $spotter_array; |
|
| 306 | + } |
|
| 307 | 307 | |
| 308 | 308 | |
| 309 | - /** |
|
| 310 | - * Gets altitude information based on a particular callsign |
|
| 311 | - * |
|
| 312 | - * @return Array the spotter information |
|
| 313 | - * |
|
| 314 | - */ |
|
| 315 | - public function getLastAltitudeArchiveMarineDataByIdent($ident) |
|
| 316 | - { |
|
| 309 | + /** |
|
| 310 | + * Gets altitude information based on a particular callsign |
|
| 311 | + * |
|
| 312 | + * @return Array the spotter information |
|
| 313 | + * |
|
| 314 | + */ |
|
| 315 | + public function getLastAltitudeArchiveMarineDataByIdent($ident) |
|
| 316 | + { |
|
| 317 | 317 | |
| 318 | - date_default_timezone_set('UTC'); |
|
| 318 | + date_default_timezone_set('UTC'); |
|
| 319 | 319 | |
| 320 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 321 | - $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1"; |
|
| 320 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 321 | + $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1"; |
|
| 322 | 322 | // $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident"; |
| 323 | 323 | |
| 324 | - try { |
|
| 325 | - $sth = $this->db->prepare($query); |
|
| 326 | - $sth->execute(array(':ident' => $ident)); |
|
| 327 | - } catch(PDOException $e) { |
|
| 328 | - echo $e->getMessage(); |
|
| 329 | - die; |
|
| 330 | - } |
|
| 331 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 324 | + try { |
|
| 325 | + $sth = $this->db->prepare($query); |
|
| 326 | + $sth->execute(array(':ident' => $ident)); |
|
| 327 | + } catch(PDOException $e) { |
|
| 328 | + echo $e->getMessage(); |
|
| 329 | + die; |
|
| 330 | + } |
|
| 331 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 332 | 332 | |
| 333 | - return $spotter_array; |
|
| 334 | - } |
|
| 333 | + return $spotter_array; |
|
| 334 | + } |
|
| 335 | 335 | |
| 336 | 336 | |
| 337 | 337 | |
| 338 | - /** |
|
| 339 | - * Gets all the archive spotter information |
|
| 340 | - * |
|
| 341 | - * @return Array the spotter information |
|
| 342 | - * |
|
| 343 | - */ |
|
| 344 | - public function getMarineArchiveData($ident,$fammarine_id,$date) |
|
| 345 | - { |
|
| 346 | - $Marine = new Marine($this->db); |
|
| 347 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 348 | - $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.fammarine_id = :fammarine_id AND l.date LIKE :date GROUP BY l.fammarine_id) s on spotter_live.fammarine_id = s.fammarine_id AND spotter_live.date = s.maxdate"; |
|
| 338 | + /** |
|
| 339 | + * Gets all the archive spotter information |
|
| 340 | + * |
|
| 341 | + * @return Array the spotter information |
|
| 342 | + * |
|
| 343 | + */ |
|
| 344 | + public function getMarineArchiveData($ident,$fammarine_id,$date) |
|
| 345 | + { |
|
| 346 | + $Marine = new Marine($this->db); |
|
| 347 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 348 | + $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.fammarine_id = :fammarine_id AND l.date LIKE :date GROUP BY l.fammarine_id) s on spotter_live.fammarine_id = s.fammarine_id AND spotter_live.date = s.maxdate"; |
|
| 349 | 349 | |
| 350 | - $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':fammarine_id' => $fammarine_id,':date' => $date.'%')); |
|
| 350 | + $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':fammarine_id' => $fammarine_id,':date' => $date.'%')); |
|
| 351 | 351 | |
| 352 | - return $spotter_array; |
|
| 353 | - } |
|
| 352 | + return $spotter_array; |
|
| 353 | + } |
|
| 354 | 354 | |
| 355 | - public function deleteMarineArchiveTrackData() |
|
| 356 | - { |
|
| 355 | + public function deleteMarineArchiveTrackData() |
|
| 356 | + { |
|
| 357 | 357 | global $globalArchiveKeepTrackMonths; |
| 358 | - date_default_timezone_set('UTC'); |
|
| 358 | + date_default_timezone_set('UTC'); |
|
| 359 | 359 | $query = 'DELETE FROM marine_archive WHERE marine_archive.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepTrackMonths.' MONTH)'; |
| 360 | - try { |
|
| 361 | - $sth = $this->db->prepare($query); |
|
| 362 | - $sth->execute(); |
|
| 363 | - } catch(PDOException $e) { |
|
| 364 | - echo $e->getMessage(); |
|
| 365 | - die; |
|
| 366 | - } |
|
| 360 | + try { |
|
| 361 | + $sth = $this->db->prepare($query); |
|
| 362 | + $sth->execute(); |
|
| 363 | + } catch(PDOException $e) { |
|
| 364 | + echo $e->getMessage(); |
|
| 365 | + die; |
|
| 366 | + } |
|
| 367 | 367 | } |
| 368 | 368 | |
| 369 | 369 | /** |
| 370 | - * Gets Minimal Live Marine data |
|
| 371 | - * |
|
| 372 | - * @return Array the spotter information |
|
| 373 | - * |
|
| 374 | - */ |
|
| 375 | - public function getMinLiveMarineData($begindate,$enddate,$filter = array()) |
|
| 376 | - { |
|
| 377 | - global $globalDBdriver, $globalLiveInterval; |
|
| 378 | - date_default_timezone_set('UTC'); |
|
| 379 | - |
|
| 380 | - $filter_query = ''; |
|
| 381 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 382 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 383 | - } |
|
| 384 | - // Use spotter_output also ? |
|
| 385 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 386 | - $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id "; |
|
| 387 | - } |
|
| 388 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 389 | - $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id "; |
|
| 390 | - } |
|
| 391 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 392 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 393 | - } |
|
| 394 | - |
|
| 395 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 396 | - if ($globalDBdriver == 'mysql') { |
|
| 397 | - /* |
|
| 370 | + * Gets Minimal Live Marine data |
|
| 371 | + * |
|
| 372 | + * @return Array the spotter information |
|
| 373 | + * |
|
| 374 | + */ |
|
| 375 | + public function getMinLiveMarineData($begindate,$enddate,$filter = array()) |
|
| 376 | + { |
|
| 377 | + global $globalDBdriver, $globalLiveInterval; |
|
| 378 | + date_default_timezone_set('UTC'); |
|
| 379 | + |
|
| 380 | + $filter_query = ''; |
|
| 381 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 382 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 383 | + } |
|
| 384 | + // Use spotter_output also ? |
|
| 385 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 386 | + $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id "; |
|
| 387 | + } |
|
| 388 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 389 | + $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id "; |
|
| 390 | + } |
|
| 391 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 392 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 393 | + } |
|
| 394 | + |
|
| 395 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 396 | + if ($globalDBdriver == 'mysql') { |
|
| 397 | + /* |
|
| 398 | 398 | $query = 'SELECT a.aircraft_shadow, marine_archive.ident, marine_archive.fammarine_id, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk |
| 399 | 399 | FROM marine_archive |
| 400 | 400 | INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive.aircraft_icao = a.icao'; |
@@ -413,56 +413,56 @@ discard block |
||
| 413 | 413 | INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao |
| 414 | 414 | WHERE marine_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' |
| 415 | 415 | '.$filter_query.' ORDER BY fammarine_id'; |
| 416 | - } else { |
|
| 417 | - //$query = 'SELECT marine_archive.ident, marine_archive.fammarine_id, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao'; |
|
| 418 | - $query = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 416 | + } else { |
|
| 417 | + //$query = 'SELECT marine_archive.ident, marine_archive.fammarine_id, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao'; |
|
| 418 | + $query = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 419 | 419 | FROM marine_archive |
| 420 | 420 | INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao |
| 421 | 421 | WHERE marine_archive.date >= '."'".$begindate."'".' AND marine_archive.date <= '."'".$enddate."'".' |
| 422 | 422 | '.$filter_query.' ORDER BY fammarine_id'; |
| 423 | - } |
|
| 424 | - //echo $query; |
|
| 425 | - try { |
|
| 426 | - $sth = $this->db->prepare($query); |
|
| 427 | - $sth->execute(); |
|
| 428 | - } catch(PDOException $e) { |
|
| 429 | - echo $e->getMessage(); |
|
| 430 | - die; |
|
| 431 | - } |
|
| 432 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 433 | - |
|
| 434 | - return $spotter_array; |
|
| 435 | - } |
|
| 423 | + } |
|
| 424 | + //echo $query; |
|
| 425 | + try { |
|
| 426 | + $sth = $this->db->prepare($query); |
|
| 427 | + $sth->execute(); |
|
| 428 | + } catch(PDOException $e) { |
|
| 429 | + echo $e->getMessage(); |
|
| 430 | + die; |
|
| 431 | + } |
|
| 432 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 433 | + |
|
| 434 | + return $spotter_array; |
|
| 435 | + } |
|
| 436 | 436 | |
| 437 | 437 | /** |
| 438 | - * Gets Minimal Live Marine data |
|
| 439 | - * |
|
| 440 | - * @return Array the spotter information |
|
| 441 | - * |
|
| 442 | - */ |
|
| 443 | - public function getMinLiveMarineDataPlayback($begindate,$enddate,$filter = array()) |
|
| 444 | - { |
|
| 445 | - global $globalDBdriver, $globalLiveInterval; |
|
| 446 | - date_default_timezone_set('UTC'); |
|
| 447 | - |
|
| 448 | - $filter_query = ''; |
|
| 449 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 450 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 451 | - } |
|
| 452 | - // Should use spotter_output also ? |
|
| 453 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 454 | - $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id "; |
|
| 455 | - } |
|
| 456 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 457 | - $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id "; |
|
| 458 | - } |
|
| 459 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 460 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 461 | - } |
|
| 462 | - |
|
| 463 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 464 | - if ($globalDBdriver == 'mysql') { |
|
| 465 | - /* |
|
| 438 | + * Gets Minimal Live Marine data |
|
| 439 | + * |
|
| 440 | + * @return Array the spotter information |
|
| 441 | + * |
|
| 442 | + */ |
|
| 443 | + public function getMinLiveMarineDataPlayback($begindate,$enddate,$filter = array()) |
|
| 444 | + { |
|
| 445 | + global $globalDBdriver, $globalLiveInterval; |
|
| 446 | + date_default_timezone_set('UTC'); |
|
| 447 | + |
|
| 448 | + $filter_query = ''; |
|
| 449 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 450 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 451 | + } |
|
| 452 | + // Should use spotter_output also ? |
|
| 453 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 454 | + $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id "; |
|
| 455 | + } |
|
| 456 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 457 | + $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id "; |
|
| 458 | + } |
|
| 459 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 460 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 461 | + } |
|
| 462 | + |
|
| 463 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 464 | + if ($globalDBdriver == 'mysql') { |
|
| 465 | + /* |
|
| 466 | 466 | $query = 'SELECT a.aircraft_shadow, marine_archive.ident, marine_archive.fammarine_id, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk |
| 467 | 467 | FROM marine_archive |
| 468 | 468 | INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive.aircraft_icao = a.icao'; |
@@ -473,95 +473,95 @@ discard block |
||
| 473 | 473 | WHERE (marine_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') |
| 474 | 474 | '.$filter_query.' GROUP BY marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao, marine_archive_output.arrival_airport_icao, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow'; |
| 475 | 475 | |
| 476 | - } else { |
|
| 477 | - //$query = 'SELECT marine_archive_output.ident, marine_archive_output.fammarine_id, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow FROM marine_archive_output INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_archive_output.fammarine_id = s.fammarine_id AND marine_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on marine_archive_output.aircraft_icao = a.icao'; |
|
| 478 | - /* |
|
| 476 | + } else { |
|
| 477 | + //$query = 'SELECT marine_archive_output.ident, marine_archive_output.fammarine_id, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow FROM marine_archive_output INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_archive_output.fammarine_id = s.fammarine_id AND marine_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on marine_archive_output.aircraft_icao = a.icao'; |
|
| 478 | + /* |
|
| 479 | 479 | $query = 'SELECT marine_archive_output.ident, marine_archive_output.fammarine_id, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow |
| 480 | 480 | FROM marine_archive_output |
| 481 | 481 | INNER JOIN (SELECT * FROM aircraft) a on marine_archive_output.aircraft_icao = a.icao |
| 482 | 482 | WHERE marine_archive_output.date >= '."'".$begindate."'".' AND marine_archive_output.date <= '."'".$enddate."'".' |
| 483 | 483 | '.$filter_query.' GROUP BY marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao, marine_archive_output.arrival_airport_icao, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow'; |
| 484 | 484 | */ |
| 485 | - $query = 'SELECT DISTINCT marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow |
|
| 485 | + $query = 'SELECT DISTINCT marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow |
|
| 486 | 486 | FROM marine_archive_output |
| 487 | 487 | INNER JOIN (SELECT * FROM aircraft) a on marine_archive_output.aircraft_icao = a.icao |
| 488 | 488 | WHERE marine_archive_output.date >= '."'".$begindate."'".' AND marine_archive_output.date <= '."'".$enddate."'".' |
| 489 | 489 | '.$filter_query.' LIMIT 200 OFFSET 0'; |
| 490 | 490 | // .' GROUP BY spotter_output.fammarine_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'; |
| 491 | 491 | |
| 492 | - } |
|
| 493 | - //echo $query; |
|
| 494 | - try { |
|
| 495 | - $sth = $this->db->prepare($query); |
|
| 496 | - $sth->execute(); |
|
| 497 | - } catch(PDOException $e) { |
|
| 498 | - echo $e->getMessage(); |
|
| 499 | - die; |
|
| 500 | - } |
|
| 501 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 502 | - |
|
| 503 | - return $spotter_array; |
|
| 504 | - } |
|
| 492 | + } |
|
| 493 | + //echo $query; |
|
| 494 | + try { |
|
| 495 | + $sth = $this->db->prepare($query); |
|
| 496 | + $sth->execute(); |
|
| 497 | + } catch(PDOException $e) { |
|
| 498 | + echo $e->getMessage(); |
|
| 499 | + die; |
|
| 500 | + } |
|
| 501 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 502 | + |
|
| 503 | + return $spotter_array; |
|
| 504 | + } |
|
| 505 | 505 | |
| 506 | 506 | /** |
| 507 | - * Gets count Live Marine data |
|
| 508 | - * |
|
| 509 | - * @return Array the spotter information |
|
| 510 | - * |
|
| 511 | - */ |
|
| 512 | - public function getLiveMarineCount($begindate,$enddate,$filter = array()) |
|
| 513 | - { |
|
| 514 | - global $globalDBdriver, $globalLiveInterval; |
|
| 515 | - date_default_timezone_set('UTC'); |
|
| 516 | - |
|
| 517 | - $filter_query = ''; |
|
| 518 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 519 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 520 | - } |
|
| 521 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 522 | - $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id "; |
|
| 523 | - } |
|
| 524 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 525 | - $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id "; |
|
| 526 | - } |
|
| 527 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 528 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 529 | - } |
|
| 530 | - |
|
| 531 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 532 | - if ($globalDBdriver == 'mysql') { |
|
| 507 | + * Gets count Live Marine data |
|
| 508 | + * |
|
| 509 | + * @return Array the spotter information |
|
| 510 | + * |
|
| 511 | + */ |
|
| 512 | + public function getLiveMarineCount($begindate,$enddate,$filter = array()) |
|
| 513 | + { |
|
| 514 | + global $globalDBdriver, $globalLiveInterval; |
|
| 515 | + date_default_timezone_set('UTC'); |
|
| 516 | + |
|
| 517 | + $filter_query = ''; |
|
| 518 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 519 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 520 | + } |
|
| 521 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 522 | + $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id "; |
|
| 523 | + } |
|
| 524 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 525 | + $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id "; |
|
| 526 | + } |
|
| 527 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 528 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 529 | + } |
|
| 530 | + |
|
| 531 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 532 | + if ($globalDBdriver == 'mysql') { |
|
| 533 | 533 | $query = 'SELECT COUNT(DISTINCT fammarine_id) as nb |
| 534 | 534 | FROM marine_archive l |
| 535 | 535 | WHERE (l.date BETWEEN DATE_SUB('."'".$begindate."'".',INTERVAL '.$globalLiveInterval.' SECOND) AND '."'".$begindate."'".')'.$filter_query; |
| 536 | - } else { |
|
| 536 | + } else { |
|
| 537 | 537 | $query = 'SELECT COUNT(DISTINCT fammarine_id) as nb FROM marine_archive l WHERE (l.date BETWEEN '."'".$begindate."' - INTERVAL '".$globalLiveInterval." SECONDS' AND "."'".$enddate."'".')'.$filter_query; |
| 538 | - } |
|
| 539 | - //echo $query; |
|
| 540 | - try { |
|
| 541 | - $sth = $this->db->prepare($query); |
|
| 542 | - $sth->execute(); |
|
| 543 | - } catch(PDOException $e) { |
|
| 544 | - echo $e->getMessage(); |
|
| 545 | - die; |
|
| 546 | - } |
|
| 538 | + } |
|
| 539 | + //echo $query; |
|
| 540 | + try { |
|
| 541 | + $sth = $this->db->prepare($query); |
|
| 542 | + $sth->execute(); |
|
| 543 | + } catch(PDOException $e) { |
|
| 544 | + echo $e->getMessage(); |
|
| 545 | + die; |
|
| 546 | + } |
|
| 547 | 547 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
| 548 | 548 | $sth->closeCursor(); |
| 549 | - return $result['nb']; |
|
| 549 | + return $result['nb']; |
|
| 550 | 550 | |
| 551 | - } |
|
| 551 | + } |
|
| 552 | 552 | |
| 553 | 553 | |
| 554 | 554 | |
| 555 | 555 | // marine_archive_output |
| 556 | 556 | |
| 557 | - /** |
|
| 558 | - * Gets all the spotter information |
|
| 559 | - * |
|
| 560 | - * @return Array the spotter information |
|
| 561 | - * |
|
| 562 | - */ |
|
| 563 | - public function searchMarineData($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()) |
|
| 564 | - { |
|
| 557 | + /** |
|
| 558 | + * Gets all the spotter information |
|
| 559 | + * |
|
| 560 | + * @return Array the spotter information |
|
| 561 | + * |
|
| 562 | + */ |
|
| 563 | + public function searchMarineData($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()) |
|
| 564 | + { |
|
| 565 | 565 | global $globalTimezone, $globalDBdriver; |
| 566 | 566 | require_once(dirname(__FILE__).'/class.Translation.php'); |
| 567 | 567 | $Translation = new Translation(); |
@@ -575,159 +575,159 @@ discard block |
||
| 575 | 575 | $filter_query = $this->getFilter($filters); |
| 576 | 576 | if ($q != "") |
| 577 | 577 | { |
| 578 | - if (!is_string($q)) |
|
| 579 | - { |
|
| 578 | + if (!is_string($q)) |
|
| 579 | + { |
|
| 580 | 580 | return false; |
| 581 | - } else { |
|
| 581 | + } else { |
|
| 582 | 582 | |
| 583 | 583 | $q_array = explode(" ", $q); |
| 584 | 584 | |
| 585 | 585 | foreach ($q_array as $q_item){ |
| 586 | - $additional_query .= " AND ("; |
|
| 587 | - $additional_query .= "(marine_archive_output.spotter_id like '%".$q_item."%') OR "; |
|
| 588 | - $additional_query .= "(marine_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
|
| 589 | - $additional_query .= "(marine_archive_output.aircraft_name like '%".$q_item."%') OR "; |
|
| 590 | - $additional_query .= "(marine_archive_output.aircraft_manufacturer like '%".$q_item."%') OR "; |
|
| 591 | - $additional_query .= "(marine_archive_output.airline_icao like '%".$q_item."%') OR "; |
|
| 592 | - $additional_query .= "(marine_archive_output.airline_name like '%".$q_item."%') OR "; |
|
| 593 | - $additional_query .= "(marine_archive_output.airline_country like '%".$q_item."%') OR "; |
|
| 594 | - $additional_query .= "(marine_archive_output.departure_airport_icao like '%".$q_item."%') OR "; |
|
| 595 | - $additional_query .= "(marine_archive_output.departure_airport_name like '%".$q_item."%') OR "; |
|
| 596 | - $additional_query .= "(marine_archive_output.departure_airport_city like '%".$q_item."%') OR "; |
|
| 597 | - $additional_query .= "(marine_archive_output.departure_airport_country like '%".$q_item."%') OR "; |
|
| 598 | - $additional_query .= "(marine_archive_output.arrival_airport_icao like '%".$q_item."%') OR "; |
|
| 599 | - $additional_query .= "(marine_archive_output.arrival_airport_name like '%".$q_item."%') OR "; |
|
| 600 | - $additional_query .= "(marine_archive_output.arrival_airport_city like '%".$q_item."%') OR "; |
|
| 601 | - $additional_query .= "(marine_archive_output.arrival_airport_country like '%".$q_item."%') OR "; |
|
| 602 | - $additional_query .= "(marine_archive_output.registration like '%".$q_item."%') OR "; |
|
| 603 | - $additional_query .= "(marine_archive_output.owner_name like '%".$q_item."%') OR "; |
|
| 604 | - $additional_query .= "(marine_archive_output.pilot_id like '%".$q_item."%') OR "; |
|
| 605 | - $additional_query .= "(marine_archive_output.pilot_name like '%".$q_item."%') OR "; |
|
| 606 | - $additional_query .= "(marine_archive_output.ident like '%".$q_item."%') OR "; |
|
| 607 | - $translate = $Translation->ident2icao($q_item); |
|
| 608 | - if ($translate != $q_item) $additional_query .= "(marine_archive_output.ident like '%".$translate."%') OR "; |
|
| 609 | - $additional_query .= "(marine_archive_output.highlight like '%".$q_item."%')"; |
|
| 610 | - $additional_query .= ")"; |
|
| 586 | + $additional_query .= " AND ("; |
|
| 587 | + $additional_query .= "(marine_archive_output.spotter_id like '%".$q_item."%') OR "; |
|
| 588 | + $additional_query .= "(marine_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
|
| 589 | + $additional_query .= "(marine_archive_output.aircraft_name like '%".$q_item."%') OR "; |
|
| 590 | + $additional_query .= "(marine_archive_output.aircraft_manufacturer like '%".$q_item."%') OR "; |
|
| 591 | + $additional_query .= "(marine_archive_output.airline_icao like '%".$q_item."%') OR "; |
|
| 592 | + $additional_query .= "(marine_archive_output.airline_name like '%".$q_item."%') OR "; |
|
| 593 | + $additional_query .= "(marine_archive_output.airline_country like '%".$q_item."%') OR "; |
|
| 594 | + $additional_query .= "(marine_archive_output.departure_airport_icao like '%".$q_item."%') OR "; |
|
| 595 | + $additional_query .= "(marine_archive_output.departure_airport_name like '%".$q_item."%') OR "; |
|
| 596 | + $additional_query .= "(marine_archive_output.departure_airport_city like '%".$q_item."%') OR "; |
|
| 597 | + $additional_query .= "(marine_archive_output.departure_airport_country like '%".$q_item."%') OR "; |
|
| 598 | + $additional_query .= "(marine_archive_output.arrival_airport_icao like '%".$q_item."%') OR "; |
|
| 599 | + $additional_query .= "(marine_archive_output.arrival_airport_name like '%".$q_item."%') OR "; |
|
| 600 | + $additional_query .= "(marine_archive_output.arrival_airport_city like '%".$q_item."%') OR "; |
|
| 601 | + $additional_query .= "(marine_archive_output.arrival_airport_country like '%".$q_item."%') OR "; |
|
| 602 | + $additional_query .= "(marine_archive_output.registration like '%".$q_item."%') OR "; |
|
| 603 | + $additional_query .= "(marine_archive_output.owner_name like '%".$q_item."%') OR "; |
|
| 604 | + $additional_query .= "(marine_archive_output.pilot_id like '%".$q_item."%') OR "; |
|
| 605 | + $additional_query .= "(marine_archive_output.pilot_name like '%".$q_item."%') OR "; |
|
| 606 | + $additional_query .= "(marine_archive_output.ident like '%".$q_item."%') OR "; |
|
| 607 | + $translate = $Translation->ident2icao($q_item); |
|
| 608 | + if ($translate != $q_item) $additional_query .= "(marine_archive_output.ident like '%".$translate."%') OR "; |
|
| 609 | + $additional_query .= "(marine_archive_output.highlight like '%".$q_item."%')"; |
|
| 610 | + $additional_query .= ")"; |
|
| 611 | + } |
|
| 611 | 612 | } |
| 612 | - } |
|
| 613 | 613 | } |
| 614 | 614 | |
| 615 | 615 | if ($registration != "") |
| 616 | 616 | { |
| 617 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 618 | - if (!is_string($registration)) |
|
| 619 | - { |
|
| 617 | + $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 618 | + if (!is_string($registration)) |
|
| 619 | + { |
|
| 620 | 620 | return false; |
| 621 | - } else { |
|
| 621 | + } else { |
|
| 622 | 622 | $additional_query .= " AND (marine_archive_output.registration = '".$registration."')"; |
| 623 | - } |
|
| 623 | + } |
|
| 624 | 624 | } |
| 625 | 625 | |
| 626 | 626 | if ($aircraft_icao != "") |
| 627 | 627 | { |
| 628 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 629 | - if (!is_string($aircraft_icao)) |
|
| 630 | - { |
|
| 628 | + $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 629 | + if (!is_string($aircraft_icao)) |
|
| 630 | + { |
|
| 631 | 631 | return false; |
| 632 | - } else { |
|
| 632 | + } else { |
|
| 633 | 633 | $additional_query .= " AND (marine_archive_output.aircraft_icao = '".$aircraft_icao."')"; |
| 634 | - } |
|
| 634 | + } |
|
| 635 | 635 | } |
| 636 | 636 | |
| 637 | 637 | if ($aircraft_manufacturer != "") |
| 638 | 638 | { |
| 639 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 640 | - if (!is_string($aircraft_manufacturer)) |
|
| 641 | - { |
|
| 639 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 640 | + if (!is_string($aircraft_manufacturer)) |
|
| 641 | + { |
|
| 642 | 642 | return false; |
| 643 | - } else { |
|
| 643 | + } else { |
|
| 644 | 644 | $additional_query .= " AND (marine_archive_output.aircraft_manufacturer = '".$aircraft_manufacturer."')"; |
| 645 | - } |
|
| 645 | + } |
|
| 646 | 646 | } |
| 647 | 647 | |
| 648 | 648 | if ($highlights == "true") |
| 649 | 649 | { |
| 650 | - if (!is_string($highlights)) |
|
| 651 | - { |
|
| 650 | + if (!is_string($highlights)) |
|
| 651 | + { |
|
| 652 | 652 | return false; |
| 653 | - } else { |
|
| 653 | + } else { |
|
| 654 | 654 | $additional_query .= " AND (marine_archive_output.highlight <> '')"; |
| 655 | - } |
|
| 655 | + } |
|
| 656 | 656 | } |
| 657 | 657 | |
| 658 | 658 | if ($airline_icao != "") |
| 659 | 659 | { |
| 660 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 661 | - if (!is_string($airline_icao)) |
|
| 662 | - { |
|
| 660 | + $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 661 | + if (!is_string($airline_icao)) |
|
| 662 | + { |
|
| 663 | 663 | return false; |
| 664 | - } else { |
|
| 664 | + } else { |
|
| 665 | 665 | $additional_query .= " AND (marine_archive_output.airline_icao = '".$airline_icao."')"; |
| 666 | - } |
|
| 666 | + } |
|
| 667 | 667 | } |
| 668 | 668 | |
| 669 | 669 | if ($airline_country != "") |
| 670 | 670 | { |
| 671 | - $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 672 | - if (!is_string($airline_country)) |
|
| 673 | - { |
|
| 671 | + $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 672 | + if (!is_string($airline_country)) |
|
| 673 | + { |
|
| 674 | 674 | return false; |
| 675 | - } else { |
|
| 675 | + } else { |
|
| 676 | 676 | $additional_query .= " AND (marine_archive_output.airline_country = '".$airline_country."')"; |
| 677 | - } |
|
| 677 | + } |
|
| 678 | 678 | } |
| 679 | 679 | |
| 680 | 680 | if ($airline_type != "") |
| 681 | 681 | { |
| 682 | - $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 683 | - if (!is_string($airline_type)) |
|
| 684 | - { |
|
| 682 | + $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 683 | + if (!is_string($airline_type)) |
|
| 684 | + { |
|
| 685 | 685 | return false; |
| 686 | - } else { |
|
| 686 | + } else { |
|
| 687 | 687 | if ($airline_type == "passenger") |
| 688 | 688 | { |
| 689 | - $additional_query .= " AND (marine_archive_output.airline_type = 'passenger')"; |
|
| 689 | + $additional_query .= " AND (marine_archive_output.airline_type = 'passenger')"; |
|
| 690 | 690 | } |
| 691 | 691 | if ($airline_type == "cargo") |
| 692 | 692 | { |
| 693 | - $additional_query .= " AND (marine_archive_output.airline_type = 'cargo')"; |
|
| 693 | + $additional_query .= " AND (marine_archive_output.airline_type = 'cargo')"; |
|
| 694 | 694 | } |
| 695 | 695 | if ($airline_type == "military") |
| 696 | 696 | { |
| 697 | - $additional_query .= " AND (marine_archive_output.airline_type = 'military')"; |
|
| 697 | + $additional_query .= " AND (marine_archive_output.airline_type = 'military')"; |
|
| 698 | + } |
|
| 698 | 699 | } |
| 699 | - } |
|
| 700 | 700 | } |
| 701 | 701 | |
| 702 | 702 | if ($airport != "") |
| 703 | 703 | { |
| 704 | - $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 705 | - if (!is_string($airport)) |
|
| 706 | - { |
|
| 704 | + $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 705 | + if (!is_string($airport)) |
|
| 706 | + { |
|
| 707 | 707 | return false; |
| 708 | - } else { |
|
| 708 | + } else { |
|
| 709 | 709 | $additional_query .= " AND ((marine_archive_output.departure_airport_icao = '".$airport."') OR (marine_archive_output.arrival_airport_icao = '".$airport."'))"; |
| 710 | - } |
|
| 710 | + } |
|
| 711 | 711 | } |
| 712 | 712 | |
| 713 | 713 | if ($airport_country != "") |
| 714 | 714 | { |
| 715 | - $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 716 | - if (!is_string($airport_country)) |
|
| 717 | - { |
|
| 715 | + $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 716 | + if (!is_string($airport_country)) |
|
| 717 | + { |
|
| 718 | 718 | return false; |
| 719 | - } else { |
|
| 719 | + } else { |
|
| 720 | 720 | $additional_query .= " AND ((marine_archive_output.departure_airport_country = '".$airport_country."') OR (marine_archive_output.arrival_airport_country = '".$airport_country."'))"; |
| 721 | - } |
|
| 721 | + } |
|
| 722 | 722 | } |
| 723 | 723 | |
| 724 | 724 | if ($callsign != "") |
| 725 | 725 | { |
| 726 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 727 | - if (!is_string($callsign)) |
|
| 728 | - { |
|
| 726 | + $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 727 | + if (!is_string($callsign)) |
|
| 728 | + { |
|
| 729 | 729 | return false; |
| 730 | - } else { |
|
| 730 | + } else { |
|
| 731 | 731 | $translate = $Translation->ident2icao($callsign); |
| 732 | 732 | if ($translate != $callsign) { |
| 733 | 733 | $additional_query .= " AND (marine_archive_output.ident = :callsign OR marine_archive_output.ident = :translate)"; |
@@ -735,99 +735,99 @@ discard block |
||
| 735 | 735 | } else { |
| 736 | 736 | $additional_query .= " AND (marine_archive_output.ident = '".$callsign."')"; |
| 737 | 737 | } |
| 738 | - } |
|
| 738 | + } |
|
| 739 | 739 | } |
| 740 | 740 | |
| 741 | 741 | if ($owner != "") |
| 742 | 742 | { |
| 743 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 744 | - if (!is_string($owner)) |
|
| 745 | - { |
|
| 743 | + $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 744 | + if (!is_string($owner)) |
|
| 745 | + { |
|
| 746 | 746 | return false; |
| 747 | - } else { |
|
| 747 | + } else { |
|
| 748 | 748 | $additional_query .= " AND (marine_archive_output.owner_name = '".$owner."')"; |
| 749 | - } |
|
| 749 | + } |
|
| 750 | 750 | } |
| 751 | 751 | |
| 752 | 752 | if ($pilot_name != "") |
| 753 | 753 | { |
| 754 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 755 | - if (!is_string($pilot_name)) |
|
| 756 | - { |
|
| 754 | + $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 755 | + if (!is_string($pilot_name)) |
|
| 756 | + { |
|
| 757 | 757 | return false; |
| 758 | - } else { |
|
| 758 | + } else { |
|
| 759 | 759 | $additional_query .= " AND (marine_archive_output.pilot_name = '".$pilot_name."')"; |
| 760 | - } |
|
| 760 | + } |
|
| 761 | 761 | } |
| 762 | 762 | |
| 763 | 763 | if ($pilot_id != "") |
| 764 | 764 | { |
| 765 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 766 | - if (!is_string($pilot_id)) |
|
| 767 | - { |
|
| 765 | + $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 766 | + if (!is_string($pilot_id)) |
|
| 767 | + { |
|
| 768 | 768 | return false; |
| 769 | - } else { |
|
| 769 | + } else { |
|
| 770 | 770 | $additional_query .= " AND (marine_archive_output.pilot_id = '".$pilot_id."')"; |
| 771 | - } |
|
| 771 | + } |
|
| 772 | 772 | } |
| 773 | 773 | |
| 774 | 774 | if ($departure_airport_route != "") |
| 775 | 775 | { |
| 776 | - $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 777 | - if (!is_string($departure_airport_route)) |
|
| 778 | - { |
|
| 776 | + $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 777 | + if (!is_string($departure_airport_route)) |
|
| 778 | + { |
|
| 779 | 779 | return false; |
| 780 | - } else { |
|
| 780 | + } else { |
|
| 781 | 781 | $additional_query .= " AND (marine_archive_output.departure_airport_icao = '".$departure_airport_route."')"; |
| 782 | - } |
|
| 782 | + } |
|
| 783 | 783 | } |
| 784 | 784 | |
| 785 | 785 | if ($arrival_airport_route != "") |
| 786 | 786 | { |
| 787 | - $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 788 | - if (!is_string($arrival_airport_route)) |
|
| 789 | - { |
|
| 787 | + $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 788 | + if (!is_string($arrival_airport_route)) |
|
| 789 | + { |
|
| 790 | 790 | return false; |
| 791 | - } else { |
|
| 791 | + } else { |
|
| 792 | 792 | $additional_query .= " AND (marine_archive_output.arrival_airport_icao = '".$arrival_airport_route."')"; |
| 793 | - } |
|
| 793 | + } |
|
| 794 | 794 | } |
| 795 | 795 | |
| 796 | 796 | if ($altitude != "") |
| 797 | 797 | { |
| 798 | - $altitude_array = explode(",", $altitude); |
|
| 798 | + $altitude_array = explode(",", $altitude); |
|
| 799 | 799 | |
| 800 | - $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 801 | - $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 800 | + $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 801 | + $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 802 | 802 | |
| 803 | 803 | |
| 804 | - if ($altitude_array[1] != "") |
|
| 805 | - { |
|
| 804 | + if ($altitude_array[1] != "") |
|
| 805 | + { |
|
| 806 | 806 | $altitude_array[0] = substr($altitude_array[0], 0, -2); |
| 807 | 807 | $altitude_array[1] = substr($altitude_array[1], 0, -2); |
| 808 | 808 | $additional_query .= " AND altitude BETWEEN '".$altitude_array[0]."' AND '".$altitude_array[1]."' "; |
| 809 | - } else { |
|
| 809 | + } else { |
|
| 810 | 810 | $altitude_array[0] = substr($altitude_array[0], 0, -2); |
| 811 | 811 | $additional_query .= " AND altitude <= '".$altitude_array[0]."' "; |
| 812 | - } |
|
| 812 | + } |
|
| 813 | 813 | } |
| 814 | 814 | |
| 815 | 815 | if ($date_posted != "") |
| 816 | 816 | { |
| 817 | - $date_array = explode(",", $date_posted); |
|
| 817 | + $date_array = explode(",", $date_posted); |
|
| 818 | 818 | |
| 819 | - $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 820 | - $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 819 | + $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 820 | + $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 821 | 821 | |
| 822 | - if ($globalTimezone != '') { |
|
| 822 | + if ($globalTimezone != '') { |
|
| 823 | 823 | date_default_timezone_set($globalTimezone); |
| 824 | 824 | $datetime = new DateTime(); |
| 825 | 825 | $offset = $datetime->format('P'); |
| 826 | - } else $offset = '+00:00'; |
|
| 826 | + } else $offset = '+00:00'; |
|
| 827 | 827 | |
| 828 | 828 | |
| 829 | - if ($date_array[1] != "") |
|
| 830 | - { |
|
| 829 | + if ($date_array[1] != "") |
|
| 830 | + { |
|
| 831 | 831 | $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0])); |
| 832 | 832 | $date_array[1] = date("Y-m-d H:i:s", strtotime($date_array[1])); |
| 833 | 833 | if ($globalDBdriver == 'mysql') { |
@@ -835,28 +835,28 @@ discard block |
||
| 835 | 835 | } else { |
| 836 | 836 | $additional_query .= " AND marine_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) AND marine_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." <= CAST('".$date_array[1]."' AS TIMESTAMP) "; |
| 837 | 837 | } |
| 838 | - } else { |
|
| 838 | + } else { |
|
| 839 | 839 | $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0])); |
| 840 | - if ($globalDBdriver == 'mysql') { |
|
| 840 | + if ($globalDBdriver == 'mysql') { |
|
| 841 | 841 | $additional_query .= " AND TIMESTAMP(CONVERT_TZ(marine_archive_output.date,'+00:00', '".$offset."')) >= '".$date_array[0]."' "; |
| 842 | 842 | } else { |
| 843 | 843 | $additional_query .= " AND marine_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) "; |
| 844 | 844 | } |
| 845 | - } |
|
| 845 | + } |
|
| 846 | 846 | } |
| 847 | 847 | |
| 848 | 848 | if ($limit != "") |
| 849 | 849 | { |
| 850 | - $limit_array = explode(",", $limit); |
|
| 850 | + $limit_array = explode(",", $limit); |
|
| 851 | 851 | |
| 852 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 853 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 852 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 853 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 854 | 854 | |
| 855 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 856 | - { |
|
| 855 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 856 | + { |
|
| 857 | 857 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 858 | 858 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 859 | - } |
|
| 859 | + } |
|
| 860 | 860 | } |
| 861 | 861 | |
| 862 | 862 | |
@@ -887,33 +887,33 @@ discard block |
||
| 887 | 887 | $spotter_array = $Marine->getDataFromDB($query, $query_values,$limit_query); |
| 888 | 888 | |
| 889 | 889 | return $spotter_array; |
| 890 | - } |
|
| 890 | + } |
|
| 891 | 891 | |
| 892 | - public function deleteMarineArchiveData() |
|
| 893 | - { |
|
| 892 | + public function deleteMarineArchiveData() |
|
| 893 | + { |
|
| 894 | 894 | global $globalArchiveKeepMonths, $globalDBdriver; |
| 895 | - date_default_timezone_set('UTC'); |
|
| 896 | - if ($globalDBdriver == 'mysql') { |
|
| 895 | + date_default_timezone_set('UTC'); |
|
| 896 | + if ($globalDBdriver == 'mysql') { |
|
| 897 | 897 | $query = 'DELETE FROM marine_archive_output WHERE marine_archive_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepMonths.' MONTH)'; |
| 898 | 898 | } else { |
| 899 | 899 | $query = "DELETE FROM marine_archive_output WHERE marine_archive_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveKeepMonths." MONTH'"; |
| 900 | 900 | } |
| 901 | - try { |
|
| 902 | - $sth = $this->db->prepare($query); |
|
| 903 | - $sth->execute(); |
|
| 904 | - } catch(PDOException $e) { |
|
| 905 | - return "error"; |
|
| 906 | - } |
|
| 901 | + try { |
|
| 902 | + $sth = $this->db->prepare($query); |
|
| 903 | + $sth->execute(); |
|
| 904 | + } catch(PDOException $e) { |
|
| 905 | + return "error"; |
|
| 906 | + } |
|
| 907 | 907 | } |
| 908 | 908 | |
| 909 | - /** |
|
| 910 | - * Gets all the spotter information based on the callsign |
|
| 911 | - * |
|
| 912 | - * @return Array the spotter information |
|
| 913 | - * |
|
| 914 | - */ |
|
| 915 | - public function getMarineDataByIdent($ident = '', $limit = '', $sort = '') |
|
| 916 | - { |
|
| 909 | + /** |
|
| 910 | + * Gets all the spotter information based on the callsign |
|
| 911 | + * |
|
| 912 | + * @return Array the spotter information |
|
| 913 | + * |
|
| 914 | + */ |
|
| 915 | + public function getMarineDataByIdent($ident = '', $limit = '', $sort = '') |
|
| 916 | + { |
|
| 917 | 917 | $global_query = "SELECT marine_archive_output.* FROM marine_archive_output"; |
| 918 | 918 | |
| 919 | 919 | date_default_timezone_set('UTC'); |
@@ -925,35 +925,35 @@ discard block |
||
| 925 | 925 | |
| 926 | 926 | if ($ident != "") |
| 927 | 927 | { |
| 928 | - if (!is_string($ident)) |
|
| 929 | - { |
|
| 928 | + if (!is_string($ident)) |
|
| 929 | + { |
|
| 930 | 930 | return false; |
| 931 | - } else { |
|
| 931 | + } else { |
|
| 932 | 932 | $additional_query = " AND (marine_archive_output.ident = :ident)"; |
| 933 | 933 | $query_values = array(':ident' => $ident); |
| 934 | - } |
|
| 934 | + } |
|
| 935 | 935 | } |
| 936 | 936 | |
| 937 | 937 | if ($limit != "") |
| 938 | 938 | { |
| 939 | - $limit_array = explode(",", $limit); |
|
| 939 | + $limit_array = explode(",", $limit); |
|
| 940 | 940 | |
| 941 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 942 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 941 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 942 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 943 | 943 | |
| 944 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 945 | - { |
|
| 944 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 945 | + { |
|
| 946 | 946 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 947 | 947 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 948 | - } |
|
| 948 | + } |
|
| 949 | 949 | } |
| 950 | 950 | |
| 951 | 951 | if ($sort != "") |
| 952 | 952 | { |
| 953 | - $search_orderby_array = $Marine->getOrderBy(); |
|
| 954 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 953 | + $search_orderby_array = $Marine->getOrderBy(); |
|
| 954 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 955 | 955 | } else { |
| 956 | - $orderby_query = " ORDER BY marine_archive_output.date DESC"; |
|
| 956 | + $orderby_query = " ORDER BY marine_archive_output.date DESC"; |
|
| 957 | 957 | } |
| 958 | 958 | |
| 959 | 959 | $query = $global_query." WHERE marine_archive_output.ident <> '' ".$additional_query." ".$orderby_query; |
@@ -961,17 +961,17 @@ discard block |
||
| 961 | 961 | $spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query); |
| 962 | 962 | |
| 963 | 963 | return $spotter_array; |
| 964 | - } |
|
| 964 | + } |
|
| 965 | 965 | |
| 966 | 966 | |
| 967 | - /** |
|
| 968 | - * Gets all the spotter information based on the owner |
|
| 969 | - * |
|
| 970 | - * @return Array the spotter information |
|
| 971 | - * |
|
| 972 | - */ |
|
| 973 | - public function getMarineDataByOwner($owner = '', $limit = '', $sort = '', $filter = array()) |
|
| 974 | - { |
|
| 967 | + /** |
|
| 968 | + * Gets all the spotter information based on the owner |
|
| 969 | + * |
|
| 970 | + * @return Array the spotter information |
|
| 971 | + * |
|
| 972 | + */ |
|
| 973 | + public function getMarineDataByOwner($owner = '', $limit = '', $sort = '', $filter = array()) |
|
| 974 | + { |
|
| 975 | 975 | $global_query = "SELECT marine_archive_output.* FROM marine_archive_output"; |
| 976 | 976 | |
| 977 | 977 | date_default_timezone_set('UTC'); |
@@ -984,35 +984,35 @@ discard block |
||
| 984 | 984 | |
| 985 | 985 | if ($owner != "") |
| 986 | 986 | { |
| 987 | - if (!is_string($owner)) |
|
| 988 | - { |
|
| 987 | + if (!is_string($owner)) |
|
| 988 | + { |
|
| 989 | 989 | return false; |
| 990 | - } else { |
|
| 990 | + } else { |
|
| 991 | 991 | $additional_query = " AND (marine_archive_output.owner_name = :owner)"; |
| 992 | 992 | $query_values = array(':owner' => $owner); |
| 993 | - } |
|
| 993 | + } |
|
| 994 | 994 | } |
| 995 | 995 | |
| 996 | 996 | if ($limit != "") |
| 997 | 997 | { |
| 998 | - $limit_array = explode(",", $limit); |
|
| 998 | + $limit_array = explode(",", $limit); |
|
| 999 | 999 | |
| 1000 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1001 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1000 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1001 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1002 | 1002 | |
| 1003 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1004 | - { |
|
| 1003 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1004 | + { |
|
| 1005 | 1005 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 1006 | 1006 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 1007 | - } |
|
| 1007 | + } |
|
| 1008 | 1008 | } |
| 1009 | 1009 | |
| 1010 | 1010 | if ($sort != "") |
| 1011 | 1011 | { |
| 1012 | - $search_orderby_array = $Marine->getOrderBy(); |
|
| 1013 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1012 | + $search_orderby_array = $Marine->getOrderBy(); |
|
| 1013 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1014 | 1014 | } else { |
| 1015 | - $orderby_query = " ORDER BY marine_archive_output.date DESC"; |
|
| 1015 | + $orderby_query = " ORDER BY marine_archive_output.date DESC"; |
|
| 1016 | 1016 | } |
| 1017 | 1017 | |
| 1018 | 1018 | $query = $global_query.$filter_query." marine_archive_output.owner_name <> '' ".$additional_query." ".$orderby_query; |
@@ -1020,16 +1020,16 @@ discard block |
||
| 1020 | 1020 | $spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query); |
| 1021 | 1021 | |
| 1022 | 1022 | return $spotter_array; |
| 1023 | - } |
|
| 1023 | + } |
|
| 1024 | 1024 | |
| 1025 | - /** |
|
| 1026 | - * Gets all the spotter information based on the pilot |
|
| 1027 | - * |
|
| 1028 | - * @return Array the spotter information |
|
| 1029 | - * |
|
| 1030 | - */ |
|
| 1031 | - public function getMarineDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array()) |
|
| 1032 | - { |
|
| 1025 | + /** |
|
| 1026 | + * Gets all the spotter information based on the pilot |
|
| 1027 | + * |
|
| 1028 | + * @return Array the spotter information |
|
| 1029 | + * |
|
| 1030 | + */ |
|
| 1031 | + public function getMarineDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array()) |
|
| 1032 | + { |
|
| 1033 | 1033 | $global_query = "SELECT marine_archive_output.* FROM marine_archive_output"; |
| 1034 | 1034 | |
| 1035 | 1035 | date_default_timezone_set('UTC'); |
@@ -1048,24 +1048,24 @@ discard block |
||
| 1048 | 1048 | |
| 1049 | 1049 | if ($limit != "") |
| 1050 | 1050 | { |
| 1051 | - $limit_array = explode(",", $limit); |
|
| 1051 | + $limit_array = explode(",", $limit); |
|
| 1052 | 1052 | |
| 1053 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1054 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1053 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1054 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1055 | 1055 | |
| 1056 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1057 | - { |
|
| 1056 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1057 | + { |
|
| 1058 | 1058 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 1059 | 1059 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 1060 | - } |
|
| 1060 | + } |
|
| 1061 | 1061 | } |
| 1062 | 1062 | |
| 1063 | 1063 | if ($sort != "") |
| 1064 | 1064 | { |
| 1065 | - $search_orderby_array = $Marine->getOrderBy(); |
|
| 1066 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1065 | + $search_orderby_array = $Marine->getOrderBy(); |
|
| 1066 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1067 | 1067 | } else { |
| 1068 | - $orderby_query = " ORDER BY marine_archive_output.date DESC"; |
|
| 1068 | + $orderby_query = " ORDER BY marine_archive_output.date DESC"; |
|
| 1069 | 1069 | } |
| 1070 | 1070 | |
| 1071 | 1071 | $query = $global_query.$filter_query." marine_archive_output.pilot_name <> '' ".$additional_query." ".$orderby_query; |
@@ -1073,16 +1073,16 @@ discard block |
||
| 1073 | 1073 | $spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query); |
| 1074 | 1074 | |
| 1075 | 1075 | return $spotter_array; |
| 1076 | - } |
|
| 1076 | + } |
|
| 1077 | 1077 | |
| 1078 | - /** |
|
| 1079 | - * Gets all number of flight over countries |
|
| 1080 | - * |
|
| 1081 | - * @return Array the airline country list |
|
| 1082 | - * |
|
| 1083 | - */ |
|
| 1084 | - public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1085 | - { |
|
| 1078 | + /** |
|
| 1079 | + * Gets all number of flight over countries |
|
| 1080 | + * |
|
| 1081 | + * @return Array the airline country list |
|
| 1082 | + * |
|
| 1083 | + */ |
|
| 1084 | + public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1085 | + { |
|
| 1086 | 1086 | global $globalDBdriver; |
| 1087 | 1087 | /* |
| 1088 | 1088 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
@@ -1092,14 +1092,14 @@ discard block |
||
| 1092 | 1092 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
| 1093 | 1093 | FROM countries c, marine_archive s |
| 1094 | 1094 | WHERE c.iso2 = s.over_country "; |
| 1095 | - if ($olderthanmonths > 0) { |
|
| 1096 | - if ($globalDBdriver == 'mysql') { |
|
| 1095 | + if ($olderthanmonths > 0) { |
|
| 1096 | + if ($globalDBdriver == 'mysql') { |
|
| 1097 | 1097 | $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) '; |
| 1098 | 1098 | } else { |
| 1099 | 1099 | $query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1100 | 1100 | } |
| 1101 | 1101 | } |
| 1102 | - if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
| 1102 | + if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
| 1103 | 1103 | $query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1104 | 1104 | if ($limit) $query .= " LIMIT 0,10"; |
| 1105 | 1105 | |
@@ -1112,23 +1112,23 @@ discard block |
||
| 1112 | 1112 | |
| 1113 | 1113 | while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
| 1114 | 1114 | { |
| 1115 | - $temp_array['flight_count'] = $row['nb']; |
|
| 1116 | - $temp_array['flight_country'] = $row['name']; |
|
| 1117 | - $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1118 | - $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1119 | - $flight_array[] = $temp_array; |
|
| 1115 | + $temp_array['flight_count'] = $row['nb']; |
|
| 1116 | + $temp_array['flight_country'] = $row['name']; |
|
| 1117 | + $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1118 | + $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1119 | + $flight_array[] = $temp_array; |
|
| 1120 | 1120 | } |
| 1121 | 1121 | return $flight_array; |
| 1122 | - } |
|
| 1122 | + } |
|
| 1123 | 1123 | |
| 1124 | - /** |
|
| 1125 | - * Gets all number of flight over countries |
|
| 1126 | - * |
|
| 1127 | - * @return Array the airline country list |
|
| 1128 | - * |
|
| 1129 | - */ |
|
| 1130 | - public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1131 | - { |
|
| 1124 | + /** |
|
| 1125 | + * Gets all number of flight over countries |
|
| 1126 | + * |
|
| 1127 | + * @return Array the airline country list |
|
| 1128 | + * |
|
| 1129 | + */ |
|
| 1130 | + public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1131 | + { |
|
| 1132 | 1132 | global $globalDBdriver; |
| 1133 | 1133 | /* |
| 1134 | 1134 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
@@ -1138,14 +1138,14 @@ discard block |
||
| 1138 | 1138 | $query = "SELECT o.airline_icao,c.name, c.iso3, c.iso2, count(c.name) as nb |
| 1139 | 1139 | FROM countries c, marine_archive s, spotter_output o |
| 1140 | 1140 | WHERE c.iso2 = s.over_country AND o.airline_icao <> '' AND o.fammarine_id = s.fammarine_id "; |
| 1141 | - if ($olderthanmonths > 0) { |
|
| 1142 | - if ($globalDBdriver == 'mysql') { |
|
| 1141 | + if ($olderthanmonths > 0) { |
|
| 1142 | + if ($globalDBdriver == 'mysql') { |
|
| 1143 | 1143 | $query .= 'AND s.date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) '; |
| 1144 | 1144 | } else { |
| 1145 | 1145 | $query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1146 | 1146 | } |
| 1147 | 1147 | } |
| 1148 | - if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' "; |
|
| 1148 | + if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' "; |
|
| 1149 | 1149 | $query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1150 | 1150 | if ($limit) $query .= " LIMIT 0,10"; |
| 1151 | 1151 | |
@@ -1158,24 +1158,24 @@ discard block |
||
| 1158 | 1158 | |
| 1159 | 1159 | while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
| 1160 | 1160 | { |
| 1161 | - $temp_array['airline_icao'] = $row['airline_icao']; |
|
| 1162 | - $temp_array['flight_count'] = $row['nb']; |
|
| 1163 | - $temp_array['flight_country'] = $row['name']; |
|
| 1164 | - $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1165 | - $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1166 | - $flight_array[] = $temp_array; |
|
| 1161 | + $temp_array['airline_icao'] = $row['airline_icao']; |
|
| 1162 | + $temp_array['flight_count'] = $row['nb']; |
|
| 1163 | + $temp_array['flight_country'] = $row['name']; |
|
| 1164 | + $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1165 | + $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1166 | + $flight_array[] = $temp_array; |
|
| 1167 | 1167 | } |
| 1168 | 1168 | return $flight_array; |
| 1169 | - } |
|
| 1169 | + } |
|
| 1170 | 1170 | |
| 1171 | - /** |
|
| 1172 | - * Gets last spotter information based on a particular callsign |
|
| 1173 | - * |
|
| 1174 | - * @return Array the spotter information |
|
| 1175 | - * |
|
| 1176 | - */ |
|
| 1177 | - public function getDateArchiveMarineDataById($id,$date) |
|
| 1178 | - { |
|
| 1171 | + /** |
|
| 1172 | + * Gets last spotter information based on a particular callsign |
|
| 1173 | + * |
|
| 1174 | + * @return Array the spotter information |
|
| 1175 | + * |
|
| 1176 | + */ |
|
| 1177 | + public function getDateArchiveMarineDataById($id,$date) |
|
| 1178 | + { |
|
| 1179 | 1179 | $Marine = new Marine($this->db); |
| 1180 | 1180 | date_default_timezone_set('UTC'); |
| 1181 | 1181 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
@@ -1183,16 +1183,16 @@ discard block |
||
| 1183 | 1183 | $date = date('c',$date); |
| 1184 | 1184 | $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id,':date' => $date)); |
| 1185 | 1185 | return $spotter_array; |
| 1186 | - } |
|
| 1186 | + } |
|
| 1187 | 1187 | |
| 1188 | - /** |
|
| 1189 | - * Gets all the spotter information based on a particular callsign |
|
| 1190 | - * |
|
| 1191 | - * @return Array the spotter information |
|
| 1192 | - * |
|
| 1193 | - */ |
|
| 1194 | - public function getDateArchiveMarineDataByIdent($ident,$date) |
|
| 1195 | - { |
|
| 1188 | + /** |
|
| 1189 | + * Gets all the spotter information based on a particular callsign |
|
| 1190 | + * |
|
| 1191 | + * @return Array the spotter information |
|
| 1192 | + * |
|
| 1193 | + */ |
|
| 1194 | + public function getDateArchiveMarineDataByIdent($ident,$date) |
|
| 1195 | + { |
|
| 1196 | 1196 | $Marine = new Marine($this->db); |
| 1197 | 1197 | date_default_timezone_set('UTC'); |
| 1198 | 1198 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
@@ -1200,16 +1200,16 @@ discard block |
||
| 1200 | 1200 | $date = date('c',$date); |
| 1201 | 1201 | $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
| 1202 | 1202 | return $spotter_array; |
| 1203 | - } |
|
| 1203 | + } |
|
| 1204 | 1204 | |
| 1205 | - /** |
|
| 1206 | - * Gets all the spotter information based on the airport |
|
| 1207 | - * |
|
| 1208 | - * @return Array the spotter information |
|
| 1209 | - * |
|
| 1210 | - */ |
|
| 1211 | - public function getMarineDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1212 | - { |
|
| 1205 | + /** |
|
| 1206 | + * Gets all the spotter information based on the airport |
|
| 1207 | + * |
|
| 1208 | + * @return Array the spotter information |
|
| 1209 | + * |
|
| 1210 | + */ |
|
| 1211 | + public function getMarineDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1212 | + { |
|
| 1213 | 1213 | global $global_query; |
| 1214 | 1214 | $Marine = new Marine(); |
| 1215 | 1215 | date_default_timezone_set('UTC'); |
@@ -1220,35 +1220,35 @@ discard block |
||
| 1220 | 1220 | |
| 1221 | 1221 | if ($airport != "") |
| 1222 | 1222 | { |
| 1223 | - if (!is_string($airport)) |
|
| 1224 | - { |
|
| 1223 | + if (!is_string($airport)) |
|
| 1224 | + { |
|
| 1225 | 1225 | return false; |
| 1226 | - } else { |
|
| 1226 | + } else { |
|
| 1227 | 1227 | $additional_query .= " AND ((marine_archive_output.departure_airport_icao = :airport) OR (marine_archive_output.arrival_airport_icao = :airport))"; |
| 1228 | 1228 | $query_values = array(':airport' => $airport); |
| 1229 | - } |
|
| 1229 | + } |
|
| 1230 | 1230 | } |
| 1231 | 1231 | |
| 1232 | 1232 | if ($limit != "") |
| 1233 | 1233 | { |
| 1234 | - $limit_array = explode(",", $limit); |
|
| 1234 | + $limit_array = explode(",", $limit); |
|
| 1235 | 1235 | |
| 1236 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1237 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1236 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1237 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1238 | 1238 | |
| 1239 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1240 | - { |
|
| 1239 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1240 | + { |
|
| 1241 | 1241 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 1242 | 1242 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 1243 | - } |
|
| 1243 | + } |
|
| 1244 | 1244 | } |
| 1245 | 1245 | |
| 1246 | 1246 | if ($sort != "") |
| 1247 | 1247 | { |
| 1248 | - $search_orderby_array = $Marine->getOrderBy(); |
|
| 1249 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1248 | + $search_orderby_array = $Marine->getOrderBy(); |
|
| 1249 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1250 | 1250 | } else { |
| 1251 | - $orderby_query = " ORDER BY marine_archive_output.date DESC"; |
|
| 1251 | + $orderby_query = " ORDER BY marine_archive_output.date DESC"; |
|
| 1252 | 1252 | } |
| 1253 | 1253 | |
| 1254 | 1254 | $query = $global_query.$filter_query." marine_archive_output.ident <> '' ".$additional_query." AND ((marine_archive_output.departure_airport_icao <> 'NA') AND (marine_archive_output.arrival_airport_icao <> 'NA')) ".$orderby_query; |
@@ -1256,6 +1256,6 @@ discard block |
||
| 1256 | 1256 | $spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query); |
| 1257 | 1257 | |
| 1258 | 1258 | return $spotter_array; |
| 1259 | - } |
|
| 1259 | + } |
|
| 1260 | 1260 | } |
| 1261 | 1261 | ?> |
| 1262 | 1262 | \ No newline at end of file |
