Ysurac /
FlightAirMap
@@ -286,6 +286,7 @@ discard block |
||
| 286 | 286 | * |
| 287 | 287 | * @param String $aircraft_registration the registration of the aircraft |
| 288 | 288 | * @param String $aircraft_name type of the aircraft |
| 289 | + * @param string $type |
|
| 289 | 290 | * @return array the aircraft thumbnail, orignal url and copyright |
| 290 | 291 | * |
| 291 | 292 | */ |
@@ -318,7 +319,7 @@ discard block |
||
| 318 | 319 | /** |
| 319 | 320 | * Gets the aircraft image from Deviantart |
| 320 | 321 | * |
| 321 | - * @param $type |
|
| 322 | + * @param string $type |
|
| 322 | 323 | * @param String $registration the registration of the aircraft |
| 323 | 324 | * @param String $name type of the aircraft |
| 324 | 325 | * @return array the aircraft thumbnail, orignal url and copyright |
@@ -360,6 +361,7 @@ discard block |
||
| 360 | 361 | * |
| 361 | 362 | * @param String $aircraft_registration the registration of the aircraft |
| 362 | 363 | * @param String $aircraft_name type of the aircraft |
| 364 | + * @param string $type |
|
| 363 | 365 | * @return array the aircraft thumbnail, orignal url and copyright |
| 364 | 366 | * |
| 365 | 367 | */ |
@@ -402,6 +404,7 @@ discard block |
||
| 402 | 404 | * |
| 403 | 405 | * @param String $aircraft_registration the registration of the aircraft |
| 404 | 406 | * @param String $aircraft_name type of the aircraft |
| 407 | + * @param string $type |
|
| 405 | 408 | * @return array the aircraft thumbnail, orignal url and copyright |
| 406 | 409 | * |
| 407 | 410 | */ |
@@ -436,6 +439,7 @@ discard block |
||
| 436 | 439 | * |
| 437 | 440 | * @param String $registration the registration of the aircraft |
| 438 | 441 | * @param String $name type of the aircraft |
| 442 | + * @param string $type |
|
| 439 | 443 | * @return array the aircraft thumbnail, orignal url and copyright |
| 440 | 444 | * |
| 441 | 445 | */ |
@@ -466,8 +470,8 @@ discard block |
||
| 466 | 470 | } |
| 467 | 471 | |
| 468 | 472 | /** |
| 469 | - * @param $type |
|
| 470 | - * @param $aircraft_icao |
|
| 473 | + * @param string $type |
|
| 474 | + * @param string $aircraft_icao |
|
| 471 | 475 | * @param $airline_icao |
| 472 | 476 | * @return array |
| 473 | 477 | */ |
@@ -490,7 +494,7 @@ discard block |
||
| 490 | 494 | /** |
| 491 | 495 | * Gets the aircraft image from Bing |
| 492 | 496 | * |
| 493 | - * @param $type |
|
| 497 | + * @param string $type |
|
| 494 | 498 | * @param String $aircraft_registration the registration of the aircraft |
| 495 | 499 | * @param String $aircraft_name type of the aircraft |
| 496 | 500 | * @return array the aircraft thumbnail, orignal url and copyright |
@@ -529,6 +533,7 @@ discard block |
||
| 529 | 533 | * |
| 530 | 534 | * @param String $aircraft_registration the registration of the aircraft |
| 531 | 535 | * @param String $aircraft_name type of the aircraft |
| 536 | + * @param string $type |
|
| 532 | 537 | * @return array the aircraft thumbnail, orignal url and copyright |
| 533 | 538 | * |
| 534 | 539 | */ |
@@ -554,6 +559,7 @@ discard block |
||
| 554 | 559 | * |
| 555 | 560 | * @param String $registration the registration of the aircraft/mmsi |
| 556 | 561 | * @param String $name name |
| 562 | + * @param string $type |
|
| 557 | 563 | * @return array the aircraft thumbnail, orignal url and copyright |
| 558 | 564 | * |
| 559 | 565 | */ |
@@ -615,6 +621,7 @@ discard block |
||
| 615 | 621 | * |
| 616 | 622 | * @param String $registration the registration of the aircraft |
| 617 | 623 | * @param String $name type of the aircraft |
| 624 | + * @param string $type |
|
| 618 | 625 | * @return array the aircraft thumbnail, orignal url and copyright |
| 619 | 626 | * |
| 620 | 627 | */ |
@@ -22,14 +22,14 @@ discard block |
||
| 22 | 22 | if ($this->db === null) die('Error: No DB connection. (Image)'); |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | - /** |
|
| 26 | - * Gets the images based on the aircraft registration |
|
| 27 | - * |
|
| 28 | - * @param $registration |
|
| 29 | - * @param string $aircraft_icao |
|
| 30 | - * @param string $airline_icao |
|
| 31 | - * @return array the images list |
|
| 32 | - */ |
|
| 25 | + /** |
|
| 26 | + * Gets the images based on the aircraft registration |
|
| 27 | + * |
|
| 28 | + * @param $registration |
|
| 29 | + * @param string $aircraft_icao |
|
| 30 | + * @param string $airline_icao |
|
| 31 | + * @return array the images list |
|
| 32 | + */ |
|
| 33 | 33 | public function getSpotterImage($registration,$aircraft_icao = '', $airline_icao = '') |
| 34 | 34 | { |
| 35 | 35 | $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
@@ -49,15 +49,15 @@ discard block |
||
| 49 | 49 | else return array(); |
| 50 | 50 | } |
| 51 | 51 | |
| 52 | - /** |
|
| 53 | - * Gets the images based on the ship name |
|
| 54 | - * |
|
| 55 | - * @param $mmsi |
|
| 56 | - * @param string $imo |
|
| 57 | - * @param string $name |
|
| 58 | - * @param string $type_name |
|
| 59 | - * @return array the images list |
|
| 60 | - */ |
|
| 52 | + /** |
|
| 53 | + * Gets the images based on the ship name |
|
| 54 | + * |
|
| 55 | + * @param $mmsi |
|
| 56 | + * @param string $imo |
|
| 57 | + * @param string $name |
|
| 58 | + * @param string $type_name |
|
| 59 | + * @return array the images list |
|
| 60 | + */ |
|
| 61 | 61 | public function getMarineImage($mmsi,$imo = '',$name = '',$type_name = '') |
| 62 | 62 | { |
| 63 | 63 | global $globalMarineImagePics; |
@@ -94,12 +94,12 @@ discard block |
||
| 94 | 94 | return $result; |
| 95 | 95 | } |
| 96 | 96 | |
| 97 | - /** |
|
| 98 | - * Gets the image copyright based on the Exif data |
|
| 99 | - * |
|
| 100 | - * @param $url |
|
| 101 | - * @return String image copyright |
|
| 102 | - */ |
|
| 97 | + /** |
|
| 98 | + * Gets the image copyright based on the Exif data |
|
| 99 | + * |
|
| 100 | + * @param $url |
|
| 101 | + * @return String image copyright |
|
| 102 | + */ |
|
| 103 | 103 | public function getExifCopyright($url) { |
| 104 | 104 | $exif = exif_read_data($url); |
| 105 | 105 | $copyright = ''; |
@@ -113,14 +113,14 @@ discard block |
||
| 113 | 113 | return $copyright; |
| 114 | 114 | } |
| 115 | 115 | |
| 116 | - /** |
|
| 117 | - * Adds the images based on the aircraft registration |
|
| 118 | - * |
|
| 119 | - * @param $registration |
|
| 120 | - * @param string $aircraft_icao |
|
| 121 | - * @param string $airline_icao |
|
| 122 | - * @return String either success or error |
|
| 123 | - */ |
|
| 116 | + /** |
|
| 117 | + * Adds the images based on the aircraft registration |
|
| 118 | + * |
|
| 119 | + * @param $registration |
|
| 120 | + * @param string $aircraft_icao |
|
| 121 | + * @param string $airline_icao |
|
| 122 | + * @return String either success or error |
|
| 123 | + */ |
|
| 124 | 124 | public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '') |
| 125 | 125 | { |
| 126 | 126 | global $globalDebug,$globalAircraftImageFetch, $globalOffline; |
@@ -147,14 +147,14 @@ discard block |
||
| 147 | 147 | return "success"; |
| 148 | 148 | } |
| 149 | 149 | |
| 150 | - /** |
|
| 151 | - * Adds the images based on the marine name |
|
| 152 | - * |
|
| 153 | - * @param $mmsi |
|
| 154 | - * @param string $imo |
|
| 155 | - * @param string $name |
|
| 156 | - * @return String either success or error |
|
| 157 | - */ |
|
| 150 | + /** |
|
| 151 | + * Adds the images based on the marine name |
|
| 152 | + * |
|
| 153 | + * @param $mmsi |
|
| 154 | + * @param string $imo |
|
| 155 | + * @param string $name |
|
| 156 | + * @return String either success or error |
|
| 157 | + */ |
|
| 158 | 158 | public function addMarineImage($mmsi,$imo = '',$name = '') |
| 159 | 159 | { |
| 160 | 160 | global $globalDebug,$globalMarineImageFetch, $globalOffline; |
@@ -190,14 +190,14 @@ discard block |
||
| 190 | 190 | return "success"; |
| 191 | 191 | } |
| 192 | 192 | |
| 193 | - /** |
|
| 194 | - * Gets the aircraft image |
|
| 195 | - * |
|
| 196 | - * @param String $aircraft_registration the registration of the aircraft |
|
| 197 | - * @param string $aircraft_icao |
|
| 198 | - * @param string $airline_icao |
|
| 199 | - * @return array the aircraft thumbnail, orignal url and copyright |
|
| 200 | - */ |
|
| 193 | + /** |
|
| 194 | + * Gets the aircraft image |
|
| 195 | + * |
|
| 196 | + * @param String $aircraft_registration the registration of the aircraft |
|
| 197 | + * @param string $aircraft_icao |
|
| 198 | + * @param string $airline_icao |
|
| 199 | + * @return array the aircraft thumbnail, orignal url and copyright |
|
| 200 | + */ |
|
| 201 | 201 | public function findAircraftImage($aircraft_registration, $aircraft_icao = '', $airline_icao = '') |
| 202 | 202 | { |
| 203 | 203 | global $globalAircraftImageSources, $globalIVAO, $globalAircraftImageCheckICAO, $globalVA; |
@@ -241,14 +241,14 @@ discard block |
||
| 241 | 241 | } |
| 242 | 242 | |
| 243 | 243 | /** |
| 244 | - * Gets the vessel image |
|
| 245 | - * |
|
| 246 | - * @param String $mmsi the vessel mmsi |
|
| 247 | - * @param String $imo the vessel imo |
|
| 248 | - * @param String $name the vessel name |
|
| 249 | - * @return array the aircraft thumbnail, orignal url and copyright |
|
| 250 | - * |
|
| 251 | - */ |
|
| 244 | + * Gets the vessel image |
|
| 245 | + * |
|
| 246 | + * @param String $mmsi the vessel mmsi |
|
| 247 | + * @param String $imo the vessel imo |
|
| 248 | + * @param String $name the vessel name |
|
| 249 | + * @return array the aircraft thumbnail, orignal url and copyright |
|
| 250 | + * |
|
| 251 | + */ |
|
| 252 | 252 | public function findMarineImage($mmsi,$imo = '',$name = '') |
| 253 | 253 | { |
| 254 | 254 | global $globalMarineImageSources; |
@@ -282,13 +282,13 @@ discard block |
||
| 282 | 282 | } |
| 283 | 283 | |
| 284 | 284 | /** |
| 285 | - * Gets the aircraft image from Planespotters |
|
| 286 | - * |
|
| 287 | - * @param String $aircraft_registration the registration of the aircraft |
|
| 288 | - * @param String $aircraft_name type of the aircraft |
|
| 289 | - * @return array the aircraft thumbnail, orignal url and copyright |
|
| 290 | - * |
|
| 291 | - */ |
|
| 285 | + * Gets the aircraft image from Planespotters |
|
| 286 | + * |
|
| 287 | + * @param String $aircraft_registration the registration of the aircraft |
|
| 288 | + * @param String $aircraft_name type of the aircraft |
|
| 289 | + * @return array the aircraft thumbnail, orignal url and copyright |
|
| 290 | + * |
|
| 291 | + */ |
|
| 292 | 292 | public function fromPlanespotters($type,$aircraft_registration, $aircraft_name='') { |
| 293 | 293 | $Common = new Common(); |
| 294 | 294 | // If aircraft registration is only number, also check with aircraft model |
@@ -315,14 +315,14 @@ discard block |
||
| 315 | 315 | return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
| 316 | 316 | } |
| 317 | 317 | |
| 318 | - /** |
|
| 319 | - * Gets the aircraft image from Deviantart |
|
| 320 | - * |
|
| 321 | - * @param $type |
|
| 322 | - * @param String $registration the registration of the aircraft |
|
| 323 | - * @param String $name type of the aircraft |
|
| 324 | - * @return array the aircraft thumbnail, orignal url and copyright |
|
| 325 | - */ |
|
| 318 | + /** |
|
| 319 | + * Gets the aircraft image from Deviantart |
|
| 320 | + * |
|
| 321 | + * @param $type |
|
| 322 | + * @param String $registration the registration of the aircraft |
|
| 323 | + * @param String $name type of the aircraft |
|
| 324 | + * @return array the aircraft thumbnail, orignal url and copyright |
|
| 325 | + */ |
|
| 326 | 326 | public function fromDeviantart($type,$registration, $name='') { |
| 327 | 327 | $Common = new Common(); |
| 328 | 328 | if ($type == 'aircraft') { |
@@ -356,13 +356,13 @@ discard block |
||
| 356 | 356 | } |
| 357 | 357 | |
| 358 | 358 | /** |
| 359 | - * Gets the aircraft image from JetPhotos |
|
| 360 | - * |
|
| 361 | - * @param String $aircraft_registration the registration of the aircraft |
|
| 362 | - * @param String $aircraft_name type of the aircraft |
|
| 363 | - * @return array the aircraft thumbnail, orignal url and copyright |
|
| 364 | - * |
|
| 365 | - */ |
|
| 359 | + * Gets the aircraft image from JetPhotos |
|
| 360 | + * |
|
| 361 | + * @param String $aircraft_registration the registration of the aircraft |
|
| 362 | + * @param String $aircraft_name type of the aircraft |
|
| 363 | + * @return array the aircraft thumbnail, orignal url and copyright |
|
| 364 | + * |
|
| 365 | + */ |
|
| 366 | 366 | public function fromJetPhotos($type,$aircraft_registration, $aircraft_name='') { |
| 367 | 367 | $Common = new Common(); |
| 368 | 368 | $url= 'http://jetphotos.net/showphotos.php?displaymode=2®search='.$aircraft_registration; |
@@ -398,13 +398,13 @@ discard block |
||
| 398 | 398 | } |
| 399 | 399 | |
| 400 | 400 | /** |
| 401 | - * Gets the aircraft image from PlanePictures |
|
| 402 | - * |
|
| 403 | - * @param String $aircraft_registration the registration of the aircraft |
|
| 404 | - * @param String $aircraft_name type of the aircraft |
|
| 405 | - * @return array the aircraft thumbnail, orignal url and copyright |
|
| 406 | - * |
|
| 407 | - */ |
|
| 401 | + * Gets the aircraft image from PlanePictures |
|
| 402 | + * |
|
| 403 | + * @param String $aircraft_registration the registration of the aircraft |
|
| 404 | + * @param String $aircraft_name type of the aircraft |
|
| 405 | + * @return array the aircraft thumbnail, orignal url and copyright |
|
| 406 | + * |
|
| 407 | + */ |
|
| 408 | 408 | public function fromPlanePictures($type,$aircraft_registration, $aircraft_name='') { |
| 409 | 409 | $Common = new Common(); |
| 410 | 410 | $url= 'http://www.planepictures.net/netsearch4.cgi?srch='.$aircraft_registration.'&stype=reg&srng=2'; |
@@ -432,13 +432,13 @@ discard block |
||
| 432 | 432 | } |
| 433 | 433 | |
| 434 | 434 | /** |
| 435 | - * Gets the aircraft image from Flickr |
|
| 436 | - * |
|
| 437 | - * @param String $registration the registration of the aircraft |
|
| 438 | - * @param String $name type of the aircraft |
|
| 439 | - * @return array the aircraft thumbnail, orignal url and copyright |
|
| 440 | - * |
|
| 441 | - */ |
|
| 435 | + * Gets the aircraft image from Flickr |
|
| 436 | + * |
|
| 437 | + * @param String $registration the registration of the aircraft |
|
| 438 | + * @param String $name type of the aircraft |
|
| 439 | + * @return array the aircraft thumbnail, orignal url and copyright |
|
| 440 | + * |
|
| 441 | + */ |
|
| 442 | 442 | public function fromFlickr($type,$registration,$name='') { |
| 443 | 443 | $Common = new Common(); |
| 444 | 444 | if ($type == 'aircraft') { |
@@ -465,13 +465,13 @@ discard block |
||
| 465 | 465 | return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
| 466 | 466 | } |
| 467 | 467 | |
| 468 | - /** |
|
| 469 | - * @param $type |
|
| 470 | - * @param $aircraft_icao |
|
| 471 | - * @param $airline_icao |
|
| 472 | - * @return array |
|
| 473 | - */ |
|
| 474 | - public function fromIvaoMtl($type, $aircraft_icao, $airline_icao) { |
|
| 468 | + /** |
|
| 469 | + * @param $type |
|
| 470 | + * @param $aircraft_icao |
|
| 471 | + * @param $airline_icao |
|
| 472 | + * @return array |
|
| 473 | + */ |
|
| 474 | + public function fromIvaoMtl($type, $aircraft_icao, $airline_icao) { |
|
| 475 | 475 | $Common = new Common(); |
| 476 | 476 | //echo "\n".'SEARCH IMAGE : http://mtlcatalog.ivao.aero/images/aircraft/'.$aircraft_icao.$airline_icao.'.jpg'; |
| 477 | 477 | if ($Common->urlexist('http://mtlcatalog.ivao.aero/images/aircraft/'.$aircraft_icao.$airline_icao.'.jpg')) { |
@@ -487,14 +487,14 @@ discard block |
||
| 487 | 487 | } |
| 488 | 488 | } |
| 489 | 489 | |
| 490 | - /** |
|
| 491 | - * Gets the aircraft image from Bing |
|
| 492 | - * |
|
| 493 | - * @param $type |
|
| 494 | - * @param String $aircraft_registration the registration of the aircraft |
|
| 495 | - * @param String $aircraft_name type of the aircraft |
|
| 496 | - * @return array the aircraft thumbnail, orignal url and copyright |
|
| 497 | - */ |
|
| 490 | + /** |
|
| 491 | + * Gets the aircraft image from Bing |
|
| 492 | + * |
|
| 493 | + * @param $type |
|
| 494 | + * @param String $aircraft_registration the registration of the aircraft |
|
| 495 | + * @param String $aircraft_name type of the aircraft |
|
| 496 | + * @return array the aircraft thumbnail, orignal url and copyright |
|
| 497 | + */ |
|
| 498 | 498 | public function fromBing($type,$aircraft_registration,$aircraft_name='') { |
| 499 | 499 | global $globalImageBingKey; |
| 500 | 500 | $Common = new Common(); |
@@ -525,13 +525,13 @@ discard block |
||
| 525 | 525 | } |
| 526 | 526 | |
| 527 | 527 | /** |
| 528 | - * Gets the aircraft image from airport-data |
|
| 529 | - * |
|
| 530 | - * @param String $aircraft_registration the registration of the aircraft |
|
| 531 | - * @param String $aircraft_name type of the aircraft |
|
| 532 | - * @return array the aircraft thumbnail, orignal url and copyright |
|
| 533 | - * |
|
| 534 | - */ |
|
| 528 | + * Gets the aircraft image from airport-data |
|
| 529 | + * |
|
| 530 | + * @param String $aircraft_registration the registration of the aircraft |
|
| 531 | + * @param String $aircraft_name type of the aircraft |
|
| 532 | + * @return array the aircraft thumbnail, orignal url and copyright |
|
| 533 | + * |
|
| 534 | + */ |
|
| 535 | 535 | public function fromAirportData($type,$aircraft_registration,$aircraft_name='') { |
| 536 | 536 | $Common = new Common(); |
| 537 | 537 | $url = 'http://www.airport-data.com/api/ac_thumb.json?&n=1&r='.$aircraft_registration; |
@@ -550,13 +550,13 @@ discard block |
||
| 550 | 550 | } |
| 551 | 551 | |
| 552 | 552 | /** |
| 553 | - * Gets image from WikiMedia |
|
| 554 | - * |
|
| 555 | - * @param String $registration the registration of the aircraft/mmsi |
|
| 556 | - * @param String $name name |
|
| 557 | - * @return array the aircraft thumbnail, orignal url and copyright |
|
| 558 | - * |
|
| 559 | - */ |
|
| 553 | + * Gets image from WikiMedia |
|
| 554 | + * |
|
| 555 | + * @param String $registration the registration of the aircraft/mmsi |
|
| 556 | + * @param String $name name |
|
| 557 | + * @return array the aircraft thumbnail, orignal url and copyright |
|
| 558 | + * |
|
| 559 | + */ |
|
| 560 | 560 | public function fromWikimedia($type,$registration,$name='') { |
| 561 | 561 | $Common = new Common(); |
| 562 | 562 | if ($type == 'aircraft') { |
@@ -611,13 +611,13 @@ discard block |
||
| 611 | 611 | } |
| 612 | 612 | |
| 613 | 613 | /** |
| 614 | - * Gets the aircraft image from custom url |
|
| 615 | - * |
|
| 616 | - * @param String $registration the registration of the aircraft |
|
| 617 | - * @param String $name type of the aircraft |
|
| 618 | - * @return array the aircraft thumbnail, orignal url and copyright |
|
| 619 | - * |
|
| 620 | - */ |
|
| 614 | + * Gets the aircraft image from custom url |
|
| 615 | + * |
|
| 616 | + * @param String $registration the registration of the aircraft |
|
| 617 | + * @param String $name type of the aircraft |
|
| 618 | + * @return array the aircraft thumbnail, orignal url and copyright |
|
| 619 | + * |
|
| 620 | + */ |
|
| 621 | 621 | public function fromCustomSource($type,$registration,$name='') { |
| 622 | 622 | global $globalAircraftImageCustomSources, $globalMarineImageCustomSources, $globalDebug; |
| 623 | 623 | //$globalAircraftImageCustomSource[] = array('thumbnail' => '','original' => '', 'copyright' => '', 'source_website' => '', 'source' => '','exif' => true); |
@@ -30,22 +30,22 @@ discard block |
||
| 30 | 30 | * @param string $airline_icao |
| 31 | 31 | * @return array the images list |
| 32 | 32 | */ |
| 33 | - public function getSpotterImage($registration,$aircraft_icao = '', $airline_icao = '') |
|
| 33 | + public function getSpotterImage($registration, $aircraft_icao = '', $airline_icao = '') |
|
| 34 | 34 | { |
| 35 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 36 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 37 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 35 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 36 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 37 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 38 | 38 | $reg = $registration; |
| 39 | 39 | if (($reg == '' || $reg == 'NA') && $aircraft_icao != '') $reg = $aircraft_icao.$airline_icao; |
| 40 | 40 | $reg = trim($reg); |
| 41 | - $query = "SELECT spotter_image.image, spotter_image.image_thumbnail, spotter_image.image_source, spotter_image.image_source_website,spotter_image.image_copyright, spotter_image.registration |
|
| 41 | + $query = "SELECT spotter_image.image, spotter_image.image_thumbnail, spotter_image.image_source, spotter_image.image_source_website,spotter_image.image_copyright, spotter_image.registration |
|
| 42 | 42 | FROM spotter_image |
| 43 | 43 | WHERE spotter_image.registration = :registration LIMIT 1"; |
| 44 | 44 | $sth = $this->db->prepare($query); |
| 45 | 45 | $sth->execute(array(':registration' => $reg)); |
| 46 | 46 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 47 | 47 | if (!empty($result)) return $result; |
| 48 | - elseif ($registration != '' && ($aircraft_icao != '' || $airline_icao != '')) return $this->getSpotterImage('',$aircraft_icao,$airline_icao); |
|
| 48 | + elseif ($registration != '' && ($aircraft_icao != '' || $airline_icao != '')) return $this->getSpotterImage('', $aircraft_icao, $airline_icao); |
|
| 49 | 49 | else return array(); |
| 50 | 50 | } |
| 51 | 51 | |
@@ -58,34 +58,34 @@ discard block |
||
| 58 | 58 | * @param string $type_name |
| 59 | 59 | * @return array the images list |
| 60 | 60 | */ |
| 61 | - public function getMarineImage($mmsi,$imo = '',$name = '',$type_name = '') |
|
| 61 | + public function getMarineImage($mmsi, $imo = '', $name = '', $type_name = '') |
|
| 62 | 62 | { |
| 63 | 63 | global $globalMarineImagePics; |
| 64 | - $mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING); |
|
| 65 | - $imo = filter_var($imo,FILTER_SANITIZE_STRING); |
|
| 66 | - $name = filter_var($name,FILTER_SANITIZE_STRING); |
|
| 67 | - $type_name = str_replace(''',"'",filter_var($type_name,FILTER_SANITIZE_STRING)); |
|
| 64 | + $mmsi = filter_var($mmsi, FILTER_SANITIZE_STRING); |
|
| 65 | + $imo = filter_var($imo, FILTER_SANITIZE_STRING); |
|
| 66 | + $name = filter_var($name, FILTER_SANITIZE_STRING); |
|
| 67 | + $type_name = str_replace(''', "'", filter_var($type_name, FILTER_SANITIZE_STRING)); |
|
| 68 | 68 | if (isset($globalMarineImagePics) && !empty($globalMarineImagePics)) { |
| 69 | 69 | if ($type_name != '' && isset($globalMarineImagePics['type'][$type_name])) { |
| 70 | 70 | if (!isset($globalMarineImagePics['type'][$type_name]['image_thumbnail'])) { |
| 71 | 71 | $globalMarineImagePics['type'][$type_name]['image_thumbnail'] = $globalMarineImagePics['type'][$type_name]['image']; |
| 72 | 72 | } |
| 73 | - return array($globalMarineImagePics['type'][$type_name]+array('image_thumbnail' => '','image' => '', 'image_copyright' => '','image_source' => '','image_source_website' => '')); |
|
| 73 | + return array($globalMarineImagePics['type'][$type_name] + array('image_thumbnail' => '', 'image' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => '')); |
|
| 74 | 74 | } |
| 75 | 75 | } |
| 76 | 76 | $name = trim($name); |
| 77 | 77 | if ($mmsi == '' && $imo == '' && $name == '') return array(); |
| 78 | - $query = "SELECT marine_image.image, marine_image.image_thumbnail, marine_image.image_source, marine_image.image_source_website,marine_image.image_copyright, marine_image.mmsi, marine_image.imo, marine_image.name |
|
| 78 | + $query = "SELECT marine_image.image, marine_image.image_thumbnail, marine_image.image_source, marine_image.image_source_website,marine_image.image_copyright, marine_image.mmsi, marine_image.imo, marine_image.name |
|
| 79 | 79 | FROM marine_image |
| 80 | 80 | WHERE marine_image.mmsi = :mmsi"; |
| 81 | 81 | $query_data = array(':mmsi' => $mmsi); |
| 82 | 82 | if ($imo != '') { |
| 83 | 83 | $query .= " AND marine_image.imo = :imo"; |
| 84 | - $query_data = array_merge($query_data,array(':imo' => $imo)); |
|
| 84 | + $query_data = array_merge($query_data, array(':imo' => $imo)); |
|
| 85 | 85 | } |
| 86 | 86 | if ($name != '') { |
| 87 | 87 | $query .= " AND marine_image.name = :name"; |
| 88 | - $query_data = array_merge($query_data,array(':name' => $name)); |
|
| 88 | + $query_data = array_merge($query_data, array(':name' => $name)); |
|
| 89 | 89 | } |
| 90 | 90 | $query .= " LIMIT 1"; |
| 91 | 91 | $sth = $this->db->prepare($query); |
@@ -106,9 +106,9 @@ discard block |
||
| 106 | 106 | if (isset($exif['COMPUTED']['copyright'])) $copyright = $exif['COMPUTED']['copyright']; |
| 107 | 107 | elseif (isset($exif['copyright'])) $copyright = $exif['copyright']; |
| 108 | 108 | if ($copyright != '') { |
| 109 | - $copyright = str_replace('Copyright ','',$copyright); |
|
| 110 | - $copyright = str_replace('© ','',$copyright); |
|
| 111 | - $copyright = str_replace('(c) ','',$copyright); |
|
| 109 | + $copyright = str_replace('Copyright ', '', $copyright); |
|
| 110 | + $copyright = str_replace('© ', '', $copyright); |
|
| 111 | + $copyright = str_replace('(c) ', '', $copyright); |
|
| 112 | 112 | } |
| 113 | 113 | return $copyright; |
| 114 | 114 | } |
@@ -121,25 +121,25 @@ discard block |
||
| 121 | 121 | * @param string $airline_icao |
| 122 | 122 | * @return String either success or error |
| 123 | 123 | */ |
| 124 | - public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '') |
|
| 124 | + public function addSpotterImage($registration, $aircraft_icao = '', $airline_icao = '') |
|
| 125 | 125 | { |
| 126 | - global $globalDebug,$globalAircraftImageFetch, $globalOffline; |
|
| 126 | + global $globalDebug, $globalAircraftImageFetch, $globalOffline; |
|
| 127 | 127 | if ((isset($globalAircraftImageFetch) && $globalAircraftImageFetch === FALSE) || (isset($globalOffline) && $globalOffline === TRUE)) return ''; |
| 128 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 128 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 129 | 129 | $registration = trim($registration); |
| 130 | 130 | //getting the aircraft image |
| 131 | 131 | if ($globalDebug && $registration != '') echo 'Try to find an aircraft image for '.$registration.'...'; |
| 132 | 132 | elseif ($globalDebug && $aircraft_icao != '') echo 'Try to find an aircraft image for '.$aircraft_icao.'...'; |
| 133 | 133 | elseif ($globalDebug && $airline_icao != '') echo 'Try to find an aircraft image for '.$airline_icao.'...'; |
| 134 | - $image_url = $this->findAircraftImage($registration,$aircraft_icao,$airline_icao); |
|
| 134 | + $image_url = $this->findAircraftImage($registration, $aircraft_icao, $airline_icao); |
|
| 135 | 135 | if ($registration == '' && $aircraft_icao != '') $registration = $aircraft_icao.$airline_icao; |
| 136 | 136 | if ($image_url['original'] != '') { |
| 137 | 137 | if ($globalDebug) echo 'Found !'."\n"; |
| 138 | - $query = "INSERT INTO spotter_image (registration, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:registration,:image,:image_thumbnail,:copyright,:source,:source_website)"; |
|
| 138 | + $query = "INSERT INTO spotter_image (registration, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:registration,:image,:image_thumbnail,:copyright,:source,:source_website)"; |
|
| 139 | 139 | try { |
| 140 | 140 | $sth = $this->db->prepare($query); |
| 141 | - $sth->execute(array(':registration' => $registration,':image' => $image_url['original'],':image_thumbnail' => $image_url['thumbnail'], ':copyright' => $image_url['copyright'],':source' => $image_url['source'],':source_website' => $image_url['source_website'])); |
|
| 142 | - } catch(PDOException $e) { |
|
| 141 | + $sth->execute(array(':registration' => $registration, ':image' => $image_url['original'], ':image_thumbnail' => $image_url['thumbnail'], ':copyright' => $image_url['copyright'], ':source' => $image_url['source'], ':source_website' => $image_url['source_website'])); |
|
| 142 | + } catch (PDOException $e) { |
|
| 143 | 143 | echo $e->getMessage()."\n"; |
| 144 | 144 | return "error"; |
| 145 | 145 | } |
@@ -155,13 +155,13 @@ discard block |
||
| 155 | 155 | * @param string $name |
| 156 | 156 | * @return String either success or error |
| 157 | 157 | */ |
| 158 | - public function addMarineImage($mmsi,$imo = '',$name = '') |
|
| 158 | + public function addMarineImage($mmsi, $imo = '', $name = '') |
|
| 159 | 159 | { |
| 160 | - global $globalDebug,$globalMarineImageFetch, $globalOffline; |
|
| 160 | + global $globalDebug, $globalMarineImageFetch, $globalOffline; |
|
| 161 | 161 | if ((isset($globalMarineImageFetch) && !$globalMarineImageFetch) || (isset($globalOffline) && $globalOffline === TRUE)) return ''; |
| 162 | - $mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING); |
|
| 163 | - $imo = filter_var($imo,FILTER_SANITIZE_STRING); |
|
| 164 | - $name = filter_var($name,FILTER_SANITIZE_STRING); |
|
| 162 | + $mmsi = filter_var($mmsi, FILTER_SANITIZE_STRING); |
|
| 163 | + $imo = filter_var($imo, FILTER_SANITIZE_STRING); |
|
| 164 | + $name = filter_var($name, FILTER_SANITIZE_STRING); |
|
| 165 | 165 | $name = trim($name); |
| 166 | 166 | $Marine = new Marine($this->db); |
| 167 | 167 | if ($imo == '' || $name == '') { |
@@ -175,14 +175,14 @@ discard block |
||
| 175 | 175 | |
| 176 | 176 | //getting the aircraft image |
| 177 | 177 | if ($globalDebug && $name != '') echo 'Try to find an vessel image for '.$name.'...'; |
| 178 | - $image_url = $this->findMarineImage($mmsi,$imo,$name); |
|
| 178 | + $image_url = $this->findMarineImage($mmsi, $imo, $name); |
|
| 179 | 179 | if ($image_url['original'] != '') { |
| 180 | 180 | if ($globalDebug) echo 'Found !'."\n"; |
| 181 | - $query = "INSERT INTO marine_image (mmsi,imo,name, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:mmsi,:imo,:name,:image,:image_thumbnail,:copyright,:source,:source_website)"; |
|
| 181 | + $query = "INSERT INTO marine_image (mmsi,imo,name, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:mmsi,:imo,:name,:image,:image_thumbnail,:copyright,:source,:source_website)"; |
|
| 182 | 182 | try { |
| 183 | 183 | $sth = $this->db->prepare($query); |
| 184 | - $sth->execute(array(':mmsi' => $mmsi,':imo' => $imo,':name' => $name,':image' => $image_url['original'],':image_thumbnail' => $image_url['thumbnail'], ':copyright' => $image_url['copyright'],':source' => $image_url['source'],':source_website' => $image_url['source_website'])); |
|
| 185 | - } catch(PDOException $e) { |
|
| 184 | + $sth->execute(array(':mmsi' => $mmsi, ':imo' => $imo, ':name' => $name, ':image' => $image_url['original'], ':image_thumbnail' => $image_url['thumbnail'], ':copyright' => $image_url['copyright'], ':source' => $image_url['source'], ':source_website' => $image_url['source_website'])); |
|
| 185 | + } catch (PDOException $e) { |
|
| 186 | 186 | echo $e->getMessage()."\n"; |
| 187 | 187 | return "error"; |
| 188 | 188 | } |
@@ -203,9 +203,9 @@ discard block |
||
| 203 | 203 | global $globalAircraftImageSources, $globalIVAO, $globalAircraftImageCheckICAO, $globalVA; |
| 204 | 204 | $Spotter = new Spotter($this->db); |
| 205 | 205 | if (!isset($globalIVAO)) $globalIVAO = FALSE; |
| 206 | - $aircraft_registration = filter_var($aircraft_registration,FILTER_SANITIZE_STRING); |
|
| 206 | + $aircraft_registration = filter_var($aircraft_registration, FILTER_SANITIZE_STRING); |
|
| 207 | 207 | if ($aircraft_registration != '' && $aircraft_registration != 'NA' && (!isset($globalVA) || $globalVA !== TRUE)) { |
| 208 | - if (strpos($aircraft_registration,'/') !== false) return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 208 | + if (strpos($aircraft_registration, '/') !== false) return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
| 209 | 209 | $aircraft_registration = urlencode(trim($aircraft_registration)); |
| 210 | 210 | $aircraft_info = $Spotter->getAircraftInfoByRegistration($aircraft_registration); |
| 211 | 211 | if (isset($aircraft_info[0]['aircraft_name'])) $aircraft_name = $aircraft_info[0]['aircraft_name']; |
@@ -219,25 +219,25 @@ discard block |
||
| 219 | 219 | if (isset($aircraft_info[0]['type'])) $aircraft_name = $aircraft_info[0]['type']; |
| 220 | 220 | else $aircraft_name = ''; |
| 221 | 221 | $aircraft_registration = $aircraft_icao; |
| 222 | - } else return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => ''); |
|
| 222 | + } else return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
| 223 | 223 | unset($Spotter); |
| 224 | - if (!isset($globalAircraftImageSources)) $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters'); |
|
| 224 | + if (!isset($globalAircraftImageSources)) $globalAircraftImageSources = array('ivaomtl', 'wikimedia', 'airportdata', 'deviantart', 'flickr', 'bing', 'jetphotos', 'planepictures', 'planespotters'); |
|
| 225 | 225 | foreach ($globalAircraftImageSources as $source) { |
| 226 | 226 | $source = strtolower($source); |
| 227 | - if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') $images_array = $this->fromIvaoMtl('aircraft',$aircraft_icao,$airline_icao); |
|
| 228 | - if ($source == 'planespotters' && !$globalIVAO && extension_loaded('simplexml')) $images_array = $this->fromPlanespotters('aircraft',$aircraft_registration,$aircraft_name); |
|
| 229 | - if ($source == 'flickr' && extension_loaded('simplexml')) $images_array = $this->fromFlickr('aircraft',$aircraft_registration,$aircraft_name); |
|
| 230 | - if ($source == 'bing') $images_array = $this->fromBing('aircraft',$aircraft_registration,$aircraft_name); |
|
| 231 | - if ($source == 'deviantart' && extension_loaded('simplexml')) $images_array = $this->fromDeviantart('aircraft',$aircraft_registration,$aircraft_name); |
|
| 232 | - if ($source == 'wikimedia') $images_array = $this->fromWikimedia('aircraft',$aircraft_registration,$aircraft_name); |
|
| 233 | - if ($source == 'jetphotos' && !$globalIVAO && class_exists("DomDocument")) $images_array = $this->fromJetPhotos('aircraft',$aircraft_registration,$aircraft_name); |
|
| 234 | - if ($source == 'planepictures' && !$globalIVAO && class_exists("DomDocument")) $images_array = $this->fromPlanePictures('aircraft',$aircraft_registration,$aircraft_name); |
|
| 235 | - if ($source == 'airportdata' && !$globalIVAO) $images_array = $this->fromAirportData('aircraft',$aircraft_registration,$aircraft_name); |
|
| 236 | - if ($source == 'customsources') $images_array = $this->fromCustomSource('aircraft',$aircraft_registration,$aircraft_name); |
|
| 227 | + if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') $images_array = $this->fromIvaoMtl('aircraft', $aircraft_icao, $airline_icao); |
|
| 228 | + if ($source == 'planespotters' && !$globalIVAO && extension_loaded('simplexml')) $images_array = $this->fromPlanespotters('aircraft', $aircraft_registration, $aircraft_name); |
|
| 229 | + if ($source == 'flickr' && extension_loaded('simplexml')) $images_array = $this->fromFlickr('aircraft', $aircraft_registration, $aircraft_name); |
|
| 230 | + if ($source == 'bing') $images_array = $this->fromBing('aircraft', $aircraft_registration, $aircraft_name); |
|
| 231 | + if ($source == 'deviantart' && extension_loaded('simplexml')) $images_array = $this->fromDeviantart('aircraft', $aircraft_registration, $aircraft_name); |
|
| 232 | + if ($source == 'wikimedia') $images_array = $this->fromWikimedia('aircraft', $aircraft_registration, $aircraft_name); |
|
| 233 | + if ($source == 'jetphotos' && !$globalIVAO && class_exists("DomDocument")) $images_array = $this->fromJetPhotos('aircraft', $aircraft_registration, $aircraft_name); |
|
| 234 | + if ($source == 'planepictures' && !$globalIVAO && class_exists("DomDocument")) $images_array = $this->fromPlanePictures('aircraft', $aircraft_registration, $aircraft_name); |
|
| 235 | + if ($source == 'airportdata' && !$globalIVAO) $images_array = $this->fromAirportData('aircraft', $aircraft_registration, $aircraft_name); |
|
| 236 | + if ($source == 'customsources') $images_array = $this->fromCustomSource('aircraft', $aircraft_registration, $aircraft_name); |
|
| 237 | 237 | if (isset($images_array) && $images_array['original'] != '') return $images_array; |
| 238 | 238 | } |
| 239 | 239 | if ((!isset($globalAircraftImageCheckICAO) || $globalAircraftImageCheckICAO === TRUE) && isset($aircraft_icao)) return $this->findAircraftImage($aircraft_icao); |
| 240 | - return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 240 | + return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
| 241 | 241 | } |
| 242 | 242 | |
| 243 | 243 | /** |
@@ -249,14 +249,14 @@ discard block |
||
| 249 | 249 | * @return array the aircraft thumbnail, orignal url and copyright |
| 250 | 250 | * |
| 251 | 251 | */ |
| 252 | - public function findMarineImage($mmsi,$imo = '',$name = '') |
|
| 252 | + public function findMarineImage($mmsi, $imo = '', $name = '') |
|
| 253 | 253 | { |
| 254 | 254 | global $globalMarineImageSources; |
| 255 | - $mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING); |
|
| 255 | + $mmsi = filter_var($mmsi, FILTER_SANITIZE_STRING); |
|
| 256 | 256 | //$imo = filter_var($imo,FILTER_SANITIZE_STRING); |
| 257 | - $name = filter_var($name,FILTER_SANITIZE_STRING); |
|
| 257 | + $name = filter_var($name, FILTER_SANITIZE_STRING); |
|
| 258 | 258 | $name = trim($name); |
| 259 | - if (strlen($name) < 4) return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => ''); |
|
| 259 | + if (strlen($name) < 4) return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
| 260 | 260 | /* |
| 261 | 261 | $Marine = new Marine($this->db); |
| 262 | 262 | if ($imo == '' || $name == '') { |
@@ -268,17 +268,17 @@ discard block |
||
| 268 | 268 | } |
| 269 | 269 | unset($Marine); |
| 270 | 270 | */ |
| 271 | - if (!isset($globalMarineImageSources)) $globalMarineImageSources = array('wikimedia','deviantart','flickr','bing'); |
|
| 271 | + if (!isset($globalMarineImageSources)) $globalMarineImageSources = array('wikimedia', 'deviantart', 'flickr', 'bing'); |
|
| 272 | 272 | foreach ($globalMarineImageSources as $source) { |
| 273 | 273 | $source = strtolower($source); |
| 274 | - if ($source == 'flickr') $images_array = $this->fromFlickr('marine',$mmsi,$name); |
|
| 275 | - if ($source == 'bing') $images_array = $this->fromBing('marine',$mmsi,$name); |
|
| 276 | - if ($source == 'deviantart') $images_array = $this->fromDeviantart('marine',$mmsi,$name); |
|
| 277 | - if ($source == 'wikimedia') $images_array = $this->fromWikimedia('marine',$mmsi,$name); |
|
| 278 | - if ($source == 'customsources') $images_array = $this->fromCustomSource('marine',$mmsi,$name); |
|
| 274 | + if ($source == 'flickr') $images_array = $this->fromFlickr('marine', $mmsi, $name); |
|
| 275 | + if ($source == 'bing') $images_array = $this->fromBing('marine', $mmsi, $name); |
|
| 276 | + if ($source == 'deviantart') $images_array = $this->fromDeviantart('marine', $mmsi, $name); |
|
| 277 | + if ($source == 'wikimedia') $images_array = $this->fromWikimedia('marine', $mmsi, $name); |
|
| 278 | + if ($source == 'customsources') $images_array = $this->fromCustomSource('marine', $mmsi, $name); |
|
| 279 | 279 | if (isset($images_array) && $images_array['original'] != '') return $images_array; |
| 280 | 280 | } |
| 281 | - return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 281 | + return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
| 282 | 282 | } |
| 283 | 283 | |
| 284 | 284 | /** |
@@ -289,30 +289,30 @@ discard block |
||
| 289 | 289 | * @return array the aircraft thumbnail, orignal url and copyright |
| 290 | 290 | * |
| 291 | 291 | */ |
| 292 | - public function fromPlanespotters($type,$aircraft_registration, $aircraft_name='') { |
|
| 292 | + public function fromPlanespotters($type, $aircraft_registration, $aircraft_name = '') { |
|
| 293 | 293 | $Common = new Common(); |
| 294 | 294 | // If aircraft registration is only number, also check with aircraft model |
| 295 | - if (preg_match('/^[[:digit]]+$/',$aircraft_registration) && $aircraft_name != '') { |
|
| 296 | - $url= 'http://www.planespotters.net/Aviation_Photos/search.php?tag='.$aircraft_registration.'&actype=s_'.urlencode($aircraft_name).'&output=rss'; |
|
| 295 | + if (preg_match('/^[[:digit]]+$/', $aircraft_registration) && $aircraft_name != '') { |
|
| 296 | + $url = 'http://www.planespotters.net/Aviation_Photos/search.php?tag='.$aircraft_registration.'&actype=s_'.urlencode($aircraft_name).'&output=rss'; |
|
| 297 | 297 | } else { |
| 298 | 298 | //$url= 'http://www.planespotters.net/Aviation_Photos/search.php?tag='.$airline_aircraft_type.'&output=rss'; |
| 299 | - $url= 'http://www.planespotters.net/Aviation_Photos/search.php?reg='.$aircraft_registration.'&output=rss'; |
|
| 299 | + $url = 'http://www.planespotters.net/Aviation_Photos/search.php?reg='.$aircraft_registration.'&output=rss'; |
|
| 300 | 300 | } |
| 301 | 301 | $data = $Common->getData($url); |
| 302 | - if (substr($data, 0, 5) != "<?xml") return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 302 | + if (substr($data, 0, 5) != "<?xml") return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
| 303 | 303 | if ($xml = simplexml_load_string($data)) { |
| 304 | 304 | if (isset($xml->channel->item)) { |
| 305 | 305 | $image_url = array(); |
| 306 | - $thumbnail_url = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url); |
|
| 306 | + $thumbnail_url = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url); |
|
| 307 | 307 | $image_url['thumbnail'] = $thumbnail_url; |
| 308 | - $image_url['original'] = str_replace('thumbnail','original',$thumbnail_url); |
|
| 309 | - $image_url['copyright'] = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->copyright); |
|
| 310 | - $image_url['source_website'] = trim((string)$xml->channel->item->link); |
|
| 308 | + $image_url['original'] = str_replace('thumbnail', 'original', $thumbnail_url); |
|
| 309 | + $image_url['copyright'] = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->copyright); |
|
| 310 | + $image_url['source_website'] = trim((string) $xml->channel->item->link); |
|
| 311 | 311 | $image_url['source'] = 'planespotters'; |
| 312 | 312 | return $image_url; |
| 313 | 313 | } |
| 314 | 314 | } |
| 315 | - return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 315 | + return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
| 316 | 316 | } |
| 317 | 317 | |
| 318 | 318 | /** |
@@ -323,36 +323,36 @@ discard block |
||
| 323 | 323 | * @param String $name type of the aircraft |
| 324 | 324 | * @return array the aircraft thumbnail, orignal url and copyright |
| 325 | 325 | */ |
| 326 | - public function fromDeviantart($type,$registration, $name='') { |
|
| 326 | + public function fromDeviantart($type, $registration, $name = '') { |
|
| 327 | 327 | $Common = new Common(); |
| 328 | 328 | if ($type == 'aircraft') { |
| 329 | 329 | // If aircraft registration is only number, also check with aircraft model |
| 330 | - if (preg_match('/^[[:digit]]+$/',$registration) && $name != '') { |
|
| 331 | - $url= 'http://backend.deviantart.com/rss.xml?type=deviation&q='.$registration.'%20'.urlencode($name); |
|
| 330 | + if (preg_match('/^[[:digit]]+$/', $registration) && $name != '') { |
|
| 331 | + $url = 'http://backend.deviantart.com/rss.xml?type=deviation&q='.$registration.'%20'.urlencode($name); |
|
| 332 | 332 | } else { |
| 333 | - $url= 'http://backend.deviantart.com/rss.xml?type=deviation&q=aircraft%20'.$registration; |
|
| 333 | + $url = 'http://backend.deviantart.com/rss.xml?type=deviation&q=aircraft%20'.$registration; |
|
| 334 | 334 | } |
| 335 | 335 | } elseif ($type == 'marine') { |
| 336 | - $url= 'http://backend.deviantart.com/rss.xml?type=deviation&q=ship%20"'.urlencode($name).'"'; |
|
| 336 | + $url = 'http://backend.deviantart.com/rss.xml?type=deviation&q=ship%20"'.urlencode($name).'"'; |
|
| 337 | 337 | } else { |
| 338 | - $url= 'http://backend.deviantart.com/rss.xml?type=deviation&q="'.urlencode($name).'"'; |
|
| 338 | + $url = 'http://backend.deviantart.com/rss.xml?type=deviation&q="'.urlencode($name).'"'; |
|
| 339 | 339 | } |
| 340 | 340 | $data = $Common->getData($url); |
| 341 | - if (substr($data, 0, 5) != "<?xml") return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 341 | + if (substr($data, 0, 5) != "<?xml") return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
| 342 | 342 | if ($xml = simplexml_load_string($data)) { |
| 343 | 343 | if (isset($xml->channel->item->link)) { |
| 344 | 344 | $image_url = array(); |
| 345 | - $thumbnail_url = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url); |
|
| 345 | + $thumbnail_url = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url); |
|
| 346 | 346 | $image_url['thumbnail'] = $thumbnail_url; |
| 347 | - $original_url = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->content->attributes()->url); |
|
| 347 | + $original_url = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->content->attributes()->url); |
|
| 348 | 348 | $image_url['original'] = $original_url; |
| 349 | - $image_url['copyright'] = str_replace('Copyright ','',trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->copyright)); |
|
| 350 | - $image_url['source_website'] = trim((string)$xml->channel->item->link); |
|
| 349 | + $image_url['copyright'] = str_replace('Copyright ', '', trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->copyright)); |
|
| 350 | + $image_url['source_website'] = trim((string) $xml->channel->item->link); |
|
| 351 | 351 | $image_url['source'] = 'deviantart'; |
| 352 | 352 | return $image_url; |
| 353 | 353 | } |
| 354 | 354 | } |
| 355 | - return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 355 | + return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
| 356 | 356 | } |
| 357 | 357 | |
| 358 | 358 | /** |
@@ -363,38 +363,38 @@ discard block |
||
| 363 | 363 | * @return array the aircraft thumbnail, orignal url and copyright |
| 364 | 364 | * |
| 365 | 365 | */ |
| 366 | - public function fromJetPhotos($type,$aircraft_registration, $aircraft_name='') { |
|
| 366 | + public function fromJetPhotos($type, $aircraft_registration, $aircraft_name = '') { |
|
| 367 | 367 | $Common = new Common(); |
| 368 | - $url= 'http://jetphotos.net/showphotos.php?displaymode=2®search='.$aircraft_registration; |
|
| 368 | + $url = 'http://jetphotos.net/showphotos.php?displaymode=2®search='.$aircraft_registration; |
|
| 369 | 369 | $data = $Common->getData($url); |
| 370 | 370 | $dom = new DOMDocument(); |
| 371 | 371 | @$dom->loadHTML($data); |
| 372 | 372 | $all_pics = array(); |
| 373 | - foreach($dom->getElementsByTagName('img') as $image) { |
|
| 373 | + foreach ($dom->getElementsByTagName('img') as $image) { |
|
| 374 | 374 | if ($image->getAttribute('itemprop') == "http://schema.org/image") { |
| 375 | 375 | $all_pics[] = $image->getAttribute('src'); |
| 376 | 376 | } |
| 377 | 377 | } |
| 378 | 378 | $all_authors = array(); |
| 379 | - foreach($dom->getElementsByTagName('meta') as $author) { |
|
| 379 | + foreach ($dom->getElementsByTagName('meta') as $author) { |
|
| 380 | 380 | if ($author->getAttribute('itemprop') == "http://schema.org/author") { |
| 381 | 381 | $all_authors[] = $author->getAttribute('content'); |
| 382 | 382 | } |
| 383 | 383 | } |
| 384 | 384 | $all_ref = array(); |
| 385 | - foreach($dom->getElementsByTagName('a') as $link) { |
|
| 385 | + foreach ($dom->getElementsByTagName('a') as $link) { |
|
| 386 | 386 | $all_ref[] = $link->getAttribute('href'); |
| 387 | 387 | } |
| 388 | 388 | if (isset($all_pics[0])) { |
| 389 | 389 | $image_url = array(); |
| 390 | 390 | $image_url['thumbnail'] = $all_pics[0]; |
| 391 | - $image_url['original'] = str_replace('_tb','',$all_pics[0]); |
|
| 391 | + $image_url['original'] = str_replace('_tb', '', $all_pics[0]); |
|
| 392 | 392 | $image_url['copyright'] = $all_authors[0]; |
| 393 | 393 | $image_url['source_website'] = 'http://jetphotos.net'.$all_ref[8]; |
| 394 | 394 | $image_url['source'] = 'JetPhotos'; |
| 395 | 395 | return $image_url; |
| 396 | 396 | } |
| 397 | - return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 397 | + return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
| 398 | 398 | } |
| 399 | 399 | |
| 400 | 400 | /** |
@@ -405,30 +405,30 @@ discard block |
||
| 405 | 405 | * @return array the aircraft thumbnail, orignal url and copyright |
| 406 | 406 | * |
| 407 | 407 | */ |
| 408 | - public function fromPlanePictures($type,$aircraft_registration, $aircraft_name='') { |
|
| 408 | + public function fromPlanePictures($type, $aircraft_registration, $aircraft_name = '') { |
|
| 409 | 409 | $Common = new Common(); |
| 410 | - $url= 'http://www.planepictures.net/netsearch4.cgi?srch='.$aircraft_registration.'&stype=reg&srng=2'; |
|
| 410 | + $url = 'http://www.planepictures.net/netsearch4.cgi?srch='.$aircraft_registration.'&stype=reg&srng=2'; |
|
| 411 | 411 | $data = $Common->getData($url); |
| 412 | 412 | $dom = new DOMDocument(); |
| 413 | 413 | @$dom->loadHTML($data); |
| 414 | 414 | $all_pics = array(); |
| 415 | - foreach($dom->getElementsByTagName('img') as $image) { |
|
| 415 | + foreach ($dom->getElementsByTagName('img') as $image) { |
|
| 416 | 416 | $all_pics[] = $image->getAttribute('src'); |
| 417 | 417 | } |
| 418 | 418 | $all_links = array(); |
| 419 | - foreach($dom->getElementsByTagName('a') as $link) { |
|
| 420 | - $all_links[] = array('text' => $link->textContent,'href' => $link->getAttribute('href')); |
|
| 419 | + foreach ($dom->getElementsByTagName('a') as $link) { |
|
| 420 | + $all_links[] = array('text' => $link->textContent, 'href' => $link->getAttribute('href')); |
|
| 421 | 421 | } |
| 422 | - if (isset($all_pics[1]) && !preg_match('/bit.ly/',$all_pics[1]) && !preg_match('/flagge/',$all_pics[1])) { |
|
| 422 | + if (isset($all_pics[1]) && !preg_match('/bit.ly/', $all_pics[1]) && !preg_match('/flagge/', $all_pics[1])) { |
|
| 423 | 423 | $image_url = array(); |
| 424 | 424 | $image_url['thumbnail'] = 'http://www.planepictures.net/'.$all_pics[1]; |
| 425 | - $image_url['original'] = 'http://www.planepictures.net/'.str_replace('_TN','',$all_pics[1]); |
|
| 425 | + $image_url['original'] = 'http://www.planepictures.net/'.str_replace('_TN', '', $all_pics[1]); |
|
| 426 | 426 | $image_url['copyright'] = $all_links[6]['text']; |
| 427 | 427 | $image_url['source_website'] = 'http://www.planepictures.net/'.$all_links[2]['href']; |
| 428 | 428 | $image_url['source'] = 'PlanePictures'; |
| 429 | 429 | return $image_url; |
| 430 | 430 | } |
| 431 | - return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 431 | + return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
| 432 | 432 | } |
| 433 | 433 | |
| 434 | 434 | /** |
@@ -439,7 +439,7 @@ discard block |
||
| 439 | 439 | * @return array the aircraft thumbnail, orignal url and copyright |
| 440 | 440 | * |
| 441 | 441 | */ |
| 442 | - public function fromFlickr($type,$registration,$name='') { |
|
| 442 | + public function fromFlickr($type, $registration, $name = '') { |
|
| 443 | 443 | $Common = new Common(); |
| 444 | 444 | if ($type == 'aircraft') { |
| 445 | 445 | if ($name != '') $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.','.urlencode($name); |
@@ -449,20 +449,20 @@ discard block |
||
| 449 | 449 | else $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.',ship'; |
| 450 | 450 | } |
| 451 | 451 | $data = $Common->getData($url); |
| 452 | - if (substr($data, 0, 5) != "<?xml") return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 452 | + if (substr($data, 0, 5) != "<?xml") return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
| 453 | 453 | if ($xml = simplexml_load_string($data)) { |
| 454 | 454 | if (isset($xml->channel->item)) { |
| 455 | - $original_url = trim((string)$xml->channel->item->enclosure->attributes()->url); |
|
| 455 | + $original_url = trim((string) $xml->channel->item->enclosure->attributes()->url); |
|
| 456 | 456 | $image_url = array(); |
| 457 | 457 | $image_url['thumbnail'] = $original_url; |
| 458 | 458 | $image_url['original'] = $original_url; |
| 459 | - $image_url['copyright'] = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->credit); |
|
| 460 | - $image_url['source_website'] = trim((string)$xml->channel->item->link); |
|
| 459 | + $image_url['copyright'] = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->credit); |
|
| 460 | + $image_url['source_website'] = trim((string) $xml->channel->item->link); |
|
| 461 | 461 | $image_url['source'] = 'flickr'; |
| 462 | 462 | return $image_url; |
| 463 | 463 | } |
| 464 | 464 | } |
| 465 | - return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 465 | + return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
| 466 | 466 | } |
| 467 | 467 | |
| 468 | 468 | /** |
@@ -483,7 +483,7 @@ discard block |
||
| 483 | 483 | $image_url['source'] = 'ivao.aero'; |
| 484 | 484 | return $image_url; |
| 485 | 485 | } else { |
| 486 | - return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 486 | + return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
| 487 | 487 | } |
| 488 | 488 | } |
| 489 | 489 | |
@@ -495,10 +495,10 @@ discard block |
||
| 495 | 495 | * @param String $aircraft_name type of the aircraft |
| 496 | 496 | * @return array the aircraft thumbnail, orignal url and copyright |
| 497 | 497 | */ |
| 498 | - public function fromBing($type,$aircraft_registration,$aircraft_name='') { |
|
| 498 | + public function fromBing($type, $aircraft_registration, $aircraft_name = '') { |
|
| 499 | 499 | global $globalImageBingKey; |
| 500 | 500 | $Common = new Common(); |
| 501 | - if (!isset($globalImageBingKey) || $globalImageBingKey == '') return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 501 | + if (!isset($globalImageBingKey) || $globalImageBingKey == '') return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
| 502 | 502 | if ($type == 'aircraft') { |
| 503 | 503 | if ($aircraft_name != '') $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.$aircraft_registration.'%20'.urlencode($aircraft_name).'%20-site:planespotters.com%20-site:flickr.com%27'; |
| 504 | 504 | else $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Baircraft%20-site:planespotters.com%20-site:flickr.com%27'; |
@@ -506,8 +506,8 @@ discard block |
||
| 506 | 506 | if ($aircraft_name != '') $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.urlencode($aircraft_name).'%20%2Bship%20-site:flickr.com%27'; |
| 507 | 507 | else $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Bship%20-site:flickr.com%27'; |
| 508 | 508 | } |
| 509 | - $headers = array("Authorization: Basic " . base64_encode("ignored:".$globalImageBingKey)); |
|
| 510 | - $data = $Common->getData($url,'get','',$headers); |
|
| 509 | + $headers = array("Authorization: Basic ".base64_encode("ignored:".$globalImageBingKey)); |
|
| 510 | + $data = $Common->getData($url, 'get', '', $headers); |
|
| 511 | 511 | $result = json_decode($data); |
| 512 | 512 | if (isset($result->d->results[0]->MediaUrl)) { |
| 513 | 513 | $image_url = array(); |
@@ -521,7 +521,7 @@ discard block |
||
| 521 | 521 | $image_url['source'] = 'bing'; |
| 522 | 522 | return $image_url; |
| 523 | 523 | } |
| 524 | - return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 524 | + return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
| 525 | 525 | } |
| 526 | 526 | |
| 527 | 527 | /** |
@@ -532,21 +532,21 @@ discard block |
||
| 532 | 532 | * @return array the aircraft thumbnail, orignal url and copyright |
| 533 | 533 | * |
| 534 | 534 | */ |
| 535 | - public function fromAirportData($type,$aircraft_registration,$aircraft_name='') { |
|
| 535 | + public function fromAirportData($type, $aircraft_registration, $aircraft_name = '') { |
|
| 536 | 536 | $Common = new Common(); |
| 537 | 537 | $url = 'http://www.airport-data.com/api/ac_thumb.json?&n=1&r='.$aircraft_registration; |
| 538 | 538 | $data = $Common->getData($url); |
| 539 | 539 | $result = json_decode($data); |
| 540 | 540 | if (isset($result->count) && $result->count > 0) { |
| 541 | 541 | $image_url = array(); |
| 542 | - $image_url['original'] = str_replace('thumbnails','large',$result->data[0]->image); |
|
| 542 | + $image_url['original'] = str_replace('thumbnails', 'large', $result->data[0]->image); |
|
| 543 | 543 | $image_url['source_website'] = $result->data[0]->link; |
| 544 | 544 | $image_url['thumbnail'] = $result->data[0]->image; |
| 545 | 545 | $image_url['copyright'] = $result->data[0]->photographer; |
| 546 | 546 | $image_url['source'] = 'AirportData'; |
| 547 | 547 | return $image_url; |
| 548 | 548 | } |
| 549 | - return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 549 | + return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
| 550 | 550 | } |
| 551 | 551 | |
| 552 | 552 | /** |
@@ -557,20 +557,20 @@ discard block |
||
| 557 | 557 | * @return array the aircraft thumbnail, orignal url and copyright |
| 558 | 558 | * |
| 559 | 559 | */ |
| 560 | - public function fromWikimedia($type,$registration,$name='') { |
|
| 560 | + public function fromWikimedia($type, $registration, $name = '') { |
|
| 561 | 561 | $Common = new Common(); |
| 562 | 562 | if ($type == 'aircraft') { |
| 563 | 563 | if ($name != '') $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20'.urlencode($name); |
| 564 | 564 | else $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20aircraft'; |
| 565 | 565 | } elseif ($type == 'marine') { |
| 566 | 566 | if ($name != '') $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.urlencode($name).'%20ship"'; |
| 567 | - else return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 567 | + else return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
| 568 | 568 | } |
| 569 | 569 | $data = $Common->getData($url); |
| 570 | 570 | $result = json_decode($data); |
| 571 | 571 | if (isset($result->query->search[0]->title)) { |
| 572 | 572 | $fileo = $result->query->search[0]->title; |
| 573 | - if (substr($fileo,-3) == 'pdf') return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 573 | + if (substr($fileo, -3) == 'pdf') return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
| 574 | 574 | $file = urlencode($fileo); |
| 575 | 575 | $url2 = 'https://commons.wikimedia.org/w/api.php?action=query&format=json&continue&iilimit=500&prop=imageinfo&iiprop=user|url|size|mime|sha1|timestamp&iiurlwidth=200%27&titles='.$file; |
| 576 | 576 | $data2 = $Common->getData($url2); |
@@ -595,11 +595,11 @@ discard block |
||
| 595 | 595 | if (isset($result2->query->pages)) { |
| 596 | 596 | foreach ($result2->query->pages as $page) { |
| 597 | 597 | if (isset($page->imageinfo[0]->extmetadata->Artist)) { |
| 598 | - $image_url['copyright'] = preg_replace('/ from(.*)/','',strip_tags($page->imageinfo[0]->extmetadata->Artist->value)); |
|
| 598 | + $image_url['copyright'] = preg_replace('/ from(.*)/', '', strip_tags($page->imageinfo[0]->extmetadata->Artist->value)); |
|
| 599 | 599 | if (isset($page->imageinfo[0]->extmetadata->License->value)) { |
| 600 | 600 | $image_url['copyright'] = $image_url['copyright'].' (under '.$page->imageinfo[0]->extmetadata->License->value.')'; |
| 601 | 601 | } |
| 602 | - $image_url['copyright'] = trim(str_replace('\n','',$image_url['copyright'])); |
|
| 602 | + $image_url['copyright'] = trim(str_replace('\n', '', $image_url['copyright'])); |
|
| 603 | 603 | return $image_url; |
| 604 | 604 | } |
| 605 | 605 | } |
@@ -607,7 +607,7 @@ discard block |
||
| 607 | 607 | return $image_url; |
| 608 | 608 | } |
| 609 | 609 | } |
| 610 | - return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 610 | + return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
| 611 | 611 | } |
| 612 | 612 | |
| 613 | 613 | /** |
@@ -618,7 +618,7 @@ discard block |
||
| 618 | 618 | * @return array the aircraft thumbnail, orignal url and copyright |
| 619 | 619 | * |
| 620 | 620 | */ |
| 621 | - public function fromCustomSource($type,$registration,$name='') { |
|
| 621 | + public function fromCustomSource($type, $registration, $name = '') { |
|
| 622 | 622 | global $globalAircraftImageCustomSources, $globalMarineImageCustomSources, $globalDebug; |
| 623 | 623 | //$globalAircraftImageCustomSource[] = array('thumbnail' => '','original' => '', 'copyright' => '', 'source_website' => '', 'source' => '','exif' => true); |
| 624 | 624 | if (!empty($globalAircraftImageCustomSources) && $type == 'aircraft') { |
@@ -635,15 +635,15 @@ discard block |
||
| 635 | 635 | print_r($source); |
| 636 | 636 | print_r($customsources); |
| 637 | 637 | } |
| 638 | - $url = str_replace('{registration}',$registration,$source['original']); |
|
| 639 | - $url_thumbnail = str_replace('{registration}',$registration,$source['thumbnail']); |
|
| 638 | + $url = str_replace('{registration}', $registration, $source['original']); |
|
| 639 | + $url_thumbnail = str_replace('{registration}', $registration, $source['thumbnail']); |
|
| 640 | 640 | if ($Common->urlexist($url)) { |
| 641 | 641 | $image_url = array(); |
| 642 | 642 | $image_url['thumbnail'] = $url_thumbnail; |
| 643 | 643 | $image_url['original'] = $url; |
| 644 | 644 | if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) $exifCopyright = $this->getExifCopyright($url); |
| 645 | 645 | else $exifCopyright = ''; |
| 646 | - if ($exifCopyright != '') $image_url['copyright'] = $exifCopyright; |
|
| 646 | + if ($exifCopyright != '') $image_url['copyright'] = $exifCopyright; |
|
| 647 | 647 | elseif (isset($source['copyright'])) $image_url['copyright'] = $source['copyright']; |
| 648 | 648 | else $image_url['copyright'] = $source['source_website']; |
| 649 | 649 | $image_url['source_website'] = $source['source_website']; |
@@ -651,8 +651,8 @@ discard block |
||
| 651 | 651 | return $image_url; |
| 652 | 652 | } |
| 653 | 653 | } |
| 654 | - return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 655 | - } else return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 654 | + return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
| 655 | + } else return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
| 656 | 656 | |
| 657 | 657 | if (!empty($globalMarineImageCustomSources) && $type == 'marine') { |
| 658 | 658 | $customsources = array(); |
@@ -668,19 +668,19 @@ discard block |
||
| 668 | 668 | print_r($source); |
| 669 | 669 | print_r($customsources); |
| 670 | 670 | } |
| 671 | - $url = str_replace('{registration}',$registration,$source['original']); |
|
| 672 | - $url = str_replace('{mmsi}',$registration,$url); |
|
| 673 | - $url = str_replace('{name}',$name,$url); |
|
| 674 | - $url_thumbnail = str_replace('{registration}',$registration,$source['thumbnail']); |
|
| 675 | - $url_thumbnail = str_replace('{mmsi}',$registration,$url_thumbnail); |
|
| 676 | - $url_thumbnail = str_replace('{name}',$name,$url_thumbnail); |
|
| 671 | + $url = str_replace('{registration}', $registration, $source['original']); |
|
| 672 | + $url = str_replace('{mmsi}', $registration, $url); |
|
| 673 | + $url = str_replace('{name}', $name, $url); |
|
| 674 | + $url_thumbnail = str_replace('{registration}', $registration, $source['thumbnail']); |
|
| 675 | + $url_thumbnail = str_replace('{mmsi}', $registration, $url_thumbnail); |
|
| 676 | + $url_thumbnail = str_replace('{name}', $name, $url_thumbnail); |
|
| 677 | 677 | if ($Common->urlexist($url)) { |
| 678 | 678 | $image_url = array(); |
| 679 | 679 | $image_url['thumbnail'] = $url_thumbnail; |
| 680 | 680 | $image_url['original'] = $url; |
| 681 | 681 | if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) $exifCopyright = $this->getExifCopyright($url); |
| 682 | 682 | else $exifCopyright = ''; |
| 683 | - if ($exifCopyright != '') $image_url['copyright'] = $exifCopyright; |
|
| 683 | + if ($exifCopyright != '') $image_url['copyright'] = $exifCopyright; |
|
| 684 | 684 | elseif (isset($source['copyright'])) $image_url['copyright'] = $source['copyright']; |
| 685 | 685 | else $image_url['copyright'] = $source['source_website']; |
| 686 | 686 | $image_url['source_website'] = $source['source_website']; |
@@ -19,7 +19,9 @@ discard block |
||
| 19 | 19 | public function __construct($dbc = null) { |
| 20 | 20 | $Connection = new Connection($dbc); |
| 21 | 21 | $this->db = $Connection->db(); |
| 22 | - if ($this->db === null) die('Error: No DB connection. (Image)'); |
|
| 22 | + if ($this->db === null) { |
|
| 23 | + die('Error: No DB connection. (Image)'); |
|
| 24 | + } |
|
| 23 | 25 | } |
| 24 | 26 | |
| 25 | 27 | /** |
@@ -36,7 +38,9 @@ discard block |
||
| 36 | 38 | $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
| 37 | 39 | $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
| 38 | 40 | $reg = $registration; |
| 39 | - if (($reg == '' || $reg == 'NA') && $aircraft_icao != '') $reg = $aircraft_icao.$airline_icao; |
|
| 41 | + if (($reg == '' || $reg == 'NA') && $aircraft_icao != '') { |
|
| 42 | + $reg = $aircraft_icao.$airline_icao; |
|
| 43 | + } |
|
| 40 | 44 | $reg = trim($reg); |
| 41 | 45 | $query = "SELECT spotter_image.image, spotter_image.image_thumbnail, spotter_image.image_source, spotter_image.image_source_website,spotter_image.image_copyright, spotter_image.registration |
| 42 | 46 | FROM spotter_image |
@@ -44,9 +48,13 @@ discard block |
||
| 44 | 48 | $sth = $this->db->prepare($query); |
| 45 | 49 | $sth->execute(array(':registration' => $reg)); |
| 46 | 50 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 47 | - if (!empty($result)) return $result; |
|
| 48 | - elseif ($registration != '' && ($aircraft_icao != '' || $airline_icao != '')) return $this->getSpotterImage('',$aircraft_icao,$airline_icao); |
|
| 49 | - else return array(); |
|
| 51 | + if (!empty($result)) { |
|
| 52 | + return $result; |
|
| 53 | + } elseif ($registration != '' && ($aircraft_icao != '' || $airline_icao != '')) { |
|
| 54 | + return $this->getSpotterImage('',$aircraft_icao,$airline_icao); |
|
| 55 | + } else { |
|
| 56 | + return array(); |
|
| 57 | + } |
|
| 50 | 58 | } |
| 51 | 59 | |
| 52 | 60 | /** |
@@ -74,7 +82,9 @@ discard block |
||
| 74 | 82 | } |
| 75 | 83 | } |
| 76 | 84 | $name = trim($name); |
| 77 | - if ($mmsi == '' && $imo == '' && $name == '') return array(); |
|
| 85 | + if ($mmsi == '' && $imo == '' && $name == '') { |
|
| 86 | + return array(); |
|
| 87 | + } |
|
| 78 | 88 | $query = "SELECT marine_image.image, marine_image.image_thumbnail, marine_image.image_source, marine_image.image_source_website,marine_image.image_copyright, marine_image.mmsi, marine_image.imo, marine_image.name |
| 79 | 89 | FROM marine_image |
| 80 | 90 | WHERE marine_image.mmsi = :mmsi"; |
@@ -103,8 +113,11 @@ discard block |
||
| 103 | 113 | public function getExifCopyright($url) { |
| 104 | 114 | $exif = exif_read_data($url); |
| 105 | 115 | $copyright = ''; |
| 106 | - if (isset($exif['COMPUTED']['copyright'])) $copyright = $exif['COMPUTED']['copyright']; |
|
| 107 | - elseif (isset($exif['copyright'])) $copyright = $exif['copyright']; |
|
| 116 | + if (isset($exif['COMPUTED']['copyright'])) { |
|
| 117 | + $copyright = $exif['COMPUTED']['copyright']; |
|
| 118 | + } elseif (isset($exif['copyright'])) { |
|
| 119 | + $copyright = $exif['copyright']; |
|
| 120 | + } |
|
| 108 | 121 | if ($copyright != '') { |
| 109 | 122 | $copyright = str_replace('Copyright ','',$copyright); |
| 110 | 123 | $copyright = str_replace('© ','',$copyright); |
@@ -124,17 +137,27 @@ discard block |
||
| 124 | 137 | public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '') |
| 125 | 138 | { |
| 126 | 139 | global $globalDebug,$globalAircraftImageFetch, $globalOffline; |
| 127 | - if ((isset($globalAircraftImageFetch) && $globalAircraftImageFetch === FALSE) || (isset($globalOffline) && $globalOffline === TRUE)) return ''; |
|
| 140 | + if ((isset($globalAircraftImageFetch) && $globalAircraftImageFetch === FALSE) || (isset($globalOffline) && $globalOffline === TRUE)) { |
|
| 141 | + return ''; |
|
| 142 | + } |
|
| 128 | 143 | $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
| 129 | 144 | $registration = trim($registration); |
| 130 | 145 | //getting the aircraft image |
| 131 | - if ($globalDebug && $registration != '') echo 'Try to find an aircraft image for '.$registration.'...'; |
|
| 132 | - elseif ($globalDebug && $aircraft_icao != '') echo 'Try to find an aircraft image for '.$aircraft_icao.'...'; |
|
| 133 | - elseif ($globalDebug && $airline_icao != '') echo 'Try to find an aircraft image for '.$airline_icao.'...'; |
|
| 146 | + if ($globalDebug && $registration != '') { |
|
| 147 | + echo 'Try to find an aircraft image for '.$registration.'...'; |
|
| 148 | + } elseif ($globalDebug && $aircraft_icao != '') { |
|
| 149 | + echo 'Try to find an aircraft image for '.$aircraft_icao.'...'; |
|
| 150 | + } elseif ($globalDebug && $airline_icao != '') { |
|
| 151 | + echo 'Try to find an aircraft image for '.$airline_icao.'...'; |
|
| 152 | + } |
|
| 134 | 153 | $image_url = $this->findAircraftImage($registration,$aircraft_icao,$airline_icao); |
| 135 | - if ($registration == '' && $aircraft_icao != '') $registration = $aircraft_icao.$airline_icao; |
|
| 154 | + if ($registration == '' && $aircraft_icao != '') { |
|
| 155 | + $registration = $aircraft_icao.$airline_icao; |
|
| 156 | + } |
|
| 136 | 157 | if ($image_url['original'] != '') { |
| 137 | - if ($globalDebug) echo 'Found !'."\n"; |
|
| 158 | + if ($globalDebug) { |
|
| 159 | + echo 'Found !'."\n"; |
|
| 160 | + } |
|
| 138 | 161 | $query = "INSERT INTO spotter_image (registration, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:registration,:image,:image_thumbnail,:copyright,:source,:source_website)"; |
| 139 | 162 | try { |
| 140 | 163 | $sth = $this->db->prepare($query); |
@@ -143,7 +166,9 @@ discard block |
||
| 143 | 166 | echo $e->getMessage()."\n"; |
| 144 | 167 | return "error"; |
| 145 | 168 | } |
| 146 | - } elseif ($globalDebug) echo "Not found :'(\n"; |
|
| 169 | + } elseif ($globalDebug) { |
|
| 170 | + echo "Not found :'(\n"; |
|
| 171 | + } |
|
| 147 | 172 | return "success"; |
| 148 | 173 | } |
| 149 | 174 | |
@@ -158,7 +183,9 @@ discard block |
||
| 158 | 183 | public function addMarineImage($mmsi,$imo = '',$name = '') |
| 159 | 184 | { |
| 160 | 185 | global $globalDebug,$globalMarineImageFetch, $globalOffline; |
| 161 | - if ((isset($globalMarineImageFetch) && !$globalMarineImageFetch) || (isset($globalOffline) && $globalOffline === TRUE)) return ''; |
|
| 186 | + if ((isset($globalMarineImageFetch) && !$globalMarineImageFetch) || (isset($globalOffline) && $globalOffline === TRUE)) { |
|
| 187 | + return ''; |
|
| 188 | + } |
|
| 162 | 189 | $mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING); |
| 163 | 190 | $imo = filter_var($imo,FILTER_SANITIZE_STRING); |
| 164 | 191 | $name = filter_var($name,FILTER_SANITIZE_STRING); |
@@ -168,16 +195,22 @@ discard block |
||
| 168 | 195 | $identity = $Marine->getIdentity($mmsi); |
| 169 | 196 | if (isset($identity[0]['mmsi'])) { |
| 170 | 197 | $imo = $identity[0]['imo']; |
| 171 | - if ($identity[0]['ship_name'] != '') $name = $identity[0]['ship_name']; |
|
| 198 | + if ($identity[0]['ship_name'] != '') { |
|
| 199 | + $name = $identity[0]['ship_name']; |
|
| 200 | + } |
|
| 172 | 201 | } |
| 173 | 202 | } |
| 174 | 203 | unset($Marine); |
| 175 | 204 | |
| 176 | 205 | //getting the aircraft image |
| 177 | - if ($globalDebug && $name != '') echo 'Try to find an vessel image for '.$name.'...'; |
|
| 206 | + if ($globalDebug && $name != '') { |
|
| 207 | + echo 'Try to find an vessel image for '.$name.'...'; |
|
| 208 | + } |
|
| 178 | 209 | $image_url = $this->findMarineImage($mmsi,$imo,$name); |
| 179 | 210 | if ($image_url['original'] != '') { |
| 180 | - if ($globalDebug) echo 'Found !'."\n"; |
|
| 211 | + if ($globalDebug) { |
|
| 212 | + echo 'Found !'."\n"; |
|
| 213 | + } |
|
| 181 | 214 | $query = "INSERT INTO marine_image (mmsi,imo,name, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:mmsi,:imo,:name,:image,:image_thumbnail,:copyright,:source,:source_website)"; |
| 182 | 215 | try { |
| 183 | 216 | $sth = $this->db->prepare($query); |
@@ -186,7 +219,9 @@ discard block |
||
| 186 | 219 | echo $e->getMessage()."\n"; |
| 187 | 220 | return "error"; |
| 188 | 221 | } |
| 189 | - } elseif ($globalDebug) echo "Not found :'(\n"; |
|
| 222 | + } elseif ($globalDebug) { |
|
| 223 | + echo "Not found :'(\n"; |
|
| 224 | + } |
|
| 190 | 225 | return "success"; |
| 191 | 226 | } |
| 192 | 227 | |
@@ -202,41 +237,85 @@ discard block |
||
| 202 | 237 | { |
| 203 | 238 | global $globalAircraftImageSources, $globalIVAO, $globalAircraftImageCheckICAO, $globalVA; |
| 204 | 239 | $Spotter = new Spotter($this->db); |
| 205 | - if (!isset($globalIVAO)) $globalIVAO = FALSE; |
|
| 240 | + if (!isset($globalIVAO)) { |
|
| 241 | + $globalIVAO = FALSE; |
|
| 242 | + } |
|
| 206 | 243 | $aircraft_registration = filter_var($aircraft_registration,FILTER_SANITIZE_STRING); |
| 207 | 244 | if ($aircraft_registration != '' && $aircraft_registration != 'NA' && (!isset($globalVA) || $globalVA !== TRUE)) { |
| 208 | - if (strpos($aircraft_registration,'/') !== false) return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 245 | + if (strpos($aircraft_registration,'/') !== false) { |
|
| 246 | + return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 247 | + } |
|
| 209 | 248 | $aircraft_registration = urlencode(trim($aircraft_registration)); |
| 210 | 249 | $aircraft_info = $Spotter->getAircraftInfoByRegistration($aircraft_registration); |
| 211 | - if (isset($aircraft_info[0]['aircraft_name'])) $aircraft_name = $aircraft_info[0]['aircraft_name']; |
|
| 212 | - else $aircraft_name = ''; |
|
| 213 | - if (isset($aircraft_info[0]['aircraft_icao'])) $aircraft_name = $aircraft_info[0]['aircraft_icao']; |
|
| 214 | - else $aircraft_icao = ''; |
|
| 215 | - if (isset($aircraft_info[0]['airline_icao'])) $airline_icao = $aircraft_info[0]['airline_icao']; |
|
| 216 | - else $airline_icao = ''; |
|
| 250 | + if (isset($aircraft_info[0]['aircraft_name'])) { |
|
| 251 | + $aircraft_name = $aircraft_info[0]['aircraft_name']; |
|
| 252 | + } else { |
|
| 253 | + $aircraft_name = ''; |
|
| 254 | + } |
|
| 255 | + if (isset($aircraft_info[0]['aircraft_icao'])) { |
|
| 256 | + $aircraft_name = $aircraft_info[0]['aircraft_icao']; |
|
| 257 | + } else { |
|
| 258 | + $aircraft_icao = ''; |
|
| 259 | + } |
|
| 260 | + if (isset($aircraft_info[0]['airline_icao'])) { |
|
| 261 | + $airline_icao = $aircraft_info[0]['airline_icao']; |
|
| 262 | + } else { |
|
| 263 | + $airline_icao = ''; |
|
| 264 | + } |
|
| 217 | 265 | } elseif ($aircraft_icao != '') { |
| 218 | 266 | $aircraft_info = $Spotter->getAllAircraftInfo($aircraft_icao); |
| 219 | - if (isset($aircraft_info[0]['type'])) $aircraft_name = $aircraft_info[0]['type']; |
|
| 220 | - else $aircraft_name = ''; |
|
| 267 | + if (isset($aircraft_info[0]['type'])) { |
|
| 268 | + $aircraft_name = $aircraft_info[0]['type']; |
|
| 269 | + } else { |
|
| 270 | + $aircraft_name = ''; |
|
| 271 | + } |
|
| 221 | 272 | $aircraft_registration = $aircraft_icao; |
| 222 | - } else return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => ''); |
|
| 273 | + } else { |
|
| 274 | + return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => ''); |
|
| 275 | + } |
|
| 223 | 276 | unset($Spotter); |
| 224 | - if (!isset($globalAircraftImageSources)) $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters'); |
|
| 277 | + if (!isset($globalAircraftImageSources)) { |
|
| 278 | + $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters'); |
|
| 279 | + } |
|
| 225 | 280 | foreach ($globalAircraftImageSources as $source) { |
| 226 | 281 | $source = strtolower($source); |
| 227 | - if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') $images_array = $this->fromIvaoMtl('aircraft',$aircraft_icao,$airline_icao); |
|
| 228 | - if ($source == 'planespotters' && !$globalIVAO && extension_loaded('simplexml')) $images_array = $this->fromPlanespotters('aircraft',$aircraft_registration,$aircraft_name); |
|
| 229 | - if ($source == 'flickr' && extension_loaded('simplexml')) $images_array = $this->fromFlickr('aircraft',$aircraft_registration,$aircraft_name); |
|
| 230 | - if ($source == 'bing') $images_array = $this->fromBing('aircraft',$aircraft_registration,$aircraft_name); |
|
| 231 | - if ($source == 'deviantart' && extension_loaded('simplexml')) $images_array = $this->fromDeviantart('aircraft',$aircraft_registration,$aircraft_name); |
|
| 232 | - if ($source == 'wikimedia') $images_array = $this->fromWikimedia('aircraft',$aircraft_registration,$aircraft_name); |
|
| 233 | - if ($source == 'jetphotos' && !$globalIVAO && class_exists("DomDocument")) $images_array = $this->fromJetPhotos('aircraft',$aircraft_registration,$aircraft_name); |
|
| 234 | - if ($source == 'planepictures' && !$globalIVAO && class_exists("DomDocument")) $images_array = $this->fromPlanePictures('aircraft',$aircraft_registration,$aircraft_name); |
|
| 235 | - if ($source == 'airportdata' && !$globalIVAO) $images_array = $this->fromAirportData('aircraft',$aircraft_registration,$aircraft_name); |
|
| 236 | - if ($source == 'customsources') $images_array = $this->fromCustomSource('aircraft',$aircraft_registration,$aircraft_name); |
|
| 237 | - if (isset($images_array) && $images_array['original'] != '') return $images_array; |
|
| 238 | - } |
|
| 239 | - if ((!isset($globalAircraftImageCheckICAO) || $globalAircraftImageCheckICAO === TRUE) && isset($aircraft_icao)) return $this->findAircraftImage($aircraft_icao); |
|
| 282 | + if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') { |
|
| 283 | + $images_array = $this->fromIvaoMtl('aircraft',$aircraft_icao,$airline_icao); |
|
| 284 | + } |
|
| 285 | + if ($source == 'planespotters' && !$globalIVAO && extension_loaded('simplexml')) { |
|
| 286 | + $images_array = $this->fromPlanespotters('aircraft',$aircraft_registration,$aircraft_name); |
|
| 287 | + } |
|
| 288 | + if ($source == 'flickr' && extension_loaded('simplexml')) { |
|
| 289 | + $images_array = $this->fromFlickr('aircraft',$aircraft_registration,$aircraft_name); |
|
| 290 | + } |
|
| 291 | + if ($source == 'bing') { |
|
| 292 | + $images_array = $this->fromBing('aircraft',$aircraft_registration,$aircraft_name); |
|
| 293 | + } |
|
| 294 | + if ($source == 'deviantart' && extension_loaded('simplexml')) { |
|
| 295 | + $images_array = $this->fromDeviantart('aircraft',$aircraft_registration,$aircraft_name); |
|
| 296 | + } |
|
| 297 | + if ($source == 'wikimedia') { |
|
| 298 | + $images_array = $this->fromWikimedia('aircraft',$aircraft_registration,$aircraft_name); |
|
| 299 | + } |
|
| 300 | + if ($source == 'jetphotos' && !$globalIVAO && class_exists("DomDocument")) { |
|
| 301 | + $images_array = $this->fromJetPhotos('aircraft',$aircraft_registration,$aircraft_name); |
|
| 302 | + } |
|
| 303 | + if ($source == 'planepictures' && !$globalIVAO && class_exists("DomDocument")) { |
|
| 304 | + $images_array = $this->fromPlanePictures('aircraft',$aircraft_registration,$aircraft_name); |
|
| 305 | + } |
|
| 306 | + if ($source == 'airportdata' && !$globalIVAO) { |
|
| 307 | + $images_array = $this->fromAirportData('aircraft',$aircraft_registration,$aircraft_name); |
|
| 308 | + } |
|
| 309 | + if ($source == 'customsources') { |
|
| 310 | + $images_array = $this->fromCustomSource('aircraft',$aircraft_registration,$aircraft_name); |
|
| 311 | + } |
|
| 312 | + if (isset($images_array) && $images_array['original'] != '') { |
|
| 313 | + return $images_array; |
|
| 314 | + } |
|
| 315 | + } |
|
| 316 | + if ((!isset($globalAircraftImageCheckICAO) || $globalAircraftImageCheckICAO === TRUE) && isset($aircraft_icao)) { |
|
| 317 | + return $this->findAircraftImage($aircraft_icao); |
|
| 318 | + } |
|
| 240 | 319 | return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
| 241 | 320 | } |
| 242 | 321 | |
@@ -256,7 +335,9 @@ discard block |
||
| 256 | 335 | //$imo = filter_var($imo,FILTER_SANITIZE_STRING); |
| 257 | 336 | $name = filter_var($name,FILTER_SANITIZE_STRING); |
| 258 | 337 | $name = trim($name); |
| 259 | - if (strlen($name) < 4) return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => ''); |
|
| 338 | + if (strlen($name) < 4) { |
|
| 339 | + return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => ''); |
|
| 340 | + } |
|
| 260 | 341 | /* |
| 261 | 342 | $Marine = new Marine($this->db); |
| 262 | 343 | if ($imo == '' || $name == '') { |
@@ -268,15 +349,29 @@ discard block |
||
| 268 | 349 | } |
| 269 | 350 | unset($Marine); |
| 270 | 351 | */ |
| 271 | - if (!isset($globalMarineImageSources)) $globalMarineImageSources = array('wikimedia','deviantart','flickr','bing'); |
|
| 352 | + if (!isset($globalMarineImageSources)) { |
|
| 353 | + $globalMarineImageSources = array('wikimedia','deviantart','flickr','bing'); |
|
| 354 | + } |
|
| 272 | 355 | foreach ($globalMarineImageSources as $source) { |
| 273 | 356 | $source = strtolower($source); |
| 274 | - if ($source == 'flickr') $images_array = $this->fromFlickr('marine',$mmsi,$name); |
|
| 275 | - if ($source == 'bing') $images_array = $this->fromBing('marine',$mmsi,$name); |
|
| 276 | - if ($source == 'deviantart') $images_array = $this->fromDeviantart('marine',$mmsi,$name); |
|
| 277 | - if ($source == 'wikimedia') $images_array = $this->fromWikimedia('marine',$mmsi,$name); |
|
| 278 | - if ($source == 'customsources') $images_array = $this->fromCustomSource('marine',$mmsi,$name); |
|
| 279 | - if (isset($images_array) && $images_array['original'] != '') return $images_array; |
|
| 357 | + if ($source == 'flickr') { |
|
| 358 | + $images_array = $this->fromFlickr('marine',$mmsi,$name); |
|
| 359 | + } |
|
| 360 | + if ($source == 'bing') { |
|
| 361 | + $images_array = $this->fromBing('marine',$mmsi,$name); |
|
| 362 | + } |
|
| 363 | + if ($source == 'deviantart') { |
|
| 364 | + $images_array = $this->fromDeviantart('marine',$mmsi,$name); |
|
| 365 | + } |
|
| 366 | + if ($source == 'wikimedia') { |
|
| 367 | + $images_array = $this->fromWikimedia('marine',$mmsi,$name); |
|
| 368 | + } |
|
| 369 | + if ($source == 'customsources') { |
|
| 370 | + $images_array = $this->fromCustomSource('marine',$mmsi,$name); |
|
| 371 | + } |
|
| 372 | + if (isset($images_array) && $images_array['original'] != '') { |
|
| 373 | + return $images_array; |
|
| 374 | + } |
|
| 280 | 375 | } |
| 281 | 376 | return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
| 282 | 377 | } |
@@ -299,7 +394,9 @@ discard block |
||
| 299 | 394 | $url= 'http://www.planespotters.net/Aviation_Photos/search.php?reg='.$aircraft_registration.'&output=rss'; |
| 300 | 395 | } |
| 301 | 396 | $data = $Common->getData($url); |
| 302 | - if (substr($data, 0, 5) != "<?xml") return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 397 | + if (substr($data, 0, 5) != "<?xml") { |
|
| 398 | + return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 399 | + } |
|
| 303 | 400 | if ($xml = simplexml_load_string($data)) { |
| 304 | 401 | if (isset($xml->channel->item)) { |
| 305 | 402 | $image_url = array(); |
@@ -338,7 +435,9 @@ discard block |
||
| 338 | 435 | $url= 'http://backend.deviantart.com/rss.xml?type=deviation&q="'.urlencode($name).'"'; |
| 339 | 436 | } |
| 340 | 437 | $data = $Common->getData($url); |
| 341 | - if (substr($data, 0, 5) != "<?xml") return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 438 | + if (substr($data, 0, 5) != "<?xml") { |
|
| 439 | + return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 440 | + } |
|
| 342 | 441 | if ($xml = simplexml_load_string($data)) { |
| 343 | 442 | if (isset($xml->channel->item->link)) { |
| 344 | 443 | $image_url = array(); |
@@ -442,14 +541,22 @@ discard block |
||
| 442 | 541 | public function fromFlickr($type,$registration,$name='') { |
| 443 | 542 | $Common = new Common(); |
| 444 | 543 | if ($type == 'aircraft') { |
| 445 | - if ($name != '') $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.','.urlencode($name); |
|
| 446 | - else $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.',aircraft'; |
|
| 544 | + if ($name != '') { |
|
| 545 | + $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.','.urlencode($name); |
|
| 546 | + } else { |
|
| 547 | + $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.',aircraft'; |
|
| 548 | + } |
|
| 447 | 549 | } elseif ($type == 'marine') { |
| 448 | - if ($name != '') $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags=ship,'.urlencode($name); |
|
| 449 | - else $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.',ship'; |
|
| 550 | + if ($name != '') { |
|
| 551 | + $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags=ship,'.urlencode($name); |
|
| 552 | + } else { |
|
| 553 | + $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.',ship'; |
|
| 554 | + } |
|
| 450 | 555 | } |
| 451 | 556 | $data = $Common->getData($url); |
| 452 | - if (substr($data, 0, 5) != "<?xml") return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 557 | + if (substr($data, 0, 5) != "<?xml") { |
|
| 558 | + return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 559 | + } |
|
| 453 | 560 | if ($xml = simplexml_load_string($data)) { |
| 454 | 561 | if (isset($xml->channel->item)) { |
| 455 | 562 | $original_url = trim((string)$xml->channel->item->enclosure->attributes()->url); |
@@ -498,13 +605,21 @@ discard block |
||
| 498 | 605 | public function fromBing($type,$aircraft_registration,$aircraft_name='') { |
| 499 | 606 | global $globalImageBingKey; |
| 500 | 607 | $Common = new Common(); |
| 501 | - if (!isset($globalImageBingKey) || $globalImageBingKey == '') return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 608 | + if (!isset($globalImageBingKey) || $globalImageBingKey == '') { |
|
| 609 | + return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 610 | + } |
|
| 502 | 611 | if ($type == 'aircraft') { |
| 503 | - if ($aircraft_name != '') $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.$aircraft_registration.'%20'.urlencode($aircraft_name).'%20-site:planespotters.com%20-site:flickr.com%27'; |
|
| 504 | - else $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Baircraft%20-site:planespotters.com%20-site:flickr.com%27'; |
|
| 612 | + if ($aircraft_name != '') { |
|
| 613 | + $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.$aircraft_registration.'%20'.urlencode($aircraft_name).'%20-site:planespotters.com%20-site:flickr.com%27'; |
|
| 614 | + } else { |
|
| 615 | + $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Baircraft%20-site:planespotters.com%20-site:flickr.com%27'; |
|
| 616 | + } |
|
| 505 | 617 | } elseif ($type == 'marine') { |
| 506 | - if ($aircraft_name != '') $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.urlencode($aircraft_name).'%20%2Bship%20-site:flickr.com%27'; |
|
| 507 | - else $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Bship%20-site:flickr.com%27'; |
|
| 618 | + if ($aircraft_name != '') { |
|
| 619 | + $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.urlencode($aircraft_name).'%20%2Bship%20-site:flickr.com%27'; |
|
| 620 | + } else { |
|
| 621 | + $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Bship%20-site:flickr.com%27'; |
|
| 622 | + } |
|
| 508 | 623 | } |
| 509 | 624 | $headers = array("Authorization: Basic " . base64_encode("ignored:".$globalImageBingKey)); |
| 510 | 625 | $data = $Common->getData($url,'get','',$headers); |
@@ -560,17 +675,25 @@ discard block |
||
| 560 | 675 | public function fromWikimedia($type,$registration,$name='') { |
| 561 | 676 | $Common = new Common(); |
| 562 | 677 | if ($type == 'aircraft') { |
| 563 | - if ($name != '') $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20'.urlencode($name); |
|
| 564 | - else $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20aircraft'; |
|
| 678 | + if ($name != '') { |
|
| 679 | + $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20'.urlencode($name); |
|
| 680 | + } else { |
|
| 681 | + $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20aircraft'; |
|
| 682 | + } |
|
| 565 | 683 | } elseif ($type == 'marine') { |
| 566 | - if ($name != '') $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.urlencode($name).'%20ship"'; |
|
| 567 | - else return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 684 | + if ($name != '') { |
|
| 685 | + $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.urlencode($name).'%20ship"'; |
|
| 686 | + } else { |
|
| 687 | + return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 688 | + } |
|
| 568 | 689 | } |
| 569 | 690 | $data = $Common->getData($url); |
| 570 | 691 | $result = json_decode($data); |
| 571 | 692 | if (isset($result->query->search[0]->title)) { |
| 572 | 693 | $fileo = $result->query->search[0]->title; |
| 573 | - if (substr($fileo,-3) == 'pdf') return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 694 | + if (substr($fileo,-3) == 'pdf') { |
|
| 695 | + return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 696 | + } |
|
| 574 | 697 | $file = urlencode($fileo); |
| 575 | 698 | $url2 = 'https://commons.wikimedia.org/w/api.php?action=query&format=json&continue&iilimit=500&prop=imageinfo&iiprop=user|url|size|mime|sha1|timestamp&iiurlwidth=200%27&titles='.$file; |
| 576 | 699 | $data2 = $Common->getData($url2); |
@@ -641,18 +764,27 @@ discard block |
||
| 641 | 764 | $image_url = array(); |
| 642 | 765 | $image_url['thumbnail'] = $url_thumbnail; |
| 643 | 766 | $image_url['original'] = $url; |
| 644 | - if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) $exifCopyright = $this->getExifCopyright($url); |
|
| 645 | - else $exifCopyright = ''; |
|
| 646 | - if ($exifCopyright != '') $image_url['copyright'] = $exifCopyright; |
|
| 647 | - elseif (isset($source['copyright'])) $image_url['copyright'] = $source['copyright']; |
|
| 648 | - else $image_url['copyright'] = $source['source_website']; |
|
| 767 | + if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) { |
|
| 768 | + $exifCopyright = $this->getExifCopyright($url); |
|
| 769 | + } else { |
|
| 770 | + $exifCopyright = ''; |
|
| 771 | + } |
|
| 772 | + if ($exifCopyright != '') { |
|
| 773 | + $image_url['copyright'] = $exifCopyright; |
|
| 774 | + } elseif (isset($source['copyright'])) { |
|
| 775 | + $image_url['copyright'] = $source['copyright']; |
|
| 776 | + } else { |
|
| 777 | + $image_url['copyright'] = $source['source_website']; |
|
| 778 | + } |
|
| 649 | 779 | $image_url['source_website'] = $source['source_website']; |
| 650 | 780 | $image_url['source'] = $source['source']; |
| 651 | 781 | return $image_url; |
| 652 | 782 | } |
| 653 | 783 | } |
| 654 | 784 | return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
| 655 | - } else return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 785 | + } else { |
|
| 786 | + return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 787 | + } |
|
| 656 | 788 | |
| 657 | 789 | if (!empty($globalMarineImageCustomSources) && $type == 'marine') { |
| 658 | 790 | $customsources = array(); |
@@ -678,18 +810,27 @@ discard block |
||
| 678 | 810 | $image_url = array(); |
| 679 | 811 | $image_url['thumbnail'] = $url_thumbnail; |
| 680 | 812 | $image_url['original'] = $url; |
| 681 | - if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) $exifCopyright = $this->getExifCopyright($url); |
|
| 682 | - else $exifCopyright = ''; |
|
| 683 | - if ($exifCopyright != '') $image_url['copyright'] = $exifCopyright; |
|
| 684 | - elseif (isset($source['copyright'])) $image_url['copyright'] = $source['copyright']; |
|
| 685 | - else $image_url['copyright'] = $source['source_website']; |
|
| 813 | + if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) { |
|
| 814 | + $exifCopyright = $this->getExifCopyright($url); |
|
| 815 | + } else { |
|
| 816 | + $exifCopyright = ''; |
|
| 817 | + } |
|
| 818 | + if ($exifCopyright != '') { |
|
| 819 | + $image_url['copyright'] = $exifCopyright; |
|
| 820 | + } elseif (isset($source['copyright'])) { |
|
| 821 | + $image_url['copyright'] = $source['copyright']; |
|
| 822 | + } else { |
|
| 823 | + $image_url['copyright'] = $source['source_website']; |
|
| 824 | + } |
|
| 686 | 825 | $image_url['source_website'] = $source['source_website']; |
| 687 | 826 | $image_url['source'] = $source['source']; |
| 688 | 827 | return $image_url; |
| 689 | 828 | } |
| 690 | 829 | } |
| 691 | 830 | return false; |
| 692 | - } else return false; |
|
| 831 | + } else { |
|
| 832 | + return false; |
|
| 833 | + } |
|
| 693 | 834 | } |
| 694 | 835 | } |
| 695 | 836 | |
@@ -1784,7 +1784,7 @@ discard block |
||
| 1784 | 1784 | /** |
| 1785 | 1785 | * Counts all hours |
| 1786 | 1786 | * |
| 1787 | - * @param $orderby |
|
| 1787 | + * @param string $orderby |
|
| 1788 | 1788 | * @param array $filters |
| 1789 | 1789 | * @return array the hour list |
| 1790 | 1790 | */ |
@@ -2263,7 +2263,7 @@ discard block |
||
| 2263 | 2263 | /** |
| 2264 | 2264 | * Parses the direction degrees to working |
| 2265 | 2265 | * |
| 2266 | - * @param Float $direction the direction in degrees |
|
| 2266 | + * @param integer $direction the direction in degrees |
|
| 2267 | 2267 | * @return array the direction information |
| 2268 | 2268 | * |
| 2269 | 2269 | */ |
@@ -15,7 +15,9 @@ discard block |
||
| 15 | 15 | public function __construct($dbc = null) { |
| 16 | 16 | $Connection = new Connection($dbc); |
| 17 | 17 | $this->db = $Connection->db(); |
| 18 | - if ($this->db === null) die('Error: No DB connection. (Marine)'); |
|
| 18 | + if ($this->db === null) { |
|
| 19 | + die('Error: No DB connection. (Marine)'); |
|
| 20 | + } |
|
| 19 | 21 | } |
| 20 | 22 | |
| 21 | 23 | /** |
@@ -38,7 +40,9 @@ discard block |
||
| 38 | 40 | if (isset($filter[0]['source'])) { |
| 39 | 41 | $filters = array_merge($filters,$filter); |
| 40 | 42 | } |
| 41 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 43 | + if (is_array($globalFilter)) { |
|
| 44 | + $filter = array_merge($filter,$globalFilter); |
|
| 45 | + } |
|
| 42 | 46 | $filter_query_join = ''; |
| 43 | 47 | $filter_query_where = ''; |
| 44 | 48 | foreach($filters as $flt) { |
@@ -86,8 +90,11 @@ discard block |
||
| 86 | 90 | $filter_query_where .= " AND EXTRACT(DAY FROM marine_output.date) = '".$filter['day']."'"; |
| 87 | 91 | } |
| 88 | 92 | } |
| 89 | - if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
|
| 90 | - elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
|
| 93 | + if ($filter_query_where == '' && $where) { |
|
| 94 | + $filter_query_where = ' WHERE'; |
|
| 95 | + } elseif ($filter_query_where != '' && $and) { |
|
| 96 | + $filter_query_where .= ' AND'; |
|
| 97 | + } |
|
| 91 | 98 | if ($filter_query_where != '') { |
| 92 | 99 | $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
| 93 | 100 | } |
@@ -142,42 +149,84 @@ discard block |
||
| 142 | 149 | $temp_array['spotter_id'] = $row['spotter_archive_id']; |
| 143 | 150 | } elseif (isset($row['spotter_archive_output_id'])) { |
| 144 | 151 | $temp_array['spotter_id'] = $row['spotter_archive_output_id']; |
| 145 | - */} |
|
| 146 | - elseif (isset($row['marineid'])) { |
|
| 152 | + */} elseif (isset($row['marineid'])) { |
|
| 147 | 153 | $temp_array['marine_id'] = $row['marineid']; |
| 148 | 154 | } else { |
| 149 | 155 | $temp_array['marine_id'] = ''; |
| 150 | 156 | } |
| 151 | - if (isset($row['fammarine_id'])) $temp_array['fammarine_id'] = $row['fammarine_id']; |
|
| 152 | - if (isset($row['mmsi'])) $temp_array['mmsi'] = $row['mmsi']; |
|
| 153 | - if (isset($row['type'])) $temp_array['type'] = html_entity_decode($row['type'],ENT_QUOTES); |
|
| 154 | - if (isset($row['type_id'])) $temp_array['type_id'] = $row['type_id']; |
|
| 155 | - if (isset($row['status'])) $temp_array['status'] = $row['status']; |
|
| 156 | - if (isset($row['status_id'])) $temp_array['status_id'] = $row['status_id']; |
|
| 157 | - if (isset($row['captain_id'])) $temp_array['captain_id'] = $row['captain_id']; |
|
| 158 | - if (isset($row['captain_name'])) $temp_array['captain_name'] = $row['captain_name']; |
|
| 159 | - if (isset($row['race_id'])) $temp_array['race_id'] = $row['race_id']; |
|
| 160 | - if (isset($row['race_name'])) $temp_array['race_name'] = $row['race_name']; |
|
| 161 | - if (isset($row['race_time']) && isset($row['status']) && $row['status'] != 'Racing' && $row['race_time'] > 0) $temp_array['race_time'] = $row['race_time']; |
|
| 162 | - if (isset($row['race_rank'])) $temp_array['race_rank'] = $row['race_rank']; |
|
| 163 | - if (isset($row['ident'])) $temp_array['ident'] = $row['ident']; |
|
| 164 | - if (isset($row['arrival_port_name'])) $temp_array['arrival_port_name'] = $row['arrival_port_name']; |
|
| 165 | - if (isset($row['latitude'])) $temp_array['latitude'] = $row['latitude']; |
|
| 166 | - if (isset($row['longitude'])) $temp_array['longitude'] = $row['longitude']; |
|
| 167 | - if (isset($row['distance']) && $row['distance'] != '') $temp_array['distance'] = $row['distance']; |
|
| 168 | - if (isset($row['format_source'])) $temp_array['format_source'] = $row['format_source']; |
|
| 157 | + if (isset($row['fammarine_id'])) { |
|
| 158 | + $temp_array['fammarine_id'] = $row['fammarine_id']; |
|
| 159 | + } |
|
| 160 | + if (isset($row['mmsi'])) { |
|
| 161 | + $temp_array['mmsi'] = $row['mmsi']; |
|
| 162 | + } |
|
| 163 | + if (isset($row['type'])) { |
|
| 164 | + $temp_array['type'] = html_entity_decode($row['type'],ENT_QUOTES); |
|
| 165 | + } |
|
| 166 | + if (isset($row['type_id'])) { |
|
| 167 | + $temp_array['type_id'] = $row['type_id']; |
|
| 168 | + } |
|
| 169 | + if (isset($row['status'])) { |
|
| 170 | + $temp_array['status'] = $row['status']; |
|
| 171 | + } |
|
| 172 | + if (isset($row['status_id'])) { |
|
| 173 | + $temp_array['status_id'] = $row['status_id']; |
|
| 174 | + } |
|
| 175 | + if (isset($row['captain_id'])) { |
|
| 176 | + $temp_array['captain_id'] = $row['captain_id']; |
|
| 177 | + } |
|
| 178 | + if (isset($row['captain_name'])) { |
|
| 179 | + $temp_array['captain_name'] = $row['captain_name']; |
|
| 180 | + } |
|
| 181 | + if (isset($row['race_id'])) { |
|
| 182 | + $temp_array['race_id'] = $row['race_id']; |
|
| 183 | + } |
|
| 184 | + if (isset($row['race_name'])) { |
|
| 185 | + $temp_array['race_name'] = $row['race_name']; |
|
| 186 | + } |
|
| 187 | + if (isset($row['race_time']) && isset($row['status']) && $row['status'] != 'Racing' && $row['race_time'] > 0) { |
|
| 188 | + $temp_array['race_time'] = $row['race_time']; |
|
| 189 | + } |
|
| 190 | + if (isset($row['race_rank'])) { |
|
| 191 | + $temp_array['race_rank'] = $row['race_rank']; |
|
| 192 | + } |
|
| 193 | + if (isset($row['ident'])) { |
|
| 194 | + $temp_array['ident'] = $row['ident']; |
|
| 195 | + } |
|
| 196 | + if (isset($row['arrival_port_name'])) { |
|
| 197 | + $temp_array['arrival_port_name'] = $row['arrival_port_name']; |
|
| 198 | + } |
|
| 199 | + if (isset($row['latitude'])) { |
|
| 200 | + $temp_array['latitude'] = $row['latitude']; |
|
| 201 | + } |
|
| 202 | + if (isset($row['longitude'])) { |
|
| 203 | + $temp_array['longitude'] = $row['longitude']; |
|
| 204 | + } |
|
| 205 | + if (isset($row['distance']) && $row['distance'] != '') { |
|
| 206 | + $temp_array['distance'] = $row['distance']; |
|
| 207 | + } |
|
| 208 | + if (isset($row['format_source'])) { |
|
| 209 | + $temp_array['format_source'] = $row['format_source']; |
|
| 210 | + } |
|
| 169 | 211 | if (isset($row['heading'])) { |
| 170 | 212 | $temp_array['heading'] = $row['heading']; |
| 171 | 213 | $heading_direction = $this->parseDirection($row['heading']); |
| 172 | - if (isset($heading_direction[0]['direction_fullname'])) $temp_array['heading_name'] = $heading_direction[0]['direction_fullname']; |
|
| 214 | + if (isset($heading_direction[0]['direction_fullname'])) { |
|
| 215 | + $temp_array['heading_name'] = $heading_direction[0]['direction_fullname']; |
|
| 216 | + } |
|
| 217 | + } |
|
| 218 | + if (isset($row['ground_speed'])) { |
|
| 219 | + $temp_array['ground_speed'] = $row['ground_speed']; |
|
| 173 | 220 | } |
| 174 | - if (isset($row['ground_speed'])) $temp_array['ground_speed'] = $row['ground_speed']; |
|
| 175 | 221 | |
| 176 | 222 | if(isset($temp_array['mmsi']) && $temp_array['mmsi'] != "") |
| 177 | 223 | { |
| 178 | 224 | $Image = new Image($this->db); |
| 179 | - if (isset($temp_array['ident']) && $temp_array['ident'] != '') $image_array = $Image->getMarineImage($temp_array['mmsi'],'',$temp_array['ident']); |
|
| 180 | - else $image_array = $Image->getMarineImage($temp_array['mmsi']); |
|
| 225 | + if (isset($temp_array['ident']) && $temp_array['ident'] != '') { |
|
| 226 | + $image_array = $Image->getMarineImage($temp_array['mmsi'],'',$temp_array['ident']); |
|
| 227 | + } else { |
|
| 228 | + $image_array = $Image->getMarineImage($temp_array['mmsi']); |
|
| 229 | + } |
|
| 181 | 230 | unset($Image); |
| 182 | 231 | if (count($image_array) > 0) { |
| 183 | 232 | $temp_array['image'] = $image_array[0]['image']; |
@@ -241,13 +290,21 @@ discard block |
||
| 241 | 290 | } |
| 242 | 291 | |
| 243 | 292 | $fromsource = NULL; |
| 244 | - if (isset($row['source_name']) && $row['source_name'] != '') $temp_array['source_name'] = $row['source_name']; |
|
| 245 | - if (isset($row['over_country']) && $row['over_country'] != '') $temp_array['over_country'] = $row['over_country']; |
|
| 246 | - if (isset($row['distance']) && $row['distance'] != '') $temp_array['distance'] = $row['distance']; |
|
| 293 | + if (isset($row['source_name']) && $row['source_name'] != '') { |
|
| 294 | + $temp_array['source_name'] = $row['source_name']; |
|
| 295 | + } |
|
| 296 | + if (isset($row['over_country']) && $row['over_country'] != '') { |
|
| 297 | + $temp_array['over_country'] = $row['over_country']; |
|
| 298 | + } |
|
| 299 | + if (isset($row['distance']) && $row['distance'] != '') { |
|
| 300 | + $temp_array['distance'] = $row['distance']; |
|
| 301 | + } |
|
| 247 | 302 | $temp_array['query_number_rows'] = $num_rows; |
| 248 | 303 | $spotter_array[] = $temp_array; |
| 249 | 304 | } |
| 250 | - if ($num_rows == 0) return array(); |
|
| 305 | + if ($num_rows == 0) { |
|
| 306 | + return array(); |
|
| 307 | + } |
|
| 251 | 308 | $spotter_array[0]['query_number_rows'] = $num_rows; |
| 252 | 309 | return $spotter_array; |
| 253 | 310 | } |
@@ -275,8 +332,12 @@ discard block |
||
| 275 | 332 | { |
| 276 | 333 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 277 | 334 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 278 | - } else $limit_query = ""; |
|
| 279 | - } else $limit_query = ""; |
|
| 335 | + } else { |
|
| 336 | + $limit_query = ""; |
|
| 337 | + } |
|
| 338 | + } else { |
|
| 339 | + $limit_query = ""; |
|
| 340 | + } |
|
| 280 | 341 | if ($sort != "") |
| 281 | 342 | { |
| 282 | 343 | $search_orderby_array = $this->getOrderBy(); |
@@ -300,7 +361,9 @@ discard block |
||
| 300 | 361 | global $global_marine_query; |
| 301 | 362 | |
| 302 | 363 | date_default_timezone_set('UTC'); |
| 303 | - if ($id == '') return array(); |
|
| 364 | + if ($id == '') { |
|
| 365 | + return array(); |
|
| 366 | + } |
|
| 304 | 367 | $additional_query = "marine_output.fammarine_id = :id"; |
| 305 | 368 | $query_values = array(':id' => $id); |
| 306 | 369 | $query = $global_marine_query." WHERE ".$additional_query." "; |
@@ -781,8 +844,11 @@ discard block |
||
| 781 | 844 | $sth = $this->db->prepare($query); |
| 782 | 845 | $sth->execute($query_values); |
| 783 | 846 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 784 | - if (is_int($result[0]['duration'])) return gmdate('H:i:s',$result[0]['duration']); |
|
| 785 | - else return $result[0]['duration']; |
|
| 847 | + if (is_int($result[0]['duration'])) { |
|
| 848 | + return gmdate('H:i:s',$result[0]['duration']); |
|
| 849 | + } else { |
|
| 850 | + return $result[0]['duration']; |
|
| 851 | + } |
|
| 786 | 852 | } |
| 787 | 853 | |
| 788 | 854 | /** |
@@ -830,7 +896,9 @@ discard block |
||
| 830 | 896 | } |
| 831 | 897 | } |
| 832 | 898 | $query .= " GROUP BY marine_output.captain_id,marine_output.captain_name ORDER BY duration DESC"; |
| 833 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 899 | + if ($limit) { |
|
| 900 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 901 | + } |
|
| 834 | 902 | $sth = $this->db->prepare($query); |
| 835 | 903 | $sth->execute($query_values); |
| 836 | 904 | //if (is_int($result[0]['duration'])) return gmdate('H:i:s',$result[0]['duration']); |
@@ -909,8 +977,11 @@ discard block |
||
| 909 | 977 | $query .= " ORDER BY marine_output.source_name ASC"; |
| 910 | 978 | |
| 911 | 979 | $sth = $this->db->prepare($query); |
| 912 | - if (!empty($query_values)) $sth->execute($query_values); |
|
| 913 | - else $sth->execute(); |
|
| 980 | + if (!empty($query_values)) { |
|
| 981 | + $sth->execute($query_values); |
|
| 982 | + } else { |
|
| 983 | + $sth->execute(); |
|
| 984 | + } |
|
| 914 | 985 | |
| 915 | 986 | $source_array = array(); |
| 916 | 987 | $temp_array = array(); |
@@ -965,8 +1036,11 @@ discard block |
||
| 965 | 1036 | $sth = $this->db->prepare($query); |
| 966 | 1037 | $sth->execute(array(':mmsi' => $mmsi)); |
| 967 | 1038 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 968 | - if (isset($result[0])) return $result[0]; |
|
| 969 | - else return array(); |
|
| 1039 | + if (isset($result[0])) { |
|
| 1040 | + return $result[0]; |
|
| 1041 | + } else { |
|
| 1042 | + return array(); |
|
| 1043 | + } |
|
| 970 | 1044 | } |
| 971 | 1045 | |
| 972 | 1046 | /** |
@@ -1011,7 +1085,9 @@ discard block |
||
| 1011 | 1085 | date_default_timezone_set($globalTimezone); |
| 1012 | 1086 | $datetime = new DateTime(); |
| 1013 | 1087 | $offset = $datetime->format('P'); |
| 1014 | - } else $offset = '+00:00'; |
|
| 1088 | + } else { |
|
| 1089 | + $offset = '+00:00'; |
|
| 1090 | + } |
|
| 1015 | 1091 | |
| 1016 | 1092 | if ($globalDBdriver == 'mysql') { |
| 1017 | 1093 | $query = "SELECT DISTINCT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) as date |
@@ -1127,8 +1203,12 @@ discard block |
||
| 1127 | 1203 | */ |
| 1128 | 1204 | public function updateLatestMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $groundspeed = NULL, $date = '',$distance = NULL,$race_rank = NULL, $race_time = NULL, $status = '', $race_begin = '') |
| 1129 | 1205 | { |
| 1130 | - if ($latitude == '') $latitude = NULL; |
|
| 1131 | - if ($longitude == '') $longitude = NULL; |
|
| 1206 | + if ($latitude == '') { |
|
| 1207 | + $latitude = NULL; |
|
| 1208 | + } |
|
| 1209 | + if ($longitude == '') { |
|
| 1210 | + $longitude = NULL; |
|
| 1211 | + } |
|
| 1132 | 1212 | $groundspeed = round($groundspeed); |
| 1133 | 1213 | if ($race_begin != '') { |
| 1134 | 1214 | $query = 'UPDATE marine_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_seen = :last_seen, last_ground_speed = :last_ground_speed, distance = :distance, race_rank = :race_rank, race_time = :race_time, status = :status, date = :race_begin WHERE fammarine_id = :fammarine_id'; |
@@ -1286,14 +1366,28 @@ discard block |
||
| 1286 | 1366 | $latitude = 0; |
| 1287 | 1367 | $longitude = 0; |
| 1288 | 1368 | } |
| 1289 | - if ($type_id == '') $type_id = NULL; |
|
| 1290 | - if ($status_id == '') $status_id = NULL; |
|
| 1291 | - if ($distance == '') $distance = NULL; |
|
| 1292 | - if ($race_rank == '') $race_rank = NULL; |
|
| 1293 | - if ($race_time == '') $race_time = NULL; |
|
| 1294 | - if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
|
| 1369 | + if ($type_id == '') { |
|
| 1370 | + $type_id = NULL; |
|
| 1371 | + } |
|
| 1372 | + if ($status_id == '') { |
|
| 1373 | + $status_id = NULL; |
|
| 1374 | + } |
|
| 1375 | + if ($distance == '') { |
|
| 1376 | + $distance = NULL; |
|
| 1377 | + } |
|
| 1378 | + if ($race_rank == '') { |
|
| 1379 | + $race_rank = NULL; |
|
| 1380 | + } |
|
| 1381 | + if ($race_time == '') { |
|
| 1382 | + $race_time = NULL; |
|
| 1383 | + } |
|
| 1384 | + if ($heading == '' || $Common->isInteger($heading) === false) { |
|
| 1385 | + $heading = 0; |
|
| 1386 | + } |
|
| 1295 | 1387 | //if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
| 1296 | - if ($arrival_date == '') $arrival_date = NULL; |
|
| 1388 | + if ($arrival_date == '') { |
|
| 1389 | + $arrival_date = NULL; |
|
| 1390 | + } |
|
| 1297 | 1391 | $query = "INSERT INTO marine_output (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, mmsi, type, type_id, status,status_id,imo,arrival_port_name,arrival_port_date,captain_id,captain_name,race_id,race_name, distance, race_rank,race_time) |
| 1298 | 1392 | VALUES (:fammarine_id,:ident,:latitude,:longitude,:heading,:speed,:date,:format_source, :source_name,:mmsi,:type,:type_id,:status,:status_id,:imo,:arrival_port_name,:arrival_port_date,:captain_id,:captain_name,:race_id,:race_name, :distance, :race_rank,:race_time)"; |
| 1299 | 1393 | |
@@ -1401,7 +1495,9 @@ discard block |
||
| 1401 | 1495 | global $globalDBdriver, $globalArchive; |
| 1402 | 1496 | //$filter_query = $this->getFilter($filters,true,true); |
| 1403 | 1497 | $Connection= new Connection($this->db); |
| 1404 | - if (!$Connection->tableExists('countries')) return array(); |
|
| 1498 | + if (!$Connection->tableExists('countries')) { |
|
| 1499 | + return array(); |
|
| 1500 | + } |
|
| 1405 | 1501 | require_once('class.SpotterLive.php'); |
| 1406 | 1502 | if (!isset($globalArchive) || $globalArchive !== TRUE) { |
| 1407 | 1503 | $MarineLive = new MarineLive($this->db); |
@@ -1445,7 +1541,9 @@ discard block |
||
| 1445 | 1541 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb FROM countries c INNER JOIN (SELECT DISTINCT fammarine_id,over_country FROM marine_archive".$filter_query.") l ON c.iso2 = l.over_country "; |
| 1446 | 1542 | } |
| 1447 | 1543 | $query .= "GROUP BY c.name,c.iso3,c.iso2 ORDER BY nb DESC"; |
| 1448 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 1544 | + if ($limit) { |
|
| 1545 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 1546 | + } |
|
| 1449 | 1547 | |
| 1450 | 1548 | $sth = $this->db->prepare($query); |
| 1451 | 1549 | $sth->execute(); |
@@ -1484,12 +1582,18 @@ discard block |
||
| 1484 | 1582 | $query = "SELECT DISTINCT marine_output.ident, COUNT(marine_output.ident) AS callsign_icao_count |
| 1485 | 1583 | FROM marine_output".$filter_query." marine_output.ident <> ''"; |
| 1486 | 1584 | if ($olderthanmonths > 0) { |
| 1487 | - if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)'; |
|
| 1488 | - else $query .= " AND marine_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
|
| 1585 | + if ($globalDBdriver == 'mysql') { |
|
| 1586 | + $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)'; |
|
| 1587 | + } else { |
|
| 1588 | + $query .= " AND marine_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
|
| 1589 | + } |
|
| 1489 | 1590 | } |
| 1490 | 1591 | if ($sincedate != '') { |
| 1491 | - if ($globalDBdriver == 'mysql') $query .= " AND marine_output.date > '".$sincedate."'"; |
|
| 1492 | - else $query .= " AND marine_output.date > CAST('".$sincedate."' AS TIMESTAMP)"; |
|
| 1592 | + if ($globalDBdriver == 'mysql') { |
|
| 1593 | + $query .= " AND marine_output.date > '".$sincedate."'"; |
|
| 1594 | + } else { |
|
| 1595 | + $query .= " AND marine_output.date > CAST('".$sincedate."' AS TIMESTAMP)"; |
|
| 1596 | + } |
|
| 1493 | 1597 | } |
| 1494 | 1598 | $query_values = array(); |
| 1495 | 1599 | if ($year != '') { |
@@ -1520,7 +1624,9 @@ discard block |
||
| 1520 | 1624 | } |
| 1521 | 1625 | } |
| 1522 | 1626 | $query .= " GROUP BY marine_output.ident ORDER BY callsign_icao_count DESC"; |
| 1523 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 1627 | + if ($limit) { |
|
| 1628 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 1629 | + } |
|
| 1524 | 1630 | |
| 1525 | 1631 | $sth = $this->db->prepare($query); |
| 1526 | 1632 | $sth->execute($query_values); |
@@ -1555,7 +1661,9 @@ discard block |
||
| 1555 | 1661 | date_default_timezone_set($globalTimezone); |
| 1556 | 1662 | $datetime = new DateTime(); |
| 1557 | 1663 | $offset = $datetime->format('P'); |
| 1558 | - } else $offset = '+00:00'; |
|
| 1664 | + } else { |
|
| 1665 | + $offset = '+00:00'; |
|
| 1666 | + } |
|
| 1559 | 1667 | |
| 1560 | 1668 | if ($globalDBdriver == 'mysql') { |
| 1561 | 1669 | $query = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
@@ -1605,7 +1713,9 @@ discard block |
||
| 1605 | 1713 | date_default_timezone_set($globalTimezone); |
| 1606 | 1714 | $datetime = new DateTime(); |
| 1607 | 1715 | $offset = $datetime->format('P'); |
| 1608 | - } else $offset = '+00:00'; |
|
| 1716 | + } else { |
|
| 1717 | + $offset = '+00:00'; |
|
| 1718 | + } |
|
| 1609 | 1719 | $filter_query = $this->getFilter($filters,true,true); |
| 1610 | 1720 | if ($globalDBdriver == 'mysql') { |
| 1611 | 1721 | $query = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
@@ -1651,7 +1761,9 @@ discard block |
||
| 1651 | 1761 | date_default_timezone_set($globalTimezone); |
| 1652 | 1762 | $datetime = new DateTime(); |
| 1653 | 1763 | $offset = $datetime->format('P'); |
| 1654 | - } else $offset = '+00:00'; |
|
| 1764 | + } else { |
|
| 1765 | + $offset = '+00:00'; |
|
| 1766 | + } |
|
| 1655 | 1767 | $filter_query = $this->getFilter($filters,true,true); |
| 1656 | 1768 | if ($globalDBdriver == 'mysql') { |
| 1657 | 1769 | $query = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
@@ -1699,7 +1811,9 @@ discard block |
||
| 1699 | 1811 | date_default_timezone_set($globalTimezone); |
| 1700 | 1812 | $datetime = new DateTime(); |
| 1701 | 1813 | $offset = $datetime->format('P'); |
| 1702 | - } else $offset = '+00:00'; |
|
| 1814 | + } else { |
|
| 1815 | + $offset = '+00:00'; |
|
| 1816 | + } |
|
| 1703 | 1817 | |
| 1704 | 1818 | if ($globalDBdriver == 'mysql') { |
| 1705 | 1819 | $query = "SELECT YEAR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count |
@@ -1746,7 +1860,9 @@ discard block |
||
| 1746 | 1860 | date_default_timezone_set($globalTimezone); |
| 1747 | 1861 | $datetime = new DateTime(); |
| 1748 | 1862 | $offset = $datetime->format('P'); |
| 1749 | - } else $offset = '+00:00'; |
|
| 1863 | + } else { |
|
| 1864 | + $offset = '+00:00'; |
|
| 1865 | + } |
|
| 1750 | 1866 | $filter_query = $this->getFilter($filters,true,true); |
| 1751 | 1867 | if ($globalDBdriver == 'mysql') { |
| 1752 | 1868 | $query = "SELECT MONTH(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count |
@@ -1795,7 +1911,9 @@ discard block |
||
| 1795 | 1911 | date_default_timezone_set($globalTimezone); |
| 1796 | 1912 | $datetime = new DateTime(); |
| 1797 | 1913 | $offset = $datetime->format('P'); |
| 1798 | - } else $offset = '+00:00'; |
|
| 1914 | + } else { |
|
| 1915 | + $offset = '+00:00'; |
|
| 1916 | + } |
|
| 1799 | 1917 | |
| 1800 | 1918 | $orderby_sql = ''; |
| 1801 | 1919 | if ($orderby == "hour") |
@@ -1864,7 +1982,9 @@ discard block |
||
| 1864 | 1982 | date_default_timezone_set($globalTimezone); |
| 1865 | 1983 | $datetime = new DateTime($date); |
| 1866 | 1984 | $offset = $datetime->format('P'); |
| 1867 | - } else $offset = '+00:00'; |
|
| 1985 | + } else { |
|
| 1986 | + $offset = '+00:00'; |
|
| 1987 | + } |
|
| 1868 | 1988 | |
| 1869 | 1989 | if ($globalDBdriver == 'mysql') { |
| 1870 | 1990 | $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
@@ -1912,7 +2032,9 @@ discard block |
||
| 1912 | 2032 | date_default_timezone_set($globalTimezone); |
| 1913 | 2033 | $datetime = new DateTime(); |
| 1914 | 2034 | $offset = $datetime->format('P'); |
| 1915 | - } else $offset = '+00:00'; |
|
| 2035 | + } else { |
|
| 2036 | + $offset = '+00:00'; |
|
| 2037 | + } |
|
| 1916 | 2038 | |
| 1917 | 2039 | if ($globalDBdriver == 'mysql') { |
| 1918 | 2040 | $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
@@ -1974,7 +2096,9 @@ discard block |
||
| 1974 | 2096 | } |
| 1975 | 2097 | } |
| 1976 | 2098 | $query .= " GROUP BY marine_output.race_id,marine_output.race_name ORDER BY captain_count DESC"; |
| 1977 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 2099 | + if ($limit) { |
|
| 2100 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 2101 | + } |
|
| 1978 | 2102 | $sth = $this->db->prepare($query); |
| 1979 | 2103 | $sth->execute(); |
| 1980 | 2104 | $marine_array = array(); |
@@ -2023,8 +2147,11 @@ discard block |
||
| 2023 | 2147 | $query_values = array_merge($query_values,array(':month' => $month)); |
| 2024 | 2148 | } |
| 2025 | 2149 | } |
| 2026 | - if (empty($query_values)) $queryi .= $this->getFilter($filters); |
|
| 2027 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 2150 | + if (empty($query_values)) { |
|
| 2151 | + $queryi .= $this->getFilter($filters); |
|
| 2152 | + } else { |
|
| 2153 | + $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 2154 | + } |
|
| 2028 | 2155 | |
| 2029 | 2156 | $sth = $this->db->prepare($queryi); |
| 2030 | 2157 | $sth->execute($query_values); |
@@ -2063,8 +2190,11 @@ discard block |
||
| 2063 | 2190 | $query_values = array_merge($query_values,array(':month' => $month)); |
| 2064 | 2191 | } |
| 2065 | 2192 | } |
| 2066 | - if (empty($query_values)) $queryi .= $this->getFilter($filters); |
|
| 2067 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 2193 | + if (empty($query_values)) { |
|
| 2194 | + $queryi .= $this->getFilter($filters); |
|
| 2195 | + } else { |
|
| 2196 | + $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 2197 | + } |
|
| 2068 | 2198 | |
| 2069 | 2199 | $sth = $this->db->prepare($queryi); |
| 2070 | 2200 | $sth->execute($query_values); |
@@ -2103,8 +2233,11 @@ discard block |
||
| 2103 | 2233 | $query_values = array_merge($query_values,array(':month' => $month)); |
| 2104 | 2234 | } |
| 2105 | 2235 | } |
| 2106 | - if (empty($query_values)) $queryi .= $this->getFilter($filters); |
|
| 2107 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 2236 | + if (empty($query_values)) { |
|
| 2237 | + $queryi .= $this->getFilter($filters); |
|
| 2238 | + } else { |
|
| 2239 | + $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 2240 | + } |
|
| 2108 | 2241 | |
| 2109 | 2242 | $sth = $this->db->prepare($queryi); |
| 2110 | 2243 | $sth->execute($query_values); |
@@ -2143,8 +2276,11 @@ discard block |
||
| 2143 | 2276 | $query_values = array_merge($query_values,array(':month' => $month)); |
| 2144 | 2277 | } |
| 2145 | 2278 | } |
| 2146 | - if (empty($query_values)) $queryi .= $this->getFilter($filters); |
|
| 2147 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 2279 | + if (empty($query_values)) { |
|
| 2280 | + $queryi .= $this->getFilter($filters); |
|
| 2281 | + } else { |
|
| 2282 | + $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 2283 | + } |
|
| 2148 | 2284 | |
| 2149 | 2285 | $sth = $this->db->prepare($queryi); |
| 2150 | 2286 | $sth->execute($query_values); |
@@ -2165,7 +2301,9 @@ discard block |
||
| 2165 | 2301 | date_default_timezone_set($globalTimezone); |
| 2166 | 2302 | $datetime = new DateTime(); |
| 2167 | 2303 | $offset = $datetime->format('P'); |
| 2168 | - } else $offset = '+00:00'; |
|
| 2304 | + } else { |
|
| 2305 | + $offset = '+00:00'; |
|
| 2306 | + } |
|
| 2169 | 2307 | |
| 2170 | 2308 | if ($globalDBdriver == 'mysql') { |
| 2171 | 2309 | $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
@@ -2269,7 +2407,9 @@ discard block |
||
| 2269 | 2407 | */ |
| 2270 | 2408 | public function parseDirection($direction = 0) |
| 2271 | 2409 | { |
| 2272 | - if ($direction == '') $direction = 0; |
|
| 2410 | + if ($direction == '') { |
|
| 2411 | + $direction = 0; |
|
| 2412 | + } |
|
| 2273 | 2413 | $direction_array = array(); |
| 2274 | 2414 | $temp_array = array(); |
| 2275 | 2415 | |
@@ -2358,7 +2498,9 @@ discard block |
||
| 2358 | 2498 | $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 2359 | 2499 | |
| 2360 | 2500 | $Connection = new Connection($this->db); |
| 2361 | - if (!$Connection->tableExists('countries')) return ''; |
|
| 2501 | + if (!$Connection->tableExists('countries')) { |
|
| 2502 | + return ''; |
|
| 2503 | + } |
|
| 2362 | 2504 | |
| 2363 | 2505 | try { |
| 2364 | 2506 | /* |
@@ -2378,9 +2520,13 @@ discard block |
||
| 2378 | 2520 | $sth->closeCursor(); |
| 2379 | 2521 | if (count($row) > 0) { |
| 2380 | 2522 | return $row; |
| 2381 | - } else return ''; |
|
| 2523 | + } else { |
|
| 2524 | + return ''; |
|
| 2525 | + } |
|
| 2382 | 2526 | } catch (PDOException $e) { |
| 2383 | - if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n"; |
|
| 2527 | + if (isset($globalDebug) && $globalDebug) { |
|
| 2528 | + echo 'Error : '.$e->getMessage()."\n"; |
|
| 2529 | + } |
|
| 2384 | 2530 | return ''; |
| 2385 | 2531 | } |
| 2386 | 2532 | |
@@ -2398,7 +2544,9 @@ discard block |
||
| 2398 | 2544 | $iso2 = filter_var($iso2,FILTER_SANITIZE_STRING); |
| 2399 | 2545 | |
| 2400 | 2546 | $Connection = new Connection($this->db); |
| 2401 | - if (!$Connection->tableExists('countries')) return ''; |
|
| 2547 | + if (!$Connection->tableExists('countries')) { |
|
| 2548 | + return ''; |
|
| 2549 | + } |
|
| 2402 | 2550 | |
| 2403 | 2551 | try { |
| 2404 | 2552 | $query = "SELECT name,iso2,iso3 FROM countries WHERE iso2 = :iso2 LIMIT 1"; |
@@ -2410,9 +2558,13 @@ discard block |
||
| 2410 | 2558 | $sth->closeCursor(); |
| 2411 | 2559 | if (count($row) > 0) { |
| 2412 | 2560 | return $row; |
| 2413 | - } else return ''; |
|
| 2561 | + } else { |
|
| 2562 | + return ''; |
|
| 2563 | + } |
|
| 2414 | 2564 | } catch (PDOException $e) { |
| 2415 | - if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n"; |
|
| 2565 | + if (isset($globalDebug) && $globalDebug) { |
|
| 2566 | + echo 'Error : '.$e->getMessage()."\n"; |
|
| 2567 | + } |
|
| 2416 | 2568 | return ''; |
| 2417 | 2569 | } |
| 2418 | 2570 | |
@@ -2430,7 +2582,9 @@ discard block |
||
| 2430 | 2582 | { |
| 2431 | 2583 | global $globalBitlyAccessToken; |
| 2432 | 2584 | |
| 2433 | - if ($globalBitlyAccessToken == '') return $url; |
|
| 2585 | + if ($globalBitlyAccessToken == '') { |
|
| 2586 | + return $url; |
|
| 2587 | + } |
|
| 2434 | 2588 | |
| 2435 | 2589 | $google_url = 'https://api-ssl.bitly.com/v3/shorten?access_token='.$globalBitlyAccessToken.'&longUrl='.$url; |
| 2436 | 2590 | |
@@ -2512,7 +2666,9 @@ discard block |
||
| 2512 | 2666 | } |
| 2513 | 2667 | } |
| 2514 | 2668 | $query .= " GROUP BY marine_output.type, marine_output.type_id ORDER BY marine_type_count DESC"; |
| 2515 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 2669 | + if ($limit) { |
|
| 2670 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 2671 | + } |
|
| 2516 | 2672 | $sth = $this->db->prepare($query); |
| 2517 | 2673 | $sth->execute($query_values); |
| 2518 | 2674 | $marine_array = array(); |
@@ -2565,13 +2721,27 @@ discard block |
||
| 2565 | 2721 | foreach ($q_array as $q_item){ |
| 2566 | 2722 | $q_item = filter_var($q_item,FILTER_SANITIZE_STRING); |
| 2567 | 2723 | $additional_query .= " AND ("; |
| 2568 | - if (is_int($q_item)) $additional_query .= "(marine_output.marine_id = '".$q_item."') OR "; |
|
| 2569 | - if (is_int($q_item)) $additional_query .= "(marine_output.mmsi = '".$q_item."') OR "; |
|
| 2570 | - if (is_int($q_item)) $additional_query .= "(marine_output.imo = '".$q_item."') OR "; |
|
| 2571 | - if (is_int($q_item)) $additional_query .= "(marine_output.captain_id = '".$q_item."') OR "; |
|
| 2572 | - if (is_int($q_item)) $additional_query .= "(marine_output.race_id = '".$q_item."') OR "; |
|
| 2573 | - if (!is_int($q_item)) $additional_query .= "(marine_output.captain_name = '".$q_item."') OR "; |
|
| 2574 | - if (!is_int($q_item)) $additional_query .= "(marine_output.race_name = '".$q_item."') OR "; |
|
| 2724 | + if (is_int($q_item)) { |
|
| 2725 | + $additional_query .= "(marine_output.marine_id = '".$q_item."') OR "; |
|
| 2726 | + } |
|
| 2727 | + if (is_int($q_item)) { |
|
| 2728 | + $additional_query .= "(marine_output.mmsi = '".$q_item."') OR "; |
|
| 2729 | + } |
|
| 2730 | + if (is_int($q_item)) { |
|
| 2731 | + $additional_query .= "(marine_output.imo = '".$q_item."') OR "; |
|
| 2732 | + } |
|
| 2733 | + if (is_int($q_item)) { |
|
| 2734 | + $additional_query .= "(marine_output.captain_id = '".$q_item."') OR "; |
|
| 2735 | + } |
|
| 2736 | + if (is_int($q_item)) { |
|
| 2737 | + $additional_query .= "(marine_output.race_id = '".$q_item."') OR "; |
|
| 2738 | + } |
|
| 2739 | + if (!is_int($q_item)) { |
|
| 2740 | + $additional_query .= "(marine_output.captain_name = '".$q_item."') OR "; |
|
| 2741 | + } |
|
| 2742 | + if (!is_int($q_item)) { |
|
| 2743 | + $additional_query .= "(marine_output.race_name = '".$q_item."') OR "; |
|
| 2744 | + } |
|
| 2575 | 2745 | $additional_query .= "(marine_output.ident like '%".$q_item."%')"; |
| 2576 | 2746 | $additional_query .= ")"; |
| 2577 | 2747 | } |
@@ -2663,7 +2833,9 @@ discard block |
||
| 2663 | 2833 | date_default_timezone_set($globalTimezone); |
| 2664 | 2834 | $datetime = new DateTime(); |
| 2665 | 2835 | $offset = $datetime->format('P'); |
| 2666 | - } else $offset = '+00:00'; |
|
| 2836 | + } else { |
|
| 2837 | + $offset = '+00:00'; |
|
| 2838 | + } |
|
| 2667 | 2839 | if ($date_array[1] != "") |
| 2668 | 2840 | { |
| 2669 | 2841 | $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0])); |
@@ -2690,8 +2862,12 @@ discard block |
||
| 2690 | 2862 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 2691 | 2863 | { |
| 2692 | 2864 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 2693 | - } else $limit_query = ""; |
|
| 2694 | - } else $limit_query = ""; |
|
| 2865 | + } else { |
|
| 2866 | + $limit_query = ""; |
|
| 2867 | + } |
|
| 2868 | + } else { |
|
| 2869 | + $limit_query = ""; |
|
| 2870 | + } |
|
| 2695 | 2871 | if ($sort != "") |
| 2696 | 2872 | { |
| 2697 | 2873 | $search_orderby_array = $this->getOrderBy(); |
@@ -2757,8 +2933,11 @@ discard block |
||
| 2757 | 2933 | $sth = $this->db->prepare($query); |
| 2758 | 2934 | $sth->execute(array(':race_name' => $race_name)); |
| 2759 | 2935 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 2760 | - if (isset($result[0])) return $result[0]; |
|
| 2761 | - else return array(); |
|
| 2936 | + if (isset($result[0])) { |
|
| 2937 | + return $result[0]; |
|
| 2938 | + } else { |
|
| 2939 | + return array(); |
|
| 2940 | + } |
|
| 2762 | 2941 | } |
| 2763 | 2942 | |
| 2764 | 2943 | /** |
@@ -2774,8 +2953,11 @@ discard block |
||
| 2774 | 2953 | $sth = $this->db->prepare($query); |
| 2775 | 2954 | $sth->execute(array(':race_id' => $race_id)); |
| 2776 | 2955 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 2777 | - if (isset($result[0])) return $result[0]; |
|
| 2778 | - else return array(); |
|
| 2956 | + if (isset($result[0])) { |
|
| 2957 | + return $result[0]; |
|
| 2958 | + } else { |
|
| 2959 | + return array(); |
|
| 2960 | + } |
|
| 2779 | 2961 | } |
| 2780 | 2962 | |
| 2781 | 2963 | /** |
@@ -18,13 +18,13 @@ discard block |
||
| 18 | 18 | if ($this->db === null) die('Error: No DB connection. (Marine)'); |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | - /** |
|
| 22 | - * Get SQL query part for filter used |
|
| 23 | - * @param array $filter the filter |
|
| 24 | - * @param bool $where |
|
| 25 | - * @param bool $and |
|
| 26 | - * @return string the SQL part |
|
| 27 | - */ |
|
| 21 | + /** |
|
| 22 | + * Get SQL query part for filter used |
|
| 23 | + * @param array $filter the filter |
|
| 24 | + * @param bool $where |
|
| 25 | + * @param bool $and |
|
| 26 | + * @return string the SQL part |
|
| 27 | + */ |
|
| 28 | 28 | public function getFilter($filter = array(),$where = false,$and = false) { |
| 29 | 29 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 30 | 30 | $filters = array(); |
@@ -95,15 +95,15 @@ discard block |
||
| 95 | 95 | return $filter_query; |
| 96 | 96 | } |
| 97 | 97 | |
| 98 | - /** |
|
| 99 | - * Executes the SQL statements to get the spotter information |
|
| 100 | - * |
|
| 101 | - * @param String $query the SQL query |
|
| 102 | - * @param array $params parameter of the query |
|
| 103 | - * @param String $limitQuery the limit query |
|
| 104 | - * @param bool $schedules |
|
| 105 | - * @return array the spotter information |
|
| 106 | - */ |
|
| 98 | + /** |
|
| 99 | + * Executes the SQL statements to get the spotter information |
|
| 100 | + * |
|
| 101 | + * @param String $query the SQL query |
|
| 102 | + * @param array $params parameter of the query |
|
| 103 | + * @param String $limitQuery the limit query |
|
| 104 | + * @param bool $schedules |
|
| 105 | + * @return array the spotter information |
|
| 106 | + */ |
|
| 107 | 107 | public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false) |
| 108 | 108 | { |
| 109 | 109 | global $globalVM; |
@@ -253,14 +253,14 @@ discard block |
||
| 253 | 253 | } |
| 254 | 254 | |
| 255 | 255 | |
| 256 | - /** |
|
| 257 | - * Gets all the spotter information based on the latest data entry |
|
| 258 | - * |
|
| 259 | - * @param string $limit |
|
| 260 | - * @param string $sort |
|
| 261 | - * @param array $filter |
|
| 262 | - * @return array the spotter information |
|
| 263 | - */ |
|
| 256 | + /** |
|
| 257 | + * Gets all the spotter information based on the latest data entry |
|
| 258 | + * |
|
| 259 | + * @param string $limit |
|
| 260 | + * @param string $sort |
|
| 261 | + * @param array $filter |
|
| 262 | + * @return array the spotter information |
|
| 263 | + */ |
|
| 264 | 264 | public function getLatestMarineData($limit = '', $sort = '', $filter = array()) |
| 265 | 265 | { |
| 266 | 266 | global $global_marine_query; |
@@ -295,7 +295,7 @@ discard block |
||
| 295 | 295 | * @param string $id |
| 296 | 296 | * @return array the spotter information |
| 297 | 297 | */ |
| 298 | - public function getMarineDataByID($id = '') |
|
| 298 | + public function getMarineDataByID($id = '') |
|
| 299 | 299 | { |
| 300 | 300 | global $global_marine_query; |
| 301 | 301 | |
@@ -308,15 +308,15 @@ discard block |
||
| 308 | 308 | return $spotter_array; |
| 309 | 309 | } |
| 310 | 310 | |
| 311 | - /** |
|
| 312 | - * Gets all the spotter information based on the callsign |
|
| 313 | - * |
|
| 314 | - * @param string $ident |
|
| 315 | - * @param string $limit |
|
| 316 | - * @param string $sort |
|
| 317 | - * @param array $filter |
|
| 318 | - * @return array the spotter information |
|
| 319 | - */ |
|
| 311 | + /** |
|
| 312 | + * Gets all the spotter information based on the callsign |
|
| 313 | + * |
|
| 314 | + * @param string $ident |
|
| 315 | + * @param string $limit |
|
| 316 | + * @param string $sort |
|
| 317 | + * @param array $filter |
|
| 318 | + * @return array the spotter information |
|
| 319 | + */ |
|
| 320 | 320 | public function getMarineDataByIdent($ident = '', $limit = '', $sort = '', $filter = array()) |
| 321 | 321 | { |
| 322 | 322 | global $global_marine_query; |
@@ -367,15 +367,15 @@ discard block |
||
| 367 | 367 | return $spotter_array; |
| 368 | 368 | } |
| 369 | 369 | |
| 370 | - /** |
|
| 371 | - * Gets all the marine information based on the type |
|
| 372 | - * |
|
| 373 | - * @param string $type |
|
| 374 | - * @param string $limit |
|
| 375 | - * @param string $sort |
|
| 376 | - * @param array $filter |
|
| 377 | - * @return array the marine information |
|
| 378 | - */ |
|
| 370 | + /** |
|
| 371 | + * Gets all the marine information based on the type |
|
| 372 | + * |
|
| 373 | + * @param string $type |
|
| 374 | + * @param string $limit |
|
| 375 | + * @param string $sort |
|
| 376 | + * @param array $filter |
|
| 377 | + * @return array the marine information |
|
| 378 | + */ |
|
| 379 | 379 | public function getMarineDataByType($type = '', $limit = '', $sort = '', $filter = array()) |
| 380 | 380 | { |
| 381 | 381 | global $global_marine_query; |
@@ -421,14 +421,14 @@ discard block |
||
| 421 | 421 | return $spotter_array; |
| 422 | 422 | } |
| 423 | 423 | |
| 424 | - /** |
|
| 425 | - * @param string $date |
|
| 426 | - * @param string $limit |
|
| 427 | - * @param string $sort |
|
| 428 | - * @param array $filter |
|
| 429 | - * @return array |
|
| 430 | - */ |
|
| 431 | - public function getMarineDataByDate($date = '', $limit = '', $sort = '', $filter = array()) |
|
| 424 | + /** |
|
| 425 | + * @param string $date |
|
| 426 | + * @param string $limit |
|
| 427 | + * @param string $sort |
|
| 428 | + * @param array $filter |
|
| 429 | + * @return array |
|
| 430 | + */ |
|
| 431 | + public function getMarineDataByDate($date = '', $limit = '', $sort = '', $filter = array()) |
|
| 432 | 432 | { |
| 433 | 433 | global $global_marine_query, $globalTimezone, $globalDBdriver; |
| 434 | 434 | |
@@ -485,15 +485,15 @@ discard block |
||
| 485 | 485 | return $spotter_array; |
| 486 | 486 | } |
| 487 | 487 | |
| 488 | - /** |
|
| 489 | - * Gets all the marine information based on the captain |
|
| 490 | - * |
|
| 491 | - * @param string $captain |
|
| 492 | - * @param string $limit |
|
| 493 | - * @param string $sort |
|
| 494 | - * @param array $filter |
|
| 495 | - * @return array the marine information |
|
| 496 | - */ |
|
| 488 | + /** |
|
| 489 | + * Gets all the marine information based on the captain |
|
| 490 | + * |
|
| 491 | + * @param string $captain |
|
| 492 | + * @param string $limit |
|
| 493 | + * @param string $sort |
|
| 494 | + * @param array $filter |
|
| 495 | + * @return array the marine information |
|
| 496 | + */ |
|
| 497 | 497 | public function getMarineDataByCaptain($captain = '', $limit = '', $sort = '', $filter = array()) |
| 498 | 498 | { |
| 499 | 499 | global $global_marine_query; |
@@ -531,15 +531,15 @@ discard block |
||
| 531 | 531 | return $spotter_array; |
| 532 | 532 | } |
| 533 | 533 | |
| 534 | - /** |
|
| 535 | - * Gets all the marine information based on the race |
|
| 536 | - * |
|
| 537 | - * @param string $race |
|
| 538 | - * @param string $limit |
|
| 539 | - * @param string $sort |
|
| 540 | - * @param array $filter |
|
| 541 | - * @return array the marine information |
|
| 542 | - */ |
|
| 534 | + /** |
|
| 535 | + * Gets all the marine information based on the race |
|
| 536 | + * |
|
| 537 | + * @param string $race |
|
| 538 | + * @param string $limit |
|
| 539 | + * @param string $sort |
|
| 540 | + * @param array $filter |
|
| 541 | + * @return array the marine information |
|
| 542 | + */ |
|
| 543 | 543 | public function getMarineDataByRace($race = '', $limit = '', $sort = '', $filter = array()) |
| 544 | 544 | { |
| 545 | 545 | global $global_marine_query,$globalDBdriver; |
@@ -581,13 +581,13 @@ discard block |
||
| 581 | 581 | return $spotter_array; |
| 582 | 582 | } |
| 583 | 583 | |
| 584 | - /** |
|
| 585 | - * Count races by captain |
|
| 586 | - * |
|
| 587 | - * @param $captain |
|
| 588 | - * @param array $filters |
|
| 589 | - * @return Integer number of race for a captain |
|
| 590 | - */ |
|
| 584 | + /** |
|
| 585 | + * Count races by captain |
|
| 586 | + * |
|
| 587 | + * @param $captain |
|
| 588 | + * @param array $filters |
|
| 589 | + * @return Integer number of race for a captain |
|
| 590 | + */ |
|
| 591 | 591 | public function countRacesByCaptain($captain,$filters = array()) |
| 592 | 592 | { |
| 593 | 593 | $captain = filter_var($captain,FILTER_SANITIZE_STRING); |
@@ -602,13 +602,13 @@ discard block |
||
| 602 | 602 | return $result[0]['nb']; |
| 603 | 603 | } |
| 604 | 604 | |
| 605 | - /** |
|
| 606 | - * Count captains by race |
|
| 607 | - * |
|
| 608 | - * @param $race |
|
| 609 | - * @param array $filters |
|
| 610 | - * @return String Duration of all races |
|
| 611 | - */ |
|
| 605 | + /** |
|
| 606 | + * Count captains by race |
|
| 607 | + * |
|
| 608 | + * @param $race |
|
| 609 | + * @param array $filters |
|
| 610 | + * @return String Duration of all races |
|
| 611 | + */ |
|
| 612 | 612 | public function countCaptainsByRace($race,$filters = array()) |
| 613 | 613 | { |
| 614 | 614 | $race = filter_var($race,FILTER_SANITIZE_STRING); |
@@ -623,16 +623,16 @@ discard block |
||
| 623 | 623 | return $result[0]['nb']; |
| 624 | 624 | } |
| 625 | 625 | |
| 626 | - /** |
|
| 627 | - * Gets all boat types that have been used by a captain |
|
| 628 | - * |
|
| 629 | - * @param $captain |
|
| 630 | - * @param array $filters |
|
| 631 | - * @param string $year |
|
| 632 | - * @param string $month |
|
| 633 | - * @param string $day |
|
| 634 | - * @return array the boat list |
|
| 635 | - */ |
|
| 626 | + /** |
|
| 627 | + * Gets all boat types that have been used by a captain |
|
| 628 | + * |
|
| 629 | + * @param $captain |
|
| 630 | + * @param array $filters |
|
| 631 | + * @param string $year |
|
| 632 | + * @param string $month |
|
| 633 | + * @param string $day |
|
| 634 | + * @return array the boat list |
|
| 635 | + */ |
|
| 636 | 636 | public function countAllBoatTypesByCaptain($captain,$filters = array(),$year = '',$month = '',$day = '') |
| 637 | 637 | { |
| 638 | 638 | global $globalDBdriver; |
@@ -676,16 +676,16 @@ discard block |
||
| 676 | 676 | return $sth->fetchAll(PDO::FETCH_ASSOC); |
| 677 | 677 | } |
| 678 | 678 | |
| 679 | - /** |
|
| 680 | - * Gets all boat types that have been used on a race |
|
| 681 | - * |
|
| 682 | - * @param $race |
|
| 683 | - * @param array $filters |
|
| 684 | - * @param string $year |
|
| 685 | - * @param string $month |
|
| 686 | - * @param string $day |
|
| 687 | - * @return array the boat list |
|
| 688 | - */ |
|
| 679 | + /** |
|
| 680 | + * Gets all boat types that have been used on a race |
|
| 681 | + * |
|
| 682 | + * @param $race |
|
| 683 | + * @param array $filters |
|
| 684 | + * @param string $year |
|
| 685 | + * @param string $month |
|
| 686 | + * @param string $day |
|
| 687 | + * @return array the boat list |
|
| 688 | + */ |
|
| 689 | 689 | public function countAllBoatTypesByRace($race,$filters = array(),$year = '',$month = '',$day = '') |
| 690 | 690 | { |
| 691 | 691 | global $globalDBdriver; |
@@ -729,16 +729,16 @@ discard block |
||
| 729 | 729 | return $sth->fetchAll(PDO::FETCH_ASSOC); |
| 730 | 730 | } |
| 731 | 731 | |
| 732 | - /** |
|
| 733 | - * Gets race duration by captain |
|
| 734 | - * |
|
| 735 | - * @param $captain |
|
| 736 | - * @param array $filters |
|
| 737 | - * @param string $year |
|
| 738 | - * @param string $month |
|
| 739 | - * @param string $day |
|
| 740 | - * @return String Duration of all race |
|
| 741 | - */ |
|
| 732 | + /** |
|
| 733 | + * Gets race duration by captain |
|
| 734 | + * |
|
| 735 | + * @param $captain |
|
| 736 | + * @param array $filters |
|
| 737 | + * @param string $year |
|
| 738 | + * @param string $month |
|
| 739 | + * @param string $day |
|
| 740 | + * @return String Duration of all race |
|
| 741 | + */ |
|
| 742 | 742 | public function getRaceDurationByCaptain($captain,$filters = array(),$year = '',$month = '',$day = '') |
| 743 | 743 | { |
| 744 | 744 | global $globalDBdriver; |
@@ -783,16 +783,16 @@ discard block |
||
| 783 | 783 | else return $result[0]['duration']; |
| 784 | 784 | } |
| 785 | 785 | |
| 786 | - /** |
|
| 787 | - * Gets race duration by captains |
|
| 788 | - * |
|
| 789 | - * @param bool $limit |
|
| 790 | - * @param array $filters |
|
| 791 | - * @param string $year |
|
| 792 | - * @param string $month |
|
| 793 | - * @param string $day |
|
| 794 | - * @return array Duration of all race |
|
| 795 | - */ |
|
| 786 | + /** |
|
| 787 | + * Gets race duration by captains |
|
| 788 | + * |
|
| 789 | + * @param bool $limit |
|
| 790 | + * @param array $filters |
|
| 791 | + * @param string $year |
|
| 792 | + * @param string $month |
|
| 793 | + * @param string $day |
|
| 794 | + * @return array Duration of all race |
|
| 795 | + */ |
|
| 796 | 796 | public function getRaceDurationByCaptains($limit = true,$filters = array(),$year = '',$month = '',$day = '') |
| 797 | 797 | { |
| 798 | 798 | global $globalDBdriver; |
@@ -850,12 +850,12 @@ discard block |
||
| 850 | 850 | |
| 851 | 851 | } |
| 852 | 852 | |
| 853 | - /** |
|
| 854 | - * Gets a list of all captain names and captain ids |
|
| 855 | - * |
|
| 856 | - * @param array $filters |
|
| 857 | - * @return array list of captain names and captain ids |
|
| 858 | - */ |
|
| 853 | + /** |
|
| 854 | + * Gets a list of all captain names and captain ids |
|
| 855 | + * |
|
| 856 | + * @param array $filters |
|
| 857 | + * @return array list of captain names and captain ids |
|
| 858 | + */ |
|
| 859 | 859 | public function getAllCaptainNames($filters = array()) |
| 860 | 860 | { |
| 861 | 861 | $filter_query = $this->getFilter($filters,true,true); |
@@ -868,12 +868,12 @@ discard block |
||
| 868 | 868 | return $sth->fetchAll(PDO::FETCH_ASSOC); |
| 869 | 869 | } |
| 870 | 870 | |
| 871 | - /** |
|
| 872 | - * Gets a list of all race names and race ids |
|
| 873 | - * |
|
| 874 | - * @param array $filters |
|
| 875 | - * @return array list of race names and race ids |
|
| 876 | - */ |
|
| 871 | + /** |
|
| 872 | + * Gets a list of all race names and race ids |
|
| 873 | + * |
|
| 874 | + * @param array $filters |
|
| 875 | + * @return array list of race names and race ids |
|
| 876 | + */ |
|
| 877 | 877 | public function getAllRaceNames($filters = array()) |
| 878 | 878 | { |
| 879 | 879 | $filter_query = $this->getFilter($filters,true,true); |
@@ -887,13 +887,13 @@ discard block |
||
| 887 | 887 | } |
| 888 | 888 | |
| 889 | 889 | |
| 890 | - /** |
|
| 891 | - * Gets all source name |
|
| 892 | - * |
|
| 893 | - * @param String type format of source |
|
| 894 | - * @param array $filters |
|
| 895 | - * @return array list of source name |
|
| 896 | - */ |
|
| 890 | + /** |
|
| 891 | + * Gets all source name |
|
| 892 | + * |
|
| 893 | + * @param String type format of source |
|
| 894 | + * @param array $filters |
|
| 895 | + * @return array list of source name |
|
| 896 | + */ |
|
| 897 | 897 | public function getAllSourceName($type = '',$filters = array()) |
| 898 | 898 | { |
| 899 | 899 | $filter_query = $this->getFilter($filters,true,true); |
@@ -922,12 +922,12 @@ discard block |
||
| 922 | 922 | } |
| 923 | 923 | |
| 924 | 924 | |
| 925 | - /** |
|
| 926 | - * Gets a list of all idents/callsigns |
|
| 927 | - * |
|
| 928 | - * @param array $filters |
|
| 929 | - * @return array list of ident/callsign names |
|
| 930 | - */ |
|
| 925 | + /** |
|
| 926 | + * Gets a list of all idents/callsigns |
|
| 927 | + * |
|
| 928 | + * @param array $filters |
|
| 929 | + * @return array list of ident/callsign names |
|
| 930 | + */ |
|
| 931 | 931 | public function getAllIdents($filters = array()) |
| 932 | 932 | { |
| 933 | 933 | $filter_query = $this->getFilter($filters,true,true); |
@@ -950,12 +950,12 @@ discard block |
||
| 950 | 950 | return $ident_array; |
| 951 | 951 | } |
| 952 | 952 | |
| 953 | - /** |
|
| 954 | - * Gets all info from a mmsi |
|
| 955 | - * |
|
| 956 | - * @param $mmsi |
|
| 957 | - * @return array ident |
|
| 958 | - */ |
|
| 953 | + /** |
|
| 954 | + * Gets all info from a mmsi |
|
| 955 | + * |
|
| 956 | + * @param $mmsi |
|
| 957 | + * @return array ident |
|
| 958 | + */ |
|
| 959 | 959 | public function getIdentity($mmsi) |
| 960 | 960 | { |
| 961 | 961 | $mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT); |
@@ -967,14 +967,14 @@ discard block |
||
| 967 | 967 | else return array(); |
| 968 | 968 | } |
| 969 | 969 | |
| 970 | - /** |
|
| 971 | - * Add identity |
|
| 972 | - * @param $mmsi |
|
| 973 | - * @param $imo |
|
| 974 | - * @param $ident |
|
| 975 | - * @param $callsign |
|
| 976 | - * @param $type |
|
| 977 | - */ |
|
| 970 | + /** |
|
| 971 | + * Add identity |
|
| 972 | + * @param $mmsi |
|
| 973 | + * @param $imo |
|
| 974 | + * @param $ident |
|
| 975 | + * @param $callsign |
|
| 976 | + * @param $type |
|
| 977 | + */ |
|
| 978 | 978 | public function addIdentity($mmsi,$imo,$ident,$callsign,$type) |
| 979 | 979 | { |
| 980 | 980 | $mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT); |
@@ -1040,13 +1040,13 @@ discard block |
||
| 1040 | 1040 | } |
| 1041 | 1041 | |
| 1042 | 1042 | /** |
| 1043 | - * Update ident tracker data |
|
| 1044 | - * |
|
| 1045 | - * @param String $fammarine_id the ID |
|
| 1046 | - * @param String $ident the marine ident |
|
| 1047 | - * @return String success or false |
|
| 1048 | - * |
|
| 1049 | - */ |
|
| 1043 | + * Update ident tracker data |
|
| 1044 | + * |
|
| 1045 | + * @param String $fammarine_id the ID |
|
| 1046 | + * @param String $ident the marine ident |
|
| 1047 | + * @return String success or false |
|
| 1048 | + * |
|
| 1049 | + */ |
|
| 1050 | 1050 | public function updateIdentMarineData($fammarine_id = '', $ident = '',$fromsource = NULL) |
| 1051 | 1051 | { |
| 1052 | 1052 | $query = 'UPDATE marine_output SET ident = :ident WHERE fammarine_id = :fammarine_id'; |
@@ -1061,13 +1061,13 @@ discard block |
||
| 1061 | 1061 | } |
| 1062 | 1062 | |
| 1063 | 1063 | /** |
| 1064 | - * Update arrival marine data |
|
| 1065 | - * |
|
| 1066 | - * @param String $fammarine_id the ID |
|
| 1067 | - * @param String $arrival_code the marine ident |
|
| 1068 | - * @return String success or false |
|
| 1069 | - * |
|
| 1070 | - */ |
|
| 1064 | + * Update arrival marine data |
|
| 1065 | + * |
|
| 1066 | + * @param String $fammarine_id the ID |
|
| 1067 | + * @param String $arrival_code the marine ident |
|
| 1068 | + * @return String success or false |
|
| 1069 | + * |
|
| 1070 | + */ |
|
| 1071 | 1071 | public function updateArrivalPortNameMarineData($fammarine_id = '', $arrival_code = '',$fromsource = NULL) |
| 1072 | 1072 | { |
| 1073 | 1073 | $query = 'UPDATE marine_output SET arrival_port_name = :arrival_code WHERE fammarine_id = :fammarine_id'; |
@@ -1082,19 +1082,19 @@ discard block |
||
| 1082 | 1082 | } |
| 1083 | 1083 | |
| 1084 | 1084 | /** |
| 1085 | - * Update Status data |
|
| 1086 | - * |
|
| 1087 | - * @param String $fammarine_id the ID |
|
| 1088 | - * @param String $status_id the marine status id |
|
| 1089 | - * @param String $status the marine status |
|
| 1090 | - * @return String success or false |
|
| 1091 | - * |
|
| 1092 | - */ |
|
| 1085 | + * Update Status data |
|
| 1086 | + * |
|
| 1087 | + * @param String $fammarine_id the ID |
|
| 1088 | + * @param String $status_id the marine status id |
|
| 1089 | + * @param String $status the marine status |
|
| 1090 | + * @return String success or false |
|
| 1091 | + * |
|
| 1092 | + */ |
|
| 1093 | 1093 | public function updateStatusMarineData($fammarine_id = '', $status_id = '',$status = '') |
| 1094 | 1094 | { |
| 1095 | 1095 | |
| 1096 | 1096 | $query = 'UPDATE marine_output SET status = :status, status_id = :status_id WHERE fammarine_id = :fammarine_id'; |
| 1097 | - $query_values = array(':fammarine_id' => $fammarine_id,':status' => $status,':status_id' => $status_id); |
|
| 1097 | + $query_values = array(':fammarine_id' => $fammarine_id,':status' => $status,':status_id' => $status_id); |
|
| 1098 | 1098 | |
| 1099 | 1099 | try { |
| 1100 | 1100 | $sth = $this->db->prepare($query); |
@@ -1107,22 +1107,22 @@ discard block |
||
| 1107 | 1107 | |
| 1108 | 1108 | } |
| 1109 | 1109 | |
| 1110 | - /** |
|
| 1111 | - * Update latest marine data |
|
| 1112 | - * |
|
| 1113 | - * @param String $fammarine_id the ID |
|
| 1114 | - * @param String $ident the marine ident |
|
| 1115 | - * @param string $latitude |
|
| 1116 | - * @param string $longitude |
|
| 1117 | - * @param float $groundspeed |
|
| 1118 | - * @param string $date |
|
| 1119 | - * @param float $distance |
|
| 1120 | - * @param integer $race_rank |
|
| 1121 | - * @param integer $race_time |
|
| 1122 | - * @param string $status |
|
| 1123 | - * @param string $race_begin |
|
| 1124 | - * @return String success or false |
|
| 1125 | - */ |
|
| 1110 | + /** |
|
| 1111 | + * Update latest marine data |
|
| 1112 | + * |
|
| 1113 | + * @param String $fammarine_id the ID |
|
| 1114 | + * @param String $ident the marine ident |
|
| 1115 | + * @param string $latitude |
|
| 1116 | + * @param string $longitude |
|
| 1117 | + * @param float $groundspeed |
|
| 1118 | + * @param string $date |
|
| 1119 | + * @param float $distance |
|
| 1120 | + * @param integer $race_rank |
|
| 1121 | + * @param integer $race_time |
|
| 1122 | + * @param string $status |
|
| 1123 | + * @param string $race_begin |
|
| 1124 | + * @return String success or false |
|
| 1125 | + */ |
|
| 1126 | 1126 | public function updateLatestMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $groundspeed = NULL, $date = '',$distance = NULL,$race_rank = NULL, $race_time = NULL, $status = '', $race_begin = '') |
| 1127 | 1127 | { |
| 1128 | 1128 | if ($latitude == '') $latitude = NULL; |
@@ -1147,36 +1147,36 @@ discard block |
||
| 1147 | 1147 | |
| 1148 | 1148 | } |
| 1149 | 1149 | |
| 1150 | - /** |
|
| 1151 | - * Adds a new marine data |
|
| 1152 | - * |
|
| 1153 | - * @param String $fammarine_id the ID |
|
| 1154 | - * @param String $ident the marine ident |
|
| 1155 | - * @param String $latitude latitude of flight |
|
| 1156 | - * @param String $longitude latitude of flight |
|
| 1157 | - * @param String $heading heading of flight |
|
| 1158 | - * @param String $groundspeed speed of flight |
|
| 1159 | - * @param String $date date of flight |
|
| 1160 | - * @param string $mmsi |
|
| 1161 | - * @param string $type |
|
| 1162 | - * @param string $typeid |
|
| 1163 | - * @param string $imo |
|
| 1164 | - * @param string $callsign |
|
| 1165 | - * @param string $arrival_code |
|
| 1166 | - * @param string $arrival_date |
|
| 1167 | - * @param string $status |
|
| 1168 | - * @param string $statusid |
|
| 1169 | - * @param string $format_source |
|
| 1170 | - * @param string $source_name |
|
| 1171 | - * @param string $captain_id |
|
| 1172 | - * @param string $captain_name |
|
| 1173 | - * @param string $race_id |
|
| 1174 | - * @param string $race_name |
|
| 1175 | - * @param string $distance |
|
| 1176 | - * @param string $race_rank |
|
| 1177 | - * @param string $race_time |
|
| 1178 | - * @return String success or false |
|
| 1179 | - */ |
|
| 1150 | + /** |
|
| 1151 | + * Adds a new marine data |
|
| 1152 | + * |
|
| 1153 | + * @param String $fammarine_id the ID |
|
| 1154 | + * @param String $ident the marine ident |
|
| 1155 | + * @param String $latitude latitude of flight |
|
| 1156 | + * @param String $longitude latitude of flight |
|
| 1157 | + * @param String $heading heading of flight |
|
| 1158 | + * @param String $groundspeed speed of flight |
|
| 1159 | + * @param String $date date of flight |
|
| 1160 | + * @param string $mmsi |
|
| 1161 | + * @param string $type |
|
| 1162 | + * @param string $typeid |
|
| 1163 | + * @param string $imo |
|
| 1164 | + * @param string $callsign |
|
| 1165 | + * @param string $arrival_code |
|
| 1166 | + * @param string $arrival_date |
|
| 1167 | + * @param string $status |
|
| 1168 | + * @param string $statusid |
|
| 1169 | + * @param string $format_source |
|
| 1170 | + * @param string $source_name |
|
| 1171 | + * @param string $captain_id |
|
| 1172 | + * @param string $captain_name |
|
| 1173 | + * @param string $race_id |
|
| 1174 | + * @param string $race_name |
|
| 1175 | + * @param string $distance |
|
| 1176 | + * @param string $race_rank |
|
| 1177 | + * @param string $race_time |
|
| 1178 | + * @return String success or false |
|
| 1179 | + */ |
|
| 1180 | 1180 | public function addMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $mmsi = '',$type = '',$typeid = '',$imo = '',$callsign = '',$arrival_code = '',$arrival_date = '',$status = '',$statusid = '',$format_source = '', $source_name = '', $captain_id = '',$captain_name = '',$race_id = '', $race_name = '', $distance = '',$race_rank = '', $race_time = '') |
| 1181 | 1181 | { |
| 1182 | 1182 | global $globalMarineImageFetch; |
@@ -1309,12 +1309,12 @@ discard block |
||
| 1309 | 1309 | } |
| 1310 | 1310 | |
| 1311 | 1311 | |
| 1312 | - /** |
|
| 1313 | - * Gets the aircraft ident within the last hour |
|
| 1314 | - * |
|
| 1315 | - * @param $ident |
|
| 1316 | - * @return String the ident |
|
| 1317 | - */ |
|
| 1312 | + /** |
|
| 1313 | + * Gets the aircraft ident within the last hour |
|
| 1314 | + * |
|
| 1315 | + * @param $ident |
|
| 1316 | + * @return String the ident |
|
| 1317 | + */ |
|
| 1318 | 1318 | public function getIdentFromLastHour($ident) |
| 1319 | 1319 | { |
| 1320 | 1320 | global $globalDBdriver, $globalTimezone; |
@@ -1330,11 +1330,11 @@ discard block |
||
| 1330 | 1330 | AND marine_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS' |
| 1331 | 1331 | AND marine_output.date < now() AT TIME ZONE 'UTC'"; |
| 1332 | 1332 | $query_data = array(':ident' => $ident); |
| 1333 | - } |
|
| 1333 | + } |
|
| 1334 | 1334 | |
| 1335 | 1335 | $sth = $this->db->prepare($query); |
| 1336 | 1336 | $sth->execute($query_data); |
| 1337 | - $ident_result=''; |
|
| 1337 | + $ident_result=''; |
|
| 1338 | 1338 | while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
| 1339 | 1339 | { |
| 1340 | 1340 | $ident_result = $row['ident']; |
@@ -1344,12 +1344,12 @@ discard block |
||
| 1344 | 1344 | } |
| 1345 | 1345 | |
| 1346 | 1346 | |
| 1347 | - /** |
|
| 1348 | - * Gets the aircraft data from the last 20 seconds |
|
| 1349 | - * |
|
| 1350 | - * @param string $q |
|
| 1351 | - * @return array the marine data |
|
| 1352 | - */ |
|
| 1347 | + /** |
|
| 1348 | + * Gets the aircraft data from the last 20 seconds |
|
| 1349 | + * |
|
| 1350 | + * @param string $q |
|
| 1351 | + * @return array the marine data |
|
| 1352 | + */ |
|
| 1353 | 1353 | public function getRealTimeData($q = '') |
| 1354 | 1354 | { |
| 1355 | 1355 | global $globalDBdriver; |
@@ -1384,15 +1384,15 @@ discard block |
||
| 1384 | 1384 | } |
| 1385 | 1385 | |
| 1386 | 1386 | |
| 1387 | - /** |
|
| 1388 | - * Gets all number of flight over countries |
|
| 1389 | - * |
|
| 1390 | - * @param bool $limit |
|
| 1391 | - * @param int $olderthanmonths |
|
| 1392 | - * @param string $sincedate |
|
| 1393 | - * @param array $filters |
|
| 1394 | - * @return array the airline country list |
|
| 1395 | - */ |
|
| 1387 | + /** |
|
| 1388 | + * Gets all number of flight over countries |
|
| 1389 | + * |
|
| 1390 | + * @param bool $limit |
|
| 1391 | + * @param int $olderthanmonths |
|
| 1392 | + * @param string $sincedate |
|
| 1393 | + * @param array $filters |
|
| 1394 | + * @return array the airline country list |
|
| 1395 | + */ |
|
| 1396 | 1396 | |
| 1397 | 1397 | public function countAllMarineOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array()) |
| 1398 | 1398 | { |
@@ -1463,18 +1463,18 @@ discard block |
||
| 1463 | 1463 | } |
| 1464 | 1464 | |
| 1465 | 1465 | |
| 1466 | - /** |
|
| 1467 | - * Gets all callsigns that have flown over |
|
| 1468 | - * |
|
| 1469 | - * @param bool $limit |
|
| 1470 | - * @param int $olderthanmonths |
|
| 1471 | - * @param string $sincedate |
|
| 1472 | - * @param array $filters |
|
| 1473 | - * @param string $year |
|
| 1474 | - * @param string $month |
|
| 1475 | - * @param string $day |
|
| 1476 | - * @return array the callsign list |
|
| 1477 | - */ |
|
| 1466 | + /** |
|
| 1467 | + * Gets all callsigns that have flown over |
|
| 1468 | + * |
|
| 1469 | + * @param bool $limit |
|
| 1470 | + * @param int $olderthanmonths |
|
| 1471 | + * @param string $sincedate |
|
| 1472 | + * @param array $filters |
|
| 1473 | + * @param string $year |
|
| 1474 | + * @param string $month |
|
| 1475 | + * @param string $day |
|
| 1476 | + * @return array the callsign list |
|
| 1477 | + */ |
|
| 1478 | 1478 | public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '') |
| 1479 | 1479 | { |
| 1480 | 1480 | global $globalDBdriver; |
@@ -1540,12 +1540,12 @@ discard block |
||
| 1540 | 1540 | } |
| 1541 | 1541 | |
| 1542 | 1542 | |
| 1543 | - /** |
|
| 1544 | - * Counts all dates |
|
| 1545 | - * |
|
| 1546 | - * @param array $filters |
|
| 1547 | - * @return array the date list |
|
| 1548 | - */ |
|
| 1543 | + /** |
|
| 1544 | + * Counts all dates |
|
| 1545 | + * |
|
| 1546 | + * @param array $filters |
|
| 1547 | + * @return array the date list |
|
| 1548 | + */ |
|
| 1549 | 1549 | public function countAllDates($filters = array()) |
| 1550 | 1550 | { |
| 1551 | 1551 | global $globalTimezone, $globalDBdriver; |
@@ -1590,12 +1590,12 @@ discard block |
||
| 1590 | 1590 | } |
| 1591 | 1591 | |
| 1592 | 1592 | |
| 1593 | - /** |
|
| 1594 | - * Counts all dates during the last 7 days |
|
| 1595 | - * |
|
| 1596 | - * @param array $filters |
|
| 1597 | - * @return array the date list |
|
| 1598 | - */ |
|
| 1593 | + /** |
|
| 1594 | + * Counts all dates during the last 7 days |
|
| 1595 | + * |
|
| 1596 | + * @param array $filters |
|
| 1597 | + * @return array the date list |
|
| 1598 | + */ |
|
| 1599 | 1599 | public function countAllDatesLast7Days($filters = array()) |
| 1600 | 1600 | { |
| 1601 | 1601 | global $globalTimezone, $globalDBdriver; |
@@ -1617,7 +1617,7 @@ discard block |
||
| 1617 | 1617 | $query .= " GROUP BY date_name |
| 1618 | 1618 | ORDER BY date_name ASC"; |
| 1619 | 1619 | $query_data = array(':offset' => $offset); |
| 1620 | - } |
|
| 1620 | + } |
|
| 1621 | 1621 | |
| 1622 | 1622 | $sth = $this->db->prepare($query); |
| 1623 | 1623 | $sth->execute($query_data); |
@@ -1636,12 +1636,12 @@ discard block |
||
| 1636 | 1636 | return $date_array; |
| 1637 | 1637 | } |
| 1638 | 1638 | |
| 1639 | - /** |
|
| 1640 | - * Counts all dates during the last month |
|
| 1641 | - * |
|
| 1642 | - * @param array $filters |
|
| 1643 | - * @return array the date list |
|
| 1644 | - */ |
|
| 1639 | + /** |
|
| 1640 | + * Counts all dates during the last month |
|
| 1641 | + * |
|
| 1642 | + * @param array $filters |
|
| 1643 | + * @return array the date list |
|
| 1644 | + */ |
|
| 1645 | 1645 | public function countAllDatesLastMonth($filters = array()) |
| 1646 | 1646 | { |
| 1647 | 1647 | global $globalTimezone, $globalDBdriver; |
@@ -1663,7 +1663,7 @@ discard block |
||
| 1663 | 1663 | $query .= " GROUP BY date_name |
| 1664 | 1664 | ORDER BY date_name ASC"; |
| 1665 | 1665 | $query_data = array(':offset' => $offset); |
| 1666 | - } |
|
| 1666 | + } |
|
| 1667 | 1667 | |
| 1668 | 1668 | $sth = $this->db->prepare($query); |
| 1669 | 1669 | $sth->execute($query_data); |
@@ -1683,12 +1683,12 @@ discard block |
||
| 1683 | 1683 | } |
| 1684 | 1684 | |
| 1685 | 1685 | |
| 1686 | - /** |
|
| 1687 | - * Counts all month |
|
| 1688 | - * |
|
| 1689 | - * @param array $filters |
|
| 1690 | - * @return array the month list |
|
| 1691 | - */ |
|
| 1686 | + /** |
|
| 1687 | + * Counts all month |
|
| 1688 | + * |
|
| 1689 | + * @param array $filters |
|
| 1690 | + * @return array the month list |
|
| 1691 | + */ |
|
| 1692 | 1692 | public function countAllMonths($filters = array()) |
| 1693 | 1693 | { |
| 1694 | 1694 | global $globalTimezone, $globalDBdriver; |
@@ -1730,12 +1730,12 @@ discard block |
||
| 1730 | 1730 | } |
| 1731 | 1731 | |
| 1732 | 1732 | |
| 1733 | - /** |
|
| 1734 | - * Counts all dates during the last year |
|
| 1735 | - * |
|
| 1736 | - * @param $filters |
|
| 1737 | - * @return array the date list |
|
| 1738 | - */ |
|
| 1733 | + /** |
|
| 1734 | + * Counts all dates during the last year |
|
| 1735 | + * |
|
| 1736 | + * @param $filters |
|
| 1737 | + * @return array the date list |
|
| 1738 | + */ |
|
| 1739 | 1739 | public function countAllMonthsLastYear($filters) |
| 1740 | 1740 | { |
| 1741 | 1741 | global $globalTimezone, $globalDBdriver; |
@@ -1757,7 +1757,7 @@ discard block |
||
| 1757 | 1757 | $query .= " GROUP BY year_name, month_name |
| 1758 | 1758 | ORDER BY year_name, month_name ASC"; |
| 1759 | 1759 | $query_data = array(':offset' => $offset); |
| 1760 | - } |
|
| 1760 | + } |
|
| 1761 | 1761 | |
| 1762 | 1762 | $sth = $this->db->prepare($query); |
| 1763 | 1763 | $sth->execute($query_data); |
@@ -1778,13 +1778,13 @@ discard block |
||
| 1778 | 1778 | } |
| 1779 | 1779 | |
| 1780 | 1780 | |
| 1781 | - /** |
|
| 1782 | - * Counts all hours |
|
| 1783 | - * |
|
| 1784 | - * @param $orderby |
|
| 1785 | - * @param array $filters |
|
| 1786 | - * @return array the hour list |
|
| 1787 | - */ |
|
| 1781 | + /** |
|
| 1782 | + * Counts all hours |
|
| 1783 | + * |
|
| 1784 | + * @param $orderby |
|
| 1785 | + * @param array $filters |
|
| 1786 | + * @return array the hour list |
|
| 1787 | + */ |
|
| 1788 | 1788 | public function countAllHours($orderby,$filters = array()) |
| 1789 | 1789 | { |
| 1790 | 1790 | global $globalTimezone, $globalDBdriver; |
@@ -1845,13 +1845,13 @@ discard block |
||
| 1845 | 1845 | } |
| 1846 | 1846 | |
| 1847 | 1847 | |
| 1848 | - /** |
|
| 1849 | - * Counts all hours by date |
|
| 1850 | - * |
|
| 1851 | - * @param $date |
|
| 1852 | - * @param array $filters |
|
| 1853 | - * @return array the hour list |
|
| 1854 | - */ |
|
| 1848 | + /** |
|
| 1849 | + * Counts all hours by date |
|
| 1850 | + * |
|
| 1851 | + * @param $date |
|
| 1852 | + * @param array $filters |
|
| 1853 | + * @return array the hour list |
|
| 1854 | + */ |
|
| 1855 | 1855 | public function countAllHoursByDate($date, $filters = array()) |
| 1856 | 1856 | { |
| 1857 | 1857 | global $globalTimezone, $globalDBdriver; |
@@ -1893,13 +1893,13 @@ discard block |
||
| 1893 | 1893 | } |
| 1894 | 1894 | |
| 1895 | 1895 | |
| 1896 | - /** |
|
| 1897 | - * Counts all hours by a ident/callsign |
|
| 1898 | - * |
|
| 1899 | - * @param $ident |
|
| 1900 | - * @param array $filters |
|
| 1901 | - * @return array the hour list |
|
| 1902 | - */ |
|
| 1896 | + /** |
|
| 1897 | + * Counts all hours by a ident/callsign |
|
| 1898 | + * |
|
| 1899 | + * @param $ident |
|
| 1900 | + * @param array $filters |
|
| 1901 | + * @return array the hour list |
|
| 1902 | + */ |
|
| 1903 | 1903 | public function countAllHoursByIdent($ident, $filters = array()) |
| 1904 | 1904 | { |
| 1905 | 1905 | global $globalTimezone, $globalDBdriver; |
@@ -1941,15 +1941,15 @@ discard block |
||
| 1941 | 1941 | return $hour_array; |
| 1942 | 1942 | } |
| 1943 | 1943 | |
| 1944 | - /** |
|
| 1945 | - * Gets all aircraft registrations that have flown over |
|
| 1946 | - * |
|
| 1947 | - * @param bool $limit |
|
| 1948 | - * @param int $olderthanmonths |
|
| 1949 | - * @param string $sincedate |
|
| 1950 | - * @param array $filters |
|
| 1951 | - * @return array the aircraft list |
|
| 1952 | - */ |
|
| 1944 | + /** |
|
| 1945 | + * Gets all aircraft registrations that have flown over |
|
| 1946 | + * |
|
| 1947 | + * @param bool $limit |
|
| 1948 | + * @param int $olderthanmonths |
|
| 1949 | + * @param string $sincedate |
|
| 1950 | + * @param array $filters |
|
| 1951 | + * @return array the aircraft list |
|
| 1952 | + */ |
|
| 1953 | 1953 | public function countAllCaptainsByRaces($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array()) |
| 1954 | 1954 | { |
| 1955 | 1955 | global $globalDBdriver; |
@@ -1987,14 +1987,14 @@ discard block |
||
| 1987 | 1987 | return $marine_array; |
| 1988 | 1988 | } |
| 1989 | 1989 | |
| 1990 | - /** |
|
| 1991 | - * Counts all vessels |
|
| 1992 | - * |
|
| 1993 | - * @param array $filters |
|
| 1994 | - * @param string $year |
|
| 1995 | - * @param string $month |
|
| 1996 | - * @return Integer the number of vessels |
|
| 1997 | - */ |
|
| 1990 | + /** |
|
| 1991 | + * Counts all vessels |
|
| 1992 | + * |
|
| 1993 | + * @param array $filters |
|
| 1994 | + * @param string $year |
|
| 1995 | + * @param string $month |
|
| 1996 | + * @return Integer the number of vessels |
|
| 1997 | + */ |
|
| 1998 | 1998 | public function countOverallMarine($filters = array(),$year = '',$month = '') |
| 1999 | 1999 | { |
| 2000 | 2000 | global $globalDBdriver; |
@@ -2028,14 +2028,14 @@ discard block |
||
| 2028 | 2028 | return $sth->fetchColumn(); |
| 2029 | 2029 | } |
| 2030 | 2030 | |
| 2031 | - /** |
|
| 2032 | - * Counts all vessel type |
|
| 2033 | - * |
|
| 2034 | - * @param array $filters |
|
| 2035 | - * @param string $year |
|
| 2036 | - * @param string $month |
|
| 2037 | - * @return Integer the number of vessels |
|
| 2038 | - */ |
|
| 2031 | + /** |
|
| 2032 | + * Counts all vessel type |
|
| 2033 | + * |
|
| 2034 | + * @param array $filters |
|
| 2035 | + * @param string $year |
|
| 2036 | + * @param string $month |
|
| 2037 | + * @return Integer the number of vessels |
|
| 2038 | + */ |
|
| 2039 | 2039 | public function countOverallMarineTypes($filters = array(),$year = '',$month = '') |
| 2040 | 2040 | { |
| 2041 | 2041 | global $globalDBdriver; |
@@ -2068,14 +2068,14 @@ discard block |
||
| 2068 | 2068 | return $sth->fetchColumn(); |
| 2069 | 2069 | } |
| 2070 | 2070 | |
| 2071 | - /** |
|
| 2072 | - * Gets a number of all race |
|
| 2073 | - * |
|
| 2074 | - * @param array $filters |
|
| 2075 | - * @param string $year |
|
| 2076 | - * @param string $month |
|
| 2077 | - * @return Integer number of races |
|
| 2078 | - */ |
|
| 2071 | + /** |
|
| 2072 | + * Gets a number of all race |
|
| 2073 | + * |
|
| 2074 | + * @param array $filters |
|
| 2075 | + * @param string $year |
|
| 2076 | + * @param string $month |
|
| 2077 | + * @return Integer number of races |
|
| 2078 | + */ |
|
| 2079 | 2079 | public function countOverallMarineRaces($filters = array(),$year = '',$month = '') |
| 2080 | 2080 | { |
| 2081 | 2081 | global $globalDBdriver; |
@@ -2108,14 +2108,14 @@ discard block |
||
| 2108 | 2108 | return $sth->fetchColumn(); |
| 2109 | 2109 | } |
| 2110 | 2110 | |
| 2111 | - /** |
|
| 2112 | - * Gets a number of all captain |
|
| 2113 | - * |
|
| 2114 | - * @param array $filters |
|
| 2115 | - * @param string $year |
|
| 2116 | - * @param string $month |
|
| 2117 | - * @return Integer number of captain |
|
| 2118 | - */ |
|
| 2111 | + /** |
|
| 2112 | + * Gets a number of all captain |
|
| 2113 | + * |
|
| 2114 | + * @param array $filters |
|
| 2115 | + * @param string $year |
|
| 2116 | + * @param string $month |
|
| 2117 | + * @return Integer number of captain |
|
| 2118 | + */ |
|
| 2119 | 2119 | public function countOverallMarineCaptains($filters = array(),$year = '',$month = '') |
| 2120 | 2120 | { |
| 2121 | 2121 | global $globalDBdriver; |
@@ -2148,12 +2148,12 @@ discard block |
||
| 2148 | 2148 | return $sth->fetchColumn(); |
| 2149 | 2149 | } |
| 2150 | 2150 | |
| 2151 | - /** |
|
| 2152 | - * Counts all hours of today |
|
| 2153 | - * |
|
| 2154 | - * @param array $filters |
|
| 2155 | - * @return array the hour list |
|
| 2156 | - */ |
|
| 2151 | + /** |
|
| 2152 | + * Counts all hours of today |
|
| 2153 | + * |
|
| 2154 | + * @param array $filters |
|
| 2155 | + * @return array the hour list |
|
| 2156 | + */ |
|
| 2157 | 2157 | public function countAllHoursFromToday($filters = array()) |
| 2158 | 2158 | { |
| 2159 | 2159 | global $globalTimezone, $globalDBdriver; |
@@ -2193,12 +2193,12 @@ discard block |
||
| 2193 | 2193 | } |
| 2194 | 2194 | |
| 2195 | 2195 | |
| 2196 | - /** |
|
| 2197 | - * Gets the Barrie Spotter ID based on the FlightAware ID |
|
| 2198 | - * |
|
| 2199 | - * @param $fammarine_id |
|
| 2200 | - * @return Integer the Barrie Spotter ID |
|
| 2201 | - */ |
|
| 2196 | + /** |
|
| 2197 | + * Gets the Barrie Spotter ID based on the FlightAware ID |
|
| 2198 | + * |
|
| 2199 | + * @param $fammarine_id |
|
| 2200 | + * @return Integer the Barrie Spotter ID |
|
| 2201 | + */ |
|
| 2202 | 2202 | public function getMarineIDBasedOnFamMarineID($fammarine_id) |
| 2203 | 2203 | { |
| 2204 | 2204 | $fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING); |
@@ -2219,13 +2219,13 @@ discard block |
||
| 2219 | 2219 | |
| 2220 | 2220 | |
| 2221 | 2221 | /** |
| 2222 | - * Parses a date string |
|
| 2223 | - * |
|
| 2224 | - * @param String $dateString the date string |
|
| 2225 | - * @param String $timezone the timezone of a user |
|
| 2226 | - * @return array the time information |
|
| 2227 | - * |
|
| 2228 | - */ |
|
| 2222 | + * Parses a date string |
|
| 2223 | + * |
|
| 2224 | + * @param String $dateString the date string |
|
| 2225 | + * @param String $timezone the timezone of a user |
|
| 2226 | + * @return array the time information |
|
| 2227 | + * |
|
| 2228 | + */ |
|
| 2229 | 2229 | public function parseDateString($dateString, $timezone = '') |
| 2230 | 2230 | { |
| 2231 | 2231 | $time_array = array(); |
@@ -2258,12 +2258,12 @@ discard block |
||
| 2258 | 2258 | } |
| 2259 | 2259 | |
| 2260 | 2260 | /** |
| 2261 | - * Parses the direction degrees to working |
|
| 2262 | - * |
|
| 2263 | - * @param Float $direction the direction in degrees |
|
| 2264 | - * @return array the direction information |
|
| 2265 | - * |
|
| 2266 | - */ |
|
| 2261 | + * Parses the direction degrees to working |
|
| 2262 | + * |
|
| 2263 | + * @param Float $direction the direction in degrees |
|
| 2264 | + * @return array the direction information |
|
| 2265 | + * |
|
| 2266 | + */ |
|
| 2267 | 2267 | public function parseDirection($direction = 0) |
| 2268 | 2268 | { |
| 2269 | 2269 | if ($direction == '') $direction = 0; |
@@ -2342,12 +2342,12 @@ discard block |
||
| 2342 | 2342 | |
| 2343 | 2343 | |
| 2344 | 2344 | /** |
| 2345 | - * Gets Country from latitude/longitude |
|
| 2346 | - * |
|
| 2347 | - * @param Float $latitude latitute of the flight |
|
| 2348 | - * @param Float $longitude longitute of the flight |
|
| 2349 | - * @return String the countries |
|
| 2350 | - */ |
|
| 2345 | + * Gets Country from latitude/longitude |
|
| 2346 | + * |
|
| 2347 | + * @param Float $latitude latitute of the flight |
|
| 2348 | + * @param Float $longitude longitute of the flight |
|
| 2349 | + * @return String the countries |
|
| 2350 | + */ |
|
| 2351 | 2351 | public function getCountryFromLatitudeLongitude($latitude,$longitude) |
| 2352 | 2352 | { |
| 2353 | 2353 | global $globalDebug; |
@@ -2384,11 +2384,11 @@ discard block |
||
| 2384 | 2384 | } |
| 2385 | 2385 | |
| 2386 | 2386 | /** |
| 2387 | - * Gets Country from iso2 |
|
| 2388 | - * |
|
| 2389 | - * @param String $iso2 ISO2 country code |
|
| 2390 | - * @return String the countries |
|
| 2391 | - */ |
|
| 2387 | + * Gets Country from iso2 |
|
| 2388 | + * |
|
| 2389 | + * @param String $iso2 ISO2 country code |
|
| 2390 | + * @return String the countries |
|
| 2391 | + */ |
|
| 2392 | 2392 | public function getCountryFromISO2($iso2) |
| 2393 | 2393 | { |
| 2394 | 2394 | global $globalDebug; |
@@ -2417,12 +2417,12 @@ discard block |
||
| 2417 | 2417 | |
| 2418 | 2418 | |
| 2419 | 2419 | /** |
| 2420 | - * Gets the short url from bit.ly |
|
| 2421 | - * |
|
| 2422 | - * @param String $url the full url |
|
| 2423 | - * @return String the bit.ly url |
|
| 2424 | - * |
|
| 2425 | - */ |
|
| 2420 | + * Gets the short url from bit.ly |
|
| 2421 | + * |
|
| 2422 | + * @param String $url the full url |
|
| 2423 | + * @return String the bit.ly url |
|
| 2424 | + * |
|
| 2425 | + */ |
|
| 2426 | 2426 | public function getBitlyURL($url) |
| 2427 | 2427 | { |
| 2428 | 2428 | global $globalBitlyAccessToken; |
@@ -2448,18 +2448,18 @@ discard block |
||
| 2448 | 2448 | } |
| 2449 | 2449 | |
| 2450 | 2450 | |
| 2451 | - /** |
|
| 2452 | - * Gets all vessels types that have flown over |
|
| 2453 | - * |
|
| 2454 | - * @param bool $limit |
|
| 2455 | - * @param int $olderthanmonths |
|
| 2456 | - * @param string $sincedate |
|
| 2457 | - * @param array $filters |
|
| 2458 | - * @param string $year |
|
| 2459 | - * @param string $month |
|
| 2460 | - * @param string $day |
|
| 2461 | - * @return array the vessel type list |
|
| 2462 | - */ |
|
| 2451 | + /** |
|
| 2452 | + * Gets all vessels types that have flown over |
|
| 2453 | + * |
|
| 2454 | + * @param bool $limit |
|
| 2455 | + * @param int $olderthanmonths |
|
| 2456 | + * @param string $sincedate |
|
| 2457 | + * @param array $filters |
|
| 2458 | + * @param string $year |
|
| 2459 | + * @param string $month |
|
| 2460 | + * @param string $day |
|
| 2461 | + * @return array the vessel type list |
|
| 2462 | + */ |
|
| 2463 | 2463 | public function countAllMarineTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '') |
| 2464 | 2464 | { |
| 2465 | 2465 | global $globalDBdriver; |
@@ -2524,27 +2524,27 @@ discard block |
||
| 2524 | 2524 | return $marine_array; |
| 2525 | 2525 | } |
| 2526 | 2526 | |
| 2527 | - /** |
|
| 2528 | - * Gets all the tracker information |
|
| 2529 | - * |
|
| 2530 | - * @param string $q |
|
| 2531 | - * @param string $callsign |
|
| 2532 | - * @param string $mmsi |
|
| 2533 | - * @param string $imo |
|
| 2534 | - * @param string $date_posted |
|
| 2535 | - * @param string $limit |
|
| 2536 | - * @param string $sort |
|
| 2537 | - * @param string $includegeodata |
|
| 2538 | - * @param string $origLat |
|
| 2539 | - * @param string $origLon |
|
| 2540 | - * @param string $dist |
|
| 2541 | - * @param string $captain_id |
|
| 2542 | - * @param string $captain_name |
|
| 2543 | - * @param string $race_id |
|
| 2544 | - * @param string $race_name |
|
| 2545 | - * @param array $filters |
|
| 2546 | - * @return array the tracker information |
|
| 2547 | - */ |
|
| 2527 | + /** |
|
| 2528 | + * Gets all the tracker information |
|
| 2529 | + * |
|
| 2530 | + * @param string $q |
|
| 2531 | + * @param string $callsign |
|
| 2532 | + * @param string $mmsi |
|
| 2533 | + * @param string $imo |
|
| 2534 | + * @param string $date_posted |
|
| 2535 | + * @param string $limit |
|
| 2536 | + * @param string $sort |
|
| 2537 | + * @param string $includegeodata |
|
| 2538 | + * @param string $origLat |
|
| 2539 | + * @param string $origLon |
|
| 2540 | + * @param string $dist |
|
| 2541 | + * @param string $captain_id |
|
| 2542 | + * @param string $captain_name |
|
| 2543 | + * @param string $race_id |
|
| 2544 | + * @param string $race_name |
|
| 2545 | + * @param array $filters |
|
| 2546 | + * @return array the tracker information |
|
| 2547 | + */ |
|
| 2548 | 2548 | public function searchMarineData($q = '', $callsign = '',$mmsi = '', $imo = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '',$captain_id = '',$captain_name = '',$race_id = '',$race_name = '',$filters = array()) |
| 2549 | 2549 | { |
| 2550 | 2550 | global $globalTimezone, $globalDBdriver; |
@@ -2720,12 +2720,12 @@ discard block |
||
| 2720 | 2720 | return $marine_array; |
| 2721 | 2721 | } |
| 2722 | 2722 | |
| 2723 | - /** |
|
| 2724 | - * Check marine by id |
|
| 2725 | - * |
|
| 2726 | - * @param $id |
|
| 2727 | - * @return String the ident |
|
| 2728 | - */ |
|
| 2723 | + /** |
|
| 2724 | + * Check marine by id |
|
| 2725 | + * |
|
| 2726 | + * @param $id |
|
| 2727 | + * @return String the ident |
|
| 2728 | + */ |
|
| 2729 | 2729 | public function checkId($id) |
| 2730 | 2730 | { |
| 2731 | 2731 | $query = 'SELECT marine_output.ident, marine_output.fammarine_id FROM marine_output WHERE marine_output.fammarine_id = :id'; |
@@ -2740,12 +2740,12 @@ discard block |
||
| 2740 | 2740 | return $ident_result; |
| 2741 | 2741 | } |
| 2742 | 2742 | |
| 2743 | - /** |
|
| 2744 | - * Gets all info from a race |
|
| 2745 | - * |
|
| 2746 | - * @param $race_name |
|
| 2747 | - * @return array race |
|
| 2748 | - */ |
|
| 2743 | + /** |
|
| 2744 | + * Gets all info from a race |
|
| 2745 | + * |
|
| 2746 | + * @param $race_name |
|
| 2747 | + * @return array race |
|
| 2748 | + */ |
|
| 2749 | 2749 | public function getRaceByName($race_name) |
| 2750 | 2750 | { |
| 2751 | 2751 | $race_name = filter_var($race_name,FILTER_SANITIZE_STRING); |
@@ -2757,12 +2757,12 @@ discard block |
||
| 2757 | 2757 | else return array(); |
| 2758 | 2758 | } |
| 2759 | 2759 | |
| 2760 | - /** |
|
| 2761 | - * Gets all info from a race |
|
| 2762 | - * |
|
| 2763 | - * @param $race_id |
|
| 2764 | - * @return array race |
|
| 2765 | - */ |
|
| 2760 | + /** |
|
| 2761 | + * Gets all info from a race |
|
| 2762 | + * |
|
| 2763 | + * @param $race_id |
|
| 2764 | + * @return array race |
|
| 2765 | + */ |
|
| 2766 | 2766 | public function getRace($race_id) |
| 2767 | 2767 | { |
| 2768 | 2768 | $race_id = filter_var($race_id,FILTER_SANITIZE_NUMBER_INT); |
@@ -2774,15 +2774,15 @@ discard block |
||
| 2774 | 2774 | else return array(); |
| 2775 | 2775 | } |
| 2776 | 2776 | |
| 2777 | - /** |
|
| 2778 | - * Add race |
|
| 2779 | - * @param $race_id |
|
| 2780 | - * @param $race_name |
|
| 2781 | - * @param $race_creator |
|
| 2782 | - * @param $race_desc |
|
| 2783 | - * @param $race_startdate |
|
| 2784 | - * @param $race_markers |
|
| 2785 | - */ |
|
| 2777 | + /** |
|
| 2778 | + * Add race |
|
| 2779 | + * @param $race_id |
|
| 2780 | + * @param $race_name |
|
| 2781 | + * @param $race_creator |
|
| 2782 | + * @param $race_desc |
|
| 2783 | + * @param $race_startdate |
|
| 2784 | + * @param $race_markers |
|
| 2785 | + */ |
|
| 2786 | 2786 | public function addRace($race_id,$race_name,$race_creator,$race_desc,$race_startdate,$race_markers) |
| 2787 | 2787 | { |
| 2788 | 2788 | $race_id = filter_var($race_id,FILTER_SANITIZE_NUMBER_INT); |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | require_once(dirname(__FILE__).'/class.Image.php'); |
| 10 | 10 | $global_marine_query = "SELECT marine_output.* FROM marine_output"; |
| 11 | 11 | |
| 12 | -class Marine{ |
|
| 12 | +class Marine { |
|
| 13 | 13 | public $db; |
| 14 | 14 | |
| 15 | 15 | public function __construct($dbc = null) { |
@@ -25,33 +25,33 @@ discard block |
||
| 25 | 25 | * @param bool $and |
| 26 | 26 | * @return string the SQL part |
| 27 | 27 | */ |
| 28 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 28 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 29 | 29 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 30 | 30 | $filters = array(); |
| 31 | 31 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 32 | 32 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 33 | 33 | $filters = $globalStatsFilters[$globalFilterName]; |
| 34 | 34 | } else { |
| 35 | - $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
|
| 35 | + $filter = array_merge($filter, $globalStatsFilters[$globalFilterName]); |
|
| 36 | 36 | } |
| 37 | 37 | } |
| 38 | 38 | if (isset($filter[0]['source'])) { |
| 39 | - $filters = array_merge($filters,$filter); |
|
| 39 | + $filters = array_merge($filters, $filter); |
|
| 40 | 40 | } |
| 41 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 41 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 42 | 42 | $filter_query_join = ''; |
| 43 | 43 | $filter_query_where = ''; |
| 44 | - foreach($filters as $flt) { |
|
| 44 | + foreach ($filters as $flt) { |
|
| 45 | 45 | if (isset($flt['idents']) && !empty($flt['idents'])) { |
| 46 | 46 | if (isset($flt['source'])) { |
| 47 | - $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','",$flt['idents'])."') AND marine_output.format_source IN ('".implode("','",$flt['source'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id"; |
|
| 47 | + $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','", $flt['idents'])."') AND marine_output.format_source IN ('".implode("','", $flt['source'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id"; |
|
| 48 | 48 | } else { |
| 49 | - $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','",$flt['idents'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id"; |
|
| 49 | + $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','", $flt['idents'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id"; |
|
| 50 | 50 | } |
| 51 | 51 | } |
| 52 | 52 | } |
| 53 | 53 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 54 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 54 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 55 | 55 | } |
| 56 | 56 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 57 | 57 | $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 90 | 90 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
| 91 | 91 | if ($filter_query_where != '') { |
| 92 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
| 92 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
| 93 | 93 | } |
| 94 | 94 | $filter_query = $filter_query_join.$filter_query_where; |
| 95 | 95 | return $filter_query; |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | * @param bool $schedules |
| 105 | 105 | * @return array the spotter information |
| 106 | 106 | */ |
| 107 | - public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false) |
|
| 107 | + public function getDataFromDB($query, $params = array(), $limitQuery = '', $schedules = false) |
|
| 108 | 108 | { |
| 109 | 109 | global $globalVM; |
| 110 | 110 | date_default_timezone_set('UTC'); |
@@ -125,13 +125,13 @@ discard block |
||
| 125 | 125 | $sth = $this->db->prepare($query.$limitQuery); |
| 126 | 126 | $sth->execute($params); |
| 127 | 127 | } catch (PDOException $e) { |
| 128 | - printf("Invalid query : %s\nWhole query: %s\n",$e->getMessage(), $query.$limitQuery); |
|
| 128 | + printf("Invalid query : %s\nWhole query: %s\n", $e->getMessage(), $query.$limitQuery); |
|
| 129 | 129 | exit(); |
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | $num_rows = 0; |
| 133 | 133 | $spotter_array = array(); |
| 134 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 134 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 135 | 135 | { |
| 136 | 136 | $num_rows++; |
| 137 | 137 | $temp_array = array(); |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | } |
| 151 | 151 | if (isset($row['fammarine_id'])) $temp_array['fammarine_id'] = $row['fammarine_id']; |
| 152 | 152 | if (isset($row['mmsi'])) $temp_array['mmsi'] = $row['mmsi']; |
| 153 | - if (isset($row['type'])) $temp_array['type'] = html_entity_decode($row['type'],ENT_QUOTES); |
|
| 153 | + if (isset($row['type'])) $temp_array['type'] = html_entity_decode($row['type'], ENT_QUOTES); |
|
| 154 | 154 | if (isset($row['type_id'])) $temp_array['type_id'] = $row['type_id']; |
| 155 | 155 | if (isset($row['status'])) $temp_array['status'] = $row['status']; |
| 156 | 156 | if (isset($row['status_id'])) $temp_array['status_id'] = $row['status_id']; |
@@ -173,10 +173,10 @@ discard block |
||
| 173 | 173 | } |
| 174 | 174 | if (isset($row['ground_speed'])) $temp_array['ground_speed'] = $row['ground_speed']; |
| 175 | 175 | |
| 176 | - if(isset($temp_array['mmsi']) && $temp_array['mmsi'] != "") |
|
| 176 | + if (isset($temp_array['mmsi']) && $temp_array['mmsi'] != "") |
|
| 177 | 177 | { |
| 178 | 178 | $Image = new Image($this->db); |
| 179 | - if (isset($temp_array['ident']) && $temp_array['ident'] != '') $image_array = $Image->getMarineImage($temp_array['mmsi'],'',$temp_array['ident']); |
|
| 179 | + if (isset($temp_array['ident']) && $temp_array['ident'] != '') $image_array = $Image->getMarineImage($temp_array['mmsi'], '', $temp_array['ident']); |
|
| 180 | 180 | else $image_array = $Image->getMarineImage($temp_array['mmsi']); |
| 181 | 181 | unset($Image); |
| 182 | 182 | if (count($image_array) > 0) { |
@@ -186,10 +186,10 @@ discard block |
||
| 186 | 186 | $temp_array['image_source_website'] = $image_array[0]['image_source_website']; |
| 187 | 187 | $temp_array['image_copyright'] = $image_array[0]['image_copyright']; |
| 188 | 188 | } |
| 189 | - } elseif(isset($temp_array['type']) && $temp_array['type'] != "") |
|
| 189 | + } elseif (isset($temp_array['type']) && $temp_array['type'] != "") |
|
| 190 | 190 | { |
| 191 | 191 | $Image = new Image($this->db); |
| 192 | - $image_array = $Image->getMarineImage('','','',$temp_array['type']); |
|
| 192 | + $image_array = $Image->getMarineImage('', '', '', $temp_array['type']); |
|
| 193 | 193 | unset($Image); |
| 194 | 194 | if (count($image_array) > 0) { |
| 195 | 195 | $temp_array['image'] = $image_array[0]['image']; |
@@ -224,17 +224,17 @@ discard block |
||
| 224 | 224 | { |
| 225 | 225 | $temp_array['date'] = "about ".$dateArray['hours']." hours ago"; |
| 226 | 226 | } else { |
| 227 | - $temp_array['date'] = date("M j Y, g:i a",strtotime($row['date']." UTC")); |
|
| 227 | + $temp_array['date'] = date("M j Y, g:i a", strtotime($row['date']." UTC")); |
|
| 228 | 228 | } |
| 229 | 229 | $temp_array['date_minutes_past'] = $dateArray['minutes']; |
| 230 | - $temp_array['date_iso_8601'] = date("c",strtotime($row['date']." UTC")); |
|
| 231 | - $temp_array['date_rfc_2822'] = date("r",strtotime($row['date']." UTC")); |
|
| 230 | + $temp_array['date_iso_8601'] = date("c", strtotime($row['date']." UTC")); |
|
| 231 | + $temp_array['date_rfc_2822'] = date("r", strtotime($row['date']." UTC")); |
|
| 232 | 232 | $temp_array['date_unix'] = strtotime($row['date']." UTC"); |
| 233 | 233 | if (isset($row['last_seen']) && $row['last_seen'] != '') { |
| 234 | 234 | if (strtotime($row['last_seen']) > strtotime($row['date'])) { |
| 235 | 235 | $temp_array['duration'] = strtotime($row['last_seen']) - strtotime($row['date']); |
| 236 | - $temp_array['last_seen_date_iso_8601'] = date("c",strtotime($row['last_seen']." UTC")); |
|
| 237 | - $temp_array['last_seen_date_rfc_2822'] = date("r",strtotime($row['last_seen']." UTC")); |
|
| 236 | + $temp_array['last_seen_date_iso_8601'] = date("c", strtotime($row['last_seen']." UTC")); |
|
| 237 | + $temp_array['last_seen_date_rfc_2822'] = date("r", strtotime($row['last_seen']." UTC")); |
|
| 238 | 238 | $temp_array['last_seen_date_unix'] = strtotime($row['last_seen']." UTC"); |
| 239 | 239 | } |
| 240 | 240 | } |
@@ -269,8 +269,8 @@ discard block |
||
| 269 | 269 | if ($limit != "") |
| 270 | 270 | { |
| 271 | 271 | $limit_array = explode(",", $limit); |
| 272 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 273 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 272 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 273 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 274 | 274 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 275 | 275 | { |
| 276 | 276 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
@@ -284,8 +284,8 @@ discard block |
||
| 284 | 284 | } else { |
| 285 | 285 | $orderby_query = " ORDER BY marine_output.date DESC"; |
| 286 | 286 | } |
| 287 | - $query = $global_marine_query.$filter_query." ".$orderby_query; |
|
| 288 | - $spotter_array = $this->getDataFromDB($query, array(),$limit_query,true); |
|
| 287 | + $query = $global_marine_query.$filter_query." ".$orderby_query; |
|
| 288 | + $spotter_array = $this->getDataFromDB($query, array(), $limit_query, true); |
|
| 289 | 289 | return $spotter_array; |
| 290 | 290 | } |
| 291 | 291 | |
@@ -303,8 +303,8 @@ discard block |
||
| 303 | 303 | if ($id == '') return array(); |
| 304 | 304 | $additional_query = "marine_output.fammarine_id = :id"; |
| 305 | 305 | $query_values = array(':id' => $id); |
| 306 | - $query = $global_marine_query." WHERE ".$additional_query." "; |
|
| 307 | - $spotter_array = $this->getDataFromDB($query,$query_values); |
|
| 306 | + $query = $global_marine_query." WHERE ".$additional_query." "; |
|
| 307 | + $spotter_array = $this->getDataFromDB($query, $query_values); |
|
| 308 | 308 | return $spotter_array; |
| 309 | 309 | } |
| 310 | 310 | |
@@ -326,7 +326,7 @@ discard block |
||
| 326 | 326 | $query_values = array(); |
| 327 | 327 | $limit_query = ''; |
| 328 | 328 | $additional_query = ''; |
| 329 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 329 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 330 | 330 | if ($ident != "") |
| 331 | 331 | { |
| 332 | 332 | if (!is_string($ident)) |
@@ -342,8 +342,8 @@ discard block |
||
| 342 | 342 | { |
| 343 | 343 | $limit_array = explode(",", $limit); |
| 344 | 344 | |
| 345 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 346 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 345 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 346 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 347 | 347 | |
| 348 | 348 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 349 | 349 | { |
@@ -383,7 +383,7 @@ discard block |
||
| 383 | 383 | date_default_timezone_set('UTC'); |
| 384 | 384 | |
| 385 | 385 | $limit_query = ''; |
| 386 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 386 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 387 | 387 | if (!is_string($type)) |
| 388 | 388 | { |
| 389 | 389 | return array(); |
@@ -396,8 +396,8 @@ discard block |
||
| 396 | 396 | { |
| 397 | 397 | $limit_array = explode(",", $limit); |
| 398 | 398 | |
| 399 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 400 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 399 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 400 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 401 | 401 | |
| 402 | 402 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 403 | 403 | { |
@@ -436,7 +436,7 @@ discard block |
||
| 436 | 436 | $limit_query = ''; |
| 437 | 437 | $additional_query = ''; |
| 438 | 438 | |
| 439 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 439 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 440 | 440 | |
| 441 | 441 | if ($date != "") |
| 442 | 442 | { |
@@ -462,8 +462,8 @@ discard block |
||
| 462 | 462 | { |
| 463 | 463 | $limit_array = explode(",", $limit); |
| 464 | 464 | |
| 465 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 466 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 465 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 466 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 467 | 467 | |
| 468 | 468 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 469 | 469 | { |
@@ -501,8 +501,8 @@ discard block |
||
| 501 | 501 | $query_values = array(); |
| 502 | 502 | $limit_query = ''; |
| 503 | 503 | $additional_query = ''; |
| 504 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 505 | - $captain = filter_var($captain,FILTER_SANITIZE_STRING); |
|
| 504 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 505 | + $captain = filter_var($captain, FILTER_SANITIZE_STRING); |
|
| 506 | 506 | if ($captain != "") |
| 507 | 507 | { |
| 508 | 508 | $additional_query = " AND (marine_output.captain_name = :captain OR marine_output.captain_id = :captain)"; |
@@ -511,8 +511,8 @@ discard block |
||
| 511 | 511 | if ($limit != "") |
| 512 | 512 | { |
| 513 | 513 | $limit_array = explode(",", $limit); |
| 514 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 515 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 514 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 515 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 516 | 516 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 517 | 517 | { |
| 518 | 518 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
@@ -542,13 +542,13 @@ discard block |
||
| 542 | 542 | */ |
| 543 | 543 | public function getMarineDataByRace($race = '', $limit = '', $sort = '', $filter = array()) |
| 544 | 544 | { |
| 545 | - global $global_marine_query,$globalDBdriver; |
|
| 545 | + global $global_marine_query, $globalDBdriver; |
|
| 546 | 546 | date_default_timezone_set('UTC'); |
| 547 | 547 | $query_values = array(); |
| 548 | 548 | $limit_query = ''; |
| 549 | 549 | $additional_query = ''; |
| 550 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 551 | - $race = filter_var($race,FILTER_SANITIZE_STRING); |
|
| 550 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 551 | + $race = filter_var($race, FILTER_SANITIZE_STRING); |
|
| 552 | 552 | if ($race != "") |
| 553 | 553 | { |
| 554 | 554 | $additional_query = " AND (marine_output.race_name = :race OR marine_output.race_id = :race)"; |
@@ -557,8 +557,8 @@ discard block |
||
| 557 | 557 | if ($limit != "") |
| 558 | 558 | { |
| 559 | 559 | $limit_array = explode(",", $limit); |
| 560 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 561 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 560 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 561 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 562 | 562 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 563 | 563 | { |
| 564 | 564 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
@@ -588,14 +588,14 @@ discard block |
||
| 588 | 588 | * @param array $filters |
| 589 | 589 | * @return Integer number of race for a captain |
| 590 | 590 | */ |
| 591 | - public function countRacesByCaptain($captain,$filters = array()) |
|
| 591 | + public function countRacesByCaptain($captain, $filters = array()) |
|
| 592 | 592 | { |
| 593 | - $captain = filter_var($captain,FILTER_SANITIZE_STRING); |
|
| 594 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 595 | - $query = "SELECT COUNT(*) AS nb |
|
| 593 | + $captain = filter_var($captain, FILTER_SANITIZE_STRING); |
|
| 594 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 595 | + $query = "SELECT COUNT(*) AS nb |
|
| 596 | 596 | FROM marine_output".$filter_query." (marine_output.captain_name = :captain OR marine_output.captain_id = :captain)"; |
| 597 | 597 | $query_values = array(); |
| 598 | - $query_values = array_merge($query_values,array(':captain' => $captain)); |
|
| 598 | + $query_values = array_merge($query_values, array(':captain' => $captain)); |
|
| 599 | 599 | $sth = $this->db->prepare($query); |
| 600 | 600 | $sth->execute($query_values); |
| 601 | 601 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -609,14 +609,14 @@ discard block |
||
| 609 | 609 | * @param array $filters |
| 610 | 610 | * @return String Duration of all races |
| 611 | 611 | */ |
| 612 | - public function countCaptainsByRace($race,$filters = array()) |
|
| 612 | + public function countCaptainsByRace($race, $filters = array()) |
|
| 613 | 613 | { |
| 614 | - $race = filter_var($race,FILTER_SANITIZE_STRING); |
|
| 615 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 616 | - $query = "SELECT COUNT(*) AS nb |
|
| 614 | + $race = filter_var($race, FILTER_SANITIZE_STRING); |
|
| 615 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 616 | + $query = "SELECT COUNT(*) AS nb |
|
| 617 | 617 | FROM marine_output".$filter_query." (marine_output.race_name = :race OR marine_output.race_id = :race)"; |
| 618 | 618 | $query_values = array(); |
| 619 | - $query_values = array_merge($query_values,array(':race' => $race)); |
|
| 619 | + $query_values = array_merge($query_values, array(':race' => $race)); |
|
| 620 | 620 | $sth = $this->db->prepare($query); |
| 621 | 621 | $sth->execute($query_values); |
| 622 | 622 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -633,44 +633,44 @@ discard block |
||
| 633 | 633 | * @param string $day |
| 634 | 634 | * @return array the boat list |
| 635 | 635 | */ |
| 636 | - public function countAllBoatTypesByCaptain($captain,$filters = array(),$year = '',$month = '',$day = '') |
|
| 636 | + public function countAllBoatTypesByCaptain($captain, $filters = array(), $year = '', $month = '', $day = '') |
|
| 637 | 637 | { |
| 638 | 638 | global $globalDBdriver; |
| 639 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 640 | - $captain = filter_var($captain,FILTER_SANITIZE_STRING); |
|
| 641 | - $query = "SELECT DISTINCT marine_output.type, COUNT(marine_output.type) AS type_count |
|
| 639 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 640 | + $captain = filter_var($captain, FILTER_SANITIZE_STRING); |
|
| 641 | + $query = "SELECT DISTINCT marine_output.type, COUNT(marine_output.type) AS type_count |
|
| 642 | 642 | FROM marine_output".$filter_query." (marine_output.captain_id = :captain OR marine_output.captain_name = :captain)"; |
| 643 | 643 | $query_values = array(); |
| 644 | 644 | if ($year != '') { |
| 645 | 645 | if ($globalDBdriver == 'mysql') { |
| 646 | 646 | $query .= " AND YEAR(marine_output.date) = :year"; |
| 647 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 647 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 648 | 648 | } else { |
| 649 | 649 | $query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year"; |
| 650 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 650 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 651 | 651 | } |
| 652 | 652 | } |
| 653 | 653 | if ($month != '') { |
| 654 | 654 | if ($globalDBdriver == 'mysql') { |
| 655 | 655 | $query .= " AND MONTH(marine_output.date) = :month"; |
| 656 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 656 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 657 | 657 | } else { |
| 658 | 658 | $query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month"; |
| 659 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 659 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 660 | 660 | } |
| 661 | 661 | } |
| 662 | 662 | if ($day != '') { |
| 663 | 663 | if ($globalDBdriver == 'mysql') { |
| 664 | 664 | $query .= " AND DAY(marine_output.date) = :day"; |
| 665 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 665 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 666 | 666 | } else { |
| 667 | 667 | $query .= " AND EXTRACT(DAY FROM marine_output.date) = :day"; |
| 668 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 668 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 669 | 669 | } |
| 670 | 670 | } |
| 671 | 671 | $query .= " GROUP BY marine_output.type |
| 672 | 672 | ORDER BY type_count DESC"; |
| 673 | - $query_values = array_merge($query_values,array(':captain' => $captain)); |
|
| 673 | + $query_values = array_merge($query_values, array(':captain' => $captain)); |
|
| 674 | 674 | $sth = $this->db->prepare($query); |
| 675 | 675 | $sth->execute($query_values); |
| 676 | 676 | return $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -686,44 +686,44 @@ discard block |
||
| 686 | 686 | * @param string $day |
| 687 | 687 | * @return array the boat list |
| 688 | 688 | */ |
| 689 | - public function countAllBoatTypesByRace($race,$filters = array(),$year = '',$month = '',$day = '') |
|
| 689 | + public function countAllBoatTypesByRace($race, $filters = array(), $year = '', $month = '', $day = '') |
|
| 690 | 690 | { |
| 691 | 691 | global $globalDBdriver; |
| 692 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 693 | - $race = filter_var($race,FILTER_SANITIZE_STRING); |
|
| 694 | - $query = "SELECT DISTINCT marine_output.type, COUNT(marine_output.type) AS type_count |
|
| 692 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 693 | + $race = filter_var($race, FILTER_SANITIZE_STRING); |
|
| 694 | + $query = "SELECT DISTINCT marine_output.type, COUNT(marine_output.type) AS type_count |
|
| 695 | 695 | FROM marine_output".$filter_query." (marine_output.race_id = :race OR marine_output.race_name = :race)"; |
| 696 | 696 | $query_values = array(); |
| 697 | 697 | if ($year != '') { |
| 698 | 698 | if ($globalDBdriver == 'mysql') { |
| 699 | 699 | $query .= " AND YEAR(marine_output.date) = :year"; |
| 700 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 700 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 701 | 701 | } else { |
| 702 | 702 | $query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year"; |
| 703 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 703 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 704 | 704 | } |
| 705 | 705 | } |
| 706 | 706 | if ($month != '') { |
| 707 | 707 | if ($globalDBdriver == 'mysql') { |
| 708 | 708 | $query .= " AND MONTH(marine_output.date) = :month"; |
| 709 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 709 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 710 | 710 | } else { |
| 711 | 711 | $query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month"; |
| 712 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 712 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 713 | 713 | } |
| 714 | 714 | } |
| 715 | 715 | if ($day != '') { |
| 716 | 716 | if ($globalDBdriver == 'mysql') { |
| 717 | 717 | $query .= " AND DAY(marine_output.date) = :day"; |
| 718 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 718 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 719 | 719 | } else { |
| 720 | 720 | $query .= " AND EXTRACT(DAY FROM marine_output.date) = :day"; |
| 721 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 721 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 722 | 722 | } |
| 723 | 723 | } |
| 724 | 724 | $query .= " GROUP BY marine_output.type |
| 725 | 725 | ORDER BY type_count DESC"; |
| 726 | - $query_values = array_merge($query_values,array(':race' => $race)); |
|
| 726 | + $query_values = array_merge($query_values, array(':race' => $race)); |
|
| 727 | 727 | $sth = $this->db->prepare($query); |
| 728 | 728 | $sth->execute($query_values); |
| 729 | 729 | return $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -739,47 +739,47 @@ discard block |
||
| 739 | 739 | * @param string $day |
| 740 | 740 | * @return String Duration of all race |
| 741 | 741 | */ |
| 742 | - public function getRaceDurationByCaptain($captain,$filters = array(),$year = '',$month = '',$day = '') |
|
| 742 | + public function getRaceDurationByCaptain($captain, $filters = array(), $year = '', $month = '', $day = '') |
|
| 743 | 743 | { |
| 744 | 744 | global $globalDBdriver; |
| 745 | - $captain = filter_var($captain,FILTER_SANITIZE_STRING); |
|
| 746 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 747 | - $query = "SELECT SUM(last_seen - date) AS duration |
|
| 745 | + $captain = filter_var($captain, FILTER_SANITIZE_STRING); |
|
| 746 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 747 | + $query = "SELECT SUM(last_seen - date) AS duration |
|
| 748 | 748 | FROM marine_output".$filter_query." (marine_output.captain_name = :captain OR marine_output.captain_id = :captain) |
| 749 | 749 | AND last_seen > date"; |
| 750 | 750 | $query_values = array(); |
| 751 | 751 | if ($year != '') { |
| 752 | 752 | if ($globalDBdriver == 'mysql') { |
| 753 | 753 | $query .= " AND YEAR(marine_output.date) = :year"; |
| 754 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 754 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 755 | 755 | } else { |
| 756 | 756 | $query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year"; |
| 757 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 757 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 758 | 758 | } |
| 759 | 759 | } |
| 760 | 760 | if ($month != '') { |
| 761 | 761 | if ($globalDBdriver == 'mysql') { |
| 762 | 762 | $query .= " AND MONTH(marine_output.date) = :month"; |
| 763 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 763 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 764 | 764 | } else { |
| 765 | 765 | $query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month"; |
| 766 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 766 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 767 | 767 | } |
| 768 | 768 | } |
| 769 | 769 | if ($day != '') { |
| 770 | 770 | if ($globalDBdriver == 'mysql') { |
| 771 | 771 | $query .= " AND DAY(marine_output.date) = :day"; |
| 772 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 772 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 773 | 773 | } else { |
| 774 | 774 | $query .= " AND EXTRACT(DAY FROM marine_output.date) = :day"; |
| 775 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 775 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 776 | 776 | } |
| 777 | 777 | } |
| 778 | - $query_values = array_merge($query_values,array(':captain' => $captain)); |
|
| 778 | + $query_values = array_merge($query_values, array(':captain' => $captain)); |
|
| 779 | 779 | $sth = $this->db->prepare($query); |
| 780 | 780 | $sth->execute($query_values); |
| 781 | 781 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 782 | - if (is_int($result[0]['duration'])) return gmdate('H:i:s',$result[0]['duration']); |
|
| 782 | + if (is_int($result[0]['duration'])) return gmdate('H:i:s', $result[0]['duration']); |
|
| 783 | 783 | else return $result[0]['duration']; |
| 784 | 784 | } |
| 785 | 785 | |
@@ -793,38 +793,38 @@ discard block |
||
| 793 | 793 | * @param string $day |
| 794 | 794 | * @return array Duration of all race |
| 795 | 795 | */ |
| 796 | - public function getRaceDurationByCaptains($limit = true,$filters = array(),$year = '',$month = '',$day = '') |
|
| 796 | + public function getRaceDurationByCaptains($limit = true, $filters = array(), $year = '', $month = '', $day = '') |
|
| 797 | 797 | { |
| 798 | 798 | global $globalDBdriver; |
| 799 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 800 | - $query = "SELECT SUM(last_seen - date) AS duration, captain_id, captain_name |
|
| 799 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 800 | + $query = "SELECT SUM(last_seen - date) AS duration, captain_id, captain_name |
|
| 801 | 801 | FROM marine_output".$filter_query." last_seen > date"; |
| 802 | 802 | $query_values = array(); |
| 803 | 803 | if ($year != '') { |
| 804 | 804 | if ($globalDBdriver == 'mysql') { |
| 805 | 805 | $query .= " AND YEAR(marine_output.date) = :year"; |
| 806 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 806 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 807 | 807 | } else { |
| 808 | 808 | $query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year"; |
| 809 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 809 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 810 | 810 | } |
| 811 | 811 | } |
| 812 | 812 | if ($month != '') { |
| 813 | 813 | if ($globalDBdriver == 'mysql') { |
| 814 | 814 | $query .= " AND MONTH(marine_output.date) = :month"; |
| 815 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 815 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 816 | 816 | } else { |
| 817 | 817 | $query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month"; |
| 818 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 818 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 819 | 819 | } |
| 820 | 820 | } |
| 821 | 821 | if ($day != '') { |
| 822 | 822 | if ($globalDBdriver == 'mysql') { |
| 823 | 823 | $query .= " AND DAY(marine_output.date) = :day"; |
| 824 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 824 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 825 | 825 | } else { |
| 826 | 826 | $query .= " AND EXTRACT(DAY FROM marine_output.date) = :day"; |
| 827 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 827 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 828 | 828 | } |
| 829 | 829 | } |
| 830 | 830 | $query .= " GROUP BY marine_output.captain_id,marine_output.captain_name ORDER BY duration DESC"; |
@@ -836,7 +836,7 @@ discard block |
||
| 836 | 836 | $duration_array = array(); |
| 837 | 837 | $temp_array = array(); |
| 838 | 838 | |
| 839 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 839 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 840 | 840 | { |
| 841 | 841 | if ($row['duration'] != '') { |
| 842 | 842 | $temp_array['marine_duration_days'] = $row['duration']; |
@@ -858,8 +858,8 @@ discard block |
||
| 858 | 858 | */ |
| 859 | 859 | public function getAllCaptainNames($filters = array()) |
| 860 | 860 | { |
| 861 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 862 | - $query = "SELECT DISTINCT marine_output.captain_name, marine_output.captain_id |
|
| 861 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 862 | + $query = "SELECT DISTINCT marine_output.captain_name, marine_output.captain_id |
|
| 863 | 863 | FROM marine_output".$filter_query." marine_output.captain_name <> '' |
| 864 | 864 | ORDER BY marine_output.captain_name ASC"; |
| 865 | 865 | |
@@ -876,8 +876,8 @@ discard block |
||
| 876 | 876 | */ |
| 877 | 877 | public function getAllRaceNames($filters = array()) |
| 878 | 878 | { |
| 879 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 880 | - $query = "SELECT DISTINCT marine_output.race_name, marine_output.race_id |
|
| 879 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 880 | + $query = "SELECT DISTINCT marine_output.race_name, marine_output.race_id |
|
| 881 | 881 | FROM marine_output".$filter_query." marine_output.race_name <> '' |
| 882 | 882 | ORDER BY marine_output.race_name ASC"; |
| 883 | 883 | |
@@ -894,11 +894,11 @@ discard block |
||
| 894 | 894 | * @param array $filters |
| 895 | 895 | * @return array list of source name |
| 896 | 896 | */ |
| 897 | - public function getAllSourceName($type = '',$filters = array()) |
|
| 897 | + public function getAllSourceName($type = '', $filters = array()) |
|
| 898 | 898 | { |
| 899 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 899 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 900 | 900 | $query_values = array(); |
| 901 | - $query = "SELECT DISTINCT marine_output.source_name |
|
| 901 | + $query = "SELECT DISTINCT marine_output.source_name |
|
| 902 | 902 | FROM marine_output".$filter_query." marine_output.source_name <> ''"; |
| 903 | 903 | if ($type != '') { |
| 904 | 904 | $query_values = array(':type' => $type); |
@@ -913,7 +913,7 @@ discard block |
||
| 913 | 913 | $source_array = array(); |
| 914 | 914 | $temp_array = array(); |
| 915 | 915 | |
| 916 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 916 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 917 | 917 | { |
| 918 | 918 | $temp_array['source_name'] = $row['source_name']; |
| 919 | 919 | $source_array[] = $temp_array; |
@@ -930,8 +930,8 @@ discard block |
||
| 930 | 930 | */ |
| 931 | 931 | public function getAllIdents($filters = array()) |
| 932 | 932 | { |
| 933 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 934 | - $query = "SELECT DISTINCT marine_output.ident |
|
| 933 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 934 | + $query = "SELECT DISTINCT marine_output.ident |
|
| 935 | 935 | FROM marine_output".$filter_query." marine_output.ident <> '' |
| 936 | 936 | ORDER BY marine_output.date ASC LIMIT 700 OFFSET 0"; |
| 937 | 937 | |
@@ -941,7 +941,7 @@ discard block |
||
| 941 | 941 | $ident_array = array(); |
| 942 | 942 | $temp_array = array(); |
| 943 | 943 | |
| 944 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 944 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 945 | 945 | { |
| 946 | 946 | $temp_array['ident'] = $row['ident']; |
| 947 | 947 | $ident_array[] = $temp_array; |
@@ -958,7 +958,7 @@ discard block |
||
| 958 | 958 | */ |
| 959 | 959 | public function getIdentity($mmsi) |
| 960 | 960 | { |
| 961 | - $mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT); |
|
| 961 | + $mmsi = filter_var($mmsi, FILTER_SANITIZE_NUMBER_INT); |
|
| 962 | 962 | $query = "SELECT * FROM marine_identity WHERE mmsi = :mmsi LIMIT 1"; |
| 963 | 963 | $sth = $this->db->prepare($query); |
| 964 | 964 | $sth->execute(array(':mmsi' => $mmsi)); |
@@ -975,23 +975,23 @@ discard block |
||
| 975 | 975 | * @param $callsign |
| 976 | 976 | * @param $type |
| 977 | 977 | */ |
| 978 | - public function addIdentity($mmsi,$imo,$ident,$callsign,$type) |
|
| 978 | + public function addIdentity($mmsi, $imo, $ident, $callsign, $type) |
|
| 979 | 979 | { |
| 980 | - $mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT); |
|
| 980 | + $mmsi = filter_var($mmsi, FILTER_SANITIZE_NUMBER_INT); |
|
| 981 | 981 | if ($mmsi != '') { |
| 982 | - $imo = filter_var($imo,FILTER_SANITIZE_NUMBER_INT); |
|
| 983 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 984 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 985 | - $type = filter_var($type,FILTER_SANITIZE_STRING); |
|
| 982 | + $imo = filter_var($imo, FILTER_SANITIZE_NUMBER_INT); |
|
| 983 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 984 | + $callsign = filter_var($callsign, FILTER_SANITIZE_STRING); |
|
| 985 | + $type = filter_var($type, FILTER_SANITIZE_STRING); |
|
| 986 | 986 | $identinfo = $this->getIdentity($mmsi); |
| 987 | 987 | if (empty($identinfo)) { |
| 988 | - $query = "INSERT INTO marine_identity (mmsi,imo,call_sign,ship_name,type) VALUES (:mmsi,:imo,:call_sign,:ship_name,:type)"; |
|
| 988 | + $query = "INSERT INTO marine_identity (mmsi,imo,call_sign,ship_name,type) VALUES (:mmsi,:imo,:call_sign,:ship_name,:type)"; |
|
| 989 | 989 | $sth = $this->db->prepare($query); |
| 990 | - $sth->execute(array(':mmsi' => $mmsi,':imo' => $imo,':call_sign' => $callsign,':ship_name' => $ident,':type' => $type)); |
|
| 990 | + $sth->execute(array(':mmsi' => $mmsi, ':imo' => $imo, ':call_sign' => $callsign, ':ship_name' => $ident, ':type' => $type)); |
|
| 991 | 991 | } elseif ($ident != '' && $identinfo['ship_name'] != $ident) { |
| 992 | - $query = "UPDATE marine_identity SET ship_name = :ship_name,type = :type WHERE mmsi = :mmsi"; |
|
| 992 | + $query = "UPDATE marine_identity SET ship_name = :ship_name,type = :type WHERE mmsi = :mmsi"; |
|
| 993 | 993 | $sth = $this->db->prepare($query); |
| 994 | - $sth->execute(array(':mmsi' => $mmsi,':ship_name' => $ident,':type' => $type)); |
|
| 994 | + $sth->execute(array(':mmsi' => $mmsi, ':ship_name' => $ident, ':type' => $type)); |
|
| 995 | 995 | } |
| 996 | 996 | } |
| 997 | 997 | } |
@@ -1012,12 +1012,12 @@ discard block |
||
| 1012 | 1012 | } else $offset = '+00:00'; |
| 1013 | 1013 | |
| 1014 | 1014 | if ($globalDBdriver == 'mysql') { |
| 1015 | - $query = "SELECT DISTINCT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) as date |
|
| 1015 | + $query = "SELECT DISTINCT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) as date |
|
| 1016 | 1016 | FROM marine_output |
| 1017 | 1017 | WHERE marine_output.date <> '' |
| 1018 | 1018 | ORDER BY marine_output.date ASC LIMIT 0,100"; |
| 1019 | 1019 | } else { |
| 1020 | - $query = "SELECT DISTINCT to_char(marine_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date |
|
| 1020 | + $query = "SELECT DISTINCT to_char(marine_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date |
|
| 1021 | 1021 | FROM marine_output |
| 1022 | 1022 | WHERE marine_output.date <> '' |
| 1023 | 1023 | ORDER BY marine_output.date ASC LIMIT 0,100"; |
@@ -1029,7 +1029,7 @@ discard block |
||
| 1029 | 1029 | $date_array = array(); |
| 1030 | 1030 | $temp_array = array(); |
| 1031 | 1031 | |
| 1032 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1032 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1033 | 1033 | { |
| 1034 | 1034 | $temp_array['date'] = $row['date']; |
| 1035 | 1035 | |
@@ -1047,10 +1047,10 @@ discard block |
||
| 1047 | 1047 | * @return String success or false |
| 1048 | 1048 | * |
| 1049 | 1049 | */ |
| 1050 | - public function updateIdentMarineData($fammarine_id = '', $ident = '',$fromsource = NULL) |
|
| 1050 | + public function updateIdentMarineData($fammarine_id = '', $ident = '', $fromsource = NULL) |
|
| 1051 | 1051 | { |
| 1052 | 1052 | $query = 'UPDATE marine_output SET ident = :ident WHERE fammarine_id = :fammarine_id'; |
| 1053 | - $query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident); |
|
| 1053 | + $query_values = array(':fammarine_id' => $fammarine_id, ':ident' => $ident); |
|
| 1054 | 1054 | try { |
| 1055 | 1055 | $sth = $this->db->prepare($query); |
| 1056 | 1056 | $sth->execute($query_values); |
@@ -1068,10 +1068,10 @@ discard block |
||
| 1068 | 1068 | * @return String success or false |
| 1069 | 1069 | * |
| 1070 | 1070 | */ |
| 1071 | - public function updateArrivalPortNameMarineData($fammarine_id = '', $arrival_code = '',$fromsource = NULL) |
|
| 1071 | + public function updateArrivalPortNameMarineData($fammarine_id = '', $arrival_code = '', $fromsource = NULL) |
|
| 1072 | 1072 | { |
| 1073 | 1073 | $query = 'UPDATE marine_output SET arrival_port_name = :arrival_code WHERE fammarine_id = :fammarine_id'; |
| 1074 | - $query_values = array(':fammarine_id' => $fammarine_id,':arrival_code' => $arrival_code); |
|
| 1074 | + $query_values = array(':fammarine_id' => $fammarine_id, ':arrival_code' => $arrival_code); |
|
| 1075 | 1075 | try { |
| 1076 | 1076 | $sth = $this->db->prepare($query); |
| 1077 | 1077 | $sth->execute($query_values); |
@@ -1090,11 +1090,11 @@ discard block |
||
| 1090 | 1090 | * @return String success or false |
| 1091 | 1091 | * |
| 1092 | 1092 | */ |
| 1093 | - public function updateStatusMarineData($fammarine_id = '', $status_id = '',$status = '') |
|
| 1093 | + public function updateStatusMarineData($fammarine_id = '', $status_id = '', $status = '') |
|
| 1094 | 1094 | { |
| 1095 | 1095 | |
| 1096 | 1096 | $query = 'UPDATE marine_output SET status = :status, status_id = :status_id WHERE fammarine_id = :fammarine_id'; |
| 1097 | - $query_values = array(':fammarine_id' => $fammarine_id,':status' => $status,':status_id' => $status_id); |
|
| 1097 | + $query_values = array(':fammarine_id' => $fammarine_id, ':status' => $status, ':status_id' => $status_id); |
|
| 1098 | 1098 | |
| 1099 | 1099 | try { |
| 1100 | 1100 | $sth = $this->db->prepare($query); |
@@ -1123,17 +1123,17 @@ discard block |
||
| 1123 | 1123 | * @param string $race_begin |
| 1124 | 1124 | * @return String success or false |
| 1125 | 1125 | */ |
| 1126 | - public function updateLatestMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $groundspeed = NULL, $date = '',$distance = NULL,$race_rank = NULL, $race_time = NULL, $status = '', $race_begin = '') |
|
| 1126 | + public function updateLatestMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $groundspeed = NULL, $date = '', $distance = NULL, $race_rank = NULL, $race_time = NULL, $status = '', $race_begin = '') |
|
| 1127 | 1127 | { |
| 1128 | 1128 | if ($latitude == '') $latitude = NULL; |
| 1129 | 1129 | if ($longitude == '') $longitude = NULL; |
| 1130 | 1130 | $groundspeed = round($groundspeed); |
| 1131 | 1131 | if ($race_begin != '') { |
| 1132 | 1132 | $query = 'UPDATE marine_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_seen = :last_seen, last_ground_speed = :last_ground_speed, distance = :distance, race_rank = :race_rank, race_time = :race_time, status = :status, date = :race_begin WHERE fammarine_id = :fammarine_id'; |
| 1133 | - $query_values = array(':fammarine_id' => $fammarine_id,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident,':distance' => $distance,':race_rank' => $race_rank,':race_time' => $race_time,':status' => $status,':race_begin' => $race_begin); |
|
| 1133 | + $query_values = array(':fammarine_id' => $fammarine_id, ':last_latitude' => $latitude, ':last_longitude' => $longitude, ':last_ground_speed' => $groundspeed, ':last_seen' => $date, ':ident' => $ident, ':distance' => $distance, ':race_rank' => $race_rank, ':race_time' => $race_time, ':status' => $status, ':race_begin' => $race_begin); |
|
| 1134 | 1134 | } else { |
| 1135 | 1135 | $query = 'UPDATE marine_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_seen = :last_seen, last_ground_speed = :last_ground_speed, distance = :distance, race_rank = :race_rank, race_time = :race_time, status = :status WHERE fammarine_id = :fammarine_id'; |
| 1136 | - $query_values = array(':fammarine_id' => $fammarine_id,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident,':distance' => $distance,':race_rank' => $race_rank,':race_time' => $race_time,':status' => $status); |
|
| 1136 | + $query_values = array(':fammarine_id' => $fammarine_id, ':last_latitude' => $latitude, ':last_longitude' => $longitude, ':last_ground_speed' => $groundspeed, ':last_seen' => $date, ':ident' => $ident, ':distance' => $distance, ':race_rank' => $race_rank, ':race_time' => $race_time, ':status' => $status); |
|
| 1137 | 1137 | } |
| 1138 | 1138 | try { |
| 1139 | 1139 | $sth = $this->db->prepare($query); |
@@ -1177,7 +1177,7 @@ discard block |
||
| 1177 | 1177 | * @param string $race_time |
| 1178 | 1178 | * @return String success or false |
| 1179 | 1179 | */ |
| 1180 | - public function addMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $mmsi = '',$type = '',$typeid = '',$imo = '',$callsign = '',$arrival_code = '',$arrival_date = '',$status = '',$statusid = '',$format_source = '', $source_name = '', $captain_id = '',$captain_name = '',$race_id = '', $race_name = '', $distance = '',$race_rank = '', $race_time = '') |
|
| 1180 | + public function addMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $mmsi = '', $type = '', $typeid = '', $imo = '', $callsign = '', $arrival_code = '', $arrival_date = '', $status = '', $statusid = '', $format_source = '', $source_name = '', $captain_id = '', $captain_name = '', $race_id = '', $race_name = '', $distance = '', $race_rank = '', $race_time = '') |
|
| 1181 | 1181 | { |
| 1182 | 1182 | global $globalMarineImageFetch; |
| 1183 | 1183 | |
@@ -1249,34 +1249,34 @@ discard block |
||
| 1249 | 1249 | $date = date("Y-m-d H:i:s", time()); |
| 1250 | 1250 | } |
| 1251 | 1251 | |
| 1252 | - $fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING); |
|
| 1253 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 1254 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1255 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1256 | - $heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT); |
|
| 1257 | - $groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1258 | - $format_source = filter_var($format_source,FILTER_SANITIZE_STRING); |
|
| 1259 | - $mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING); |
|
| 1260 | - $type = filter_var($type,FILTER_SANITIZE_STRING); |
|
| 1261 | - $status = filter_var($status,FILTER_SANITIZE_STRING); |
|
| 1262 | - $type_id = filter_var($typeid,FILTER_SANITIZE_NUMBER_INT); |
|
| 1263 | - $status_id = filter_var($statusid,FILTER_SANITIZE_NUMBER_INT); |
|
| 1264 | - $imo = filter_var($imo,FILTER_SANITIZE_STRING); |
|
| 1265 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 1266 | - $arrival_code = filter_var($arrival_code,FILTER_SANITIZE_STRING); |
|
| 1267 | - $arrival_date = filter_var($arrival_date,FILTER_SANITIZE_STRING); |
|
| 1268 | - $captain_id = filter_var($captain_id,FILTER_SANITIZE_STRING); |
|
| 1269 | - $captain_name = filter_var($captain_name,FILTER_SANITIZE_STRING); |
|
| 1270 | - $race_id = filter_var($race_id,FILTER_SANITIZE_STRING); |
|
| 1271 | - $race_name = filter_var($race_name,FILTER_SANITIZE_STRING); |
|
| 1272 | - $race_rank = filter_var($race_rank,FILTER_SANITIZE_NUMBER_INT); |
|
| 1273 | - $race_time = filter_var($race_time,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1274 | - $distance = filter_var($distance,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1252 | + $fammarine_id = filter_var($fammarine_id, FILTER_SANITIZE_STRING); |
|
| 1253 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 1254 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1255 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1256 | + $heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT); |
|
| 1257 | + $groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1258 | + $format_source = filter_var($format_source, FILTER_SANITIZE_STRING); |
|
| 1259 | + $mmsi = filter_var($mmsi, FILTER_SANITIZE_STRING); |
|
| 1260 | + $type = filter_var($type, FILTER_SANITIZE_STRING); |
|
| 1261 | + $status = filter_var($status, FILTER_SANITIZE_STRING); |
|
| 1262 | + $type_id = filter_var($typeid, FILTER_SANITIZE_NUMBER_INT); |
|
| 1263 | + $status_id = filter_var($statusid, FILTER_SANITIZE_NUMBER_INT); |
|
| 1264 | + $imo = filter_var($imo, FILTER_SANITIZE_STRING); |
|
| 1265 | + $callsign = filter_var($callsign, FILTER_SANITIZE_STRING); |
|
| 1266 | + $arrival_code = filter_var($arrival_code, FILTER_SANITIZE_STRING); |
|
| 1267 | + $arrival_date = filter_var($arrival_date, FILTER_SANITIZE_STRING); |
|
| 1268 | + $captain_id = filter_var($captain_id, FILTER_SANITIZE_STRING); |
|
| 1269 | + $captain_name = filter_var($captain_name, FILTER_SANITIZE_STRING); |
|
| 1270 | + $race_id = filter_var($race_id, FILTER_SANITIZE_STRING); |
|
| 1271 | + $race_name = filter_var($race_name, FILTER_SANITIZE_STRING); |
|
| 1272 | + $race_rank = filter_var($race_rank, FILTER_SANITIZE_NUMBER_INT); |
|
| 1273 | + $race_time = filter_var($race_time, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1274 | + $distance = filter_var($distance, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1275 | 1275 | if (isset($globalMarineImageFetch) && $globalMarineImageFetch === TRUE) { |
| 1276 | 1276 | $Image = new Image($this->db); |
| 1277 | - $image_array = $Image->getMarineImage($mmsi,$imo,$ident); |
|
| 1277 | + $image_array = $Image->getMarineImage($mmsi, $imo, $ident); |
|
| 1278 | 1278 | if (!isset($image_array[0]['mmsi'])) { |
| 1279 | - $Image->addMarineImage($mmsi,$imo,$ident); |
|
| 1279 | + $Image->addMarineImage($mmsi, $imo, $ident); |
|
| 1280 | 1280 | } |
| 1281 | 1281 | unset($Image); |
| 1282 | 1282 | } |
@@ -1292,10 +1292,10 @@ discard block |
||
| 1292 | 1292 | if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
| 1293 | 1293 | //if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
| 1294 | 1294 | if ($arrival_date == '') $arrival_date = NULL; |
| 1295 | - $query = "INSERT INTO marine_output (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, mmsi, type, type_id, status,status_id,imo,arrival_port_name,arrival_port_date,captain_id,captain_name,race_id,race_name, distance, race_rank,race_time) |
|
| 1295 | + $query = "INSERT INTO marine_output (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, mmsi, type, type_id, status,status_id,imo,arrival_port_name,arrival_port_date,captain_id,captain_name,race_id,race_name, distance, race_rank,race_time) |
|
| 1296 | 1296 | VALUES (:fammarine_id,:ident,:latitude,:longitude,:heading,:speed,:date,:format_source, :source_name,:mmsi,:type,:type_id,:status,:status_id,:imo,:arrival_port_name,:arrival_port_date,:captain_id,:captain_name,:race_id,:race_name, :distance, :race_rank,:race_time)"; |
| 1297 | 1297 | |
| 1298 | - $query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':heading' => $heading,':speed' => $groundspeed,':date' => $date,':format_source' => $format_source, ':source_name' => $source_name,':mmsi' => $mmsi,':type' => $type,':type_id' => $type_id,':status' => $status,':status_id' => $status_id,':imo' => $imo,':arrival_port_name' => $arrival_code,':arrival_port_date' => $arrival_date,':captain_id' => $captain_id,':captain_name' => $captain_name,':race_id' => $race_id,':race_name' => $race_name,':distance' => $distance,':race_rank' => $race_rank,':race_time' => $race_time); |
|
| 1298 | + $query_values = array(':fammarine_id' => $fammarine_id, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':heading' => $heading, ':speed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':mmsi' => $mmsi, ':type' => $type, ':type_id' => $type_id, ':status' => $status, ':status_id' => $status_id, ':imo' => $imo, ':arrival_port_name' => $arrival_code, ':arrival_port_date' => $arrival_date, ':captain_id' => $captain_id, ':captain_name' => $captain_name, ':race_id' => $race_id, ':race_name' => $race_name, ':distance' => $distance, ':race_rank' => $race_rank, ':race_time' => $race_time); |
|
| 1299 | 1299 | try { |
| 1300 | 1300 | $sth = $this->db->prepare($query); |
| 1301 | 1301 | $sth->execute($query_values); |
@@ -1319,13 +1319,13 @@ discard block |
||
| 1319 | 1319 | { |
| 1320 | 1320 | global $globalDBdriver, $globalTimezone; |
| 1321 | 1321 | if ($globalDBdriver == 'mysql') { |
| 1322 | - $query = "SELECT marine_output.ident FROM marine_output |
|
| 1322 | + $query = "SELECT marine_output.ident FROM marine_output |
|
| 1323 | 1323 | WHERE marine_output.ident = :ident |
| 1324 | 1324 | AND marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) |
| 1325 | 1325 | AND marine_output.date < UTC_TIMESTAMP()"; |
| 1326 | 1326 | $query_data = array(':ident' => $ident); |
| 1327 | 1327 | } else { |
| 1328 | - $query = "SELECT marine_output.ident FROM marine_output |
|
| 1328 | + $query = "SELECT marine_output.ident FROM marine_output |
|
| 1329 | 1329 | WHERE marine_output.ident = :ident |
| 1330 | 1330 | AND marine_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS' |
| 1331 | 1331 | AND marine_output.date < now() AT TIME ZONE 'UTC'"; |
@@ -1334,8 +1334,8 @@ discard block |
||
| 1334 | 1334 | |
| 1335 | 1335 | $sth = $this->db->prepare($query); |
| 1336 | 1336 | $sth->execute($query_data); |
| 1337 | - $ident_result=''; |
|
| 1338 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1337 | + $ident_result = ''; |
|
| 1338 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1339 | 1339 | { |
| 1340 | 1340 | $ident_result = $row['ident']; |
| 1341 | 1341 | } |
@@ -1361,8 +1361,8 @@ discard block |
||
| 1361 | 1361 | return false; |
| 1362 | 1362 | } else { |
| 1363 | 1363 | $q_array = explode(" ", $q); |
| 1364 | - foreach ($q_array as $q_item){ |
|
| 1365 | - $q_item = filter_var($q_item,FILTER_SANITIZE_STRING); |
|
| 1364 | + foreach ($q_array as $q_item) { |
|
| 1365 | + $q_item = filter_var($q_item, FILTER_SANITIZE_STRING); |
|
| 1366 | 1366 | $additional_query .= " AND ("; |
| 1367 | 1367 | $additional_query .= "(marine_output.ident like '%".$q_item."%')"; |
| 1368 | 1368 | $additional_query .= ")"; |
@@ -1370,11 +1370,11 @@ discard block |
||
| 1370 | 1370 | } |
| 1371 | 1371 | } |
| 1372 | 1372 | if ($globalDBdriver == 'mysql') { |
| 1373 | - $query = "SELECT marine_output.* FROM marine_output |
|
| 1373 | + $query = "SELECT marine_output.* FROM marine_output |
|
| 1374 | 1374 | WHERE marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 SECOND) ".$additional_query." |
| 1375 | 1375 | AND marine_output.date < UTC_TIMESTAMP()"; |
| 1376 | 1376 | } else { |
| 1377 | - $query = "SELECT marine_output.* FROM marine_output |
|
| 1377 | + $query = "SELECT marine_output.* FROM marine_output |
|
| 1378 | 1378 | WHERE marine_output.date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '20 SECONDS' ".$additional_query." |
| 1379 | 1379 | AND marine_output.date::timestamp < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'"; |
| 1380 | 1380 | } |
@@ -1394,16 +1394,16 @@ discard block |
||
| 1394 | 1394 | * @return array the airline country list |
| 1395 | 1395 | */ |
| 1396 | 1396 | |
| 1397 | - public function countAllMarineOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array()) |
|
| 1397 | + public function countAllMarineOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array()) |
|
| 1398 | 1398 | { |
| 1399 | 1399 | global $globalDBdriver, $globalArchive; |
| 1400 | 1400 | //$filter_query = $this->getFilter($filters,true,true); |
| 1401 | - $Connection= new Connection($this->db); |
|
| 1401 | + $Connection = new Connection($this->db); |
|
| 1402 | 1402 | if (!$Connection->tableExists('countries')) return array(); |
| 1403 | 1403 | require_once('class.SpotterLive.php'); |
| 1404 | 1404 | if (!isset($globalArchive) || $globalArchive !== TRUE) { |
| 1405 | 1405 | $MarineLive = new MarineLive($this->db); |
| 1406 | - $filter_query = $MarineLive->getFilter($filters,true,true); |
|
| 1406 | + $filter_query = $MarineLive->getFilter($filters, true, true); |
|
| 1407 | 1407 | $filter_query .= " over_country IS NOT NULL AND over_country <> ''"; |
| 1408 | 1408 | if ($olderthanmonths > 0) { |
| 1409 | 1409 | if ($globalDBdriver == 'mysql') { |
@@ -1423,7 +1423,7 @@ discard block |
||
| 1423 | 1423 | } else { |
| 1424 | 1424 | require_once(dirname(__FILE__)."/class.MarineArchive.php"); |
| 1425 | 1425 | $MarineArchive = new MarineArchive($this->db); |
| 1426 | - $filter_query = $MarineArchive->getFilter($filters,true,true); |
|
| 1426 | + $filter_query = $MarineArchive->getFilter($filters, true, true); |
|
| 1427 | 1427 | $filter_query .= " over_country <> ''"; |
| 1428 | 1428 | if ($olderthanmonths > 0) { |
| 1429 | 1429 | if ($globalDBdriver == 'mysql') { |
@@ -1451,7 +1451,7 @@ discard block |
||
| 1451 | 1451 | $flight_array = array(); |
| 1452 | 1452 | $temp_array = array(); |
| 1453 | 1453 | |
| 1454 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1454 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1455 | 1455 | { |
| 1456 | 1456 | $temp_array['marine_count'] = $row['nb']; |
| 1457 | 1457 | $temp_array['marine_country'] = $row['name']; |
@@ -1475,11 +1475,11 @@ discard block |
||
| 1475 | 1475 | * @param string $day |
| 1476 | 1476 | * @return array the callsign list |
| 1477 | 1477 | */ |
| 1478 | - public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '') |
|
| 1478 | + public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '') |
|
| 1479 | 1479 | { |
| 1480 | 1480 | global $globalDBdriver; |
| 1481 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1482 | - $query = "SELECT DISTINCT marine_output.ident, COUNT(marine_output.ident) AS callsign_icao_count |
|
| 1481 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1482 | + $query = "SELECT DISTINCT marine_output.ident, COUNT(marine_output.ident) AS callsign_icao_count |
|
| 1483 | 1483 | FROM marine_output".$filter_query." marine_output.ident <> ''"; |
| 1484 | 1484 | if ($olderthanmonths > 0) { |
| 1485 | 1485 | if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)'; |
@@ -1493,28 +1493,28 @@ discard block |
||
| 1493 | 1493 | if ($year != '') { |
| 1494 | 1494 | if ($globalDBdriver == 'mysql') { |
| 1495 | 1495 | $query .= " AND YEAR(marine_output.date) = :year"; |
| 1496 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1496 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1497 | 1497 | } else { |
| 1498 | 1498 | $query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year"; |
| 1499 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1499 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1500 | 1500 | } |
| 1501 | 1501 | } |
| 1502 | 1502 | if ($month != '') { |
| 1503 | 1503 | if ($globalDBdriver == 'mysql') { |
| 1504 | 1504 | $query .= " AND MONTH(marine_output.date) = :month"; |
| 1505 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1505 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1506 | 1506 | } else { |
| 1507 | 1507 | $query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month"; |
| 1508 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1508 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1509 | 1509 | } |
| 1510 | 1510 | } |
| 1511 | 1511 | if ($day != '') { |
| 1512 | 1512 | if ($globalDBdriver == 'mysql') { |
| 1513 | 1513 | $query .= " AND DAY(marine_output.date) = :day"; |
| 1514 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 1514 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 1515 | 1515 | } else { |
| 1516 | 1516 | $query .= " AND EXTRACT(DAY FROM marine_output.date) = :day"; |
| 1517 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 1517 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 1518 | 1518 | } |
| 1519 | 1519 | } |
| 1520 | 1520 | $query .= " GROUP BY marine_output.ident ORDER BY callsign_icao_count DESC"; |
@@ -1526,7 +1526,7 @@ discard block |
||
| 1526 | 1526 | $callsign_array = array(); |
| 1527 | 1527 | $temp_array = array(); |
| 1528 | 1528 | |
| 1529 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1529 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1530 | 1530 | { |
| 1531 | 1531 | $temp_array['callsign_icao'] = $row['ident']; |
| 1532 | 1532 | $temp_array['airline_name'] = $row['airline_name']; |
@@ -1578,7 +1578,7 @@ discard block |
||
| 1578 | 1578 | $date_array = array(); |
| 1579 | 1579 | $temp_array = array(); |
| 1580 | 1580 | |
| 1581 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1581 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1582 | 1582 | { |
| 1583 | 1583 | $temp_array['date_name'] = $row['date_name']; |
| 1584 | 1584 | $temp_array['date_count'] = $row['date_count']; |
@@ -1604,7 +1604,7 @@ discard block |
||
| 1604 | 1604 | $datetime = new DateTime(); |
| 1605 | 1605 | $offset = $datetime->format('P'); |
| 1606 | 1606 | } else $offset = '+00:00'; |
| 1607 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1607 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1608 | 1608 | if ($globalDBdriver == 'mysql') { |
| 1609 | 1609 | $query = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
| 1610 | 1610 | FROM marine_output".$filter_query." marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY)"; |
@@ -1625,7 +1625,7 @@ discard block |
||
| 1625 | 1625 | $date_array = array(); |
| 1626 | 1626 | $temp_array = array(); |
| 1627 | 1627 | |
| 1628 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1628 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1629 | 1629 | { |
| 1630 | 1630 | $temp_array['date_name'] = $row['date_name']; |
| 1631 | 1631 | $temp_array['date_count'] = $row['date_count']; |
@@ -1650,7 +1650,7 @@ discard block |
||
| 1650 | 1650 | $datetime = new DateTime(); |
| 1651 | 1651 | $offset = $datetime->format('P'); |
| 1652 | 1652 | } else $offset = '+00:00'; |
| 1653 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1653 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1654 | 1654 | if ($globalDBdriver == 'mysql') { |
| 1655 | 1655 | $query = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
| 1656 | 1656 | FROM marine_output".$filter_query." marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MONTH)"; |
@@ -1671,7 +1671,7 @@ discard block |
||
| 1671 | 1671 | $date_array = array(); |
| 1672 | 1672 | $temp_array = array(); |
| 1673 | 1673 | |
| 1674 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1674 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1675 | 1675 | { |
| 1676 | 1676 | $temp_array['date_name'] = $row['date_name']; |
| 1677 | 1677 | $temp_array['date_count'] = $row['date_count']; |
@@ -1717,7 +1717,7 @@ discard block |
||
| 1717 | 1717 | $date_array = array(); |
| 1718 | 1718 | $temp_array = array(); |
| 1719 | 1719 | |
| 1720 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1720 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1721 | 1721 | { |
| 1722 | 1722 | $temp_array['month_name'] = $row['month_name']; |
| 1723 | 1723 | $temp_array['year_name'] = $row['year_name']; |
@@ -1744,7 +1744,7 @@ discard block |
||
| 1744 | 1744 | $datetime = new DateTime(); |
| 1745 | 1745 | $offset = $datetime->format('P'); |
| 1746 | 1746 | } else $offset = '+00:00'; |
| 1747 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1747 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1748 | 1748 | if ($globalDBdriver == 'mysql') { |
| 1749 | 1749 | $query = "SELECT MONTH(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count |
| 1750 | 1750 | FROM marine_output".$filter_query." marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 YEAR)"; |
@@ -1765,7 +1765,7 @@ discard block |
||
| 1765 | 1765 | $date_array = array(); |
| 1766 | 1766 | $temp_array = array(); |
| 1767 | 1767 | |
| 1768 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1768 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1769 | 1769 | { |
| 1770 | 1770 | $temp_array['year_name'] = $row['year_name']; |
| 1771 | 1771 | $temp_array['month_name'] = $row['month_name']; |
@@ -1785,7 +1785,7 @@ discard block |
||
| 1785 | 1785 | * @param array $filters |
| 1786 | 1786 | * @return array the hour list |
| 1787 | 1787 | */ |
| 1788 | - public function countAllHours($orderby,$filters = array()) |
|
| 1788 | + public function countAllHours($orderby, $filters = array()) |
|
| 1789 | 1789 | { |
| 1790 | 1790 | global $globalTimezone, $globalDBdriver; |
| 1791 | 1791 | if ($globalTimezone != '') { |
@@ -1833,7 +1833,7 @@ discard block |
||
| 1833 | 1833 | $hour_array = array(); |
| 1834 | 1834 | $temp_array = array(); |
| 1835 | 1835 | |
| 1836 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1836 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1837 | 1837 | { |
| 1838 | 1838 | $temp_array['hour_name'] = $row['hour_name']; |
| 1839 | 1839 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1855,8 +1855,8 @@ discard block |
||
| 1855 | 1855 | public function countAllHoursByDate($date, $filters = array()) |
| 1856 | 1856 | { |
| 1857 | 1857 | global $globalTimezone, $globalDBdriver; |
| 1858 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1859 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 1858 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1859 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 1860 | 1860 | if ($globalTimezone != '') { |
| 1861 | 1861 | date_default_timezone_set($globalTimezone); |
| 1862 | 1862 | $datetime = new DateTime($date); |
@@ -1864,12 +1864,12 @@ discard block |
||
| 1864 | 1864 | } else $offset = '+00:00'; |
| 1865 | 1865 | |
| 1866 | 1866 | if ($globalDBdriver == 'mysql') { |
| 1867 | - $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1867 | + $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1868 | 1868 | FROM marine_output".$filter_query." DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) = :date |
| 1869 | 1869 | GROUP BY hour_name |
| 1870 | 1870 | ORDER BY hour_name ASC"; |
| 1871 | 1871 | } else { |
| 1872 | - $query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1872 | + $query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1873 | 1873 | FROM marine_output".$filter_query." to_char(marine_output.date AT TIME ZONE INTERVAL :offset, 'YYYY-mm-dd') = :date |
| 1874 | 1874 | GROUP BY hour_name |
| 1875 | 1875 | ORDER BY hour_name ASC"; |
@@ -1881,7 +1881,7 @@ discard block |
||
| 1881 | 1881 | $hour_array = array(); |
| 1882 | 1882 | $temp_array = array(); |
| 1883 | 1883 | |
| 1884 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1884 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1885 | 1885 | { |
| 1886 | 1886 | $temp_array['hour_name'] = $row['hour_name']; |
| 1887 | 1887 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1903,8 +1903,8 @@ discard block |
||
| 1903 | 1903 | public function countAllHoursByIdent($ident, $filters = array()) |
| 1904 | 1904 | { |
| 1905 | 1905 | global $globalTimezone, $globalDBdriver; |
| 1906 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1907 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 1906 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1907 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 1908 | 1908 | if ($globalTimezone != '') { |
| 1909 | 1909 | date_default_timezone_set($globalTimezone); |
| 1910 | 1910 | $datetime = new DateTime(); |
@@ -1912,12 +1912,12 @@ discard block |
||
| 1912 | 1912 | } else $offset = '+00:00'; |
| 1913 | 1913 | |
| 1914 | 1914 | if ($globalDBdriver == 'mysql') { |
| 1915 | - $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1915 | + $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1916 | 1916 | FROM marine_output".$filter_query." marine_output.ident = :ident |
| 1917 | 1917 | GROUP BY hour_name |
| 1918 | 1918 | ORDER BY hour_name ASC"; |
| 1919 | 1919 | } else { |
| 1920 | - $query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1920 | + $query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1921 | 1921 | FROM marine_output".$filter_query." marine_output.ident = :ident |
| 1922 | 1922 | GROUP BY hour_name |
| 1923 | 1923 | ORDER BY hour_name ASC"; |
@@ -1925,12 +1925,12 @@ discard block |
||
| 1925 | 1925 | |
| 1926 | 1926 | |
| 1927 | 1927 | $sth = $this->db->prepare($query); |
| 1928 | - $sth->execute(array(':ident' => $ident,':offset' => $offset)); |
|
| 1928 | + $sth->execute(array(':ident' => $ident, ':offset' => $offset)); |
|
| 1929 | 1929 | |
| 1930 | 1930 | $hour_array = array(); |
| 1931 | 1931 | $temp_array = array(); |
| 1932 | 1932 | |
| 1933 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1933 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1934 | 1934 | { |
| 1935 | 1935 | $temp_array['hour_name'] = $row['hour_name']; |
| 1936 | 1936 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1950,11 +1950,11 @@ discard block |
||
| 1950 | 1950 | * @param array $filters |
| 1951 | 1951 | * @return array the aircraft list |
| 1952 | 1952 | */ |
| 1953 | - public function countAllCaptainsByRaces($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array()) |
|
| 1953 | + public function countAllCaptainsByRaces($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array()) |
|
| 1954 | 1954 | { |
| 1955 | 1955 | global $globalDBdriver; |
| 1956 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1957 | - $query = "SELECT DISTINCT marine_output.race_id, marine_output.race_name, COUNT(marine_output.captain_id) AS captain_count |
|
| 1956 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1957 | + $query = "SELECT DISTINCT marine_output.race_id, marine_output.race_name, COUNT(marine_output.captain_id) AS captain_count |
|
| 1958 | 1958 | FROM marine_output".$filter_query." race_id IS NOT NULL"; |
| 1959 | 1959 | if ($olderthanmonths > 0) { |
| 1960 | 1960 | if ($globalDBdriver == 'mysql') { |
@@ -1977,7 +1977,7 @@ discard block |
||
| 1977 | 1977 | $marine_array = array(); |
| 1978 | 1978 | $temp_array = array(); |
| 1979 | 1979 | |
| 1980 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1980 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1981 | 1981 | { |
| 1982 | 1982 | $temp_array['marine_race_id'] = $row['race_id']; |
| 1983 | 1983 | $temp_array['marine_race_name'] = $row['race_name']; |
@@ -1995,33 +1995,33 @@ discard block |
||
| 1995 | 1995 | * @param string $month |
| 1996 | 1996 | * @return Integer the number of vessels |
| 1997 | 1997 | */ |
| 1998 | - public function countOverallMarine($filters = array(),$year = '',$month = '') |
|
| 1998 | + public function countOverallMarine($filters = array(), $year = '', $month = '') |
|
| 1999 | 1999 | { |
| 2000 | 2000 | global $globalDBdriver; |
| 2001 | 2001 | //$queryi = "SELECT COUNT(marine_output.marine_id) AS flight_count FROM marine_output"; |
| 2002 | - $queryi = "SELECT COUNT(DISTINCT marine_output.mmsi) AS flight_count FROM marine_output"; |
|
| 2002 | + $queryi = "SELECT COUNT(DISTINCT marine_output.mmsi) AS flight_count FROM marine_output"; |
|
| 2003 | 2003 | $query_values = array(); |
| 2004 | 2004 | $query = ''; |
| 2005 | 2005 | if ($year != '') { |
| 2006 | 2006 | if ($globalDBdriver == 'mysql') { |
| 2007 | 2007 | $query .= " AND YEAR(marine_output.date) = :year"; |
| 2008 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 2008 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 2009 | 2009 | } else { |
| 2010 | 2010 | $query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year"; |
| 2011 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 2011 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 2012 | 2012 | } |
| 2013 | 2013 | } |
| 2014 | 2014 | if ($month != '') { |
| 2015 | 2015 | if ($globalDBdriver == 'mysql') { |
| 2016 | 2016 | $query .= " AND MONTH(marine_output.date) = :month"; |
| 2017 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 2017 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 2018 | 2018 | } else { |
| 2019 | 2019 | $query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month"; |
| 2020 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 2020 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 2021 | 2021 | } |
| 2022 | 2022 | } |
| 2023 | 2023 | if (empty($query_values)) $queryi .= $this->getFilter($filters); |
| 2024 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 2024 | + else $queryi .= $this->getFilter($filters, true, true).substr($query, 4); |
|
| 2025 | 2025 | |
| 2026 | 2026 | $sth = $this->db->prepare($queryi); |
| 2027 | 2027 | $sth->execute($query_values); |
@@ -2036,32 +2036,32 @@ discard block |
||
| 2036 | 2036 | * @param string $month |
| 2037 | 2037 | * @return Integer the number of vessels |
| 2038 | 2038 | */ |
| 2039 | - public function countOverallMarineTypes($filters = array(),$year = '',$month = '') |
|
| 2039 | + public function countOverallMarineTypes($filters = array(), $year = '', $month = '') |
|
| 2040 | 2040 | { |
| 2041 | 2041 | global $globalDBdriver; |
| 2042 | - $queryi = "SELECT COUNT(DISTINCT marine_output.type) AS marine_count FROM marine_output"; |
|
| 2042 | + $queryi = "SELECT COUNT(DISTINCT marine_output.type) AS marine_count FROM marine_output"; |
|
| 2043 | 2043 | $query_values = array(); |
| 2044 | 2044 | $query = ''; |
| 2045 | 2045 | if ($year != '') { |
| 2046 | 2046 | if ($globalDBdriver == 'mysql') { |
| 2047 | 2047 | $query .= " AND YEAR(marine_output.date) = :year"; |
| 2048 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 2048 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 2049 | 2049 | } else { |
| 2050 | 2050 | $query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year"; |
| 2051 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 2051 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 2052 | 2052 | } |
| 2053 | 2053 | } |
| 2054 | 2054 | if ($month != '') { |
| 2055 | 2055 | if ($globalDBdriver == 'mysql') { |
| 2056 | 2056 | $query .= " AND MONTH(marine_output.date) = :month"; |
| 2057 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 2057 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 2058 | 2058 | } else { |
| 2059 | 2059 | $query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month"; |
| 2060 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 2060 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 2061 | 2061 | } |
| 2062 | 2062 | } |
| 2063 | 2063 | if (empty($query_values)) $queryi .= $this->getFilter($filters); |
| 2064 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 2064 | + else $queryi .= $this->getFilter($filters, true, true).substr($query, 4); |
|
| 2065 | 2065 | |
| 2066 | 2066 | $sth = $this->db->prepare($queryi); |
| 2067 | 2067 | $sth->execute($query_values); |
@@ -2076,32 +2076,32 @@ discard block |
||
| 2076 | 2076 | * @param string $month |
| 2077 | 2077 | * @return Integer number of races |
| 2078 | 2078 | */ |
| 2079 | - public function countOverallMarineRaces($filters = array(),$year = '',$month = '') |
|
| 2079 | + public function countOverallMarineRaces($filters = array(), $year = '', $month = '') |
|
| 2080 | 2080 | { |
| 2081 | 2081 | global $globalDBdriver; |
| 2082 | - $queryi = "SELECT COUNT(DISTINCT marine_output.race_id) AS marine_count FROM marine_output"; |
|
| 2082 | + $queryi = "SELECT COUNT(DISTINCT marine_output.race_id) AS marine_count FROM marine_output"; |
|
| 2083 | 2083 | $query_values = array(); |
| 2084 | 2084 | $query = ''; |
| 2085 | 2085 | if ($year != '') { |
| 2086 | 2086 | if ($globalDBdriver == 'mysql') { |
| 2087 | 2087 | $query .= " AND YEAR(marine_output.date) = :year"; |
| 2088 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 2088 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 2089 | 2089 | } else { |
| 2090 | 2090 | $query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year"; |
| 2091 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 2091 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 2092 | 2092 | } |
| 2093 | 2093 | } |
| 2094 | 2094 | if ($month != '') { |
| 2095 | 2095 | if ($globalDBdriver == 'mysql') { |
| 2096 | 2096 | $query .= " AND MONTH(marine_output.date) = :month"; |
| 2097 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 2097 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 2098 | 2098 | } else { |
| 2099 | 2099 | $query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month"; |
| 2100 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 2100 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 2101 | 2101 | } |
| 2102 | 2102 | } |
| 2103 | 2103 | if (empty($query_values)) $queryi .= $this->getFilter($filters); |
| 2104 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 2104 | + else $queryi .= $this->getFilter($filters, true, true).substr($query, 4); |
|
| 2105 | 2105 | |
| 2106 | 2106 | $sth = $this->db->prepare($queryi); |
| 2107 | 2107 | $sth->execute($query_values); |
@@ -2116,32 +2116,32 @@ discard block |
||
| 2116 | 2116 | * @param string $month |
| 2117 | 2117 | * @return Integer number of captain |
| 2118 | 2118 | */ |
| 2119 | - public function countOverallMarineCaptains($filters = array(),$year = '',$month = '') |
|
| 2119 | + public function countOverallMarineCaptains($filters = array(), $year = '', $month = '') |
|
| 2120 | 2120 | { |
| 2121 | 2121 | global $globalDBdriver; |
| 2122 | - $queryi = "SELECT COUNT(DISTINCT marine_output.captain_id) AS marine_count FROM marine_output"; |
|
| 2122 | + $queryi = "SELECT COUNT(DISTINCT marine_output.captain_id) AS marine_count FROM marine_output"; |
|
| 2123 | 2123 | $query_values = array(); |
| 2124 | 2124 | $query = ''; |
| 2125 | 2125 | if ($year != '') { |
| 2126 | 2126 | if ($globalDBdriver == 'mysql') { |
| 2127 | 2127 | $query .= " AND YEAR(marine_output.date) = :year"; |
| 2128 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 2128 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 2129 | 2129 | } else { |
| 2130 | 2130 | $query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year"; |
| 2131 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 2131 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 2132 | 2132 | } |
| 2133 | 2133 | } |
| 2134 | 2134 | if ($month != '') { |
| 2135 | 2135 | if ($globalDBdriver == 'mysql') { |
| 2136 | 2136 | $query .= " AND MONTH(marine_output.date) = :month"; |
| 2137 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 2137 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 2138 | 2138 | } else { |
| 2139 | 2139 | $query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month"; |
| 2140 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 2140 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 2141 | 2141 | } |
| 2142 | 2142 | } |
| 2143 | 2143 | if (empty($query_values)) $queryi .= $this->getFilter($filters); |
| 2144 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 2144 | + else $queryi .= $this->getFilter($filters, true, true).substr($query, 4); |
|
| 2145 | 2145 | |
| 2146 | 2146 | $sth = $this->db->prepare($queryi); |
| 2147 | 2147 | $sth->execute($query_values); |
@@ -2157,7 +2157,7 @@ discard block |
||
| 2157 | 2157 | public function countAllHoursFromToday($filters = array()) |
| 2158 | 2158 | { |
| 2159 | 2159 | global $globalTimezone, $globalDBdriver; |
| 2160 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 2160 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 2161 | 2161 | if ($globalTimezone != '') { |
| 2162 | 2162 | date_default_timezone_set($globalTimezone); |
| 2163 | 2163 | $datetime = new DateTime(); |
@@ -2165,12 +2165,12 @@ discard block |
||
| 2165 | 2165 | } else $offset = '+00:00'; |
| 2166 | 2166 | |
| 2167 | 2167 | if ($globalDBdriver == 'mysql') { |
| 2168 | - $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 2168 | + $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 2169 | 2169 | FROM marine_output".$filter_query." DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) = CURDATE() |
| 2170 | 2170 | GROUP BY hour_name |
| 2171 | 2171 | ORDER BY hour_name ASC"; |
| 2172 | 2172 | } else { |
| 2173 | - $query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 2173 | + $query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 2174 | 2174 | FROM marine_output".$filter_query." to_char(marine_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = CAST(NOW() AS date) |
| 2175 | 2175 | GROUP BY hour_name |
| 2176 | 2176 | ORDER BY hour_name ASC"; |
@@ -2182,7 +2182,7 @@ discard block |
||
| 2182 | 2182 | $hour_array = array(); |
| 2183 | 2183 | $temp_array = array(); |
| 2184 | 2184 | |
| 2185 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2185 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2186 | 2186 | { |
| 2187 | 2187 | $temp_array['hour_name'] = $row['hour_name']; |
| 2188 | 2188 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -2201,9 +2201,9 @@ discard block |
||
| 2201 | 2201 | */ |
| 2202 | 2202 | public function getMarineIDBasedOnFamMarineID($fammarine_id) |
| 2203 | 2203 | { |
| 2204 | - $fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING); |
|
| 2204 | + $fammarine_id = filter_var($fammarine_id, FILTER_SANITIZE_STRING); |
|
| 2205 | 2205 | |
| 2206 | - $query = "SELECT marine_output.marine_id |
|
| 2206 | + $query = "SELECT marine_output.marine_id |
|
| 2207 | 2207 | FROM marine_output |
| 2208 | 2208 | WHERE marine_output.fammarine_id = '".$fammarine_id."'"; |
| 2209 | 2209 | |
@@ -2211,7 +2211,7 @@ discard block |
||
| 2211 | 2211 | $sth = $this->db->prepare($query); |
| 2212 | 2212 | $sth->execute(); |
| 2213 | 2213 | |
| 2214 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2214 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2215 | 2215 | { |
| 2216 | 2216 | return $row['marine_id']; |
| 2217 | 2217 | } |
@@ -2236,23 +2236,23 @@ discard block |
||
| 2236 | 2236 | } |
| 2237 | 2237 | |
| 2238 | 2238 | $current_date = date("Y-m-d H:i:s"); |
| 2239 | - $date = date("Y-m-d H:i:s",strtotime($dateString." UTC")); |
|
| 2239 | + $date = date("Y-m-d H:i:s", strtotime($dateString." UTC")); |
|
| 2240 | 2240 | |
| 2241 | 2241 | $diff = abs(strtotime($current_date) - strtotime($date)); |
| 2242 | 2242 | |
| 2243 | - $time_array['years'] = floor($diff / (365*60*60*24)); |
|
| 2243 | + $time_array['years'] = floor($diff/(365*60*60*24)); |
|
| 2244 | 2244 | $years = $time_array['years']; |
| 2245 | 2245 | |
| 2246 | - $time_array['months'] = floor(($diff - $years * 365*60*60*24) / (30*60*60*24)); |
|
| 2246 | + $time_array['months'] = floor(($diff - $years*365*60*60*24)/(30*60*60*24)); |
|
| 2247 | 2247 | $months = $time_array['months']; |
| 2248 | 2248 | |
| 2249 | - $time_array['days'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24)/ (60*60*24)); |
|
| 2249 | + $time_array['days'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24)/(60*60*24)); |
|
| 2250 | 2250 | $days = $time_array['days']; |
| 2251 | - $time_array['hours'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/ (60*60)); |
|
| 2251 | + $time_array['hours'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/(60*60)); |
|
| 2252 | 2252 | $hours = $time_array['hours']; |
| 2253 | - $time_array['minutes'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/ 60); |
|
| 2253 | + $time_array['minutes'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/60); |
|
| 2254 | 2254 | $minutes = $time_array['minutes']; |
| 2255 | - $time_array['seconds'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60)); |
|
| 2255 | + $time_array['seconds'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60)); |
|
| 2256 | 2256 | |
| 2257 | 2257 | return $time_array; |
| 2258 | 2258 | } |
@@ -2275,63 +2275,63 @@ discard block |
||
| 2275 | 2275 | $temp_array['direction_degree'] = $direction; |
| 2276 | 2276 | $temp_array['direction_shortname'] = "N"; |
| 2277 | 2277 | $temp_array['direction_fullname'] = "North"; |
| 2278 | - } elseif ($direction >= 22.5 && $direction < 45){ |
|
| 2278 | + } elseif ($direction >= 22.5 && $direction < 45) { |
|
| 2279 | 2279 | $temp_array['direction_degree'] = $direction; |
| 2280 | 2280 | $temp_array['direction_shortname'] = "NNE"; |
| 2281 | 2281 | $temp_array['direction_fullname'] = "North-Northeast"; |
| 2282 | - } elseif ($direction >= 45 && $direction < 67.5){ |
|
| 2282 | + } elseif ($direction >= 45 && $direction < 67.5) { |
|
| 2283 | 2283 | $temp_array['direction_degree'] = $direction; |
| 2284 | 2284 | $temp_array['direction_shortname'] = "NE"; |
| 2285 | 2285 | $temp_array['direction_fullname'] = "Northeast"; |
| 2286 | - } elseif ($direction >= 67.5 && $direction < 90){ |
|
| 2286 | + } elseif ($direction >= 67.5 && $direction < 90) { |
|
| 2287 | 2287 | $temp_array['direction_degree'] = $direction; |
| 2288 | 2288 | $temp_array['direction_shortname'] = "ENE"; |
| 2289 | 2289 | $temp_array['direction_fullname'] = "East-Northeast"; |
| 2290 | - } elseif ($direction >= 90 && $direction < 112.5){ |
|
| 2290 | + } elseif ($direction >= 90 && $direction < 112.5) { |
|
| 2291 | 2291 | $temp_array['direction_degree'] = $direction; |
| 2292 | 2292 | $temp_array['direction_shortname'] = "E"; |
| 2293 | 2293 | $temp_array['direction_fullname'] = "East"; |
| 2294 | - } elseif ($direction >= 112.5 && $direction < 135){ |
|
| 2294 | + } elseif ($direction >= 112.5 && $direction < 135) { |
|
| 2295 | 2295 | $temp_array['direction_degree'] = $direction; |
| 2296 | 2296 | $temp_array['direction_shortname'] = "ESE"; |
| 2297 | 2297 | $temp_array['direction_fullname'] = "East-Southeast"; |
| 2298 | - } elseif ($direction >= 135 && $direction < 157.5){ |
|
| 2298 | + } elseif ($direction >= 135 && $direction < 157.5) { |
|
| 2299 | 2299 | $temp_array['direction_degree'] = $direction; |
| 2300 | 2300 | $temp_array['direction_shortname'] = "SE"; |
| 2301 | 2301 | $temp_array['direction_fullname'] = "Southeast"; |
| 2302 | - } elseif ($direction >= 157.5 && $direction < 180){ |
|
| 2302 | + } elseif ($direction >= 157.5 && $direction < 180) { |
|
| 2303 | 2303 | $temp_array['direction_degree'] = $direction; |
| 2304 | 2304 | $temp_array['direction_shortname'] = "SSE"; |
| 2305 | 2305 | $temp_array['direction_fullname'] = "South-Southeast"; |
| 2306 | - } elseif ($direction >= 180 && $direction < 202.5){ |
|
| 2306 | + } elseif ($direction >= 180 && $direction < 202.5) { |
|
| 2307 | 2307 | $temp_array['direction_degree'] = $direction; |
| 2308 | 2308 | $temp_array['direction_shortname'] = "S"; |
| 2309 | 2309 | $temp_array['direction_fullname'] = "South"; |
| 2310 | - } elseif ($direction >= 202.5 && $direction < 225){ |
|
| 2310 | + } elseif ($direction >= 202.5 && $direction < 225) { |
|
| 2311 | 2311 | $temp_array['direction_degree'] = $direction; |
| 2312 | 2312 | $temp_array['direction_shortname'] = "SSW"; |
| 2313 | 2313 | $temp_array['direction_fullname'] = "South-Southwest"; |
| 2314 | - } elseif ($direction >= 225 && $direction < 247.5){ |
|
| 2314 | + } elseif ($direction >= 225 && $direction < 247.5) { |
|
| 2315 | 2315 | $temp_array['direction_degree'] = $direction; |
| 2316 | 2316 | $temp_array['direction_shortname'] = "SW"; |
| 2317 | 2317 | $temp_array['direction_fullname'] = "Southwest"; |
| 2318 | - } elseif ($direction >= 247.5 && $direction < 270){ |
|
| 2318 | + } elseif ($direction >= 247.5 && $direction < 270) { |
|
| 2319 | 2319 | $temp_array['direction_degree'] = $direction; |
| 2320 | 2320 | $temp_array['direction_shortname'] = "WSW"; |
| 2321 | 2321 | $temp_array['direction_fullname'] = "West-Southwest"; |
| 2322 | - } elseif ($direction >= 270 && $direction < 292.5){ |
|
| 2322 | + } elseif ($direction >= 270 && $direction < 292.5) { |
|
| 2323 | 2323 | $temp_array['direction_degree'] = $direction; |
| 2324 | 2324 | $temp_array['direction_shortname'] = "W"; |
| 2325 | 2325 | $temp_array['direction_fullname'] = "West"; |
| 2326 | - } elseif ($direction >= 292.5 && $direction < 315){ |
|
| 2326 | + } elseif ($direction >= 292.5 && $direction < 315) { |
|
| 2327 | 2327 | $temp_array['direction_degree'] = $direction; |
| 2328 | 2328 | $temp_array['direction_shortname'] = "WNW"; |
| 2329 | 2329 | $temp_array['direction_fullname'] = "West-Northwest"; |
| 2330 | - } elseif ($direction >= 315 && $direction < 337.5){ |
|
| 2330 | + } elseif ($direction >= 315 && $direction < 337.5) { |
|
| 2331 | 2331 | $temp_array['direction_degree'] = $direction; |
| 2332 | 2332 | $temp_array['direction_shortname'] = "NW"; |
| 2333 | 2333 | $temp_array['direction_fullname'] = "Northwest"; |
| 2334 | - } elseif ($direction >= 337.5 && $direction < 360){ |
|
| 2334 | + } elseif ($direction >= 337.5 && $direction < 360) { |
|
| 2335 | 2335 | $temp_array['direction_degree'] = $direction; |
| 2336 | 2336 | $temp_array['direction_shortname'] = "NNW"; |
| 2337 | 2337 | $temp_array['direction_fullname'] = "North-Northwest"; |
@@ -2348,11 +2348,11 @@ discard block |
||
| 2348 | 2348 | * @param Float $longitude longitute of the flight |
| 2349 | 2349 | * @return String the countries |
| 2350 | 2350 | */ |
| 2351 | - public function getCountryFromLatitudeLongitude($latitude,$longitude) |
|
| 2351 | + public function getCountryFromLatitudeLongitude($latitude, $longitude) |
|
| 2352 | 2352 | { |
| 2353 | 2353 | global $globalDebug; |
| 2354 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 2355 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 2354 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 2355 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 2356 | 2356 | |
| 2357 | 2357 | $Connection = new Connection($this->db); |
| 2358 | 2358 | if (!$Connection->tableExists('countries')) return ''; |
@@ -2392,7 +2392,7 @@ discard block |
||
| 2392 | 2392 | public function getCountryFromISO2($iso2) |
| 2393 | 2393 | { |
| 2394 | 2394 | global $globalDebug; |
| 2395 | - $iso2 = filter_var($iso2,FILTER_SANITIZE_STRING); |
|
| 2395 | + $iso2 = filter_var($iso2, FILTER_SANITIZE_STRING); |
|
| 2396 | 2396 | |
| 2397 | 2397 | $Connection = new Connection($this->db); |
| 2398 | 2398 | if (!$Connection->tableExists('countries')) return ''; |
@@ -2440,7 +2440,7 @@ discard block |
||
| 2440 | 2440 | |
| 2441 | 2441 | $bitly_data = json_decode($bitly_data); |
| 2442 | 2442 | $bitly_url = ''; |
| 2443 | - if ($bitly_data->status_txt = "OK"){ |
|
| 2443 | + if ($bitly_data->status_txt = "OK") { |
|
| 2444 | 2444 | $bitly_url = $bitly_data->data->url; |
| 2445 | 2445 | } |
| 2446 | 2446 | |
@@ -2460,11 +2460,11 @@ discard block |
||
| 2460 | 2460 | * @param string $day |
| 2461 | 2461 | * @return array the vessel type list |
| 2462 | 2462 | */ |
| 2463 | - public function countAllMarineTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '') |
|
| 2463 | + public function countAllMarineTypes($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '') |
|
| 2464 | 2464 | { |
| 2465 | 2465 | global $globalDBdriver; |
| 2466 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 2467 | - $query = "SELECT marine_output.type AS marine_type, COUNT(marine_output.type) AS marine_type_count, marine_output.type_id AS marine_type_id |
|
| 2466 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 2467 | + $query = "SELECT marine_output.type AS marine_type, COUNT(marine_output.type) AS marine_type_count, marine_output.type_id AS marine_type_id |
|
| 2468 | 2468 | FROM marine_output ".$filter_query." marine_output.type <> '' AND marine_output.type_id IS NOT NULL"; |
| 2469 | 2469 | if ($olderthanmonths > 0) { |
| 2470 | 2470 | if ($globalDBdriver == 'mysql') { |
@@ -2484,28 +2484,28 @@ discard block |
||
| 2484 | 2484 | if ($year != '') { |
| 2485 | 2485 | if ($globalDBdriver == 'mysql') { |
| 2486 | 2486 | $query .= " AND YEAR(marine_output.date) = :year"; |
| 2487 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 2487 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 2488 | 2488 | } else { |
| 2489 | 2489 | $query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year"; |
| 2490 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 2490 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 2491 | 2491 | } |
| 2492 | 2492 | } |
| 2493 | 2493 | if ($month != '') { |
| 2494 | 2494 | if ($globalDBdriver == 'mysql') { |
| 2495 | 2495 | $query .= " AND MONTH(marine_output.date) = :month"; |
| 2496 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 2496 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 2497 | 2497 | } else { |
| 2498 | 2498 | $query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month"; |
| 2499 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 2499 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 2500 | 2500 | } |
| 2501 | 2501 | } |
| 2502 | 2502 | if ($day != '') { |
| 2503 | 2503 | if ($globalDBdriver == 'mysql') { |
| 2504 | 2504 | $query .= " AND DAY(marine_output.date) = :day"; |
| 2505 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 2505 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 2506 | 2506 | } else { |
| 2507 | 2507 | $query .= " AND EXTRACT(DAY FROM marine_output.date) = :day"; |
| 2508 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 2508 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 2509 | 2509 | } |
| 2510 | 2510 | } |
| 2511 | 2511 | $query .= " GROUP BY marine_output.type, marine_output.type_id ORDER BY marine_type_count DESC"; |
@@ -2514,9 +2514,9 @@ discard block |
||
| 2514 | 2514 | $sth->execute($query_values); |
| 2515 | 2515 | $marine_array = array(); |
| 2516 | 2516 | $temp_array = array(); |
| 2517 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2517 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2518 | 2518 | { |
| 2519 | - $temp_array['marine_type'] = html_entity_decode($row['marine_type'],ENT_QUOTES); |
|
| 2519 | + $temp_array['marine_type'] = html_entity_decode($row['marine_type'], ENT_QUOTES); |
|
| 2520 | 2520 | $temp_array['marine_type_id'] = $row['marine_type_id']; |
| 2521 | 2521 | $temp_array['marine_type_count'] = $row['marine_type_count']; |
| 2522 | 2522 | $marine_array[] = $temp_array; |
@@ -2545,13 +2545,13 @@ discard block |
||
| 2545 | 2545 | * @param array $filters |
| 2546 | 2546 | * @return array the tracker information |
| 2547 | 2547 | */ |
| 2548 | - public function searchMarineData($q = '', $callsign = '',$mmsi = '', $imo = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '',$captain_id = '',$captain_name = '',$race_id = '',$race_name = '',$filters = array()) |
|
| 2548 | + public function searchMarineData($q = '', $callsign = '', $mmsi = '', $imo = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '', $captain_id = '', $captain_name = '', $race_id = '', $race_name = '', $filters = array()) |
|
| 2549 | 2549 | { |
| 2550 | 2550 | global $globalTimezone, $globalDBdriver; |
| 2551 | 2551 | date_default_timezone_set('UTC'); |
| 2552 | 2552 | $query_values = array(); |
| 2553 | 2553 | $additional_query = ''; |
| 2554 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 2554 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 2555 | 2555 | if ($q != "") |
| 2556 | 2556 | { |
| 2557 | 2557 | if (!is_string($q)) |
@@ -2559,8 +2559,8 @@ discard block |
||
| 2559 | 2559 | return array(); |
| 2560 | 2560 | } else { |
| 2561 | 2561 | $q_array = explode(" ", $q); |
| 2562 | - foreach ($q_array as $q_item){ |
|
| 2563 | - $q_item = filter_var($q_item,FILTER_SANITIZE_STRING); |
|
| 2562 | + foreach ($q_array as $q_item) { |
|
| 2563 | + $q_item = filter_var($q_item, FILTER_SANITIZE_STRING); |
|
| 2564 | 2564 | $additional_query .= " AND ("; |
| 2565 | 2565 | if (is_int($q_item)) $additional_query .= "(marine_output.marine_id = '".$q_item."') OR "; |
| 2566 | 2566 | if (is_int($q_item)) $additional_query .= "(marine_output.mmsi = '".$q_item."') OR "; |
@@ -2576,86 +2576,86 @@ discard block |
||
| 2576 | 2576 | } |
| 2577 | 2577 | if ($callsign != "") |
| 2578 | 2578 | { |
| 2579 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 2579 | + $callsign = filter_var($callsign, FILTER_SANITIZE_STRING); |
|
| 2580 | 2580 | if (!is_string($callsign)) |
| 2581 | 2581 | { |
| 2582 | 2582 | return array(); |
| 2583 | 2583 | } else { |
| 2584 | 2584 | $additional_query .= " AND marine_output.ident = :callsign"; |
| 2585 | - $query_values = array_merge($query_values,array(':callsign' => $callsign)); |
|
| 2585 | + $query_values = array_merge($query_values, array(':callsign' => $callsign)); |
|
| 2586 | 2586 | } |
| 2587 | 2587 | } |
| 2588 | 2588 | if ($mmsi != "") |
| 2589 | 2589 | { |
| 2590 | - $mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING); |
|
| 2590 | + $mmsi = filter_var($mmsi, FILTER_SANITIZE_STRING); |
|
| 2591 | 2591 | if (!is_numeric($mmsi)) |
| 2592 | 2592 | { |
| 2593 | 2593 | return array(); |
| 2594 | 2594 | } else { |
| 2595 | 2595 | $additional_query .= " AND marine_output.mmsi = :mmsi"; |
| 2596 | - $query_values = array_merge($query_values,array(':mmsi' => $mmsi)); |
|
| 2596 | + $query_values = array_merge($query_values, array(':mmsi' => $mmsi)); |
|
| 2597 | 2597 | } |
| 2598 | 2598 | } |
| 2599 | 2599 | if ($imo != "") |
| 2600 | 2600 | { |
| 2601 | - $imo = filter_var($imo,FILTER_SANITIZE_STRING); |
|
| 2601 | + $imo = filter_var($imo, FILTER_SANITIZE_STRING); |
|
| 2602 | 2602 | if (!is_numeric($imo)) |
| 2603 | 2603 | { |
| 2604 | 2604 | return array(); |
| 2605 | 2605 | } else { |
| 2606 | 2606 | $additional_query .= " AND marine_output.imo = :imo"; |
| 2607 | - $query_values = array_merge($query_values,array(':imo' => $imo)); |
|
| 2607 | + $query_values = array_merge($query_values, array(':imo' => $imo)); |
|
| 2608 | 2608 | } |
| 2609 | 2609 | } |
| 2610 | 2610 | if ($captain_id != "") |
| 2611 | 2611 | { |
| 2612 | - $captain_id = filter_var($captain_id,FILTER_SANITIZE_STRING); |
|
| 2612 | + $captain_id = filter_var($captain_id, FILTER_SANITIZE_STRING); |
|
| 2613 | 2613 | if (!is_numeric($captain_id)) |
| 2614 | 2614 | { |
| 2615 | 2615 | return array(); |
| 2616 | 2616 | } else { |
| 2617 | 2617 | $additional_query .= " AND marine_output.captain_id = :captain_id"; |
| 2618 | - $query_values = array_merge($query_values,array(':captain_id' => $captain_id)); |
|
| 2618 | + $query_values = array_merge($query_values, array(':captain_id' => $captain_id)); |
|
| 2619 | 2619 | } |
| 2620 | 2620 | } |
| 2621 | 2621 | if ($race_id != "") |
| 2622 | 2622 | { |
| 2623 | - $race_id = filter_var($race_id,FILTER_SANITIZE_STRING); |
|
| 2623 | + $race_id = filter_var($race_id, FILTER_SANITIZE_STRING); |
|
| 2624 | 2624 | if (!is_numeric($race_id)) |
| 2625 | 2625 | { |
| 2626 | 2626 | return array(); |
| 2627 | 2627 | } else { |
| 2628 | 2628 | $additional_query .= " AND marine_output.race_id = :race_id"; |
| 2629 | - $query_values = array_merge($query_values,array(':race_id' => $race_id)); |
|
| 2629 | + $query_values = array_merge($query_values, array(':race_id' => $race_id)); |
|
| 2630 | 2630 | } |
| 2631 | 2631 | } |
| 2632 | 2632 | if ($captain_name != "") |
| 2633 | 2633 | { |
| 2634 | - $captain_name = filter_var($captain_name,FILTER_SANITIZE_STRING); |
|
| 2634 | + $captain_name = filter_var($captain_name, FILTER_SANITIZE_STRING); |
|
| 2635 | 2635 | if (!is_string($captain_name)) |
| 2636 | 2636 | { |
| 2637 | 2637 | return array(); |
| 2638 | 2638 | } else { |
| 2639 | 2639 | $additional_query .= " AND marine_output.captain_name = :captain_name"; |
| 2640 | - $query_values = array_merge($query_values,array(':captain_name' => $captain_name)); |
|
| 2640 | + $query_values = array_merge($query_values, array(':captain_name' => $captain_name)); |
|
| 2641 | 2641 | } |
| 2642 | 2642 | } |
| 2643 | 2643 | if ($race_name != "") |
| 2644 | 2644 | { |
| 2645 | - $race_name = filter_var($race_name,FILTER_SANITIZE_STRING); |
|
| 2645 | + $race_name = filter_var($race_name, FILTER_SANITIZE_STRING); |
|
| 2646 | 2646 | if (!is_numeric($race_name)) |
| 2647 | 2647 | { |
| 2648 | 2648 | return array(); |
| 2649 | 2649 | } else { |
| 2650 | 2650 | $additional_query .= " AND marine_output.race_name = :race_name"; |
| 2651 | - $query_values = array_merge($query_values,array(':race_name' => $race_name)); |
|
| 2651 | + $query_values = array_merge($query_values, array(':race_name' => $race_name)); |
|
| 2652 | 2652 | } |
| 2653 | 2653 | } |
| 2654 | 2654 | if ($date_posted != "") |
| 2655 | 2655 | { |
| 2656 | 2656 | $date_array = explode(",", $date_posted); |
| 2657 | - $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 2658 | - $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 2657 | + $date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING); |
|
| 2658 | + $date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING); |
|
| 2659 | 2659 | if ($globalTimezone != '') { |
| 2660 | 2660 | date_default_timezone_set($globalTimezone); |
| 2661 | 2661 | $datetime = new DateTime(); |
@@ -2682,8 +2682,8 @@ discard block |
||
| 2682 | 2682 | if ($limit != "") |
| 2683 | 2683 | { |
| 2684 | 2684 | $limit_array = explode(",", $limit); |
| 2685 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 2686 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 2685 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 2686 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 2687 | 2687 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 2688 | 2688 | { |
| 2689 | 2689 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
@@ -2701,22 +2701,22 @@ discard block |
||
| 2701 | 2701 | } |
| 2702 | 2702 | } |
| 2703 | 2703 | if ($origLat != "" && $origLon != "" && $dist != "") { |
| 2704 | - $dist = number_format($dist*0.621371,2,'.',''); // convert km to mile |
|
| 2704 | + $dist = number_format($dist*0.621371, 2, '.', ''); // convert km to mile |
|
| 2705 | 2705 | if ($globalDBdriver == 'mysql') { |
| 2706 | - $query="SELECT marine_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - marine_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(marine_archive.latitude*pi()/180)*POWER(SIN(($origLon-marine_archive.longitude)*pi()/180/2),2))) as distance |
|
| 2706 | + $query = "SELECT marine_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - marine_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(marine_archive.latitude*pi()/180)*POWER(SIN(($origLon-marine_archive.longitude)*pi()/180/2),2))) as distance |
|
| 2707 | 2707 | FROM marine_archive,marine_output".$filter_query." marine_output.fammarine_id = marine_archive.fammarine_id AND marine_output.ident <> '' ".$additional_query."AND marine_archive.longitude between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat)*69)) and marine_archive.latitude between ($origLat-($dist/69)) and ($origLat+($dist/69)) |
| 2708 | 2708 | AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - marine_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(marine_archive.latitude*pi()/180)*POWER(SIN(($origLon-marine_archive.longitude)*pi()/180/2),2)))) < $dist".$orderby_query; |
| 2709 | 2709 | } else { |
| 2710 | - $query="SELECT marine_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(marine_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(marine_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
| 2710 | + $query = "SELECT marine_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(marine_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(marine_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
| 2711 | 2711 | FROM marine_archive,marine_output".$filter_query." marine_output.fammarine_id = marine_archive.fammarine_id AND marine_output.ident <> '' ".$additional_query."AND CAST(marine_archive.longitude as double precision) between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat))*69) and CAST(marine_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) |
| 2712 | 2712 | AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(marine_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(marine_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query.$orderby_query; |
| 2713 | 2713 | } |
| 2714 | 2714 | } else { |
| 2715 | - $query = "SELECT marine_output.* FROM marine_output".$filter_query." marine_output.ident <> '' |
|
| 2715 | + $query = "SELECT marine_output.* FROM marine_output".$filter_query." marine_output.ident <> '' |
|
| 2716 | 2716 | ".$additional_query." |
| 2717 | 2717 | ".$orderby_query; |
| 2718 | 2718 | } |
| 2719 | - $marine_array = $this->getDataFromDB($query, $query_values,$limit_query); |
|
| 2719 | + $marine_array = $this->getDataFromDB($query, $query_values, $limit_query); |
|
| 2720 | 2720 | return $marine_array; |
| 2721 | 2721 | } |
| 2722 | 2722 | |
@@ -2728,12 +2728,12 @@ discard block |
||
| 2728 | 2728 | */ |
| 2729 | 2729 | public function checkId($id) |
| 2730 | 2730 | { |
| 2731 | - $query = 'SELECT marine_output.ident, marine_output.fammarine_id FROM marine_output WHERE marine_output.fammarine_id = :id'; |
|
| 2731 | + $query = 'SELECT marine_output.ident, marine_output.fammarine_id FROM marine_output WHERE marine_output.fammarine_id = :id'; |
|
| 2732 | 2732 | $query_data = array(':id' => $id); |
| 2733 | 2733 | $sth = $this->db->prepare($query); |
| 2734 | 2734 | $sth->execute($query_data); |
| 2735 | - $ident_result=''; |
|
| 2736 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2735 | + $ident_result = ''; |
|
| 2736 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2737 | 2737 | { |
| 2738 | 2738 | $ident_result = $row['fammarine_id']; |
| 2739 | 2739 | } |
@@ -2748,7 +2748,7 @@ discard block |
||
| 2748 | 2748 | */ |
| 2749 | 2749 | public function getRaceByName($race_name) |
| 2750 | 2750 | { |
| 2751 | - $race_name = filter_var($race_name,FILTER_SANITIZE_STRING); |
|
| 2751 | + $race_name = filter_var($race_name, FILTER_SANITIZE_STRING); |
|
| 2752 | 2752 | $query = "SELECT * FROM marine_race WHERE race_name = :race_name LIMIT 1"; |
| 2753 | 2753 | $sth = $this->db->prepare($query); |
| 2754 | 2754 | $sth->execute(array(':race_name' => $race_name)); |
@@ -2765,7 +2765,7 @@ discard block |
||
| 2765 | 2765 | */ |
| 2766 | 2766 | public function getRace($race_id) |
| 2767 | 2767 | { |
| 2768 | - $race_id = filter_var($race_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 2768 | + $race_id = filter_var($race_id, FILTER_SANITIZE_NUMBER_INT); |
|
| 2769 | 2769 | $query = "SELECT * FROM marine_race WHERE race_id = :race_id LIMIT 1"; |
| 2770 | 2770 | $sth = $this->db->prepare($query); |
| 2771 | 2771 | $sth->execute(array(':race_id' => $race_id)); |
@@ -2783,24 +2783,24 @@ discard block |
||
| 2783 | 2783 | * @param $race_startdate |
| 2784 | 2784 | * @param $race_markers |
| 2785 | 2785 | */ |
| 2786 | - public function addRace($race_id,$race_name,$race_creator,$race_desc,$race_startdate,$race_markers) |
|
| 2786 | + public function addRace($race_id, $race_name, $race_creator, $race_desc, $race_startdate, $race_markers) |
|
| 2787 | 2787 | { |
| 2788 | - $race_id = filter_var($race_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 2788 | + $race_id = filter_var($race_id, FILTER_SANITIZE_NUMBER_INT); |
|
| 2789 | 2789 | if ($race_id != '') { |
| 2790 | - $race_name = filter_var($race_name,FILTER_SANITIZE_STRING); |
|
| 2791 | - $race_creator = filter_var($race_creator,FILTER_SANITIZE_STRING); |
|
| 2792 | - $race_desc = filter_var($race_desc,FILTER_SANITIZE_STRING); |
|
| 2793 | - $race_startdate = filter_var($race_startdate,FILTER_SANITIZE_STRING); |
|
| 2790 | + $race_name = filter_var($race_name, FILTER_SANITIZE_STRING); |
|
| 2791 | + $race_creator = filter_var($race_creator, FILTER_SANITIZE_STRING); |
|
| 2792 | + $race_desc = filter_var($race_desc, FILTER_SANITIZE_STRING); |
|
| 2793 | + $race_startdate = filter_var($race_startdate, FILTER_SANITIZE_STRING); |
|
| 2794 | 2794 | //$race_markers = filter_var($race_markers,FILTER_SANITIZE_STRING); |
| 2795 | 2795 | $allrace = $this->getRace($race_id); |
| 2796 | 2796 | if (empty($allrace)) { |
| 2797 | 2797 | $query = "INSERT INTO marine_race (race_id,race_name,race_creator,race_desc,race_startdate,race_markers) VALUES (:race_id,:race_name,:race_creator,:race_desc,:race_startdate,:race_markers)"; |
| 2798 | 2798 | $sth = $this->db->prepare($query); |
| 2799 | - $sth->execute(array(':race_id' => $race_id,':race_name' => $race_name,':race_creator' => $race_creator,':race_desc' => $race_desc,':race_startdate' => $race_startdate,':race_markers' => $race_markers)); |
|
| 2799 | + $sth->execute(array(':race_id' => $race_id, ':race_name' => $race_name, ':race_creator' => $race_creator, ':race_desc' => $race_desc, ':race_startdate' => $race_startdate, ':race_markers' => $race_markers)); |
|
| 2800 | 2800 | } elseif ($race_id != '') { |
| 2801 | - $query = "UPDATE marine_race SET race_name = :race_name,race_desc = :race_desc,race_startdate = :race_startdate,race_markers = :race_markers WHERE race_id = :race_id"; |
|
| 2801 | + $query = "UPDATE marine_race SET race_name = :race_name,race_desc = :race_desc,race_startdate = :race_startdate,race_markers = :race_markers WHERE race_id = :race_id"; |
|
| 2802 | 2802 | $sth = $this->db->prepare($query); |
| 2803 | - $sth->execute(array(':race_id' => $race_id,':race_name' => $race_name,':race_desc' => $race_desc,':race_startdate' => $race_startdate,':race_markers' => $race_markers)); |
|
| 2803 | + $sth->execute(array(':race_id' => $race_id, ':race_name' => $race_name, ':race_desc' => $race_desc, ':race_startdate' => $race_startdate, ':race_markers' => $race_markers)); |
|
| 2804 | 2804 | } |
| 2805 | 2805 | } |
| 2806 | 2806 | } |
@@ -2809,7 +2809,7 @@ discard block |
||
| 2809 | 2809 | |
| 2810 | 2810 | public function getOrderBy() |
| 2811 | 2811 | { |
| 2812 | - $orderby = array("type_asc" => array("key" => "type_asc", "value" => "Type - ASC", "sql" => "ORDER BY marine_output.type ASC"), "type_desc" => array("key" => "type_desc", "value" => "Type - DESC", "sql" => "ORDER BY marine_output.type DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY marine_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY marine_output.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY marine_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY marine_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY marine_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY marine_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure port - ASC", "sql" => "ORDER BY marine_output.departure_port_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY marine_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY marine_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY marine_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY marine_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY marine_output.date DESC"),"distance_asc" => array("key" => "distance_asc","value" => "Distance - ASC","sql" => "ORDER BY distance ASC"),"distance_desc" => array("key" => "distance_desc","value" => "Distance - DESC","sql" => "ORDER BY distance DESC")); |
|
| 2812 | + $orderby = array("type_asc" => array("key" => "type_asc", "value" => "Type - ASC", "sql" => "ORDER BY marine_output.type ASC"), "type_desc" => array("key" => "type_desc", "value" => "Type - DESC", "sql" => "ORDER BY marine_output.type DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY marine_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY marine_output.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY marine_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY marine_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY marine_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY marine_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure port - ASC", "sql" => "ORDER BY marine_output.departure_port_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY marine_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY marine_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY marine_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY marine_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY marine_output.date DESC"), "distance_asc" => array("key" => "distance_asc", "value" => "Distance - ASC", "sql" => "ORDER BY distance ASC"), "distance_desc" => array("key" => "distance_desc", "value" => "Distance - DESC", "sql" => "ORDER BY distance DESC")); |
|
| 2813 | 2813 | return $orderby; |
| 2814 | 2814 | } |
| 2815 | 2815 | |
@@ -13,10 +13,10 @@ discard block |
||
| 13 | 13 | |
| 14 | 14 | |
| 15 | 15 | /** |
| 16 | - * Get SQL query part for filter used |
|
| 17 | - * @param array $filter the filter |
|
| 18 | - * @return string the SQL part |
|
| 19 | - */ |
|
| 16 | + * Get SQL query part for filter used |
|
| 17 | + * @param array $filter the filter |
|
| 18 | + * @return string the SQL part |
|
| 19 | + */ |
|
| 20 | 20 | public function getFilter($filter = array(),$where = false,$and = false) { |
| 21 | 21 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 22 | 22 | $filters = array(); |
@@ -138,14 +138,14 @@ discard block |
||
| 138 | 138 | return $filter_query; |
| 139 | 139 | } |
| 140 | 140 | |
| 141 | - /** |
|
| 142 | - * Gets all the spotter information based on the latest data entry |
|
| 143 | - * |
|
| 144 | - * @param string $limit |
|
| 145 | - * @param string $sort |
|
| 146 | - * @param array $filter |
|
| 147 | - * @return array the spotter information |
|
| 148 | - */ |
|
| 141 | + /** |
|
| 142 | + * Gets all the spotter information based on the latest data entry |
|
| 143 | + * |
|
| 144 | + * @param string $limit |
|
| 145 | + * @param string $sort |
|
| 146 | + * @param array $filter |
|
| 147 | + * @return array the spotter information |
|
| 148 | + */ |
|
| 149 | 149 | public function getLiveSpotterData($limit = '', $sort = '', $filter = array()) |
| 150 | 150 | { |
| 151 | 151 | global $globalDBdriver, $globalLiveInterval; |
@@ -187,13 +187,13 @@ discard block |
||
| 187 | 187 | return $spotter_array; |
| 188 | 188 | } |
| 189 | 189 | |
| 190 | - /** |
|
| 191 | - * Gets Minimal Live Spotter data |
|
| 192 | - * |
|
| 193 | - * @param int $limit |
|
| 194 | - * @param array $filter |
|
| 195 | - * @return array the spotter information |
|
| 196 | - */ |
|
| 190 | + /** |
|
| 191 | + * Gets Minimal Live Spotter data |
|
| 192 | + * |
|
| 193 | + * @param int $limit |
|
| 194 | + * @param array $filter |
|
| 195 | + * @return array the spotter information |
|
| 196 | + */ |
|
| 197 | 197 | public function getMinLiveSpotterData($limit = 0,$filter = array()) |
| 198 | 198 | { |
| 199 | 199 | global $globalDBdriver, $globalLiveInterval, $globalArchive, $globalMap2DAircraftsLimit; |
@@ -244,15 +244,15 @@ discard block |
||
| 244 | 244 | return $spotter_array; |
| 245 | 245 | } |
| 246 | 246 | |
| 247 | - /** |
|
| 248 | - * Gets Minimal Live Spotter data since xx seconds |
|
| 249 | - * |
|
| 250 | - * @param array $coord |
|
| 251 | - * @param array $filter |
|
| 252 | - * @param int $limit |
|
| 253 | - * @param string $id |
|
| 254 | - * @return array the spotter information |
|
| 255 | - */ |
|
| 247 | + /** |
|
| 248 | + * Gets Minimal Live Spotter data since xx seconds |
|
| 249 | + * |
|
| 250 | + * @param array $coord |
|
| 251 | + * @param array $filter |
|
| 252 | + * @param int $limit |
|
| 253 | + * @param string $id |
|
| 254 | + * @return array the spotter information |
|
| 255 | + */ |
|
| 256 | 256 | public function getMinLastLiveSpotterData($coord = array(),$filter = array(), $limit = 0, $id = '') |
| 257 | 257 | { |
| 258 | 258 | global $globalDBdriver, $globalLiveInterval, $globalArchive, $globalMap3DAircraftsLimit; |
@@ -354,14 +354,14 @@ discard block |
||
| 354 | 354 | return $spotter_array; |
| 355 | 355 | } |
| 356 | 356 | |
| 357 | - /** |
|
| 358 | - * Gets Minimal Live Spotter data since xx seconds |
|
| 359 | - * |
|
| 360 | - * @param string $id |
|
| 361 | - * @param array $filter |
|
| 362 | - * @param int $limit |
|
| 363 | - * @return array the spotter information |
|
| 364 | - */ |
|
| 357 | + /** |
|
| 358 | + * Gets Minimal Live Spotter data since xx seconds |
|
| 359 | + * |
|
| 360 | + * @param string $id |
|
| 361 | + * @param array $filter |
|
| 362 | + * @param int $limit |
|
| 363 | + * @return array the spotter information |
|
| 364 | + */ |
|
| 365 | 365 | public function getMinLastLiveSpotterDataByID($id = '',$filter = array(), $limit = 0) |
| 366 | 366 | { |
| 367 | 367 | global $globalDBdriver, $globalLiveInterval, $globalArchive, $globalMap3DAircraftsLimit; |
@@ -426,12 +426,12 @@ discard block |
||
| 426 | 426 | return $spotter_array; |
| 427 | 427 | } |
| 428 | 428 | |
| 429 | - /** |
|
| 430 | - * Gets number of latest data entry |
|
| 431 | - * |
|
| 432 | - * @param array $filter |
|
| 433 | - * @return String number of entry |
|
| 434 | - */ |
|
| 429 | + /** |
|
| 430 | + * Gets number of latest data entry |
|
| 431 | + * |
|
| 432 | + * @param array $filter |
|
| 433 | + * @return String number of entry |
|
| 434 | + */ |
|
| 435 | 435 | public function getLiveSpotterCount($filter = array()) |
| 436 | 436 | { |
| 437 | 437 | global $globalDBdriver, $globalLiveInterval; |
@@ -457,13 +457,13 @@ discard block |
||
| 457 | 457 | return $result['nb']; |
| 458 | 458 | } |
| 459 | 459 | |
| 460 | - /** |
|
| 461 | - * Gets all the spotter information based on the latest data entry and coord |
|
| 462 | - * |
|
| 463 | - * @param $coord |
|
| 464 | - * @param array $filter |
|
| 465 | - * @return array the spotter information |
|
| 466 | - */ |
|
| 460 | + /** |
|
| 461 | + * Gets all the spotter information based on the latest data entry and coord |
|
| 462 | + * |
|
| 463 | + * @param $coord |
|
| 464 | + * @param array $filter |
|
| 465 | + * @return array the spotter information |
|
| 466 | + */ |
|
| 467 | 467 | public function getLiveSpotterDatabyCoord($coord, $filter = array()) |
| 468 | 468 | { |
| 469 | 469 | global $globalDBdriver, $globalLiveInterval,$globalMap2DAircraftsLimit; |
@@ -490,14 +490,14 @@ discard block |
||
| 490 | 490 | return $spotter_array; |
| 491 | 491 | } |
| 492 | 492 | |
| 493 | - /** |
|
| 494 | - * Gets all the spotter information based on the latest data entry and coord |
|
| 495 | - * |
|
| 496 | - * @param $coord |
|
| 497 | - * @param int $limit |
|
| 498 | - * @param array $filter |
|
| 499 | - * @return array the spotter information |
|
| 500 | - */ |
|
| 493 | + /** |
|
| 494 | + * Gets all the spotter information based on the latest data entry and coord |
|
| 495 | + * |
|
| 496 | + * @param $coord |
|
| 497 | + * @param int $limit |
|
| 498 | + * @param array $filter |
|
| 499 | + * @return array the spotter information |
|
| 500 | + */ |
|
| 501 | 501 | public function getMinLiveSpotterDatabyCoord($coord,$limit = 0, $filter = array()) |
| 502 | 502 | { |
| 503 | 503 | global $globalDBdriver, $globalLiveInterval, $globalArchive,$globalMap2DAircraftsLimit; |
@@ -587,15 +587,15 @@ discard block |
||
| 587 | 587 | return $spotter_array; |
| 588 | 588 | } |
| 589 | 589 | |
| 590 | - /** |
|
| 591 | - * Gets all the spotter information based on a user's latitude and longitude |
|
| 592 | - * |
|
| 593 | - * @param $lat |
|
| 594 | - * @param $lng |
|
| 595 | - * @param $radius |
|
| 596 | - * @param $interval |
|
| 597 | - * @return array the spotter information |
|
| 598 | - */ |
|
| 590 | + /** |
|
| 591 | + * Gets all the spotter information based on a user's latitude and longitude |
|
| 592 | + * |
|
| 593 | + * @param $lat |
|
| 594 | + * @param $lng |
|
| 595 | + * @param $radius |
|
| 596 | + * @param $interval |
|
| 597 | + * @return array the spotter information |
|
| 598 | + */ |
|
| 599 | 599 | public function getLatestSpotterForLayar($lat, $lng, $radius, $interval) |
| 600 | 600 | { |
| 601 | 601 | $Spotter = new Spotter($this->db); |
@@ -605,95 +605,95 @@ discard block |
||
| 605 | 605 | return array(); |
| 606 | 606 | } |
| 607 | 607 | } |
| 608 | - if ($lng != '') |
|
| 609 | - { |
|
| 610 | - if (!is_numeric($lng)) |
|
| 611 | - { |
|
| 612 | - return array(); |
|
| 613 | - } |
|
| 614 | - } |
|
| 615 | - if ($radius != '') |
|
| 616 | - { |
|
| 617 | - if (!is_numeric($radius)) |
|
| 618 | - { |
|
| 619 | - return array(); |
|
| 620 | - } |
|
| 621 | - } |
|
| 608 | + if ($lng != '') |
|
| 609 | + { |
|
| 610 | + if (!is_numeric($lng)) |
|
| 611 | + { |
|
| 612 | + return array(); |
|
| 613 | + } |
|
| 614 | + } |
|
| 615 | + if ($radius != '') |
|
| 616 | + { |
|
| 617 | + if (!is_numeric($radius)) |
|
| 618 | + { |
|
| 619 | + return array(); |
|
| 620 | + } |
|
| 621 | + } |
|
| 622 | 622 | $additional_query = ''; |
| 623 | - if ($interval != '') |
|
| 624 | - { |
|
| 625 | - if (!is_string($interval)) |
|
| 626 | - { |
|
| 627 | - return array(); |
|
| 628 | - } else { |
|
| 629 | - if ($interval == '1m') |
|
| 630 | - { |
|
| 631 | - $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
|
| 632 | - } else if ($interval == '15m'){ |
|
| 633 | - $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date '; |
|
| 634 | - } |
|
| 635 | - } |
|
| 636 | - } else { |
|
| 637 | - $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
|
| 638 | - } |
|
| 639 | - $query = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live |
|
| 623 | + if ($interval != '') |
|
| 624 | + { |
|
| 625 | + if (!is_string($interval)) |
|
| 626 | + { |
|
| 627 | + return array(); |
|
| 628 | + } else { |
|
| 629 | + if ($interval == '1m') |
|
| 630 | + { |
|
| 631 | + $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
|
| 632 | + } else if ($interval == '15m'){ |
|
| 633 | + $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date '; |
|
| 634 | + } |
|
| 635 | + } |
|
| 636 | + } else { |
|
| 637 | + $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
|
| 638 | + } |
|
| 639 | + $query = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live |
|
| 640 | 640 | WHERE spotter_live.latitude <> '' |
| 641 | 641 | AND spotter_live.longitude <> '' |
| 642 | 642 | ".$additional_query." |
| 643 | 643 | HAVING distance < :radius |
| 644 | 644 | ORDER BY distance"; |
| 645 | 645 | |
| 646 | - $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius)); |
|
| 647 | - return $spotter_array; |
|
| 648 | - } |
|
| 646 | + $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius)); |
|
| 647 | + return $spotter_array; |
|
| 648 | + } |
|
| 649 | 649 | |
| 650 | 650 | |
| 651 | - /** |
|
| 652 | - * Gets all the spotter information based on a particular callsign |
|
| 653 | - * |
|
| 654 | - * @param $ident |
|
| 655 | - * @return array the spotter information |
|
| 656 | - */ |
|
| 651 | + /** |
|
| 652 | + * Gets all the spotter information based on a particular callsign |
|
| 653 | + * |
|
| 654 | + * @param $ident |
|
| 655 | + * @return array the spotter information |
|
| 656 | + */ |
|
| 657 | 657 | public function getLastLiveSpotterDataByIdent($ident) |
| 658 | 658 | { |
| 659 | 659 | $Spotter = new Spotter($this->db); |
| 660 | 660 | date_default_timezone_set('UTC'); |
| 661 | 661 | |
| 662 | 662 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 663 | - $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 663 | + $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 664 | 664 | |
| 665 | 665 | $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident),'',true); |
| 666 | 666 | |
| 667 | 667 | return $spotter_array; |
| 668 | 668 | } |
| 669 | 669 | |
| 670 | - /** |
|
| 671 | - * Gets all the spotter information based on a particular callsign |
|
| 672 | - * |
|
| 673 | - * @param $ident |
|
| 674 | - * @param $date |
|
| 675 | - * @return array the spotter information |
|
| 676 | - */ |
|
| 670 | + /** |
|
| 671 | + * Gets all the spotter information based on a particular callsign |
|
| 672 | + * |
|
| 673 | + * @param $ident |
|
| 674 | + * @param $date |
|
| 675 | + * @return array the spotter information |
|
| 676 | + */ |
|
| 677 | 677 | public function getDateLiveSpotterDataByIdent($ident,$date) |
| 678 | 678 | { |
| 679 | 679 | $Spotter = new Spotter($this->db); |
| 680 | 680 | date_default_timezone_set('UTC'); |
| 681 | 681 | |
| 682 | 682 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 683 | - $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 683 | + $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 684 | 684 | |
| 685 | - $date = date('c',$date); |
|
| 685 | + $date = date('c',$date); |
|
| 686 | 686 | $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
| 687 | 687 | |
| 688 | 688 | return $spotter_array; |
| 689 | 689 | } |
| 690 | 690 | |
| 691 | - /** |
|
| 692 | - * Gets last spotter information based on a particular callsign |
|
| 693 | - * |
|
| 694 | - * @param $id |
|
| 695 | - * @return array the spotter information |
|
| 696 | - */ |
|
| 691 | + /** |
|
| 692 | + * Gets last spotter information based on a particular callsign |
|
| 693 | + * |
|
| 694 | + * @param $id |
|
| 695 | + * @return array the spotter information |
|
| 696 | + */ |
|
| 697 | 697 | public function getLastLiveSpotterDataById($id) |
| 698 | 698 | { |
| 699 | 699 | $Spotter = new Spotter($this->db); |
@@ -704,13 +704,13 @@ discard block |
||
| 704 | 704 | return $spotter_array; |
| 705 | 705 | } |
| 706 | 706 | |
| 707 | - /** |
|
| 708 | - * Gets last spotter information based on a particular callsign |
|
| 709 | - * |
|
| 710 | - * @param $id |
|
| 711 | - * @param $date |
|
| 712 | - * @return array the spotter information |
|
| 713 | - */ |
|
| 707 | + /** |
|
| 708 | + * Gets last spotter information based on a particular callsign |
|
| 709 | + * |
|
| 710 | + * @param $id |
|
| 711 | + * @param $date |
|
| 712 | + * @return array the spotter information |
|
| 713 | + */ |
|
| 714 | 714 | public function getDateLiveSpotterDataById($id,$date) |
| 715 | 715 | { |
| 716 | 716 | $Spotter = new Spotter($this->db); |
@@ -723,21 +723,21 @@ discard block |
||
| 723 | 723 | return $spotter_array; |
| 724 | 724 | } |
| 725 | 725 | |
| 726 | - /** |
|
| 727 | - * Gets altitude information based on a particular callsign |
|
| 728 | - * |
|
| 729 | - * @param $ident |
|
| 730 | - * @return array the spotter information |
|
| 731 | - */ |
|
| 726 | + /** |
|
| 727 | + * Gets altitude information based on a particular callsign |
|
| 728 | + * |
|
| 729 | + * @param $ident |
|
| 730 | + * @return array the spotter information |
|
| 731 | + */ |
|
| 732 | 732 | public function getAltitudeLiveSpotterDataByIdent($ident) |
| 733 | 733 | { |
| 734 | 734 | |
| 735 | 735 | date_default_timezone_set('UTC'); |
| 736 | 736 | |
| 737 | 737 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 738 | - $query = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident'; |
|
| 738 | + $query = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident'; |
|
| 739 | 739 | |
| 740 | - try { |
|
| 740 | + try { |
|
| 741 | 741 | |
| 742 | 742 | $sth = $this->db->prepare($query); |
| 743 | 743 | $sth->execute(array(':ident' => $ident)); |
@@ -750,13 +750,13 @@ discard block |
||
| 750 | 750 | return $spotter_array; |
| 751 | 751 | } |
| 752 | 752 | |
| 753 | - /** |
|
| 754 | - * Gets all the spotter information based on a particular id |
|
| 755 | - * |
|
| 756 | - * @param $id |
|
| 757 | - * @param bool $liveinterval |
|
| 758 | - * @return array the spotter information |
|
| 759 | - */ |
|
| 753 | + /** |
|
| 754 | + * Gets all the spotter information based on a particular id |
|
| 755 | + * |
|
| 756 | + * @param $id |
|
| 757 | + * @param bool $liveinterval |
|
| 758 | + * @return array the spotter information |
|
| 759 | + */ |
|
| 760 | 760 | public function getAllLiveSpotterDataById($id,$liveinterval = false) |
| 761 | 761 | { |
| 762 | 762 | global $globalDBdriver, $globalLiveInterval; |
@@ -784,18 +784,18 @@ discard block |
||
| 784 | 784 | return $spotter_array; |
| 785 | 785 | } |
| 786 | 786 | |
| 787 | - /** |
|
| 788 | - * Gets all the spotter information based on a particular ident |
|
| 789 | - * |
|
| 790 | - * @param $ident |
|
| 791 | - * @return array the spotter information |
|
| 792 | - */ |
|
| 787 | + /** |
|
| 788 | + * Gets all the spotter information based on a particular ident |
|
| 789 | + * |
|
| 790 | + * @param $ident |
|
| 791 | + * @return array the spotter information |
|
| 792 | + */ |
|
| 793 | 793 | public function getAllLiveSpotterDataByIdent($ident) |
| 794 | 794 | { |
| 795 | 795 | date_default_timezone_set('UTC'); |
| 796 | 796 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 797 | 797 | $query = self::$global_query.' WHERE spotter_live.ident = :ident'; |
| 798 | - try { |
|
| 798 | + try { |
|
| 799 | 799 | |
| 800 | 800 | $sth = $this->db->prepare($query); |
| 801 | 801 | $sth->execute(array(':ident' => $ident)); |
@@ -809,23 +809,23 @@ discard block |
||
| 809 | 809 | |
| 810 | 810 | |
| 811 | 811 | /** |
| 812 | - * Deletes all info in the table |
|
| 813 | - * |
|
| 814 | - * @return String success or false |
|
| 815 | - * |
|
| 816 | - */ |
|
| 812 | + * Deletes all info in the table |
|
| 813 | + * |
|
| 814 | + * @return String success or false |
|
| 815 | + * |
|
| 816 | + */ |
|
| 817 | 817 | public function deleteLiveSpotterData() |
| 818 | 818 | { |
| 819 | 819 | global $globalDBdriver; |
| 820 | 820 | if ($globalDBdriver == 'mysql') { |
| 821 | 821 | //$query = "DELETE FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE) >= spotter_live.date"; |
| 822 | 822 | $query = 'DELETE FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 9 HOUR) >= spotter_live.date'; |
| 823 | - //$query = "DELETE FROM spotter_live WHERE spotter_live.id IN (SELECT spotter_live.id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= spotter_live.date)"; |
|
| 823 | + //$query = "DELETE FROM spotter_live WHERE spotter_live.id IN (SELECT spotter_live.id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= spotter_live.date)"; |
|
| 824 | 824 | } else { |
| 825 | 825 | $query = "DELETE FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= spotter_live.date"; |
| 826 | 826 | } |
| 827 | 827 | |
| 828 | - try { |
|
| 828 | + try { |
|
| 829 | 829 | |
| 830 | 830 | $sth = $this->db->prepare($query); |
| 831 | 831 | $sth->execute(); |
@@ -837,18 +837,18 @@ discard block |
||
| 837 | 837 | } |
| 838 | 838 | |
| 839 | 839 | /** |
| 840 | - * Deletes all info in the table for aircraft not seen since 2 HOUR |
|
| 841 | - * |
|
| 842 | - * @return String success or false |
|
| 843 | - * |
|
| 844 | - */ |
|
| 840 | + * Deletes all info in the table for aircraft not seen since 2 HOUR |
|
| 841 | + * |
|
| 842 | + * @return String success or false |
|
| 843 | + * |
|
| 844 | + */ |
|
| 845 | 845 | public function deleteLiveSpotterDataNotUpdated() |
| 846 | 846 | { |
| 847 | 847 | global $globalDBdriver, $globalDebug; |
| 848 | 848 | if ($globalDBdriver == 'mysql') { |
| 849 | 849 | //$query = 'SELECT flightaware_id FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) >= spotter_live.date AND spotter_live.flightaware_id NOT IN (SELECT flightaware_id FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) < spotter_live.date) LIMIT 800 OFFSET 0'; |
| 850 | - $query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 2000 OFFSET 0"; |
|
| 851 | - try { |
|
| 850 | + $query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 2000 OFFSET 0"; |
|
| 851 | + try { |
|
| 852 | 852 | |
| 853 | 853 | $sth = $this->db->prepare($query); |
| 854 | 854 | $sth->execute(); |
@@ -856,8 +856,8 @@ discard block |
||
| 856 | 856 | return "error"; |
| 857 | 857 | } |
| 858 | 858 | $query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN ('; |
| 859 | - $i = 0; |
|
| 860 | - $j =0; |
|
| 859 | + $i = 0; |
|
| 860 | + $j =0; |
|
| 861 | 861 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 862 | 862 | foreach($all as $row) |
| 863 | 863 | { |
@@ -865,20 +865,20 @@ discard block |
||
| 865 | 865 | $j++; |
| 866 | 866 | if ($j == 30) { |
| 867 | 867 | if ($globalDebug) echo "."; |
| 868 | - try { |
|
| 868 | + try { |
|
| 869 | 869 | |
| 870 | 870 | $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
| 871 | 871 | $sth->execute(); |
| 872 | 872 | } catch(PDOException $e) { |
| 873 | 873 | return "error"; |
| 874 | 874 | } |
| 875 | - $query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN ('; |
|
| 876 | - $j = 0; |
|
| 875 | + $query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN ('; |
|
| 876 | + $j = 0; |
|
| 877 | 877 | } |
| 878 | 878 | $query_delete .= "'".$row['flightaware_id']."',"; |
| 879 | 879 | } |
| 880 | 880 | if ($i > 0) { |
| 881 | - try { |
|
| 881 | + try { |
|
| 882 | 882 | |
| 883 | 883 | $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
| 884 | 884 | $sth->execute(); |
@@ -889,9 +889,9 @@ discard block |
||
| 889 | 889 | return "success"; |
| 890 | 890 | } elseif ($globalDBdriver == 'pgsql') { |
| 891 | 891 | //$query = "SELECT flightaware_id FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= spotter_live.date AND spotter_live.flightaware_id NOT IN (SELECT flightaware_id FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' < spotter_live.date) LIMIT 800 OFFSET 0"; |
| 892 | - //$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0"; |
|
| 893 | - $query = "DELETE FROM spotter_live WHERE flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 2000 OFFSET 0)"; |
|
| 894 | - try { |
|
| 892 | + //$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0"; |
|
| 893 | + $query = "DELETE FROM spotter_live WHERE flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 2000 OFFSET 0)"; |
|
| 894 | + try { |
|
| 895 | 895 | |
| 896 | 896 | $sth = $this->db->prepare($query); |
| 897 | 897 | $sth->execute(); |
@@ -934,18 +934,18 @@ discard block |
||
| 934 | 934 | } |
| 935 | 935 | } |
| 936 | 936 | |
| 937 | - /** |
|
| 938 | - * Deletes all info in the table for an ident |
|
| 939 | - * |
|
| 940 | - * @param $ident |
|
| 941 | - * @return String success or false |
|
| 942 | - */ |
|
| 937 | + /** |
|
| 938 | + * Deletes all info in the table for an ident |
|
| 939 | + * |
|
| 940 | + * @param $ident |
|
| 941 | + * @return String success or false |
|
| 942 | + */ |
|
| 943 | 943 | public function deleteLiveSpotterDataByIdent($ident) |
| 944 | 944 | { |
| 945 | 945 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 946 | 946 | $query = 'DELETE FROM spotter_live WHERE ident = :ident'; |
| 947 | 947 | |
| 948 | - try { |
|
| 948 | + try { |
|
| 949 | 949 | |
| 950 | 950 | $sth = $this->db->prepare($query); |
| 951 | 951 | $sth->execute(array(':ident' => $ident)); |
@@ -956,18 +956,18 @@ discard block |
||
| 956 | 956 | return "success"; |
| 957 | 957 | } |
| 958 | 958 | |
| 959 | - /** |
|
| 960 | - * Deletes all info in the table for an id |
|
| 961 | - * |
|
| 962 | - * @param $id |
|
| 963 | - * @return String success or false |
|
| 964 | - */ |
|
| 959 | + /** |
|
| 960 | + * Deletes all info in the table for an id |
|
| 961 | + * |
|
| 962 | + * @param $id |
|
| 963 | + * @return String success or false |
|
| 964 | + */ |
|
| 965 | 965 | public function deleteLiveSpotterDataById($id) |
| 966 | 966 | { |
| 967 | 967 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 968 | 968 | $query = 'DELETE FROM spotter_live WHERE flightaware_id = :id'; |
| 969 | 969 | |
| 970 | - try { |
|
| 970 | + try { |
|
| 971 | 971 | |
| 972 | 972 | $sth = $this->db->prepare($query); |
| 973 | 973 | $sth->execute(array(':id' => $id)); |
@@ -979,12 +979,12 @@ discard block |
||
| 979 | 979 | } |
| 980 | 980 | |
| 981 | 981 | |
| 982 | - /** |
|
| 983 | - * Gets the aircraft ident within the last hour |
|
| 984 | - * |
|
| 985 | - * @param $ident |
|
| 986 | - * @return String the ident |
|
| 987 | - */ |
|
| 982 | + /** |
|
| 983 | + * Gets the aircraft ident within the last hour |
|
| 984 | + * |
|
| 985 | + * @param $ident |
|
| 986 | + * @return String the ident |
|
| 987 | + */ |
|
| 988 | 988 | public function getIdentFromLastHour($ident) |
| 989 | 989 | { |
| 990 | 990 | global $globalDBdriver, $globalTimezone; |
@@ -1010,14 +1010,14 @@ discard block |
||
| 1010 | 1010 | $ident_result = $row['ident']; |
| 1011 | 1011 | } |
| 1012 | 1012 | return $ident_result; |
| 1013 | - } |
|
| 1014 | - |
|
| 1015 | - /** |
|
| 1016 | - * Check recent aircraft |
|
| 1017 | - * |
|
| 1018 | - * @param $ident |
|
| 1019 | - * @return String the ident |
|
| 1020 | - */ |
|
| 1013 | + } |
|
| 1014 | + |
|
| 1015 | + /** |
|
| 1016 | + * Check recent aircraft |
|
| 1017 | + * |
|
| 1018 | + * @param $ident |
|
| 1019 | + * @return String the ident |
|
| 1020 | + */ |
|
| 1021 | 1021 | public function checkIdentRecent($ident) |
| 1022 | 1022 | { |
| 1023 | 1023 | global $globalDBdriver, $globalTimezone; |
@@ -1043,14 +1043,14 @@ discard block |
||
| 1043 | 1043 | $ident_result = $row['flightaware_id']; |
| 1044 | 1044 | } |
| 1045 | 1045 | return $ident_result; |
| 1046 | - } |
|
| 1047 | - |
|
| 1048 | - /** |
|
| 1049 | - * Check recent aircraft by id |
|
| 1050 | - * |
|
| 1051 | - * @param $id |
|
| 1052 | - * @return String the ident |
|
| 1053 | - */ |
|
| 1046 | + } |
|
| 1047 | + |
|
| 1048 | + /** |
|
| 1049 | + * Check recent aircraft by id |
|
| 1050 | + * |
|
| 1051 | + * @param $id |
|
| 1052 | + * @return String the ident |
|
| 1053 | + */ |
|
| 1054 | 1054 | public function checkIdRecent($id) |
| 1055 | 1055 | { |
| 1056 | 1056 | global $globalDBdriver, $globalTimezone; |
@@ -1076,14 +1076,14 @@ discard block |
||
| 1076 | 1076 | $ident_result = $row['flightaware_id']; |
| 1077 | 1077 | } |
| 1078 | 1078 | return $ident_result; |
| 1079 | - } |
|
| 1080 | - |
|
| 1081 | - /** |
|
| 1082 | - * Check recent aircraft by ModeS |
|
| 1083 | - * |
|
| 1084 | - * @param $modes |
|
| 1085 | - * @return String the ModeS |
|
| 1086 | - */ |
|
| 1079 | + } |
|
| 1080 | + |
|
| 1081 | + /** |
|
| 1082 | + * Check recent aircraft by ModeS |
|
| 1083 | + * |
|
| 1084 | + * @param $modes |
|
| 1085 | + * @return String the ModeS |
|
| 1086 | + */ |
|
| 1087 | 1087 | public function checkModeSRecent($modes) |
| 1088 | 1088 | { |
| 1089 | 1089 | global $globalDBdriver, $globalTimezone; |
@@ -1112,12 +1112,12 @@ discard block |
||
| 1112 | 1112 | return $ident_result; |
| 1113 | 1113 | } |
| 1114 | 1114 | |
| 1115 | - /** |
|
| 1116 | - * Gets the aircraft data from the last 20 seconds |
|
| 1117 | - * |
|
| 1118 | - * @param string $q |
|
| 1119 | - * @return array the spotter data |
|
| 1120 | - */ |
|
| 1115 | + /** |
|
| 1116 | + * Gets the aircraft data from the last 20 seconds |
|
| 1117 | + * |
|
| 1118 | + * @param string $q |
|
| 1119 | + * @return array the spotter data |
|
| 1120 | + */ |
|
| 1121 | 1121 | public function getRealTimeData($q = '') |
| 1122 | 1122 | { |
| 1123 | 1123 | global $globalDBdriver; |
@@ -1158,39 +1158,39 @@ discard block |
||
| 1158 | 1158 | return $spotter_array; |
| 1159 | 1159 | } |
| 1160 | 1160 | |
| 1161 | - /** |
|
| 1162 | - * Adds a new spotter data |
|
| 1163 | - * |
|
| 1164 | - * @param String $flightaware_id the ID from flightaware |
|
| 1165 | - * @param String $ident the flight ident |
|
| 1166 | - * @param String $aircraft_icao the aircraft type |
|
| 1167 | - * @param String $departure_airport_icao the departure airport |
|
| 1168 | - * @param String $arrival_airport_icao the arrival airport |
|
| 1169 | - * @param string $latitude |
|
| 1170 | - * @param string $longitude |
|
| 1171 | - * @param string $waypoints |
|
| 1172 | - * @param string $altitude |
|
| 1173 | - * @param string $altitude_real |
|
| 1174 | - * @param string $heading |
|
| 1175 | - * @param string $groundspeed |
|
| 1176 | - * @param string $date |
|
| 1177 | - * @param string $departure_airport_time |
|
| 1178 | - * @param string $arrival_airport_time |
|
| 1179 | - * @param string $squawk |
|
| 1180 | - * @param string $route_stop |
|
| 1181 | - * @param string $ModeS |
|
| 1182 | - * @param bool $putinarchive |
|
| 1183 | - * @param string $registration |
|
| 1184 | - * @param string $pilot_id |
|
| 1185 | - * @param string $pilot_name |
|
| 1186 | - * @param string $verticalrate |
|
| 1187 | - * @param bool $noarchive |
|
| 1188 | - * @param bool $ground |
|
| 1189 | - * @param string $format_source |
|
| 1190 | - * @param string $source_name |
|
| 1191 | - * @param string $over_country |
|
| 1192 | - * @return String success or false |
|
| 1193 | - */ |
|
| 1161 | + /** |
|
| 1162 | + * Adds a new spotter data |
|
| 1163 | + * |
|
| 1164 | + * @param String $flightaware_id the ID from flightaware |
|
| 1165 | + * @param String $ident the flight ident |
|
| 1166 | + * @param String $aircraft_icao the aircraft type |
|
| 1167 | + * @param String $departure_airport_icao the departure airport |
|
| 1168 | + * @param String $arrival_airport_icao the arrival airport |
|
| 1169 | + * @param string $latitude |
|
| 1170 | + * @param string $longitude |
|
| 1171 | + * @param string $waypoints |
|
| 1172 | + * @param string $altitude |
|
| 1173 | + * @param string $altitude_real |
|
| 1174 | + * @param string $heading |
|
| 1175 | + * @param string $groundspeed |
|
| 1176 | + * @param string $date |
|
| 1177 | + * @param string $departure_airport_time |
|
| 1178 | + * @param string $arrival_airport_time |
|
| 1179 | + * @param string $squawk |
|
| 1180 | + * @param string $route_stop |
|
| 1181 | + * @param string $ModeS |
|
| 1182 | + * @param bool $putinarchive |
|
| 1183 | + * @param string $registration |
|
| 1184 | + * @param string $pilot_id |
|
| 1185 | + * @param string $pilot_name |
|
| 1186 | + * @param string $verticalrate |
|
| 1187 | + * @param bool $noarchive |
|
| 1188 | + * @param bool $ground |
|
| 1189 | + * @param string $format_source |
|
| 1190 | + * @param string $source_name |
|
| 1191 | + * @param string $over_country |
|
| 1192 | + * @return String success or false |
|
| 1193 | + */ |
|
| 1194 | 1194 | public function addLiveSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $altitude_real = '',$heading = '', $groundspeed = '', $date = '',$departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $ModeS = '', $putinarchive = false,$registration = '',$pilot_id = '', $pilot_name = '', $verticalrate = '', $noarchive = false, $ground = false,$format_source = '', $source_name = '', $over_country = '') |
| 1195 | 1195 | { |
| 1196 | 1196 | global $globalURL, $globalArchive, $globalDebug; |
@@ -1333,10 +1333,10 @@ discard block |
||
| 1333 | 1333 | $arrival_airport_country = ''; |
| 1334 | 1334 | |
| 1335 | 1335 | |
| 1336 | - if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL; |
|
| 1337 | - if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL; |
|
| 1338 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
| 1339 | - if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
| 1336 | + if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL; |
|
| 1337 | + if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL; |
|
| 1338 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
| 1339 | + if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
| 1340 | 1340 | |
| 1341 | 1341 | $query = ''; |
| 1342 | 1342 | if ($globalArchive) { |
@@ -1357,10 +1357,10 @@ discard block |
||
| 1357 | 1357 | return "error : ".$e->getMessage(); |
| 1358 | 1358 | } |
| 1359 | 1359 | if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) { |
| 1360 | - if ($globalDebug) echo '(Add to Spotter archive : '; |
|
| 1361 | - $SpotterArchive = new SpotterArchive($this->db); |
|
| 1362 | - $result = $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $altitude_real,$heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country); |
|
| 1363 | - if ($globalDebug) echo $result.')'; |
|
| 1360 | + if ($globalDebug) echo '(Add to Spotter archive : '; |
|
| 1361 | + $SpotterArchive = new SpotterArchive($this->db); |
|
| 1362 | + $result = $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $altitude_real,$heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country); |
|
| 1363 | + if ($globalDebug) echo $result.')'; |
|
| 1364 | 1364 | } elseif ($globalDebug && $putinarchive !== true) { |
| 1365 | 1365 | echo '(Not adding to archive)'; |
| 1366 | 1366 | } elseif ($globalDebug && $noarchive === true) { |
@@ -17,62 +17,62 @@ discard block |
||
| 17 | 17 | * @param array $filter the filter |
| 18 | 18 | * @return string the SQL part |
| 19 | 19 | */ |
| 20 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 20 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 21 | 21 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 22 | 22 | $filters = array(); |
| 23 | 23 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 24 | 24 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 25 | 25 | $filters = $globalStatsFilters[$globalFilterName]; |
| 26 | 26 | } else { |
| 27 | - $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
|
| 27 | + $filter = array_merge($filter, $globalStatsFilters[$globalFilterName]); |
|
| 28 | 28 | } |
| 29 | 29 | } |
| 30 | 30 | if (isset($filter[0]['source'])) { |
| 31 | - $filters = array_merge($filters,$filter); |
|
| 31 | + $filters = array_merge($filters, $filter); |
|
| 32 | 32 | } |
| 33 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 33 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 34 | 34 | $filter_query_join = ''; |
| 35 | 35 | $filter_query_where = ''; |
| 36 | - foreach($filters as $flt) { |
|
| 36 | + foreach ($filters as $flt) { |
|
| 37 | 37 | if (isset($flt['airlines']) && !empty($flt['airlines'])) { |
| 38 | 38 | if ($flt['airlines'][0] != '' && $flt['airlines'][0] != 'all') { |
| 39 | 39 | if (isset($flt['source'])) { |
| 40 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$flt['airlines'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) saf ON saf.flightaware_id = spotter_live.flightaware_id"; |
|
| 40 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $flt['airlines'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) saf ON saf.flightaware_id = spotter_live.flightaware_id"; |
|
| 41 | 41 | } else { |
| 42 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$flt['airlines'])."')) saf ON saf.flightaware_id = spotter_live.flightaware_id"; |
|
| 42 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $flt['airlines'])."')) saf ON saf.flightaware_id = spotter_live.flightaware_id"; |
|
| 43 | 43 | } |
| 44 | 44 | } |
| 45 | 45 | } |
| 46 | 46 | if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) { |
| 47 | 47 | if (isset($flt['source'])) { |
| 48 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id"; |
|
| 48 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id"; |
|
| 49 | 49 | } else { |
| 50 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id"; |
|
| 50 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id"; |
|
| 51 | 51 | } |
| 52 | 52 | } |
| 53 | 53 | if (isset($flt['idents']) && !empty($flt['idents'])) { |
| 54 | 54 | if (isset($flt['source'])) { |
| 55 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) spid ON spid.flightaware_id = spotter_live.flightaware_id"; |
|
| 55 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','", $flt['idents'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) spid ON spid.flightaware_id = spotter_live.flightaware_id"; |
|
| 56 | 56 | } else { |
| 57 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','",$flt['idents'])."')) spid ON spid.flightaware_id = spotter_live.flightaware_id"; |
|
| 57 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','", $flt['idents'])."')) spid ON spid.flightaware_id = spotter_live.flightaware_id"; |
|
| 58 | 58 | } |
| 59 | 59 | } |
| 60 | 60 | if (isset($flt['registrations']) && !empty($flt['registrations'])) { |
| 61 | 61 | if (isset($flt['source'])) { |
| 62 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','",$flt['registrations'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) sre ON sre.flightaware_id = spotter_live.flightaware_id"; |
|
| 62 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','", $flt['registrations'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) sre ON sre.flightaware_id = spotter_live.flightaware_id"; |
|
| 63 | 63 | } else { |
| 64 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','",$flt['registrations'])."')) sre ON sre.flightaware_id = spotter_live.flightaware_id"; |
|
| 64 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','", $flt['registrations'])."')) sre ON sre.flightaware_id = spotter_live.flightaware_id"; |
|
| 65 | 65 | } |
| 66 | 66 | } |
| 67 | 67 | if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id']) && isset($flt['idents']) && empty($flt['idents'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']) && !isset($flt['idents']) && !isset($flt['registrations']))) { |
| 68 | 68 | if (isset($flt['source'])) { |
| 69 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) ssf ON ssf.flightaware_id = spotter_live.flightaware_id"; |
|
| 69 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.format_source IN ('".implode("','", $flt['source'])."')) ssf ON ssf.flightaware_id = spotter_live.flightaware_id"; |
|
| 70 | 70 | } |
| 71 | 71 | } |
| 72 | 72 | } |
| 73 | 73 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 74 | 74 | if ($filter['airlines'][0] != '' && $filter['airlines'][0] != 'all') { |
| 75 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) sai ON sai.flightaware_id = spotter_live.flightaware_id"; |
|
| 75 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) sai ON sai.flightaware_id = spotter_live.flightaware_id"; |
|
| 76 | 76 | } |
| 77 | 77 | } |
| 78 | 78 | if (isset($filter['alliance']) && !empty($filter['alliance'])) { |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_live.flightaware_id "; |
| 83 | 83 | } |
| 84 | 84 | if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) { |
| 85 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) sp ON sp.flightaware_id = spotter_live.flightaware_id"; |
|
| 85 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $filter['pilots_id'])."')) sp ON sp.flightaware_id = spotter_live.flightaware_id"; |
|
| 86 | 86 | } |
| 87 | 87 | if (isset($filter['blocked']) && $filter['blocked'] == true) { |
| 88 | 88 | $filter_query_join .= " INNER JOIN (SELECT callsign FROM aircraft_block) cblk ON cblk.callsign = spotter_live.ident"; |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | if (count($filter['source']) == 1) { |
| 92 | 92 | $filter_query_where .= " AND format_source = '".$filter['source'][0]."'"; |
| 93 | 93 | } else { |
| 94 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 94 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 95 | 95 | } |
| 96 | 96 | } |
| 97 | 97 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
@@ -124,15 +124,15 @@ discard block |
||
| 124 | 124 | $filter_query_date .= " AND EXTRACT(DAY FROM spotter_output.date) = '".$filter['day']."'"; |
| 125 | 125 | } |
| 126 | 126 | } |
| 127 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_live.flightaware_id"; |
|
| 127 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.flightaware_id = spotter_live.flightaware_id"; |
|
| 128 | 128 | } |
| 129 | 129 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 130 | - $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 130 | + $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 131 | 131 | } |
| 132 | 132 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 133 | 133 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
| 134 | 134 | if ($filter_query_where != '') { |
| 135 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
| 135 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
| 136 | 136 | } |
| 137 | 137 | $filter_query = $filter_query_join.$filter_query_where; |
| 138 | 138 | return $filter_query; |
@@ -157,8 +157,8 @@ discard block |
||
| 157 | 157 | if ($limit != '') |
| 158 | 158 | { |
| 159 | 159 | $limit_array = explode(',', $limit); |
| 160 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 161 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 160 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 161 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 162 | 162 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 163 | 163 | { |
| 164 | 164 | $limit_query = ' LIMIT '.$limit_array[1].' OFFSET '.$limit_array[0]; |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | } else { |
| 183 | 183 | $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate".$filter_query.$orderby_query; |
| 184 | 184 | } |
| 185 | - $spotter_array = $Spotter->getDataFromDB($query.$limit_query,array(),'',true); |
|
| 185 | + $spotter_array = $Spotter->getDataFromDB($query.$limit_query, array(), '', true); |
|
| 186 | 186 | |
| 187 | 187 | return $spotter_array; |
| 188 | 188 | } |
@@ -194,34 +194,34 @@ discard block |
||
| 194 | 194 | * @param array $filter |
| 195 | 195 | * @return array the spotter information |
| 196 | 196 | */ |
| 197 | - public function getMinLiveSpotterData($limit = 0,$filter = array()) |
|
| 197 | + public function getMinLiveSpotterData($limit = 0, $filter = array()) |
|
| 198 | 198 | { |
| 199 | 199 | global $globalDBdriver, $globalLiveInterval, $globalArchive, $globalMap2DAircraftsLimit; |
| 200 | 200 | date_default_timezone_set('UTC'); |
| 201 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 201 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 202 | 202 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 203 | 203 | if ($globalDBdriver == 'mysql') { |
| 204 | 204 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 205 | 205 | // $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.real_altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source, spotter_live.registration |
| 206 | 206 | // FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= spotter_live.date AND'." spotter_live.latitude <> 0 AND spotter_live.longitude <> 0 ORDER BY date DESC"; |
| 207 | - $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.real_altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source, spotter_live.registration |
|
| 207 | + $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.real_altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source, spotter_live.registration |
|
| 208 | 208 | FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= spotter_live.date AND'." spotter_live.latitude <> 0 AND spotter_live.longitude <> 0"; |
| 209 | 209 | } else { |
| 210 | 210 | // $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.real_altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source, spotter_live.registration |
| 211 | 211 | // FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate'.$filter_query." spotter_live.latitude <> 0 AND spotter_live.longitude <> 0 ORDER BY date DESC"; |
| 212 | - $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.real_altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source, spotter_live.registration |
|
| 212 | + $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.real_altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source, spotter_live.registration |
|
| 213 | 213 | FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate'.$filter_query." spotter_live.latitude <> 0 AND spotter_live.longitude <> 0"; |
| 214 | 214 | } |
| 215 | 215 | } else { |
| 216 | 216 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 217 | 217 | // $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.real_altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source, spotter_live.registration |
| 218 | 218 | // FROM spotter_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' ORDER BY date DESC"; |
| 219 | - $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.real_altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source, spotter_live.registration |
|
| 219 | + $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.real_altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source, spotter_live.registration |
|
| 220 | 220 | FROM spotter_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0'"; |
| 221 | 221 | } else { |
| 222 | 222 | // $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.real_altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source, spotter_live.registration |
| 223 | 223 | // FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate".$filter_query." spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' ORDER BY date DESC"; |
| 224 | - $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.real_altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source, spotter_live.registration |
|
| 224 | + $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.real_altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source, spotter_live.registration |
|
| 225 | 225 | FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate".$filter_query." spotter_live.latitude <> '0' AND spotter_live.longitude <> '0'"; |
| 226 | 226 | } |
| 227 | 227 | } |
@@ -229,14 +229,14 @@ discard block |
||
| 229 | 229 | if ($limit == 0 && isset($globalMap2DAircraftsLimit) && $globalMap2DAircraftsLimit != '') { |
| 230 | 230 | $limit = $globalMap2DAircraftsLimit; |
| 231 | 231 | } |
| 232 | - if ($limit != 0 && filter_var($limit,FILTER_VALIDATE_INT)) { |
|
| 232 | + if ($limit != 0 && filter_var($limit, FILTER_VALIDATE_INT)) { |
|
| 233 | 233 | $query .= ' LIMIT '.$limit; |
| 234 | 234 | } |
| 235 | 235 | |
| 236 | 236 | try { |
| 237 | 237 | $sth = $this->db->prepare($query); |
| 238 | 238 | $sth->execute(); |
| 239 | - } catch(PDOException $e) { |
|
| 239 | + } catch (PDOException $e) { |
|
| 240 | 240 | echo $e->getMessage(); |
| 241 | 241 | die; |
| 242 | 242 | } |
@@ -253,20 +253,20 @@ discard block |
||
| 253 | 253 | * @param string $id |
| 254 | 254 | * @return array the spotter information |
| 255 | 255 | */ |
| 256 | - public function getMinLastLiveSpotterData($coord = array(),$filter = array(), $limit = 0, $id = '') |
|
| 256 | + public function getMinLastLiveSpotterData($coord = array(), $filter = array(), $limit = 0, $id = '') |
|
| 257 | 257 | { |
| 258 | 258 | global $globalDBdriver, $globalLiveInterval, $globalArchive, $globalMap3DAircraftsLimit; |
| 259 | 259 | date_default_timezone_set('UTC'); |
| 260 | 260 | $usecoord = false; |
| 261 | 261 | if (is_array($coord) && !empty($coord)) { |
| 262 | - $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 263 | - $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 264 | - $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 265 | - $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 262 | + $minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 263 | + $minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 264 | + $maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 265 | + $maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 266 | 266 | if ($minlong != '' && $minlat != '' && $maxlong != '' && $maxlat != '') $usecoord = true; |
| 267 | 267 | } |
| 268 | - $id = filter_var($id,FILTER_SANITIZE_STRING); |
|
| 269 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 268 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 269 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 270 | 270 | |
| 271 | 271 | if (!isset($globalLiveInterval) || $globalLiveInterval == '') $globalLiveInterval = '200'; |
| 272 | 272 | if (!isset($globalMap3DAircraftsLimit) || $globalMap3DAircraftsLimit == '') $globalMap3DAircraftsLimit = '300'; |
@@ -296,7 +296,7 @@ discard block |
||
| 296 | 296 | ORDER BY flightaware_id, date"; |
| 297 | 297 | if ($limit > 0) $query .= " LIMIT ".$limit; |
| 298 | 298 | } else { |
| 299 | - $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source, spotter_live.registration |
|
| 299 | + $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source, spotter_live.registration |
|
| 300 | 300 | FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date "; |
| 301 | 301 | if ($usecoord) $query .= "AND (spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong.") "; |
| 302 | 302 | if ($id != '') $query .= "OR spotter_live.flightaware_id = :id "; |
@@ -346,7 +346,7 @@ discard block |
||
| 346 | 346 | try { |
| 347 | 347 | $sth = $this->db->prepare($query); |
| 348 | 348 | $sth->execute($query_values); |
| 349 | - } catch(PDOException $e) { |
|
| 349 | + } catch (PDOException $e) { |
|
| 350 | 350 | echo $e->getMessage(); |
| 351 | 351 | die; |
| 352 | 352 | } |
@@ -362,12 +362,12 @@ discard block |
||
| 362 | 362 | * @param int $limit |
| 363 | 363 | * @return array the spotter information |
| 364 | 364 | */ |
| 365 | - public function getMinLastLiveSpotterDataByID($id = '',$filter = array(), $limit = 0) |
|
| 365 | + public function getMinLastLiveSpotterDataByID($id = '', $filter = array(), $limit = 0) |
|
| 366 | 366 | { |
| 367 | 367 | global $globalDBdriver, $globalLiveInterval, $globalArchive, $globalMap3DAircraftsLimit; |
| 368 | 368 | date_default_timezone_set('UTC'); |
| 369 | - $id = filter_var($id,FILTER_SANITIZE_STRING); |
|
| 370 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 369 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 370 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 371 | 371 | |
| 372 | 372 | if (!isset($globalLiveInterval) || $globalLiveInterval == '') $globalLiveInterval = '200'; |
| 373 | 373 | if (!isset($globalMap3DAircraftsLimit) || $globalMap3DAircraftsLimit == '') $globalMap3DAircraftsLimit = '300'; |
@@ -392,13 +392,13 @@ discard block |
||
| 392 | 392 | } |
| 393 | 393 | } else { |
| 394 | 394 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 395 | - $query = "SELECT * FROM ( |
|
| 395 | + $query = "SELECT * FROM ( |
|
| 396 | 396 | SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, spotter_archive.date, spotter_archive.format_source, spotter_archive.registration |
| 397 | 397 | FROM spotter_archive |
| 398 | 398 | INNER JOIN ( |
| 399 | 399 | SELECT flightaware_id |
| 400 | 400 | FROM spotter_live".$filter_query." spotter_live.flightaware_id = :id"; |
| 401 | - $query.= ") l ON l.flightaware_id = spotter_archive.flightaware_id "; |
|
| 401 | + $query .= ") l ON l.flightaware_id = spotter_archive.flightaware_id "; |
|
| 402 | 402 | $query .= "UNION |
| 403 | 403 | SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source, spotter_live.registration |
| 404 | 404 | FROM spotter_live".$filter_query." spotter_live.flightaware_id = :id"; |
@@ -417,7 +417,7 @@ discard block |
||
| 417 | 417 | try { |
| 418 | 418 | $sth = $this->db->prepare($query); |
| 419 | 419 | $sth->execute($query_values); |
| 420 | - } catch(PDOException $e) { |
|
| 420 | + } catch (PDOException $e) { |
|
| 421 | 421 | echo $e->getMessage(); |
| 422 | 422 | die; |
| 423 | 423 | } |
@@ -434,7 +434,7 @@ discard block |
||
| 434 | 434 | public function getLiveSpotterCount($filter = array()) |
| 435 | 435 | { |
| 436 | 436 | global $globalDBdriver, $globalLiveInterval; |
| 437 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 437 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 438 | 438 | |
| 439 | 439 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 440 | 440 | if ($globalDBdriver == 'mysql') { |
@@ -447,7 +447,7 @@ discard block |
||
| 447 | 447 | try { |
| 448 | 448 | $sth = $this->db->prepare($query); |
| 449 | 449 | $sth->execute(); |
| 450 | - } catch(PDOException $e) { |
|
| 450 | + } catch (PDOException $e) { |
|
| 451 | 451 | echo $e->getMessage(); |
| 452 | 452 | die; |
| 453 | 453 | } |
@@ -465,16 +465,16 @@ discard block |
||
| 465 | 465 | */ |
| 466 | 466 | public function getLiveSpotterDatabyCoord($coord, $filter = array()) |
| 467 | 467 | { |
| 468 | - global $globalDBdriver, $globalLiveInterval,$globalMap2DAircraftsLimit; |
|
| 468 | + global $globalDBdriver, $globalLiveInterval, $globalMap2DAircraftsLimit; |
|
| 469 | 469 | $Spotter = new Spotter($this->db); |
| 470 | 470 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 471 | 471 | $filter_query = $this->getFilter($filter); |
| 472 | 472 | |
| 473 | 473 | if (is_array($coord)) { |
| 474 | - $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 475 | - $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 476 | - $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 477 | - $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 474 | + $minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 475 | + $minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 476 | + $maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 477 | + $maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 478 | 478 | } else return array(); |
| 479 | 479 | if ($globalDBdriver == 'mysql') { |
| 480 | 480 | $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND spotter_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND spotter_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY spotter_live.flightaware_id'.$filter_query; |
@@ -497,27 +497,27 @@ discard block |
||
| 497 | 497 | * @param array $filter |
| 498 | 498 | * @return array the spotter information |
| 499 | 499 | */ |
| 500 | - public function getMinLiveSpotterDatabyCoord($coord,$limit = 0, $filter = array()) |
|
| 500 | + public function getMinLiveSpotterDatabyCoord($coord, $limit = 0, $filter = array()) |
|
| 501 | 501 | { |
| 502 | - global $globalDBdriver, $globalLiveInterval, $globalArchive,$globalMap2DAircraftsLimit; |
|
| 502 | + global $globalDBdriver, $globalLiveInterval, $globalArchive, $globalMap2DAircraftsLimit; |
|
| 503 | 503 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 504 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 504 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 505 | 505 | |
| 506 | 506 | if (is_array($coord)) { |
| 507 | - $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 508 | - $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 509 | - $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 510 | - $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 507 | + $minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 508 | + $minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 509 | + $maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 510 | + $maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 511 | 511 | } else return array(); |
| 512 | 512 | if ($globalDBdriver == 'mysql') { |
| 513 | 513 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 514 | - $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.real_altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source, spotter_live.registration |
|
| 514 | + $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.real_altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source, spotter_live.registration |
|
| 515 | 515 | FROM spotter_live |
| 516 | 516 | '.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= spotter_live.date |
| 517 | 517 | AND spotter_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND spotter_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' |
| 518 | 518 | AND spotter_live.latitude <> 0 AND spotter_live.longitude <> 0 ORDER BY date DESC'; |
| 519 | 519 | } else { |
| 520 | - $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.real_altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source, spotter_live.registration |
|
| 520 | + $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.real_altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source, spotter_live.registration |
|
| 521 | 521 | FROM spotter_live |
| 522 | 522 | INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate |
| 523 | 523 | FROM spotter_live l |
@@ -537,7 +537,7 @@ discard block |
||
| 537 | 537 | AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong." |
| 538 | 538 | AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' ORDER BY date DESC"; |
| 539 | 539 | */ |
| 540 | - $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.real_altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source, spotter_live.registration |
|
| 540 | + $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.real_altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source, spotter_live.registration |
|
| 541 | 541 | FROM spotter_live |
| 542 | 542 | ".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date |
| 543 | 543 | AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." |
@@ -556,7 +556,7 @@ discard block |
||
| 556 | 556 | ) s on spotter_live.flightaware_id = s.flightaware_id |
| 557 | 557 | AND spotter_live.date = s.maxdate".$filter_query." spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' ORDER BY date DESC"; |
| 558 | 558 | */ |
| 559 | - $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.real_altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source, spotter_live.registration |
|
| 559 | + $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.real_altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source, spotter_live.registration |
|
| 560 | 560 | FROM spotter_live |
| 561 | 561 | INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate |
| 562 | 562 | FROM spotter_live l |
@@ -571,13 +571,13 @@ discard block |
||
| 571 | 571 | if ($limit == 0 && isset($globalMap2DAircraftsLimit) && $globalMap2DAircraftsLimit != '') { |
| 572 | 572 | $limit = $globalMap2DAircraftsLimit; |
| 573 | 573 | } |
| 574 | - if ($limit != 0 && filter_var($limit,FILTER_VALIDATE_INT)) { |
|
| 574 | + if ($limit != 0 && filter_var($limit, FILTER_VALIDATE_INT)) { |
|
| 575 | 575 | $query .= ' LIMIT '.$limit; |
| 576 | 576 | } |
| 577 | 577 | try { |
| 578 | 578 | $sth = $this->db->prepare($query); |
| 579 | 579 | $sth->execute(); |
| 580 | - } catch(PDOException $e) { |
|
| 580 | + } catch (PDOException $e) { |
|
| 581 | 581 | echo $e->getMessage(); |
| 582 | 582 | die; |
| 583 | 583 | } |
@@ -627,21 +627,21 @@ discard block |
||
| 627 | 627 | if ($interval == '1m') |
| 628 | 628 | { |
| 629 | 629 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
| 630 | - } else if ($interval == '15m'){ |
|
| 630 | + } else if ($interval == '15m') { |
|
| 631 | 631 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date '; |
| 632 | 632 | } |
| 633 | 633 | } |
| 634 | 634 | } else { |
| 635 | 635 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
| 636 | 636 | } |
| 637 | - $query = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live |
|
| 637 | + $query = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live |
|
| 638 | 638 | WHERE spotter_live.latitude <> '' |
| 639 | 639 | AND spotter_live.longitude <> '' |
| 640 | 640 | ".$additional_query." |
| 641 | 641 | HAVING distance < :radius |
| 642 | 642 | ORDER BY distance"; |
| 643 | 643 | |
| 644 | - $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius)); |
|
| 644 | + $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng, ':radius' => $radius)); |
|
| 645 | 645 | return $spotter_array; |
| 646 | 646 | } |
| 647 | 647 | |
@@ -658,9 +658,9 @@ discard block |
||
| 658 | 658 | date_default_timezone_set('UTC'); |
| 659 | 659 | |
| 660 | 660 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 661 | - $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 661 | + $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 662 | 662 | |
| 663 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident),'',true); |
|
| 663 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident), '', true); |
|
| 664 | 664 | |
| 665 | 665 | return $spotter_array; |
| 666 | 666 | } |
@@ -672,16 +672,16 @@ discard block |
||
| 672 | 672 | * @param $date |
| 673 | 673 | * @return array the spotter information |
| 674 | 674 | */ |
| 675 | - public function getDateLiveSpotterDataByIdent($ident,$date) |
|
| 675 | + public function getDateLiveSpotterDataByIdent($ident, $date) |
|
| 676 | 676 | { |
| 677 | 677 | $Spotter = new Spotter($this->db); |
| 678 | 678 | date_default_timezone_set('UTC'); |
| 679 | 679 | |
| 680 | 680 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 681 | - $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 681 | + $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 682 | 682 | |
| 683 | - $date = date('c',$date); |
|
| 684 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
|
| 683 | + $date = date('c', $date); |
|
| 684 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':date' => $date)); |
|
| 685 | 685 | |
| 686 | 686 | return $spotter_array; |
| 687 | 687 | } |
@@ -697,8 +697,8 @@ discard block |
||
| 697 | 697 | $Spotter = new Spotter($this->db); |
| 698 | 698 | date_default_timezone_set('UTC'); |
| 699 | 699 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 700 | - $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 701 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id),'',true); |
|
| 700 | + $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 701 | + $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id), '', true); |
|
| 702 | 702 | return $spotter_array; |
| 703 | 703 | } |
| 704 | 704 | |
@@ -709,15 +709,15 @@ discard block |
||
| 709 | 709 | * @param $date |
| 710 | 710 | * @return array the spotter information |
| 711 | 711 | */ |
| 712 | - public function getDateLiveSpotterDataById($id,$date) |
|
| 712 | + public function getDateLiveSpotterDataById($id, $date) |
|
| 713 | 713 | { |
| 714 | 714 | $Spotter = new Spotter($this->db); |
| 715 | 715 | date_default_timezone_set('UTC'); |
| 716 | 716 | |
| 717 | 717 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 718 | - $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 719 | - $date = date('c',$date); |
|
| 720 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true); |
|
| 718 | + $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 719 | + $date = date('c', $date); |
|
| 720 | + $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id, ':date' => $date), '', true); |
|
| 721 | 721 | return $spotter_array; |
| 722 | 722 | } |
| 723 | 723 | |
@@ -733,13 +733,13 @@ discard block |
||
| 733 | 733 | date_default_timezone_set('UTC'); |
| 734 | 734 | |
| 735 | 735 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 736 | - $query = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident'; |
|
| 736 | + $query = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident'; |
|
| 737 | 737 | |
| 738 | 738 | try { |
| 739 | 739 | |
| 740 | 740 | $sth = $this->db->prepare($query); |
| 741 | 741 | $sth->execute(array(':ident' => $ident)); |
| 742 | - } catch(PDOException $e) { |
|
| 742 | + } catch (PDOException $e) { |
|
| 743 | 743 | echo $e->getMessage(); |
| 744 | 744 | die; |
| 745 | 745 | } |
@@ -755,7 +755,7 @@ discard block |
||
| 755 | 755 | * @param bool $liveinterval |
| 756 | 756 | * @return array the spotter information |
| 757 | 757 | */ |
| 758 | - public function getAllLiveSpotterDataById($id,$liveinterval = false) |
|
| 758 | + public function getAllLiveSpotterDataById($id, $liveinterval = false) |
|
| 759 | 759 | { |
| 760 | 760 | global $globalDBdriver, $globalLiveInterval; |
| 761 | 761 | date_default_timezone_set('UTC'); |
@@ -774,7 +774,7 @@ discard block |
||
| 774 | 774 | try { |
| 775 | 775 | $sth = $this->db->prepare($query); |
| 776 | 776 | $sth->execute(array(':id' => $id)); |
| 777 | - } catch(PDOException $e) { |
|
| 777 | + } catch (PDOException $e) { |
|
| 778 | 778 | echo $e->getMessage(); |
| 779 | 779 | die; |
| 780 | 780 | } |
@@ -792,12 +792,12 @@ discard block |
||
| 792 | 792 | { |
| 793 | 793 | date_default_timezone_set('UTC'); |
| 794 | 794 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 795 | - $query = self::$global_query.' WHERE spotter_live.ident = :ident'; |
|
| 795 | + $query = self::$global_query.' WHERE spotter_live.ident = :ident'; |
|
| 796 | 796 | try { |
| 797 | 797 | |
| 798 | 798 | $sth = $this->db->prepare($query); |
| 799 | 799 | $sth->execute(array(':ident' => $ident)); |
| 800 | - } catch(PDOException $e) { |
|
| 800 | + } catch (PDOException $e) { |
|
| 801 | 801 | echo $e->getMessage(); |
| 802 | 802 | die; |
| 803 | 803 | } |
@@ -827,7 +827,7 @@ discard block |
||
| 827 | 827 | |
| 828 | 828 | $sth = $this->db->prepare($query); |
| 829 | 829 | $sth->execute(); |
| 830 | - } catch(PDOException $e) { |
|
| 830 | + } catch (PDOException $e) { |
|
| 831 | 831 | return "error"; |
| 832 | 832 | } |
| 833 | 833 | |
@@ -850,14 +850,14 @@ discard block |
||
| 850 | 850 | |
| 851 | 851 | $sth = $this->db->prepare($query); |
| 852 | 852 | $sth->execute(); |
| 853 | - } catch(PDOException $e) { |
|
| 853 | + } catch (PDOException $e) { |
|
| 854 | 854 | return "error"; |
| 855 | 855 | } |
| 856 | 856 | $query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN ('; |
| 857 | 857 | $i = 0; |
| 858 | - $j =0; |
|
| 858 | + $j = 0; |
|
| 859 | 859 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 860 | - foreach($all as $row) |
|
| 860 | + foreach ($all as $row) |
|
| 861 | 861 | { |
| 862 | 862 | $i++; |
| 863 | 863 | $j++; |
@@ -865,9 +865,9 @@ discard block |
||
| 865 | 865 | if ($globalDebug) echo "."; |
| 866 | 866 | try { |
| 867 | 867 | |
| 868 | - $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
|
| 868 | + $sth = $this->db->prepare(substr($query_delete, 0, -1).")"); |
|
| 869 | 869 | $sth->execute(); |
| 870 | - } catch(PDOException $e) { |
|
| 870 | + } catch (PDOException $e) { |
|
| 871 | 871 | return "error"; |
| 872 | 872 | } |
| 873 | 873 | $query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN ('; |
@@ -878,9 +878,9 @@ discard block |
||
| 878 | 878 | if ($i > 0) { |
| 879 | 879 | try { |
| 880 | 880 | |
| 881 | - $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
|
| 881 | + $sth = $this->db->prepare(substr($query_delete, 0, -1).")"); |
|
| 882 | 882 | $sth->execute(); |
| 883 | - } catch(PDOException $e) { |
|
| 883 | + } catch (PDOException $e) { |
|
| 884 | 884 | return "error"; |
| 885 | 885 | } |
| 886 | 886 | } |
@@ -893,7 +893,7 @@ discard block |
||
| 893 | 893 | |
| 894 | 894 | $sth = $this->db->prepare($query); |
| 895 | 895 | $sth->execute(); |
| 896 | - } catch(PDOException $e) { |
|
| 896 | + } catch (PDOException $e) { |
|
| 897 | 897 | return "error"; |
| 898 | 898 | } |
| 899 | 899 | /* $query_delete = "DELETE FROM spotter_live WHERE flightaware_id IN ("; |
@@ -941,13 +941,13 @@ discard block |
||
| 941 | 941 | public function deleteLiveSpotterDataByIdent($ident) |
| 942 | 942 | { |
| 943 | 943 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 944 | - $query = 'DELETE FROM spotter_live WHERE ident = :ident'; |
|
| 944 | + $query = 'DELETE FROM spotter_live WHERE ident = :ident'; |
|
| 945 | 945 | |
| 946 | 946 | try { |
| 947 | 947 | |
| 948 | 948 | $sth = $this->db->prepare($query); |
| 949 | 949 | $sth->execute(array(':ident' => $ident)); |
| 950 | - } catch(PDOException $e) { |
|
| 950 | + } catch (PDOException $e) { |
|
| 951 | 951 | return "error"; |
| 952 | 952 | } |
| 953 | 953 | |
@@ -963,13 +963,13 @@ discard block |
||
| 963 | 963 | public function deleteLiveSpotterDataById($id) |
| 964 | 964 | { |
| 965 | 965 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 966 | - $query = 'DELETE FROM spotter_live WHERE flightaware_id = :id'; |
|
| 966 | + $query = 'DELETE FROM spotter_live WHERE flightaware_id = :id'; |
|
| 967 | 967 | |
| 968 | 968 | try { |
| 969 | 969 | |
| 970 | 970 | $sth = $this->db->prepare($query); |
| 971 | 971 | $sth->execute(array(':id' => $id)); |
| 972 | - } catch(PDOException $e) { |
|
| 972 | + } catch (PDOException $e) { |
|
| 973 | 973 | return "error"; |
| 974 | 974 | } |
| 975 | 975 | |
@@ -987,13 +987,13 @@ discard block |
||
| 987 | 987 | { |
| 988 | 988 | global $globalDBdriver, $globalTimezone; |
| 989 | 989 | if ($globalDBdriver == 'mysql') { |
| 990 | - $query = 'SELECT spotter_live.ident FROM spotter_live |
|
| 990 | + $query = 'SELECT spotter_live.ident FROM spotter_live |
|
| 991 | 991 | WHERE spotter_live.ident = :ident |
| 992 | 992 | AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) |
| 993 | 993 | AND spotter_live.date < UTC_TIMESTAMP()'; |
| 994 | 994 | $query_data = array(':ident' => $ident); |
| 995 | 995 | } else { |
| 996 | - $query = "SELECT spotter_live.ident FROM spotter_live |
|
| 996 | + $query = "SELECT spotter_live.ident FROM spotter_live |
|
| 997 | 997 | WHERE spotter_live.ident = :ident |
| 998 | 998 | AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS' |
| 999 | 999 | AND spotter_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -1002,8 +1002,8 @@ discard block |
||
| 1002 | 1002 | |
| 1003 | 1003 | $sth = $this->db->prepare($query); |
| 1004 | 1004 | $sth->execute($query_data); |
| 1005 | - $ident_result=''; |
|
| 1006 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1005 | + $ident_result = ''; |
|
| 1006 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1007 | 1007 | { |
| 1008 | 1008 | $ident_result = $row['ident']; |
| 1009 | 1009 | } |
@@ -1020,13 +1020,13 @@ discard block |
||
| 1020 | 1020 | { |
| 1021 | 1021 | global $globalDBdriver, $globalTimezone; |
| 1022 | 1022 | if ($globalDBdriver == 'mysql') { |
| 1023 | - $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 1023 | + $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 1024 | 1024 | WHERE spotter_live.ident = :ident |
| 1025 | 1025 | AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 MINUTE)'; |
| 1026 | 1026 | // AND spotter_live.date < UTC_TIMESTAMP()"; |
| 1027 | 1027 | $query_data = array(':ident' => $ident); |
| 1028 | 1028 | } else { |
| 1029 | - $query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 1029 | + $query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 1030 | 1030 | WHERE spotter_live.ident = :ident |
| 1031 | 1031 | AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '20 MINUTES'"; |
| 1032 | 1032 | // AND spotter_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -1035,8 +1035,8 @@ discard block |
||
| 1035 | 1035 | |
| 1036 | 1036 | $sth = $this->db->prepare($query); |
| 1037 | 1037 | $sth->execute($query_data); |
| 1038 | - $ident_result=''; |
|
| 1039 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1038 | + $ident_result = ''; |
|
| 1039 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1040 | 1040 | { |
| 1041 | 1041 | $ident_result = $row['flightaware_id']; |
| 1042 | 1042 | } |
@@ -1053,13 +1053,13 @@ discard block |
||
| 1053 | 1053 | { |
| 1054 | 1054 | global $globalDBdriver, $globalTimezone; |
| 1055 | 1055 | if ($globalDBdriver == 'mysql') { |
| 1056 | - $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 1056 | + $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 1057 | 1057 | WHERE spotter_live.flightaware_id = :id |
| 1058 | 1058 | AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 10 HOUR)'; |
| 1059 | 1059 | // AND spotter_live.date < UTC_TIMESTAMP()"; |
| 1060 | 1060 | $query_data = array(':id' => $id); |
| 1061 | 1061 | } else { |
| 1062 | - $query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 1062 | + $query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 1063 | 1063 | WHERE spotter_live.flightaware_id = :id |
| 1064 | 1064 | AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '10 HOUR'"; |
| 1065 | 1065 | // AND spotter_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -1068,8 +1068,8 @@ discard block |
||
| 1068 | 1068 | |
| 1069 | 1069 | $sth = $this->db->prepare($query); |
| 1070 | 1070 | $sth->execute($query_data); |
| 1071 | - $ident_result=''; |
|
| 1072 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1071 | + $ident_result = ''; |
|
| 1072 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1073 | 1073 | { |
| 1074 | 1074 | $ident_result = $row['flightaware_id']; |
| 1075 | 1075 | } |
@@ -1086,13 +1086,13 @@ discard block |
||
| 1086 | 1086 | { |
| 1087 | 1087 | global $globalDBdriver, $globalTimezone; |
| 1088 | 1088 | if ($globalDBdriver == 'mysql') { |
| 1089 | - $query = 'SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live |
|
| 1089 | + $query = 'SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live |
|
| 1090 | 1090 | WHERE spotter_live.ModeS = :modes |
| 1091 | 1091 | AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 MINUTE)'; |
| 1092 | 1092 | // AND spotter_live.date < UTC_TIMESTAMP()"; |
| 1093 | 1093 | $query_data = array(':modes' => $modes); |
| 1094 | 1094 | } else { |
| 1095 | - $query = "SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live |
|
| 1095 | + $query = "SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live |
|
| 1096 | 1096 | WHERE spotter_live.ModeS = :modes |
| 1097 | 1097 | AND spotter_live.date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '20 MINUTE'"; |
| 1098 | 1098 | // // AND spotter_live.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'"; |
@@ -1101,8 +1101,8 @@ discard block |
||
| 1101 | 1101 | |
| 1102 | 1102 | $sth = $this->db->prepare($query); |
| 1103 | 1103 | $sth->execute($query_data); |
| 1104 | - $ident_result=''; |
|
| 1105 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1104 | + $ident_result = ''; |
|
| 1105 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1106 | 1106 | { |
| 1107 | 1107 | //$ident_result = $row['spotter_live_id']; |
| 1108 | 1108 | $ident_result = $row['flightaware_id']; |
@@ -1127,8 +1127,8 @@ discard block |
||
| 1127 | 1127 | return array(); |
| 1128 | 1128 | } else { |
| 1129 | 1129 | $q_array = explode(" ", $q); |
| 1130 | - foreach ($q_array as $q_item){ |
|
| 1131 | - $q_item = filter_var($q_item,FILTER_SANITIZE_STRING); |
|
| 1130 | + foreach ($q_array as $q_item) { |
|
| 1131 | + $q_item = filter_var($q_item, FILTER_SANITIZE_STRING); |
|
| 1132 | 1132 | $additional_query .= " AND ("; |
| 1133 | 1133 | $additional_query .= "(spotter_live.aircraft_icao like '%".$q_item."%') OR "; |
| 1134 | 1134 | $additional_query .= "(spotter_live.aircraft_name like '%".$q_item."%') OR "; |
@@ -1143,11 +1143,11 @@ discard block |
||
| 1143 | 1143 | } |
| 1144 | 1144 | } |
| 1145 | 1145 | if ($globalDBdriver == 'mysql') { |
| 1146 | - $query = "SELECT spotter_live.* FROM spotter_live |
|
| 1146 | + $query = "SELECT spotter_live.* FROM spotter_live |
|
| 1147 | 1147 | WHERE spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 SECOND) ".$additional_query." |
| 1148 | 1148 | AND spotter_live.date < UTC_TIMESTAMP()"; |
| 1149 | 1149 | } else { |
| 1150 | - $query = "SELECT spotter_live.* FROM spotter_live |
|
| 1150 | + $query = "SELECT spotter_live.* FROM spotter_live |
|
| 1151 | 1151 | WHERE spotter_live.date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '20 SECONDS' ".$additional_query." |
| 1152 | 1152 | AND spotter_live.date::timestamp < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'"; |
| 1153 | 1153 | } |
@@ -1189,7 +1189,7 @@ discard block |
||
| 1189 | 1189 | * @param string $over_country |
| 1190 | 1190 | * @return String success or false |
| 1191 | 1191 | */ |
| 1192 | - public function addLiveSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $altitude_real = '',$heading = '', $groundspeed = '', $date = '',$departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $ModeS = '', $putinarchive = false,$registration = '',$pilot_id = '', $pilot_name = '', $verticalrate = '', $noarchive = false, $ground = false,$format_source = '', $source_name = '', $over_country = '') |
|
| 1192 | + public function addLiveSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $altitude_real = '', $heading = '', $groundspeed = '', $date = '', $departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $ModeS = '', $putinarchive = false, $registration = '', $pilot_id = '', $pilot_name = '', $verticalrate = '', $noarchive = false, $ground = false, $format_source = '', $source_name = '', $over_country = '') |
|
| 1193 | 1193 | { |
| 1194 | 1194 | global $globalURL, $globalArchive, $globalDebug; |
| 1195 | 1195 | $Common = new Common(); |
@@ -1289,27 +1289,27 @@ discard block |
||
| 1289 | 1289 | if ($date == '') $date = date("Y-m-d H:i:s", time()); |
| 1290 | 1290 | |
| 1291 | 1291 | |
| 1292 | - $flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING); |
|
| 1293 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 1294 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 1295 | - $departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING); |
|
| 1296 | - $arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING); |
|
| 1297 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1298 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1299 | - $waypoints = filter_var($waypoints,FILTER_SANITIZE_STRING); |
|
| 1300 | - $altitude = filter_var($altitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1301 | - $altitude_real = filter_var($altitude_real,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1302 | - $heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT); |
|
| 1303 | - $groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1304 | - $squawk = filter_var($squawk,FILTER_SANITIZE_NUMBER_INT); |
|
| 1305 | - $route_stop = filter_var($route_stop,FILTER_SANITIZE_STRING); |
|
| 1306 | - $ModeS = filter_var($ModeS,FILTER_SANITIZE_STRING); |
|
| 1307 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_STRING); |
|
| 1308 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 1309 | - $format_source = filter_var($format_source,FILTER_SANITIZE_STRING); |
|
| 1310 | - $source_name = filter_var($source_name,FILTER_SANITIZE_STRING); |
|
| 1311 | - $over_country = filter_var($over_country,FILTER_SANITIZE_STRING); |
|
| 1312 | - $verticalrate = filter_var($verticalrate,FILTER_SANITIZE_NUMBER_INT); |
|
| 1292 | + $flightaware_id = filter_var($flightaware_id, FILTER_SANITIZE_STRING); |
|
| 1293 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 1294 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 1295 | + $departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING); |
|
| 1296 | + $arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING); |
|
| 1297 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1298 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1299 | + $waypoints = filter_var($waypoints, FILTER_SANITIZE_STRING); |
|
| 1300 | + $altitude = filter_var($altitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1301 | + $altitude_real = filter_var($altitude_real, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1302 | + $heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT); |
|
| 1303 | + $groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1304 | + $squawk = filter_var($squawk, FILTER_SANITIZE_NUMBER_INT); |
|
| 1305 | + $route_stop = filter_var($route_stop, FILTER_SANITIZE_STRING); |
|
| 1306 | + $ModeS = filter_var($ModeS, FILTER_SANITIZE_STRING); |
|
| 1307 | + $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_STRING); |
|
| 1308 | + $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING); |
|
| 1309 | + $format_source = filter_var($format_source, FILTER_SANITIZE_STRING); |
|
| 1310 | + $source_name = filter_var($source_name, FILTER_SANITIZE_STRING); |
|
| 1311 | + $over_country = filter_var($over_country, FILTER_SANITIZE_STRING); |
|
| 1312 | + $verticalrate = filter_var($verticalrate, FILTER_SANITIZE_NUMBER_INT); |
|
| 1313 | 1313 | |
| 1314 | 1314 | $airline_name = ''; |
| 1315 | 1315 | $airline_icao = ''; |
@@ -1331,10 +1331,10 @@ discard block |
||
| 1331 | 1331 | $arrival_airport_country = ''; |
| 1332 | 1332 | |
| 1333 | 1333 | |
| 1334 | - if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL; |
|
| 1335 | - if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL; |
|
| 1336 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
| 1337 | - if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
| 1334 | + if ($squawk == '' || $Common->isInteger($squawk) === false) $squawk = NULL; |
|
| 1335 | + if ($verticalrate == '' || $Common->isInteger($verticalrate) === false) $verticalrate = NULL; |
|
| 1336 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
|
| 1337 | + if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
|
| 1338 | 1338 | |
| 1339 | 1339 | $query = ''; |
| 1340 | 1340 | if ($globalArchive) { |
@@ -1345,19 +1345,19 @@ discard block |
||
| 1345 | 1345 | $query .= 'INSERT INTO spotter_live (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, latitude, longitude, waypoints, altitude, heading, ground_speed, date, departure_airport_time, arrival_airport_time, squawk, route_stop, ModeS, pilot_id, pilot_name, verticalrate, ground, format_source, source_name, over_country, real_altitude) |
| 1346 | 1346 | VALUES (:flightaware_id,:ident,:registration,:airline_name,:airline_icao,:airline_country,:airline_type,:aircraft_icao,:aircraft_shadow,:aircraft_type,:aircraft_manufacturer,:departure_airport_icao,:departure_airport_name, :departure_airport_city, :departure_airport_country, :arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :latitude,:longitude,:waypoints,:altitude,:heading,:groundspeed,:date,:departure_airport_time,:arrival_airport_time,:squawk,:route_stop,:ModeS, :pilot_id, :pilot_name, :verticalrate, :ground, :format_source, :source_name, :over_country, :real_altitude)'; |
| 1347 | 1347 | |
| 1348 | - $query_values = array(':flightaware_id' => $flightaware_id,':ident' => $ident, ':registration' => $registration,':airline_name' => $airline_name,':airline_icao' => $airline_icao,':airline_country' => $airline_country,':airline_type' => $airline_type,':aircraft_icao' => $aircraft_icao,':aircraft_shadow' => $aircraft_shadow,':aircraft_type' => $aircraft_type,':aircraft_manufacturer' => $aircraft_manufacturer,':departure_airport_icao' => $departure_airport_icao,':departure_airport_name' => $departure_airport_name,':departure_airport_city' => $departure_airport_city,':departure_airport_country' => $departure_airport_country,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_name' => $arrival_airport_name,':arrival_airport_city' => $arrival_airport_city,':arrival_airport_country' => $arrival_airport_country,':latitude' => $latitude,':longitude' => $longitude, ':waypoints' => $waypoints,':altitude' => $altitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date, ':departure_airport_time' => $departure_airport_time,':arrival_airport_time' => $arrival_airport_time, ':squawk' => $squawk,':route_stop' => $route_stop,':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source,':ground' => $ground, ':source_name' => $source_name, ':over_country' => $over_country,':real_altitude' => $altitude_real); |
|
| 1348 | + $query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_shadow' => $aircraft_shadow, ':aircraft_type' => $aircraft_type, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_time' => $arrival_airport_time, ':squawk' => $squawk, ':route_stop' => $route_stop, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':ground' => $ground, ':source_name' => $source_name, ':over_country' => $over_country, ':real_altitude' => $altitude_real); |
|
| 1349 | 1349 | try { |
| 1350 | 1350 | |
| 1351 | 1351 | $sth = $this->db->prepare($query); |
| 1352 | 1352 | $sth->execute($query_values); |
| 1353 | 1353 | $sth->closeCursor(); |
| 1354 | - } catch(PDOException $e) { |
|
| 1354 | + } catch (PDOException $e) { |
|
| 1355 | 1355 | return "error : ".$e->getMessage(); |
| 1356 | 1356 | } |
| 1357 | 1357 | if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) { |
| 1358 | 1358 | if ($globalDebug) echo '(Add to Spotter archive : '; |
| 1359 | 1359 | $SpotterArchive = new SpotterArchive($this->db); |
| 1360 | - $result = $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $altitude_real,$heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country); |
|
| 1360 | + $result = $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time, $arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date, $latitude, $longitude, $waypoints, $altitude, $altitude_real, $heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name, $verticalrate, $format_source, $source_name, $over_country); |
|
| 1361 | 1361 | if ($globalDebug) echo $result.')'; |
| 1362 | 1362 | } elseif ($globalDebug && $putinarchive !== true) { |
| 1363 | 1363 | echo '(Not adding to archive)'; |
@@ -1370,7 +1370,7 @@ discard block |
||
| 1370 | 1370 | |
| 1371 | 1371 | public function getOrderBy() |
| 1372 | 1372 | { |
| 1373 | - $orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY spotter_live.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY spotter_live.aircraft_icao DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY spotter_live.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY spotter_live.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY spotter_live.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY spotter_live.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY spotter_live.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY spotter_live.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY spotter_live.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY spotter_live.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY spotter_live.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY spotter_live.date DESC")); |
|
| 1373 | + $orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY spotter_live.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY spotter_live.aircraft_icao DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY spotter_live.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY spotter_live.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY spotter_live.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY spotter_live.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY spotter_live.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY spotter_live.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY spotter_live.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY spotter_live.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY spotter_live.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY spotter_live.date DESC")); |
|
| 1374 | 1374 | return $orderby; |
| 1375 | 1375 | } |
| 1376 | 1376 | |
@@ -8,7 +8,9 @@ discard block |
||
| 8 | 8 | public function __construct($dbc = null) { |
| 9 | 9 | $Connection = new Connection($dbc); |
| 10 | 10 | $this->db = $Connection->db(); |
| 11 | - if ($this->db === null) die('Error: No DB connection. (SpotterLive)'); |
|
| 11 | + if ($this->db === null) { |
|
| 12 | + die('Error: No DB connection. (SpotterLive)'); |
|
| 13 | + } |
|
| 12 | 14 | } |
| 13 | 15 | |
| 14 | 16 | |
@@ -30,7 +32,9 @@ discard block |
||
| 30 | 32 | if (isset($filter[0]['source'])) { |
| 31 | 33 | $filters = array_merge($filters,$filter); |
| 32 | 34 | } |
| 33 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 35 | + if (is_array($globalFilter)) { |
|
| 36 | + $filter = array_merge($filter,$globalFilter); |
|
| 37 | + } |
|
| 34 | 38 | $filter_query_join = ''; |
| 35 | 39 | $filter_query_where = ''; |
| 36 | 40 | foreach($filters as $flt) { |
@@ -129,8 +133,11 @@ discard block |
||
| 129 | 133 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 130 | 134 | $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
| 131 | 135 | } |
| 132 | - if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
|
| 133 | - elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
|
| 136 | + if ($filter_query_where == '' && $where) { |
|
| 137 | + $filter_query_where = ' WHERE'; |
|
| 138 | + } elseif ($filter_query_where != '' && $and) { |
|
| 139 | + $filter_query_where .= ' AND'; |
|
| 140 | + } |
|
| 134 | 141 | if ($filter_query_where != '') { |
| 135 | 142 | $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
| 136 | 143 | } |
@@ -173,9 +180,13 @@ discard block |
||
| 173 | 180 | $orderby_query = ' '.$search_orderby_array[$sort]['sql']; |
| 174 | 181 | } |
| 175 | 182 | } |
| 176 | - if ($orderby_query == '') $orderby_query = ' ORDER BY date DESC'; |
|
| 183 | + if ($orderby_query == '') { |
|
| 184 | + $orderby_query = ' ORDER BY date DESC'; |
|
| 185 | + } |
|
| 177 | 186 | |
| 178 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 187 | + if (!isset($globalLiveInterval)) { |
|
| 188 | + $globalLiveInterval = '200'; |
|
| 189 | + } |
|
| 179 | 190 | if ($globalDBdriver == 'mysql') { |
| 180 | 191 | //$query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate"; |
| 181 | 192 | $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate'.$filter_query.$orderby_query; |
@@ -199,7 +210,9 @@ discard block |
||
| 199 | 210 | global $globalDBdriver, $globalLiveInterval, $globalArchive, $globalMap2DAircraftsLimit; |
| 200 | 211 | date_default_timezone_set('UTC'); |
| 201 | 212 | $filter_query = $this->getFilter($filter,true,true); |
| 202 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 213 | + if (!isset($globalLiveInterval)) { |
|
| 214 | + $globalLiveInterval = '200'; |
|
| 215 | + } |
|
| 203 | 216 | if ($globalDBdriver == 'mysql') { |
| 204 | 217 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 205 | 218 | // $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.real_altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source, spotter_live.registration |
@@ -263,14 +276,22 @@ discard block |
||
| 263 | 276 | $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 264 | 277 | $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 265 | 278 | $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 266 | - if ($minlong != '' && $minlat != '' && $maxlong != '' && $maxlat != '') $usecoord = true; |
|
| 279 | + if ($minlong != '' && $minlat != '' && $maxlong != '' && $maxlat != '') { |
|
| 280 | + $usecoord = true; |
|
| 281 | + } |
|
| 267 | 282 | } |
| 268 | 283 | $id = filter_var($id,FILTER_SANITIZE_STRING); |
| 269 | 284 | $filter_query = $this->getFilter($filter,true,true); |
| 270 | 285 | |
| 271 | - if (!isset($globalLiveInterval) || $globalLiveInterval == '') $globalLiveInterval = '200'; |
|
| 272 | - if (!isset($globalMap3DAircraftsLimit) || $globalMap3DAircraftsLimit == '') $globalMap3DAircraftsLimit = '300'; |
|
| 273 | - if ($limit == 0 || $limit == '') $limit = $globalMap3DAircraftsLimit; |
|
| 286 | + if (!isset($globalLiveInterval) || $globalLiveInterval == '') { |
|
| 287 | + $globalLiveInterval = '200'; |
|
| 288 | + } |
|
| 289 | + if (!isset($globalMap3DAircraftsLimit) || $globalMap3DAircraftsLimit == '') { |
|
| 290 | + $globalMap3DAircraftsLimit = '300'; |
|
| 291 | + } |
|
| 292 | + if ($limit == 0 || $limit == '') { |
|
| 293 | + $limit = $globalMap3DAircraftsLimit; |
|
| 294 | + } |
|
| 274 | 295 | if ($globalDBdriver == 'mysql') { |
| 275 | 296 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 276 | 297 | /* |
@@ -283,26 +304,42 @@ discard block |
||
| 283 | 304 | FROM spotter_archive INNER JOIN (SELECT flightaware_id FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date"; |
| 284 | 305 | //if ($limit > 0) $query .= " LIMIT ".$limit; |
| 285 | 306 | $query .= ") l ON l.flightaware_id = spotter_archive.flightaware_id "; |
| 286 | - if ($usecoord) $query .= "AND (spotter_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_archive.longitude BETWEEN ".$minlong." AND ".$maxlong.") "; |
|
| 287 | - if ($id != '') $query .= "OR spotter_archive.flightaware_id = :id "; |
|
| 307 | + if ($usecoord) { |
|
| 308 | + $query .= "AND (spotter_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_archive.longitude BETWEEN ".$minlong." AND ".$maxlong.") "; |
|
| 309 | + } |
|
| 310 | + if ($id != '') { |
|
| 311 | + $query .= "OR spotter_archive.flightaware_id = :id "; |
|
| 312 | + } |
|
| 288 | 313 | $query .= "UNION |
| 289 | 314 | SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source, spotter_live.registration |
| 290 | 315 | FROM spotter_live".$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date"; |
| 291 | - if ($usecoord) $query .= " AND (spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong.")"; |
|
| 292 | - if ($id != '') $query .= " OR spotter_live.flightaware_id = :id"; |
|
| 316 | + if ($usecoord) { |
|
| 317 | + $query .= " AND (spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong.")"; |
|
| 318 | + } |
|
| 319 | + if ($id != '') { |
|
| 320 | + $query .= " OR spotter_live.flightaware_id = :id"; |
|
| 321 | + } |
|
| 293 | 322 | //if ($limit > 0) $query .= " LIMIT ".$limit; |
| 294 | 323 | $query .= ") AS spotter |
| 295 | 324 | WHERE latitude <> '0' AND longitude <> '0' |
| 296 | 325 | ORDER BY flightaware_id, date"; |
| 297 | - if ($limit > 0) $query .= " LIMIT ".$limit; |
|
| 326 | + if ($limit > 0) { |
|
| 327 | + $query .= " LIMIT ".$limit; |
|
| 328 | + } |
|
| 298 | 329 | } else { |
| 299 | 330 | $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source, spotter_live.registration |
| 300 | 331 | FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date "; |
| 301 | - if ($usecoord) $query .= "AND (spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong.") "; |
|
| 302 | - if ($id != '') $query .= "OR spotter_live.flightaware_id = :id "; |
|
| 332 | + if ($usecoord) { |
|
| 333 | + $query .= "AND (spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong.") "; |
|
| 334 | + } |
|
| 335 | + if ($id != '') { |
|
| 336 | + $query .= "OR spotter_live.flightaware_id = :id "; |
|
| 337 | + } |
|
| 303 | 338 | $query .= "AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' |
| 304 | 339 | ORDER BY spotter_live.flightaware_id, spotter_live.date"; |
| 305 | - if ($limit > 0) $query .= " LIMIT ".$limit; |
|
| 340 | + if ($limit > 0) { |
|
| 341 | + $query .= " LIMIT ".$limit; |
|
| 342 | + } |
|
| 306 | 343 | } |
| 307 | 344 | } else { |
| 308 | 345 | if (isset($globalArchive) && $globalArchive === TRUE) { |
@@ -320,29 +357,47 @@ discard block |
||
| 320 | 357 | FROM spotter_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date"; |
| 321 | 358 | //if ($limit > 0) $query .= " ORDER BY spotter_live.date ASC LIMIT ".$limit; |
| 322 | 359 | $query .= ") l ON l.flightaware_id = spotter_archive.flightaware_id "; |
| 323 | - if ($usecoord) $query .= "AND (spotter_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_archive.longitude BETWEEN ".$minlong." AND ".$maxlong.") "; |
|
| 324 | - if ($id != '') $query .= "OR spotter_archive.flightaware_id = :id "; |
|
| 360 | + if ($usecoord) { |
|
| 361 | + $query .= "AND (spotter_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_archive.longitude BETWEEN ".$minlong." AND ".$maxlong.") "; |
|
| 362 | + } |
|
| 363 | + if ($id != '') { |
|
| 364 | + $query .= "OR spotter_archive.flightaware_id = :id "; |
|
| 365 | + } |
|
| 325 | 366 | $query .= "UNION |
| 326 | 367 | SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source, spotter_live.registration |
| 327 | 368 | FROM spotter_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date"; |
| 328 | - if ($usecoord) $query .= " AND (spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong.")"; |
|
| 329 | - if ($id != '') $query .= " OR spotter_live.flightaware_id = :id"; |
|
| 369 | + if ($usecoord) { |
|
| 370 | + $query .= " AND (spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong.")"; |
|
| 371 | + } |
|
| 372 | + if ($id != '') { |
|
| 373 | + $query .= " OR spotter_live.flightaware_id = :id"; |
|
| 374 | + } |
|
| 330 | 375 | //if ($limit > 0) $query .= " ORDER BY date ASC LIMIT ".$limit; |
| 331 | 376 | $query .= ") AS spotter WHERE latitude <> '0' AND longitude <> '0' "; |
| 332 | 377 | $query .= "ORDER BY flightaware_id, date"; |
| 333 | - if ($limit > 0) $query .= " LIMIT ".$limit; |
|
| 378 | + if ($limit > 0) { |
|
| 379 | + $query .= " LIMIT ".$limit; |
|
| 380 | + } |
|
| 334 | 381 | } else { |
| 335 | 382 | $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source, spotter_live.registration |
| 336 | 383 | FROM spotter_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date "; |
| 337 | - if ($usecoord) $query .= "AND (spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong.") "; |
|
| 338 | - if ($id != '') $query .= "OR spotter_live.flightaware_id = :id "; |
|
| 384 | + if ($usecoord) { |
|
| 385 | + $query .= "AND (spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong.") "; |
|
| 386 | + } |
|
| 387 | + if ($id != '') { |
|
| 388 | + $query .= "OR spotter_live.flightaware_id = :id "; |
|
| 389 | + } |
|
| 339 | 390 | $query .= "AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' |
| 340 | 391 | ORDER BY spotter_live.flightaware_id, spotter_live.date"; |
| 341 | - if ($limit > 0) $query .= " LIMIT ".$limit; |
|
| 392 | + if ($limit > 0) { |
|
| 393 | + $query .= " LIMIT ".$limit; |
|
| 394 | + } |
|
| 342 | 395 | } |
| 343 | 396 | } |
| 344 | 397 | $query_values = array(); |
| 345 | - if ($id != '') $query_values = array(':id' => $id); |
|
| 398 | + if ($id != '') { |
|
| 399 | + $query_values = array(':id' => $id); |
|
| 400 | + } |
|
| 346 | 401 | try { |
| 347 | 402 | $sth = $this->db->prepare($query); |
| 348 | 403 | $sth->execute($query_values); |
@@ -369,9 +424,15 @@ discard block |
||
| 369 | 424 | $id = filter_var($id,FILTER_SANITIZE_STRING); |
| 370 | 425 | $filter_query = $this->getFilter($filter,true,true); |
| 371 | 426 | |
| 372 | - if (!isset($globalLiveInterval) || $globalLiveInterval == '') $globalLiveInterval = '200'; |
|
| 373 | - if (!isset($globalMap3DAircraftsLimit) || $globalMap3DAircraftsLimit == '') $globalMap3DAircraftsLimit = '300'; |
|
| 374 | - if ($limit == 0 || $limit == '') $limit = $globalMap3DAircraftsLimit; |
|
| 427 | + if (!isset($globalLiveInterval) || $globalLiveInterval == '') { |
|
| 428 | + $globalLiveInterval = '200'; |
|
| 429 | + } |
|
| 430 | + if (!isset($globalMap3DAircraftsLimit) || $globalMap3DAircraftsLimit == '') { |
|
| 431 | + $globalMap3DAircraftsLimit = '300'; |
|
| 432 | + } |
|
| 433 | + if ($limit == 0 || $limit == '') { |
|
| 434 | + $limit = $globalMap3DAircraftsLimit; |
|
| 435 | + } |
|
| 375 | 436 | if ($globalDBdriver == 'mysql') { |
| 376 | 437 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 377 | 438 | $query = 'SELECT * FROM (SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, spotter_archive.date, spotter_archive.format_source, spotter_archive.registration |
@@ -382,13 +443,17 @@ discard block |
||
| 382 | 443 | $query .= ") AS spotter |
| 383 | 444 | WHERE latitude <> '0' AND longitude <> '0' |
| 384 | 445 | ORDER BY flightaware_id, date"; |
| 385 | - if ($limit > 0) $query .= " LIMIT ".$limit; |
|
| 446 | + if ($limit > 0) { |
|
| 447 | + $query .= " LIMIT ".$limit; |
|
| 448 | + } |
|
| 386 | 449 | } else { |
| 387 | 450 | $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source, spotter_live.registration |
| 388 | 451 | FROM spotter_live'.$filter_query.' spotter_live.flightaware_id = :id '; |
| 389 | 452 | $query .= "AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' |
| 390 | 453 | ORDER BY spotter_live.flightaware_id, spotter_live.date"; |
| 391 | - if ($limit > 0) $query .= " LIMIT ".$limit; |
|
| 454 | + if ($limit > 0) { |
|
| 455 | + $query .= " LIMIT ".$limit; |
|
| 456 | + } |
|
| 392 | 457 | } |
| 393 | 458 | } else { |
| 394 | 459 | if (isset($globalArchive) && $globalArchive === TRUE) { |
@@ -404,13 +469,17 @@ discard block |
||
| 404 | 469 | FROM spotter_live".$filter_query." spotter_live.flightaware_id = :id"; |
| 405 | 470 | $query .= ") AS spotter WHERE latitude <> '0' AND longitude <> '0' "; |
| 406 | 471 | $query .= "ORDER BY flightaware_id, date"; |
| 407 | - if ($limit > 0) $query .= " LIMIT ".$limit; |
|
| 472 | + if ($limit > 0) { |
|
| 473 | + $query .= " LIMIT ".$limit; |
|
| 474 | + } |
|
| 408 | 475 | } else { |
| 409 | 476 | $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source, spotter_live.registration |
| 410 | 477 | FROM spotter_live".$filter_query." spotter_live.flightaware_id = :id "; |
| 411 | 478 | $query .= "AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' |
| 412 | 479 | ORDER BY spotter_live.flightaware_id, spotter_live.date"; |
| 413 | - if ($limit > 0) $query .= " LIMIT ".$limit; |
|
| 480 | + if ($limit > 0) { |
|
| 481 | + $query .= " LIMIT ".$limit; |
|
| 482 | + } |
|
| 414 | 483 | } |
| 415 | 484 | } |
| 416 | 485 | $query_values = array(':id' => $id); |
@@ -436,7 +505,9 @@ discard block |
||
| 436 | 505 | global $globalDBdriver, $globalLiveInterval; |
| 437 | 506 | $filter_query = $this->getFilter($filter,true,true); |
| 438 | 507 | |
| 439 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 508 | + if (!isset($globalLiveInterval)) { |
|
| 509 | + $globalLiveInterval = '200'; |
|
| 510 | + } |
|
| 440 | 511 | if ($globalDBdriver == 'mysql') { |
| 441 | 512 | //$query = 'SELECT COUNT(*) as nb FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate'.$filter_query; |
| 442 | 513 | $query = 'SELECT COUNT(DISTINCT spotter_live.flightaware_id) as nb FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date'; |
@@ -467,7 +538,9 @@ discard block |
||
| 467 | 538 | { |
| 468 | 539 | global $globalDBdriver, $globalLiveInterval,$globalMap2DAircraftsLimit; |
| 469 | 540 | $Spotter = new Spotter($this->db); |
| 470 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 541 | + if (!isset($globalLiveInterval)) { |
|
| 542 | + $globalLiveInterval = '200'; |
|
| 543 | + } |
|
| 471 | 544 | $filter_query = $this->getFilter($filter); |
| 472 | 545 | |
| 473 | 546 | if (is_array($coord)) { |
@@ -475,7 +548,9 @@ discard block |
||
| 475 | 548 | $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 476 | 549 | $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 477 | 550 | $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 478 | - } else return array(); |
|
| 551 | + } else { |
|
| 552 | + return array(); |
|
| 553 | + } |
|
| 479 | 554 | if ($globalDBdriver == 'mysql') { |
| 480 | 555 | $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND spotter_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND spotter_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY spotter_live.flightaware_id'.$filter_query; |
| 481 | 556 | } else { |
@@ -500,7 +575,9 @@ discard block |
||
| 500 | 575 | public function getMinLiveSpotterDatabyCoord($coord,$limit = 0, $filter = array()) |
| 501 | 576 | { |
| 502 | 577 | global $globalDBdriver, $globalLiveInterval, $globalArchive,$globalMap2DAircraftsLimit; |
| 503 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 578 | + if (!isset($globalLiveInterval)) { |
|
| 579 | + $globalLiveInterval = '200'; |
|
| 580 | + } |
|
| 504 | 581 | $filter_query = $this->getFilter($filter,true,true); |
| 505 | 582 | |
| 506 | 583 | if (is_array($coord)) { |
@@ -508,7 +585,9 @@ discard block |
||
| 508 | 585 | $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 509 | 586 | $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 510 | 587 | $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 511 | - } else return array(); |
|
| 588 | + } else { |
|
| 589 | + return array(); |
|
| 590 | + } |
|
| 512 | 591 | if ($globalDBdriver == 'mysql') { |
| 513 | 592 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 514 | 593 | $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.real_altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source, spotter_live.registration |
@@ -763,11 +842,15 @@ discard block |
||
| 763 | 842 | //$query = self::$global_query.' WHERE spotter_live.flightaware_id = :id ORDER BY date'; |
| 764 | 843 | if ($globalDBdriver == 'mysql') { |
| 765 | 844 | $query = 'SELECT spotter_live.* FROM spotter_live WHERE spotter_live.flightaware_id = :id'; |
| 766 | - if ($liveinterval) $query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date'; |
|
| 845 | + if ($liveinterval) { |
|
| 846 | + $query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date'; |
|
| 847 | + } |
|
| 767 | 848 | $query .= ' ORDER BY date'; |
| 768 | 849 | } else { |
| 769 | 850 | $query = 'SELECT spotter_live.* FROM spotter_live WHERE spotter_live.flightaware_id = :id'; |
| 770 | - if ($liveinterval) $query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date"; |
|
| 851 | + if ($liveinterval) { |
|
| 852 | + $query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date"; |
|
| 853 | + } |
|
| 771 | 854 | $query .= ' ORDER BY date'; |
| 772 | 855 | } |
| 773 | 856 | |
@@ -862,7 +945,9 @@ discard block |
||
| 862 | 945 | $i++; |
| 863 | 946 | $j++; |
| 864 | 947 | if ($j == 30) { |
| 865 | - if ($globalDebug) echo "."; |
|
| 948 | + if ($globalDebug) { |
|
| 949 | + echo "."; |
|
| 950 | + } |
|
| 866 | 951 | try { |
| 867 | 952 | |
| 868 | 953 | $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
@@ -1237,7 +1322,9 @@ discard block |
||
| 1237 | 1322 | { |
| 1238 | 1323 | return false; |
| 1239 | 1324 | } |
| 1240 | - } else return ''; |
|
| 1325 | + } else { |
|
| 1326 | + return ''; |
|
| 1327 | + } |
|
| 1241 | 1328 | |
| 1242 | 1329 | if ($longitude != '') |
| 1243 | 1330 | { |
@@ -1245,7 +1332,9 @@ discard block |
||
| 1245 | 1332 | { |
| 1246 | 1333 | return false; |
| 1247 | 1334 | } |
| 1248 | - } else return ''; |
|
| 1335 | + } else { |
|
| 1336 | + return ''; |
|
| 1337 | + } |
|
| 1249 | 1338 | |
| 1250 | 1339 | if ($waypoints != '') |
| 1251 | 1340 | { |
@@ -1261,14 +1350,18 @@ discard block |
||
| 1261 | 1350 | { |
| 1262 | 1351 | return false; |
| 1263 | 1352 | } |
| 1264 | - } else $altitude = 0; |
|
| 1353 | + } else { |
|
| 1354 | + $altitude = 0; |
|
| 1355 | + } |
|
| 1265 | 1356 | if ($altitude_real != '') |
| 1266 | 1357 | { |
| 1267 | 1358 | if (!is_numeric($altitude_real)) |
| 1268 | 1359 | { |
| 1269 | 1360 | return false; |
| 1270 | 1361 | } |
| 1271 | - } else $altitude_real = 0; |
|
| 1362 | + } else { |
|
| 1363 | + $altitude_real = 0; |
|
| 1364 | + } |
|
| 1272 | 1365 | |
| 1273 | 1366 | if ($heading != '') |
| 1274 | 1367 | { |
@@ -1276,7 +1369,9 @@ discard block |
||
| 1276 | 1369 | { |
| 1277 | 1370 | return false; |
| 1278 | 1371 | } |
| 1279 | - } else $heading = 0; |
|
| 1372 | + } else { |
|
| 1373 | + $heading = 0; |
|
| 1374 | + } |
|
| 1280 | 1375 | |
| 1281 | 1376 | if ($groundspeed != '') |
| 1282 | 1377 | { |
@@ -1284,9 +1379,13 @@ discard block |
||
| 1284 | 1379 | { |
| 1285 | 1380 | return false; |
| 1286 | 1381 | } |
| 1287 | - } else $groundspeed = 0; |
|
| 1382 | + } else { |
|
| 1383 | + $groundspeed = 0; |
|
| 1384 | + } |
|
| 1288 | 1385 | date_default_timezone_set('UTC'); |
| 1289 | - if ($date == '') $date = date("Y-m-d H:i:s", time()); |
|
| 1386 | + if ($date == '') { |
|
| 1387 | + $date = date("Y-m-d H:i:s", time()); |
|
| 1388 | + } |
|
| 1290 | 1389 | |
| 1291 | 1390 | |
| 1292 | 1391 | $flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING); |
@@ -1331,14 +1430,24 @@ discard block |
||
| 1331 | 1430 | $arrival_airport_country = ''; |
| 1332 | 1431 | |
| 1333 | 1432 | |
| 1334 | - if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL; |
|
| 1335 | - if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL; |
|
| 1336 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
| 1337 | - if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
| 1433 | + if ($squawk == '' || $Common->isInteger($squawk) === false ) { |
|
| 1434 | + $squawk = NULL; |
|
| 1435 | + } |
|
| 1436 | + if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) { |
|
| 1437 | + $verticalrate = NULL; |
|
| 1438 | + } |
|
| 1439 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) { |
|
| 1440 | + $groundspeed = 0; |
|
| 1441 | + } |
|
| 1442 | + if ($heading == '' || $Common->isInteger($heading) === false ) { |
|
| 1443 | + $heading = 0; |
|
| 1444 | + } |
|
| 1338 | 1445 | |
| 1339 | 1446 | $query = ''; |
| 1340 | 1447 | if ($globalArchive) { |
| 1341 | - if ($globalDebug) echo '-- Delete previous data -- '; |
|
| 1448 | + if ($globalDebug) { |
|
| 1449 | + echo '-- Delete previous data -- '; |
|
| 1450 | + } |
|
| 1342 | 1451 | $query .= 'DELETE FROM spotter_live WHERE flightaware_id = :flightaware_id;'; |
| 1343 | 1452 | } |
| 1344 | 1453 | |
@@ -1355,10 +1464,14 @@ discard block |
||
| 1355 | 1464 | return "error : ".$e->getMessage(); |
| 1356 | 1465 | } |
| 1357 | 1466 | if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) { |
| 1358 | - if ($globalDebug) echo '(Add to Spotter archive : '; |
|
| 1467 | + if ($globalDebug) { |
|
| 1468 | + echo '(Add to Spotter archive : '; |
|
| 1469 | + } |
|
| 1359 | 1470 | $SpotterArchive = new SpotterArchive($this->db); |
| 1360 | 1471 | $result = $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $altitude_real,$heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country); |
| 1361 | - if ($globalDebug) echo $result.')'; |
|
| 1472 | + if ($globalDebug) { |
|
| 1473 | + echo $result.')'; |
|
| 1474 | + } |
|
| 1362 | 1475 | } elseif ($globalDebug && $putinarchive !== true) { |
| 1363 | 1476 | echo '(Not adding to archive)'; |
| 1364 | 1477 | } elseif ($globalDebug && $noarchive === true) { |
@@ -9,13 +9,13 @@ discard block |
||
| 9 | 9 | if ($this->db === null) die('Error: No DB connection. (SpotterArchive)'); |
| 10 | 10 | } |
| 11 | 11 | |
| 12 | - /** |
|
| 13 | - * Get SQL query part for filter used |
|
| 14 | - * @param array $filter the filter |
|
| 15 | - * @param bool $where |
|
| 16 | - * @param bool $and |
|
| 17 | - * @return string the SQL part |
|
| 18 | - */ |
|
| 12 | + /** |
|
| 13 | + * Get SQL query part for filter used |
|
| 14 | + * @param array $filter the filter |
|
| 15 | + * @param bool $where |
|
| 16 | + * @param bool $and |
|
| 17 | + * @return string 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(); |
@@ -160,12 +160,12 @@ discard block |
||
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | |
| 163 | - /** |
|
| 164 | - * Gets all the spotter information based on a particular callsign |
|
| 165 | - * |
|
| 166 | - * @param $ident |
|
| 167 | - * @return array the spotter information |
|
| 168 | - */ |
|
| 163 | + /** |
|
| 164 | + * Gets all the spotter information based on a particular callsign |
|
| 165 | + * |
|
| 166 | + * @param $ident |
|
| 167 | + * @return array the spotter information |
|
| 168 | + */ |
|
| 169 | 169 | public function getLastArchiveSpotterDataByIdent($ident) { |
| 170 | 170 | $Spotter = new Spotter($this->db); |
| 171 | 171 | date_default_timezone_set('UTC'); |
@@ -180,12 +180,12 @@ discard block |
||
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | |
| 183 | - /** |
|
| 184 | - * Gets last the spotter information based on a particular id |
|
| 185 | - * |
|
| 186 | - * @param $id |
|
| 187 | - * @return array the spotter information |
|
| 188 | - */ |
|
| 183 | + /** |
|
| 184 | + * Gets last the spotter information based on a particular id |
|
| 185 | + * |
|
| 186 | + * @param $id |
|
| 187 | + * @return array the spotter information |
|
| 188 | + */ |
|
| 189 | 189 | public function getLastArchiveSpotterDataById($id) { |
| 190 | 190 | $Spotter = new Spotter($this->db); |
| 191 | 191 | date_default_timezone_set('UTC'); |
@@ -210,12 +210,12 @@ discard block |
||
| 210 | 210 | return $spotter_array; |
| 211 | 211 | } |
| 212 | 212 | |
| 213 | - /** |
|
| 214 | - * Gets all the spotter information based on a particular id |
|
| 215 | - * |
|
| 216 | - * @param $id |
|
| 217 | - * @return array the spotter information |
|
| 218 | - */ |
|
| 213 | + /** |
|
| 214 | + * Gets all the spotter information based on a particular id |
|
| 215 | + * |
|
| 216 | + * @param $id |
|
| 217 | + * @return array the spotter information |
|
| 218 | + */ |
|
| 219 | 219 | public function getAllArchiveSpotterDataById($id) { |
| 220 | 220 | date_default_timezone_set('UTC'); |
| 221 | 221 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
@@ -235,12 +235,12 @@ discard block |
||
| 235 | 235 | return $spotter_array; |
| 236 | 236 | } |
| 237 | 237 | |
| 238 | - /** |
|
| 239 | - * Gets coordinate & time spotter information based on a particular id |
|
| 240 | - * |
|
| 241 | - * @param $id |
|
| 242 | - * @return array the spotter information |
|
| 243 | - */ |
|
| 238 | + /** |
|
| 239 | + * Gets coordinate & time spotter information based on a particular id |
|
| 240 | + * |
|
| 241 | + * @param $id |
|
| 242 | + * @return array the spotter information |
|
| 243 | + */ |
|
| 244 | 244 | public function getCoordArchiveSpotterDataById($id) { |
| 245 | 245 | date_default_timezone_set('UTC'); |
| 246 | 246 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
@@ -256,14 +256,14 @@ discard block |
||
| 256 | 256 | return $spotter_array; |
| 257 | 257 | } |
| 258 | 258 | |
| 259 | - /** |
|
| 260 | - * Gets coordinate & time spotter information based on a particular id |
|
| 261 | - * |
|
| 262 | - * @param $id |
|
| 263 | - * @param $begindate |
|
| 264 | - * @param $enddate |
|
| 265 | - * @return array the spotter information |
|
| 266 | - */ |
|
| 259 | + /** |
|
| 260 | + * Gets coordinate & time spotter information based on a particular id |
|
| 261 | + * |
|
| 262 | + * @param $id |
|
| 263 | + * @param $begindate |
|
| 264 | + * @param $enddate |
|
| 265 | + * @return array the spotter information |
|
| 266 | + */ |
|
| 267 | 267 | public function getCoordArchiveSpotterDataByIdDate($id,$begindate,$enddate) { |
| 268 | 268 | date_default_timezone_set('UTC'); |
| 269 | 269 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
@@ -280,12 +280,12 @@ discard block |
||
| 280 | 280 | } |
| 281 | 281 | |
| 282 | 282 | |
| 283 | - /** |
|
| 284 | - * Gets altitude information based on a particular callsign |
|
| 285 | - * |
|
| 286 | - * @param $ident |
|
| 287 | - * @return array the spotter information |
|
| 288 | - */ |
|
| 283 | + /** |
|
| 284 | + * Gets altitude information based on a particular callsign |
|
| 285 | + * |
|
| 286 | + * @param $ident |
|
| 287 | + * @return array the spotter information |
|
| 288 | + */ |
|
| 289 | 289 | public function getAltitudeArchiveSpotterDataByIdent($ident) { |
| 290 | 290 | |
| 291 | 291 | date_default_timezone_set('UTC'); |
@@ -305,12 +305,12 @@ discard block |
||
| 305 | 305 | return $spotter_array; |
| 306 | 306 | } |
| 307 | 307 | |
| 308 | - /** |
|
| 309 | - * Gets altitude information based on a particular id |
|
| 310 | - * |
|
| 311 | - * @param $id |
|
| 312 | - * @return array the spotter information |
|
| 313 | - */ |
|
| 308 | + /** |
|
| 309 | + * Gets altitude information based on a particular id |
|
| 310 | + * |
|
| 311 | + * @param $id |
|
| 312 | + * @return array the spotter information |
|
| 313 | + */ |
|
| 314 | 314 | public function getAltitudeArchiveSpotterDataById($id) { |
| 315 | 315 | |
| 316 | 316 | date_default_timezone_set('UTC'); |
@@ -330,12 +330,12 @@ discard block |
||
| 330 | 330 | return $spotter_array; |
| 331 | 331 | } |
| 332 | 332 | |
| 333 | - /** |
|
| 334 | - * Gets altitude & speed information based on a particular id |
|
| 335 | - * |
|
| 336 | - * @param $id |
|
| 337 | - * @return array the spotter information |
|
| 338 | - */ |
|
| 333 | + /** |
|
| 334 | + * Gets altitude & speed information based on a particular id |
|
| 335 | + * |
|
| 336 | + * @param $id |
|
| 337 | + * @return array the spotter information |
|
| 338 | + */ |
|
| 339 | 339 | public function getAltitudeSpeedArchiveSpotterDataById($id) { |
| 340 | 340 | date_default_timezone_set('UTC'); |
| 341 | 341 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
@@ -351,12 +351,12 @@ discard block |
||
| 351 | 351 | return $spotter_array; |
| 352 | 352 | } |
| 353 | 353 | |
| 354 | - /** |
|
| 355 | - * Gets altitude information based on a particular callsign |
|
| 356 | - * |
|
| 357 | - * @param $ident |
|
| 358 | - * @return array the spotter information |
|
| 359 | - */ |
|
| 354 | + /** |
|
| 355 | + * Gets altitude information based on a particular callsign |
|
| 356 | + * |
|
| 357 | + * @param $ident |
|
| 358 | + * @return array the spotter information |
|
| 359 | + */ |
|
| 360 | 360 | public function getLastAltitudeArchiveSpotterDataByIdent($ident) { |
| 361 | 361 | date_default_timezone_set('UTC'); |
| 362 | 362 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
@@ -374,14 +374,14 @@ discard block |
||
| 374 | 374 | } |
| 375 | 375 | |
| 376 | 376 | |
| 377 | - /** |
|
| 378 | - * Gets all the archive spotter information |
|
| 379 | - * |
|
| 380 | - * @param $ident |
|
| 381 | - * @param $flightaware_id |
|
| 382 | - * @param $date |
|
| 383 | - * @return array the spotter information |
|
| 384 | - */ |
|
| 377 | + /** |
|
| 378 | + * Gets all the archive spotter information |
|
| 379 | + * |
|
| 380 | + * @param $ident |
|
| 381 | + * @param $flightaware_id |
|
| 382 | + * @param $date |
|
| 383 | + * @return array the spotter information |
|
| 384 | + */ |
|
| 385 | 385 | public function getSpotterArchiveData($ident,$flightaware_id,$date) { |
| 386 | 386 | $Spotter = new Spotter($this->db); |
| 387 | 387 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
@@ -406,11 +406,11 @@ discard block |
||
| 406 | 406 | } |
| 407 | 407 | } |
| 408 | 408 | |
| 409 | - /** |
|
| 410 | - * Delete row in spotter_archive table based on flightaware_id |
|
| 411 | - * @param $id flightaware_id |
|
| 412 | - */ |
|
| 413 | - public function deleteSpotterArchiveTrackDataByID($id) { |
|
| 409 | + /** |
|
| 410 | + * Delete row in spotter_archive table based on flightaware_id |
|
| 411 | + * @param $id flightaware_id |
|
| 412 | + */ |
|
| 413 | + public function deleteSpotterArchiveTrackDataByID($id) { |
|
| 414 | 414 | global $globalArchiveKeepTrackMonths, $globalDBdriver; |
| 415 | 415 | $query = 'DELETE FROM spotter_archive WHERE spotter_archive.flightaware_id = :id'; |
| 416 | 416 | try { |
@@ -422,15 +422,15 @@ discard block |
||
| 422 | 422 | } |
| 423 | 423 | } |
| 424 | 424 | |
| 425 | - /** |
|
| 426 | - * Gets Minimal Live Spotter data |
|
| 427 | - * |
|
| 428 | - * @param $begindate |
|
| 429 | - * @param $enddate |
|
| 430 | - * @param array $filter |
|
| 431 | - * @param int $part |
|
| 432 | - * @return array the spotter information |
|
| 433 | - */ |
|
| 425 | + /** |
|
| 426 | + * Gets Minimal Live Spotter data |
|
| 427 | + * |
|
| 428 | + * @param $begindate |
|
| 429 | + * @param $enddate |
|
| 430 | + * @param array $filter |
|
| 431 | + * @param int $part |
|
| 432 | + * @return array the spotter information |
|
| 433 | + */ |
|
| 434 | 434 | public function getMinLiveSpotterData($begindate,$enddate,$filter = array(),$part = 0) { |
| 435 | 435 | global $globalDBdriver; |
| 436 | 436 | date_default_timezone_set('UTC'); |
@@ -481,14 +481,14 @@ discard block |
||
| 481 | 481 | return $spotter_array; |
| 482 | 482 | } |
| 483 | 483 | |
| 484 | - /** |
|
| 485 | - * Gets Minimal Live Spotter data |
|
| 486 | - * |
|
| 487 | - * @param $begindate |
|
| 488 | - * @param $enddate |
|
| 489 | - * @param array $filter |
|
| 490 | - * @return array the spotter information |
|
| 491 | - */ |
|
| 484 | + /** |
|
| 485 | + * Gets Minimal Live Spotter data |
|
| 486 | + * |
|
| 487 | + * @param $begindate |
|
| 488 | + * @param $enddate |
|
| 489 | + * @param array $filter |
|
| 490 | + * @return array the spotter information |
|
| 491 | + */ |
|
| 492 | 492 | public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array()) { |
| 493 | 493 | global $globalDBdriver; |
| 494 | 494 | date_default_timezone_set('UTC'); |
@@ -554,14 +554,14 @@ discard block |
||
| 554 | 554 | return $spotter_array; |
| 555 | 555 | } |
| 556 | 556 | |
| 557 | - /** |
|
| 558 | - * Gets count Live Spotter data |
|
| 559 | - * |
|
| 560 | - * @param $begindate |
|
| 561 | - * @param $enddate |
|
| 562 | - * @param array $filter |
|
| 563 | - * @return array the spotter information |
|
| 564 | - */ |
|
| 557 | + /** |
|
| 558 | + * Gets count Live Spotter data |
|
| 559 | + * |
|
| 560 | + * @param $begindate |
|
| 561 | + * @param $enddate |
|
| 562 | + * @param array $filter |
|
| 563 | + * @return array the spotter information |
|
| 564 | + */ |
|
| 565 | 565 | public function getLiveSpotterCount($begindate,$enddate,$filter = array()) { |
| 566 | 566 | global $globalDBdriver, $globalLiveInterval; |
| 567 | 567 | date_default_timezone_set('UTC'); |
@@ -606,36 +606,36 @@ discard block |
||
| 606 | 606 | |
| 607 | 607 | // Spotter_Archive_output |
| 608 | 608 | |
| 609 | - /** |
|
| 610 | - * Gets all the spotter information |
|
| 611 | - * |
|
| 612 | - * @param string $q |
|
| 613 | - * @param string $registration |
|
| 614 | - * @param string $aircraft_icao |
|
| 615 | - * @param string $aircraft_manufacturer |
|
| 616 | - * @param string $highlights |
|
| 617 | - * @param string $airline_icao |
|
| 618 | - * @param string $airline_country |
|
| 619 | - * @param string $airline_type |
|
| 620 | - * @param string $airport |
|
| 621 | - * @param string $airport_country |
|
| 622 | - * @param string $callsign |
|
| 623 | - * @param string $departure_airport_route |
|
| 624 | - * @param string $arrival_airport_route |
|
| 625 | - * @param string $owner |
|
| 626 | - * @param string $pilot_id |
|
| 627 | - * @param string $pilot_name |
|
| 628 | - * @param string $altitude |
|
| 629 | - * @param string $date_posted |
|
| 630 | - * @param string $limit |
|
| 631 | - * @param string $sort |
|
| 632 | - * @param string $includegeodata |
|
| 633 | - * @param string $origLat |
|
| 634 | - * @param string $origLon |
|
| 635 | - * @param string $dist |
|
| 636 | - * @param array $filters |
|
| 637 | - * @return array the spotter information |
|
| 638 | - */ |
|
| 609 | + /** |
|
| 610 | + * Gets all the spotter information |
|
| 611 | + * |
|
| 612 | + * @param string $q |
|
| 613 | + * @param string $registration |
|
| 614 | + * @param string $aircraft_icao |
|
| 615 | + * @param string $aircraft_manufacturer |
|
| 616 | + * @param string $highlights |
|
| 617 | + * @param string $airline_icao |
|
| 618 | + * @param string $airline_country |
|
| 619 | + * @param string $airline_type |
|
| 620 | + * @param string $airport |
|
| 621 | + * @param string $airport_country |
|
| 622 | + * @param string $callsign |
|
| 623 | + * @param string $departure_airport_route |
|
| 624 | + * @param string $arrival_airport_route |
|
| 625 | + * @param string $owner |
|
| 626 | + * @param string $pilot_id |
|
| 627 | + * @param string $pilot_name |
|
| 628 | + * @param string $altitude |
|
| 629 | + * @param string $date_posted |
|
| 630 | + * @param string $limit |
|
| 631 | + * @param string $sort |
|
| 632 | + * @param string $includegeodata |
|
| 633 | + * @param string $origLat |
|
| 634 | + * @param string $origLon |
|
| 635 | + * @param string $dist |
|
| 636 | + * @param array $filters |
|
| 637 | + * @return array the spotter information |
|
| 638 | + */ |
|
| 639 | 639 | public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array()) { |
| 640 | 640 | global $globalTimezone, $globalDBdriver; |
| 641 | 641 | require_once(dirname(__FILE__).'/class.Translation.php'); |
@@ -927,14 +927,14 @@ discard block |
||
| 927 | 927 | } |
| 928 | 928 | } |
| 929 | 929 | |
| 930 | - /** |
|
| 931 | - * Gets all the spotter information based on the callsign |
|
| 932 | - * |
|
| 933 | - * @param string $ident |
|
| 934 | - * @param string $limit |
|
| 935 | - * @param string $sort |
|
| 936 | - * @return array the spotter information |
|
| 937 | - */ |
|
| 930 | + /** |
|
| 931 | + * Gets all the spotter information based on the callsign |
|
| 932 | + * |
|
| 933 | + * @param string $ident |
|
| 934 | + * @param string $limit |
|
| 935 | + * @param string $sort |
|
| 936 | + * @return array the spotter information |
|
| 937 | + */ |
|
| 938 | 938 | public function getSpotterDataByIdent($ident = '', $limit = '', $sort = '') { |
| 939 | 939 | $global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output"; |
| 940 | 940 | |
@@ -981,15 +981,15 @@ discard block |
||
| 981 | 981 | } |
| 982 | 982 | |
| 983 | 983 | |
| 984 | - /** |
|
| 985 | - * Gets all the spotter information based on the owner |
|
| 986 | - * |
|
| 987 | - * @param string $owner |
|
| 988 | - * @param string $limit |
|
| 989 | - * @param string $sort |
|
| 990 | - * @param array $filter |
|
| 991 | - * @return array the spotter information |
|
| 992 | - */ |
|
| 984 | + /** |
|
| 985 | + * Gets all the spotter information based on the owner |
|
| 986 | + * |
|
| 987 | + * @param string $owner |
|
| 988 | + * @param string $limit |
|
| 989 | + * @param string $sort |
|
| 990 | + * @param array $filter |
|
| 991 | + * @return array the spotter information |
|
| 992 | + */ |
|
| 993 | 993 | public function getSpotterDataByOwner($owner = '', $limit = '', $sort = '', $filter = array()) { |
| 994 | 994 | $global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output"; |
| 995 | 995 | |
@@ -1036,15 +1036,15 @@ discard block |
||
| 1036 | 1036 | return $spotter_array; |
| 1037 | 1037 | } |
| 1038 | 1038 | |
| 1039 | - /** |
|
| 1040 | - * Gets all the spotter information based on the pilot |
|
| 1041 | - * |
|
| 1042 | - * @param string $pilot |
|
| 1043 | - * @param string $limit |
|
| 1044 | - * @param string $sort |
|
| 1045 | - * @param array $filter |
|
| 1046 | - * @return array the spotter information |
|
| 1047 | - */ |
|
| 1039 | + /** |
|
| 1040 | + * Gets all the spotter information based on the pilot |
|
| 1041 | + * |
|
| 1042 | + * @param string $pilot |
|
| 1043 | + * @param string $limit |
|
| 1044 | + * @param string $sort |
|
| 1045 | + * @param array $filter |
|
| 1046 | + * @return array the spotter information |
|
| 1047 | + */ |
|
| 1048 | 1048 | public function getSpotterDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array()) { |
| 1049 | 1049 | $global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output"; |
| 1050 | 1050 | |
@@ -1087,14 +1087,14 @@ discard block |
||
| 1087 | 1087 | return $spotter_array; |
| 1088 | 1088 | } |
| 1089 | 1089 | |
| 1090 | - /** |
|
| 1091 | - * Gets all number of flight over countries |
|
| 1092 | - * |
|
| 1093 | - * @param bool $limit |
|
| 1094 | - * @param int $olderthanmonths |
|
| 1095 | - * @param string $sincedate |
|
| 1096 | - * @return array the airline country list |
|
| 1097 | - */ |
|
| 1090 | + /** |
|
| 1091 | + * Gets all number of flight over countries |
|
| 1092 | + * |
|
| 1093 | + * @param bool $limit |
|
| 1094 | + * @param int $olderthanmonths |
|
| 1095 | + * @param string $sincedate |
|
| 1096 | + * @return array the airline country list |
|
| 1097 | + */ |
|
| 1098 | 1098 | public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') { |
| 1099 | 1099 | global $globalDBdriver; |
| 1100 | 1100 | /* |
@@ -1133,14 +1133,14 @@ discard block |
||
| 1133 | 1133 | return $flight_array; |
| 1134 | 1134 | } |
| 1135 | 1135 | |
| 1136 | - /** |
|
| 1137 | - * Gets all number of flight over countries |
|
| 1138 | - * |
|
| 1139 | - * @param bool $limit |
|
| 1140 | - * @param int $olderthanmonths |
|
| 1141 | - * @param string $sincedate |
|
| 1142 | - * @return array the airline country list |
|
| 1143 | - */ |
|
| 1136 | + /** |
|
| 1137 | + * Gets all number of flight over countries |
|
| 1138 | + * |
|
| 1139 | + * @param bool $limit |
|
| 1140 | + * @param int $olderthanmonths |
|
| 1141 | + * @param string $sincedate |
|
| 1142 | + * @return array the airline country list |
|
| 1143 | + */ |
|
| 1144 | 1144 | public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') { |
| 1145 | 1145 | global $globalDBdriver; |
| 1146 | 1146 | /* |
@@ -1180,13 +1180,13 @@ discard block |
||
| 1180 | 1180 | return $flight_array; |
| 1181 | 1181 | } |
| 1182 | 1182 | |
| 1183 | - /** |
|
| 1184 | - * Gets all aircraft types that have flown over by owner |
|
| 1185 | - * |
|
| 1186 | - * @param $owner |
|
| 1187 | - * @param array $filters |
|
| 1188 | - * @return array the aircraft list |
|
| 1189 | - */ |
|
| 1183 | + /** |
|
| 1184 | + * Gets all aircraft types that have flown over by owner |
|
| 1185 | + * |
|
| 1186 | + * @param $owner |
|
| 1187 | + * @param array $filters |
|
| 1188 | + * @return array the aircraft list |
|
| 1189 | + */ |
|
| 1190 | 1190 | public function countAllAircraftTypesByOwner($owner,$filters = array()) |
| 1191 | 1191 | { |
| 1192 | 1192 | $filter_query = $this->getFilter($filters,true,true); |
@@ -1202,13 +1202,13 @@ discard block |
||
| 1202 | 1202 | return $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1203 | 1203 | } |
| 1204 | 1204 | |
| 1205 | - /** |
|
| 1206 | - * Gets all airlines by owner |
|
| 1207 | - * |
|
| 1208 | - * @param $owner |
|
| 1209 | - * @param array $filters |
|
| 1210 | - * @return array the airline list |
|
| 1211 | - */ |
|
| 1205 | + /** |
|
| 1206 | + * Gets all airlines by owner |
|
| 1207 | + * |
|
| 1208 | + * @param $owner |
|
| 1209 | + * @param array $filters |
|
| 1210 | + * @return array the airline list |
|
| 1211 | + */ |
|
| 1212 | 1212 | public function countAllAirlinesByOwner($owner,$filters = array()) |
| 1213 | 1213 | { |
| 1214 | 1214 | $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
@@ -1223,13 +1223,13 @@ discard block |
||
| 1223 | 1223 | return $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1224 | 1224 | } |
| 1225 | 1225 | |
| 1226 | - /** |
|
| 1227 | - * Gets all arrival airports by country of the airplanes that have flown over based on a owner |
|
| 1228 | - * |
|
| 1229 | - * @param $owner |
|
| 1230 | - * @param array $filters |
|
| 1231 | - * @return array the airport list |
|
| 1232 | - */ |
|
| 1226 | + /** |
|
| 1227 | + * Gets all arrival airports by country of the airplanes that have flown over based on a owner |
|
| 1228 | + * |
|
| 1229 | + * @param $owner |
|
| 1230 | + * @param array $filters |
|
| 1231 | + * @return array the airport list |
|
| 1232 | + */ |
|
| 1233 | 1233 | public function countAllArrivalAirportCountriesByOwner($owner, $filters = array()) |
| 1234 | 1234 | { |
| 1235 | 1235 | $filter_query = $this->getFilter($filters,true,true); |
@@ -1243,13 +1243,13 @@ discard block |
||
| 1243 | 1243 | return $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1244 | 1244 | } |
| 1245 | 1245 | |
| 1246 | - /** |
|
| 1247 | - * Gets all arrival airports of the airplanes that have flown over based on a owner |
|
| 1248 | - * |
|
| 1249 | - * @param $owner |
|
| 1250 | - * @param array $filters |
|
| 1251 | - * @return array the airport list |
|
| 1252 | - */ |
|
| 1246 | + /** |
|
| 1247 | + * Gets all arrival airports of the airplanes that have flown over based on a owner |
|
| 1248 | + * |
|
| 1249 | + * @param $owner |
|
| 1250 | + * @param array $filters |
|
| 1251 | + * @return array the airport list |
|
| 1252 | + */ |
|
| 1253 | 1253 | public function countAllArrivalAirportsByOwner($owner,$filters = array()) |
| 1254 | 1254 | { |
| 1255 | 1255 | $filter_query = $this->getFilter($filters,true,true); |
@@ -1274,13 +1274,13 @@ discard block |
||
| 1274 | 1274 | return $airport_array; |
| 1275 | 1275 | } |
| 1276 | 1276 | |
| 1277 | - /** |
|
| 1278 | - * Gets all departure airports by country of the airplanes that have flown over based on owner |
|
| 1279 | - * |
|
| 1280 | - * @param $owner |
|
| 1281 | - * @param array $filters |
|
| 1282 | - * @return array the airport list |
|
| 1283 | - */ |
|
| 1277 | + /** |
|
| 1278 | + * Gets all departure airports by country of the airplanes that have flown over based on owner |
|
| 1279 | + * |
|
| 1280 | + * @param $owner |
|
| 1281 | + * @param array $filters |
|
| 1282 | + * @return array the airport list |
|
| 1283 | + */ |
|
| 1284 | 1284 | public function countAllDepartureAirportCountriesByOwner($owner,$filters = array()) |
| 1285 | 1285 | { |
| 1286 | 1286 | $filter_query = $this->getFilter($filters,true,true); |
@@ -1294,13 +1294,13 @@ discard block |
||
| 1294 | 1294 | return $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1295 | 1295 | } |
| 1296 | 1296 | |
| 1297 | - /** |
|
| 1298 | - * Gets all departure airports of the airplanes that have flown over based on a owner |
|
| 1299 | - * |
|
| 1300 | - * @param $owner |
|
| 1301 | - * @param array $filters |
|
| 1302 | - * @return array the airport list |
|
| 1303 | - */ |
|
| 1297 | + /** |
|
| 1298 | + * Gets all departure airports of the airplanes that have flown over based on a owner |
|
| 1299 | + * |
|
| 1300 | + * @param $owner |
|
| 1301 | + * @param array $filters |
|
| 1302 | + * @return array the airport list |
|
| 1303 | + */ |
|
| 1304 | 1304 | public function countAllDepartureAirportsByOwner($owner,$filters = array()) |
| 1305 | 1305 | { |
| 1306 | 1306 | $filter_query = $this->getFilter($filters,true,true); |
@@ -1327,13 +1327,13 @@ discard block |
||
| 1327 | 1327 | return $airport_array; |
| 1328 | 1328 | } |
| 1329 | 1329 | |
| 1330 | - /** |
|
| 1331 | - * Gets all aircraft manufacturer that have flown over by owner |
|
| 1332 | - * |
|
| 1333 | - * @param $owner |
|
| 1334 | - * @param array $filters |
|
| 1335 | - * @return array the aircraft manufacturer list |
|
| 1336 | - */ |
|
| 1330 | + /** |
|
| 1331 | + * Gets all aircraft manufacturer that have flown over by owner |
|
| 1332 | + * |
|
| 1333 | + * @param $owner |
|
| 1334 | + * @param array $filters |
|
| 1335 | + * @return array the aircraft manufacturer list |
|
| 1336 | + */ |
|
| 1337 | 1337 | public function countAllAircraftManufacturerByOwner($owner,$filters = array()) |
| 1338 | 1338 | { |
| 1339 | 1339 | $filter_query = $this->getFilter($filters,true,true); |
@@ -1349,13 +1349,13 @@ discard block |
||
| 1349 | 1349 | return $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1350 | 1350 | } |
| 1351 | 1351 | |
| 1352 | - /** |
|
| 1353 | - * Gets all aircraft registration that have flown over by owner |
|
| 1354 | - * |
|
| 1355 | - * @param $owner |
|
| 1356 | - * @param array $filters |
|
| 1357 | - * @return array the aircraft list |
|
| 1358 | - */ |
|
| 1352 | + /** |
|
| 1353 | + * Gets all aircraft registration that have flown over by owner |
|
| 1354 | + * |
|
| 1355 | + * @param $owner |
|
| 1356 | + * @param array $filters |
|
| 1357 | + * @return array the aircraft list |
|
| 1358 | + */ |
|
| 1359 | 1359 | public function countAllAircraftRegistrationByOwner($owner,$filters = array()) |
| 1360 | 1360 | { |
| 1361 | 1361 | $filter_query = $this->getFilter($filters,true,true); |
@@ -1391,13 +1391,13 @@ discard block |
||
| 1391 | 1391 | return $aircraft_array; |
| 1392 | 1392 | } |
| 1393 | 1393 | |
| 1394 | - /** |
|
| 1395 | - * Gets all route combinations based on an owner |
|
| 1396 | - * |
|
| 1397 | - * @param $owner |
|
| 1398 | - * @param array $filters |
|
| 1399 | - * @return array the route list |
|
| 1400 | - */ |
|
| 1394 | + /** |
|
| 1395 | + * Gets all route combinations based on an owner |
|
| 1396 | + * |
|
| 1397 | + * @param $owner |
|
| 1398 | + * @param array $filters |
|
| 1399 | + * @return array the route list |
|
| 1400 | + */ |
|
| 1401 | 1401 | public function countAllRoutesByOwner($owner,$filters = array()) |
| 1402 | 1402 | { |
| 1403 | 1403 | $filter_query = $this->getFilter($filters,true,true); |
@@ -1426,13 +1426,13 @@ discard block |
||
| 1426 | 1426 | return $routes_array; |
| 1427 | 1427 | } |
| 1428 | 1428 | |
| 1429 | - /** |
|
| 1430 | - * Counts all hours by a owner |
|
| 1431 | - * |
|
| 1432 | - * @param $owner |
|
| 1433 | - * @param array $filters |
|
| 1434 | - * @return array the hour list |
|
| 1435 | - */ |
|
| 1429 | + /** |
|
| 1430 | + * Counts all hours by a owner |
|
| 1431 | + * |
|
| 1432 | + * @param $owner |
|
| 1433 | + * @param array $filters |
|
| 1434 | + * @return array the hour list |
|
| 1435 | + */ |
|
| 1436 | 1436 | public function countAllHoursByOwner($owner, $filters = array()) |
| 1437 | 1437 | { |
| 1438 | 1438 | global $globalTimezone, $globalDBdriver; |
@@ -1467,13 +1467,13 @@ discard block |
||
| 1467 | 1467 | return $hour_array; |
| 1468 | 1468 | } |
| 1469 | 1469 | |
| 1470 | - /** |
|
| 1471 | - * Gets last spotter information based on a particular callsign |
|
| 1472 | - * |
|
| 1473 | - * @param $id |
|
| 1474 | - * @param $date |
|
| 1475 | - * @return array the spotter information |
|
| 1476 | - */ |
|
| 1470 | + /** |
|
| 1471 | + * Gets last spotter information based on a particular callsign |
|
| 1472 | + * |
|
| 1473 | + * @param $id |
|
| 1474 | + * @param $date |
|
| 1475 | + * @return array the spotter information |
|
| 1476 | + */ |
|
| 1477 | 1477 | public function getDateArchiveSpotterDataById($id,$date) { |
| 1478 | 1478 | $Spotter = new Spotter($this->db); |
| 1479 | 1479 | date_default_timezone_set('UTC'); |
@@ -1484,13 +1484,13 @@ discard block |
||
| 1484 | 1484 | return $spotter_array; |
| 1485 | 1485 | } |
| 1486 | 1486 | |
| 1487 | - /** |
|
| 1488 | - * Gets all the spotter information based on a particular callsign |
|
| 1489 | - * |
|
| 1490 | - * @param $ident |
|
| 1491 | - * @param $date |
|
| 1492 | - * @return array the spotter information |
|
| 1493 | - */ |
|
| 1487 | + /** |
|
| 1488 | + * Gets all the spotter information based on a particular callsign |
|
| 1489 | + * |
|
| 1490 | + * @param $ident |
|
| 1491 | + * @param $date |
|
| 1492 | + * @return array the spotter information |
|
| 1493 | + */ |
|
| 1494 | 1494 | public function getDateArchiveSpotterDataByIdent($ident,$date) { |
| 1495 | 1495 | $Spotter = new Spotter($this->db); |
| 1496 | 1496 | date_default_timezone_set('UTC'); |
@@ -1501,15 +1501,15 @@ discard block |
||
| 1501 | 1501 | return $spotter_array; |
| 1502 | 1502 | } |
| 1503 | 1503 | |
| 1504 | - /** |
|
| 1505 | - * Gets all the spotter information based on the airport |
|
| 1506 | - * |
|
| 1507 | - * @param string $airport |
|
| 1508 | - * @param string $limit |
|
| 1509 | - * @param string $sort |
|
| 1510 | - * @param array $filters |
|
| 1511 | - * @return array the spotter information |
|
| 1512 | - */ |
|
| 1504 | + /** |
|
| 1505 | + * Gets all the spotter information based on the airport |
|
| 1506 | + * |
|
| 1507 | + * @param string $airport |
|
| 1508 | + * @param string $limit |
|
| 1509 | + * @param string $sort |
|
| 1510 | + * @param array $filters |
|
| 1511 | + * @return array the spotter information |
|
| 1512 | + */ |
|
| 1513 | 1513 | public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) { |
| 1514 | 1514 | global $global_query; |
| 1515 | 1515 | $Spotter = new Spotter($this->db); |
@@ -16,75 +16,75 @@ discard block |
||
| 16 | 16 | * @param bool $and |
| 17 | 17 | * @return string the SQL part |
| 18 | 18 | */ |
| 19 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 19 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 20 | 20 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 21 | 21 | $filters = array(); |
| 22 | 22 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 23 | 23 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 24 | 24 | $filters = $globalStatsFilters[$globalFilterName]; |
| 25 | 25 | } else { |
| 26 | - $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
|
| 26 | + $filter = array_merge($filter, $globalStatsFilters[$globalFilterName]); |
|
| 27 | 27 | } |
| 28 | 28 | } |
| 29 | 29 | if (isset($filter[0]['source'])) { |
| 30 | - $filters = array_merge($filters,$filter); |
|
| 30 | + $filters = array_merge($filters, $filter); |
|
| 31 | 31 | } |
| 32 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 32 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 33 | 33 | $filter_query_join = ''; |
| 34 | 34 | $filter_query_where = ''; |
| 35 | - foreach($filters as $flt) { |
|
| 35 | + foreach ($filters as $flt) { |
|
| 36 | 36 | if (isset($flt['airlines']) && !empty($flt['airlines'])) { |
| 37 | 37 | if ($flt['airlines'][0] != '' && $flt['airlines'][0] != 'all') { |
| 38 | 38 | if (isset($flt['source'])) { |
| 39 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 39 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $flt['airlines'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 40 | 40 | } else { |
| 41 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 41 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $flt['airlines'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 42 | 42 | } |
| 43 | 43 | } |
| 44 | 44 | } |
| 45 | 45 | if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) { |
| 46 | 46 | if (isset($flt['source'])) { |
| 47 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 47 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 48 | 48 | } else { |
| 49 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 49 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 50 | 50 | } |
| 51 | 51 | } |
| 52 | 52 | if (isset($flt['idents']) && !empty($flt['idents'])) { |
| 53 | 53 | if (isset($flt['source'])) { |
| 54 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 54 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','", $flt['idents'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 55 | 55 | } else { |
| 56 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 56 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','", $flt['idents'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 57 | 57 | } |
| 58 | 58 | } |
| 59 | 59 | if (isset($flt['registrations']) && !empty($flt['registrations'])) { |
| 60 | 60 | if (isset($flt['source'])) { |
| 61 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 61 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','", $flt['registrations'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 62 | 62 | } else { |
| 63 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 63 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','", $flt['registrations'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 64 | 64 | } |
| 65 | 65 | } |
| 66 | 66 | if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id']) && isset($flt['idents']) && empty($flt['idents']) && isset($flt['registrations']) && empty($flt['registrations'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']) && !isset($flt['idents']) && !isset($flt['registrations']))) { |
| 67 | 67 | if (isset($flt['source'])) { |
| 68 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) saa ON saa.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 68 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_output.format_source IN ('".implode("','", $flt['source'])."')) saa ON saa.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 69 | 69 | } |
| 70 | 70 | } |
| 71 | 71 | } |
| 72 | 72 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 73 | 73 | if ($filter['airlines'][0] != '' && $filter['airlines'][0] != 'all') { |
| 74 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) saf ON saf.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 74 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) saf ON saf.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 75 | 75 | } |
| 76 | 76 | } |
| 77 | 77 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 78 | 78 | $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive_output.flightaware_id "; |
| 79 | 79 | } |
| 80 | 80 | if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) { |
| 81 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 81 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $filter['pilots_id'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 82 | 82 | } |
| 83 | 83 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 84 | 84 | if (count($filter['source']) == 1) { |
| 85 | 85 | $filter_query_where .= " AND format_source = '".$filter['source'][0]."'"; |
| 86 | 86 | } else { |
| 87 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 87 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 88 | 88 | } |
| 89 | 89 | } |
| 90 | 90 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | $filter_query_where .= " AND flightaware_id = '".$filter['id']."'"; |
| 95 | 95 | } |
| 96 | 96 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 97 | - $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 97 | + $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 98 | 98 | } |
| 99 | 99 | if ((isset($filter['year']) && $filter['year'] != '') || (isset($filter['month']) && $filter['month'] != '') || (isset($filter['day']) && $filter['day'] != '')) { |
| 100 | 100 | $filter_query_date = ''; |
@@ -119,41 +119,41 @@ discard block |
||
| 119 | 119 | $filter_query_date .= " AND EXTRACT(DAY FROM spotter_archive_output.date) = '".$filter['day']."'"; |
| 120 | 120 | } |
| 121 | 121 | } |
| 122 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 122 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 123 | 123 | } |
| 124 | 124 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 125 | 125 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
| 126 | 126 | if ($filter_query_where != '') { |
| 127 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
| 127 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
| 128 | 128 | } |
| 129 | 129 | $filter_query = $filter_query_join.$filter_query_where; |
| 130 | 130 | return $filter_query; |
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | // Spotter_archive |
| 134 | - public function addSpotterArchiveData($flightaware_id = '', $ident = '', $registration = '', $airline_name = '', $airline_icao = '', $airline_country = '', $airline_type = '', $aircraft_icao = '', $aircraft_shadow = '', $aircraft_name = '', $aircraft_manufacturer = '', $departure_airport_icao = '', $departure_airport_name = '', $departure_airport_city = '', $departure_airport_country = '', $departure_airport_time = '',$arrival_airport_icao = '', $arrival_airport_name = '', $arrival_airport_city ='', $arrival_airport_country = '', $arrival_airport_time = '', $route_stop = '', $date = '',$latitude = '', $longitude = '', $waypoints = '', $altitude = '', $real_altitude = '',$heading = '', $ground_speed = '', $squawk = '', $ModeS = '', $pilot_id = '', $pilot_name = '',$verticalrate = '',$format_source = '', $source_name = '', $over_country = '') { |
|
| 134 | + public function addSpotterArchiveData($flightaware_id = '', $ident = '', $registration = '', $airline_name = '', $airline_icao = '', $airline_country = '', $airline_type = '', $aircraft_icao = '', $aircraft_shadow = '', $aircraft_name = '', $aircraft_manufacturer = '', $departure_airport_icao = '', $departure_airport_name = '', $departure_airport_city = '', $departure_airport_country = '', $departure_airport_time = '', $arrival_airport_icao = '', $arrival_airport_name = '', $arrival_airport_city = '', $arrival_airport_country = '', $arrival_airport_time = '', $route_stop = '', $date = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $real_altitude = '', $heading = '', $ground_speed = '', $squawk = '', $ModeS = '', $pilot_id = '', $pilot_name = '', $verticalrate = '', $format_source = '', $source_name = '', $over_country = '') { |
|
| 135 | 135 | require_once(dirname(__FILE__).'/class.Spotter.php'); |
| 136 | 136 | if ($over_country == '') { |
| 137 | 137 | $Spotter = new Spotter($this->db); |
| 138 | - $data_country = $Spotter->getCountryFromLatitudeLongitude($latitude,$longitude); |
|
| 138 | + $data_country = $Spotter->getCountryFromLatitudeLongitude($latitude, $longitude); |
|
| 139 | 139 | if (!empty($data_country)) $country = $data_country['iso2']; |
| 140 | 140 | else $country = ''; |
| 141 | 141 | } else $country = $over_country; |
| 142 | - if ($airline_type === NULL) $airline_type =''; |
|
| 142 | + if ($airline_type === NULL) $airline_type = ''; |
|
| 143 | 143 | |
| 144 | 144 | //if ($country == '') echo "\n".'************ UNKNOW COUNTRY ****************'."\n"; |
| 145 | 145 | //else echo "\n".'*/*/*/*/*/*/*/ Country : '.$country.' */*/*/*/*/*/*/*/*/'."\n"; |
| 146 | 146 | |
| 147 | 147 | // Route is not added in spotter_archive |
| 148 | - $query = "INSERT INTO spotter_archive (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, departure_airport_time,arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, arrival_airport_time, route_stop, date,latitude, longitude, waypoints, altitude, heading, ground_speed, squawk, ModeS, pilot_id, pilot_name, verticalrate,format_source,over_country,source_name,real_altitude) |
|
| 148 | + $query = "INSERT INTO spotter_archive (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, departure_airport_time,arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, arrival_airport_time, route_stop, date,latitude, longitude, waypoints, altitude, heading, ground_speed, squawk, ModeS, pilot_id, pilot_name, verticalrate,format_source,over_country,source_name,real_altitude) |
|
| 149 | 149 | VALUES (:flightaware_id, :ident, :registration, :airline_name, :airline_icao, :airline_country, :airline_type, :aircraft_icao, :aircraft_shadow, :aircraft_name, :aircraft_manufacturer, :departure_airport_icao, :departure_airport_name, :departure_airport_city, :departure_airport_country, :departure_airport_time,:arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :arrival_airport_time, :route_stop, :date,:latitude, :longitude, :waypoints, :altitude, :heading, :ground_speed, :squawk, :ModeS, :pilot_id, :pilot_name, :verticalrate, :format_source, :over_country, :source_name,:real_altitude)"; |
| 150 | 150 | |
| 151 | - $query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_shadow' => $aircraft_shadow, ':aircraft_name' => $aircraft_name, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':arrival_airport_time' => $arrival_airport_time, ':route_stop' => $route_stop, ':date' => $date,':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':ground_speed' => $ground_speed, ':squawk' => $squawk, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':over_country' => $country, ':source_name' => $source_name,':real_altitude' => $real_altitude); |
|
| 151 | + $query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_shadow' => $aircraft_shadow, ':aircraft_name' => $aircraft_name, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':arrival_airport_time' => $arrival_airport_time, ':route_stop' => $route_stop, ':date' => $date, ':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':ground_speed' => $ground_speed, ':squawk' => $squawk, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':over_country' => $country, ':source_name' => $source_name, ':real_altitude' => $real_altitude); |
|
| 152 | 152 | try { |
| 153 | 153 | $sth = $this->db->prepare($query); |
| 154 | 154 | $sth->execute($query_values); |
| 155 | 155 | $sth->closeCursor(); |
| 156 | - } catch(PDOException $e) { |
|
| 156 | + } catch (PDOException $e) { |
|
| 157 | 157 | return "error : ".$e->getMessage(); |
| 158 | 158 | } |
| 159 | 159 | return "success"; |
@@ -172,9 +172,9 @@ discard block |
||
| 172 | 172 | |
| 173 | 173 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 174 | 174 | //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
| 175 | - $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 175 | + $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 176 | 176 | |
| 177 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident)); |
|
| 177 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident)); |
|
| 178 | 178 | |
| 179 | 179 | return $spotter_array; |
| 180 | 180 | } |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 193 | 193 | //$query = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id"; |
| 194 | 194 | //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
| 195 | - $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 195 | + $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 196 | 196 | |
| 197 | 197 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 198 | 198 | /* |
@@ -205,7 +205,7 @@ discard block |
||
| 205 | 205 | } |
| 206 | 206 | $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC); |
| 207 | 207 | */ |
| 208 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id)); |
|
| 208 | + $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id)); |
|
| 209 | 209 | |
| 210 | 210 | return $spotter_array; |
| 211 | 211 | } |
@@ -219,14 +219,14 @@ discard block |
||
| 219 | 219 | public function getAllArchiveSpotterDataById($id) { |
| 220 | 220 | date_default_timezone_set('UTC'); |
| 221 | 221 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 222 | - $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 222 | + $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 223 | 223 | |
| 224 | 224 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 225 | 225 | |
| 226 | 226 | try { |
| 227 | 227 | $sth = $this->db->prepare($query); |
| 228 | 228 | $sth->execute(array(':id' => $id)); |
| 229 | - } catch(PDOException $e) { |
|
| 229 | + } catch (PDOException $e) { |
|
| 230 | 230 | echo $e->getMessage(); |
| 231 | 231 | die; |
| 232 | 232 | } |
@@ -244,11 +244,11 @@ discard block |
||
| 244 | 244 | public function getCoordArchiveSpotterDataById($id) { |
| 245 | 245 | date_default_timezone_set('UTC'); |
| 246 | 246 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 247 | - $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER by spotter_archive.date ASC"; |
|
| 247 | + $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER by spotter_archive.date ASC"; |
|
| 248 | 248 | try { |
| 249 | 249 | $sth = $this->db->prepare($query); |
| 250 | 250 | $sth->execute(array(':id' => $id)); |
| 251 | - } catch(PDOException $e) { |
|
| 251 | + } catch (PDOException $e) { |
|
| 252 | 252 | echo $e->getMessage(); |
| 253 | 253 | die; |
| 254 | 254 | } |
@@ -264,14 +264,14 @@ discard block |
||
| 264 | 264 | * @param $enddate |
| 265 | 265 | * @return array the spotter information |
| 266 | 266 | */ |
| 267 | - public function getCoordArchiveSpotterDataByIdDate($id,$begindate,$enddate) { |
|
| 267 | + public function getCoordArchiveSpotterDataByIdDate($id, $begindate, $enddate) { |
|
| 268 | 268 | date_default_timezone_set('UTC'); |
| 269 | 269 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 270 | - $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.date BETWEEN :begindate AND :enddate ORDER by spotter_archive.date ASC"; |
|
| 270 | + $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.date BETWEEN :begindate AND :enddate ORDER by spotter_archive.date ASC"; |
|
| 271 | 271 | try { |
| 272 | 272 | $sth = $this->db->prepare($query); |
| 273 | - $sth->execute(array(':id' => $id,':begindate' => $begindate,':enddate' => $enddate)); |
|
| 274 | - } catch(PDOException $e) { |
|
| 273 | + $sth->execute(array(':id' => $id, ':begindate' => $begindate, ':enddate' => $enddate)); |
|
| 274 | + } catch (PDOException $e) { |
|
| 275 | 275 | echo $e->getMessage(); |
| 276 | 276 | die; |
| 277 | 277 | } |
@@ -291,12 +291,12 @@ discard block |
||
| 291 | 291 | date_default_timezone_set('UTC'); |
| 292 | 292 | |
| 293 | 293 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 294 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 294 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 295 | 295 | |
| 296 | 296 | try { |
| 297 | 297 | $sth = $this->db->prepare($query); |
| 298 | 298 | $sth->execute(array(':ident' => $ident)); |
| 299 | - } catch(PDOException $e) { |
|
| 299 | + } catch (PDOException $e) { |
|
| 300 | 300 | echo $e->getMessage(); |
| 301 | 301 | die; |
| 302 | 302 | } |
@@ -316,12 +316,12 @@ discard block |
||
| 316 | 316 | date_default_timezone_set('UTC'); |
| 317 | 317 | |
| 318 | 318 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 319 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 319 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 320 | 320 | |
| 321 | 321 | try { |
| 322 | 322 | $sth = $this->db->prepare($query); |
| 323 | 323 | $sth->execute(array(':id' => $id)); |
| 324 | - } catch(PDOException $e) { |
|
| 324 | + } catch (PDOException $e) { |
|
| 325 | 325 | echo $e->getMessage(); |
| 326 | 326 | die; |
| 327 | 327 | } |
@@ -339,11 +339,11 @@ discard block |
||
| 339 | 339 | public function getAltitudeSpeedArchiveSpotterDataById($id) { |
| 340 | 340 | date_default_timezone_set('UTC'); |
| 341 | 341 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 342 | - $query = "SELECT spotter_archive.altitude, spotter_archive.real_altitude,spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 342 | + $query = "SELECT spotter_archive.altitude, spotter_archive.real_altitude,spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 343 | 343 | try { |
| 344 | 344 | $sth = $this->db->prepare($query); |
| 345 | 345 | $sth->execute(array(':id' => $id)); |
| 346 | - } catch(PDOException $e) { |
|
| 346 | + } catch (PDOException $e) { |
|
| 347 | 347 | echo $e->getMessage(); |
| 348 | 348 | die; |
| 349 | 349 | } |
@@ -360,12 +360,12 @@ discard block |
||
| 360 | 360 | public function getLastAltitudeArchiveSpotterDataByIdent($ident) { |
| 361 | 361 | date_default_timezone_set('UTC'); |
| 362 | 362 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 363 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 363 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 364 | 364 | // $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident"; |
| 365 | 365 | try { |
| 366 | 366 | $sth = $this->db->prepare($query); |
| 367 | 367 | $sth->execute(array(':ident' => $ident)); |
| 368 | - } catch(PDOException $e) { |
|
| 368 | + } catch (PDOException $e) { |
|
| 369 | 369 | echo $e->getMessage(); |
| 370 | 370 | die; |
| 371 | 371 | } |
@@ -382,11 +382,11 @@ discard block |
||
| 382 | 382 | * @param $date |
| 383 | 383 | * @return array the spotter information |
| 384 | 384 | */ |
| 385 | - public function getSpotterArchiveData($ident,$flightaware_id,$date) { |
|
| 385 | + public function getSpotterArchiveData($ident, $flightaware_id, $date) { |
|
| 386 | 386 | $Spotter = new Spotter($this->db); |
| 387 | 387 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 388 | - $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate"; |
|
| 389 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':flightaware_id' => $flightaware_id,':date' => $date.'%')); |
|
| 388 | + $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate"; |
|
| 389 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':flightaware_id' => $flightaware_id, ':date' => $date.'%')); |
|
| 390 | 390 | return $spotter_array; |
| 391 | 391 | } |
| 392 | 392 | |
@@ -400,7 +400,7 @@ discard block |
||
| 400 | 400 | try { |
| 401 | 401 | $sth = $this->db->prepare($query); |
| 402 | 402 | $sth->execute(); |
| 403 | - } catch(PDOException $e) { |
|
| 403 | + } catch (PDOException $e) { |
|
| 404 | 404 | echo $e->getMessage(); |
| 405 | 405 | die; |
| 406 | 406 | } |
@@ -416,7 +416,7 @@ discard block |
||
| 416 | 416 | try { |
| 417 | 417 | $sth = $this->db->prepare($query); |
| 418 | 418 | $sth->execute(array(':id' => $id)); |
| 419 | - } catch(PDOException $e) { |
|
| 419 | + } catch (PDOException $e) { |
|
| 420 | 420 | echo $e->getMessage(); |
| 421 | 421 | die; |
| 422 | 422 | } |
@@ -431,39 +431,39 @@ discard block |
||
| 431 | 431 | * @param int $part |
| 432 | 432 | * @return array the spotter information |
| 433 | 433 | */ |
| 434 | - public function getMinLiveSpotterData($begindate,$enddate,$filter = array(),$part = 0) { |
|
| 434 | + public function getMinLiveSpotterData($begindate, $enddate, $filter = array(), $part = 0) { |
|
| 435 | 435 | global $globalDBdriver; |
| 436 | 436 | date_default_timezone_set('UTC'); |
| 437 | 437 | //$filter_query = $this->getFilter($filter,true,true); |
| 438 | 438 | |
| 439 | 439 | $filter_query = ''; |
| 440 | 440 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 441 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 441 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 442 | 442 | } |
| 443 | 443 | // Use spotter_output also ? |
| 444 | 444 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 445 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 445 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 446 | 446 | } |
| 447 | 447 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 448 | 448 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
| 449 | 449 | } |
| 450 | 450 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 451 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 451 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 452 | 452 | } |
| 453 | 453 | |
| 454 | 454 | $limit = ''; |
| 455 | 455 | if ($part != 0) { |
| 456 | - $limit = ' LIMIT 100 OFFSET '.($part-1)*100; |
|
| 456 | + $limit = ' LIMIT 100 OFFSET '.($part - 1)*100; |
|
| 457 | 457 | } |
| 458 | 458 | if ($globalDBdriver == 'mysql') { |
| 459 | - $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 459 | + $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 460 | 460 | FROM spotter_archive |
| 461 | 461 | INNER JOIN aircraft a on spotter_archive.aircraft_icao = a.icao |
| 462 | 462 | WHERE spotter_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".' |
| 463 | 463 | '.$filter_query.' ORDER BY flightaware_id'.$limit; |
| 464 | 464 | } else { |
| 465 | 465 | |
| 466 | - $query = 'SELECT spotter_archive.flightaware_id, spotter_archive.date, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 466 | + $query = 'SELECT spotter_archive.flightaware_id, spotter_archive.date, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 467 | 467 | FROM spotter_archive |
| 468 | 468 | INNER JOIN aircraft a on spotter_archive.aircraft_icao = a.icao |
| 469 | 469 | WHERE spotter_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".' |
@@ -473,7 +473,7 @@ discard block |
||
| 473 | 473 | try { |
| 474 | 474 | $sth = $this->db->prepare($query); |
| 475 | 475 | $sth->execute(); |
| 476 | - } catch(PDOException $e) { |
|
| 476 | + } catch (PDOException $e) { |
|
| 477 | 477 | echo $e->getMessage(); |
| 478 | 478 | die; |
| 479 | 479 | } |
@@ -489,7 +489,7 @@ discard block |
||
| 489 | 489 | * @param array $filter |
| 490 | 490 | * @return array the spotter information |
| 491 | 491 | */ |
| 492 | - public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array()) { |
|
| 492 | + public function getMinLiveSpotterDataPlayback($begindate, $enddate, $filter = array()) { |
|
| 493 | 493 | global $globalDBdriver; |
| 494 | 494 | date_default_timezone_set('UTC'); |
| 495 | 495 | |
@@ -497,17 +497,17 @@ discard block |
||
| 497 | 497 | |
| 498 | 498 | $filter_query = ''; |
| 499 | 499 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 500 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 500 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 501 | 501 | } |
| 502 | 502 | // Use spotter_output also ? |
| 503 | 503 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 504 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 504 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 505 | 505 | } |
| 506 | 506 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 507 | 507 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
| 508 | 508 | } |
| 509 | 509 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 510 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 510 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 511 | 511 | } |
| 512 | 512 | |
| 513 | 513 | |
@@ -518,7 +518,7 @@ discard block |
||
| 518 | 518 | FROM spotter_archive |
| 519 | 519 | INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao'; |
| 520 | 520 | */ |
| 521 | - $query = 'SELECT a.aircraft_shadow, spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk |
|
| 521 | + $query = 'SELECT a.aircraft_shadow, spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk |
|
| 522 | 522 | FROM spotter_archive_output |
| 523 | 523 | LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive_output.aircraft_icao = a.icao |
| 524 | 524 | WHERE (spotter_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') |
@@ -533,7 +533,7 @@ discard block |
||
| 533 | 533 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
| 534 | 534 | '.$filter_query.' GROUP BY spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao, spotter_archive_output.arrival_airport_icao, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow'; |
| 535 | 535 | */ |
| 536 | - $query = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
|
| 536 | + $query = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
|
| 537 | 537 | FROM spotter_archive_output |
| 538 | 538 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao |
| 539 | 539 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
@@ -545,7 +545,7 @@ discard block |
||
| 545 | 545 | try { |
| 546 | 546 | $sth = $this->db->prepare($query); |
| 547 | 547 | $sth->execute(); |
| 548 | - } catch(PDOException $e) { |
|
| 548 | + } catch (PDOException $e) { |
|
| 549 | 549 | echo $e->getMessage(); |
| 550 | 550 | die; |
| 551 | 551 | } |
@@ -562,22 +562,22 @@ discard block |
||
| 562 | 562 | * @param array $filter |
| 563 | 563 | * @return array the spotter information |
| 564 | 564 | */ |
| 565 | - public function getLiveSpotterCount($begindate,$enddate,$filter = array()) { |
|
| 565 | + public function getLiveSpotterCount($begindate, $enddate, $filter = array()) { |
|
| 566 | 566 | global $globalDBdriver, $globalLiveInterval; |
| 567 | 567 | date_default_timezone_set('UTC'); |
| 568 | 568 | |
| 569 | 569 | $filter_query = ''; |
| 570 | 570 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 571 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 571 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 572 | 572 | } |
| 573 | 573 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 574 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 574 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 575 | 575 | } |
| 576 | 576 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 577 | 577 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
| 578 | 578 | } |
| 579 | 579 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 580 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 580 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 581 | 581 | } |
| 582 | 582 | |
| 583 | 583 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -592,7 +592,7 @@ discard block |
||
| 592 | 592 | try { |
| 593 | 593 | $sth = $this->db->prepare($query); |
| 594 | 594 | $sth->execute(); |
| 595 | - } catch(PDOException $e) { |
|
| 595 | + } catch (PDOException $e) { |
|
| 596 | 596 | echo $e->getMessage(); |
| 597 | 597 | die; |
| 598 | 598 | } |
@@ -636,7 +636,7 @@ discard block |
||
| 636 | 636 | * @param array $filters |
| 637 | 637 | * @return array the spotter information |
| 638 | 638 | */ |
| 639 | - public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array()) { |
|
| 639 | + public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '', $pilot_id = '', $pilot_name = '', $altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '', $filters = array()) { |
|
| 640 | 640 | global $globalTimezone, $globalDBdriver; |
| 641 | 641 | require_once(dirname(__FILE__).'/class.Translation.php'); |
| 642 | 642 | $Translation = new Translation($this->db); |
@@ -686,7 +686,7 @@ discard block |
||
| 686 | 686 | } |
| 687 | 687 | |
| 688 | 688 | if ($registration != "") { |
| 689 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 689 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 690 | 690 | if (!is_string($registration)) { |
| 691 | 691 | return array(); |
| 692 | 692 | } else { |
@@ -695,7 +695,7 @@ discard block |
||
| 695 | 695 | } |
| 696 | 696 | |
| 697 | 697 | if ($aircraft_icao != "") { |
| 698 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 698 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 699 | 699 | if (!is_string($aircraft_icao)) { |
| 700 | 700 | return array(); |
| 701 | 701 | } else { |
@@ -704,7 +704,7 @@ discard block |
||
| 704 | 704 | } |
| 705 | 705 | |
| 706 | 706 | if ($aircraft_manufacturer != "") { |
| 707 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 707 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 708 | 708 | if (!is_string($aircraft_manufacturer)) { |
| 709 | 709 | return array(); |
| 710 | 710 | } else { |
@@ -721,7 +721,7 @@ discard block |
||
| 721 | 721 | } |
| 722 | 722 | |
| 723 | 723 | if ($airline_icao != "") { |
| 724 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 724 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 725 | 725 | if (!is_string($airline_icao)) { |
| 726 | 726 | return array(); |
| 727 | 727 | } else { |
@@ -730,7 +730,7 @@ discard block |
||
| 730 | 730 | } |
| 731 | 731 | |
| 732 | 732 | if ($airline_country != "") { |
| 733 | - $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 733 | + $airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING); |
|
| 734 | 734 | if (!is_string($airline_country)) { |
| 735 | 735 | return array(); |
| 736 | 736 | } else { |
@@ -739,7 +739,7 @@ discard block |
||
| 739 | 739 | } |
| 740 | 740 | |
| 741 | 741 | if ($airline_type != "") { |
| 742 | - $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 742 | + $airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING); |
|
| 743 | 743 | if (!is_string($airline_type)) { |
| 744 | 744 | return array(); |
| 745 | 745 | } else { |
@@ -756,7 +756,7 @@ discard block |
||
| 756 | 756 | } |
| 757 | 757 | |
| 758 | 758 | if ($airport != "") { |
| 759 | - $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 759 | + $airport = filter_var($airport, FILTER_SANITIZE_STRING); |
|
| 760 | 760 | if (!is_string($airport)) { |
| 761 | 761 | return array(); |
| 762 | 762 | } else { |
@@ -765,7 +765,7 @@ discard block |
||
| 765 | 765 | } |
| 766 | 766 | |
| 767 | 767 | if ($airport_country != "") { |
| 768 | - $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 768 | + $airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING); |
|
| 769 | 769 | if (!is_string($airport_country)) { |
| 770 | 770 | return array(); |
| 771 | 771 | } else { |
@@ -774,14 +774,14 @@ discard block |
||
| 774 | 774 | } |
| 775 | 775 | |
| 776 | 776 | if ($callsign != "") { |
| 777 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 777 | + $callsign = filter_var($callsign, FILTER_SANITIZE_STRING); |
|
| 778 | 778 | if (!is_string($callsign)) { |
| 779 | 779 | return array(); |
| 780 | 780 | } else { |
| 781 | 781 | $translate = $Translation->ident2icao($callsign); |
| 782 | 782 | if ($translate != $callsign) { |
| 783 | 783 | $additional_query .= " AND (spotter_archive_output.ident = :callsign OR spotter_archive_output.ident = :translate)"; |
| 784 | - $query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate)); |
|
| 784 | + $query_values = array_merge($query_values, array(':callsign' => $callsign, ':translate' => $translate)); |
|
| 785 | 785 | } else { |
| 786 | 786 | $additional_query .= " AND (spotter_archive_output.ident = '".$callsign."')"; |
| 787 | 787 | } |
@@ -789,7 +789,7 @@ discard block |
||
| 789 | 789 | } |
| 790 | 790 | |
| 791 | 791 | if ($owner != "") { |
| 792 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 792 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 793 | 793 | if (!is_string($owner)) { |
| 794 | 794 | return array(); |
| 795 | 795 | } else { |
@@ -798,7 +798,7 @@ discard block |
||
| 798 | 798 | } |
| 799 | 799 | |
| 800 | 800 | if ($pilot_name != "") { |
| 801 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 801 | + $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING); |
|
| 802 | 802 | if (!is_string($pilot_name)) { |
| 803 | 803 | return array(); |
| 804 | 804 | } else { |
@@ -807,7 +807,7 @@ discard block |
||
| 807 | 807 | } |
| 808 | 808 | |
| 809 | 809 | if ($pilot_id != "") { |
| 810 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 810 | + $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT); |
|
| 811 | 811 | if (!is_string($pilot_id)) { |
| 812 | 812 | return array(); |
| 813 | 813 | } else { |
@@ -816,7 +816,7 @@ discard block |
||
| 816 | 816 | } |
| 817 | 817 | |
| 818 | 818 | if ($departure_airport_route != "") { |
| 819 | - $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 819 | + $departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING); |
|
| 820 | 820 | if (!is_string($departure_airport_route)) { |
| 821 | 821 | return array(); |
| 822 | 822 | } else { |
@@ -825,7 +825,7 @@ discard block |
||
| 825 | 825 | } |
| 826 | 826 | |
| 827 | 827 | if ($arrival_airport_route != "") { |
| 828 | - $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 828 | + $arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING); |
|
| 829 | 829 | if (!is_string($arrival_airport_route)) { |
| 830 | 830 | return array(); |
| 831 | 831 | } else { |
@@ -836,8 +836,8 @@ discard block |
||
| 836 | 836 | if ($altitude != "") { |
| 837 | 837 | $altitude_array = explode(",", $altitude); |
| 838 | 838 | |
| 839 | - $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 840 | - $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 839 | + $altitude_array[0] = filter_var($altitude_array[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 840 | + $altitude_array[1] = filter_var($altitude_array[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 841 | 841 | |
| 842 | 842 | |
| 843 | 843 | if ($altitude_array[1] != "") { |
@@ -852,8 +852,8 @@ discard block |
||
| 852 | 852 | |
| 853 | 853 | if ($date_posted != "") { |
| 854 | 854 | $date_array = explode(",", $date_posted); |
| 855 | - $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 856 | - $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 855 | + $date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING); |
|
| 856 | + $date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING); |
|
| 857 | 857 | if ($globalTimezone != '') { |
| 858 | 858 | date_default_timezone_set($globalTimezone); |
| 859 | 859 | $datetime = new DateTime(); |
@@ -878,16 +878,16 @@ discard block |
||
| 878 | 878 | } |
| 879 | 879 | if ($limit != "") { |
| 880 | 880 | $limit_array = explode(",", $limit); |
| 881 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 882 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 881 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 882 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 883 | 883 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) { |
| 884 | 884 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 885 | 885 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 886 | 886 | } |
| 887 | 887 | } |
| 888 | 888 | if ($origLat != "" && $origLon != "" && $dist != "") { |
| 889 | - $dist = number_format($dist*0.621371,2,'.',''); |
|
| 890 | - $query="SELECT spotter_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
| 889 | + $dist = number_format($dist*0.621371, 2, '.', ''); |
|
| 890 | + $query = "SELECT spotter_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
| 891 | 891 | FROM spotter_archive_output, spotter_archive WHERE spotter_output_archive.flightaware_id = spotter_archive.flightaware_id AND spotter_output.ident <> '' ".$additional_query."AND CAST(spotter_archive.longitude as double precision) between ($origLon-$dist/ABS(cos(radians($origLat))*69)) and ($origLon+$dist/ABS(cos(radians($origLat))*69)) and CAST(spotter_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) |
| 892 | 892 | AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query." ORDER BY distance"; |
| 893 | 893 | } else { |
@@ -901,12 +901,12 @@ discard block |
||
| 901 | 901 | $additional_query .= " AND (spotter_archive_output.waypoints <> '')"; |
| 902 | 902 | } |
| 903 | 903 | |
| 904 | - $query = "SELECT spotter_archive_output.* FROM spotter_archive_output |
|
| 904 | + $query = "SELECT spotter_archive_output.* FROM spotter_archive_output |
|
| 905 | 905 | WHERE spotter_archive_output.ident <> '' |
| 906 | 906 | ".$additional_query." |
| 907 | 907 | ".$filter_query.$orderby_query; |
| 908 | 908 | } |
| 909 | - $spotter_array = $Spotter->getDataFromDB($query, $query_values,$limit_query); |
|
| 909 | + $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
|
| 910 | 910 | return $spotter_array; |
| 911 | 911 | } |
| 912 | 912 | |
@@ -922,7 +922,7 @@ discard block |
||
| 922 | 922 | $sth = $this->db->prepare($query); |
| 923 | 923 | $sth->execute(); |
| 924 | 924 | return ''; |
| 925 | - } catch(PDOException $e) { |
|
| 925 | + } catch (PDOException $e) { |
|
| 926 | 926 | return "error"; |
| 927 | 927 | } |
| 928 | 928 | } |
@@ -957,8 +957,8 @@ discard block |
||
| 957 | 957 | if ($limit != "") { |
| 958 | 958 | $limit_array = explode(",", $limit); |
| 959 | 959 | |
| 960 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 961 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 960 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 961 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 962 | 962 | |
| 963 | 963 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) { |
| 964 | 964 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
@@ -999,7 +999,7 @@ discard block |
||
| 999 | 999 | $query_values = array(); |
| 1000 | 1000 | $limit_query = ''; |
| 1001 | 1001 | $additional_query = ''; |
| 1002 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 1002 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 1003 | 1003 | |
| 1004 | 1004 | if ($owner != "") { |
| 1005 | 1005 | if (!is_string($owner)) { |
@@ -1013,8 +1013,8 @@ discard block |
||
| 1013 | 1013 | if ($limit != "") { |
| 1014 | 1014 | $limit_array = explode(",", $limit); |
| 1015 | 1015 | |
| 1016 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1017 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1016 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1017 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1018 | 1018 | |
| 1019 | 1019 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0 && $limit_array[0] != '' && $limit_array[1] != '') { |
| 1020 | 1020 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
@@ -1054,7 +1054,7 @@ discard block |
||
| 1054 | 1054 | $query_values = array(); |
| 1055 | 1055 | $limit_query = ''; |
| 1056 | 1056 | $additional_query = ''; |
| 1057 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 1057 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 1058 | 1058 | |
| 1059 | 1059 | if ($pilot != "") { |
| 1060 | 1060 | $additional_query = " AND (spotter_archive_output.pilot_id = :pilot OR spotter_archive_output.pilot_name = :pilot)"; |
@@ -1064,8 +1064,8 @@ discard block |
||
| 1064 | 1064 | if ($limit != "") { |
| 1065 | 1065 | $limit_array = explode(",", $limit); |
| 1066 | 1066 | |
| 1067 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1068 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1067 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1068 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1069 | 1069 | |
| 1070 | 1070 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) { |
| 1071 | 1071 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
@@ -1095,7 +1095,7 @@ discard block |
||
| 1095 | 1095 | * @param string $sincedate |
| 1096 | 1096 | * @return array the airline country list |
| 1097 | 1097 | */ |
| 1098 | - public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') { |
|
| 1098 | + public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '') { |
|
| 1099 | 1099 | global $globalDBdriver; |
| 1100 | 1100 | /* |
| 1101 | 1101 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
@@ -1123,7 +1123,7 @@ discard block |
||
| 1123 | 1123 | $flight_array = array(); |
| 1124 | 1124 | $temp_array = array(); |
| 1125 | 1125 | |
| 1126 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) { |
|
| 1126 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) { |
|
| 1127 | 1127 | $temp_array['flight_count'] = $row['nb']; |
| 1128 | 1128 | $temp_array['flight_country'] = $row['name']; |
| 1129 | 1129 | $temp_array['flight_country_iso3'] = $row['iso3']; |
@@ -1141,7 +1141,7 @@ discard block |
||
| 1141 | 1141 | * @param string $sincedate |
| 1142 | 1142 | * @return array the airline country list |
| 1143 | 1143 | */ |
| 1144 | - public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') { |
|
| 1144 | + public function countAllFlightOverCountriesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '') { |
|
| 1145 | 1145 | global $globalDBdriver; |
| 1146 | 1146 | /* |
| 1147 | 1147 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
@@ -1169,7 +1169,7 @@ discard block |
||
| 1169 | 1169 | $flight_array = array(); |
| 1170 | 1170 | $temp_array = array(); |
| 1171 | 1171 | |
| 1172 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) { |
|
| 1172 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) { |
|
| 1173 | 1173 | $temp_array['airline_icao'] = $row['airline_icao']; |
| 1174 | 1174 | $temp_array['flight_count'] = $row['nb']; |
| 1175 | 1175 | $temp_array['flight_country'] = $row['name']; |
@@ -1187,16 +1187,16 @@ discard block |
||
| 1187 | 1187 | * @param array $filters |
| 1188 | 1188 | * @return array the aircraft list |
| 1189 | 1189 | */ |
| 1190 | - public function countAllAircraftTypesByOwner($owner,$filters = array()) |
|
| 1190 | + public function countAllAircraftTypesByOwner($owner, $filters = array()) |
|
| 1191 | 1191 | { |
| 1192 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1193 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 1192 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1193 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 1194 | 1194 | $query = "SELECT DISTINCT spotter_archive_output.aircraft_icao, COUNT(spotter_archive_output.aircraft_icao) AS aircraft_icao_count, spotter_archive_output.aircraft_name, spotter_archive_output.aircraft_manufacturer |
| 1195 | 1195 | FROM spotter_archive_output".$filter_query." spotter_archive_output.owner_name = :owner"; |
| 1196 | 1196 | $query_values = array(); |
| 1197 | 1197 | $query .= " GROUP BY spotter_archive_output.aircraft_name, spotter_archive_output.aircraft_manufacturer, spotter_archive_output.aircraft_icao |
| 1198 | 1198 | ORDER BY aircraft_icao_count DESC"; |
| 1199 | - $query_values = array_merge($query_values,array(':owner' => $owner)); |
|
| 1199 | + $query_values = array_merge($query_values, array(':owner' => $owner)); |
|
| 1200 | 1200 | $sth = $this->db->prepare($query); |
| 1201 | 1201 | $sth->execute($query_values); |
| 1202 | 1202 | return $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1209,11 +1209,11 @@ discard block |
||
| 1209 | 1209 | * @param array $filters |
| 1210 | 1210 | * @return array the airline list |
| 1211 | 1211 | */ |
| 1212 | - public function countAllAirlinesByOwner($owner,$filters = array()) |
|
| 1212 | + public function countAllAirlinesByOwner($owner, $filters = array()) |
|
| 1213 | 1213 | { |
| 1214 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 1215 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1216 | - $query = "SELECT DISTINCT spotter_archive_output.airline_name, spotter_archive_output.airline_icao, spotter_archive_output.airline_country, COUNT(spotter_archive_output.airline_name) AS airline_count |
|
| 1214 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 1215 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1216 | + $query = "SELECT DISTINCT spotter_archive_output.airline_name, spotter_archive_output.airline_icao, spotter_archive_output.airline_country, COUNT(spotter_archive_output.airline_name) AS airline_count |
|
| 1217 | 1217 | FROM spotter_archive_output".$filter_query." spotter_archive_output.owner_name = :owner |
| 1218 | 1218 | GROUP BY spotter_archive_output.airline_icao, spotter_archive_output.airline_name, spotter_archive_output.airline_country |
| 1219 | 1219 | ORDER BY airline_count DESC"; |
@@ -1232,9 +1232,9 @@ discard block |
||
| 1232 | 1232 | */ |
| 1233 | 1233 | public function countAllArrivalAirportCountriesByOwner($owner, $filters = array()) |
| 1234 | 1234 | { |
| 1235 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1236 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 1237 | - $query = "SELECT DISTINCT spotter_archive_output.arrival_airport_country, COUNT(spotter_archive_output.arrival_airport_country) AS airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 |
|
| 1235 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1236 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 1237 | + $query = "SELECT DISTINCT spotter_archive_output.arrival_airport_country, COUNT(spotter_archive_output.arrival_airport_country) AS airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 |
|
| 1238 | 1238 | FROM countries, spotter_archive_output".$filter_query." spotter_archive_output.arrival_airport_country <> '' AND spotter_archive_output.owner_name = :owner AND countries.name = spotter_archive_output.arrival_airport_country |
| 1239 | 1239 | GROUP BY spotter_archive_output.arrival_airport_country, countries.iso3 |
| 1240 | 1240 | ORDER BY airport_arrival_country_count DESC"; |
@@ -1250,11 +1250,11 @@ discard block |
||
| 1250 | 1250 | * @param array $filters |
| 1251 | 1251 | * @return array the airport list |
| 1252 | 1252 | */ |
| 1253 | - public function countAllArrivalAirportsByOwner($owner,$filters = array()) |
|
| 1253 | + public function countAllArrivalAirportsByOwner($owner, $filters = array()) |
|
| 1254 | 1254 | { |
| 1255 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1256 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 1257 | - $query = "SELECT DISTINCT spotter_archive_output.arrival_airport_icao, COUNT(spotter_archive_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_archive_output.arrival_airport_name, spotter_archive_output.arrival_airport_city, spotter_archive_output.arrival_airport_country |
|
| 1255 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1256 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 1257 | + $query = "SELECT DISTINCT spotter_archive_output.arrival_airport_icao, COUNT(spotter_archive_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_archive_output.arrival_airport_name, spotter_archive_output.arrival_airport_city, spotter_archive_output.arrival_airport_country |
|
| 1258 | 1258 | FROM spotter_archive_output".$filter_query." spotter_archive_output.arrival_airport_name <> '' AND spotter_archive_output.arrival_airport_icao <> 'NA' AND spotter_archive_output.arrival_airport_icao <> '' AND spotter_archive_output.owner_name = :owner |
| 1259 | 1259 | GROUP BY spotter_archive_output.arrival_airport_icao, spotter_archive_output.arrival_airport_name, spotter_archive_output.arrival_airport_city, spotter_archive_output.arrival_airport_country |
| 1260 | 1260 | ORDER BY airport_arrival_icao_count DESC"; |
@@ -1262,7 +1262,7 @@ discard block |
||
| 1262 | 1262 | $sth->execute(array(':owner' => $owner)); |
| 1263 | 1263 | $airport_array = array(); |
| 1264 | 1264 | $temp_array = array(); |
| 1265 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1265 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1266 | 1266 | { |
| 1267 | 1267 | $temp_array['airport_arrival_icao'] = $row['arrival_airport_icao']; |
| 1268 | 1268 | $temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count']; |
@@ -1281,11 +1281,11 @@ discard block |
||
| 1281 | 1281 | * @param array $filters |
| 1282 | 1282 | * @return array the airport list |
| 1283 | 1283 | */ |
| 1284 | - public function countAllDepartureAirportCountriesByOwner($owner,$filters = array()) |
|
| 1284 | + public function countAllDepartureAirportCountriesByOwner($owner, $filters = array()) |
|
| 1285 | 1285 | { |
| 1286 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1287 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 1288 | - $query = "SELECT DISTINCT spotter_archive_output.departure_airport_country, COUNT(spotter_archive_output.departure_airport_country) AS airport_departure_country_count, countries.iso3 AS airport_departure_country_iso3 |
|
| 1286 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1287 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 1288 | + $query = "SELECT DISTINCT spotter_archive_output.departure_airport_country, COUNT(spotter_archive_output.departure_airport_country) AS airport_departure_country_count, countries.iso3 AS airport_departure_country_iso3 |
|
| 1289 | 1289 | FROM spotter_archive_output,countries".$filter_query." spotter_archive_output.departure_airport_country <> '' AND spotter_archive_output.owner_name = :owner AND countries.name = spotter_archive_output.departure_airport_country |
| 1290 | 1290 | GROUP BY spotter_archive_output.departure_airport_country, countries.iso3 |
| 1291 | 1291 | ORDER BY airport_departure_country_count DESC"; |
@@ -1301,11 +1301,11 @@ discard block |
||
| 1301 | 1301 | * @param array $filters |
| 1302 | 1302 | * @return array the airport list |
| 1303 | 1303 | */ |
| 1304 | - public function countAllDepartureAirportsByOwner($owner,$filters = array()) |
|
| 1304 | + public function countAllDepartureAirportsByOwner($owner, $filters = array()) |
|
| 1305 | 1305 | { |
| 1306 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1307 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 1308 | - $query = "SELECT DISTINCT spotter_archive_output.departure_airport_icao, COUNT(spotter_archive_output.departure_airport_icao) AS airport_departure_icao_count, spotter_archive_output.departure_airport_name, spotter_archive_output.departure_airport_city, spotter_archive_output.departure_airport_country, airport.latitude, airport.longitude |
|
| 1306 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1307 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 1308 | + $query = "SELECT DISTINCT spotter_archive_output.departure_airport_icao, COUNT(spotter_archive_output.departure_airport_icao) AS airport_departure_icao_count, spotter_archive_output.departure_airport_name, spotter_archive_output.departure_airport_city, spotter_archive_output.departure_airport_country, airport.latitude, airport.longitude |
|
| 1309 | 1309 | FROM spotter_archive_output,airport".$filter_query." spotter_archive_output.departure_airport_name <> '' AND spotter_archive_output.departure_airport_icao <> 'NA' AND spotter_archive_output.departure_airport_icao <> '' AND spotter_archive_output.owner_name = :owner AND airport.icao = spotter_archive_output.departure_airport_icao |
| 1310 | 1310 | GROUP BY spotter_archive_output.departure_airport_icao, spotter_archive_output.departure_airport_name, spotter_archive_output.departure_airport_city, spotter_archive_output.departure_airport_country, airport.latitude, airport.longitude |
| 1311 | 1311 | ORDER BY airport_departure_icao_count DESC"; |
@@ -1313,7 +1313,7 @@ discard block |
||
| 1313 | 1313 | $sth->execute(array(':owner' => $owner)); |
| 1314 | 1314 | $airport_array = array(); |
| 1315 | 1315 | $temp_array = array(); |
| 1316 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1316 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1317 | 1317 | { |
| 1318 | 1318 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
| 1319 | 1319 | $temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count']; |
@@ -1334,14 +1334,14 @@ discard block |
||
| 1334 | 1334 | * @param array $filters |
| 1335 | 1335 | * @return array the aircraft manufacturer list |
| 1336 | 1336 | */ |
| 1337 | - public function countAllAircraftManufacturerByOwner($owner,$filters = array()) |
|
| 1337 | + public function countAllAircraftManufacturerByOwner($owner, $filters = array()) |
|
| 1338 | 1338 | { |
| 1339 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1340 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 1341 | - $query = "SELECT DISTINCT spotter_archive_output.aircraft_manufacturer, COUNT(spotter_archive_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 1339 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1340 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 1341 | + $query = "SELECT DISTINCT spotter_archive_output.aircraft_manufacturer, COUNT(spotter_archive_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 1342 | 1342 | FROM spotter_archive_output".$filter_query." spotter_archive_output.aircraft_manufacturer <> '' AND spotter_archive_output.owner_name = :owner"; |
| 1343 | 1343 | $query_values = array(); |
| 1344 | - $query_values = array_merge($query_values,array(':owner' => $owner)); |
|
| 1344 | + $query_values = array_merge($query_values, array(':owner' => $owner)); |
|
| 1345 | 1345 | $query .= " GROUP BY spotter_archive_output.aircraft_manufacturer |
| 1346 | 1346 | ORDER BY aircraft_manufacturer_count DESC"; |
| 1347 | 1347 | $sth = $this->db->prepare($query); |
@@ -1356,22 +1356,22 @@ discard block |
||
| 1356 | 1356 | * @param array $filters |
| 1357 | 1357 | * @return array the aircraft list |
| 1358 | 1358 | */ |
| 1359 | - public function countAllAircraftRegistrationByOwner($owner,$filters = array()) |
|
| 1359 | + public function countAllAircraftRegistrationByOwner($owner, $filters = array()) |
|
| 1360 | 1360 | { |
| 1361 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1361 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1362 | 1362 | $Image = new Image($this->db); |
| 1363 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 1364 | - $query = "SELECT DISTINCT spotter_archive_output.aircraft_icao, COUNT(spotter_archive_output.registration) AS registration_count, spotter_archive_output.aircraft_name, spotter_archive_output.aircraft_manufacturer, spotter_archive_output.registration, spotter_archive_output.airline_name |
|
| 1363 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 1364 | + $query = "SELECT DISTINCT spotter_archive_output.aircraft_icao, COUNT(spotter_archive_output.registration) AS registration_count, spotter_archive_output.aircraft_name, spotter_archive_output.aircraft_manufacturer, spotter_archive_output.registration, spotter_archive_output.airline_name |
|
| 1365 | 1365 | FROM spotter_archive_output".$filter_query." spotter_archive_output.registration <> '' AND spotter_archive_output.owner_name = :owner"; |
| 1366 | 1366 | $query_values = array(); |
| 1367 | - $query_values = array_merge($query_values,array(':owner' => $owner)); |
|
| 1367 | + $query_values = array_merge($query_values, array(':owner' => $owner)); |
|
| 1368 | 1368 | $query .= " GROUP BY spotter_archive_output.registration,spotter_archive_output.aircraft_icao, spotter_archive_output.aircraft_name, spotter_archive_output.aircraft_manufacturer, spotter_archive_output.airline_name |
| 1369 | 1369 | ORDER BY registration_count DESC"; |
| 1370 | 1370 | $sth = $this->db->prepare($query); |
| 1371 | 1371 | $sth->execute($query_values); |
| 1372 | 1372 | $aircraft_array = array(); |
| 1373 | 1373 | $temp_array = array(); |
| 1374 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1374 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1375 | 1375 | { |
| 1376 | 1376 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 1377 | 1377 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
@@ -1379,7 +1379,7 @@ discard block |
||
| 1379 | 1379 | $temp_array['registration'] = $row['registration']; |
| 1380 | 1380 | $temp_array['airline_name'] = $row['airline_name']; |
| 1381 | 1381 | $temp_array['image_thumbnail'] = ""; |
| 1382 | - if($row['registration'] != "") |
|
| 1382 | + if ($row['registration'] != "") |
|
| 1383 | 1383 | { |
| 1384 | 1384 | $image_array = $Image->getSpotterImage($row['registration']); |
| 1385 | 1385 | if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
@@ -1398,11 +1398,11 @@ discard block |
||
| 1398 | 1398 | * @param array $filters |
| 1399 | 1399 | * @return array the route list |
| 1400 | 1400 | */ |
| 1401 | - public function countAllRoutesByOwner($owner,$filters = array()) |
|
| 1401 | + public function countAllRoutesByOwner($owner, $filters = array()) |
|
| 1402 | 1402 | { |
| 1403 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1404 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 1405 | - $query = "SELECT DISTINCT concat(spotter_archive_output.departure_airport_icao, ' - ', spotter_archive_output.arrival_airport_icao) AS route, count(concat(spotter_archive_output.departure_airport_icao, ' - ', spotter_archive_output.arrival_airport_icao)) AS route_count, spotter_archive_output.departure_airport_icao, spotter_archive_output.departure_airport_name AS airport_departure_name, spotter_archive_output.departure_airport_city AS airport_departure_city, spotter_archive_output.departure_airport_country AS airport_departure_country, spotter_archive_output.arrival_airport_icao, spotter_archive_output.arrival_airport_name AS airport_arrival_name, spotter_archive_output.arrival_airport_city AS airport_arrival_city, spotter_archive_output.arrival_airport_country AS airport_arrival_country |
|
| 1403 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1404 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 1405 | + $query = "SELECT DISTINCT concat(spotter_archive_output.departure_airport_icao, ' - ', spotter_archive_output.arrival_airport_icao) AS route, count(concat(spotter_archive_output.departure_airport_icao, ' - ', spotter_archive_output.arrival_airport_icao)) AS route_count, spotter_archive_output.departure_airport_icao, spotter_archive_output.departure_airport_name AS airport_departure_name, spotter_archive_output.departure_airport_city AS airport_departure_city, spotter_archive_output.departure_airport_country AS airport_departure_country, spotter_archive_output.arrival_airport_icao, spotter_archive_output.arrival_airport_name AS airport_arrival_name, spotter_archive_output.arrival_airport_city AS airport_arrival_city, spotter_archive_output.arrival_airport_country AS airport_arrival_country |
|
| 1406 | 1406 | FROM spotter_archive_output".$filter_query." spotter_archive_output.ident <> '' AND spotter_archive_output.owner_name = :owner |
| 1407 | 1407 | GROUP BY route, spotter_archive_output.departure_airport_icao, spotter_archive_output.departure_airport_name, spotter_archive_output.departure_airport_city, spotter_archive_output.departure_airport_country, spotter_archive_output.arrival_airport_icao, spotter_archive_output.arrival_airport_name, spotter_archive_output.arrival_airport_city, spotter_archive_output.arrival_airport_country |
| 1408 | 1408 | ORDER BY route_count DESC"; |
@@ -1410,7 +1410,7 @@ discard block |
||
| 1410 | 1410 | $sth->execute(array(':owner' => $owner)); |
| 1411 | 1411 | $routes_array = array(); |
| 1412 | 1412 | $temp_array = array(); |
| 1413 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1413 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1414 | 1414 | { |
| 1415 | 1415 | $temp_array['route_count'] = $row['route_count']; |
| 1416 | 1416 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
@@ -1436,8 +1436,8 @@ discard block |
||
| 1436 | 1436 | public function countAllHoursByOwner($owner, $filters = array()) |
| 1437 | 1437 | { |
| 1438 | 1438 | global $globalTimezone, $globalDBdriver; |
| 1439 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1440 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 1439 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1440 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 1441 | 1441 | if ($globalTimezone != '') { |
| 1442 | 1442 | date_default_timezone_set($globalTimezone); |
| 1443 | 1443 | $datetime = new DateTime(); |
@@ -1449,16 +1449,16 @@ discard block |
||
| 1449 | 1449 | GROUP BY hour_name |
| 1450 | 1450 | ORDER BY hour_name ASC"; |
| 1451 | 1451 | } else { |
| 1452 | - $query = "SELECT EXTRACT(HOUR FROM spotter_archive_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1452 | + $query = "SELECT EXTRACT(HOUR FROM spotter_archive_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1453 | 1453 | FROM spotter_archive_output".$filter_query." spotter_archive_output.owner_name = :owner |
| 1454 | 1454 | GROUP BY hour_name |
| 1455 | 1455 | ORDER BY hour_name ASC"; |
| 1456 | 1456 | } |
| 1457 | 1457 | $sth = $this->db->prepare($query); |
| 1458 | - $sth->execute(array(':owner' => $owner,':offset' => $offset)); |
|
| 1458 | + $sth->execute(array(':owner' => $owner, ':offset' => $offset)); |
|
| 1459 | 1459 | $hour_array = array(); |
| 1460 | 1460 | $temp_array = array(); |
| 1461 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1461 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1462 | 1462 | { |
| 1463 | 1463 | $temp_array['hour_name'] = $row['hour_name']; |
| 1464 | 1464 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1474,13 +1474,13 @@ discard block |
||
| 1474 | 1474 | * @param $date |
| 1475 | 1475 | * @return array the spotter information |
| 1476 | 1476 | */ |
| 1477 | - public function getDateArchiveSpotterDataById($id,$date) { |
|
| 1477 | + public function getDateArchiveSpotterDataById($id, $date) { |
|
| 1478 | 1478 | $Spotter = new Spotter($this->db); |
| 1479 | 1479 | date_default_timezone_set('UTC'); |
| 1480 | 1480 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 1481 | - $query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC'; |
|
| 1482 | - $date = date('c',$date); |
|
| 1483 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date)); |
|
| 1481 | + $query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC'; |
|
| 1482 | + $date = date('c', $date); |
|
| 1483 | + $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id, ':date' => $date)); |
|
| 1484 | 1484 | return $spotter_array; |
| 1485 | 1485 | } |
| 1486 | 1486 | |
@@ -1491,13 +1491,13 @@ discard block |
||
| 1491 | 1491 | * @param $date |
| 1492 | 1492 | * @return array the spotter information |
| 1493 | 1493 | */ |
| 1494 | - public function getDateArchiveSpotterDataByIdent($ident,$date) { |
|
| 1494 | + public function getDateArchiveSpotterDataByIdent($ident, $date) { |
|
| 1495 | 1495 | $Spotter = new Spotter($this->db); |
| 1496 | 1496 | date_default_timezone_set('UTC'); |
| 1497 | 1497 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 1498 | - $query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC'; |
|
| 1499 | - $date = date('c',$date); |
|
| 1500 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
|
| 1498 | + $query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC'; |
|
| 1499 | + $date = date('c', $date); |
|
| 1500 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':date' => $date)); |
|
| 1501 | 1501 | return $spotter_array; |
| 1502 | 1502 | } |
| 1503 | 1503 | |
@@ -1510,14 +1510,14 @@ discard block |
||
| 1510 | 1510 | * @param array $filters |
| 1511 | 1511 | * @return array the spotter information |
| 1512 | 1512 | */ |
| 1513 | - public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) { |
|
| 1513 | + public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '', $filters = array()) { |
|
| 1514 | 1514 | global $global_query; |
| 1515 | 1515 | $Spotter = new Spotter($this->db); |
| 1516 | 1516 | date_default_timezone_set('UTC'); |
| 1517 | 1517 | $query_values = array(); |
| 1518 | 1518 | $limit_query = ''; |
| 1519 | 1519 | $additional_query = ''; |
| 1520 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1520 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1521 | 1521 | |
| 1522 | 1522 | if ($airport != "") { |
| 1523 | 1523 | if (!is_string($airport)) { |
@@ -1531,8 +1531,8 @@ discard block |
||
| 1531 | 1531 | if ($limit != "") { |
| 1532 | 1532 | $limit_array = explode(",", $limit); |
| 1533 | 1533 | |
| 1534 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1535 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1534 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1535 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1536 | 1536 | |
| 1537 | 1537 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) { |
| 1538 | 1538 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
@@ -6,7 +6,9 @@ discard block |
||
| 6 | 6 | public function __construct($dbc = null) { |
| 7 | 7 | $Connection = new Connection($dbc); |
| 8 | 8 | $this->db = $Connection->db; |
| 9 | - if ($this->db === null) die('Error: No DB connection. (SpotterArchive)'); |
|
| 9 | + if ($this->db === null) { |
|
| 10 | + die('Error: No DB connection. (SpotterArchive)'); |
|
| 11 | + } |
|
| 10 | 12 | } |
| 11 | 13 | |
| 12 | 14 | /** |
@@ -29,7 +31,9 @@ discard block |
||
| 29 | 31 | if (isset($filter[0]['source'])) { |
| 30 | 32 | $filters = array_merge($filters,$filter); |
| 31 | 33 | } |
| 32 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 34 | + if (is_array($globalFilter)) { |
|
| 35 | + $filter = array_merge($filter,$globalFilter); |
|
| 36 | + } |
|
| 33 | 37 | $filter_query_join = ''; |
| 34 | 38 | $filter_query_where = ''; |
| 35 | 39 | foreach($filters as $flt) { |
@@ -121,8 +125,11 @@ discard block |
||
| 121 | 125 | } |
| 122 | 126 | $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id"; |
| 123 | 127 | } |
| 124 | - if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
|
| 125 | - elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
|
| 128 | + if ($filter_query_where == '' && $where) { |
|
| 129 | + $filter_query_where = ' WHERE'; |
|
| 130 | + } elseif ($filter_query_where != '' && $and) { |
|
| 131 | + $filter_query_where .= ' AND'; |
|
| 132 | + } |
|
| 126 | 133 | if ($filter_query_where != '') { |
| 127 | 134 | $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
| 128 | 135 | } |
@@ -136,10 +143,17 @@ discard block |
||
| 136 | 143 | if ($over_country == '') { |
| 137 | 144 | $Spotter = new Spotter($this->db); |
| 138 | 145 | $data_country = $Spotter->getCountryFromLatitudeLongitude($latitude,$longitude); |
| 139 | - if (!empty($data_country)) $country = $data_country['iso2']; |
|
| 140 | - else $country = ''; |
|
| 141 | - } else $country = $over_country; |
|
| 142 | - if ($airline_type === NULL) $airline_type =''; |
|
| 146 | + if (!empty($data_country)) { |
|
| 147 | + $country = $data_country['iso2']; |
|
| 148 | + } else { |
|
| 149 | + $country = ''; |
|
| 150 | + } |
|
| 151 | + } else { |
|
| 152 | + $country = $over_country; |
|
| 153 | + } |
|
| 154 | + if ($airline_type === NULL) { |
|
| 155 | + $airline_type =''; |
|
| 156 | + } |
|
| 143 | 157 | |
| 144 | 158 | //if ($country == '') echo "\n".'************ UNKNOW COUNTRY ****************'."\n"; |
| 145 | 159 | //else echo "\n".'*/*/*/*/*/*/*/ Country : '.$country.' */*/*/*/*/*/*/*/*/'."\n"; |
@@ -678,7 +692,9 @@ discard block |
||
| 678 | 692 | $additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR "; |
| 679 | 693 | $additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR "; |
| 680 | 694 | $translate = $Translation->ident2icao($q_item); |
| 681 | - if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR "; |
|
| 695 | + if ($translate != $q_item) { |
|
| 696 | + $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR "; |
|
| 697 | + } |
|
| 682 | 698 | $additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')"; |
| 683 | 699 | $additional_query .= ")"; |
| 684 | 700 | } |
@@ -858,7 +874,9 @@ discard block |
||
| 858 | 874 | date_default_timezone_set($globalTimezone); |
| 859 | 875 | $datetime = new DateTime(); |
| 860 | 876 | $offset = $datetime->format('P'); |
| 861 | - } else $offset = '+00:00'; |
|
| 877 | + } else { |
|
| 878 | + $offset = '+00:00'; |
|
| 879 | + } |
|
| 862 | 880 | if ($date_array[1] != "") { |
| 863 | 881 | $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0])); |
| 864 | 882 | $date_array[1] = date("Y-m-d H:i:s", strtotime($date_array[1])); |
@@ -1112,9 +1130,13 @@ discard block |
||
| 1112 | 1130 | $query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1113 | 1131 | } |
| 1114 | 1132 | } |
| 1115 | - if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
| 1133 | + if ($sincedate != '') { |
|
| 1134 | + $query .= "AND date > '".$sincedate."' "; |
|
| 1135 | + } |
|
| 1116 | 1136 | $query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1117 | - if ($limit) $query .= " LIMIT 0,10"; |
|
| 1137 | + if ($limit) { |
|
| 1138 | + $query .= " LIMIT 0,10"; |
|
| 1139 | + } |
|
| 1118 | 1140 | |
| 1119 | 1141 | |
| 1120 | 1142 | $sth = $this->db->prepare($query); |
@@ -1158,9 +1180,13 @@ discard block |
||
| 1158 | 1180 | $query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1159 | 1181 | } |
| 1160 | 1182 | } |
| 1161 | - if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' "; |
|
| 1183 | + if ($sincedate != '') { |
|
| 1184 | + $query .= "AND s.date > '".$sincedate."' "; |
|
| 1185 | + } |
|
| 1162 | 1186 | $query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1163 | - if ($limit) $query .= " LIMIT 0,10"; |
|
| 1187 | + if ($limit) { |
|
| 1188 | + $query .= " LIMIT 0,10"; |
|
| 1189 | + } |
|
| 1164 | 1190 | |
| 1165 | 1191 | |
| 1166 | 1192 | $sth = $this->db->prepare($query); |
@@ -1382,8 +1408,11 @@ discard block |
||
| 1382 | 1408 | if($row['registration'] != "") |
| 1383 | 1409 | { |
| 1384 | 1410 | $image_array = $Image->getSpotterImage($row['registration']); |
| 1385 | - if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
|
| 1386 | - else $temp_array['image_thumbnail'] = ''; |
|
| 1411 | + if (isset($image_array[0]['image_thumbnail'])) { |
|
| 1412 | + $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
|
| 1413 | + } else { |
|
| 1414 | + $temp_array['image_thumbnail'] = ''; |
|
| 1415 | + } |
|
| 1387 | 1416 | } |
| 1388 | 1417 | $temp_array['registration_count'] = $row['registration_count']; |
| 1389 | 1418 | $aircraft_array[] = $temp_array; |
@@ -1442,7 +1471,9 @@ discard block |
||
| 1442 | 1471 | date_default_timezone_set($globalTimezone); |
| 1443 | 1472 | $datetime = new DateTime(); |
| 1444 | 1473 | $offset = $datetime->format('P'); |
| 1445 | - } else $offset = '+00:00'; |
|
| 1474 | + } else { |
|
| 1475 | + $offset = '+00:00'; |
|
| 1476 | + } |
|
| 1446 | 1477 | if ($globalDBdriver == 'mysql') { |
| 1447 | 1478 | $query = "SELECT HOUR(CONVERT_TZ(spotter_archive_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
| 1448 | 1479 | FROM spotter_archive_output".$filter_query." spotter_archive_output.owner_name = :owner |
@@ -21,13 +21,13 @@ discard block |
||
| 21 | 21 | if ($this->db === null) die('Error: No DB connection. (ATC)'); |
| 22 | 22 | } |
| 23 | 23 | |
| 24 | - /** |
|
| 25 | - * Get SQL query part for filter used |
|
| 26 | - * @param array $filter the filter |
|
| 27 | - * @param bool $where |
|
| 28 | - * @param bool $and |
|
| 29 | - * @return String the SQL part |
|
| 30 | - */ |
|
| 24 | + /** |
|
| 25 | + * Get SQL query part for filter used |
|
| 26 | + * @param array $filter the filter |
|
| 27 | + * @param bool $where |
|
| 28 | + * @param bool $and |
|
| 29 | + * @return String the SQL part |
|
| 30 | + */ |
|
| 31 | 31 | public function getFilter($filter = array(),$where = false,$and = false) { |
| 32 | 32 | global $globalFilter, $globalStatsFilters, $globalFilterName; |
| 33 | 33 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | * Get all ATC from atc table |
| 56 | 56 | * @return array Return all ATC |
| 57 | 57 | */ |
| 58 | - public function getAll() { |
|
| 58 | + public function getAll() { |
|
| 59 | 59 | $filter_query = $this->getFilter(array()); |
| 60 | 60 | $query = "SELECT * FROM atc".$filter_query; |
| 61 | 61 | $query_values = array(); |
@@ -18,7 +18,9 @@ discard block |
||
| 18 | 18 | public function __construct($dbc = null) { |
| 19 | 19 | $Connection = new Connection($dbc); |
| 20 | 20 | $this->db = $Connection->db; |
| 21 | - if ($this->db === null) die('Error: No DB connection. (ATC)'); |
|
| 21 | + if ($this->db === null) { |
|
| 22 | + die('Error: No DB connection. (ATC)'); |
|
| 23 | + } |
|
| 22 | 24 | } |
| 23 | 25 | |
| 24 | 26 | /** |
@@ -33,20 +35,27 @@ discard block |
||
| 33 | 35 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 34 | 36 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 35 | 37 | foreach($globalStatsFilters[$globalFilterName] as $source) { |
| 36 | - if (isset($source['source'])) $filter['source'][] = $source['source']; |
|
| 38 | + if (isset($source['source'])) { |
|
| 39 | + $filter['source'][] = $source['source']; |
|
| 40 | + } |
|
| 37 | 41 | } |
| 38 | 42 | } else { |
| 39 | 43 | $filter = $globalStatsFilters[$globalFilterName]; |
| 40 | 44 | } |
| 41 | 45 | } |
| 42 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 46 | + if (is_array($globalFilter)) { |
|
| 47 | + $filter = array_merge($filter,$globalFilter); |
|
| 48 | + } |
|
| 43 | 49 | $filter_query_join = ''; |
| 44 | 50 | $filter_query_where = ''; |
| 45 | 51 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 46 | 52 | $filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')"; |
| 47 | 53 | } |
| 48 | - if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
|
| 49 | - elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
|
| 54 | + if ($filter_query_where == '' && $where) { |
|
| 55 | + $filter_query_where = ' WHERE'; |
|
| 56 | + } elseif ($filter_query_where != '' && $and) { |
|
| 57 | + $filter_query_where .= ' AND'; |
|
| 58 | + } |
|
| 50 | 59 | $filter_query = $filter_query_join.$filter_query_where; |
| 51 | 60 | return $filter_query; |
| 52 | 61 | } |
@@ -133,7 +142,9 @@ discard block |
||
| 133 | 142 | $info = str_replace('^','<br />',$info); |
| 134 | 143 | $info = str_replace('&sect;','',$info); |
| 135 | 144 | $info = str_replace('"','',$info); |
| 136 | - if ($type == '') $type = NULL; |
|
| 145 | + if ($type == '') { |
|
| 146 | + $type = NULL; |
|
| 147 | + } |
|
| 137 | 148 | $query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)"; |
| 138 | 149 | $query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name); |
| 139 | 150 | try { |
@@ -164,7 +175,9 @@ discard block |
||
| 164 | 175 | $info = str_replace('^','<br />',$info); |
| 165 | 176 | $info = str_replace('&sect;','',$info); |
| 166 | 177 | $info = str_replace('"','',$info); |
| 167 | - if ($type == '') $type = NULL; |
|
| 178 | + if ($type == '') { |
|
| 179 | + $type = NULL; |
|
| 180 | + } |
|
| 168 | 181 | $query = "UPDATE atc SET frequency = :frequency,latitude = :latitude,longitude = :longitude,atc_range = :range,info = :info,atc_lastseen = :date,type = :type,ivao_id = :ivao_id,ivao_name = :ivao_name WHERE ident = :ident AND format_source = :format_source AND source_name = :source_name"; |
| 169 | 182 | $query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name); |
| 170 | 183 | try { |
@@ -28,22 +28,22 @@ discard block |
||
| 28 | 28 | * @param bool $and |
| 29 | 29 | * @return String the SQL part |
| 30 | 30 | */ |
| 31 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 31 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 32 | 32 | global $globalFilter, $globalStatsFilters, $globalFilterName; |
| 33 | 33 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 34 | 34 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 35 | - foreach($globalStatsFilters[$globalFilterName] as $source) { |
|
| 35 | + foreach ($globalStatsFilters[$globalFilterName] as $source) { |
|
| 36 | 36 | if (isset($source['source'])) $filter['source'][] = $source['source']; |
| 37 | 37 | } |
| 38 | 38 | } else { |
| 39 | 39 | $filter = $globalStatsFilters[$globalFilterName]; |
| 40 | 40 | } |
| 41 | 41 | } |
| 42 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 42 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 43 | 43 | $filter_query_join = ''; |
| 44 | 44 | $filter_query_where = ''; |
| 45 | 45 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 46 | - $filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 46 | + $filter_query_where = " WHERE format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 47 | 47 | } |
| 48 | 48 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 49 | 49 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | try { |
| 63 | 63 | $sth = $this->db->prepare($query); |
| 64 | 64 | $sth->execute($query_values); |
| 65 | - } catch(PDOException $e) { |
|
| 65 | + } catch (PDOException $e) { |
|
| 66 | 66 | return "error : ".$e->getMessage(); |
| 67 | 67 | } |
| 68 | 68 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -75,13 +75,13 @@ discard block |
||
| 75 | 75 | * @return Array Return ATC |
| 76 | 76 | */ |
| 77 | 77 | public function getById($id) { |
| 78 | - $filter_query = $this->getFilter(array(),true,true); |
|
| 78 | + $filter_query = $this->getFilter(array(), true, true); |
|
| 79 | 79 | $query = "SELECT * FROM atc".$filter_query." atc_id = :id"; |
| 80 | 80 | $query_values = array(':id' => $id); |
| 81 | 81 | try { |
| 82 | 82 | $sth = $this->db->prepare($query); |
| 83 | 83 | $sth->execute($query_values); |
| 84 | - } catch(PDOException $e) { |
|
| 84 | + } catch (PDOException $e) { |
|
| 85 | 85 | return "error : ".$e->getMessage(); |
| 86 | 86 | } |
| 87 | 87 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -94,19 +94,19 @@ discard block |
||
| 94 | 94 | * @param String $format_source Format source |
| 95 | 95 | * @return Array Return ATC |
| 96 | 96 | */ |
| 97 | - public function getByIdent($ident,$format_source = '') { |
|
| 98 | - $filter_query = $this->getFilter(array(),true,true); |
|
| 97 | + public function getByIdent($ident, $format_source = '') { |
|
| 98 | + $filter_query = $this->getFilter(array(), true, true); |
|
| 99 | 99 | if ($format_source == '') { |
| 100 | 100 | $query = "SELECT * FROM atc".$filter_query." ident = :ident"; |
| 101 | 101 | $query_values = array(':ident' => $ident); |
| 102 | 102 | } else { |
| 103 | 103 | $query = "SELECT * FROM atc".$filter_query." ident = :ident AND format_source = :format_source"; |
| 104 | - $query_values = array(':ident' => $ident,':format_source' => $format_source); |
|
| 104 | + $query_values = array(':ident' => $ident, ':format_source' => $format_source); |
|
| 105 | 105 | } |
| 106 | 106 | try { |
| 107 | 107 | $sth = $this->db->prepare($query); |
| 108 | 108 | $sth->execute($query_values); |
| 109 | - } catch(PDOException $e) { |
|
| 109 | + } catch (PDOException $e) { |
|
| 110 | 110 | return "error : ".$e->getMessage(); |
| 111 | 111 | } |
| 112 | 112 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -128,18 +128,18 @@ discard block |
||
| 128 | 128 | * @param String $format_source Format source |
| 129 | 129 | * @param String $source_name Source name |
| 130 | 130 | */ |
| 131 | - public function add($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '',$format_source = '',$source_name = '') { |
|
| 132 | - $info = preg_replace('/[^(\x20-\x7F)]*/','',$info); |
|
| 133 | - $info = str_replace('^','<br />',$info); |
|
| 134 | - $info = str_replace('&sect;','',$info); |
|
| 135 | - $info = str_replace('"','',$info); |
|
| 131 | + public function add($ident, $frequency, $latitude, $longitude, $range, $info, $date, $type = '', $ivao_id = '', $ivao_name = '', $format_source = '', $source_name = '') { |
|
| 132 | + $info = preg_replace('/[^(\x20-\x7F)]*/', '', $info); |
|
| 133 | + $info = str_replace('^', '<br />', $info); |
|
| 134 | + $info = str_replace('&sect;', '', $info); |
|
| 135 | + $info = str_replace('"', '', $info); |
|
| 136 | 136 | if ($type == '') $type = NULL; |
| 137 | 137 | $query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)"; |
| 138 | - $query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name); |
|
| 138 | + $query_values = array(':ident' => $ident, ':frequency' => $frequency, ':latitude' => $latitude, ':longitude' => $longitude, ':range' => $range, ':info' => $info, ':date' => $date, ':ivao_id' => $ivao_id, ':ivao_name' => $ivao_name, ':type' => $type, ':format_source' => $format_source, ':source_name' => $source_name); |
|
| 139 | 139 | try { |
| 140 | 140 | $sth = $this->db->prepare($query); |
| 141 | 141 | $sth->execute($query_values); |
| 142 | - } catch(PDOException $e) { |
|
| 142 | + } catch (PDOException $e) { |
|
| 143 | 143 | return "error : ".$e->getMessage(); |
| 144 | 144 | } |
| 145 | 145 | return ''; |
@@ -160,18 +160,18 @@ discard block |
||
| 160 | 160 | * @param String $format_source Format source |
| 161 | 161 | * @param String $source_name Source name |
| 162 | 162 | */ |
| 163 | - public function update($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '',$format_source = '',$source_name = '') { |
|
| 164 | - $info = preg_replace('/[^(\x20-\x7F)]*/','',$info); |
|
| 165 | - $info = str_replace('^','<br />',$info); |
|
| 166 | - $info = str_replace('&sect;','',$info); |
|
| 167 | - $info = str_replace('"','',$info); |
|
| 163 | + public function update($ident, $frequency, $latitude, $longitude, $range, $info, $date, $type = '', $ivao_id = '', $ivao_name = '', $format_source = '', $source_name = '') { |
|
| 164 | + $info = preg_replace('/[^(\x20-\x7F)]*/', '', $info); |
|
| 165 | + $info = str_replace('^', '<br />', $info); |
|
| 166 | + $info = str_replace('&sect;', '', $info); |
|
| 167 | + $info = str_replace('"', '', $info); |
|
| 168 | 168 | if ($type == '') $type = NULL; |
| 169 | 169 | $query = "UPDATE atc SET frequency = :frequency,latitude = :latitude,longitude = :longitude,atc_range = :range,info = :info,atc_lastseen = :date,type = :type,ivao_id = :ivao_id,ivao_name = :ivao_name WHERE ident = :ident AND format_source = :format_source AND source_name = :source_name"; |
| 170 | - $query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name); |
|
| 170 | + $query_values = array(':ident' => $ident, ':frequency' => $frequency, ':latitude' => $latitude, ':longitude' => $longitude, ':range' => $range, ':info' => $info, ':date' => $date, ':ivao_id' => $ivao_id, ':ivao_name' => $ivao_name, ':type' => $type, ':format_source' => $format_source, ':source_name' => $source_name); |
|
| 171 | 171 | try { |
| 172 | 172 | $sth = $this->db->prepare($query); |
| 173 | 173 | $sth->execute($query_values); |
| 174 | - } catch(PDOException $e) { |
|
| 174 | + } catch (PDOException $e) { |
|
| 175 | 175 | return "error : ".$e->getMessage(); |
| 176 | 176 | } |
| 177 | 177 | return ''; |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | try { |
| 188 | 188 | $sth = $this->db->prepare($query); |
| 189 | 189 | $sth->execute($query_values); |
| 190 | - } catch(PDOException $e) { |
|
| 190 | + } catch (PDOException $e) { |
|
| 191 | 191 | return "error : ".$e->getMessage(); |
| 192 | 192 | } |
| 193 | 193 | return ''; |
@@ -198,13 +198,13 @@ discard block |
||
| 198 | 198 | * @param String $ident Flight ident |
| 199 | 199 | * @param String $format_source Format source |
| 200 | 200 | */ |
| 201 | - public function deleteByIdent($ident,$format_source) { |
|
| 201 | + public function deleteByIdent($ident, $format_source) { |
|
| 202 | 202 | $query = "DELETE FROM atc WHERE ident = :ident AND format_source = :format_source"; |
| 203 | - $query_values = array(':ident' => $ident,':format_source' => $format_source); |
|
| 203 | + $query_values = array(':ident' => $ident, ':format_source' => $format_source); |
|
| 204 | 204 | try { |
| 205 | 205 | $sth = $this->db->prepare($query); |
| 206 | 206 | $sth->execute($query_values); |
| 207 | - } catch(PDOException $e) { |
|
| 207 | + } catch (PDOException $e) { |
|
| 208 | 208 | return "error : ".$e->getMessage(); |
| 209 | 209 | } |
| 210 | 210 | return ''; |
@@ -219,7 +219,7 @@ discard block |
||
| 219 | 219 | try { |
| 220 | 220 | $sth = $this->db->prepare($query); |
| 221 | 221 | $sth->execute($query_values); |
| 222 | - } catch(PDOException $e) { |
|
| 222 | + } catch (PDOException $e) { |
|
| 223 | 223 | return "error : ".$e->getMessage(); |
| 224 | 224 | } |
| 225 | 225 | return ''; |
@@ -238,7 +238,7 @@ discard block |
||
| 238 | 238 | try { |
| 239 | 239 | $sth = $this->db->prepare($query); |
| 240 | 240 | $sth->execute(); |
| 241 | - } catch(PDOException $e) { |
|
| 241 | + } catch (PDOException $e) { |
|
| 242 | 242 | return "error"; |
| 243 | 243 | } |
| 244 | 244 | return "success"; |
@@ -13,7 +13,9 @@ discard block |
||
| 13 | 13 | public function __construct($dbc = null) { |
| 14 | 14 | $Connection = new Connection($dbc); |
| 15 | 15 | $this->db = $Connection->db; |
| 16 | - if ($this->db === null) die('Error: No DB connection. (MarineArchive)'); |
|
| 16 | + if ($this->db === null) { |
|
| 17 | + die('Error: No DB connection. (MarineArchive)'); |
|
| 18 | + } |
|
| 17 | 19 | } |
| 18 | 20 | |
| 19 | 21 | /** |
@@ -36,7 +38,9 @@ discard block |
||
| 36 | 38 | if (isset($filter[0]['source'])) { |
| 37 | 39 | $filters = array_merge($filters,$filter); |
| 38 | 40 | } |
| 39 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 41 | + if (is_array($globalFilter)) { |
|
| 42 | + $filter = array_merge($filter,$globalFilter); |
|
| 43 | + } |
|
| 40 | 44 | $filter_query_join = ''; |
| 41 | 45 | $filter_query_where = ''; |
| 42 | 46 | foreach($filters as $flt) { |
@@ -82,8 +86,11 @@ discard block |
||
| 82 | 86 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 83 | 87 | $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
| 84 | 88 | } |
| 85 | - if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
|
| 86 | - elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
|
| 89 | + if ($filter_query_where == '' && $where) { |
|
| 90 | + $filter_query_where = ' WHERE'; |
|
| 91 | + } elseif ($filter_query_where != '' && $and) { |
|
| 92 | + $filter_query_where .= ' AND'; |
|
| 93 | + } |
|
| 87 | 94 | if ($filter_query_where != '') { |
| 88 | 95 | $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
| 89 | 96 | } |
@@ -129,9 +136,14 @@ discard block |
||
| 129 | 136 | if ($over_country == '') { |
| 130 | 137 | $Marine = new Marine($this->db); |
| 131 | 138 | $data_country = $Marine->getCountryFromLatitudeLongitude($latitude,$longitude); |
| 132 | - if (!empty($data_country)) $country = $data_country['iso2']; |
|
| 133 | - else $country = ''; |
|
| 134 | - } else $country = $over_country; |
|
| 139 | + if (!empty($data_country)) { |
|
| 140 | + $country = $data_country['iso2']; |
|
| 141 | + } else { |
|
| 142 | + $country = ''; |
|
| 143 | + } |
|
| 144 | + } else { |
|
| 145 | + $country = $over_country; |
|
| 146 | + } |
|
| 135 | 147 | |
| 136 | 148 | //$country = $over_country; |
| 137 | 149 | // Route is not added in marine_archive |
@@ -661,7 +673,9 @@ discard block |
||
| 661 | 673 | $additional_query .= "(marine_archive_output.pilot_name like '%".$q_item."%') OR "; |
| 662 | 674 | $additional_query .= "(marine_archive_output.ident like '%".$q_item."%') OR "; |
| 663 | 675 | $translate = $Translation->ident2icao($q_item); |
| 664 | - if ($translate != $q_item) $additional_query .= "(marine_archive_output.ident like '%".$translate."%') OR "; |
|
| 676 | + if ($translate != $q_item) { |
|
| 677 | + $additional_query .= "(marine_archive_output.ident like '%".$translate."%') OR "; |
|
| 678 | + } |
|
| 665 | 679 | $additional_query .= "(marine_archive_output.highlight like '%".$q_item."%')"; |
| 666 | 680 | $additional_query .= ")"; |
| 667 | 681 | } |
@@ -879,7 +893,9 @@ discard block |
||
| 879 | 893 | date_default_timezone_set($globalTimezone); |
| 880 | 894 | $datetime = new DateTime(); |
| 881 | 895 | $offset = $datetime->format('P'); |
| 882 | - } else $offset = '+00:00'; |
|
| 896 | + } else { |
|
| 897 | + $offset = '+00:00'; |
|
| 898 | + } |
|
| 883 | 899 | |
| 884 | 900 | |
| 885 | 901 | if ($date_array[1] != "") |
@@ -1165,9 +1181,13 @@ discard block |
||
| 1165 | 1181 | $query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1166 | 1182 | } |
| 1167 | 1183 | } |
| 1168 | - if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
| 1184 | + if ($sincedate != '') { |
|
| 1185 | + $query .= "AND date > '".$sincedate."' "; |
|
| 1186 | + } |
|
| 1169 | 1187 | $query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1170 | - if ($limit) $query .= " LIMIT 0,10"; |
|
| 1188 | + if ($limit) { |
|
| 1189 | + $query .= " LIMIT 0,10"; |
|
| 1190 | + } |
|
| 1171 | 1191 | |
| 1172 | 1192 | |
| 1173 | 1193 | $sth = $this->db->prepare($query); |
@@ -1213,9 +1233,13 @@ discard block |
||
| 1213 | 1233 | $query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1214 | 1234 | } |
| 1215 | 1235 | } |
| 1216 | - if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' "; |
|
| 1236 | + if ($sincedate != '') { |
|
| 1237 | + $query .= "AND s.date > '".$sincedate."' "; |
|
| 1238 | + } |
|
| 1217 | 1239 | $query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1218 | - if ($limit) $query .= " LIMIT 0,10"; |
|
| 1240 | + if ($limit) { |
|
| 1241 | + $query .= " LIMIT 0,10"; |
|
| 1242 | + } |
|
| 1219 | 1243 | |
| 1220 | 1244 | |
| 1221 | 1245 | $sth = $this->db->prepare($query); |
@@ -16,13 +16,13 @@ discard block |
||
| 16 | 16 | if ($this->db === null) die('Error: No DB connection. (MarineArchive)'); |
| 17 | 17 | } |
| 18 | 18 | |
| 19 | - /** |
|
| 20 | - * Get SQL query part for filter used |
|
| 21 | - * @param array $filter the filter |
|
| 22 | - * @param bool $where |
|
| 23 | - * @param bool $and |
|
| 24 | - * @return string the SQL part |
|
| 25 | - */ |
|
| 19 | + /** |
|
| 20 | + * Get SQL query part for filter used |
|
| 21 | + * @param array $filter the filter |
|
| 22 | + * @param bool $where |
|
| 23 | + * @param bool $and |
|
| 24 | + * @return string the SQL part |
|
| 25 | + */ |
|
| 26 | 26 | public function getFilter($filter = array(),$where = false,$and = false) { |
| 27 | 27 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 28 | 28 | $filters = array(); |
@@ -91,40 +91,40 @@ discard block |
||
| 91 | 91 | return $filter_query; |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | - /** |
|
| 95 | - * Add to Mariche archive |
|
| 96 | - * |
|
| 97 | - * @param string $fammarine_id |
|
| 98 | - * @param string $ident |
|
| 99 | - * @param string $latitude |
|
| 100 | - * @param string $longitude |
|
| 101 | - * @param string $heading |
|
| 102 | - * @param string $groundspeed |
|
| 103 | - * @param string $date |
|
| 104 | - * @param bool $putinarchive |
|
| 105 | - * @param string $mmsi |
|
| 106 | - * @param string $type |
|
| 107 | - * @param string $typeid |
|
| 108 | - * @param string $imo |
|
| 109 | - * @param string $callsign |
|
| 110 | - * @param string $arrival_code |
|
| 111 | - * @param string $arrival_date |
|
| 112 | - * @param string $status |
|
| 113 | - * @param string $statusid |
|
| 114 | - * @param bool $noarchive |
|
| 115 | - * @param string $format_source |
|
| 116 | - * @param string $source_name |
|
| 117 | - * @param string $over_country |
|
| 118 | - * @param string $captain_id |
|
| 119 | - * @param string $captain_name |
|
| 120 | - * @param string $race_id |
|
| 121 | - * @param string $race_name |
|
| 122 | - * @param string $distance |
|
| 123 | - * @param string $race_rank |
|
| 124 | - * @param string $race_time |
|
| 125 | - * @return string |
|
| 126 | - */ |
|
| 127 | - public function addMarineArchiveData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $mmsi = '', $type = '', $typeid = '', $imo = '', $callsign = '', $arrival_code = '', $arrival_date = '', $status = '', $statusid = '', $noarchive = false, $format_source = '', $source_name = '', $over_country = '', $captain_id = '', $captain_name = '', $race_id = '', $race_name = '', $distance = '', $race_rank = '', $race_time = '') { |
|
| 94 | + /** |
|
| 95 | + * Add to Mariche archive |
|
| 96 | + * |
|
| 97 | + * @param string $fammarine_id |
|
| 98 | + * @param string $ident |
|
| 99 | + * @param string $latitude |
|
| 100 | + * @param string $longitude |
|
| 101 | + * @param string $heading |
|
| 102 | + * @param string $groundspeed |
|
| 103 | + * @param string $date |
|
| 104 | + * @param bool $putinarchive |
|
| 105 | + * @param string $mmsi |
|
| 106 | + * @param string $type |
|
| 107 | + * @param string $typeid |
|
| 108 | + * @param string $imo |
|
| 109 | + * @param string $callsign |
|
| 110 | + * @param string $arrival_code |
|
| 111 | + * @param string $arrival_date |
|
| 112 | + * @param string $status |
|
| 113 | + * @param string $statusid |
|
| 114 | + * @param bool $noarchive |
|
| 115 | + * @param string $format_source |
|
| 116 | + * @param string $source_name |
|
| 117 | + * @param string $over_country |
|
| 118 | + * @param string $captain_id |
|
| 119 | + * @param string $captain_name |
|
| 120 | + * @param string $race_id |
|
| 121 | + * @param string $race_name |
|
| 122 | + * @param string $distance |
|
| 123 | + * @param string $race_rank |
|
| 124 | + * @param string $race_time |
|
| 125 | + * @return string |
|
| 126 | + */ |
|
| 127 | + public function addMarineArchiveData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $mmsi = '', $type = '', $typeid = '', $imo = '', $callsign = '', $arrival_code = '', $arrival_date = '', $status = '', $statusid = '', $noarchive = false, $format_source = '', $source_name = '', $over_country = '', $captain_id = '', $captain_name = '', $race_id = '', $race_name = '', $distance = '', $race_rank = '', $race_time = '') { |
|
| 128 | 128 | require_once(dirname(__FILE__).'/class.Marine.php'); |
| 129 | 129 | if ($over_country == '') { |
| 130 | 130 | $Marine = new Marine($this->db); |
@@ -149,42 +149,42 @@ discard block |
||
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | |
| 152 | - /** |
|
| 153 | - * Gets all the spotter information based on a particular callsign |
|
| 154 | - * |
|
| 155 | - * @param $ident |
|
| 156 | - * @return array the spotter information |
|
| 157 | - */ |
|
| 158 | - public function getLastArchiveMarineDataByIdent($ident) |
|
| 159 | - { |
|
| 160 | - $Marine = new Marine($this->db); |
|
| 161 | - date_default_timezone_set('UTC'); |
|
| 162 | - |
|
| 163 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 164 | - //$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"; |
|
| 165 | - $query = "SELECT marine_archive.* FROM marine_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 166 | - $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident)); |
|
| 167 | - return $spotter_array; |
|
| 168 | - } |
|
| 169 | - |
|
| 170 | - |
|
| 171 | - /** |
|
| 172 | - * Gets last the spotter information based on a particular id |
|
| 173 | - * |
|
| 174 | - * @param $id |
|
| 175 | - * @return array the spotter information |
|
| 176 | - */ |
|
| 177 | - public function getLastArchiveMarineDataById($id) |
|
| 178 | - { |
|
| 179 | - $Marine = new Marine($this->db); |
|
| 180 | - date_default_timezone_set('UTC'); |
|
| 181 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 182 | - //$query = MarineArchive->$global_query." WHERE marine_archive.fammarine_id = :id"; |
|
| 183 | - //$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"; |
|
| 184 | - $query = "SELECT * FROM marine_archive WHERE fammarine_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 152 | + /** |
|
| 153 | + * Gets all the spotter information based on a particular callsign |
|
| 154 | + * |
|
| 155 | + * @param $ident |
|
| 156 | + * @return array the spotter information |
|
| 157 | + */ |
|
| 158 | + public function getLastArchiveMarineDataByIdent($ident) |
|
| 159 | + { |
|
| 160 | + $Marine = new Marine($this->db); |
|
| 161 | + date_default_timezone_set('UTC'); |
|
| 162 | + |
|
| 163 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 164 | + //$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"; |
|
| 165 | + $query = "SELECT marine_archive.* FROM marine_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 166 | + $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident)); |
|
| 167 | + return $spotter_array; |
|
| 168 | + } |
|
| 169 | + |
|
| 170 | + |
|
| 171 | + /** |
|
| 172 | + * Gets last the spotter information based on a particular id |
|
| 173 | + * |
|
| 174 | + * @param $id |
|
| 175 | + * @return array the spotter information |
|
| 176 | + */ |
|
| 177 | + public function getLastArchiveMarineDataById($id) |
|
| 178 | + { |
|
| 179 | + $Marine = new Marine($this->db); |
|
| 180 | + date_default_timezone_set('UTC'); |
|
| 181 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 182 | + //$query = MarineArchive->$global_query." WHERE marine_archive.fammarine_id = :id"; |
|
| 183 | + //$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"; |
|
| 184 | + $query = "SELECT * FROM marine_archive WHERE fammarine_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 185 | 185 | |
| 186 | 186 | // $spotter_array = Marine->getDataFromDB($query,array(':id' => $id)); |
| 187 | - /* |
|
| 187 | + /* |
|
| 188 | 188 | try { |
| 189 | 189 | $Connection = new Connection(); |
| 190 | 190 | $sth = Connection->$db->prepare($query); |
@@ -194,196 +194,196 @@ discard block |
||
| 194 | 194 | } |
| 195 | 195 | $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC); |
| 196 | 196 | */ |
| 197 | - $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id)); |
|
| 198 | - return $spotter_array; |
|
| 199 | - } |
|
| 200 | - |
|
| 201 | - /** |
|
| 202 | - * Gets all the spotter information based on a particular id |
|
| 203 | - * |
|
| 204 | - * @param $id |
|
| 205 | - * @return array the spotter information |
|
| 206 | - */ |
|
| 207 | - public function getAllArchiveMarineDataById($id) |
|
| 197 | + $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id)); |
|
| 198 | + return $spotter_array; |
|
| 199 | + } |
|
| 200 | + |
|
| 201 | + /** |
|
| 202 | + * Gets all the spotter information based on a particular id |
|
| 203 | + * |
|
| 204 | + * @param $id |
|
| 205 | + * @return array the spotter information |
|
| 206 | + */ |
|
| 207 | + public function getAllArchiveMarineDataById($id) |
|
| 208 | 208 | { |
| 209 | - date_default_timezone_set('UTC'); |
|
| 210 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 211 | - $query = $this->global_query." WHERE marine_archive.fammarine_id = :id ORDER BY date"; |
|
| 209 | + date_default_timezone_set('UTC'); |
|
| 210 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 211 | + $query = $this->global_query." WHERE marine_archive.fammarine_id = :id ORDER BY date"; |
|
| 212 | 212 | |
| 213 | 213 | // $spotter_array = Marine->getDataFromDB($query,array(':id' => $id)); |
| 214 | 214 | |
| 215 | - try { |
|
| 216 | - $sth = $this->db->prepare($query); |
|
| 217 | - $sth->execute(array(':id' => $id)); |
|
| 218 | - } catch(PDOException $e) { |
|
| 219 | - echo $e->getMessage(); |
|
| 220 | - die; |
|
| 221 | - } |
|
| 222 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 223 | - return $spotter_array; |
|
| 215 | + try { |
|
| 216 | + $sth = $this->db->prepare($query); |
|
| 217 | + $sth->execute(array(':id' => $id)); |
|
| 218 | + } catch(PDOException $e) { |
|
| 219 | + echo $e->getMessage(); |
|
| 220 | + die; |
|
| 221 | + } |
|
| 222 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 223 | + return $spotter_array; |
|
| 224 | 224 | } |
| 225 | 225 | |
| 226 | - /** |
|
| 227 | - * Gets coordinate & time spotter information based on a particular id |
|
| 228 | - * |
|
| 229 | - * @param $id |
|
| 230 | - * @return array the spotter information |
|
| 231 | - */ |
|
| 232 | - public function getCoordArchiveMarineDataById($id) |
|
| 233 | - { |
|
| 234 | - date_default_timezone_set('UTC'); |
|
| 235 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 236 | - $query = "SELECT marine_archive.latitude, marine_archive.longitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id"; |
|
| 226 | + /** |
|
| 227 | + * Gets coordinate & time spotter information based on a particular id |
|
| 228 | + * |
|
| 229 | + * @param $id |
|
| 230 | + * @return array the spotter information |
|
| 231 | + */ |
|
| 232 | + public function getCoordArchiveMarineDataById($id) |
|
| 233 | + { |
|
| 234 | + date_default_timezone_set('UTC'); |
|
| 235 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 236 | + $query = "SELECT marine_archive.latitude, marine_archive.longitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id"; |
|
| 237 | 237 | |
| 238 | 238 | // $spotter_array = Marine->getDataFromDB($query,array(':id' => $id)); |
| 239 | 239 | |
| 240 | - try { |
|
| 241 | - $sth = $this->db->prepare($query); |
|
| 242 | - $sth->execute(array(':id' => $id)); |
|
| 243 | - } catch(PDOException $e) { |
|
| 244 | - echo $e->getMessage(); |
|
| 245 | - die; |
|
| 246 | - } |
|
| 247 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 248 | - |
|
| 249 | - return $spotter_array; |
|
| 250 | - } |
|
| 251 | - |
|
| 252 | - |
|
| 253 | - /** |
|
| 254 | - * Gets altitude information based on a particular callsign |
|
| 255 | - * |
|
| 256 | - * @param $ident |
|
| 257 | - * @return array the spotter information |
|
| 258 | - */ |
|
| 259 | - public function getAltitudeArchiveMarineDataByIdent($ident) |
|
| 260 | - { |
|
| 261 | - |
|
| 262 | - date_default_timezone_set('UTC'); |
|
| 263 | - |
|
| 264 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 265 | - $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"; |
|
| 266 | - |
|
| 267 | - try { |
|
| 268 | - $sth = $this->db->prepare($query); |
|
| 269 | - $sth->execute(array(':ident' => $ident)); |
|
| 270 | - } catch(PDOException $e) { |
|
| 271 | - echo $e->getMessage(); |
|
| 272 | - die; |
|
| 273 | - } |
|
| 274 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 275 | - |
|
| 276 | - return $spotter_array; |
|
| 277 | - } |
|
| 278 | - |
|
| 279 | - /** |
|
| 280 | - * Gets altitude information based on a particular id |
|
| 281 | - * |
|
| 282 | - * @param $id |
|
| 283 | - * @return array the spotter information |
|
| 284 | - */ |
|
| 285 | - public function getAltitudeArchiveMarineDataById($id) |
|
| 286 | - { |
|
| 287 | - |
|
| 288 | - date_default_timezone_set('UTC'); |
|
| 289 | - |
|
| 290 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 291 | - $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"; |
|
| 292 | - |
|
| 293 | - try { |
|
| 294 | - $sth = $this->db->prepare($query); |
|
| 295 | - $sth->execute(array(':id' => $id)); |
|
| 296 | - } catch(PDOException $e) { |
|
| 297 | - echo $e->getMessage(); |
|
| 298 | - die; |
|
| 299 | - } |
|
| 300 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 301 | - |
|
| 302 | - return $spotter_array; |
|
| 303 | - } |
|
| 304 | - |
|
| 305 | - /** |
|
| 306 | - * Gets altitude & speed information based on a particular id |
|
| 307 | - * |
|
| 308 | - * @param $id |
|
| 309 | - * @return array the spotter information |
|
| 310 | - */ |
|
| 311 | - public function getAltitudeSpeedArchiveMarineDataById($id) |
|
| 312 | - { |
|
| 313 | - date_default_timezone_set('UTC'); |
|
| 314 | - |
|
| 315 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 316 | - $query = "SELECT marine_archive.altitude, marine_archive.ground_speed, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id ORDER BY date"; |
|
| 317 | - |
|
| 318 | - try { |
|
| 319 | - $sth = $this->db->prepare($query); |
|
| 320 | - $sth->execute(array(':id' => $id)); |
|
| 321 | - } catch(PDOException $e) { |
|
| 322 | - echo $e->getMessage(); |
|
| 323 | - die; |
|
| 324 | - } |
|
| 325 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 326 | - |
|
| 327 | - return $spotter_array; |
|
| 328 | - } |
|
| 329 | - |
|
| 330 | - |
|
| 331 | - /** |
|
| 332 | - * Gets altitude information based on a particular callsign |
|
| 333 | - * |
|
| 334 | - * @param $ident |
|
| 335 | - * @return array the spotter information |
|
| 336 | - */ |
|
| 337 | - public function getLastAltitudeArchiveMarineDataByIdent($ident) |
|
| 338 | - { |
|
| 339 | - |
|
| 340 | - date_default_timezone_set('UTC'); |
|
| 341 | - |
|
| 342 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 343 | - $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"; |
|
| 240 | + try { |
|
| 241 | + $sth = $this->db->prepare($query); |
|
| 242 | + $sth->execute(array(':id' => $id)); |
|
| 243 | + } catch(PDOException $e) { |
|
| 244 | + echo $e->getMessage(); |
|
| 245 | + die; |
|
| 246 | + } |
|
| 247 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 248 | + |
|
| 249 | + return $spotter_array; |
|
| 250 | + } |
|
| 251 | + |
|
| 252 | + |
|
| 253 | + /** |
|
| 254 | + * Gets altitude information based on a particular callsign |
|
| 255 | + * |
|
| 256 | + * @param $ident |
|
| 257 | + * @return array the spotter information |
|
| 258 | + */ |
|
| 259 | + public function getAltitudeArchiveMarineDataByIdent($ident) |
|
| 260 | + { |
|
| 261 | + |
|
| 262 | + date_default_timezone_set('UTC'); |
|
| 263 | + |
|
| 264 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 265 | + $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"; |
|
| 266 | + |
|
| 267 | + try { |
|
| 268 | + $sth = $this->db->prepare($query); |
|
| 269 | + $sth->execute(array(':ident' => $ident)); |
|
| 270 | + } catch(PDOException $e) { |
|
| 271 | + echo $e->getMessage(); |
|
| 272 | + die; |
|
| 273 | + } |
|
| 274 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 275 | + |
|
| 276 | + return $spotter_array; |
|
| 277 | + } |
|
| 278 | + |
|
| 279 | + /** |
|
| 280 | + * Gets altitude information based on a particular id |
|
| 281 | + * |
|
| 282 | + * @param $id |
|
| 283 | + * @return array the spotter information |
|
| 284 | + */ |
|
| 285 | + public function getAltitudeArchiveMarineDataById($id) |
|
| 286 | + { |
|
| 287 | + |
|
| 288 | + date_default_timezone_set('UTC'); |
|
| 289 | + |
|
| 290 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 291 | + $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"; |
|
| 292 | + |
|
| 293 | + try { |
|
| 294 | + $sth = $this->db->prepare($query); |
|
| 295 | + $sth->execute(array(':id' => $id)); |
|
| 296 | + } catch(PDOException $e) { |
|
| 297 | + echo $e->getMessage(); |
|
| 298 | + die; |
|
| 299 | + } |
|
| 300 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 301 | + |
|
| 302 | + return $spotter_array; |
|
| 303 | + } |
|
| 304 | + |
|
| 305 | + /** |
|
| 306 | + * Gets altitude & speed information based on a particular id |
|
| 307 | + * |
|
| 308 | + * @param $id |
|
| 309 | + * @return array the spotter information |
|
| 310 | + */ |
|
| 311 | + public function getAltitudeSpeedArchiveMarineDataById($id) |
|
| 312 | + { |
|
| 313 | + date_default_timezone_set('UTC'); |
|
| 314 | + |
|
| 315 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 316 | + $query = "SELECT marine_archive.altitude, marine_archive.ground_speed, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id ORDER BY date"; |
|
| 317 | + |
|
| 318 | + try { |
|
| 319 | + $sth = $this->db->prepare($query); |
|
| 320 | + $sth->execute(array(':id' => $id)); |
|
| 321 | + } catch(PDOException $e) { |
|
| 322 | + echo $e->getMessage(); |
|
| 323 | + die; |
|
| 324 | + } |
|
| 325 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 326 | + |
|
| 327 | + return $spotter_array; |
|
| 328 | + } |
|
| 329 | + |
|
| 330 | + |
|
| 331 | + /** |
|
| 332 | + * Gets altitude information based on a particular callsign |
|
| 333 | + * |
|
| 334 | + * @param $ident |
|
| 335 | + * @return array the spotter information |
|
| 336 | + */ |
|
| 337 | + public function getLastAltitudeArchiveMarineDataByIdent($ident) |
|
| 338 | + { |
|
| 339 | + |
|
| 340 | + date_default_timezone_set('UTC'); |
|
| 341 | + |
|
| 342 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 343 | + $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"; |
|
| 344 | 344 | // $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident"; |
| 345 | 345 | |
| 346 | - try { |
|
| 347 | - $sth = $this->db->prepare($query); |
|
| 348 | - $sth->execute(array(':ident' => $ident)); |
|
| 349 | - } catch(PDOException $e) { |
|
| 350 | - echo $e->getMessage(); |
|
| 351 | - die; |
|
| 352 | - } |
|
| 353 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 354 | - |
|
| 355 | - return $spotter_array; |
|
| 356 | - } |
|
| 357 | - |
|
| 358 | - |
|
| 359 | - /** |
|
| 360 | - * Gets all the archive spotter information |
|
| 361 | - * |
|
| 362 | - * @param $ident |
|
| 363 | - * @param $fammarine_id |
|
| 364 | - * @param $date |
|
| 365 | - * @return array the spotter information |
|
| 366 | - */ |
|
| 367 | - public function getMarineArchiveData($ident,$fammarine_id,$date) |
|
| 368 | - { |
|
| 369 | - $Marine = new Marine($this->db); |
|
| 370 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 371 | - $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"; |
|
| 372 | - $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':fammarine_id' => $fammarine_id,':date' => $date.'%')); |
|
| 373 | - return $spotter_array; |
|
| 374 | - } |
|
| 375 | - |
|
| 376 | - /** |
|
| 377 | - * Delete all tracking data |
|
| 378 | - * |
|
| 379 | - */ |
|
| 380 | - public function deleteMarineArchiveTrackData() |
|
| 381 | - { |
|
| 382 | - global $globalArchiveKeepTrackMonths, $globalDBdriver; |
|
| 383 | - if ($globalDBdriver == 'mysql') { |
|
| 384 | - $query = 'DELETE FROM marine_archive WHERE marine_archive.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepTrackMonths.' MONTH)'; |
|
| 385 | - } else { |
|
| 386 | - $query = "DELETE FROM marine_archive WHERE marine_archive_id IN (SELECT marine_archive_id FROM marine_archive WHERE marine_archive.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveKeepTrackMonths." MONTH' LIMIT 10000)"; |
|
| 346 | + try { |
|
| 347 | + $sth = $this->db->prepare($query); |
|
| 348 | + $sth->execute(array(':ident' => $ident)); |
|
| 349 | + } catch(PDOException $e) { |
|
| 350 | + echo $e->getMessage(); |
|
| 351 | + die; |
|
| 352 | + } |
|
| 353 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 354 | + |
|
| 355 | + return $spotter_array; |
|
| 356 | + } |
|
| 357 | + |
|
| 358 | + |
|
| 359 | + /** |
|
| 360 | + * Gets all the archive spotter information |
|
| 361 | + * |
|
| 362 | + * @param $ident |
|
| 363 | + * @param $fammarine_id |
|
| 364 | + * @param $date |
|
| 365 | + * @return array the spotter information |
|
| 366 | + */ |
|
| 367 | + public function getMarineArchiveData($ident,$fammarine_id,$date) |
|
| 368 | + { |
|
| 369 | + $Marine = new Marine($this->db); |
|
| 370 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 371 | + $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"; |
|
| 372 | + $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':fammarine_id' => $fammarine_id,':date' => $date.'%')); |
|
| 373 | + return $spotter_array; |
|
| 374 | + } |
|
| 375 | + |
|
| 376 | + /** |
|
| 377 | + * Delete all tracking data |
|
| 378 | + * |
|
| 379 | + */ |
|
| 380 | + public function deleteMarineArchiveTrackData() |
|
| 381 | + { |
|
| 382 | + global $globalArchiveKeepTrackMonths, $globalDBdriver; |
|
| 383 | + if ($globalDBdriver == 'mysql') { |
|
| 384 | + $query = 'DELETE FROM marine_archive WHERE marine_archive.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepTrackMonths.' MONTH)'; |
|
| 385 | + } else { |
|
| 386 | + $query = "DELETE FROM marine_archive WHERE marine_archive_id IN (SELECT marine_archive_id FROM marine_archive WHERE marine_archive.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveKeepTrackMonths." MONTH' LIMIT 10000)"; |
|
| 387 | 387 | } |
| 388 | 388 | try { |
| 389 | 389 | $sth = $this->db->prepare($query); |
@@ -394,42 +394,42 @@ discard block |
||
| 394 | 394 | } |
| 395 | 395 | } |
| 396 | 396 | |
| 397 | - /** |
|
| 398 | - * Gets Minimal Live Marine data |
|
| 399 | - * |
|
| 400 | - * @param $begindate |
|
| 401 | - * @param $enddate |
|
| 402 | - * @param array $filter |
|
| 403 | - * @return array the spotter information |
|
| 404 | - */ |
|
| 405 | - public function getMinLiveMarineData($begindate,$enddate,$filter = array()) |
|
| 406 | - { |
|
| 407 | - global $globalDBdriver; |
|
| 408 | - date_default_timezone_set('UTC'); |
|
| 409 | - |
|
| 410 | - $filter_query = ''; |
|
| 411 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 412 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 413 | - } |
|
| 414 | - // Use spotter_output also ? |
|
| 415 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 416 | - $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 "; |
|
| 417 | - } |
|
| 418 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 419 | - $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 "; |
|
| 420 | - } |
|
| 421 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 422 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 423 | - } |
|
| 424 | - |
|
| 425 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 426 | - if ($globalDBdriver == 'mysql') { |
|
| 427 | - /* |
|
| 397 | + /** |
|
| 398 | + * Gets Minimal Live Marine data |
|
| 399 | + * |
|
| 400 | + * @param $begindate |
|
| 401 | + * @param $enddate |
|
| 402 | + * @param array $filter |
|
| 403 | + * @return array the spotter information |
|
| 404 | + */ |
|
| 405 | + public function getMinLiveMarineData($begindate,$enddate,$filter = array()) |
|
| 406 | + { |
|
| 407 | + global $globalDBdriver; |
|
| 408 | + date_default_timezone_set('UTC'); |
|
| 409 | + |
|
| 410 | + $filter_query = ''; |
|
| 411 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 412 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 413 | + } |
|
| 414 | + // Use spotter_output also ? |
|
| 415 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 416 | + $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 "; |
|
| 417 | + } |
|
| 418 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 419 | + $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 "; |
|
| 420 | + } |
|
| 421 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 422 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 423 | + } |
|
| 424 | + |
|
| 425 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 426 | + if ($globalDBdriver == 'mysql') { |
|
| 427 | + /* |
|
| 428 | 428 | $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 |
| 429 | 429 | FROM marine_archive |
| 430 | 430 | 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'; |
| 431 | 431 | */ |
| 432 | - /* |
|
| 432 | + /* |
|
| 433 | 433 | $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 |
| 434 | 434 | FROM marine_archive |
| 435 | 435 | INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate |
@@ -438,541 +438,541 @@ discard block |
||
| 438 | 438 | GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id |
| 439 | 439 | AND marine_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive.aircraft_icao = a.icao'; |
| 440 | 440 | */ |
| 441 | - $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 |
|
| 441 | + $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 |
|
| 442 | 442 | FROM marine_archive |
| 443 | 443 | INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao |
| 444 | 444 | WHERE marine_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' |
| 445 | 445 | '.$filter_query.' ORDER BY fammarine_id'; |
| 446 | - } else { |
|
| 447 | - //$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'; |
|
| 448 | - $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 |
|
| 446 | + } else { |
|
| 447 | + //$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'; |
|
| 448 | + $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 |
|
| 449 | 449 | FROM marine_archive |
| 450 | 450 | INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao |
| 451 | 451 | WHERE marine_archive.date >= '."'".$begindate."'".' AND marine_archive.date <= '."'".$enddate."'".' |
| 452 | 452 | '.$filter_query.' ORDER BY fammarine_id'; |
| 453 | - } |
|
| 454 | - //echo $query; |
|
| 455 | - try { |
|
| 456 | - $sth = $this->db->prepare($query); |
|
| 457 | - $sth->execute(); |
|
| 458 | - } catch(PDOException $e) { |
|
| 459 | - echo $e->getMessage(); |
|
| 460 | - die; |
|
| 461 | - } |
|
| 462 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 463 | - |
|
| 464 | - return $spotter_array; |
|
| 465 | - } |
|
| 466 | - |
|
| 467 | - /** |
|
| 468 | - * Gets Minimal Live Marine data |
|
| 469 | - * |
|
| 470 | - * @param $begindate |
|
| 471 | - * @param $enddate |
|
| 472 | - * @param array $filter |
|
| 473 | - * @return array the spotter information |
|
| 474 | - */ |
|
| 475 | - public function getMinLiveMarineDataPlayback($begindate,$enddate,$filter = array()) |
|
| 476 | - { |
|
| 477 | - global $globalDBdriver; |
|
| 478 | - date_default_timezone_set('UTC'); |
|
| 479 | - |
|
| 480 | - $filter_query = ''; |
|
| 481 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 482 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 483 | - } |
|
| 484 | - // Should use spotter_output also ? |
|
| 485 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 486 | - $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 "; |
|
| 487 | - } |
|
| 488 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 489 | - $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 "; |
|
| 490 | - } |
|
| 491 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 492 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 493 | - } |
|
| 494 | - |
|
| 495 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 496 | - if ($globalDBdriver == 'mysql') { |
|
| 497 | - /* |
|
| 453 | + } |
|
| 454 | + //echo $query; |
|
| 455 | + try { |
|
| 456 | + $sth = $this->db->prepare($query); |
|
| 457 | + $sth->execute(); |
|
| 458 | + } catch(PDOException $e) { |
|
| 459 | + echo $e->getMessage(); |
|
| 460 | + die; |
|
| 461 | + } |
|
| 462 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 463 | + |
|
| 464 | + return $spotter_array; |
|
| 465 | + } |
|
| 466 | + |
|
| 467 | + /** |
|
| 468 | + * Gets Minimal Live Marine data |
|
| 469 | + * |
|
| 470 | + * @param $begindate |
|
| 471 | + * @param $enddate |
|
| 472 | + * @param array $filter |
|
| 473 | + * @return array the spotter information |
|
| 474 | + */ |
|
| 475 | + public function getMinLiveMarineDataPlayback($begindate,$enddate,$filter = array()) |
|
| 476 | + { |
|
| 477 | + global $globalDBdriver; |
|
| 478 | + date_default_timezone_set('UTC'); |
|
| 479 | + |
|
| 480 | + $filter_query = ''; |
|
| 481 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 482 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 483 | + } |
|
| 484 | + // Should use spotter_output also ? |
|
| 485 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 486 | + $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 "; |
|
| 487 | + } |
|
| 488 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 489 | + $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 "; |
|
| 490 | + } |
|
| 491 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 492 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 493 | + } |
|
| 494 | + |
|
| 495 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 496 | + if ($globalDBdriver == 'mysql') { |
|
| 497 | + /* |
|
| 498 | 498 | $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 |
| 499 | 499 | FROM marine_archive |
| 500 | 500 | 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'; |
| 501 | 501 | */ |
| 502 | - $query = 'SELECT a.aircraft_shadow, 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 |
|
| 502 | + $query = 'SELECT a.aircraft_shadow, 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 |
|
| 503 | 503 | FROM marine_archive_output |
| 504 | 504 | LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive_output.aircraft_icao = a.icao |
| 505 | 505 | WHERE (marine_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') |
| 506 | 506 | '.$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'; |
| 507 | 507 | |
| 508 | - } else { |
|
| 509 | - //$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'; |
|
| 510 | - /* |
|
| 508 | + } else { |
|
| 509 | + //$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'; |
|
| 510 | + /* |
|
| 511 | 511 | $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 |
| 512 | 512 | FROM marine_archive_output |
| 513 | 513 | INNER JOIN (SELECT * FROM aircraft) a on marine_archive_output.aircraft_icao = a.icao |
| 514 | 514 | WHERE marine_archive_output.date >= '."'".$begindate."'".' AND marine_archive_output.date <= '."'".$enddate."'".' |
| 515 | 515 | '.$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'; |
| 516 | 516 | */ |
| 517 | - $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 |
|
| 517 | + $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 |
|
| 518 | 518 | FROM marine_archive_output |
| 519 | 519 | INNER JOIN (SELECT * FROM aircraft) a on marine_archive_output.aircraft_icao = a.icao |
| 520 | 520 | WHERE marine_archive_output.date >= '."'".$begindate."'".' AND marine_archive_output.date <= '."'".$enddate."'".' |
| 521 | 521 | '.$filter_query.' LIMIT 200 OFFSET 0'; |
| 522 | 522 | // .' 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'; |
| 523 | 523 | |
| 524 | - } |
|
| 525 | - //echo $query; |
|
| 526 | - try { |
|
| 527 | - $sth = $this->db->prepare($query); |
|
| 528 | - $sth->execute(); |
|
| 529 | - } catch(PDOException $e) { |
|
| 530 | - echo $e->getMessage(); |
|
| 531 | - die; |
|
| 532 | - } |
|
| 533 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 534 | - |
|
| 535 | - return $spotter_array; |
|
| 536 | - } |
|
| 537 | - |
|
| 538 | - /** |
|
| 539 | - * Gets count Live Marine data |
|
| 540 | - * |
|
| 541 | - * @param $begindate |
|
| 542 | - * @param $enddate |
|
| 543 | - * @param array $filter |
|
| 544 | - * @return array the spotter information |
|
| 545 | - */ |
|
| 546 | - public function getLiveMarineCount($begindate,$enddate,$filter = array()) |
|
| 547 | - { |
|
| 548 | - global $globalDBdriver, $globalLiveInterval; |
|
| 549 | - date_default_timezone_set('UTC'); |
|
| 550 | - |
|
| 551 | - $filter_query = ''; |
|
| 552 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 553 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 554 | - } |
|
| 555 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 556 | - $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id "; |
|
| 557 | - } |
|
| 558 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 559 | - $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 "; |
|
| 560 | - } |
|
| 561 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 562 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 563 | - } |
|
| 564 | - |
|
| 565 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 566 | - if ($globalDBdriver == 'mysql') { |
|
| 567 | - $query = 'SELECT COUNT(DISTINCT fammarine_id) as nb |
|
| 524 | + } |
|
| 525 | + //echo $query; |
|
| 526 | + try { |
|
| 527 | + $sth = $this->db->prepare($query); |
|
| 528 | + $sth->execute(); |
|
| 529 | + } catch(PDOException $e) { |
|
| 530 | + echo $e->getMessage(); |
|
| 531 | + die; |
|
| 532 | + } |
|
| 533 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 534 | + |
|
| 535 | + return $spotter_array; |
|
| 536 | + } |
|
| 537 | + |
|
| 538 | + /** |
|
| 539 | + * Gets count Live Marine data |
|
| 540 | + * |
|
| 541 | + * @param $begindate |
|
| 542 | + * @param $enddate |
|
| 543 | + * @param array $filter |
|
| 544 | + * @return array the spotter information |
|
| 545 | + */ |
|
| 546 | + public function getLiveMarineCount($begindate,$enddate,$filter = array()) |
|
| 547 | + { |
|
| 548 | + global $globalDBdriver, $globalLiveInterval; |
|
| 549 | + date_default_timezone_set('UTC'); |
|
| 550 | + |
|
| 551 | + $filter_query = ''; |
|
| 552 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 553 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 554 | + } |
|
| 555 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 556 | + $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id "; |
|
| 557 | + } |
|
| 558 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 559 | + $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 "; |
|
| 560 | + } |
|
| 561 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 562 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 563 | + } |
|
| 564 | + |
|
| 565 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 566 | + if ($globalDBdriver == 'mysql') { |
|
| 567 | + $query = 'SELECT COUNT(DISTINCT fammarine_id) as nb |
|
| 568 | 568 | FROM marine_archive l |
| 569 | 569 | WHERE (l.date BETWEEN DATE_SUB('."'".$begindate."'".',INTERVAL '.$globalLiveInterval.' SECOND) AND '."'".$begindate."'".')'.$filter_query; |
| 570 | - } else { |
|
| 571 | - $query = 'SELECT COUNT(DISTINCT fammarine_id) as nb FROM marine_archive l WHERE (l.date BETWEEN '."'".$begindate."' - INTERVAL '".$globalLiveInterval." SECONDS' AND "."'".$enddate."'".')'.$filter_query; |
|
| 572 | - } |
|
| 573 | - //echo $query; |
|
| 574 | - try { |
|
| 575 | - $sth = $this->db->prepare($query); |
|
| 576 | - $sth->execute(); |
|
| 577 | - } catch(PDOException $e) { |
|
| 578 | - echo $e->getMessage(); |
|
| 579 | - die; |
|
| 580 | - } |
|
| 581 | - $result = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 582 | - $sth->closeCursor(); |
|
| 583 | - return $result['nb']; |
|
| 584 | - } |
|
| 570 | + } else { |
|
| 571 | + $query = 'SELECT COUNT(DISTINCT fammarine_id) as nb FROM marine_archive l WHERE (l.date BETWEEN '."'".$begindate."' - INTERVAL '".$globalLiveInterval." SECONDS' AND "."'".$enddate."'".')'.$filter_query; |
|
| 572 | + } |
|
| 573 | + //echo $query; |
|
| 574 | + try { |
|
| 575 | + $sth = $this->db->prepare($query); |
|
| 576 | + $sth->execute(); |
|
| 577 | + } catch(PDOException $e) { |
|
| 578 | + echo $e->getMessage(); |
|
| 579 | + die; |
|
| 580 | + } |
|
| 581 | + $result = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 582 | + $sth->closeCursor(); |
|
| 583 | + return $result['nb']; |
|
| 584 | + } |
|
| 585 | 585 | |
| 586 | 586 | |
| 587 | 587 | |
| 588 | 588 | // marine_archive_output |
| 589 | 589 | |
| 590 | - /** |
|
| 591 | - * Gets all the spotter information |
|
| 592 | - * |
|
| 593 | - * @param string $q |
|
| 594 | - * @param string $registration |
|
| 595 | - * @param string $aircraft_icao |
|
| 596 | - * @param string $aircraft_manufacturer |
|
| 597 | - * @param string $highlights |
|
| 598 | - * @param string $airline_icao |
|
| 599 | - * @param string $airline_country |
|
| 600 | - * @param string $airline_type |
|
| 601 | - * @param string $airport |
|
| 602 | - * @param string $airport_country |
|
| 603 | - * @param string $callsign |
|
| 604 | - * @param string $departure_airport_route |
|
| 605 | - * @param string $arrival_airport_route |
|
| 606 | - * @param string $owner |
|
| 607 | - * @param string $pilot_id |
|
| 608 | - * @param string $pilot_name |
|
| 609 | - * @param string $altitude |
|
| 610 | - * @param string $date_posted |
|
| 611 | - * @param string $limit |
|
| 612 | - * @param string $sort |
|
| 613 | - * @param string $includegeodata |
|
| 614 | - * @param string $origLat |
|
| 615 | - * @param string $origLon |
|
| 616 | - * @param string $dist |
|
| 617 | - * @param array $filters |
|
| 618 | - * @return array the spotter information |
|
| 619 | - */ |
|
| 620 | - 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()) |
|
| 621 | - { |
|
| 622 | - global $globalTimezone, $globalDBdriver; |
|
| 623 | - require_once(dirname(__FILE__).'/class.Translation.php'); |
|
| 624 | - $Translation = new Translation($this->db); |
|
| 625 | - $Marine = new Marine($this->db); |
|
| 626 | - |
|
| 627 | - date_default_timezone_set('UTC'); |
|
| 590 | + /** |
|
| 591 | + * Gets all the spotter information |
|
| 592 | + * |
|
| 593 | + * @param string $q |
|
| 594 | + * @param string $registration |
|
| 595 | + * @param string $aircraft_icao |
|
| 596 | + * @param string $aircraft_manufacturer |
|
| 597 | + * @param string $highlights |
|
| 598 | + * @param string $airline_icao |
|
| 599 | + * @param string $airline_country |
|
| 600 | + * @param string $airline_type |
|
| 601 | + * @param string $airport |
|
| 602 | + * @param string $airport_country |
|
| 603 | + * @param string $callsign |
|
| 604 | + * @param string $departure_airport_route |
|
| 605 | + * @param string $arrival_airport_route |
|
| 606 | + * @param string $owner |
|
| 607 | + * @param string $pilot_id |
|
| 608 | + * @param string $pilot_name |
|
| 609 | + * @param string $altitude |
|
| 610 | + * @param string $date_posted |
|
| 611 | + * @param string $limit |
|
| 612 | + * @param string $sort |
|
| 613 | + * @param string $includegeodata |
|
| 614 | + * @param string $origLat |
|
| 615 | + * @param string $origLon |
|
| 616 | + * @param string $dist |
|
| 617 | + * @param array $filters |
|
| 618 | + * @return array the spotter information |
|
| 619 | + */ |
|
| 620 | + 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()) |
|
| 621 | + { |
|
| 622 | + global $globalTimezone, $globalDBdriver; |
|
| 623 | + require_once(dirname(__FILE__).'/class.Translation.php'); |
|
| 624 | + $Translation = new Translation($this->db); |
|
| 625 | + $Marine = new Marine($this->db); |
|
| 626 | + |
|
| 627 | + date_default_timezone_set('UTC'); |
|
| 628 | 628 | |
| 629 | - $query_values = array(); |
|
| 630 | - $additional_query = ''; |
|
| 631 | - $limit_query = ''; |
|
| 632 | - $filter_query = $this->getFilter($filters); |
|
| 633 | - if ($q != "") |
|
| 634 | - { |
|
| 635 | - if (!is_string($q)) |
|
| 636 | - { |
|
| 637 | - return array(); |
|
| 638 | - } else { |
|
| 639 | - $q_array = explode(" ", $q); |
|
| 629 | + $query_values = array(); |
|
| 630 | + $additional_query = ''; |
|
| 631 | + $limit_query = ''; |
|
| 632 | + $filter_query = $this->getFilter($filters); |
|
| 633 | + if ($q != "") |
|
| 634 | + { |
|
| 635 | + if (!is_string($q)) |
|
| 636 | + { |
|
| 637 | + return array(); |
|
| 638 | + } else { |
|
| 639 | + $q_array = explode(" ", $q); |
|
| 640 | 640 | |
| 641 | - foreach ($q_array as $q_item){ |
|
| 642 | - $additional_query .= " AND ("; |
|
| 643 | - $additional_query .= "(marine_archive_output.spotter_id like '%".$q_item."%') OR "; |
|
| 644 | - $additional_query .= "(marine_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
|
| 645 | - $additional_query .= "(marine_archive_output.aircraft_name like '%".$q_item."%') OR "; |
|
| 646 | - $additional_query .= "(marine_archive_output.aircraft_manufacturer like '%".$q_item."%') OR "; |
|
| 647 | - $additional_query .= "(marine_archive_output.airline_icao like '%".$q_item."%') OR "; |
|
| 648 | - $additional_query .= "(marine_archive_output.airline_name like '%".$q_item."%') OR "; |
|
| 649 | - $additional_query .= "(marine_archive_output.airline_country like '%".$q_item."%') OR "; |
|
| 650 | - $additional_query .= "(marine_archive_output.departure_airport_icao like '%".$q_item."%') OR "; |
|
| 651 | - $additional_query .= "(marine_archive_output.departure_airport_name like '%".$q_item."%') OR "; |
|
| 652 | - $additional_query .= "(marine_archive_output.departure_airport_city like '%".$q_item."%') OR "; |
|
| 653 | - $additional_query .= "(marine_archive_output.departure_airport_country like '%".$q_item."%') OR "; |
|
| 654 | - $additional_query .= "(marine_archive_output.arrival_airport_icao like '%".$q_item."%') OR "; |
|
| 655 | - $additional_query .= "(marine_archive_output.arrival_airport_name like '%".$q_item."%') OR "; |
|
| 656 | - $additional_query .= "(marine_archive_output.arrival_airport_city like '%".$q_item."%') OR "; |
|
| 657 | - $additional_query .= "(marine_archive_output.arrival_airport_country like '%".$q_item."%') OR "; |
|
| 658 | - $additional_query .= "(marine_archive_output.registration like '%".$q_item."%') OR "; |
|
| 659 | - $additional_query .= "(marine_archive_output.owner_name like '%".$q_item."%') OR "; |
|
| 660 | - $additional_query .= "(marine_archive_output.pilot_id like '%".$q_item."%') OR "; |
|
| 661 | - $additional_query .= "(marine_archive_output.pilot_name like '%".$q_item."%') OR "; |
|
| 662 | - $additional_query .= "(marine_archive_output.ident like '%".$q_item."%') OR "; |
|
| 663 | - $translate = $Translation->ident2icao($q_item); |
|
| 664 | - if ($translate != $q_item) $additional_query .= "(marine_archive_output.ident like '%".$translate."%') OR "; |
|
| 665 | - $additional_query .= "(marine_archive_output.highlight like '%".$q_item."%')"; |
|
| 666 | - $additional_query .= ")"; |
|
| 667 | - } |
|
| 668 | - } |
|
| 669 | - } |
|
| 641 | + foreach ($q_array as $q_item){ |
|
| 642 | + $additional_query .= " AND ("; |
|
| 643 | + $additional_query .= "(marine_archive_output.spotter_id like '%".$q_item."%') OR "; |
|
| 644 | + $additional_query .= "(marine_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
|
| 645 | + $additional_query .= "(marine_archive_output.aircraft_name like '%".$q_item."%') OR "; |
|
| 646 | + $additional_query .= "(marine_archive_output.aircraft_manufacturer like '%".$q_item."%') OR "; |
|
| 647 | + $additional_query .= "(marine_archive_output.airline_icao like '%".$q_item."%') OR "; |
|
| 648 | + $additional_query .= "(marine_archive_output.airline_name like '%".$q_item."%') OR "; |
|
| 649 | + $additional_query .= "(marine_archive_output.airline_country like '%".$q_item."%') OR "; |
|
| 650 | + $additional_query .= "(marine_archive_output.departure_airport_icao like '%".$q_item."%') OR "; |
|
| 651 | + $additional_query .= "(marine_archive_output.departure_airport_name like '%".$q_item."%') OR "; |
|
| 652 | + $additional_query .= "(marine_archive_output.departure_airport_city like '%".$q_item."%') OR "; |
|
| 653 | + $additional_query .= "(marine_archive_output.departure_airport_country like '%".$q_item."%') OR "; |
|
| 654 | + $additional_query .= "(marine_archive_output.arrival_airport_icao like '%".$q_item."%') OR "; |
|
| 655 | + $additional_query .= "(marine_archive_output.arrival_airport_name like '%".$q_item."%') OR "; |
|
| 656 | + $additional_query .= "(marine_archive_output.arrival_airport_city like '%".$q_item."%') OR "; |
|
| 657 | + $additional_query .= "(marine_archive_output.arrival_airport_country like '%".$q_item."%') OR "; |
|
| 658 | + $additional_query .= "(marine_archive_output.registration like '%".$q_item."%') OR "; |
|
| 659 | + $additional_query .= "(marine_archive_output.owner_name like '%".$q_item."%') OR "; |
|
| 660 | + $additional_query .= "(marine_archive_output.pilot_id like '%".$q_item."%') OR "; |
|
| 661 | + $additional_query .= "(marine_archive_output.pilot_name like '%".$q_item."%') OR "; |
|
| 662 | + $additional_query .= "(marine_archive_output.ident like '%".$q_item."%') OR "; |
|
| 663 | + $translate = $Translation->ident2icao($q_item); |
|
| 664 | + if ($translate != $q_item) $additional_query .= "(marine_archive_output.ident like '%".$translate."%') OR "; |
|
| 665 | + $additional_query .= "(marine_archive_output.highlight like '%".$q_item."%')"; |
|
| 666 | + $additional_query .= ")"; |
|
| 667 | + } |
|
| 668 | + } |
|
| 669 | + } |
|
| 670 | 670 | |
| 671 | - if ($registration != "") |
|
| 672 | - { |
|
| 673 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 674 | - if (!is_string($registration)) |
|
| 675 | - { |
|
| 676 | - return array(); |
|
| 677 | - } else { |
|
| 678 | - $additional_query .= " AND (marine_archive_output.registration = '".$registration."')"; |
|
| 679 | - } |
|
| 680 | - } |
|
| 671 | + if ($registration != "") |
|
| 672 | + { |
|
| 673 | + $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 674 | + if (!is_string($registration)) |
|
| 675 | + { |
|
| 676 | + return array(); |
|
| 677 | + } else { |
|
| 678 | + $additional_query .= " AND (marine_archive_output.registration = '".$registration."')"; |
|
| 679 | + } |
|
| 680 | + } |
|
| 681 | 681 | |
| 682 | - if ($aircraft_icao != "") |
|
| 683 | - { |
|
| 684 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 685 | - if (!is_string($aircraft_icao)) |
|
| 686 | - { |
|
| 687 | - return array(); |
|
| 688 | - } else { |
|
| 689 | - $additional_query .= " AND (marine_archive_output.aircraft_icao = '".$aircraft_icao."')"; |
|
| 690 | - } |
|
| 691 | - } |
|
| 682 | + if ($aircraft_icao != "") |
|
| 683 | + { |
|
| 684 | + $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 685 | + if (!is_string($aircraft_icao)) |
|
| 686 | + { |
|
| 687 | + return array(); |
|
| 688 | + } else { |
|
| 689 | + $additional_query .= " AND (marine_archive_output.aircraft_icao = '".$aircraft_icao."')"; |
|
| 690 | + } |
|
| 691 | + } |
|
| 692 | 692 | |
| 693 | - if ($aircraft_manufacturer != "") |
|
| 694 | - { |
|
| 695 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 696 | - if (!is_string($aircraft_manufacturer)) |
|
| 697 | - { |
|
| 698 | - return array(); |
|
| 699 | - } else { |
|
| 700 | - $additional_query .= " AND (marine_archive_output.aircraft_manufacturer = '".$aircraft_manufacturer."')"; |
|
| 701 | - } |
|
| 702 | - } |
|
| 693 | + if ($aircraft_manufacturer != "") |
|
| 694 | + { |
|
| 695 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 696 | + if (!is_string($aircraft_manufacturer)) |
|
| 697 | + { |
|
| 698 | + return array(); |
|
| 699 | + } else { |
|
| 700 | + $additional_query .= " AND (marine_archive_output.aircraft_manufacturer = '".$aircraft_manufacturer."')"; |
|
| 701 | + } |
|
| 702 | + } |
|
| 703 | 703 | |
| 704 | - if ($highlights == "true") |
|
| 705 | - { |
|
| 706 | - if (!is_string($highlights)) |
|
| 707 | - { |
|
| 708 | - return array(); |
|
| 709 | - } else { |
|
| 710 | - $additional_query .= " AND (marine_archive_output.highlight <> '')"; |
|
| 711 | - } |
|
| 712 | - } |
|
| 704 | + if ($highlights == "true") |
|
| 705 | + { |
|
| 706 | + if (!is_string($highlights)) |
|
| 707 | + { |
|
| 708 | + return array(); |
|
| 709 | + } else { |
|
| 710 | + $additional_query .= " AND (marine_archive_output.highlight <> '')"; |
|
| 711 | + } |
|
| 712 | + } |
|
| 713 | 713 | |
| 714 | - if ($airline_icao != "") |
|
| 715 | - { |
|
| 716 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 717 | - if (!is_string($airline_icao)) |
|
| 718 | - { |
|
| 719 | - return array(); |
|
| 720 | - } else { |
|
| 721 | - $additional_query .= " AND (marine_archive_output.airline_icao = '".$airline_icao."')"; |
|
| 722 | - } |
|
| 723 | - } |
|
| 714 | + if ($airline_icao != "") |
|
| 715 | + { |
|
| 716 | + $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 717 | + if (!is_string($airline_icao)) |
|
| 718 | + { |
|
| 719 | + return array(); |
|
| 720 | + } else { |
|
| 721 | + $additional_query .= " AND (marine_archive_output.airline_icao = '".$airline_icao."')"; |
|
| 722 | + } |
|
| 723 | + } |
|
| 724 | 724 | |
| 725 | - if ($airline_country != "") |
|
| 726 | - { |
|
| 727 | - $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 728 | - if (!is_string($airline_country)) |
|
| 729 | - { |
|
| 730 | - return array(); |
|
| 731 | - } else { |
|
| 732 | - $additional_query .= " AND (marine_archive_output.airline_country = '".$airline_country."')"; |
|
| 733 | - } |
|
| 734 | - } |
|
| 725 | + if ($airline_country != "") |
|
| 726 | + { |
|
| 727 | + $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 728 | + if (!is_string($airline_country)) |
|
| 729 | + { |
|
| 730 | + return array(); |
|
| 731 | + } else { |
|
| 732 | + $additional_query .= " AND (marine_archive_output.airline_country = '".$airline_country."')"; |
|
| 733 | + } |
|
| 734 | + } |
|
| 735 | 735 | |
| 736 | - if ($airline_type != "") |
|
| 737 | - { |
|
| 738 | - $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 739 | - if (!is_string($airline_type)) |
|
| 740 | - { |
|
| 741 | - return array(); |
|
| 742 | - } else { |
|
| 743 | - if ($airline_type == "passenger") |
|
| 744 | - { |
|
| 745 | - $additional_query .= " AND (marine_archive_output.airline_type = 'passenger')"; |
|
| 746 | - } |
|
| 747 | - if ($airline_type == "cargo") |
|
| 748 | - { |
|
| 749 | - $additional_query .= " AND (marine_archive_output.airline_type = 'cargo')"; |
|
| 750 | - } |
|
| 751 | - if ($airline_type == "military") |
|
| 752 | - { |
|
| 753 | - $additional_query .= " AND (marine_archive_output.airline_type = 'military')"; |
|
| 754 | - } |
|
| 755 | - } |
|
| 756 | - } |
|
| 736 | + if ($airline_type != "") |
|
| 737 | + { |
|
| 738 | + $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 739 | + if (!is_string($airline_type)) |
|
| 740 | + { |
|
| 741 | + return array(); |
|
| 742 | + } else { |
|
| 743 | + if ($airline_type == "passenger") |
|
| 744 | + { |
|
| 745 | + $additional_query .= " AND (marine_archive_output.airline_type = 'passenger')"; |
|
| 746 | + } |
|
| 747 | + if ($airline_type == "cargo") |
|
| 748 | + { |
|
| 749 | + $additional_query .= " AND (marine_archive_output.airline_type = 'cargo')"; |
|
| 750 | + } |
|
| 751 | + if ($airline_type == "military") |
|
| 752 | + { |
|
| 753 | + $additional_query .= " AND (marine_archive_output.airline_type = 'military')"; |
|
| 754 | + } |
|
| 755 | + } |
|
| 756 | + } |
|
| 757 | 757 | |
| 758 | - if ($airport != "") |
|
| 759 | - { |
|
| 760 | - $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 761 | - if (!is_string($airport)) |
|
| 762 | - { |
|
| 763 | - return array(); |
|
| 764 | - } else { |
|
| 765 | - $additional_query .= " AND ((marine_archive_output.departure_airport_icao = '".$airport."') OR (marine_archive_output.arrival_airport_icao = '".$airport."'))"; |
|
| 766 | - } |
|
| 767 | - } |
|
| 758 | + if ($airport != "") |
|
| 759 | + { |
|
| 760 | + $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 761 | + if (!is_string($airport)) |
|
| 762 | + { |
|
| 763 | + return array(); |
|
| 764 | + } else { |
|
| 765 | + $additional_query .= " AND ((marine_archive_output.departure_airport_icao = '".$airport."') OR (marine_archive_output.arrival_airport_icao = '".$airport."'))"; |
|
| 766 | + } |
|
| 767 | + } |
|
| 768 | 768 | |
| 769 | - if ($airport_country != "") |
|
| 770 | - { |
|
| 771 | - $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 772 | - if (!is_string($airport_country)) |
|
| 773 | - { |
|
| 774 | - return array(); |
|
| 775 | - } else { |
|
| 776 | - $additional_query .= " AND ((marine_archive_output.departure_airport_country = '".$airport_country."') OR (marine_archive_output.arrival_airport_country = '".$airport_country."'))"; |
|
| 777 | - } |
|
| 778 | - } |
|
| 769 | + if ($airport_country != "") |
|
| 770 | + { |
|
| 771 | + $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 772 | + if (!is_string($airport_country)) |
|
| 773 | + { |
|
| 774 | + return array(); |
|
| 775 | + } else { |
|
| 776 | + $additional_query .= " AND ((marine_archive_output.departure_airport_country = '".$airport_country."') OR (marine_archive_output.arrival_airport_country = '".$airport_country."'))"; |
|
| 777 | + } |
|
| 778 | + } |
|
| 779 | 779 | |
| 780 | - if ($callsign != "") |
|
| 781 | - { |
|
| 782 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 783 | - if (!is_string($callsign)) |
|
| 784 | - { |
|
| 785 | - return array(); |
|
| 786 | - } else { |
|
| 787 | - $translate = $Translation->ident2icao($callsign); |
|
| 788 | - if ($translate != $callsign) { |
|
| 789 | - $additional_query .= " AND (marine_archive_output.ident = :callsign OR marine_archive_output.ident = :translate)"; |
|
| 790 | - $query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate)); |
|
| 791 | - } else { |
|
| 792 | - $additional_query .= " AND (marine_archive_output.ident = '".$callsign."')"; |
|
| 793 | - } |
|
| 794 | - } |
|
| 795 | - } |
|
| 796 | - |
|
| 797 | - if ($owner != "") |
|
| 798 | - { |
|
| 799 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 800 | - if (!is_string($owner)) |
|
| 801 | - { |
|
| 802 | - return array(); |
|
| 803 | - } else { |
|
| 804 | - $additional_query .= " AND (marine_archive_output.owner_name = '".$owner."')"; |
|
| 805 | - } |
|
| 806 | - } |
|
| 807 | - |
|
| 808 | - if ($pilot_name != "") |
|
| 809 | - { |
|
| 810 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 811 | - if (!is_string($pilot_name)) |
|
| 812 | - { |
|
| 813 | - return array(); |
|
| 814 | - } else { |
|
| 815 | - $additional_query .= " AND (marine_archive_output.pilot_name = '".$pilot_name."')"; |
|
| 816 | - } |
|
| 817 | - } |
|
| 780 | + if ($callsign != "") |
|
| 781 | + { |
|
| 782 | + $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 783 | + if (!is_string($callsign)) |
|
| 784 | + { |
|
| 785 | + return array(); |
|
| 786 | + } else { |
|
| 787 | + $translate = $Translation->ident2icao($callsign); |
|
| 788 | + if ($translate != $callsign) { |
|
| 789 | + $additional_query .= " AND (marine_archive_output.ident = :callsign OR marine_archive_output.ident = :translate)"; |
|
| 790 | + $query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate)); |
|
| 791 | + } else { |
|
| 792 | + $additional_query .= " AND (marine_archive_output.ident = '".$callsign."')"; |
|
| 793 | + } |
|
| 794 | + } |
|
| 795 | + } |
|
| 796 | + |
|
| 797 | + if ($owner != "") |
|
| 798 | + { |
|
| 799 | + $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 800 | + if (!is_string($owner)) |
|
| 801 | + { |
|
| 802 | + return array(); |
|
| 803 | + } else { |
|
| 804 | + $additional_query .= " AND (marine_archive_output.owner_name = '".$owner."')"; |
|
| 805 | + } |
|
| 806 | + } |
|
| 807 | + |
|
| 808 | + if ($pilot_name != "") |
|
| 809 | + { |
|
| 810 | + $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 811 | + if (!is_string($pilot_name)) |
|
| 812 | + { |
|
| 813 | + return array(); |
|
| 814 | + } else { |
|
| 815 | + $additional_query .= " AND (marine_archive_output.pilot_name = '".$pilot_name."')"; |
|
| 816 | + } |
|
| 817 | + } |
|
| 818 | 818 | |
| 819 | - if ($pilot_id != "") |
|
| 820 | - { |
|
| 821 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 822 | - if (!is_string($pilot_id)) |
|
| 823 | - { |
|
| 824 | - return array(); |
|
| 825 | - } else { |
|
| 826 | - $additional_query .= " AND (marine_archive_output.pilot_id = '".$pilot_id."')"; |
|
| 827 | - } |
|
| 828 | - } |
|
| 819 | + if ($pilot_id != "") |
|
| 820 | + { |
|
| 821 | + $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 822 | + if (!is_string($pilot_id)) |
|
| 823 | + { |
|
| 824 | + return array(); |
|
| 825 | + } else { |
|
| 826 | + $additional_query .= " AND (marine_archive_output.pilot_id = '".$pilot_id."')"; |
|
| 827 | + } |
|
| 828 | + } |
|
| 829 | 829 | |
| 830 | - if ($departure_airport_route != "") |
|
| 831 | - { |
|
| 832 | - $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 833 | - if (!is_string($departure_airport_route)) |
|
| 834 | - { |
|
| 835 | - return array(); |
|
| 836 | - } else { |
|
| 837 | - $additional_query .= " AND (marine_archive_output.departure_airport_icao = '".$departure_airport_route."')"; |
|
| 838 | - } |
|
| 839 | - } |
|
| 830 | + if ($departure_airport_route != "") |
|
| 831 | + { |
|
| 832 | + $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 833 | + if (!is_string($departure_airport_route)) |
|
| 834 | + { |
|
| 835 | + return array(); |
|
| 836 | + } else { |
|
| 837 | + $additional_query .= " AND (marine_archive_output.departure_airport_icao = '".$departure_airport_route."')"; |
|
| 838 | + } |
|
| 839 | + } |
|
| 840 | 840 | |
| 841 | - if ($arrival_airport_route != "") |
|
| 842 | - { |
|
| 843 | - $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 844 | - if (!is_string($arrival_airport_route)) |
|
| 845 | - { |
|
| 846 | - return array(); |
|
| 847 | - } else { |
|
| 848 | - $additional_query .= " AND (marine_archive_output.arrival_airport_icao = '".$arrival_airport_route."')"; |
|
| 849 | - } |
|
| 850 | - } |
|
| 841 | + if ($arrival_airport_route != "") |
|
| 842 | + { |
|
| 843 | + $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 844 | + if (!is_string($arrival_airport_route)) |
|
| 845 | + { |
|
| 846 | + return array(); |
|
| 847 | + } else { |
|
| 848 | + $additional_query .= " AND (marine_archive_output.arrival_airport_icao = '".$arrival_airport_route."')"; |
|
| 849 | + } |
|
| 850 | + } |
|
| 851 | 851 | |
| 852 | - if ($altitude != "") |
|
| 853 | - { |
|
| 854 | - $altitude_array = explode(",", $altitude); |
|
| 852 | + if ($altitude != "") |
|
| 853 | + { |
|
| 854 | + $altitude_array = explode(",", $altitude); |
|
| 855 | 855 | |
| 856 | - $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 857 | - $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 856 | + $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 857 | + $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 858 | 858 | |
| 859 | 859 | |
| 860 | - if ($altitude_array[1] != "") |
|
| 861 | - { |
|
| 862 | - $altitude_array[0] = substr($altitude_array[0], 0, -2); |
|
| 863 | - $altitude_array[1] = substr($altitude_array[1], 0, -2); |
|
| 864 | - $additional_query .= " AND altitude BETWEEN '".$altitude_array[0]."' AND '".$altitude_array[1]."' "; |
|
| 865 | - } else { |
|
| 866 | - $altitude_array[0] = substr($altitude_array[0], 0, -2); |
|
| 867 | - $additional_query .= " AND altitude <= '".$altitude_array[0]."' "; |
|
| 868 | - } |
|
| 869 | - } |
|
| 860 | + if ($altitude_array[1] != "") |
|
| 861 | + { |
|
| 862 | + $altitude_array[0] = substr($altitude_array[0], 0, -2); |
|
| 863 | + $altitude_array[1] = substr($altitude_array[1], 0, -2); |
|
| 864 | + $additional_query .= " AND altitude BETWEEN '".$altitude_array[0]."' AND '".$altitude_array[1]."' "; |
|
| 865 | + } else { |
|
| 866 | + $altitude_array[0] = substr($altitude_array[0], 0, -2); |
|
| 867 | + $additional_query .= " AND altitude <= '".$altitude_array[0]."' "; |
|
| 868 | + } |
|
| 869 | + } |
|
| 870 | 870 | |
| 871 | - if ($date_posted != "") |
|
| 872 | - { |
|
| 873 | - $date_array = explode(",", $date_posted); |
|
| 871 | + if ($date_posted != "") |
|
| 872 | + { |
|
| 873 | + $date_array = explode(",", $date_posted); |
|
| 874 | 874 | |
| 875 | - $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 876 | - $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 875 | + $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 876 | + $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 877 | 877 | |
| 878 | - if ($globalTimezone != '') { |
|
| 879 | - date_default_timezone_set($globalTimezone); |
|
| 880 | - $datetime = new DateTime(); |
|
| 881 | - $offset = $datetime->format('P'); |
|
| 882 | - } else $offset = '+00:00'; |
|
| 883 | - |
|
| 884 | - |
|
| 885 | - if ($date_array[1] != "") |
|
| 886 | - { |
|
| 887 | - $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0])); |
|
| 888 | - $date_array[1] = date("Y-m-d H:i:s", strtotime($date_array[1])); |
|
| 889 | - if ($globalDBdriver == 'mysql') { |
|
| 890 | - $additional_query .= " AND TIMESTAMP(CONVERT_TZ(marine_archive_output.date,'+00:00', '".$offset."')) >= '".$date_array[0]."' AND TIMESTAMP(CONVERT_TZ(marine_archive_output.date,'+00:00', '".$offset."')) <= '".$date_array[1]."' "; |
|
| 891 | - } else { |
|
| 892 | - $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) "; |
|
| 893 | - } |
|
| 894 | - } else { |
|
| 895 | - $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0])); |
|
| 896 | - if ($globalDBdriver == 'mysql') { |
|
| 897 | - $additional_query .= " AND TIMESTAMP(CONVERT_TZ(marine_archive_output.date,'+00:00', '".$offset."')) >= '".$date_array[0]."' "; |
|
| 898 | - } else { |
|
| 899 | - $additional_query .= " AND marine_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) "; |
|
| 900 | - } |
|
| 901 | - } |
|
| 902 | - } |
|
| 878 | + if ($globalTimezone != '') { |
|
| 879 | + date_default_timezone_set($globalTimezone); |
|
| 880 | + $datetime = new DateTime(); |
|
| 881 | + $offset = $datetime->format('P'); |
|
| 882 | + } else $offset = '+00:00'; |
|
| 883 | + |
|
| 884 | + |
|
| 885 | + if ($date_array[1] != "") |
|
| 886 | + { |
|
| 887 | + $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0])); |
|
| 888 | + $date_array[1] = date("Y-m-d H:i:s", strtotime($date_array[1])); |
|
| 889 | + if ($globalDBdriver == 'mysql') { |
|
| 890 | + $additional_query .= " AND TIMESTAMP(CONVERT_TZ(marine_archive_output.date,'+00:00', '".$offset."')) >= '".$date_array[0]."' AND TIMESTAMP(CONVERT_TZ(marine_archive_output.date,'+00:00', '".$offset."')) <= '".$date_array[1]."' "; |
|
| 891 | + } else { |
|
| 892 | + $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) "; |
|
| 893 | + } |
|
| 894 | + } else { |
|
| 895 | + $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0])); |
|
| 896 | + if ($globalDBdriver == 'mysql') { |
|
| 897 | + $additional_query .= " AND TIMESTAMP(CONVERT_TZ(marine_archive_output.date,'+00:00', '".$offset."')) >= '".$date_array[0]."' "; |
|
| 898 | + } else { |
|
| 899 | + $additional_query .= " AND marine_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) "; |
|
| 900 | + } |
|
| 901 | + } |
|
| 902 | + } |
|
| 903 | 903 | |
| 904 | - if ($limit != "") |
|
| 905 | - { |
|
| 906 | - $limit_array = explode(",", $limit); |
|
| 904 | + if ($limit != "") |
|
| 905 | + { |
|
| 906 | + $limit_array = explode(",", $limit); |
|
| 907 | 907 | |
| 908 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 909 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 908 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 909 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 910 | 910 | |
| 911 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 912 | - { |
|
| 913 | - //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
|
| 914 | - $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
|
| 915 | - } |
|
| 916 | - } |
|
| 911 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 912 | + { |
|
| 913 | + //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
|
| 914 | + $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
|
| 915 | + } |
|
| 916 | + } |
|
| 917 | 917 | |
| 918 | 918 | |
| 919 | - if ($origLat != "" && $origLon != "" && $dist != "") { |
|
| 920 | - $dist = number_format($dist*0.621371,2,'.',''); |
|
| 921 | - $query="SELECT marine_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(marine_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(marine_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
| 919 | + if ($origLat != "" && $origLon != "" && $dist != "") { |
|
| 920 | + $dist = number_format($dist*0.621371,2,'.',''); |
|
| 921 | + $query="SELECT marine_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(marine_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(marine_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
| 922 | 922 | FROM marine_archive_output, marine_archive WHERE spotter_output_archive.fammarine_id = marine_archive.fammarine_id AND spotter_output.ident <> '' ".$additional_query."AND CAST(marine_archive.longitude as double precision) between ($origLon-$dist/ABS(cos(radians($origLat))*69)) and ($origLon+$dist/ABS(cos(radians($origLat))*69)) and CAST(marine_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) |
| 923 | 923 | AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(marine_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(marine_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query." ORDER BY distance"; |
| 924 | - } else { |
|
| 925 | - if ($sort != "") |
|
| 926 | - { |
|
| 927 | - $search_orderby_array = $Marine->getOrderBy(); |
|
| 928 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 929 | - } else { |
|
| 930 | - $orderby_query = " ORDER BY marine_archive_output.date DESC"; |
|
| 931 | - } |
|
| 924 | + } else { |
|
| 925 | + if ($sort != "") |
|
| 926 | + { |
|
| 927 | + $search_orderby_array = $Marine->getOrderBy(); |
|
| 928 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 929 | + } else { |
|
| 930 | + $orderby_query = " ORDER BY marine_archive_output.date DESC"; |
|
| 931 | + } |
|
| 932 | 932 | |
| 933 | - if ($includegeodata == "true") |
|
| 934 | - { |
|
| 935 | - $additional_query .= " AND (marine_archive_output.waypoints <> '')"; |
|
| 936 | - } |
|
| 933 | + if ($includegeodata == "true") |
|
| 934 | + { |
|
| 935 | + $additional_query .= " AND (marine_archive_output.waypoints <> '')"; |
|
| 936 | + } |
|
| 937 | 937 | |
| 938 | - $query = "SELECT marine_archive_output.* FROM marine_archive_output |
|
| 938 | + $query = "SELECT marine_archive_output.* FROM marine_archive_output |
|
| 939 | 939 | WHERE marine_archive_output.ident <> '' |
| 940 | 940 | ".$additional_query." |
| 941 | 941 | ".$filter_query.$orderby_query; |
| 942 | - } |
|
| 943 | - $spotter_array = $Marine->getDataFromDB($query, $query_values,$limit_query); |
|
| 944 | - |
|
| 945 | - return $spotter_array; |
|
| 946 | - } |
|
| 947 | - |
|
| 948 | - public function deleteMarineArchiveData() |
|
| 949 | - { |
|
| 950 | - global $globalArchiveKeepMonths, $globalDBdriver; |
|
| 951 | - date_default_timezone_set('UTC'); |
|
| 952 | - if ($globalDBdriver == 'mysql') { |
|
| 953 | - $query = 'DELETE FROM marine_archive_output WHERE marine_archive_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepMonths.' MONTH)'; |
|
| 954 | - } else { |
|
| 955 | - $query = "DELETE FROM marine_archive_output WHERE marine_archive_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveKeepMonths." MONTH'"; |
|
| 956 | - } |
|
| 957 | - try { |
|
| 958 | - $sth = $this->db->prepare($query); |
|
| 959 | - $sth->execute(); |
|
| 960 | - } catch(PDOException $e) { |
|
| 961 | - return "error"; |
|
| 962 | - } |
|
| 963 | - return ''; |
|
| 964 | - } |
|
| 965 | - |
|
| 966 | - /** |
|
| 967 | - * Gets all the spotter information based on the callsign |
|
| 968 | - * |
|
| 969 | - * @param string $ident |
|
| 970 | - * @param string $limit |
|
| 971 | - * @param string $sort |
|
| 972 | - * @return array the spotter information |
|
| 973 | - */ |
|
| 974 | - public function getMarineDataByIdent($ident = '', $limit = '', $sort = '') |
|
| 975 | - { |
|
| 942 | + } |
|
| 943 | + $spotter_array = $Marine->getDataFromDB($query, $query_values,$limit_query); |
|
| 944 | + |
|
| 945 | + return $spotter_array; |
|
| 946 | + } |
|
| 947 | + |
|
| 948 | + public function deleteMarineArchiveData() |
|
| 949 | + { |
|
| 950 | + global $globalArchiveKeepMonths, $globalDBdriver; |
|
| 951 | + date_default_timezone_set('UTC'); |
|
| 952 | + if ($globalDBdriver == 'mysql') { |
|
| 953 | + $query = 'DELETE FROM marine_archive_output WHERE marine_archive_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepMonths.' MONTH)'; |
|
| 954 | + } else { |
|
| 955 | + $query = "DELETE FROM marine_archive_output WHERE marine_archive_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveKeepMonths." MONTH'"; |
|
| 956 | + } |
|
| 957 | + try { |
|
| 958 | + $sth = $this->db->prepare($query); |
|
| 959 | + $sth->execute(); |
|
| 960 | + } catch(PDOException $e) { |
|
| 961 | + return "error"; |
|
| 962 | + } |
|
| 963 | + return ''; |
|
| 964 | + } |
|
| 965 | + |
|
| 966 | + /** |
|
| 967 | + * Gets all the spotter information based on the callsign |
|
| 968 | + * |
|
| 969 | + * @param string $ident |
|
| 970 | + * @param string $limit |
|
| 971 | + * @param string $sort |
|
| 972 | + * @return array the spotter information |
|
| 973 | + */ |
|
| 974 | + public function getMarineDataByIdent($ident = '', $limit = '', $sort = '') |
|
| 975 | + { |
|
| 976 | 976 | $global_query = "SELECT marine_archive_output.* FROM marine_archive_output"; |
| 977 | 977 | |
| 978 | 978 | date_default_timezone_set('UTC'); |
@@ -984,35 +984,35 @@ discard block |
||
| 984 | 984 | |
| 985 | 985 | if ($ident != "") |
| 986 | 986 | { |
| 987 | - if (!is_string($ident)) |
|
| 988 | - { |
|
| 989 | - return array(); |
|
| 990 | - } else { |
|
| 991 | - $additional_query = " AND (marine_archive_output.ident = :ident)"; |
|
| 992 | - $query_values = array(':ident' => $ident); |
|
| 993 | - } |
|
| 987 | + if (!is_string($ident)) |
|
| 988 | + { |
|
| 989 | + return array(); |
|
| 990 | + } else { |
|
| 991 | + $additional_query = " AND (marine_archive_output.ident = :ident)"; |
|
| 992 | + $query_values = array(':ident' => $ident); |
|
| 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." WHERE marine_archive_output.ident <> '' ".$additional_query." ".$orderby_query; |
@@ -1020,20 +1020,20 @@ discard block |
||
| 1020 | 1020 | $spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query); |
| 1021 | 1021 | |
| 1022 | 1022 | return $spotter_array; |
| 1023 | - } |
|
| 1024 | - |
|
| 1025 | - |
|
| 1026 | - /** |
|
| 1027 | - * Gets all the spotter information based on the owner |
|
| 1028 | - * |
|
| 1029 | - * @param string $owner |
|
| 1030 | - * @param string $limit |
|
| 1031 | - * @param string $sort |
|
| 1032 | - * @param array $filter |
|
| 1033 | - * @return array the spotter information |
|
| 1034 | - */ |
|
| 1035 | - public function getMarineDataByOwner($owner = '', $limit = '', $sort = '', $filter = array()) |
|
| 1036 | - { |
|
| 1023 | + } |
|
| 1024 | + |
|
| 1025 | + |
|
| 1026 | + /** |
|
| 1027 | + * Gets all the spotter information based on the owner |
|
| 1028 | + * |
|
| 1029 | + * @param string $owner |
|
| 1030 | + * @param string $limit |
|
| 1031 | + * @param string $sort |
|
| 1032 | + * @param array $filter |
|
| 1033 | + * @return array the spotter information |
|
| 1034 | + */ |
|
| 1035 | + public function getMarineDataByOwner($owner = '', $limit = '', $sort = '', $filter = array()) |
|
| 1036 | + { |
|
| 1037 | 1037 | $global_query = "SELECT marine_archive_output.* FROM marine_archive_output"; |
| 1038 | 1038 | |
| 1039 | 1039 | date_default_timezone_set('UTC'); |
@@ -1046,35 +1046,35 @@ discard block |
||
| 1046 | 1046 | |
| 1047 | 1047 | if ($owner != "") |
| 1048 | 1048 | { |
| 1049 | - if (!is_string($owner)) |
|
| 1050 | - { |
|
| 1049 | + if (!is_string($owner)) |
|
| 1050 | + { |
|
| 1051 | 1051 | return array(); |
| 1052 | - } else { |
|
| 1052 | + } else { |
|
| 1053 | 1053 | $additional_query = " AND (marine_archive_output.owner_name = :owner)"; |
| 1054 | 1054 | $query_values = array(':owner' => $owner); |
| 1055 | - } |
|
| 1055 | + } |
|
| 1056 | 1056 | } |
| 1057 | 1057 | |
| 1058 | 1058 | if ($limit != "") |
| 1059 | 1059 | { |
| 1060 | - $limit_array = explode(",", $limit); |
|
| 1060 | + $limit_array = explode(",", $limit); |
|
| 1061 | 1061 | |
| 1062 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1063 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1062 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1063 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1064 | 1064 | |
| 1065 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1066 | - { |
|
| 1065 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1066 | + { |
|
| 1067 | 1067 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 1068 | 1068 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 1069 | - } |
|
| 1069 | + } |
|
| 1070 | 1070 | } |
| 1071 | 1071 | |
| 1072 | 1072 | if ($sort != "") |
| 1073 | 1073 | { |
| 1074 | - $search_orderby_array = $Marine->getOrderBy(); |
|
| 1075 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1074 | + $search_orderby_array = $Marine->getOrderBy(); |
|
| 1075 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1076 | 1076 | } else { |
| 1077 | - $orderby_query = " ORDER BY marine_archive_output.date DESC"; |
|
| 1077 | + $orderby_query = " ORDER BY marine_archive_output.date DESC"; |
|
| 1078 | 1078 | } |
| 1079 | 1079 | |
| 1080 | 1080 | $query = $global_query.$filter_query." marine_archive_output.owner_name <> '' ".$additional_query." ".$orderby_query; |
@@ -1082,19 +1082,19 @@ discard block |
||
| 1082 | 1082 | $spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query); |
| 1083 | 1083 | |
| 1084 | 1084 | return $spotter_array; |
| 1085 | - } |
|
| 1086 | - |
|
| 1087 | - /** |
|
| 1088 | - * Gets all the spotter information based on the pilot |
|
| 1089 | - * |
|
| 1090 | - * @param string $pilot |
|
| 1091 | - * @param string $limit |
|
| 1092 | - * @param string $sort |
|
| 1093 | - * @param array $filter |
|
| 1094 | - * @return array the spotter information |
|
| 1095 | - */ |
|
| 1096 | - public function getMarineDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array()) |
|
| 1097 | - { |
|
| 1085 | + } |
|
| 1086 | + |
|
| 1087 | + /** |
|
| 1088 | + * Gets all the spotter information based on the pilot |
|
| 1089 | + * |
|
| 1090 | + * @param string $pilot |
|
| 1091 | + * @param string $limit |
|
| 1092 | + * @param string $sort |
|
| 1093 | + * @param array $filter |
|
| 1094 | + * @return array the spotter information |
|
| 1095 | + */ |
|
| 1096 | + public function getMarineDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array()) |
|
| 1097 | + { |
|
| 1098 | 1098 | $global_query = "SELECT marine_archive_output.* FROM marine_archive_output"; |
| 1099 | 1099 | |
| 1100 | 1100 | date_default_timezone_set('UTC'); |
@@ -1113,24 +1113,24 @@ discard block |
||
| 1113 | 1113 | |
| 1114 | 1114 | if ($limit != "") |
| 1115 | 1115 | { |
| 1116 | - $limit_array = explode(",", $limit); |
|
| 1116 | + $limit_array = explode(",", $limit); |
|
| 1117 | 1117 | |
| 1118 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1119 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1118 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1119 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1120 | 1120 | |
| 1121 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1122 | - { |
|
| 1121 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1122 | + { |
|
| 1123 | 1123 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 1124 | 1124 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 1125 | - } |
|
| 1125 | + } |
|
| 1126 | 1126 | } |
| 1127 | 1127 | |
| 1128 | 1128 | if ($sort != "") |
| 1129 | 1129 | { |
| 1130 | - $search_orderby_array = $Marine->getOrderBy(); |
|
| 1131 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1130 | + $search_orderby_array = $Marine->getOrderBy(); |
|
| 1131 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1132 | 1132 | } else { |
| 1133 | - $orderby_query = " ORDER BY marine_archive_output.date DESC"; |
|
| 1133 | + $orderby_query = " ORDER BY marine_archive_output.date DESC"; |
|
| 1134 | 1134 | } |
| 1135 | 1135 | |
| 1136 | 1136 | $query = $global_query.$filter_query." marine_archive_output.pilot_name <> '' ".$additional_query." ".$orderby_query; |
@@ -1138,18 +1138,18 @@ discard block |
||
| 1138 | 1138 | $spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query); |
| 1139 | 1139 | |
| 1140 | 1140 | return $spotter_array; |
| 1141 | - } |
|
| 1142 | - |
|
| 1143 | - /** |
|
| 1144 | - * Gets all number of flight over countries |
|
| 1145 | - * |
|
| 1146 | - * @param bool $limit |
|
| 1147 | - * @param int $olderthanmonths |
|
| 1148 | - * @param string $sincedate |
|
| 1149 | - * @return array the airline country list |
|
| 1150 | - */ |
|
| 1151 | - public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1152 | - { |
|
| 1141 | + } |
|
| 1142 | + |
|
| 1143 | + /** |
|
| 1144 | + * Gets all number of flight over countries |
|
| 1145 | + * |
|
| 1146 | + * @param bool $limit |
|
| 1147 | + * @param int $olderthanmonths |
|
| 1148 | + * @param string $sincedate |
|
| 1149 | + * @return array the airline country list |
|
| 1150 | + */ |
|
| 1151 | + public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1152 | + { |
|
| 1153 | 1153 | global $globalDBdriver; |
| 1154 | 1154 | /* |
| 1155 | 1155 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
@@ -1159,14 +1159,14 @@ discard block |
||
| 1159 | 1159 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
| 1160 | 1160 | FROM countries c, marine_archive s |
| 1161 | 1161 | WHERE c.iso2 = s.over_country "; |
| 1162 | - if ($olderthanmonths > 0) { |
|
| 1163 | - if ($globalDBdriver == 'mysql') { |
|
| 1162 | + if ($olderthanmonths > 0) { |
|
| 1163 | + if ($globalDBdriver == 'mysql') { |
|
| 1164 | 1164 | $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) '; |
| 1165 | 1165 | } else { |
| 1166 | 1166 | $query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1167 | 1167 | } |
| 1168 | 1168 | } |
| 1169 | - if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
| 1169 | + if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
| 1170 | 1170 | $query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1171 | 1171 | if ($limit) $query .= " LIMIT 0,10"; |
| 1172 | 1172 | |
@@ -1179,25 +1179,25 @@ discard block |
||
| 1179 | 1179 | |
| 1180 | 1180 | while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
| 1181 | 1181 | { |
| 1182 | - $temp_array['flight_count'] = $row['nb']; |
|
| 1183 | - $temp_array['flight_country'] = $row['name']; |
|
| 1184 | - $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1185 | - $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1186 | - $flight_array[] = $temp_array; |
|
| 1182 | + $temp_array['flight_count'] = $row['nb']; |
|
| 1183 | + $temp_array['flight_country'] = $row['name']; |
|
| 1184 | + $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1185 | + $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1186 | + $flight_array[] = $temp_array; |
|
| 1187 | 1187 | } |
| 1188 | 1188 | return $flight_array; |
| 1189 | - } |
|
| 1190 | - |
|
| 1191 | - /** |
|
| 1192 | - * Gets all number of flight over countries |
|
| 1193 | - * |
|
| 1194 | - * @param bool $limit |
|
| 1195 | - * @param int $olderthanmonths |
|
| 1196 | - * @param string $sincedate |
|
| 1197 | - * @return array the airline country list |
|
| 1198 | - */ |
|
| 1199 | - public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1200 | - { |
|
| 1189 | + } |
|
| 1190 | + |
|
| 1191 | + /** |
|
| 1192 | + * Gets all number of flight over countries |
|
| 1193 | + * |
|
| 1194 | + * @param bool $limit |
|
| 1195 | + * @param int $olderthanmonths |
|
| 1196 | + * @param string $sincedate |
|
| 1197 | + * @return array the airline country list |
|
| 1198 | + */ |
|
| 1199 | + public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1200 | + { |
|
| 1201 | 1201 | global $globalDBdriver; |
| 1202 | 1202 | /* |
| 1203 | 1203 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
@@ -1207,14 +1207,14 @@ discard block |
||
| 1207 | 1207 | $query = "SELECT o.airline_icao,c.name, c.iso3, c.iso2, count(c.name) as nb |
| 1208 | 1208 | FROM countries c, marine_archive s, spotter_output o |
| 1209 | 1209 | WHERE c.iso2 = s.over_country AND o.airline_icao <> '' AND o.fammarine_id = s.fammarine_id "; |
| 1210 | - if ($olderthanmonths > 0) { |
|
| 1211 | - if ($globalDBdriver == 'mysql') { |
|
| 1210 | + if ($olderthanmonths > 0) { |
|
| 1211 | + if ($globalDBdriver == 'mysql') { |
|
| 1212 | 1212 | $query .= 'AND s.date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) '; |
| 1213 | 1213 | } else { |
| 1214 | 1214 | $query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1215 | 1215 | } |
| 1216 | 1216 | } |
| 1217 | - if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' "; |
|
| 1217 | + if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' "; |
|
| 1218 | 1218 | $query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1219 | 1219 | if ($limit) $query .= " LIMIT 0,10"; |
| 1220 | 1220 | |
@@ -1227,25 +1227,25 @@ discard block |
||
| 1227 | 1227 | |
| 1228 | 1228 | while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
| 1229 | 1229 | { |
| 1230 | - $temp_array['airline_icao'] = $row['airline_icao']; |
|
| 1231 | - $temp_array['flight_count'] = $row['nb']; |
|
| 1232 | - $temp_array['flight_country'] = $row['name']; |
|
| 1233 | - $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1234 | - $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1235 | - $flight_array[] = $temp_array; |
|
| 1230 | + $temp_array['airline_icao'] = $row['airline_icao']; |
|
| 1231 | + $temp_array['flight_count'] = $row['nb']; |
|
| 1232 | + $temp_array['flight_country'] = $row['name']; |
|
| 1233 | + $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1234 | + $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1235 | + $flight_array[] = $temp_array; |
|
| 1236 | 1236 | } |
| 1237 | 1237 | return $flight_array; |
| 1238 | - } |
|
| 1239 | - |
|
| 1240 | - /** |
|
| 1241 | - * Gets last spotter information based on a particular callsign |
|
| 1242 | - * |
|
| 1243 | - * @param $id |
|
| 1244 | - * @param $date |
|
| 1245 | - * @return array the spotter information |
|
| 1246 | - */ |
|
| 1247 | - public function getDateArchiveMarineDataById($id,$date) |
|
| 1248 | - { |
|
| 1238 | + } |
|
| 1239 | + |
|
| 1240 | + /** |
|
| 1241 | + * Gets last spotter information based on a particular callsign |
|
| 1242 | + * |
|
| 1243 | + * @param $id |
|
| 1244 | + * @param $date |
|
| 1245 | + * @return array the spotter information |
|
| 1246 | + */ |
|
| 1247 | + public function getDateArchiveMarineDataById($id,$date) |
|
| 1248 | + { |
|
| 1249 | 1249 | $Marine = new Marine($this->db); |
| 1250 | 1250 | date_default_timezone_set('UTC'); |
| 1251 | 1251 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
@@ -1253,17 +1253,17 @@ discard block |
||
| 1253 | 1253 | $date = date('c',$date); |
| 1254 | 1254 | $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id,':date' => $date)); |
| 1255 | 1255 | return $spotter_array; |
| 1256 | - } |
|
| 1257 | - |
|
| 1258 | - /** |
|
| 1259 | - * Gets all the spotter information based on a particular callsign |
|
| 1260 | - * |
|
| 1261 | - * @param $ident |
|
| 1262 | - * @param $date |
|
| 1263 | - * @return array the spotter information |
|
| 1264 | - */ |
|
| 1265 | - public function getDateArchiveMarineDataByIdent($ident,$date) |
|
| 1266 | - { |
|
| 1256 | + } |
|
| 1257 | + |
|
| 1258 | + /** |
|
| 1259 | + * Gets all the spotter information based on a particular callsign |
|
| 1260 | + * |
|
| 1261 | + * @param $ident |
|
| 1262 | + * @param $date |
|
| 1263 | + * @return array the spotter information |
|
| 1264 | + */ |
|
| 1265 | + public function getDateArchiveMarineDataByIdent($ident,$date) |
|
| 1266 | + { |
|
| 1267 | 1267 | $Marine = new Marine($this->db); |
| 1268 | 1268 | date_default_timezone_set('UTC'); |
| 1269 | 1269 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
@@ -1271,65 +1271,65 @@ discard block |
||
| 1271 | 1271 | $date = date('c',$date); |
| 1272 | 1272 | $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
| 1273 | 1273 | return $spotter_array; |
| 1274 | - } |
|
| 1275 | - |
|
| 1276 | - /** |
|
| 1277 | - * Gets all the spotter information based on the airport |
|
| 1278 | - * |
|
| 1279 | - * @param string $airport |
|
| 1280 | - * @param string $limit |
|
| 1281 | - * @param string $sort |
|
| 1282 | - * @param array $filters |
|
| 1283 | - * @return array the spotter information |
|
| 1284 | - */ |
|
| 1285 | - public function getMarineDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1286 | - { |
|
| 1287 | - global $global_query; |
|
| 1288 | - $Marine = new Marine($this->db); |
|
| 1289 | - date_default_timezone_set('UTC'); |
|
| 1290 | - $query_values = array(); |
|
| 1291 | - $limit_query = ''; |
|
| 1292 | - $additional_query = ''; |
|
| 1293 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1274 | + } |
|
| 1275 | + |
|
| 1276 | + /** |
|
| 1277 | + * Gets all the spotter information based on the airport |
|
| 1278 | + * |
|
| 1279 | + * @param string $airport |
|
| 1280 | + * @param string $limit |
|
| 1281 | + * @param string $sort |
|
| 1282 | + * @param array $filters |
|
| 1283 | + * @return array the spotter information |
|
| 1284 | + */ |
|
| 1285 | + public function getMarineDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1286 | + { |
|
| 1287 | + global $global_query; |
|
| 1288 | + $Marine = new Marine($this->db); |
|
| 1289 | + date_default_timezone_set('UTC'); |
|
| 1290 | + $query_values = array(); |
|
| 1291 | + $limit_query = ''; |
|
| 1292 | + $additional_query = ''; |
|
| 1293 | + $filter_query = $this->getFilter($filters,true,true); |
|
| 1294 | 1294 | |
| 1295 | - if ($airport != "") |
|
| 1296 | - { |
|
| 1297 | - if (!is_string($airport)) |
|
| 1298 | - { |
|
| 1299 | - return array(); |
|
| 1300 | - } else { |
|
| 1301 | - $additional_query .= " AND ((marine_archive_output.departure_airport_icao = :airport) OR (marine_archive_output.arrival_airport_icao = :airport))"; |
|
| 1302 | - $query_values = array(':airport' => $airport); |
|
| 1303 | - } |
|
| 1304 | - } |
|
| 1295 | + if ($airport != "") |
|
| 1296 | + { |
|
| 1297 | + if (!is_string($airport)) |
|
| 1298 | + { |
|
| 1299 | + return array(); |
|
| 1300 | + } else { |
|
| 1301 | + $additional_query .= " AND ((marine_archive_output.departure_airport_icao = :airport) OR (marine_archive_output.arrival_airport_icao = :airport))"; |
|
| 1302 | + $query_values = array(':airport' => $airport); |
|
| 1303 | + } |
|
| 1304 | + } |
|
| 1305 | 1305 | |
| 1306 | - if ($limit != "") |
|
| 1307 | - { |
|
| 1308 | - $limit_array = explode(",", $limit); |
|
| 1306 | + if ($limit != "") |
|
| 1307 | + { |
|
| 1308 | + $limit_array = explode(",", $limit); |
|
| 1309 | 1309 | |
| 1310 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1311 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1310 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1311 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1312 | 1312 | |
| 1313 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1314 | - { |
|
| 1315 | - //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
|
| 1316 | - $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
|
| 1317 | - } |
|
| 1318 | - } |
|
| 1313 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1314 | + { |
|
| 1315 | + //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
|
| 1316 | + $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
|
| 1317 | + } |
|
| 1318 | + } |
|
| 1319 | 1319 | |
| 1320 | - if ($sort != "") |
|
| 1321 | - { |
|
| 1322 | - $search_orderby_array = $Marine->getOrderBy(); |
|
| 1323 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1324 | - } else { |
|
| 1325 | - $orderby_query = " ORDER BY marine_archive_output.date DESC"; |
|
| 1326 | - } |
|
| 1320 | + if ($sort != "") |
|
| 1321 | + { |
|
| 1322 | + $search_orderby_array = $Marine->getOrderBy(); |
|
| 1323 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1324 | + } else { |
|
| 1325 | + $orderby_query = " ORDER BY marine_archive_output.date DESC"; |
|
| 1326 | + } |
|
| 1327 | 1327 | |
| 1328 | - $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; |
|
| 1328 | + $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; |
|
| 1329 | 1329 | |
| 1330 | - $spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query); |
|
| 1330 | + $spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query); |
|
| 1331 | 1331 | |
| 1332 | - return $spotter_array; |
|
| 1333 | - } |
|
| 1332 | + return $spotter_array; |
|
| 1333 | + } |
|
| 1334 | 1334 | } |
| 1335 | 1335 | ?> |
| 1336 | 1336 | \ No newline at end of file |
@@ -23,33 +23,33 @@ discard block |
||
| 23 | 23 | * @param bool $and |
| 24 | 24 | * @return string the SQL part |
| 25 | 25 | */ |
| 26 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 26 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 27 | 27 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 28 | 28 | $filters = array(); |
| 29 | 29 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 30 | 30 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 31 | 31 | $filters = $globalStatsFilters[$globalFilterName]; |
| 32 | 32 | } else { |
| 33 | - $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
|
| 33 | + $filter = array_merge($filter, $globalStatsFilters[$globalFilterName]); |
|
| 34 | 34 | } |
| 35 | 35 | } |
| 36 | 36 | if (isset($filter[0]['source'])) { |
| 37 | - $filters = array_merge($filters,$filter); |
|
| 37 | + $filters = array_merge($filters, $filter); |
|
| 38 | 38 | } |
| 39 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 39 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 40 | 40 | $filter_query_join = ''; |
| 41 | 41 | $filter_query_where = ''; |
| 42 | - foreach($filters as $flt) { |
|
| 42 | + foreach ($filters as $flt) { |
|
| 43 | 43 | if (isset($flt['idents']) && !empty($flt['idents'])) { |
| 44 | 44 | if (isset($flt['source'])) { |
| 45 | - $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.ident IN ('".implode("','",$flt['idents'])."') AND marine_archive_output.format_source IN ('".implode("','",$flt['source'])."')) spid ON spid.fammarine_id = marine_archive.fammarine_id"; |
|
| 45 | + $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.ident IN ('".implode("','", $flt['idents'])."') AND marine_archive_output.format_source IN ('".implode("','", $flt['source'])."')) spid ON spid.fammarine_id = marine_archive.fammarine_id"; |
|
| 46 | 46 | } else { |
| 47 | - $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.ident IN ('".implode("','",$flt['idents'])."')) spid ON spid.fammarine_id = marine_archive.fammarine_id"; |
|
| 47 | + $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.ident IN ('".implode("','", $flt['idents'])."')) spid ON spid.fammarine_id = marine_archive.fammarine_id"; |
|
| 48 | 48 | } |
| 49 | 49 | } |
| 50 | 50 | } |
| 51 | 51 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 52 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 52 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 53 | 53 | } |
| 54 | 54 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 55 | 55 | $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
@@ -77,15 +77,15 @@ discard block |
||
| 77 | 77 | $filter_query_date .= " AND EXTRACT(DAY FROM marine_archive_output.date) = '".$filter['day']."'"; |
| 78 | 78 | } |
| 79 | 79 | } |
| 80 | - $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.fammarine_id = marine_archive.fammarine_id"; |
|
| 80 | + $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.fammarine_id = marine_archive.fammarine_id"; |
|
| 81 | 81 | } |
| 82 | 82 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 83 | - $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 83 | + $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 84 | 84 | } |
| 85 | 85 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 86 | 86 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
| 87 | 87 | if ($filter_query_where != '') { |
| 88 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
| 88 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
| 89 | 89 | } |
| 90 | 90 | $filter_query = $filter_query_join.$filter_query_where; |
| 91 | 91 | return $filter_query; |
@@ -128,21 +128,21 @@ discard block |
||
| 128 | 128 | require_once(dirname(__FILE__).'/class.Marine.php'); |
| 129 | 129 | if ($over_country == '') { |
| 130 | 130 | $Marine = new Marine($this->db); |
| 131 | - $data_country = $Marine->getCountryFromLatitudeLongitude($latitude,$longitude); |
|
| 131 | + $data_country = $Marine->getCountryFromLatitudeLongitude($latitude, $longitude); |
|
| 132 | 132 | if (!empty($data_country)) $country = $data_country['iso2']; |
| 133 | 133 | else $country = ''; |
| 134 | 134 | } else $country = $over_country; |
| 135 | 135 | |
| 136 | 136 | //$country = $over_country; |
| 137 | 137 | // Route is not added in marine_archive |
| 138 | - $query = 'INSERT INTO marine_archive (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, over_country, mmsi, type,type_id,status,status_id,imo,arrival_port_name,arrival_port_date,captain_id,captain_name,race_id,race_name,distance,race_rank,race_time) |
|
| 138 | + $query = 'INSERT INTO marine_archive (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, over_country, mmsi, type,type_id,status,status_id,imo,arrival_port_name,arrival_port_date,captain_id,captain_name,race_id,race_name,distance,race_rank,race_time) |
|
| 139 | 139 | VALUES (:fammarine_id,:ident,:latitude,:longitude,:heading,:groundspeed,:date,:format_source, :source_name, :over_country,:mmsi,:type,:type_id,:status,:status_id,:imo,:arrival_port_name,:arrival_port_date,:captain_id,:captain_name,:race_id,:race_name,:distance,:race_rank,:race_time)'; |
| 140 | - $query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $country,':mmsi' => $mmsi,':type' => $type,':type_id' => $typeid,':status' => $status,':status_id' => $statusid,':imo' => $imo,':arrival_port_name' => $arrival_code,':arrival_port_date' => $arrival_date,':captain_id' => $captain_id,':captain_name' => $captain_name,':race_id' => $race_id,':race_name' => $race_name,':distance' => $distance,':race_rank' => $race_rank,':race_time' => $race_time); |
|
| 140 | + $query_values = array(':fammarine_id' => $fammarine_id, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $country, ':mmsi' => $mmsi, ':type' => $type, ':type_id' => $typeid, ':status' => $status, ':status_id' => $statusid, ':imo' => $imo, ':arrival_port_name' => $arrival_code, ':arrival_port_date' => $arrival_date, ':captain_id' => $captain_id, ':captain_name' => $captain_name, ':race_id' => $race_id, ':race_name' => $race_name, ':distance' => $distance, ':race_rank' => $race_rank, ':race_time' => $race_time); |
|
| 141 | 141 | try { |
| 142 | 142 | $sth = $this->db->prepare($query); |
| 143 | 143 | $sth->execute($query_values); |
| 144 | 144 | $sth->closeCursor(); |
| 145 | - } catch(PDOException $e) { |
|
| 145 | + } catch (PDOException $e) { |
|
| 146 | 146 | return "error : ".$e->getMessage(); |
| 147 | 147 | } |
| 148 | 148 | return "success"; |
@@ -162,8 +162,8 @@ discard block |
||
| 162 | 162 | |
| 163 | 163 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 164 | 164 | //$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"; |
| 165 | - $query = "SELECT marine_archive.* FROM marine_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 166 | - $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident)); |
|
| 165 | + $query = "SELECT marine_archive.* FROM marine_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 166 | + $spotter_array = $Marine->getDataFromDB($query, array(':ident' => $ident)); |
|
| 167 | 167 | return $spotter_array; |
| 168 | 168 | } |
| 169 | 169 | |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 182 | 182 | //$query = MarineArchive->$global_query." WHERE marine_archive.fammarine_id = :id"; |
| 183 | 183 | //$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"; |
| 184 | - $query = "SELECT * FROM marine_archive WHERE fammarine_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 184 | + $query = "SELECT * FROM marine_archive WHERE fammarine_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 185 | 185 | |
| 186 | 186 | // $spotter_array = Marine->getDataFromDB($query,array(':id' => $id)); |
| 187 | 187 | /* |
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | } |
| 195 | 195 | $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC); |
| 196 | 196 | */ |
| 197 | - $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id)); |
|
| 197 | + $spotter_array = $Marine->getDataFromDB($query, array(':id' => $id)); |
|
| 198 | 198 | return $spotter_array; |
| 199 | 199 | } |
| 200 | 200 | |
@@ -208,14 +208,14 @@ discard block |
||
| 208 | 208 | { |
| 209 | 209 | date_default_timezone_set('UTC'); |
| 210 | 210 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 211 | - $query = $this->global_query." WHERE marine_archive.fammarine_id = :id ORDER BY date"; |
|
| 211 | + $query = $this->global_query." WHERE marine_archive.fammarine_id = :id ORDER BY date"; |
|
| 212 | 212 | |
| 213 | 213 | // $spotter_array = Marine->getDataFromDB($query,array(':id' => $id)); |
| 214 | 214 | |
| 215 | 215 | try { |
| 216 | 216 | $sth = $this->db->prepare($query); |
| 217 | 217 | $sth->execute(array(':id' => $id)); |
| 218 | - } catch(PDOException $e) { |
|
| 218 | + } catch (PDOException $e) { |
|
| 219 | 219 | echo $e->getMessage(); |
| 220 | 220 | die; |
| 221 | 221 | } |
@@ -233,14 +233,14 @@ discard block |
||
| 233 | 233 | { |
| 234 | 234 | date_default_timezone_set('UTC'); |
| 235 | 235 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 236 | - $query = "SELECT marine_archive.latitude, marine_archive.longitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id"; |
|
| 236 | + $query = "SELECT marine_archive.latitude, marine_archive.longitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id"; |
|
| 237 | 237 | |
| 238 | 238 | // $spotter_array = Marine->getDataFromDB($query,array(':id' => $id)); |
| 239 | 239 | |
| 240 | 240 | try { |
| 241 | 241 | $sth = $this->db->prepare($query); |
| 242 | 242 | $sth->execute(array(':id' => $id)); |
| 243 | - } catch(PDOException $e) { |
|
| 243 | + } catch (PDOException $e) { |
|
| 244 | 244 | echo $e->getMessage(); |
| 245 | 245 | die; |
| 246 | 246 | } |
@@ -262,12 +262,12 @@ discard block |
||
| 262 | 262 | date_default_timezone_set('UTC'); |
| 263 | 263 | |
| 264 | 264 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 265 | - $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"; |
|
| 265 | + $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"; |
|
| 266 | 266 | |
| 267 | 267 | try { |
| 268 | 268 | $sth = $this->db->prepare($query); |
| 269 | 269 | $sth->execute(array(':ident' => $ident)); |
| 270 | - } catch(PDOException $e) { |
|
| 270 | + } catch (PDOException $e) { |
|
| 271 | 271 | echo $e->getMessage(); |
| 272 | 272 | die; |
| 273 | 273 | } |
@@ -288,12 +288,12 @@ discard block |
||
| 288 | 288 | date_default_timezone_set('UTC'); |
| 289 | 289 | |
| 290 | 290 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 291 | - $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"; |
|
| 291 | + $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"; |
|
| 292 | 292 | |
| 293 | 293 | try { |
| 294 | 294 | $sth = $this->db->prepare($query); |
| 295 | 295 | $sth->execute(array(':id' => $id)); |
| 296 | - } catch(PDOException $e) { |
|
| 296 | + } catch (PDOException $e) { |
|
| 297 | 297 | echo $e->getMessage(); |
| 298 | 298 | die; |
| 299 | 299 | } |
@@ -313,12 +313,12 @@ discard block |
||
| 313 | 313 | date_default_timezone_set('UTC'); |
| 314 | 314 | |
| 315 | 315 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 316 | - $query = "SELECT marine_archive.altitude, marine_archive.ground_speed, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id ORDER BY date"; |
|
| 316 | + $query = "SELECT marine_archive.altitude, marine_archive.ground_speed, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id ORDER BY date"; |
|
| 317 | 317 | |
| 318 | 318 | try { |
| 319 | 319 | $sth = $this->db->prepare($query); |
| 320 | 320 | $sth->execute(array(':id' => $id)); |
| 321 | - } catch(PDOException $e) { |
|
| 321 | + } catch (PDOException $e) { |
|
| 322 | 322 | echo $e->getMessage(); |
| 323 | 323 | die; |
| 324 | 324 | } |
@@ -340,13 +340,13 @@ discard block |
||
| 340 | 340 | date_default_timezone_set('UTC'); |
| 341 | 341 | |
| 342 | 342 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 343 | - $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"; |
|
| 343 | + $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"; |
|
| 344 | 344 | // $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident"; |
| 345 | 345 | |
| 346 | 346 | try { |
| 347 | 347 | $sth = $this->db->prepare($query); |
| 348 | 348 | $sth->execute(array(':ident' => $ident)); |
| 349 | - } catch(PDOException $e) { |
|
| 349 | + } catch (PDOException $e) { |
|
| 350 | 350 | echo $e->getMessage(); |
| 351 | 351 | die; |
| 352 | 352 | } |
@@ -364,12 +364,12 @@ discard block |
||
| 364 | 364 | * @param $date |
| 365 | 365 | * @return array the spotter information |
| 366 | 366 | */ |
| 367 | - public function getMarineArchiveData($ident,$fammarine_id,$date) |
|
| 367 | + public function getMarineArchiveData($ident, $fammarine_id, $date) |
|
| 368 | 368 | { |
| 369 | 369 | $Marine = new Marine($this->db); |
| 370 | 370 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 371 | 371 | $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"; |
| 372 | - $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':fammarine_id' => $fammarine_id,':date' => $date.'%')); |
|
| 372 | + $spotter_array = $Marine->getDataFromDB($query, array(':ident' => $ident, ':fammarine_id' => $fammarine_id, ':date' => $date.'%')); |
|
| 373 | 373 | return $spotter_array; |
| 374 | 374 | } |
| 375 | 375 | |
@@ -388,7 +388,7 @@ discard block |
||
| 388 | 388 | try { |
| 389 | 389 | $sth = $this->db->prepare($query); |
| 390 | 390 | $sth->execute(); |
| 391 | - } catch(PDOException $e) { |
|
| 391 | + } catch (PDOException $e) { |
|
| 392 | 392 | echo $e->getMessage(); |
| 393 | 393 | die; |
| 394 | 394 | } |
@@ -402,24 +402,24 @@ discard block |
||
| 402 | 402 | * @param array $filter |
| 403 | 403 | * @return array the spotter information |
| 404 | 404 | */ |
| 405 | - public function getMinLiveMarineData($begindate,$enddate,$filter = array()) |
|
| 405 | + public function getMinLiveMarineData($begindate, $enddate, $filter = array()) |
|
| 406 | 406 | { |
| 407 | 407 | global $globalDBdriver; |
| 408 | 408 | date_default_timezone_set('UTC'); |
| 409 | 409 | |
| 410 | 410 | $filter_query = ''; |
| 411 | 411 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 412 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 412 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 413 | 413 | } |
| 414 | 414 | // Use spotter_output also ? |
| 415 | 415 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 416 | - $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 "; |
|
| 416 | + $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 "; |
|
| 417 | 417 | } |
| 418 | 418 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 419 | 419 | $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 "; |
| 420 | 420 | } |
| 421 | 421 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 422 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 422 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 423 | 423 | } |
| 424 | 424 | |
| 425 | 425 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -438,14 +438,14 @@ discard block |
||
| 438 | 438 | GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id |
| 439 | 439 | AND marine_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive.aircraft_icao = a.icao'; |
| 440 | 440 | */ |
| 441 | - $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 |
|
| 441 | + $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 |
|
| 442 | 442 | FROM marine_archive |
| 443 | 443 | INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao |
| 444 | 444 | WHERE marine_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' |
| 445 | 445 | '.$filter_query.' ORDER BY fammarine_id'; |
| 446 | 446 | } else { |
| 447 | 447 | //$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'; |
| 448 | - $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 |
|
| 448 | + $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 |
|
| 449 | 449 | FROM marine_archive |
| 450 | 450 | INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao |
| 451 | 451 | WHERE marine_archive.date >= '."'".$begindate."'".' AND marine_archive.date <= '."'".$enddate."'".' |
@@ -455,7 +455,7 @@ discard block |
||
| 455 | 455 | try { |
| 456 | 456 | $sth = $this->db->prepare($query); |
| 457 | 457 | $sth->execute(); |
| 458 | - } catch(PDOException $e) { |
|
| 458 | + } catch (PDOException $e) { |
|
| 459 | 459 | echo $e->getMessage(); |
| 460 | 460 | die; |
| 461 | 461 | } |
@@ -472,24 +472,24 @@ discard block |
||
| 472 | 472 | * @param array $filter |
| 473 | 473 | * @return array the spotter information |
| 474 | 474 | */ |
| 475 | - public function getMinLiveMarineDataPlayback($begindate,$enddate,$filter = array()) |
|
| 475 | + public function getMinLiveMarineDataPlayback($begindate, $enddate, $filter = array()) |
|
| 476 | 476 | { |
| 477 | 477 | global $globalDBdriver; |
| 478 | 478 | date_default_timezone_set('UTC'); |
| 479 | 479 | |
| 480 | 480 | $filter_query = ''; |
| 481 | 481 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 482 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 482 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 483 | 483 | } |
| 484 | 484 | // Should use spotter_output also ? |
| 485 | 485 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 486 | - $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 "; |
|
| 486 | + $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 "; |
|
| 487 | 487 | } |
| 488 | 488 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 489 | 489 | $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 "; |
| 490 | 490 | } |
| 491 | 491 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 492 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 492 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 493 | 493 | } |
| 494 | 494 | |
| 495 | 495 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -499,7 +499,7 @@ discard block |
||
| 499 | 499 | FROM marine_archive |
| 500 | 500 | 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'; |
| 501 | 501 | */ |
| 502 | - $query = 'SELECT a.aircraft_shadow, 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 |
|
| 502 | + $query = 'SELECT a.aircraft_shadow, 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 |
|
| 503 | 503 | FROM marine_archive_output |
| 504 | 504 | LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive_output.aircraft_icao = a.icao |
| 505 | 505 | WHERE (marine_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') |
@@ -514,7 +514,7 @@ discard block |
||
| 514 | 514 | WHERE marine_archive_output.date >= '."'".$begindate."'".' AND marine_archive_output.date <= '."'".$enddate."'".' |
| 515 | 515 | '.$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'; |
| 516 | 516 | */ |
| 517 | - $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 |
|
| 517 | + $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 |
|
| 518 | 518 | FROM marine_archive_output |
| 519 | 519 | INNER JOIN (SELECT * FROM aircraft) a on marine_archive_output.aircraft_icao = a.icao |
| 520 | 520 | WHERE marine_archive_output.date >= '."'".$begindate."'".' AND marine_archive_output.date <= '."'".$enddate."'".' |
@@ -526,7 +526,7 @@ discard block |
||
| 526 | 526 | try { |
| 527 | 527 | $sth = $this->db->prepare($query); |
| 528 | 528 | $sth->execute(); |
| 529 | - } catch(PDOException $e) { |
|
| 529 | + } catch (PDOException $e) { |
|
| 530 | 530 | echo $e->getMessage(); |
| 531 | 531 | die; |
| 532 | 532 | } |
@@ -543,23 +543,23 @@ discard block |
||
| 543 | 543 | * @param array $filter |
| 544 | 544 | * @return array the spotter information |
| 545 | 545 | */ |
| 546 | - public function getLiveMarineCount($begindate,$enddate,$filter = array()) |
|
| 546 | + public function getLiveMarineCount($begindate, $enddate, $filter = array()) |
|
| 547 | 547 | { |
| 548 | 548 | global $globalDBdriver, $globalLiveInterval; |
| 549 | 549 | date_default_timezone_set('UTC'); |
| 550 | 550 | |
| 551 | 551 | $filter_query = ''; |
| 552 | 552 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 553 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 553 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 554 | 554 | } |
| 555 | 555 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 556 | - $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id "; |
|
| 556 | + $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 "; |
|
| 557 | 557 | } |
| 558 | 558 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 559 | 559 | $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 "; |
| 560 | 560 | } |
| 561 | 561 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 562 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 562 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 563 | 563 | } |
| 564 | 564 | |
| 565 | 565 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -574,7 +574,7 @@ discard block |
||
| 574 | 574 | try { |
| 575 | 575 | $sth = $this->db->prepare($query); |
| 576 | 576 | $sth->execute(); |
| 577 | - } catch(PDOException $e) { |
|
| 577 | + } catch (PDOException $e) { |
|
| 578 | 578 | echo $e->getMessage(); |
| 579 | 579 | die; |
| 580 | 580 | } |
@@ -617,7 +617,7 @@ discard block |
||
| 617 | 617 | * @param array $filters |
| 618 | 618 | * @return array the spotter information |
| 619 | 619 | */ |
| 620 | - 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()) |
|
| 620 | + 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()) |
|
| 621 | 621 | { |
| 622 | 622 | global $globalTimezone, $globalDBdriver; |
| 623 | 623 | require_once(dirname(__FILE__).'/class.Translation.php'); |
@@ -638,7 +638,7 @@ discard block |
||
| 638 | 638 | } else { |
| 639 | 639 | $q_array = explode(" ", $q); |
| 640 | 640 | |
| 641 | - foreach ($q_array as $q_item){ |
|
| 641 | + foreach ($q_array as $q_item) { |
|
| 642 | 642 | $additional_query .= " AND ("; |
| 643 | 643 | $additional_query .= "(marine_archive_output.spotter_id like '%".$q_item."%') OR "; |
| 644 | 644 | $additional_query .= "(marine_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
@@ -670,7 +670,7 @@ discard block |
||
| 670 | 670 | |
| 671 | 671 | if ($registration != "") |
| 672 | 672 | { |
| 673 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 673 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 674 | 674 | if (!is_string($registration)) |
| 675 | 675 | { |
| 676 | 676 | return array(); |
@@ -681,7 +681,7 @@ discard block |
||
| 681 | 681 | |
| 682 | 682 | if ($aircraft_icao != "") |
| 683 | 683 | { |
| 684 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 684 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 685 | 685 | if (!is_string($aircraft_icao)) |
| 686 | 686 | { |
| 687 | 687 | return array(); |
@@ -692,7 +692,7 @@ discard block |
||
| 692 | 692 | |
| 693 | 693 | if ($aircraft_manufacturer != "") |
| 694 | 694 | { |
| 695 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 695 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 696 | 696 | if (!is_string($aircraft_manufacturer)) |
| 697 | 697 | { |
| 698 | 698 | return array(); |
@@ -713,7 +713,7 @@ discard block |
||
| 713 | 713 | |
| 714 | 714 | if ($airline_icao != "") |
| 715 | 715 | { |
| 716 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 716 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 717 | 717 | if (!is_string($airline_icao)) |
| 718 | 718 | { |
| 719 | 719 | return array(); |
@@ -724,7 +724,7 @@ discard block |
||
| 724 | 724 | |
| 725 | 725 | if ($airline_country != "") |
| 726 | 726 | { |
| 727 | - $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 727 | + $airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING); |
|
| 728 | 728 | if (!is_string($airline_country)) |
| 729 | 729 | { |
| 730 | 730 | return array(); |
@@ -735,7 +735,7 @@ discard block |
||
| 735 | 735 | |
| 736 | 736 | if ($airline_type != "") |
| 737 | 737 | { |
| 738 | - $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 738 | + $airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING); |
|
| 739 | 739 | if (!is_string($airline_type)) |
| 740 | 740 | { |
| 741 | 741 | return array(); |
@@ -757,7 +757,7 @@ discard block |
||
| 757 | 757 | |
| 758 | 758 | if ($airport != "") |
| 759 | 759 | { |
| 760 | - $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 760 | + $airport = filter_var($airport, FILTER_SANITIZE_STRING); |
|
| 761 | 761 | if (!is_string($airport)) |
| 762 | 762 | { |
| 763 | 763 | return array(); |
@@ -768,7 +768,7 @@ discard block |
||
| 768 | 768 | |
| 769 | 769 | if ($airport_country != "") |
| 770 | 770 | { |
| 771 | - $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 771 | + $airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING); |
|
| 772 | 772 | if (!is_string($airport_country)) |
| 773 | 773 | { |
| 774 | 774 | return array(); |
@@ -779,7 +779,7 @@ discard block |
||
| 779 | 779 | |
| 780 | 780 | if ($callsign != "") |
| 781 | 781 | { |
| 782 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 782 | + $callsign = filter_var($callsign, FILTER_SANITIZE_STRING); |
|
| 783 | 783 | if (!is_string($callsign)) |
| 784 | 784 | { |
| 785 | 785 | return array(); |
@@ -787,7 +787,7 @@ discard block |
||
| 787 | 787 | $translate = $Translation->ident2icao($callsign); |
| 788 | 788 | if ($translate != $callsign) { |
| 789 | 789 | $additional_query .= " AND (marine_archive_output.ident = :callsign OR marine_archive_output.ident = :translate)"; |
| 790 | - $query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate)); |
|
| 790 | + $query_values = array_merge($query_values, array(':callsign' => $callsign, ':translate' => $translate)); |
|
| 791 | 791 | } else { |
| 792 | 792 | $additional_query .= " AND (marine_archive_output.ident = '".$callsign."')"; |
| 793 | 793 | } |
@@ -796,7 +796,7 @@ discard block |
||
| 796 | 796 | |
| 797 | 797 | if ($owner != "") |
| 798 | 798 | { |
| 799 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 799 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 800 | 800 | if (!is_string($owner)) |
| 801 | 801 | { |
| 802 | 802 | return array(); |
@@ -807,7 +807,7 @@ discard block |
||
| 807 | 807 | |
| 808 | 808 | if ($pilot_name != "") |
| 809 | 809 | { |
| 810 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 810 | + $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING); |
|
| 811 | 811 | if (!is_string($pilot_name)) |
| 812 | 812 | { |
| 813 | 813 | return array(); |
@@ -818,7 +818,7 @@ discard block |
||
| 818 | 818 | |
| 819 | 819 | if ($pilot_id != "") |
| 820 | 820 | { |
| 821 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 821 | + $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT); |
|
| 822 | 822 | if (!is_string($pilot_id)) |
| 823 | 823 | { |
| 824 | 824 | return array(); |
@@ -829,7 +829,7 @@ discard block |
||
| 829 | 829 | |
| 830 | 830 | if ($departure_airport_route != "") |
| 831 | 831 | { |
| 832 | - $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 832 | + $departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING); |
|
| 833 | 833 | if (!is_string($departure_airport_route)) |
| 834 | 834 | { |
| 835 | 835 | return array(); |
@@ -840,7 +840,7 @@ discard block |
||
| 840 | 840 | |
| 841 | 841 | if ($arrival_airport_route != "") |
| 842 | 842 | { |
| 843 | - $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 843 | + $arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING); |
|
| 844 | 844 | if (!is_string($arrival_airport_route)) |
| 845 | 845 | { |
| 846 | 846 | return array(); |
@@ -853,8 +853,8 @@ discard block |
||
| 853 | 853 | { |
| 854 | 854 | $altitude_array = explode(",", $altitude); |
| 855 | 855 | |
| 856 | - $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 857 | - $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 856 | + $altitude_array[0] = filter_var($altitude_array[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 857 | + $altitude_array[1] = filter_var($altitude_array[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 858 | 858 | |
| 859 | 859 | |
| 860 | 860 | if ($altitude_array[1] != "") |
@@ -872,8 +872,8 @@ discard block |
||
| 872 | 872 | { |
| 873 | 873 | $date_array = explode(",", $date_posted); |
| 874 | 874 | |
| 875 | - $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 876 | - $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 875 | + $date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING); |
|
| 876 | + $date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING); |
|
| 877 | 877 | |
| 878 | 878 | if ($globalTimezone != '') { |
| 879 | 879 | date_default_timezone_set($globalTimezone); |
@@ -905,8 +905,8 @@ discard block |
||
| 905 | 905 | { |
| 906 | 906 | $limit_array = explode(",", $limit); |
| 907 | 907 | |
| 908 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 909 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 908 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 909 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 910 | 910 | |
| 911 | 911 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 912 | 912 | { |
@@ -917,8 +917,8 @@ discard block |
||
| 917 | 917 | |
| 918 | 918 | |
| 919 | 919 | if ($origLat != "" && $origLon != "" && $dist != "") { |
| 920 | - $dist = number_format($dist*0.621371,2,'.',''); |
|
| 921 | - $query="SELECT marine_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(marine_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(marine_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
| 920 | + $dist = number_format($dist*0.621371, 2, '.', ''); |
|
| 921 | + $query = "SELECT marine_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(marine_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(marine_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
| 922 | 922 | FROM marine_archive_output, marine_archive WHERE spotter_output_archive.fammarine_id = marine_archive.fammarine_id AND spotter_output.ident <> '' ".$additional_query."AND CAST(marine_archive.longitude as double precision) between ($origLon-$dist/ABS(cos(radians($origLat))*69)) and ($origLon+$dist/ABS(cos(radians($origLat))*69)) and CAST(marine_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) |
| 923 | 923 | AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(marine_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(marine_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query." ORDER BY distance"; |
| 924 | 924 | } else { |
@@ -935,12 +935,12 @@ discard block |
||
| 935 | 935 | $additional_query .= " AND (marine_archive_output.waypoints <> '')"; |
| 936 | 936 | } |
| 937 | 937 | |
| 938 | - $query = "SELECT marine_archive_output.* FROM marine_archive_output |
|
| 938 | + $query = "SELECT marine_archive_output.* FROM marine_archive_output |
|
| 939 | 939 | WHERE marine_archive_output.ident <> '' |
| 940 | 940 | ".$additional_query." |
| 941 | 941 | ".$filter_query.$orderby_query; |
| 942 | 942 | } |
| 943 | - $spotter_array = $Marine->getDataFromDB($query, $query_values,$limit_query); |
|
| 943 | + $spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query); |
|
| 944 | 944 | |
| 945 | 945 | return $spotter_array; |
| 946 | 946 | } |
@@ -957,7 +957,7 @@ discard block |
||
| 957 | 957 | try { |
| 958 | 958 | $sth = $this->db->prepare($query); |
| 959 | 959 | $sth->execute(); |
| 960 | - } catch(PDOException $e) { |
|
| 960 | + } catch (PDOException $e) { |
|
| 961 | 961 | return "error"; |
| 962 | 962 | } |
| 963 | 963 | return ''; |
@@ -997,8 +997,8 @@ discard block |
||
| 997 | 997 | { |
| 998 | 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 | 1003 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1004 | 1004 | { |
@@ -1042,7 +1042,7 @@ discard block |
||
| 1042 | 1042 | $query_values = array(); |
| 1043 | 1043 | $limit_query = ''; |
| 1044 | 1044 | $additional_query = ''; |
| 1045 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 1045 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 1046 | 1046 | |
| 1047 | 1047 | if ($owner != "") |
| 1048 | 1048 | { |
@@ -1059,8 +1059,8 @@ discard block |
||
| 1059 | 1059 | { |
| 1060 | 1060 | $limit_array = explode(",", $limit); |
| 1061 | 1061 | |
| 1062 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1063 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1062 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1063 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1064 | 1064 | |
| 1065 | 1065 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1066 | 1066 | { |
@@ -1103,7 +1103,7 @@ discard block |
||
| 1103 | 1103 | $query_values = array(); |
| 1104 | 1104 | $limit_query = ''; |
| 1105 | 1105 | $additional_query = ''; |
| 1106 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 1106 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 1107 | 1107 | |
| 1108 | 1108 | if ($pilot != "") |
| 1109 | 1109 | { |
@@ -1115,8 +1115,8 @@ discard block |
||
| 1115 | 1115 | { |
| 1116 | 1116 | $limit_array = explode(",", $limit); |
| 1117 | 1117 | |
| 1118 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1119 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1118 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1119 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1120 | 1120 | |
| 1121 | 1121 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1122 | 1122 | { |
@@ -1148,7 +1148,7 @@ discard block |
||
| 1148 | 1148 | * @param string $sincedate |
| 1149 | 1149 | * @return array the airline country list |
| 1150 | 1150 | */ |
| 1151 | - public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1151 | + public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '') |
|
| 1152 | 1152 | { |
| 1153 | 1153 | global $globalDBdriver; |
| 1154 | 1154 | /* |
@@ -1177,7 +1177,7 @@ discard block |
||
| 1177 | 1177 | $flight_array = array(); |
| 1178 | 1178 | $temp_array = array(); |
| 1179 | 1179 | |
| 1180 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1180 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1181 | 1181 | { |
| 1182 | 1182 | $temp_array['flight_count'] = $row['nb']; |
| 1183 | 1183 | $temp_array['flight_country'] = $row['name']; |
@@ -1196,7 +1196,7 @@ discard block |
||
| 1196 | 1196 | * @param string $sincedate |
| 1197 | 1197 | * @return array the airline country list |
| 1198 | 1198 | */ |
| 1199 | - public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1199 | + public function countAllFlightOverCountriesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '') |
|
| 1200 | 1200 | { |
| 1201 | 1201 | global $globalDBdriver; |
| 1202 | 1202 | /* |
@@ -1225,7 +1225,7 @@ discard block |
||
| 1225 | 1225 | $flight_array = array(); |
| 1226 | 1226 | $temp_array = array(); |
| 1227 | 1227 | |
| 1228 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1228 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1229 | 1229 | { |
| 1230 | 1230 | $temp_array['airline_icao'] = $row['airline_icao']; |
| 1231 | 1231 | $temp_array['flight_count'] = $row['nb']; |
@@ -1244,14 +1244,14 @@ discard block |
||
| 1244 | 1244 | * @param $date |
| 1245 | 1245 | * @return array the spotter information |
| 1246 | 1246 | */ |
| 1247 | - public function getDateArchiveMarineDataById($id,$date) |
|
| 1247 | + public function getDateArchiveMarineDataById($id, $date) |
|
| 1248 | 1248 | { |
| 1249 | 1249 | $Marine = new Marine($this->db); |
| 1250 | 1250 | date_default_timezone_set('UTC'); |
| 1251 | 1251 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 1252 | 1252 | $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 AND l.date <= :date GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate ORDER BY marine_archive.date DESC'; |
| 1253 | - $date = date('c',$date); |
|
| 1254 | - $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id,':date' => $date)); |
|
| 1253 | + $date = date('c', $date); |
|
| 1254 | + $spotter_array = $Marine->getDataFromDB($query, array(':id' => $id, ':date' => $date)); |
|
| 1255 | 1255 | return $spotter_array; |
| 1256 | 1256 | } |
| 1257 | 1257 | |
@@ -1262,14 +1262,14 @@ discard block |
||
| 1262 | 1262 | * @param $date |
| 1263 | 1263 | * @return array the spotter information |
| 1264 | 1264 | */ |
| 1265 | - public function getDateArchiveMarineDataByIdent($ident,$date) |
|
| 1265 | + public function getDateArchiveMarineDataByIdent($ident, $date) |
|
| 1266 | 1266 | { |
| 1267 | 1267 | $Marine = new Marine($this->db); |
| 1268 | 1268 | date_default_timezone_set('UTC'); |
| 1269 | 1269 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 1270 | 1270 | $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 AND l.date <= :date GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate ORDER BY marine_archive.date DESC'; |
| 1271 | - $date = date('c',$date); |
|
| 1272 | - $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
|
| 1271 | + $date = date('c', $date); |
|
| 1272 | + $spotter_array = $Marine->getDataFromDB($query, array(':ident' => $ident, ':date' => $date)); |
|
| 1273 | 1273 | return $spotter_array; |
| 1274 | 1274 | } |
| 1275 | 1275 | |
@@ -1282,7 +1282,7 @@ discard block |
||
| 1282 | 1282 | * @param array $filters |
| 1283 | 1283 | * @return array the spotter information |
| 1284 | 1284 | */ |
| 1285 | - public function getMarineDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1285 | + public function getMarineDataByAirport($airport = '', $limit = '', $sort = '', $filters = array()) |
|
| 1286 | 1286 | { |
| 1287 | 1287 | global $global_query; |
| 1288 | 1288 | $Marine = new Marine($this->db); |
@@ -1290,7 +1290,7 @@ discard block |
||
| 1290 | 1290 | $query_values = array(); |
| 1291 | 1291 | $limit_query = ''; |
| 1292 | 1292 | $additional_query = ''; |
| 1293 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1293 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1294 | 1294 | |
| 1295 | 1295 | if ($airport != "") |
| 1296 | 1296 | { |
@@ -1307,8 +1307,8 @@ discard block |
||
| 1307 | 1307 | { |
| 1308 | 1308 | $limit_array = explode(",", $limit); |
| 1309 | 1309 | |
| 1310 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1311 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1310 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1311 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1312 | 1312 | |
| 1313 | 1313 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1314 | 1314 | { |
@@ -1784,7 +1784,7 @@ discard block |
||
| 1784 | 1784 | /** |
| 1785 | 1785 | * Counts all hours |
| 1786 | 1786 | * |
| 1787 | - * @param $orderby |
|
| 1787 | + * @param string $orderby |
|
| 1788 | 1788 | * @param array $filters |
| 1789 | 1789 | * @return array the hour list |
| 1790 | 1790 | */ |
@@ -2263,7 +2263,7 @@ discard block |
||
| 2263 | 2263 | /** |
| 2264 | 2264 | * Parses the direction degrees to working |
| 2265 | 2265 | * |
| 2266 | - * @param Float $direction the direction in degrees |
|
| 2266 | + * @param integer $direction the direction in degrees |
|
| 2267 | 2267 | * @return array the direction information |
| 2268 | 2268 | * |
| 2269 | 2269 | */ |
@@ -20,13 +20,13 @@ discard block |
||
| 20 | 20 | if ($this->db === null) die('Error: No DB connection. (Tracker)'); |
| 21 | 21 | } |
| 22 | 22 | |
| 23 | - /** |
|
| 24 | - * Get SQL query part for filter used |
|
| 25 | - * @param array $filter the filter |
|
| 26 | - * @param bool $where |
|
| 27 | - * @param bool $and |
|
| 28 | - * @return string the SQL part |
|
| 29 | - */ |
|
| 23 | + /** |
|
| 24 | + * Get SQL query part for filter used |
|
| 25 | + * @param array $filter the filter |
|
| 26 | + * @param bool $where |
|
| 27 | + * @param bool $and |
|
| 28 | + * @return string the SQL part |
|
| 29 | + */ |
|
| 30 | 30 | |
| 31 | 31 | public function getFilter($filter = array(),$where = false,$and = false) { |
| 32 | 32 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
@@ -92,15 +92,15 @@ discard block |
||
| 92 | 92 | return $filter_query; |
| 93 | 93 | } |
| 94 | 94 | |
| 95 | - /** |
|
| 96 | - * Executes the SQL statements to get the tracker information |
|
| 97 | - * |
|
| 98 | - * @param String $query the SQL query |
|
| 99 | - * @param array $params parameter of the query |
|
| 100 | - * @param String $limitQuery the limit query |
|
| 101 | - * @param bool $schedules |
|
| 102 | - * @return array the tracker information |
|
| 103 | - */ |
|
| 95 | + /** |
|
| 96 | + * Executes the SQL statements to get the tracker information |
|
| 97 | + * |
|
| 98 | + * @param String $query the SQL query |
|
| 99 | + * @param array $params parameter of the query |
|
| 100 | + * @param String $limitQuery the limit query |
|
| 101 | + * @param bool $schedules |
|
| 102 | + * @return array the tracker information |
|
| 103 | + */ |
|
| 104 | 104 | public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false) |
| 105 | 105 | { |
| 106 | 106 | date_default_timezone_set('UTC'); |
@@ -212,14 +212,14 @@ discard block |
||
| 212 | 212 | } |
| 213 | 213 | |
| 214 | 214 | |
| 215 | - /** |
|
| 216 | - * Gets all the tracker information based on the latest data entry |
|
| 217 | - * |
|
| 218 | - * @param string $limit |
|
| 219 | - * @param string $sort |
|
| 220 | - * @param array $filter |
|
| 221 | - * @return array the tracker information |
|
| 222 | - */ |
|
| 215 | + /** |
|
| 216 | + * Gets all the tracker information based on the latest data entry |
|
| 217 | + * |
|
| 218 | + * @param string $limit |
|
| 219 | + * @param string $sort |
|
| 220 | + * @param array $filter |
|
| 221 | + * @return array the tracker information |
|
| 222 | + */ |
|
| 223 | 223 | public function getLatestTrackerData($limit = '', $sort = '', $filter = array()) |
| 224 | 224 | { |
| 225 | 225 | global $global_tracker_query; |
@@ -276,15 +276,15 @@ discard block |
||
| 276 | 276 | return $tracker_array; |
| 277 | 277 | } |
| 278 | 278 | |
| 279 | - /** |
|
| 280 | - * Gets all the tracker information based on the callsign |
|
| 281 | - * |
|
| 282 | - * @param string $ident |
|
| 283 | - * @param string $limit |
|
| 284 | - * @param string $sort |
|
| 285 | - * @param array $filter |
|
| 286 | - * @return array the tracker information |
|
| 287 | - */ |
|
| 279 | + /** |
|
| 280 | + * Gets all the tracker information based on the callsign |
|
| 281 | + * |
|
| 282 | + * @param string $ident |
|
| 283 | + * @param string $limit |
|
| 284 | + * @param string $sort |
|
| 285 | + * @param array $filter |
|
| 286 | + * @return array the tracker information |
|
| 287 | + */ |
|
| 288 | 288 | public function getTrackerDataByIdent($ident = '', $limit = '', $sort = '', $filter = array()) |
| 289 | 289 | { |
| 290 | 290 | global $global_tracker_query; |
@@ -393,13 +393,13 @@ discard block |
||
| 393 | 393 | } |
| 394 | 394 | |
| 395 | 395 | |
| 396 | - /** |
|
| 397 | - * Gets all source name |
|
| 398 | - * |
|
| 399 | - * @param String type format of source |
|
| 400 | - * @param array $filters |
|
| 401 | - * @return array list of source name |
|
| 402 | - */ |
|
| 396 | + /** |
|
| 397 | + * Gets all source name |
|
| 398 | + * |
|
| 399 | + * @param String type format of source |
|
| 400 | + * @param array $filters |
|
| 401 | + * @return array list of source name |
|
| 402 | + */ |
|
| 403 | 403 | public function getAllSourceName($type = '',$filters = array()) |
| 404 | 404 | { |
| 405 | 405 | $filter_query = $this->getFilter($filters,true,true); |
@@ -428,12 +428,12 @@ discard block |
||
| 428 | 428 | } |
| 429 | 429 | |
| 430 | 430 | |
| 431 | - /** |
|
| 432 | - * Gets a list of all idents/callsigns |
|
| 433 | - * |
|
| 434 | - * @param array $filters |
|
| 435 | - * @return array list of ident/callsign names |
|
| 436 | - */ |
|
| 431 | + /** |
|
| 432 | + * Gets a list of all idents/callsigns |
|
| 433 | + * |
|
| 434 | + * @param array $filters |
|
| 435 | + * @return array list of ident/callsign names |
|
| 436 | + */ |
|
| 437 | 437 | public function getAllIdents($filters = array()) |
| 438 | 438 | { |
| 439 | 439 | $filter_query = $this->getFilter($filters,true,true); |
@@ -500,19 +500,19 @@ discard block |
||
| 500 | 500 | } |
| 501 | 501 | |
| 502 | 502 | |
| 503 | - /** |
|
| 504 | - * Update ident tracker data |
|
| 505 | - * |
|
| 506 | - * @param string $famtrackid |
|
| 507 | - * @param String $ident the flight ident |
|
| 508 | - * @param null $fromsource |
|
| 509 | - * @return String success or false |
|
| 510 | - */ |
|
| 503 | + /** |
|
| 504 | + * Update ident tracker data |
|
| 505 | + * |
|
| 506 | + * @param string $famtrackid |
|
| 507 | + * @param String $ident the flight ident |
|
| 508 | + * @param null $fromsource |
|
| 509 | + * @return String success or false |
|
| 510 | + */ |
|
| 511 | 511 | public function updateIdentTrackerData($famtrackid = '', $ident = '',$fromsource = NULL) |
| 512 | 512 | { |
| 513 | 513 | |
| 514 | 514 | $query = 'UPDATE tracker_output SET ident = :ident WHERE famtrackid = :famtrackid'; |
| 515 | - $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident); |
|
| 515 | + $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident); |
|
| 516 | 516 | |
| 517 | 517 | try { |
| 518 | 518 | $sth = $this->db->prepare($query); |
@@ -525,22 +525,22 @@ discard block |
||
| 525 | 525 | |
| 526 | 526 | } |
| 527 | 527 | |
| 528 | - /** |
|
| 529 | - * Update latest tracker data |
|
| 530 | - * |
|
| 531 | - * @param string $famtrackid |
|
| 532 | - * @param String $ident the flight ident |
|
| 533 | - * @param string $latitude |
|
| 534 | - * @param string $longitude |
|
| 535 | - * @param string $altitude |
|
| 536 | - * @param null $groundspeed |
|
| 537 | - * @param string $date |
|
| 538 | - * @return String success or false |
|
| 539 | - */ |
|
| 528 | + /** |
|
| 529 | + * Update latest tracker data |
|
| 530 | + * |
|
| 531 | + * @param string $famtrackid |
|
| 532 | + * @param String $ident the flight ident |
|
| 533 | + * @param string $latitude |
|
| 534 | + * @param string $longitude |
|
| 535 | + * @param string $altitude |
|
| 536 | + * @param null $groundspeed |
|
| 537 | + * @param string $date |
|
| 538 | + * @return String success or false |
|
| 539 | + */ |
|
| 540 | 540 | public function updateLatestTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $groundspeed = NULL, $date = '') |
| 541 | 541 | { |
| 542 | 542 | $query = 'UPDATE tracker_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_altitude = :last_altitude, last_seen = :last_seen, last_ground_speed = :last_ground_speed WHERE famtrackid = :famtrackid'; |
| 543 | - $query_values = array(':famtrackid' => $famtrackid,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident); |
|
| 543 | + $query_values = array(':famtrackid' => $famtrackid,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident); |
|
| 544 | 544 | |
| 545 | 545 | try { |
| 546 | 546 | $sth = $this->db->prepare($query); |
@@ -553,23 +553,23 @@ discard block |
||
| 553 | 553 | |
| 554 | 554 | } |
| 555 | 555 | |
| 556 | - /** |
|
| 557 | - * Adds a new tracker data |
|
| 558 | - * |
|
| 559 | - * @param string $famtrackid |
|
| 560 | - * @param String $ident the flight ident |
|
| 561 | - * @param String $latitude latitude of flight |
|
| 562 | - * @param String $longitude latitude of flight |
|
| 563 | - * @param String $altitude altitude of flight |
|
| 564 | - * @param String $heading heading of flight |
|
| 565 | - * @param String $groundspeed speed of flight |
|
| 566 | - * @param String $date date of flight |
|
| 567 | - * @param string $comment |
|
| 568 | - * @param string $type |
|
| 569 | - * @param string $format_source |
|
| 570 | - * @param string $source_name |
|
| 571 | - * @return String success or false |
|
| 572 | - */ |
|
| 556 | + /** |
|
| 557 | + * Adds a new tracker data |
|
| 558 | + * |
|
| 559 | + * @param string $famtrackid |
|
| 560 | + * @param String $ident the flight ident |
|
| 561 | + * @param String $latitude latitude of flight |
|
| 562 | + * @param String $longitude latitude of flight |
|
| 563 | + * @param String $altitude altitude of flight |
|
| 564 | + * @param String $heading heading of flight |
|
| 565 | + * @param String $groundspeed speed of flight |
|
| 566 | + * @param String $date date of flight |
|
| 567 | + * @param string $comment |
|
| 568 | + * @param string $type |
|
| 569 | + * @param string $format_source |
|
| 570 | + * @param string $source_name |
|
| 571 | + * @return String success or false |
|
| 572 | + */ |
|
| 573 | 573 | public function addTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $comment = '', $type = '',$format_source = '', $source_name = '') |
| 574 | 574 | { |
| 575 | 575 | //$Image = new Image($this->db); |
@@ -652,16 +652,16 @@ discard block |
||
| 652 | 652 | $comment = filter_var($comment,FILTER_SANITIZE_STRING); |
| 653 | 653 | $type = filter_var($type,FILTER_SANITIZE_STRING); |
| 654 | 654 | |
| 655 | - if ($latitude == '' && $longitude == '') { |
|
| 656 | - $latitude = 0; |
|
| 657 | - $longitude = 0; |
|
| 658 | - } |
|
| 659 | - if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
|
| 660 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
|
| 661 | - $query = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type) |
|
| 655 | + if ($latitude == '' && $longitude == '') { |
|
| 656 | + $latitude = 0; |
|
| 657 | + $longitude = 0; |
|
| 658 | + } |
|
| 659 | + if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
|
| 660 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
|
| 661 | + $query = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type) |
|
| 662 | 662 | VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:speed,:date,:format_source, :source_name,:comment,:type)"; |
| 663 | 663 | |
| 664 | - $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':altitude' => $altitude,':heading' => $heading,':speed' => $groundspeed,':date' => $date,':format_source' => $format_source, ':source_name' => $source_name,':comment' => $comment,':type' => $type); |
|
| 664 | + $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':altitude' => $altitude,':heading' => $heading,':speed' => $groundspeed,':date' => $date,':format_source' => $format_source, ':source_name' => $source_name,':comment' => $comment,':type' => $type); |
|
| 665 | 665 | |
| 666 | 666 | try { |
| 667 | 667 | |
@@ -669,7 +669,7 @@ discard block |
||
| 669 | 669 | $sth->execute($query_values); |
| 670 | 670 | $this->db = null; |
| 671 | 671 | } catch (PDOException $e) { |
| 672 | - return "error : ".$e->getMessage(); |
|
| 672 | + return "error : ".$e->getMessage(); |
|
| 673 | 673 | } |
| 674 | 674 | |
| 675 | 675 | return "success"; |
@@ -677,12 +677,12 @@ discard block |
||
| 677 | 677 | } |
| 678 | 678 | |
| 679 | 679 | |
| 680 | - /** |
|
| 681 | - * Gets the aircraft ident within the last hour |
|
| 682 | - * |
|
| 683 | - * @param $ident |
|
| 684 | - * @return String the ident |
|
| 685 | - */ |
|
| 680 | + /** |
|
| 681 | + * Gets the aircraft ident within the last hour |
|
| 682 | + * |
|
| 683 | + * @param $ident |
|
| 684 | + * @return String the ident |
|
| 685 | + */ |
|
| 686 | 686 | public function getIdentFromLastHour($ident) |
| 687 | 687 | { |
| 688 | 688 | global $globalDBdriver; |
@@ -698,11 +698,11 @@ discard block |
||
| 698 | 698 | AND tracker_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS' |
| 699 | 699 | AND tracker_output.date < now() AT TIME ZONE 'UTC'"; |
| 700 | 700 | $query_data = array(':ident' => $ident); |
| 701 | - } |
|
| 701 | + } |
|
| 702 | 702 | |
| 703 | 703 | $sth = $this->db->prepare($query); |
| 704 | 704 | $sth->execute($query_data); |
| 705 | - $ident_result=''; |
|
| 705 | + $ident_result=''; |
|
| 706 | 706 | while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
| 707 | 707 | { |
| 708 | 708 | $ident_result = $row['ident']; |
@@ -712,12 +712,12 @@ discard block |
||
| 712 | 712 | } |
| 713 | 713 | |
| 714 | 714 | |
| 715 | - /** |
|
| 716 | - * Gets the aircraft data from the last 20 seconds |
|
| 717 | - * |
|
| 718 | - * @param string $q |
|
| 719 | - * @return array the tracker data |
|
| 720 | - */ |
|
| 715 | + /** |
|
| 716 | + * Gets the aircraft data from the last 20 seconds |
|
| 717 | + * |
|
| 718 | + * @param string $q |
|
| 719 | + * @return array the tracker data |
|
| 720 | + */ |
|
| 721 | 721 | public function getRealTimeData($q = '') |
| 722 | 722 | { |
| 723 | 723 | global $globalDBdriver; |
@@ -750,15 +750,15 @@ discard block |
||
| 750 | 750 | return $tracker_array; |
| 751 | 751 | } |
| 752 | 752 | |
| 753 | - /** |
|
| 754 | - * Gets all number of flight over countries |
|
| 755 | - * |
|
| 756 | - * @param bool $limit |
|
| 757 | - * @param int $olderthanmonths |
|
| 758 | - * @param string $sincedate |
|
| 759 | - * @param array $filters |
|
| 760 | - * @return array the airline country list |
|
| 761 | - */ |
|
| 753 | + /** |
|
| 754 | + * Gets all number of flight over countries |
|
| 755 | + * |
|
| 756 | + * @param bool $limit |
|
| 757 | + * @param int $olderthanmonths |
|
| 758 | + * @param string $sincedate |
|
| 759 | + * @param array $filters |
|
| 760 | + * @return array the airline country list |
|
| 761 | + */ |
|
| 762 | 762 | public function countAllTrackerOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array()) |
| 763 | 763 | { |
| 764 | 764 | global $globalDBdriver, $globalArchive; |
@@ -827,18 +827,18 @@ discard block |
||
| 827 | 827 | return $flight_array; |
| 828 | 828 | } |
| 829 | 829 | |
| 830 | - /** |
|
| 831 | - * Gets all callsigns that have flown over |
|
| 832 | - * |
|
| 833 | - * @param bool $limit |
|
| 834 | - * @param int $olderthanmonths |
|
| 835 | - * @param string $sincedate |
|
| 836 | - * @param array $filters |
|
| 837 | - * @param string $year |
|
| 838 | - * @param string $month |
|
| 839 | - * @param string $day |
|
| 840 | - * @return array the callsign list |
|
| 841 | - */ |
|
| 830 | + /** |
|
| 831 | + * Gets all callsigns that have flown over |
|
| 832 | + * |
|
| 833 | + * @param bool $limit |
|
| 834 | + * @param int $olderthanmonths |
|
| 835 | + * @param string $sincedate |
|
| 836 | + * @param array $filters |
|
| 837 | + * @param string $year |
|
| 838 | + * @param string $month |
|
| 839 | + * @param string $day |
|
| 840 | + * @return array the callsign list |
|
| 841 | + */ |
|
| 842 | 842 | public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '') |
| 843 | 843 | { |
| 844 | 844 | global $globalDBdriver; |
@@ -904,12 +904,12 @@ discard block |
||
| 904 | 904 | } |
| 905 | 905 | |
| 906 | 906 | |
| 907 | - /** |
|
| 908 | - * Counts all dates |
|
| 909 | - * |
|
| 910 | - * @param array $filters |
|
| 911 | - * @return array the date list |
|
| 912 | - */ |
|
| 907 | + /** |
|
| 908 | + * Counts all dates |
|
| 909 | + * |
|
| 910 | + * @param array $filters |
|
| 911 | + * @return array the date list |
|
| 912 | + */ |
|
| 913 | 913 | public function countAllDates($filters = array()) |
| 914 | 914 | { |
| 915 | 915 | global $globalTimezone, $globalDBdriver; |
@@ -954,12 +954,12 @@ discard block |
||
| 954 | 954 | } |
| 955 | 955 | |
| 956 | 956 | |
| 957 | - /** |
|
| 958 | - * Counts all dates during the last 7 days |
|
| 959 | - * |
|
| 960 | - * @param array $filters |
|
| 961 | - * @return array the date list |
|
| 962 | - */ |
|
| 957 | + /** |
|
| 958 | + * Counts all dates during the last 7 days |
|
| 959 | + * |
|
| 960 | + * @param array $filters |
|
| 961 | + * @return array the date list |
|
| 962 | + */ |
|
| 963 | 963 | public function countAllDatesLast7Days($filters = array()) |
| 964 | 964 | { |
| 965 | 965 | global $globalTimezone, $globalDBdriver; |
@@ -981,7 +981,7 @@ discard block |
||
| 981 | 981 | $query .= " GROUP BY date_name |
| 982 | 982 | ORDER BY date_name ASC"; |
| 983 | 983 | $query_data = array(':offset' => $offset); |
| 984 | - } |
|
| 984 | + } |
|
| 985 | 985 | |
| 986 | 986 | $sth = $this->db->prepare($query); |
| 987 | 987 | $sth->execute($query_data); |
@@ -1000,12 +1000,12 @@ discard block |
||
| 1000 | 1000 | return $date_array; |
| 1001 | 1001 | } |
| 1002 | 1002 | |
| 1003 | - /** |
|
| 1004 | - * Counts all dates during the last month |
|
| 1005 | - * |
|
| 1006 | - * @param array $filters |
|
| 1007 | - * @return array the date list |
|
| 1008 | - */ |
|
| 1003 | + /** |
|
| 1004 | + * Counts all dates during the last month |
|
| 1005 | + * |
|
| 1006 | + * @param array $filters |
|
| 1007 | + * @return array the date list |
|
| 1008 | + */ |
|
| 1009 | 1009 | public function countAllDatesLastMonth($filters = array()) |
| 1010 | 1010 | { |
| 1011 | 1011 | global $globalTimezone, $globalDBdriver; |
@@ -1027,7 +1027,7 @@ discard block |
||
| 1027 | 1027 | $query .= " GROUP BY date_name |
| 1028 | 1028 | ORDER BY date_name ASC"; |
| 1029 | 1029 | $query_data = array(':offset' => $offset); |
| 1030 | - } |
|
| 1030 | + } |
|
| 1031 | 1031 | |
| 1032 | 1032 | $sth = $this->db->prepare($query); |
| 1033 | 1033 | $sth->execute($query_data); |
@@ -1047,12 +1047,12 @@ discard block |
||
| 1047 | 1047 | } |
| 1048 | 1048 | |
| 1049 | 1049 | |
| 1050 | - /** |
|
| 1051 | - * Counts all month |
|
| 1052 | - * |
|
| 1053 | - * @param array $filters |
|
| 1054 | - * @return array the month list |
|
| 1055 | - */ |
|
| 1050 | + /** |
|
| 1051 | + * Counts all month |
|
| 1052 | + * |
|
| 1053 | + * @param array $filters |
|
| 1054 | + * @return array the month list |
|
| 1055 | + */ |
|
| 1056 | 1056 | public function countAllMonths($filters = array()) |
| 1057 | 1057 | { |
| 1058 | 1058 | global $globalTimezone, $globalDBdriver; |
@@ -1094,12 +1094,12 @@ discard block |
||
| 1094 | 1094 | } |
| 1095 | 1095 | |
| 1096 | 1096 | |
| 1097 | - /** |
|
| 1098 | - * Counts all dates during the last year |
|
| 1099 | - * |
|
| 1100 | - * @param $filters |
|
| 1101 | - * @return array the date list |
|
| 1102 | - */ |
|
| 1097 | + /** |
|
| 1098 | + * Counts all dates during the last year |
|
| 1099 | + * |
|
| 1100 | + * @param $filters |
|
| 1101 | + * @return array the date list |
|
| 1102 | + */ |
|
| 1103 | 1103 | public function countAllMonthsLastYear($filters) |
| 1104 | 1104 | { |
| 1105 | 1105 | global $globalTimezone, $globalDBdriver; |
@@ -1121,7 +1121,7 @@ discard block |
||
| 1121 | 1121 | $query .= " GROUP BY year_name, month_name |
| 1122 | 1122 | ORDER BY year_name, month_name ASC"; |
| 1123 | 1123 | $query_data = array(':offset' => $offset); |
| 1124 | - } |
|
| 1124 | + } |
|
| 1125 | 1125 | |
| 1126 | 1126 | $sth = $this->db->prepare($query); |
| 1127 | 1127 | $sth->execute($query_data); |
@@ -1142,13 +1142,13 @@ discard block |
||
| 1142 | 1142 | } |
| 1143 | 1143 | |
| 1144 | 1144 | |
| 1145 | - /** |
|
| 1146 | - * Counts all hours |
|
| 1147 | - * |
|
| 1148 | - * @param $orderby |
|
| 1149 | - * @param array $filters |
|
| 1150 | - * @return array the hour list |
|
| 1151 | - */ |
|
| 1145 | + /** |
|
| 1146 | + * Counts all hours |
|
| 1147 | + * |
|
| 1148 | + * @param $orderby |
|
| 1149 | + * @param array $filters |
|
| 1150 | + * @return array the hour list |
|
| 1151 | + */ |
|
| 1152 | 1152 | public function countAllHours($orderby,$filters = array()) |
| 1153 | 1153 | { |
| 1154 | 1154 | global $globalTimezone, $globalDBdriver; |
@@ -1209,13 +1209,13 @@ discard block |
||
| 1209 | 1209 | } |
| 1210 | 1210 | |
| 1211 | 1211 | |
| 1212 | - /** |
|
| 1213 | - * Counts all hours by date |
|
| 1214 | - * |
|
| 1215 | - * @param $date |
|
| 1216 | - * @param array $filters |
|
| 1217 | - * @return array the hour list |
|
| 1218 | - */ |
|
| 1212 | + /** |
|
| 1213 | + * Counts all hours by date |
|
| 1214 | + * |
|
| 1215 | + * @param $date |
|
| 1216 | + * @param array $filters |
|
| 1217 | + * @return array the hour list |
|
| 1218 | + */ |
|
| 1219 | 1219 | public function countAllHoursByDate($date, $filters = array()) |
| 1220 | 1220 | { |
| 1221 | 1221 | global $globalTimezone, $globalDBdriver; |
@@ -1257,13 +1257,13 @@ discard block |
||
| 1257 | 1257 | } |
| 1258 | 1258 | |
| 1259 | 1259 | |
| 1260 | - /** |
|
| 1261 | - * Counts all hours by a ident/callsign |
|
| 1262 | - * |
|
| 1263 | - * @param $ident |
|
| 1264 | - * @param array $filters |
|
| 1265 | - * @return array the hour list |
|
| 1266 | - */ |
|
| 1260 | + /** |
|
| 1261 | + * Counts all hours by a ident/callsign |
|
| 1262 | + * |
|
| 1263 | + * @param $ident |
|
| 1264 | + * @param array $filters |
|
| 1265 | + * @return array the hour list |
|
| 1266 | + */ |
|
| 1267 | 1267 | public function countAllHoursByIdent($ident, $filters = array()) |
| 1268 | 1268 | { |
| 1269 | 1269 | global $globalTimezone, $globalDBdriver; |
@@ -1306,14 +1306,14 @@ discard block |
||
| 1306 | 1306 | } |
| 1307 | 1307 | |
| 1308 | 1308 | |
| 1309 | - /** |
|
| 1310 | - * Counts all trackers that have flown over |
|
| 1311 | - * |
|
| 1312 | - * @param array $filters |
|
| 1313 | - * @param string $year |
|
| 1314 | - * @param string $month |
|
| 1315 | - * @return Integer the number of trackers |
|
| 1316 | - */ |
|
| 1309 | + /** |
|
| 1310 | + * Counts all trackers that have flown over |
|
| 1311 | + * |
|
| 1312 | + * @param array $filters |
|
| 1313 | + * @param string $year |
|
| 1314 | + * @param string $month |
|
| 1315 | + * @return Integer the number of trackers |
|
| 1316 | + */ |
|
| 1317 | 1317 | public function countOverallTracker($filters = array(),$year = '',$month = '') |
| 1318 | 1318 | { |
| 1319 | 1319 | global $globalDBdriver; |
@@ -1347,14 +1347,14 @@ discard block |
||
| 1347 | 1347 | return $sth->fetchColumn(); |
| 1348 | 1348 | } |
| 1349 | 1349 | |
| 1350 | - /** |
|
| 1351 | - * Counts all trackers type that have flown over |
|
| 1352 | - * |
|
| 1353 | - * @param array $filters |
|
| 1354 | - * @param string $year |
|
| 1355 | - * @param string $month |
|
| 1356 | - * @return Integer the number of flights |
|
| 1357 | - */ |
|
| 1350 | + /** |
|
| 1351 | + * Counts all trackers type that have flown over |
|
| 1352 | + * |
|
| 1353 | + * @param array $filters |
|
| 1354 | + * @param string $year |
|
| 1355 | + * @param string $month |
|
| 1356 | + * @return Integer the number of flights |
|
| 1357 | + */ |
|
| 1358 | 1358 | public function countOverallTrackerTypes($filters = array(),$year = '',$month = '') |
| 1359 | 1359 | { |
| 1360 | 1360 | global $globalDBdriver; |
@@ -1388,12 +1388,12 @@ discard block |
||
| 1388 | 1388 | } |
| 1389 | 1389 | |
| 1390 | 1390 | |
| 1391 | - /** |
|
| 1392 | - * Counts all hours of today |
|
| 1393 | - * |
|
| 1394 | - * @param array $filters |
|
| 1395 | - * @return array the hour list |
|
| 1396 | - */ |
|
| 1391 | + /** |
|
| 1392 | + * Counts all hours of today |
|
| 1393 | + * |
|
| 1394 | + * @param array $filters |
|
| 1395 | + * @return array the hour list |
|
| 1396 | + */ |
|
| 1397 | 1397 | public function countAllHoursFromToday($filters = array()) |
| 1398 | 1398 | { |
| 1399 | 1399 | global $globalTimezone, $globalDBdriver; |
@@ -1433,12 +1433,12 @@ discard block |
||
| 1433 | 1433 | } |
| 1434 | 1434 | |
| 1435 | 1435 | |
| 1436 | - /** |
|
| 1437 | - * Gets the Barrie Spotter ID based on the FlightAware ID |
|
| 1438 | - * |
|
| 1439 | - * @param $famtrackid |
|
| 1440 | - * @return Integer the Barrie Spotter ID |
|
| 1441 | - */ |
|
| 1436 | + /** |
|
| 1437 | + * Gets the Barrie Spotter ID based on the FlightAware ID |
|
| 1438 | + * |
|
| 1439 | + * @param $famtrackid |
|
| 1440 | + * @return Integer the Barrie Spotter ID |
|
| 1441 | + */ |
|
| 1442 | 1442 | public function getTrackerIDBasedOnFamTrackID($famtrackid) |
| 1443 | 1443 | { |
| 1444 | 1444 | $famtrackid = filter_var($famtrackid,FILTER_SANITIZE_STRING); |
@@ -1459,13 +1459,13 @@ discard block |
||
| 1459 | 1459 | |
| 1460 | 1460 | |
| 1461 | 1461 | /** |
| 1462 | - * Parses a date string |
|
| 1463 | - * |
|
| 1464 | - * @param String $dateString the date string |
|
| 1465 | - * @param String $timezone the timezone of a user |
|
| 1466 | - * @return array the time information |
|
| 1467 | - * |
|
| 1468 | - */ |
|
| 1462 | + * Parses a date string |
|
| 1463 | + * |
|
| 1464 | + * @param String $dateString the date string |
|
| 1465 | + * @param String $timezone the timezone of a user |
|
| 1466 | + * @return array the time information |
|
| 1467 | + * |
|
| 1468 | + */ |
|
| 1469 | 1469 | public function parseDateString($dateString, $timezone = '') |
| 1470 | 1470 | { |
| 1471 | 1471 | $time_array = array(); |
@@ -1498,12 +1498,12 @@ discard block |
||
| 1498 | 1498 | } |
| 1499 | 1499 | |
| 1500 | 1500 | /** |
| 1501 | - * Parses the direction degrees to working |
|
| 1502 | - * |
|
| 1503 | - * @param Float $direction the direction in degrees |
|
| 1504 | - * @return array the direction information |
|
| 1505 | - * |
|
| 1506 | - */ |
|
| 1501 | + * Parses the direction degrees to working |
|
| 1502 | + * |
|
| 1503 | + * @param Float $direction the direction in degrees |
|
| 1504 | + * @return array the direction information |
|
| 1505 | + * |
|
| 1506 | + */ |
|
| 1507 | 1507 | public function parseDirection($direction = 0) |
| 1508 | 1508 | { |
| 1509 | 1509 | if ($direction == '') $direction = 0; |
@@ -1582,12 +1582,12 @@ discard block |
||
| 1582 | 1582 | |
| 1583 | 1583 | |
| 1584 | 1584 | /** |
| 1585 | - * Gets Country from latitude/longitude |
|
| 1586 | - * |
|
| 1587 | - * @param Float $latitude latitute of the flight |
|
| 1588 | - * @param Float $longitude longitute of the flight |
|
| 1589 | - * @return String the countrie |
|
| 1590 | - */ |
|
| 1585 | + * Gets Country from latitude/longitude |
|
| 1586 | + * |
|
| 1587 | + * @param Float $latitude latitute of the flight |
|
| 1588 | + * @param Float $longitude longitute of the flight |
|
| 1589 | + * @return String the countrie |
|
| 1590 | + */ |
|
| 1591 | 1591 | public function getCountryFromLatitudeLongitude($latitude,$longitude) |
| 1592 | 1592 | { |
| 1593 | 1593 | global $globalDebug; |
@@ -1615,11 +1615,11 @@ discard block |
||
| 1615 | 1615 | } |
| 1616 | 1616 | |
| 1617 | 1617 | /** |
| 1618 | - * Gets Country from iso2 |
|
| 1619 | - * |
|
| 1620 | - * @param String $iso2 ISO2 country code |
|
| 1621 | - * @return String the countrie |
|
| 1622 | - */ |
|
| 1618 | + * Gets Country from iso2 |
|
| 1619 | + * |
|
| 1620 | + * @param String $iso2 ISO2 country code |
|
| 1621 | + * @return String the countrie |
|
| 1622 | + */ |
|
| 1623 | 1623 | public function getCountryFromISO2($iso2) |
| 1624 | 1624 | { |
| 1625 | 1625 | global $globalDebug; |
@@ -1646,18 +1646,18 @@ discard block |
||
| 1646 | 1646 | |
| 1647 | 1647 | } |
| 1648 | 1648 | |
| 1649 | - /** |
|
| 1650 | - * Gets all vessels types that have flown over |
|
| 1651 | - * |
|
| 1652 | - * @param bool $limit |
|
| 1653 | - * @param int $olderthanmonths |
|
| 1654 | - * @param string $sincedate |
|
| 1655 | - * @param array $filters |
|
| 1656 | - * @param string $year |
|
| 1657 | - * @param string $month |
|
| 1658 | - * @param string $day |
|
| 1659 | - * @return array the vessel type list |
|
| 1660 | - */ |
|
| 1649 | + /** |
|
| 1650 | + * Gets all vessels types that have flown over |
|
| 1651 | + * |
|
| 1652 | + * @param bool $limit |
|
| 1653 | + * @param int $olderthanmonths |
|
| 1654 | + * @param string $sincedate |
|
| 1655 | + * @param array $filters |
|
| 1656 | + * @param string $year |
|
| 1657 | + * @param string $month |
|
| 1658 | + * @param string $day |
|
| 1659 | + * @return array the vessel type list |
|
| 1660 | + */ |
|
| 1661 | 1661 | public function countAllTrackerTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '') |
| 1662 | 1662 | { |
| 1663 | 1663 | global $globalDBdriver; |
@@ -1721,21 +1721,21 @@ discard block |
||
| 1721 | 1721 | return $tracker_array; |
| 1722 | 1722 | } |
| 1723 | 1723 | |
| 1724 | - /** |
|
| 1725 | - * Gets all the tracker information |
|
| 1726 | - * |
|
| 1727 | - * @param string $q |
|
| 1728 | - * @param string $callsign |
|
| 1729 | - * @param string $date_posted |
|
| 1730 | - * @param string $limit |
|
| 1731 | - * @param string $sort |
|
| 1732 | - * @param string $includegeodata |
|
| 1733 | - * @param string $origLat |
|
| 1734 | - * @param string $origLon |
|
| 1735 | - * @param string $dist |
|
| 1736 | - * @param array $filters |
|
| 1737 | - * @return array the tracker information |
|
| 1738 | - */ |
|
| 1724 | + /** |
|
| 1725 | + * Gets all the tracker information |
|
| 1726 | + * |
|
| 1727 | + * @param string $q |
|
| 1728 | + * @param string $callsign |
|
| 1729 | + * @param string $date_posted |
|
| 1730 | + * @param string $limit |
|
| 1731 | + * @param string $sort |
|
| 1732 | + * @param string $includegeodata |
|
| 1733 | + * @param string $origLat |
|
| 1734 | + * @param string $origLon |
|
| 1735 | + * @param string $dist |
|
| 1736 | + * @param array $filters |
|
| 1737 | + * @return array the tracker information |
|
| 1738 | + */ |
|
| 1739 | 1739 | public function searchTrackerData($q = '', $callsign = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '',$filters = array()) |
| 1740 | 1740 | { |
| 1741 | 1741 | global $globalTimezone, $globalDBdriver; |
@@ -1840,12 +1840,12 @@ discard block |
||
| 1840 | 1840 | } |
| 1841 | 1841 | |
| 1842 | 1842 | /** |
| 1843 | - * Gets the short url from bit.ly |
|
| 1844 | - * |
|
| 1845 | - * @param String $url the full url |
|
| 1846 | - * @return String the bit.ly url |
|
| 1847 | - * |
|
| 1848 | - */ |
|
| 1843 | + * Gets the short url from bit.ly |
|
| 1844 | + * |
|
| 1845 | + * @param String $url the full url |
|
| 1846 | + * @return String the bit.ly url |
|
| 1847 | + * |
|
| 1848 | + */ |
|
| 1849 | 1849 | public function getBitlyURL($url) |
| 1850 | 1850 | { |
| 1851 | 1851 | global $globalBitlyAccessToken; |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | require_once(dirname(__FILE__).'/class.Image.php'); |
| 12 | 12 | $global_tracker_query = "SELECT tracker_output.* FROM tracker_output"; |
| 13 | 13 | |
| 14 | -class Tracker{ |
|
| 14 | +class Tracker { |
|
| 15 | 15 | public $db; |
| 16 | 16 | |
| 17 | 17 | public function __construct($dbc = null) { |
@@ -28,33 +28,33 @@ discard block |
||
| 28 | 28 | * @return string the SQL part |
| 29 | 29 | */ |
| 30 | 30 | |
| 31 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 31 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 32 | 32 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 33 | 33 | $filters = array(); |
| 34 | 34 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 35 | 35 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 36 | 36 | $filters = $globalStatsFilters[$globalFilterName]; |
| 37 | 37 | } else { |
| 38 | - $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
|
| 38 | + $filter = array_merge($filter, $globalStatsFilters[$globalFilterName]); |
|
| 39 | 39 | } |
| 40 | 40 | } |
| 41 | 41 | if (isset($filter[0]['source'])) { |
| 42 | - $filters = array_merge($filters,$filter); |
|
| 42 | + $filters = array_merge($filters, $filter); |
|
| 43 | 43 | } |
| 44 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 44 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 45 | 45 | $filter_query_join = ''; |
| 46 | 46 | $filter_query_where = ''; |
| 47 | - foreach($filters as $flt) { |
|
| 47 | + foreach ($filters as $flt) { |
|
| 48 | 48 | if (isset($flt['idents']) && !empty($flt['idents'])) { |
| 49 | 49 | if (isset($flt['source'])) { |
| 50 | - $filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','",$flt['idents'])."') AND tracker_output.format_source IN ('".implode("','",$flt['source'])."')) spfi ON spfi.famtrackid = tracker_output.famtrackid"; |
|
| 50 | + $filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','", $flt['idents'])."') AND tracker_output.format_source IN ('".implode("','", $flt['source'])."')) spfi ON spfi.famtrackid = tracker_output.famtrackid"; |
|
| 51 | 51 | } else { |
| 52 | - $filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','",$flt['idents'])."')) spfi ON spfi.famtrackid = tracker_output.famtrackid"; |
|
| 52 | + $filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','", $flt['idents'])."')) spfi ON spfi.famtrackid = tracker_output.famtrackid"; |
|
| 53 | 53 | } |
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | 56 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 57 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 57 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 58 | 58 | } |
| 59 | 59 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 60 | 60 | $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 87 | 87 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
| 88 | 88 | if ($filter_query_where != '') { |
| 89 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
| 89 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
| 90 | 90 | } |
| 91 | 91 | $filter_query = $filter_query_join.$filter_query_where; |
| 92 | 92 | return $filter_query; |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | * @param bool $schedules |
| 102 | 102 | * @return array the tracker information |
| 103 | 103 | */ |
| 104 | - public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false) |
|
| 104 | + public function getDataFromDB($query, $params = array(), $limitQuery = '', $schedules = false) |
|
| 105 | 105 | { |
| 106 | 106 | date_default_timezone_set('UTC'); |
| 107 | 107 | if (!is_string($query)) |
@@ -121,13 +121,13 @@ discard block |
||
| 121 | 121 | $sth = $this->db->prepare($query.$limitQuery); |
| 122 | 122 | $sth->execute($params); |
| 123 | 123 | } catch (PDOException $e) { |
| 124 | - printf("Invalid query : %s\nWhole query: %s\n",$e->getMessage(), $query.$limitQuery); |
|
| 124 | + printf("Invalid query : %s\nWhole query: %s\n", $e->getMessage(), $query.$limitQuery); |
|
| 125 | 125 | exit(); |
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | $num_rows = 0; |
| 129 | 129 | $tracker_array = array(); |
| 130 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 130 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 131 | 131 | { |
| 132 | 132 | $num_rows++; |
| 133 | 133 | $temp_array = array(); |
@@ -183,17 +183,17 @@ discard block |
||
| 183 | 183 | { |
| 184 | 184 | $temp_array['date'] = "about ".$dateArray['hours']." hours ago"; |
| 185 | 185 | } else { |
| 186 | - $temp_array['date'] = date("M j Y, g:i a",strtotime($row['date']." UTC")); |
|
| 186 | + $temp_array['date'] = date("M j Y, g:i a", strtotime($row['date']." UTC")); |
|
| 187 | 187 | } |
| 188 | 188 | $temp_array['date_minutes_past'] = $dateArray['minutes']; |
| 189 | - $temp_array['date_iso_8601'] = date("c",strtotime($row['date']." UTC")); |
|
| 190 | - $temp_array['date_rfc_2822'] = date("r",strtotime($row['date']." UTC")); |
|
| 189 | + $temp_array['date_iso_8601'] = date("c", strtotime($row['date']." UTC")); |
|
| 190 | + $temp_array['date_rfc_2822'] = date("r", strtotime($row['date']." UTC")); |
|
| 191 | 191 | $temp_array['date_unix'] = strtotime($row['date']." UTC"); |
| 192 | 192 | if (isset($row['last_seen']) && $row['last_seen'] != '') { |
| 193 | 193 | if (strtotime($row['last_seen']) > strtotime($row['date'])) { |
| 194 | 194 | $temp_array['duration'] = strtotime($row['last_seen']) - strtotime($row['date']); |
| 195 | - $temp_array['last_seen_date_iso_8601'] = date("c",strtotime($row['last_seen']." UTC")); |
|
| 196 | - $temp_array['last_seen_date_rfc_2822'] = date("r",strtotime($row['last_seen']." UTC")); |
|
| 195 | + $temp_array['last_seen_date_iso_8601'] = date("c", strtotime($row['last_seen']." UTC")); |
|
| 196 | + $temp_array['last_seen_date_rfc_2822'] = date("r", strtotime($row['last_seen']." UTC")); |
|
| 197 | 197 | $temp_array['last_seen_date_unix'] = strtotime($row['last_seen']." UTC"); |
| 198 | 198 | } |
| 199 | 199 | } |
@@ -232,8 +232,8 @@ discard block |
||
| 232 | 232 | { |
| 233 | 233 | $limit_array = explode(",", $limit); |
| 234 | 234 | |
| 235 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 236 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 235 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 236 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 237 | 237 | |
| 238 | 238 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 239 | 239 | { |
@@ -250,9 +250,9 @@ discard block |
||
| 250 | 250 | $orderby_query = " ORDER BY tracker_output.date DESC"; |
| 251 | 251 | } |
| 252 | 252 | |
| 253 | - $query = $global_tracker_query.$filter_query." ".$orderby_query; |
|
| 253 | + $query = $global_tracker_query.$filter_query." ".$orderby_query; |
|
| 254 | 254 | |
| 255 | - $tracker_array = $this->getDataFromDB($query, array(),$limit_query,true); |
|
| 255 | + $tracker_array = $this->getDataFromDB($query, array(), $limit_query, true); |
|
| 256 | 256 | |
| 257 | 257 | return $tracker_array; |
| 258 | 258 | } |
@@ -271,8 +271,8 @@ discard block |
||
| 271 | 271 | if ($id == '') return array(); |
| 272 | 272 | $additional_query = "tracker_output.famtrackid = :id"; |
| 273 | 273 | $query_values = array(':id' => $id); |
| 274 | - $query = $global_tracker_query." WHERE ".$additional_query." "; |
|
| 275 | - $tracker_array = $this->getDataFromDB($query,$query_values); |
|
| 274 | + $query = $global_tracker_query." WHERE ".$additional_query." "; |
|
| 275 | + $tracker_array = $this->getDataFromDB($query, $query_values); |
|
| 276 | 276 | return $tracker_array; |
| 277 | 277 | } |
| 278 | 278 | |
@@ -294,7 +294,7 @@ discard block |
||
| 294 | 294 | $query_values = array(); |
| 295 | 295 | $limit_query = ''; |
| 296 | 296 | $additional_query = ''; |
| 297 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 297 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 298 | 298 | if ($ident != "") |
| 299 | 299 | { |
| 300 | 300 | if (!is_string($ident)) |
@@ -310,8 +310,8 @@ discard block |
||
| 310 | 310 | { |
| 311 | 311 | $limit_array = explode(",", $limit); |
| 312 | 312 | |
| 313 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 314 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 313 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 314 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 315 | 315 | |
| 316 | 316 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 317 | 317 | { |
@@ -335,7 +335,7 @@ discard block |
||
| 335 | 335 | return $tracker_array; |
| 336 | 336 | } |
| 337 | 337 | |
| 338 | - public function getTrackerDataByDate($date = '', $limit = '', $sort = '',$filter = array()) |
|
| 338 | + public function getTrackerDataByDate($date = '', $limit = '', $sort = '', $filter = array()) |
|
| 339 | 339 | { |
| 340 | 340 | global $global_tracker_query, $globalTimezone, $globalDBdriver; |
| 341 | 341 | |
@@ -343,7 +343,7 @@ discard block |
||
| 343 | 343 | $limit_query = ''; |
| 344 | 344 | $additional_query = ''; |
| 345 | 345 | |
| 346 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 346 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 347 | 347 | |
| 348 | 348 | if ($date != "") |
| 349 | 349 | { |
@@ -369,8 +369,8 @@ discard block |
||
| 369 | 369 | { |
| 370 | 370 | $limit_array = explode(",", $limit); |
| 371 | 371 | |
| 372 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 373 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 372 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 373 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 374 | 374 | |
| 375 | 375 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 376 | 376 | { |
@@ -400,11 +400,11 @@ discard block |
||
| 400 | 400 | * @param array $filters |
| 401 | 401 | * @return array list of source name |
| 402 | 402 | */ |
| 403 | - public function getAllSourceName($type = '',$filters = array()) |
|
| 403 | + public function getAllSourceName($type = '', $filters = array()) |
|
| 404 | 404 | { |
| 405 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 405 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 406 | 406 | $query_values = array(); |
| 407 | - $query = "SELECT DISTINCT tracker_output.source_name |
|
| 407 | + $query = "SELECT DISTINCT tracker_output.source_name |
|
| 408 | 408 | FROM tracker_output".$filter_query." tracker_output.source_name <> ''"; |
| 409 | 409 | if ($type != '') { |
| 410 | 410 | $query_values = array(':type' => $type); |
@@ -419,7 +419,7 @@ discard block |
||
| 419 | 419 | $source_array = array(); |
| 420 | 420 | $temp_array = array(); |
| 421 | 421 | |
| 422 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 422 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 423 | 423 | { |
| 424 | 424 | $temp_array['source_name'] = $row['source_name']; |
| 425 | 425 | $source_array[] = $temp_array; |
@@ -436,8 +436,8 @@ discard block |
||
| 436 | 436 | */ |
| 437 | 437 | public function getAllIdents($filters = array()) |
| 438 | 438 | { |
| 439 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 440 | - $query = "SELECT DISTINCT tracker_output.ident |
|
| 439 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 440 | + $query = "SELECT DISTINCT tracker_output.ident |
|
| 441 | 441 | FROM tracker_output".$filter_query." tracker_output.ident <> '' |
| 442 | 442 | ORDER BY tracker_output.date ASC LIMIT 700 OFFSET 0"; |
| 443 | 443 | |
@@ -447,7 +447,7 @@ discard block |
||
| 447 | 447 | $ident_array = array(); |
| 448 | 448 | $temp_array = array(); |
| 449 | 449 | |
| 450 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 450 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 451 | 451 | { |
| 452 | 452 | $temp_array['ident'] = $row['ident']; |
| 453 | 453 | $ident_array[] = $temp_array; |
@@ -472,12 +472,12 @@ discard block |
||
| 472 | 472 | } else $offset = '+00:00'; |
| 473 | 473 | |
| 474 | 474 | if ($globalDBdriver == 'mysql') { |
| 475 | - $query = "SELECT DISTINCT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) as date |
|
| 475 | + $query = "SELECT DISTINCT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) as date |
|
| 476 | 476 | FROM tracker_output |
| 477 | 477 | WHERE tracker_output.date <> '' |
| 478 | 478 | ORDER BY tracker_output.date ASC LIMIT 0,100"; |
| 479 | 479 | } else { |
| 480 | - $query = "SELECT DISTINCT to_char(tracker_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date |
|
| 480 | + $query = "SELECT DISTINCT to_char(tracker_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date |
|
| 481 | 481 | FROM tracker_output |
| 482 | 482 | WHERE tracker_output.date <> '' |
| 483 | 483 | ORDER BY tracker_output.date ASC LIMIT 0,100"; |
@@ -489,7 +489,7 @@ discard block |
||
| 489 | 489 | $date_array = array(); |
| 490 | 490 | $temp_array = array(); |
| 491 | 491 | |
| 492 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 492 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 493 | 493 | { |
| 494 | 494 | $temp_array['date'] = $row['date']; |
| 495 | 495 | |
@@ -508,11 +508,11 @@ discard block |
||
| 508 | 508 | * @param null $fromsource |
| 509 | 509 | * @return String success or false |
| 510 | 510 | */ |
| 511 | - public function updateIdentTrackerData($famtrackid = '', $ident = '',$fromsource = NULL) |
|
| 511 | + public function updateIdentTrackerData($famtrackid = '', $ident = '', $fromsource = NULL) |
|
| 512 | 512 | { |
| 513 | 513 | |
| 514 | 514 | $query = 'UPDATE tracker_output SET ident = :ident WHERE famtrackid = :famtrackid'; |
| 515 | - $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident); |
|
| 515 | + $query_values = array(':famtrackid' => $famtrackid, ':ident' => $ident); |
|
| 516 | 516 | |
| 517 | 517 | try { |
| 518 | 518 | $sth = $this->db->prepare($query); |
@@ -540,7 +540,7 @@ discard block |
||
| 540 | 540 | public function updateLatestTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $groundspeed = NULL, $date = '') |
| 541 | 541 | { |
| 542 | 542 | $query = 'UPDATE tracker_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_altitude = :last_altitude, last_seen = :last_seen, last_ground_speed = :last_ground_speed WHERE famtrackid = :famtrackid'; |
| 543 | - $query_values = array(':famtrackid' => $famtrackid,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident); |
|
| 543 | + $query_values = array(':famtrackid' => $famtrackid, ':last_latitude' => $latitude, ':last_longitude' => $longitude, ':last_altitude' => $altitude, ':last_ground_speed' => $groundspeed, ':last_seen' => $date, ':ident' => $ident); |
|
| 544 | 544 | |
| 545 | 545 | try { |
| 546 | 546 | $sth = $this->db->prepare($query); |
@@ -570,7 +570,7 @@ discard block |
||
| 570 | 570 | * @param string $source_name |
| 571 | 571 | * @return String success or false |
| 572 | 572 | */ |
| 573 | - public function addTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $comment = '', $type = '',$format_source = '', $source_name = '') |
|
| 573 | + public function addTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $comment = '', $type = '', $format_source = '', $source_name = '') |
|
| 574 | 574 | { |
| 575 | 575 | //$Image = new Image($this->db); |
| 576 | 576 | $Common = new Common(); |
@@ -636,21 +636,21 @@ discard block |
||
| 636 | 636 | } |
| 637 | 637 | |
| 638 | 638 | |
| 639 | - if ($date == "" || strtotime($date) < time()-20*60) |
|
| 639 | + if ($date == "" || strtotime($date) < time() - 20*60) |
|
| 640 | 640 | { |
| 641 | 641 | $date = date("Y-m-d H:i:s", time()); |
| 642 | 642 | } |
| 643 | 643 | |
| 644 | - $famtrackid = filter_var($famtrackid,FILTER_SANITIZE_STRING); |
|
| 645 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 646 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 647 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 648 | - $altitude = filter_var($altitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 649 | - $heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT); |
|
| 650 | - $groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 651 | - $format_source = filter_var($format_source,FILTER_SANITIZE_STRING); |
|
| 652 | - $comment = filter_var($comment,FILTER_SANITIZE_STRING); |
|
| 653 | - $type = filter_var($type,FILTER_SANITIZE_STRING); |
|
| 644 | + $famtrackid = filter_var($famtrackid, FILTER_SANITIZE_STRING); |
|
| 645 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 646 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 647 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 648 | + $altitude = filter_var($altitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 649 | + $heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT); |
|
| 650 | + $groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 651 | + $format_source = filter_var($format_source, FILTER_SANITIZE_STRING); |
|
| 652 | + $comment = filter_var($comment, FILTER_SANITIZE_STRING); |
|
| 653 | + $type = filter_var($type, FILTER_SANITIZE_STRING); |
|
| 654 | 654 | |
| 655 | 655 | if ($latitude == '' && $longitude == '') { |
| 656 | 656 | $latitude = 0; |
@@ -658,10 +658,10 @@ discard block |
||
| 658 | 658 | } |
| 659 | 659 | if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
| 660 | 660 | if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
| 661 | - $query = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type) |
|
| 661 | + $query = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type) |
|
| 662 | 662 | VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:speed,:date,:format_source, :source_name,:comment,:type)"; |
| 663 | 663 | |
| 664 | - $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':altitude' => $altitude,':heading' => $heading,':speed' => $groundspeed,':date' => $date,':format_source' => $format_source, ':source_name' => $source_name,':comment' => $comment,':type' => $type); |
|
| 664 | + $query_values = array(':famtrackid' => $famtrackid, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':heading' => $heading, ':speed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':comment' => $comment, ':type' => $type); |
|
| 665 | 665 | |
| 666 | 666 | try { |
| 667 | 667 | |
@@ -687,13 +687,13 @@ discard block |
||
| 687 | 687 | { |
| 688 | 688 | global $globalDBdriver; |
| 689 | 689 | if ($globalDBdriver == 'mysql') { |
| 690 | - $query = "SELECT tracker_output.ident FROM tracker_output |
|
| 690 | + $query = "SELECT tracker_output.ident FROM tracker_output |
|
| 691 | 691 | WHERE tracker_output.ident = :ident |
| 692 | 692 | AND tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) |
| 693 | 693 | AND tracker_output.date < UTC_TIMESTAMP()"; |
| 694 | 694 | $query_data = array(':ident' => $ident); |
| 695 | 695 | } else { |
| 696 | - $query = "SELECT tracker_output.ident FROM tracker_output |
|
| 696 | + $query = "SELECT tracker_output.ident FROM tracker_output |
|
| 697 | 697 | WHERE tracker_output.ident = :ident |
| 698 | 698 | AND tracker_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS' |
| 699 | 699 | AND tracker_output.date < now() AT TIME ZONE 'UTC'"; |
@@ -702,8 +702,8 @@ discard block |
||
| 702 | 702 | |
| 703 | 703 | $sth = $this->db->prepare($query); |
| 704 | 704 | $sth->execute($query_data); |
| 705 | - $ident_result=''; |
|
| 706 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 705 | + $ident_result = ''; |
|
| 706 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 707 | 707 | { |
| 708 | 708 | $ident_result = $row['ident']; |
| 709 | 709 | } |
@@ -729,8 +729,8 @@ discard block |
||
| 729 | 729 | return array(); |
| 730 | 730 | } else { |
| 731 | 731 | $q_array = explode(" ", $q); |
| 732 | - foreach ($q_array as $q_item){ |
|
| 733 | - $q_item = filter_var($q_item,FILTER_SANITIZE_STRING); |
|
| 732 | + foreach ($q_array as $q_item) { |
|
| 733 | + $q_item = filter_var($q_item, FILTER_SANITIZE_STRING); |
|
| 734 | 734 | $additional_query .= " AND ("; |
| 735 | 735 | $additional_query .= "(tracker_output.ident like '%".$q_item."%')"; |
| 736 | 736 | $additional_query .= ")"; |
@@ -738,11 +738,11 @@ discard block |
||
| 738 | 738 | } |
| 739 | 739 | } |
| 740 | 740 | if ($globalDBdriver == 'mysql') { |
| 741 | - $query = "SELECT tracker_output.* FROM tracker_output |
|
| 741 | + $query = "SELECT tracker_output.* FROM tracker_output |
|
| 742 | 742 | WHERE tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 SECOND) ".$additional_query." |
| 743 | 743 | AND tracker_output.date < UTC_TIMESTAMP()"; |
| 744 | 744 | } else { |
| 745 | - $query = "SELECT tracker_output.* FROM tracker_output |
|
| 745 | + $query = "SELECT tracker_output.* FROM tracker_output |
|
| 746 | 746 | WHERE tracker_output.date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '20 SECONDS' ".$additional_query." |
| 747 | 747 | AND tracker_output.date::timestamp < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'"; |
| 748 | 748 | } |
@@ -759,16 +759,16 @@ discard block |
||
| 759 | 759 | * @param array $filters |
| 760 | 760 | * @return array the airline country list |
| 761 | 761 | */ |
| 762 | - public function countAllTrackerOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array()) |
|
| 762 | + public function countAllTrackerOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array()) |
|
| 763 | 763 | { |
| 764 | 764 | global $globalDBdriver, $globalArchive; |
| 765 | 765 | //$filter_query = $this->getFilter($filters,true,true); |
| 766 | - $Connection= new Connection($this->db); |
|
| 766 | + $Connection = new Connection($this->db); |
|
| 767 | 767 | if (!$Connection->tableExists('countries')) return array(); |
| 768 | 768 | if (!isset($globalArchive) || $globalArchive !== TRUE) { |
| 769 | 769 | require_once('class.TrackerLive.php'); |
| 770 | 770 | $TrackerLive = new TrackerLive($this->db); |
| 771 | - $filter_query = $TrackerLive->getFilter($filters,true,true); |
|
| 771 | + $filter_query = $TrackerLive->getFilter($filters, true, true); |
|
| 772 | 772 | $filter_query .= " over_country IS NOT NULL AND over_country <> ''"; |
| 773 | 773 | if ($olderthanmonths > 0) { |
| 774 | 774 | if ($globalDBdriver == 'mysql') { |
@@ -788,7 +788,7 @@ discard block |
||
| 788 | 788 | } else { |
| 789 | 789 | require_once('class.TrackerArchive.php'); |
| 790 | 790 | $TrackerArchive = new TrackerArchive($this->db); |
| 791 | - $filter_query = $TrackerArchive->getFilter($filters,true,true); |
|
| 791 | + $filter_query = $TrackerArchive->getFilter($filters, true, true); |
|
| 792 | 792 | $filter_query .= " over_country IS NOT NULL AND over_country <> ''"; |
| 793 | 793 | if ($olderthanmonths > 0) { |
| 794 | 794 | if ($globalDBdriver == 'mysql') { |
@@ -816,7 +816,7 @@ discard block |
||
| 816 | 816 | $flight_array = array(); |
| 817 | 817 | $temp_array = array(); |
| 818 | 818 | |
| 819 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 819 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 820 | 820 | { |
| 821 | 821 | $temp_array['tracker_count'] = $row['nb']; |
| 822 | 822 | $temp_array['tracker_country'] = $row['name']; |
@@ -839,11 +839,11 @@ discard block |
||
| 839 | 839 | * @param string $day |
| 840 | 840 | * @return array the callsign list |
| 841 | 841 | */ |
| 842 | - public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '') |
|
| 842 | + public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '') |
|
| 843 | 843 | { |
| 844 | 844 | global $globalDBdriver; |
| 845 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 846 | - $query = "SELECT DISTINCT tracker_output.ident, COUNT(tracker_output.ident) AS callsign_icao_count |
|
| 845 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 846 | + $query = "SELECT DISTINCT tracker_output.ident, COUNT(tracker_output.ident) AS callsign_icao_count |
|
| 847 | 847 | FROM tracker_output".$filter_query." tracker_output.ident <> ''"; |
| 848 | 848 | if ($olderthanmonths > 0) { |
| 849 | 849 | if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)'; |
@@ -857,28 +857,28 @@ discard block |
||
| 857 | 857 | if ($year != '') { |
| 858 | 858 | if ($globalDBdriver == 'mysql') { |
| 859 | 859 | $query .= " AND YEAR(tracker_output.date) = :year"; |
| 860 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 860 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 861 | 861 | } else { |
| 862 | 862 | $query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year"; |
| 863 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 863 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 864 | 864 | } |
| 865 | 865 | } |
| 866 | 866 | if ($month != '') { |
| 867 | 867 | if ($globalDBdriver == 'mysql') { |
| 868 | 868 | $query .= " AND MONTH(tracker_output.date) = :month"; |
| 869 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 869 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 870 | 870 | } else { |
| 871 | 871 | $query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month"; |
| 872 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 872 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 873 | 873 | } |
| 874 | 874 | } |
| 875 | 875 | if ($day != '') { |
| 876 | 876 | if ($globalDBdriver == 'mysql') { |
| 877 | 877 | $query .= " AND DAY(tracker_output.date) = :day"; |
| 878 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 878 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 879 | 879 | } else { |
| 880 | 880 | $query .= " AND EXTRACT(DAY FROM tracker_output.date) = :day"; |
| 881 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 881 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 882 | 882 | } |
| 883 | 883 | } |
| 884 | 884 | $query .= " GROUP BY tracker_output.ident ORDER BY callsign_icao_count DESC"; |
@@ -890,7 +890,7 @@ discard block |
||
| 890 | 890 | $callsign_array = array(); |
| 891 | 891 | $temp_array = array(); |
| 892 | 892 | |
| 893 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 893 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 894 | 894 | { |
| 895 | 895 | $temp_array['callsign_icao'] = $row['ident']; |
| 896 | 896 | $temp_array['airline_name'] = $row['airline_name']; |
@@ -942,7 +942,7 @@ discard block |
||
| 942 | 942 | $date_array = array(); |
| 943 | 943 | $temp_array = array(); |
| 944 | 944 | |
| 945 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 945 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 946 | 946 | { |
| 947 | 947 | $temp_array['date_name'] = $row['date_name']; |
| 948 | 948 | $temp_array['date_count'] = $row['date_count']; |
@@ -968,7 +968,7 @@ discard block |
||
| 968 | 968 | $datetime = new DateTime(); |
| 969 | 969 | $offset = $datetime->format('P'); |
| 970 | 970 | } else $offset = '+00:00'; |
| 971 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 971 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 972 | 972 | if ($globalDBdriver == 'mysql') { |
| 973 | 973 | $query = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
| 974 | 974 | FROM tracker_output".$filter_query." tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY)"; |
@@ -989,7 +989,7 @@ discard block |
||
| 989 | 989 | $date_array = array(); |
| 990 | 990 | $temp_array = array(); |
| 991 | 991 | |
| 992 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 992 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 993 | 993 | { |
| 994 | 994 | $temp_array['date_name'] = $row['date_name']; |
| 995 | 995 | $temp_array['date_count'] = $row['date_count']; |
@@ -1014,7 +1014,7 @@ discard block |
||
| 1014 | 1014 | $datetime = new DateTime(); |
| 1015 | 1015 | $offset = $datetime->format('P'); |
| 1016 | 1016 | } else $offset = '+00:00'; |
| 1017 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1017 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1018 | 1018 | if ($globalDBdriver == 'mysql') { |
| 1019 | 1019 | $query = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
| 1020 | 1020 | FROM tracker_output".$filter_query." tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MONTH)"; |
@@ -1035,7 +1035,7 @@ discard block |
||
| 1035 | 1035 | $date_array = array(); |
| 1036 | 1036 | $temp_array = array(); |
| 1037 | 1037 | |
| 1038 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1038 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1039 | 1039 | { |
| 1040 | 1040 | $temp_array['date_name'] = $row['date_name']; |
| 1041 | 1041 | $temp_array['date_count'] = $row['date_count']; |
@@ -1081,7 +1081,7 @@ discard block |
||
| 1081 | 1081 | $date_array = array(); |
| 1082 | 1082 | $temp_array = array(); |
| 1083 | 1083 | |
| 1084 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1084 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1085 | 1085 | { |
| 1086 | 1086 | $temp_array['month_name'] = $row['month_name']; |
| 1087 | 1087 | $temp_array['year_name'] = $row['year_name']; |
@@ -1108,7 +1108,7 @@ discard block |
||
| 1108 | 1108 | $datetime = new DateTime(); |
| 1109 | 1109 | $offset = $datetime->format('P'); |
| 1110 | 1110 | } else $offset = '+00:00'; |
| 1111 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1111 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1112 | 1112 | if ($globalDBdriver == 'mysql') { |
| 1113 | 1113 | $query = "SELECT MONTH(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count |
| 1114 | 1114 | FROM tracker_output".$filter_query." tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 YEAR)"; |
@@ -1129,7 +1129,7 @@ discard block |
||
| 1129 | 1129 | $date_array = array(); |
| 1130 | 1130 | $temp_array = array(); |
| 1131 | 1131 | |
| 1132 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1132 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1133 | 1133 | { |
| 1134 | 1134 | $temp_array['year_name'] = $row['year_name']; |
| 1135 | 1135 | $temp_array['month_name'] = $row['month_name']; |
@@ -1149,7 +1149,7 @@ discard block |
||
| 1149 | 1149 | * @param array $filters |
| 1150 | 1150 | * @return array the hour list |
| 1151 | 1151 | */ |
| 1152 | - public function countAllHours($orderby,$filters = array()) |
|
| 1152 | + public function countAllHours($orderby, $filters = array()) |
|
| 1153 | 1153 | { |
| 1154 | 1154 | global $globalTimezone, $globalDBdriver; |
| 1155 | 1155 | if ($globalTimezone != '') { |
@@ -1197,7 +1197,7 @@ discard block |
||
| 1197 | 1197 | $hour_array = array(); |
| 1198 | 1198 | $temp_array = array(); |
| 1199 | 1199 | |
| 1200 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1200 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1201 | 1201 | { |
| 1202 | 1202 | $temp_array['hour_name'] = $row['hour_name']; |
| 1203 | 1203 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1219,8 +1219,8 @@ discard block |
||
| 1219 | 1219 | public function countAllHoursByDate($date, $filters = array()) |
| 1220 | 1220 | { |
| 1221 | 1221 | global $globalTimezone, $globalDBdriver; |
| 1222 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1223 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 1222 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1223 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 1224 | 1224 | if ($globalTimezone != '') { |
| 1225 | 1225 | date_default_timezone_set($globalTimezone); |
| 1226 | 1226 | $datetime = new DateTime($date); |
@@ -1228,12 +1228,12 @@ discard block |
||
| 1228 | 1228 | } else $offset = '+00:00'; |
| 1229 | 1229 | |
| 1230 | 1230 | if ($globalDBdriver == 'mysql') { |
| 1231 | - $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1231 | + $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1232 | 1232 | FROM tracker_output".$filter_query." DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) = :date |
| 1233 | 1233 | GROUP BY hour_name |
| 1234 | 1234 | ORDER BY hour_name ASC"; |
| 1235 | 1235 | } else { |
| 1236 | - $query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1236 | + $query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1237 | 1237 | FROM tracker_output".$filter_query." to_char(tracker_output.date AT TIME ZONE INTERVAL :offset, 'YYYY-mm-dd') = :date |
| 1238 | 1238 | GROUP BY hour_name |
| 1239 | 1239 | ORDER BY hour_name ASC"; |
@@ -1245,7 +1245,7 @@ discard block |
||
| 1245 | 1245 | $hour_array = array(); |
| 1246 | 1246 | $temp_array = array(); |
| 1247 | 1247 | |
| 1248 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1248 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1249 | 1249 | { |
| 1250 | 1250 | $temp_array['hour_name'] = $row['hour_name']; |
| 1251 | 1251 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1267,8 +1267,8 @@ discard block |
||
| 1267 | 1267 | public function countAllHoursByIdent($ident, $filters = array()) |
| 1268 | 1268 | { |
| 1269 | 1269 | global $globalTimezone, $globalDBdriver; |
| 1270 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1271 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 1270 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1271 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 1272 | 1272 | if ($globalTimezone != '') { |
| 1273 | 1273 | date_default_timezone_set($globalTimezone); |
| 1274 | 1274 | $datetime = new DateTime(); |
@@ -1276,12 +1276,12 @@ discard block |
||
| 1276 | 1276 | } else $offset = '+00:00'; |
| 1277 | 1277 | |
| 1278 | 1278 | if ($globalDBdriver == 'mysql') { |
| 1279 | - $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1279 | + $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1280 | 1280 | FROM tracker_output".$filter_query." tracker_output.ident = :ident |
| 1281 | 1281 | GROUP BY hour_name |
| 1282 | 1282 | ORDER BY hour_name ASC"; |
| 1283 | 1283 | } else { |
| 1284 | - $query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1284 | + $query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1285 | 1285 | FROM tracker_output".$filter_query." tracker_output.ident = :ident |
| 1286 | 1286 | GROUP BY hour_name |
| 1287 | 1287 | ORDER BY hour_name ASC"; |
@@ -1289,12 +1289,12 @@ discard block |
||
| 1289 | 1289 | |
| 1290 | 1290 | |
| 1291 | 1291 | $sth = $this->db->prepare($query); |
| 1292 | - $sth->execute(array(':ident' => $ident,':offset' => $offset)); |
|
| 1292 | + $sth->execute(array(':ident' => $ident, ':offset' => $offset)); |
|
| 1293 | 1293 | |
| 1294 | 1294 | $hour_array = array(); |
| 1295 | 1295 | $temp_array = array(); |
| 1296 | 1296 | |
| 1297 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1297 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1298 | 1298 | { |
| 1299 | 1299 | $temp_array['hour_name'] = $row['hour_name']; |
| 1300 | 1300 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1314,33 +1314,33 @@ discard block |
||
| 1314 | 1314 | * @param string $month |
| 1315 | 1315 | * @return Integer the number of trackers |
| 1316 | 1316 | */ |
| 1317 | - public function countOverallTracker($filters = array(),$year = '',$month = '') |
|
| 1317 | + public function countOverallTracker($filters = array(), $year = '', $month = '') |
|
| 1318 | 1318 | { |
| 1319 | 1319 | global $globalDBdriver; |
| 1320 | 1320 | //$queryi = "SELECT COUNT(tracker_output.tracker_id) AS flight_count FROM tracker_output"; |
| 1321 | - $queryi = "SELECT COUNT(DISTINCT tracker_output.ident) AS tracker_count FROM tracker_output"; |
|
| 1321 | + $queryi = "SELECT COUNT(DISTINCT tracker_output.ident) AS tracker_count FROM tracker_output"; |
|
| 1322 | 1322 | $query_values = array(); |
| 1323 | 1323 | $query = ''; |
| 1324 | 1324 | if ($year != '') { |
| 1325 | 1325 | if ($globalDBdriver == 'mysql') { |
| 1326 | 1326 | $query .= " AND YEAR(tracker_output.date) = :year"; |
| 1327 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1327 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1328 | 1328 | } else { |
| 1329 | 1329 | $query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year"; |
| 1330 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1330 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1331 | 1331 | } |
| 1332 | 1332 | } |
| 1333 | 1333 | if ($month != '') { |
| 1334 | 1334 | if ($globalDBdriver == 'mysql') { |
| 1335 | 1335 | $query .= " AND MONTH(tracker_output.date) = :month"; |
| 1336 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1336 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1337 | 1337 | } else { |
| 1338 | 1338 | $query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month"; |
| 1339 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1339 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1340 | 1340 | } |
| 1341 | 1341 | } |
| 1342 | 1342 | if (empty($query_values)) $queryi .= $this->getFilter($filters); |
| 1343 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 1343 | + else $queryi .= $this->getFilter($filters, true, true).substr($query, 4); |
|
| 1344 | 1344 | |
| 1345 | 1345 | $sth = $this->db->prepare($queryi); |
| 1346 | 1346 | $sth->execute($query_values); |
@@ -1355,32 +1355,32 @@ discard block |
||
| 1355 | 1355 | * @param string $month |
| 1356 | 1356 | * @return Integer the number of flights |
| 1357 | 1357 | */ |
| 1358 | - public function countOverallTrackerTypes($filters = array(),$year = '',$month = '') |
|
| 1358 | + public function countOverallTrackerTypes($filters = array(), $year = '', $month = '') |
|
| 1359 | 1359 | { |
| 1360 | 1360 | global $globalDBdriver; |
| 1361 | - $queryi = "SELECT COUNT(DISTINCT tracker_output.type) AS tracker_count FROM tracker_output"; |
|
| 1361 | + $queryi = "SELECT COUNT(DISTINCT tracker_output.type) AS tracker_count FROM tracker_output"; |
|
| 1362 | 1362 | $query_values = array(); |
| 1363 | 1363 | $query = ''; |
| 1364 | 1364 | if ($year != '') { |
| 1365 | 1365 | if ($globalDBdriver == 'mysql') { |
| 1366 | 1366 | $query .= " AND YEAR(tracker_output.date) = :year"; |
| 1367 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1367 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1368 | 1368 | } else { |
| 1369 | 1369 | $query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year"; |
| 1370 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1370 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1371 | 1371 | } |
| 1372 | 1372 | } |
| 1373 | 1373 | if ($month != '') { |
| 1374 | 1374 | if ($globalDBdriver == 'mysql') { |
| 1375 | 1375 | $query .= " AND MONTH(tracker_output.date) = :month"; |
| 1376 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1376 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1377 | 1377 | } else { |
| 1378 | 1378 | $query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month"; |
| 1379 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1379 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1380 | 1380 | } |
| 1381 | 1381 | } |
| 1382 | 1382 | if (empty($query_values)) $queryi .= $this->getFilter($filters); |
| 1383 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 1383 | + else $queryi .= $this->getFilter($filters, true, true).substr($query, 4); |
|
| 1384 | 1384 | |
| 1385 | 1385 | $sth = $this->db->prepare($queryi); |
| 1386 | 1386 | $sth->execute($query_values); |
@@ -1397,7 +1397,7 @@ discard block |
||
| 1397 | 1397 | public function countAllHoursFromToday($filters = array()) |
| 1398 | 1398 | { |
| 1399 | 1399 | global $globalTimezone, $globalDBdriver; |
| 1400 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1400 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1401 | 1401 | if ($globalTimezone != '') { |
| 1402 | 1402 | date_default_timezone_set($globalTimezone); |
| 1403 | 1403 | $datetime = new DateTime(); |
@@ -1405,12 +1405,12 @@ discard block |
||
| 1405 | 1405 | } else $offset = '+00:00'; |
| 1406 | 1406 | |
| 1407 | 1407 | if ($globalDBdriver == 'mysql') { |
| 1408 | - $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1408 | + $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1409 | 1409 | FROM tracker_output".$filter_query." DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) = CURDATE() |
| 1410 | 1410 | GROUP BY hour_name |
| 1411 | 1411 | ORDER BY hour_name ASC"; |
| 1412 | 1412 | } else { |
| 1413 | - $query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1413 | + $query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1414 | 1414 | FROM tracker_output".$filter_query." to_char(tracker_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = CAST(NOW() AS date) |
| 1415 | 1415 | GROUP BY hour_name |
| 1416 | 1416 | ORDER BY hour_name ASC"; |
@@ -1422,7 +1422,7 @@ discard block |
||
| 1422 | 1422 | $hour_array = array(); |
| 1423 | 1423 | $temp_array = array(); |
| 1424 | 1424 | |
| 1425 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1425 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1426 | 1426 | { |
| 1427 | 1427 | $temp_array['hour_name'] = $row['hour_name']; |
| 1428 | 1428 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1441,9 +1441,9 @@ discard block |
||
| 1441 | 1441 | */ |
| 1442 | 1442 | public function getTrackerIDBasedOnFamTrackID($famtrackid) |
| 1443 | 1443 | { |
| 1444 | - $famtrackid = filter_var($famtrackid,FILTER_SANITIZE_STRING); |
|
| 1444 | + $famtrackid = filter_var($famtrackid, FILTER_SANITIZE_STRING); |
|
| 1445 | 1445 | |
| 1446 | - $query = "SELECT tracker_output.tracker_id |
|
| 1446 | + $query = "SELECT tracker_output.tracker_id |
|
| 1447 | 1447 | FROM tracker_output |
| 1448 | 1448 | WHERE tracker_output.famtrackid = '".$famtrackid."'"; |
| 1449 | 1449 | |
@@ -1451,7 +1451,7 @@ discard block |
||
| 1451 | 1451 | $sth = $this->db->prepare($query); |
| 1452 | 1452 | $sth->execute(); |
| 1453 | 1453 | |
| 1454 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1454 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1455 | 1455 | { |
| 1456 | 1456 | return $row['tracker_id']; |
| 1457 | 1457 | } |
@@ -1476,23 +1476,23 @@ discard block |
||
| 1476 | 1476 | } |
| 1477 | 1477 | |
| 1478 | 1478 | $current_date = date("Y-m-d H:i:s"); |
| 1479 | - $date = date("Y-m-d H:i:s",strtotime($dateString." UTC")); |
|
| 1479 | + $date = date("Y-m-d H:i:s", strtotime($dateString." UTC")); |
|
| 1480 | 1480 | |
| 1481 | 1481 | $diff = abs(strtotime($current_date) - strtotime($date)); |
| 1482 | 1482 | |
| 1483 | - $time_array['years'] = floor($diff / (365*60*60*24)); |
|
| 1483 | + $time_array['years'] = floor($diff/(365*60*60*24)); |
|
| 1484 | 1484 | $years = $time_array['years']; |
| 1485 | 1485 | |
| 1486 | - $time_array['months'] = floor(($diff - $years * 365*60*60*24) / (30*60*60*24)); |
|
| 1486 | + $time_array['months'] = floor(($diff - $years*365*60*60*24)/(30*60*60*24)); |
|
| 1487 | 1487 | $months = $time_array['months']; |
| 1488 | 1488 | |
| 1489 | - $time_array['days'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24)/ (60*60*24)); |
|
| 1489 | + $time_array['days'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24)/(60*60*24)); |
|
| 1490 | 1490 | $days = $time_array['days']; |
| 1491 | - $time_array['hours'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/ (60*60)); |
|
| 1491 | + $time_array['hours'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/(60*60)); |
|
| 1492 | 1492 | $hours = $time_array['hours']; |
| 1493 | - $time_array['minutes'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/ 60); |
|
| 1493 | + $time_array['minutes'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/60); |
|
| 1494 | 1494 | $minutes = $time_array['minutes']; |
| 1495 | - $time_array['seconds'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60)); |
|
| 1495 | + $time_array['seconds'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60)); |
|
| 1496 | 1496 | |
| 1497 | 1497 | return $time_array; |
| 1498 | 1498 | } |
@@ -1515,63 +1515,63 @@ discard block |
||
| 1515 | 1515 | $temp_array['direction_degree'] = $direction; |
| 1516 | 1516 | $temp_array['direction_shortname'] = "N"; |
| 1517 | 1517 | $temp_array['direction_fullname'] = "North"; |
| 1518 | - } elseif ($direction >= 22.5 && $direction < 45){ |
|
| 1518 | + } elseif ($direction >= 22.5 && $direction < 45) { |
|
| 1519 | 1519 | $temp_array['direction_degree'] = $direction; |
| 1520 | 1520 | $temp_array['direction_shortname'] = "NNE"; |
| 1521 | 1521 | $temp_array['direction_fullname'] = "North-Northeast"; |
| 1522 | - } elseif ($direction >= 45 && $direction < 67.5){ |
|
| 1522 | + } elseif ($direction >= 45 && $direction < 67.5) { |
|
| 1523 | 1523 | $temp_array['direction_degree'] = $direction; |
| 1524 | 1524 | $temp_array['direction_shortname'] = "NE"; |
| 1525 | 1525 | $temp_array['direction_fullname'] = "Northeast"; |
| 1526 | - } elseif ($direction >= 67.5 && $direction < 90){ |
|
| 1526 | + } elseif ($direction >= 67.5 && $direction < 90) { |
|
| 1527 | 1527 | $temp_array['direction_degree'] = $direction; |
| 1528 | 1528 | $temp_array['direction_shortname'] = "ENE"; |
| 1529 | 1529 | $temp_array['direction_fullname'] = "East-Northeast"; |
| 1530 | - } elseif ($direction >= 90 && $direction < 112.5){ |
|
| 1530 | + } elseif ($direction >= 90 && $direction < 112.5) { |
|
| 1531 | 1531 | $temp_array['direction_degree'] = $direction; |
| 1532 | 1532 | $temp_array['direction_shortname'] = "E"; |
| 1533 | 1533 | $temp_array['direction_fullname'] = "East"; |
| 1534 | - } elseif ($direction >= 112.5 && $direction < 135){ |
|
| 1534 | + } elseif ($direction >= 112.5 && $direction < 135) { |
|
| 1535 | 1535 | $temp_array['direction_degree'] = $direction; |
| 1536 | 1536 | $temp_array['direction_shortname'] = "ESE"; |
| 1537 | 1537 | $temp_array['direction_fullname'] = "East-Southeast"; |
| 1538 | - } elseif ($direction >= 135 && $direction < 157.5){ |
|
| 1538 | + } elseif ($direction >= 135 && $direction < 157.5) { |
|
| 1539 | 1539 | $temp_array['direction_degree'] = $direction; |
| 1540 | 1540 | $temp_array['direction_shortname'] = "SE"; |
| 1541 | 1541 | $temp_array['direction_fullname'] = "Southeast"; |
| 1542 | - } elseif ($direction >= 157.5 && $direction < 180){ |
|
| 1542 | + } elseif ($direction >= 157.5 && $direction < 180) { |
|
| 1543 | 1543 | $temp_array['direction_degree'] = $direction; |
| 1544 | 1544 | $temp_array['direction_shortname'] = "SSE"; |
| 1545 | 1545 | $temp_array['direction_fullname'] = "South-Southeast"; |
| 1546 | - } elseif ($direction >= 180 && $direction < 202.5){ |
|
| 1546 | + } elseif ($direction >= 180 && $direction < 202.5) { |
|
| 1547 | 1547 | $temp_array['direction_degree'] = $direction; |
| 1548 | 1548 | $temp_array['direction_shortname'] = "S"; |
| 1549 | 1549 | $temp_array['direction_fullname'] = "South"; |
| 1550 | - } elseif ($direction >= 202.5 && $direction < 225){ |
|
| 1550 | + } elseif ($direction >= 202.5 && $direction < 225) { |
|
| 1551 | 1551 | $temp_array['direction_degree'] = $direction; |
| 1552 | 1552 | $temp_array['direction_shortname'] = "SSW"; |
| 1553 | 1553 | $temp_array['direction_fullname'] = "South-Southwest"; |
| 1554 | - } elseif ($direction >= 225 && $direction < 247.5){ |
|
| 1554 | + } elseif ($direction >= 225 && $direction < 247.5) { |
|
| 1555 | 1555 | $temp_array['direction_degree'] = $direction; |
| 1556 | 1556 | $temp_array['direction_shortname'] = "SW"; |
| 1557 | 1557 | $temp_array['direction_fullname'] = "Southwest"; |
| 1558 | - } elseif ($direction >= 247.5 && $direction < 270){ |
|
| 1558 | + } elseif ($direction >= 247.5 && $direction < 270) { |
|
| 1559 | 1559 | $temp_array['direction_degree'] = $direction; |
| 1560 | 1560 | $temp_array['direction_shortname'] = "WSW"; |
| 1561 | 1561 | $temp_array['direction_fullname'] = "West-Southwest"; |
| 1562 | - } elseif ($direction >= 270 && $direction < 292.5){ |
|
| 1562 | + } elseif ($direction >= 270 && $direction < 292.5) { |
|
| 1563 | 1563 | $temp_array['direction_degree'] = $direction; |
| 1564 | 1564 | $temp_array['direction_shortname'] = "W"; |
| 1565 | 1565 | $temp_array['direction_fullname'] = "West"; |
| 1566 | - } elseif ($direction >= 292.5 && $direction < 315){ |
|
| 1566 | + } elseif ($direction >= 292.5 && $direction < 315) { |
|
| 1567 | 1567 | $temp_array['direction_degree'] = $direction; |
| 1568 | 1568 | $temp_array['direction_shortname'] = "WNW"; |
| 1569 | 1569 | $temp_array['direction_fullname'] = "West-Northwest"; |
| 1570 | - } elseif ($direction >= 315 && $direction < 337.5){ |
|
| 1570 | + } elseif ($direction >= 315 && $direction < 337.5) { |
|
| 1571 | 1571 | $temp_array['direction_degree'] = $direction; |
| 1572 | 1572 | $temp_array['direction_shortname'] = "NW"; |
| 1573 | 1573 | $temp_array['direction_fullname'] = "Northwest"; |
| 1574 | - } elseif ($direction >= 337.5 && $direction < 360){ |
|
| 1574 | + } elseif ($direction >= 337.5 && $direction < 360) { |
|
| 1575 | 1575 | $temp_array['direction_degree'] = $direction; |
| 1576 | 1576 | $temp_array['direction_shortname'] = "NNW"; |
| 1577 | 1577 | $temp_array['direction_fullname'] = "North-Northwest"; |
@@ -1588,11 +1588,11 @@ discard block |
||
| 1588 | 1588 | * @param Float $longitude longitute of the flight |
| 1589 | 1589 | * @return String the countrie |
| 1590 | 1590 | */ |
| 1591 | - public function getCountryFromLatitudeLongitude($latitude,$longitude) |
|
| 1591 | + public function getCountryFromLatitudeLongitude($latitude, $longitude) |
|
| 1592 | 1592 | { |
| 1593 | 1593 | global $globalDebug; |
| 1594 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1595 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1594 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1595 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1596 | 1596 | |
| 1597 | 1597 | $Connection = new Connection($this->db); |
| 1598 | 1598 | if (!$Connection->tableExists('countries')) return ''; |
@@ -1623,7 +1623,7 @@ discard block |
||
| 1623 | 1623 | public function getCountryFromISO2($iso2) |
| 1624 | 1624 | { |
| 1625 | 1625 | global $globalDebug; |
| 1626 | - $iso2 = filter_var($iso2,FILTER_SANITIZE_STRING); |
|
| 1626 | + $iso2 = filter_var($iso2, FILTER_SANITIZE_STRING); |
|
| 1627 | 1627 | |
| 1628 | 1628 | $Connection = new Connection($this->db); |
| 1629 | 1629 | if (!$Connection->tableExists('countries')) return ''; |
@@ -1658,11 +1658,11 @@ discard block |
||
| 1658 | 1658 | * @param string $day |
| 1659 | 1659 | * @return array the vessel type list |
| 1660 | 1660 | */ |
| 1661 | - public function countAllTrackerTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '') |
|
| 1661 | + public function countAllTrackerTypes($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '') |
|
| 1662 | 1662 | { |
| 1663 | 1663 | global $globalDBdriver; |
| 1664 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1665 | - $query = "SELECT tracker_output.type AS tracker_type, COUNT(tracker_output.type) AS tracker_type_count |
|
| 1664 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1665 | + $query = "SELECT tracker_output.type AS tracker_type, COUNT(tracker_output.type) AS tracker_type_count |
|
| 1666 | 1666 | FROM tracker_output ".$filter_query." tracker_output.type <> ''"; |
| 1667 | 1667 | if ($olderthanmonths > 0) { |
| 1668 | 1668 | if ($globalDBdriver == 'mysql') { |
@@ -1682,28 +1682,28 @@ discard block |
||
| 1682 | 1682 | if ($year != '') { |
| 1683 | 1683 | if ($globalDBdriver == 'mysql') { |
| 1684 | 1684 | $query .= " AND YEAR(tracker_output.date) = :year"; |
| 1685 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1685 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1686 | 1686 | } else { |
| 1687 | 1687 | $query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year"; |
| 1688 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1688 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1689 | 1689 | } |
| 1690 | 1690 | } |
| 1691 | 1691 | if ($month != '') { |
| 1692 | 1692 | if ($globalDBdriver == 'mysql') { |
| 1693 | 1693 | $query .= " AND MONTH(tracker_output.date) = :month"; |
| 1694 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1694 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1695 | 1695 | } else { |
| 1696 | 1696 | $query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month"; |
| 1697 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1697 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1698 | 1698 | } |
| 1699 | 1699 | } |
| 1700 | 1700 | if ($day != '') { |
| 1701 | 1701 | if ($globalDBdriver == 'mysql') { |
| 1702 | 1702 | $query .= " AND DAY(tracker_output.date) = :day"; |
| 1703 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 1703 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 1704 | 1704 | } else { |
| 1705 | 1705 | $query .= " AND EXTRACT(DAY FROM tracker_output.date) = :day"; |
| 1706 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 1706 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 1707 | 1707 | } |
| 1708 | 1708 | } |
| 1709 | 1709 | $query .= " GROUP BY tracker_output.type ORDER BY tracker_type_count DESC"; |
@@ -1712,7 +1712,7 @@ discard block |
||
| 1712 | 1712 | $sth->execute($query_values); |
| 1713 | 1713 | $tracker_array = array(); |
| 1714 | 1714 | $temp_array = array(); |
| 1715 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1715 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1716 | 1716 | { |
| 1717 | 1717 | $temp_array['tracker_type'] = $row['tracker_type']; |
| 1718 | 1718 | $temp_array['tracker_type_count'] = $row['tracker_type_count']; |
@@ -1736,13 +1736,13 @@ discard block |
||
| 1736 | 1736 | * @param array $filters |
| 1737 | 1737 | * @return array the tracker information |
| 1738 | 1738 | */ |
| 1739 | - public function searchTrackerData($q = '', $callsign = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '',$filters = array()) |
|
| 1739 | + public function searchTrackerData($q = '', $callsign = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '', $filters = array()) |
|
| 1740 | 1740 | { |
| 1741 | 1741 | global $globalTimezone, $globalDBdriver; |
| 1742 | 1742 | date_default_timezone_set('UTC'); |
| 1743 | 1743 | $query_values = array(); |
| 1744 | 1744 | $additional_query = ''; |
| 1745 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1745 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1746 | 1746 | if ($q != "") |
| 1747 | 1747 | { |
| 1748 | 1748 | if (!is_string($q)) |
@@ -1750,8 +1750,8 @@ discard block |
||
| 1750 | 1750 | return array(); |
| 1751 | 1751 | } else { |
| 1752 | 1752 | $q_array = explode(" ", $q); |
| 1753 | - foreach ($q_array as $q_item){ |
|
| 1754 | - $q_item = filter_var($q_item,FILTER_SANITIZE_STRING); |
|
| 1753 | + foreach ($q_array as $q_item) { |
|
| 1754 | + $q_item = filter_var($q_item, FILTER_SANITIZE_STRING); |
|
| 1755 | 1755 | $additional_query .= " AND ("; |
| 1756 | 1756 | if (is_int($q_item)) $additional_query .= "(tracker_output.tracker_id = '".$q_item."') OR "; |
| 1757 | 1757 | $additional_query .= "(tracker_output.ident like '%".$q_item."%') OR "; |
@@ -1761,20 +1761,20 @@ discard block |
||
| 1761 | 1761 | } |
| 1762 | 1762 | if ($callsign != "") |
| 1763 | 1763 | { |
| 1764 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 1764 | + $callsign = filter_var($callsign, FILTER_SANITIZE_STRING); |
|
| 1765 | 1765 | if (!is_string($callsign)) |
| 1766 | 1766 | { |
| 1767 | 1767 | return array(); |
| 1768 | 1768 | } else { |
| 1769 | 1769 | $additional_query .= " AND tracker_output.ident = :callsign"; |
| 1770 | - $query_values = array_merge($query_values,array(':callsign' => $callsign)); |
|
| 1770 | + $query_values = array_merge($query_values, array(':callsign' => $callsign)); |
|
| 1771 | 1771 | } |
| 1772 | 1772 | } |
| 1773 | 1773 | if ($date_posted != "") |
| 1774 | 1774 | { |
| 1775 | 1775 | $date_array = explode(",", $date_posted); |
| 1776 | - $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 1777 | - $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 1776 | + $date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING); |
|
| 1777 | + $date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING); |
|
| 1778 | 1778 | if ($globalTimezone != '') { |
| 1779 | 1779 | date_default_timezone_set($globalTimezone); |
| 1780 | 1780 | $datetime = new DateTime(); |
@@ -1801,8 +1801,8 @@ discard block |
||
| 1801 | 1801 | if ($limit != "") |
| 1802 | 1802 | { |
| 1803 | 1803 | $limit_array = explode(",", $limit); |
| 1804 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1805 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1804 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1805 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1806 | 1806 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1807 | 1807 | { |
| 1808 | 1808 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
@@ -1820,22 +1820,22 @@ discard block |
||
| 1820 | 1820 | } |
| 1821 | 1821 | } |
| 1822 | 1822 | if ($origLat != "" && $origLon != "" && $dist != "") { |
| 1823 | - $dist = number_format($dist*0.621371,2,'.',''); // convert km to mile |
|
| 1823 | + $dist = number_format($dist*0.621371, 2, '.', ''); // convert km to mile |
|
| 1824 | 1824 | if ($globalDBdriver == 'mysql') { |
| 1825 | - $query="SELECT tracker_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - tracker_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(tracker_archive.latitude*pi()/180)*POWER(SIN(($origLon-tracker_archive.longitude)*pi()/180/2),2))) as distance |
|
| 1825 | + $query = "SELECT tracker_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - tracker_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(tracker_archive.latitude*pi()/180)*POWER(SIN(($origLon-tracker_archive.longitude)*pi()/180/2),2))) as distance |
|
| 1826 | 1826 | FROM tracker_archive,tracker_output".$filter_query." tracker_output.famtrackid = tracker_archive.famtrackid AND tracker_output.ident <> '' ".$additional_query."AND tracker_archive.longitude between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat)*69)) and tracker_archive.latitude between ($origLat-($dist/69)) and ($origLat+($dist/69)) |
| 1827 | 1827 | AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - tracker_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(tracker_archive.latitude*pi()/180)*POWER(SIN(($origLon-tracker_archive.longitude)*pi()/180/2),2)))) < $dist".$orderby_query; |
| 1828 | 1828 | } else { |
| 1829 | - $query="SELECT tracker_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(tracker_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(tracker_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
| 1829 | + $query = "SELECT tracker_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(tracker_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(tracker_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
| 1830 | 1830 | FROM tracker_archive,tracker_output".$filter_query." tracker_output.famtrackid = tracker_archive.famtrackid AND tracker_output.ident <> '' ".$additional_query."AND CAST(tracker_archive.longitude as double precision) between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat))*69) and CAST(tracker_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) |
| 1831 | 1831 | AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(tracker_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(tracker_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query.$orderby_query; |
| 1832 | 1832 | } |
| 1833 | 1833 | } else { |
| 1834 | - $query = "SELECT tracker_output.* FROM tracker_output".$filter_query." tracker_output.ident <> '' |
|
| 1834 | + $query = "SELECT tracker_output.* FROM tracker_output".$filter_query." tracker_output.ident <> '' |
|
| 1835 | 1835 | ".$additional_query." |
| 1836 | 1836 | ".$orderby_query; |
| 1837 | 1837 | } |
| 1838 | - $tracker_array = $this->getDataFromDB($query, $query_values,$limit_query); |
|
| 1838 | + $tracker_array = $this->getDataFromDB($query, $query_values, $limit_query); |
|
| 1839 | 1839 | return $tracker_array; |
| 1840 | 1840 | } |
| 1841 | 1841 | |
@@ -1860,7 +1860,7 @@ discard block |
||
| 1860 | 1860 | curl_close($ch); |
| 1861 | 1861 | $bitly_data = json_decode($bitly_data); |
| 1862 | 1862 | $bitly_url = ''; |
| 1863 | - if ($bitly_data->status_txt = "OK"){ |
|
| 1863 | + if ($bitly_data->status_txt = "OK") { |
|
| 1864 | 1864 | $bitly_url = $bitly_data->data->url; |
| 1865 | 1865 | } |
| 1866 | 1866 | return $bitly_url; |
@@ -1868,7 +1868,7 @@ discard block |
||
| 1868 | 1868 | |
| 1869 | 1869 | public function getOrderBy() |
| 1870 | 1870 | { |
| 1871 | - $orderby = array("type_asc" => array("key" => "type_asc", "value" => "Type - ASC", "sql" => "ORDER BY tracker_output.type ASC"), "type_desc" => array("key" => "type_desc", "value" => "Type - DESC", "sql" => "ORDER BY tracker_output.type DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY tracker_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY tracker_output.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY tracker_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY tracker_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY tracker_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY tracker_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY tracker_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY tracker_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY tracker_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY tracker_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY tracker_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY tracker_output.date DESC"),"distance_asc" => array("key" => "distance_asc","value" => "Distance - ASC","sql" => "ORDER BY distance ASC"),"distance_desc" => array("key" => "distance_desc","value" => "Distance - DESC","sql" => "ORDER BY distance DESC")); |
|
| 1871 | + $orderby = array("type_asc" => array("key" => "type_asc", "value" => "Type - ASC", "sql" => "ORDER BY tracker_output.type ASC"), "type_desc" => array("key" => "type_desc", "value" => "Type - DESC", "sql" => "ORDER BY tracker_output.type DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY tracker_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY tracker_output.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY tracker_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY tracker_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY tracker_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY tracker_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY tracker_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY tracker_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY tracker_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY tracker_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY tracker_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY tracker_output.date DESC"), "distance_asc" => array("key" => "distance_asc", "value" => "Distance - ASC", "sql" => "ORDER BY distance ASC"), "distance_desc" => array("key" => "distance_desc", "value" => "Distance - DESC", "sql" => "ORDER BY distance DESC")); |
|
| 1872 | 1872 | |
| 1873 | 1873 | return $orderby; |
| 1874 | 1874 | |
@@ -17,7 +17,9 @@ discard block |
||
| 17 | 17 | public function __construct($dbc = null) { |
| 18 | 18 | $Connection = new Connection($dbc); |
| 19 | 19 | $this->db = $Connection->db(); |
| 20 | - if ($this->db === null) die('Error: No DB connection. (Tracker)'); |
|
| 20 | + if ($this->db === null) { |
|
| 21 | + die('Error: No DB connection. (Tracker)'); |
|
| 22 | + } |
|
| 21 | 23 | } |
| 22 | 24 | |
| 23 | 25 | /** |
@@ -41,7 +43,9 @@ discard block |
||
| 41 | 43 | if (isset($filter[0]['source'])) { |
| 42 | 44 | $filters = array_merge($filters,$filter); |
| 43 | 45 | } |
| 44 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 46 | + if (is_array($globalFilter)) { |
|
| 47 | + $filter = array_merge($filter,$globalFilter); |
|
| 48 | + } |
|
| 45 | 49 | $filter_query_join = ''; |
| 46 | 50 | $filter_query_where = ''; |
| 47 | 51 | foreach($filters as $flt) { |
@@ -83,8 +87,11 @@ discard block |
||
| 83 | 87 | $filter_query_where .= " AND EXTRACT(DAY FROM tracker_output.date) = '".$filter['day']."'"; |
| 84 | 88 | } |
| 85 | 89 | } |
| 86 | - if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
|
| 87 | - elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
|
| 90 | + if ($filter_query_where == '' && $where) { |
|
| 91 | + $filter_query_where = ' WHERE'; |
|
| 92 | + } elseif ($filter_query_where != '' && $and) { |
|
| 93 | + $filter_query_where .= ' AND'; |
|
| 94 | + } |
|
| 88 | 95 | if ($filter_query_where != '') { |
| 89 | 96 | $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
| 90 | 97 | } |
@@ -138,26 +145,43 @@ discard block |
||
| 138 | 145 | $temp_array['tracker_id'] = $row['tracker_archive_id']; |
| 139 | 146 | } elseif (isset($row['tracker_archive_output_id'])) { |
| 140 | 147 | $temp_array['tracker_id'] = $row['tracker_archive_output_id']; |
| 141 | - */} |
|
| 142 | - elseif (isset($row['trackerid'])) { |
|
| 148 | + */} elseif (isset($row['trackerid'])) { |
|
| 143 | 149 | $temp_array['trackerid'] = $row['trackerid']; |
| 144 | 150 | } else { |
| 145 | 151 | $temp_array['trackerid'] = ''; |
| 146 | 152 | } |
| 147 | - if (isset($row['famtrackid'])) $temp_array['famtrackid'] = $row['famtrackid']; |
|
| 148 | - if (isset($row['type'])) $temp_array['type'] = $row['type']; |
|
| 149 | - if (isset($row['comment'])) $temp_array['comment'] = $row['comment']; |
|
| 153 | + if (isset($row['famtrackid'])) { |
|
| 154 | + $temp_array['famtrackid'] = $row['famtrackid']; |
|
| 155 | + } |
|
| 156 | + if (isset($row['type'])) { |
|
| 157 | + $temp_array['type'] = $row['type']; |
|
| 158 | + } |
|
| 159 | + if (isset($row['comment'])) { |
|
| 160 | + $temp_array['comment'] = $row['comment']; |
|
| 161 | + } |
|
| 150 | 162 | $temp_array['ident'] = $row['ident']; |
| 151 | - if (isset($row['latitude'])) $temp_array['latitude'] = $row['latitude']; |
|
| 152 | - if (isset($row['longitude'])) $temp_array['longitude'] = $row['longitude']; |
|
| 153 | - if (isset($row['format_source'])) $temp_array['format_source'] = $row['format_source']; |
|
| 154 | - if (isset($row['altitude'])) $temp_array['altitude'] = $row['altitude']; |
|
| 163 | + if (isset($row['latitude'])) { |
|
| 164 | + $temp_array['latitude'] = $row['latitude']; |
|
| 165 | + } |
|
| 166 | + if (isset($row['longitude'])) { |
|
| 167 | + $temp_array['longitude'] = $row['longitude']; |
|
| 168 | + } |
|
| 169 | + if (isset($row['format_source'])) { |
|
| 170 | + $temp_array['format_source'] = $row['format_source']; |
|
| 171 | + } |
|
| 172 | + if (isset($row['altitude'])) { |
|
| 173 | + $temp_array['altitude'] = $row['altitude']; |
|
| 174 | + } |
|
| 155 | 175 | if (isset($row['heading'])) { |
| 156 | 176 | $temp_array['heading'] = $row['heading']; |
| 157 | 177 | $heading_direction = $this->parseDirection($row['heading']); |
| 158 | - if (isset($heading_direction[0]['direction_fullname'])) $temp_array['heading_name'] = $heading_direction[0]['direction_fullname']; |
|
| 178 | + if (isset($heading_direction[0]['direction_fullname'])) { |
|
| 179 | + $temp_array['heading_name'] = $heading_direction[0]['direction_fullname']; |
|
| 180 | + } |
|
| 181 | + } |
|
| 182 | + if (isset($row['ground_speed'])) { |
|
| 183 | + $temp_array['ground_speed'] = $row['ground_speed']; |
|
| 159 | 184 | } |
| 160 | - if (isset($row['ground_speed'])) $temp_array['ground_speed'] = $row['ground_speed']; |
|
| 161 | 185 | |
| 162 | 186 | if (isset($row['date'])) { |
| 163 | 187 | $dateArray = $this->parseDateString($row['date']); |
@@ -200,13 +224,21 @@ discard block |
||
| 200 | 224 | } |
| 201 | 225 | |
| 202 | 226 | $fromsource = NULL; |
| 203 | - if (isset($row['source_name']) && $row['source_name'] != '') $temp_array['source_name'] = $row['source_name']; |
|
| 204 | - if (isset($row['over_country']) && $row['over_country'] != '') $temp_array['over_country'] = $row['over_country']; |
|
| 205 | - if (isset($row['distance']) && $row['distance'] != '') $temp_array['distance'] = $row['distance']; |
|
| 227 | + if (isset($row['source_name']) && $row['source_name'] != '') { |
|
| 228 | + $temp_array['source_name'] = $row['source_name']; |
|
| 229 | + } |
|
| 230 | + if (isset($row['over_country']) && $row['over_country'] != '') { |
|
| 231 | + $temp_array['over_country'] = $row['over_country']; |
|
| 232 | + } |
|
| 233 | + if (isset($row['distance']) && $row['distance'] != '') { |
|
| 234 | + $temp_array['distance'] = $row['distance']; |
|
| 235 | + } |
|
| 206 | 236 | $temp_array['query_number_rows'] = $num_rows; |
| 207 | 237 | $tracker_array[] = $temp_array; |
| 208 | 238 | } |
| 209 | - if ($num_rows == 0) return array(); |
|
| 239 | + if ($num_rows == 0) { |
|
| 240 | + return array(); |
|
| 241 | + } |
|
| 210 | 242 | $tracker_array[0]['query_number_rows'] = $num_rows; |
| 211 | 243 | return $tracker_array; |
| 212 | 244 | } |
@@ -239,8 +271,12 @@ discard block |
||
| 239 | 271 | { |
| 240 | 272 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 241 | 273 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 242 | - } else $limit_query = ""; |
|
| 243 | - } else $limit_query = ""; |
|
| 274 | + } else { |
|
| 275 | + $limit_query = ""; |
|
| 276 | + } |
|
| 277 | + } else { |
|
| 278 | + $limit_query = ""; |
|
| 279 | + } |
|
| 244 | 280 | |
| 245 | 281 | if ($sort != "") |
| 246 | 282 | { |
@@ -268,7 +304,9 @@ discard block |
||
| 268 | 304 | global $global_tracker_query; |
| 269 | 305 | |
| 270 | 306 | date_default_timezone_set('UTC'); |
| 271 | - if ($id == '') return array(); |
|
| 307 | + if ($id == '') { |
|
| 308 | + return array(); |
|
| 309 | + } |
|
| 272 | 310 | $additional_query = "tracker_output.famtrackid = :id"; |
| 273 | 311 | $query_values = array(':id' => $id); |
| 274 | 312 | $query = $global_tracker_query." WHERE ".$additional_query." "; |
@@ -413,8 +451,11 @@ discard block |
||
| 413 | 451 | $query .= " ORDER BY tracker_output.source_name ASC"; |
| 414 | 452 | |
| 415 | 453 | $sth = $this->db->prepare($query); |
| 416 | - if (!empty($query_values)) $sth->execute($query_values); |
|
| 417 | - else $sth->execute(); |
|
| 454 | + if (!empty($query_values)) { |
|
| 455 | + $sth->execute($query_values); |
|
| 456 | + } else { |
|
| 457 | + $sth->execute(); |
|
| 458 | + } |
|
| 418 | 459 | |
| 419 | 460 | $source_array = array(); |
| 420 | 461 | $temp_array = array(); |
@@ -469,7 +510,9 @@ discard block |
||
| 469 | 510 | date_default_timezone_set($globalTimezone); |
| 470 | 511 | $datetime = new DateTime(); |
| 471 | 512 | $offset = $datetime->format('P'); |
| 472 | - } else $offset = '+00:00'; |
|
| 513 | + } else { |
|
| 514 | + $offset = '+00:00'; |
|
| 515 | + } |
|
| 473 | 516 | |
| 474 | 517 | if ($globalDBdriver == 'mysql') { |
| 475 | 518 | $query = "SELECT DISTINCT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) as date |
@@ -617,7 +660,9 @@ discard block |
||
| 617 | 660 | { |
| 618 | 661 | return false; |
| 619 | 662 | } |
| 620 | - } else $altitude = 0; |
|
| 663 | + } else { |
|
| 664 | + $altitude = 0; |
|
| 665 | + } |
|
| 621 | 666 | |
| 622 | 667 | if ($heading != "") |
| 623 | 668 | { |
@@ -656,8 +701,12 @@ discard block |
||
| 656 | 701 | $latitude = 0; |
| 657 | 702 | $longitude = 0; |
| 658 | 703 | } |
| 659 | - if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
|
| 660 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
|
| 704 | + if ($heading == '' || $Common->isInteger($heading) === false) { |
|
| 705 | + $heading = 0; |
|
| 706 | + } |
|
| 707 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) { |
|
| 708 | + $groundspeed = 0; |
|
| 709 | + } |
|
| 661 | 710 | $query = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type) |
| 662 | 711 | VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:speed,:date,:format_source, :source_name,:comment,:type)"; |
| 663 | 712 | |
@@ -764,7 +813,9 @@ discard block |
||
| 764 | 813 | global $globalDBdriver, $globalArchive; |
| 765 | 814 | //$filter_query = $this->getFilter($filters,true,true); |
| 766 | 815 | $Connection= new Connection($this->db); |
| 767 | - if (!$Connection->tableExists('countries')) return array(); |
|
| 816 | + if (!$Connection->tableExists('countries')) { |
|
| 817 | + return array(); |
|
| 818 | + } |
|
| 768 | 819 | if (!isset($globalArchive) || $globalArchive !== TRUE) { |
| 769 | 820 | require_once('class.TrackerLive.php'); |
| 770 | 821 | $TrackerLive = new TrackerLive($this->db); |
@@ -807,7 +858,9 @@ discard block |
||
| 807 | 858 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb FROM countries c INNER JOIN (SELECT DISTINCT famtrackid,over_country FROM tracker_archive".$filter_query.") l ON c.iso2 = l.over_country "; |
| 808 | 859 | } |
| 809 | 860 | $query .= "GROUP BY c.name,c.iso3,c.iso2 ORDER BY nb DESC"; |
| 810 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 861 | + if ($limit) { |
|
| 862 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 863 | + } |
|
| 811 | 864 | |
| 812 | 865 | |
| 813 | 866 | $sth = $this->db->prepare($query); |
@@ -846,12 +899,18 @@ discard block |
||
| 846 | 899 | $query = "SELECT DISTINCT tracker_output.ident, COUNT(tracker_output.ident) AS callsign_icao_count |
| 847 | 900 | FROM tracker_output".$filter_query." tracker_output.ident <> ''"; |
| 848 | 901 | if ($olderthanmonths > 0) { |
| 849 | - if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)'; |
|
| 850 | - else $query .= " AND tracker_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
|
| 902 | + if ($globalDBdriver == 'mysql') { |
|
| 903 | + $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)'; |
|
| 904 | + } else { |
|
| 905 | + $query .= " AND tracker_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
|
| 906 | + } |
|
| 851 | 907 | } |
| 852 | 908 | if ($sincedate != '') { |
| 853 | - if ($globalDBdriver == 'mysql') $query .= " AND tracker_output.date > '".$sincedate."'"; |
|
| 854 | - else $query .= " AND tracker_output.date > CAST('".$sincedate."' AS TIMESTAMP)"; |
|
| 909 | + if ($globalDBdriver == 'mysql') { |
|
| 910 | + $query .= " AND tracker_output.date > '".$sincedate."'"; |
|
| 911 | + } else { |
|
| 912 | + $query .= " AND tracker_output.date > CAST('".$sincedate."' AS TIMESTAMP)"; |
|
| 913 | + } |
|
| 855 | 914 | } |
| 856 | 915 | $query_values = array(); |
| 857 | 916 | if ($year != '') { |
@@ -882,7 +941,9 @@ discard block |
||
| 882 | 941 | } |
| 883 | 942 | } |
| 884 | 943 | $query .= " GROUP BY tracker_output.ident ORDER BY callsign_icao_count DESC"; |
| 885 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 944 | + if ($limit) { |
|
| 945 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 946 | + } |
|
| 886 | 947 | |
| 887 | 948 | $sth = $this->db->prepare($query); |
| 888 | 949 | $sth->execute($query_values); |
@@ -917,7 +978,9 @@ discard block |
||
| 917 | 978 | date_default_timezone_set($globalTimezone); |
| 918 | 979 | $datetime = new DateTime(); |
| 919 | 980 | $offset = $datetime->format('P'); |
| 920 | - } else $offset = '+00:00'; |
|
| 981 | + } else { |
|
| 982 | + $offset = '+00:00'; |
|
| 983 | + } |
|
| 921 | 984 | |
| 922 | 985 | if ($globalDBdriver == 'mysql') { |
| 923 | 986 | $query = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
@@ -967,7 +1030,9 @@ discard block |
||
| 967 | 1030 | date_default_timezone_set($globalTimezone); |
| 968 | 1031 | $datetime = new DateTime(); |
| 969 | 1032 | $offset = $datetime->format('P'); |
| 970 | - } else $offset = '+00:00'; |
|
| 1033 | + } else { |
|
| 1034 | + $offset = '+00:00'; |
|
| 1035 | + } |
|
| 971 | 1036 | $filter_query = $this->getFilter($filters,true,true); |
| 972 | 1037 | if ($globalDBdriver == 'mysql') { |
| 973 | 1038 | $query = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
@@ -1013,7 +1078,9 @@ discard block |
||
| 1013 | 1078 | date_default_timezone_set($globalTimezone); |
| 1014 | 1079 | $datetime = new DateTime(); |
| 1015 | 1080 | $offset = $datetime->format('P'); |
| 1016 | - } else $offset = '+00:00'; |
|
| 1081 | + } else { |
|
| 1082 | + $offset = '+00:00'; |
|
| 1083 | + } |
|
| 1017 | 1084 | $filter_query = $this->getFilter($filters,true,true); |
| 1018 | 1085 | if ($globalDBdriver == 'mysql') { |
| 1019 | 1086 | $query = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
@@ -1060,7 +1127,9 @@ discard block |
||
| 1060 | 1127 | date_default_timezone_set($globalTimezone); |
| 1061 | 1128 | $datetime = new DateTime(); |
| 1062 | 1129 | $offset = $datetime->format('P'); |
| 1063 | - } else $offset = '+00:00'; |
|
| 1130 | + } else { |
|
| 1131 | + $offset = '+00:00'; |
|
| 1132 | + } |
|
| 1064 | 1133 | |
| 1065 | 1134 | if ($globalDBdriver == 'mysql') { |
| 1066 | 1135 | $query = "SELECT YEAR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count |
@@ -1107,7 +1176,9 @@ discard block |
||
| 1107 | 1176 | date_default_timezone_set($globalTimezone); |
| 1108 | 1177 | $datetime = new DateTime(); |
| 1109 | 1178 | $offset = $datetime->format('P'); |
| 1110 | - } else $offset = '+00:00'; |
|
| 1179 | + } else { |
|
| 1180 | + $offset = '+00:00'; |
|
| 1181 | + } |
|
| 1111 | 1182 | $filter_query = $this->getFilter($filters,true,true); |
| 1112 | 1183 | if ($globalDBdriver == 'mysql') { |
| 1113 | 1184 | $query = "SELECT MONTH(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count |
@@ -1156,7 +1227,9 @@ discard block |
||
| 1156 | 1227 | date_default_timezone_set($globalTimezone); |
| 1157 | 1228 | $datetime = new DateTime(); |
| 1158 | 1229 | $offset = $datetime->format('P'); |
| 1159 | - } else $offset = '+00:00'; |
|
| 1230 | + } else { |
|
| 1231 | + $offset = '+00:00'; |
|
| 1232 | + } |
|
| 1160 | 1233 | |
| 1161 | 1234 | $orderby_sql = ''; |
| 1162 | 1235 | if ($orderby == "hour") |
@@ -1225,7 +1298,9 @@ discard block |
||
| 1225 | 1298 | date_default_timezone_set($globalTimezone); |
| 1226 | 1299 | $datetime = new DateTime($date); |
| 1227 | 1300 | $offset = $datetime->format('P'); |
| 1228 | - } else $offset = '+00:00'; |
|
| 1301 | + } else { |
|
| 1302 | + $offset = '+00:00'; |
|
| 1303 | + } |
|
| 1229 | 1304 | |
| 1230 | 1305 | if ($globalDBdriver == 'mysql') { |
| 1231 | 1306 | $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
@@ -1273,7 +1348,9 @@ discard block |
||
| 1273 | 1348 | date_default_timezone_set($globalTimezone); |
| 1274 | 1349 | $datetime = new DateTime(); |
| 1275 | 1350 | $offset = $datetime->format('P'); |
| 1276 | - } else $offset = '+00:00'; |
|
| 1351 | + } else { |
|
| 1352 | + $offset = '+00:00'; |
|
| 1353 | + } |
|
| 1277 | 1354 | |
| 1278 | 1355 | if ($globalDBdriver == 'mysql') { |
| 1279 | 1356 | $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
@@ -1339,8 +1416,11 @@ discard block |
||
| 1339 | 1416 | $query_values = array_merge($query_values,array(':month' => $month)); |
| 1340 | 1417 | } |
| 1341 | 1418 | } |
| 1342 | - if (empty($query_values)) $queryi .= $this->getFilter($filters); |
|
| 1343 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 1419 | + if (empty($query_values)) { |
|
| 1420 | + $queryi .= $this->getFilter($filters); |
|
| 1421 | + } else { |
|
| 1422 | + $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 1423 | + } |
|
| 1344 | 1424 | |
| 1345 | 1425 | $sth = $this->db->prepare($queryi); |
| 1346 | 1426 | $sth->execute($query_values); |
@@ -1379,8 +1459,11 @@ discard block |
||
| 1379 | 1459 | $query_values = array_merge($query_values,array(':month' => $month)); |
| 1380 | 1460 | } |
| 1381 | 1461 | } |
| 1382 | - if (empty($query_values)) $queryi .= $this->getFilter($filters); |
|
| 1383 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 1462 | + if (empty($query_values)) { |
|
| 1463 | + $queryi .= $this->getFilter($filters); |
|
| 1464 | + } else { |
|
| 1465 | + $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 1466 | + } |
|
| 1384 | 1467 | |
| 1385 | 1468 | $sth = $this->db->prepare($queryi); |
| 1386 | 1469 | $sth->execute($query_values); |
@@ -1402,7 +1485,9 @@ discard block |
||
| 1402 | 1485 | date_default_timezone_set($globalTimezone); |
| 1403 | 1486 | $datetime = new DateTime(); |
| 1404 | 1487 | $offset = $datetime->format('P'); |
| 1405 | - } else $offset = '+00:00'; |
|
| 1488 | + } else { |
|
| 1489 | + $offset = '+00:00'; |
|
| 1490 | + } |
|
| 1406 | 1491 | |
| 1407 | 1492 | if ($globalDBdriver == 'mysql') { |
| 1408 | 1493 | $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
@@ -1506,7 +1591,9 @@ discard block |
||
| 1506 | 1591 | */ |
| 1507 | 1592 | public function parseDirection($direction = 0) |
| 1508 | 1593 | { |
| 1509 | - if ($direction == '') $direction = 0; |
|
| 1594 | + if ($direction == '') { |
|
| 1595 | + $direction = 0; |
|
| 1596 | + } |
|
| 1510 | 1597 | $direction_array = array(); |
| 1511 | 1598 | $temp_array = array(); |
| 1512 | 1599 | |
@@ -1595,7 +1682,9 @@ discard block |
||
| 1595 | 1682 | $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 1596 | 1683 | |
| 1597 | 1684 | $Connection = new Connection($this->db); |
| 1598 | - if (!$Connection->tableExists('countries')) return ''; |
|
| 1685 | + if (!$Connection->tableExists('countries')) { |
|
| 1686 | + return ''; |
|
| 1687 | + } |
|
| 1599 | 1688 | |
| 1600 | 1689 | try { |
| 1601 | 1690 | $query = "SELECT name,iso2,iso3 FROM countries WHERE ST_Within(ST_GeomFromText('POINT(".$longitude." ".$latitude.")',4326), ogc_geom) LIMIT 1"; |
@@ -1606,9 +1695,13 @@ discard block |
||
| 1606 | 1695 | $sth->closeCursor(); |
| 1607 | 1696 | if (count($row) > 0) { |
| 1608 | 1697 | return $row; |
| 1609 | - } else return ''; |
|
| 1698 | + } else { |
|
| 1699 | + return ''; |
|
| 1700 | + } |
|
| 1610 | 1701 | } catch (PDOException $e) { |
| 1611 | - if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n"; |
|
| 1702 | + if (isset($globalDebug) && $globalDebug) { |
|
| 1703 | + echo 'Error : '.$e->getMessage()."\n"; |
|
| 1704 | + } |
|
| 1612 | 1705 | return ''; |
| 1613 | 1706 | } |
| 1614 | 1707 | |
@@ -1626,7 +1719,9 @@ discard block |
||
| 1626 | 1719 | $iso2 = filter_var($iso2,FILTER_SANITIZE_STRING); |
| 1627 | 1720 | |
| 1628 | 1721 | $Connection = new Connection($this->db); |
| 1629 | - if (!$Connection->tableExists('countries')) return ''; |
|
| 1722 | + if (!$Connection->tableExists('countries')) { |
|
| 1723 | + return ''; |
|
| 1724 | + } |
|
| 1630 | 1725 | |
| 1631 | 1726 | try { |
| 1632 | 1727 | $query = "SELECT name,iso2,iso3 FROM countries WHERE iso2 = :iso2 LIMIT 1"; |
@@ -1638,9 +1733,13 @@ discard block |
||
| 1638 | 1733 | $sth->closeCursor(); |
| 1639 | 1734 | if (count($row) > 0) { |
| 1640 | 1735 | return $row; |
| 1641 | - } else return ''; |
|
| 1736 | + } else { |
|
| 1737 | + return ''; |
|
| 1738 | + } |
|
| 1642 | 1739 | } catch (PDOException $e) { |
| 1643 | - if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n"; |
|
| 1740 | + if (isset($globalDebug) && $globalDebug) { |
|
| 1741 | + echo 'Error : '.$e->getMessage()."\n"; |
|
| 1742 | + } |
|
| 1644 | 1743 | return ''; |
| 1645 | 1744 | } |
| 1646 | 1745 | |
@@ -1707,7 +1806,9 @@ discard block |
||
| 1707 | 1806 | } |
| 1708 | 1807 | } |
| 1709 | 1808 | $query .= " GROUP BY tracker_output.type ORDER BY tracker_type_count DESC"; |
| 1710 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 1809 | + if ($limit) { |
|
| 1810 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 1811 | + } |
|
| 1711 | 1812 | $sth = $this->db->prepare($query); |
| 1712 | 1813 | $sth->execute($query_values); |
| 1713 | 1814 | $tracker_array = array(); |
@@ -1753,7 +1854,9 @@ discard block |
||
| 1753 | 1854 | foreach ($q_array as $q_item){ |
| 1754 | 1855 | $q_item = filter_var($q_item,FILTER_SANITIZE_STRING); |
| 1755 | 1856 | $additional_query .= " AND ("; |
| 1756 | - if (is_int($q_item)) $additional_query .= "(tracker_output.tracker_id = '".$q_item."') OR "; |
|
| 1857 | + if (is_int($q_item)) { |
|
| 1858 | + $additional_query .= "(tracker_output.tracker_id = '".$q_item."') OR "; |
|
| 1859 | + } |
|
| 1757 | 1860 | $additional_query .= "(tracker_output.ident like '%".$q_item."%') OR "; |
| 1758 | 1861 | $additional_query .= ")"; |
| 1759 | 1862 | } |
@@ -1779,7 +1882,9 @@ discard block |
||
| 1779 | 1882 | date_default_timezone_set($globalTimezone); |
| 1780 | 1883 | $datetime = new DateTime(); |
| 1781 | 1884 | $offset = $datetime->format('P'); |
| 1782 | - } else $offset = '+00:00'; |
|
| 1885 | + } else { |
|
| 1886 | + $offset = '+00:00'; |
|
| 1887 | + } |
|
| 1783 | 1888 | if ($date_array[1] != "") |
| 1784 | 1889 | { |
| 1785 | 1890 | $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0])); |
@@ -1806,8 +1911,12 @@ discard block |
||
| 1806 | 1911 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1807 | 1912 | { |
| 1808 | 1913 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 1809 | - } else $limit_query = ""; |
|
| 1810 | - } else $limit_query = ""; |
|
| 1914 | + } else { |
|
| 1915 | + $limit_query = ""; |
|
| 1916 | + } |
|
| 1917 | + } else { |
|
| 1918 | + $limit_query = ""; |
|
| 1919 | + } |
|
| 1811 | 1920 | if ($sort != "") |
| 1812 | 1921 | { |
| 1813 | 1922 | $search_orderby_array = $this->getOrderBy(); |
@@ -1850,7 +1959,9 @@ discard block |
||
| 1850 | 1959 | { |
| 1851 | 1960 | global $globalBitlyAccessToken; |
| 1852 | 1961 | |
| 1853 | - if ($globalBitlyAccessToken == '') return $url; |
|
| 1962 | + if ($globalBitlyAccessToken == '') { |
|
| 1963 | + return $url; |
|
| 1964 | + } |
|
| 1854 | 1965 | $google_url = 'https://api-ssl.bitly.com/v3/shorten?access_token='.$globalBitlyAccessToken.'&longUrl='.$url; |
| 1855 | 1966 | $ch = curl_init(); |
| 1856 | 1967 | curl_setopt($ch, CURLOPT_HEADER, 0); |
@@ -74,8 +74,8 @@ discard block |
||
| 74 | 74 | |
| 75 | 75 | /** |
| 76 | 76 | * @param $ident |
| 77 | - * @param $correct_ident |
|
| 78 | - * @param $source |
|
| 77 | + * @param string $correct_ident |
|
| 78 | + * @param string $source |
|
| 79 | 79 | * @return string |
| 80 | 80 | */ |
| 81 | 81 | public function addOperator($ident, $correct_ident, $source) { |
@@ -91,8 +91,8 @@ discard block |
||
| 91 | 91 | |
| 92 | 92 | /** |
| 93 | 93 | * @param $ident |
| 94 | - * @param $correct_ident |
|
| 95 | - * @param $source |
|
| 94 | + * @param string $correct_ident |
|
| 95 | + * @param string $source |
|
| 96 | 96 | * @return string |
| 97 | 97 | */ |
| 98 | 98 | public function updateOperator($ident, $correct_ident, $source) { |
@@ -25,11 +25,11 @@ discard block |
||
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | /** |
| 28 | - * Change IATA to ICAO value for ident |
|
| 29 | - * |
|
| 30 | - * @param string $ident ident |
|
| 31 | - * @return string the icao |
|
| 32 | - */ |
|
| 28 | + * Change IATA to ICAO value for ident |
|
| 29 | + * |
|
| 30 | + * @param string $ident ident |
|
| 31 | + * @return string the icao |
|
| 32 | + */ |
|
| 33 | 33 | public function ident2icao($ident) { |
| 34 | 34 | $Spotter = new Spotter(); |
| 35 | 35 | if (!is_numeric(substr($ident, 0, 3))) { |
@@ -52,11 +52,11 @@ discard block |
||
| 52 | 52 | return $icao; |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | - /** |
|
| 56 | - * @param $ident |
|
| 57 | - * @return string |
|
| 58 | - */ |
|
| 59 | - public function getOperator($ident) { |
|
| 55 | + /** |
|
| 56 | + * @param $ident |
|
| 57 | + * @return string |
|
| 58 | + */ |
|
| 59 | + public function getOperator($ident) { |
|
| 60 | 60 | $query = "SELECT * FROM translation WHERE Operator = :ident LIMIT 1"; |
| 61 | 61 | $query_values = array(':ident' => $ident); |
| 62 | 62 | try { |
@@ -72,13 +72,13 @@ discard block |
||
| 72 | 72 | } else return $ident; |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | - /** |
|
| 76 | - * @param $ident |
|
| 77 | - * @param $correct_ident |
|
| 78 | - * @param $source |
|
| 79 | - * @return string |
|
| 80 | - */ |
|
| 81 | - public function addOperator($ident, $correct_ident, $source) { |
|
| 75 | + /** |
|
| 76 | + * @param $ident |
|
| 77 | + * @param $correct_ident |
|
| 78 | + * @param $source |
|
| 79 | + * @return string |
|
| 80 | + */ |
|
| 81 | + public function addOperator($ident, $correct_ident, $source) { |
|
| 82 | 82 | $query = "INSERT INTO translation (Operator,Operator_correct,Source) VALUES (:ident,:correct_ident,:source)"; |
| 83 | 83 | $query_values = array(':ident' => $ident,':correct_ident' => $correct_ident, ':source' => $source); |
| 84 | 84 | try { |
@@ -89,13 +89,13 @@ discard block |
||
| 89 | 89 | } |
| 90 | 90 | } |
| 91 | 91 | |
| 92 | - /** |
|
| 93 | - * @param $ident |
|
| 94 | - * @param $correct_ident |
|
| 95 | - * @param $source |
|
| 96 | - * @return string |
|
| 97 | - */ |
|
| 98 | - public function updateOperator($ident, $correct_ident, $source) { |
|
| 92 | + /** |
|
| 93 | + * @param $ident |
|
| 94 | + * @param $correct_ident |
|
| 95 | + * @param $source |
|
| 96 | + * @return string |
|
| 97 | + */ |
|
| 98 | + public function updateOperator($ident, $correct_ident, $source) { |
|
| 99 | 99 | $query = "UPDATE translation SET Operator_correct = :correct_ident,Source = :source WHERE Operator = :ident"; |
| 100 | 100 | $query_values = array(':ident' => $ident,':correct_ident' => $correct_ident, ':source' => $source); |
| 101 | 101 | try { |
@@ -106,12 +106,12 @@ discard block |
||
| 106 | 106 | } |
| 107 | 107 | } |
| 108 | 108 | |
| 109 | - /** |
|
| 110 | - * @param $ident |
|
| 111 | - * @param bool $web |
|
| 112 | - * @return string |
|
| 113 | - */ |
|
| 114 | - public function checkTranslation($ident, $web = false) { |
|
| 109 | + /** |
|
| 110 | + * @param $ident |
|
| 111 | + * @param bool $web |
|
| 112 | + * @return string |
|
| 113 | + */ |
|
| 114 | + public function checkTranslation($ident, $web = false) { |
|
| 115 | 115 | global $globalTranslationSources, $globalTranslationFetch; |
| 116 | 116 | //if (!isset($globalTranslationSources)) $globalTranslationSources = array('planefinder'); |
| 117 | 117 | $globalTranslationSources = array(); |
@@ -41,12 +41,12 @@ discard block |
||
| 41 | 41 | } else return $ident; |
| 42 | 42 | } else return $ident; |
| 43 | 43 | if ($airline_icao == 'AF') { |
| 44 | - if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident; |
|
| 45 | - else $icao = 'AFR'.ltrim(substr($ident,2),'0'); |
|
| 44 | + if (filter_var(substr($ident, 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident; |
|
| 45 | + else $icao = 'AFR'.ltrim(substr($ident, 2), '0'); |
|
| 46 | 46 | } else { |
| 47 | 47 | $identicao = $Spotter->getAllAirlineInfo($airline_icao); |
| 48 | 48 | if (isset($identicao[0])) { |
| 49 | - $icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0'); |
|
| 49 | + $icao = $identicao[0]['icao'].ltrim(substr($ident, 2), '0'); |
|
| 50 | 50 | } else $icao = $ident; |
| 51 | 51 | } |
| 52 | 52 | return $icao; |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | try { |
| 63 | 63 | $sth = $this->db->prepare($query); |
| 64 | 64 | $sth->execute($query_values); |
| 65 | - } catch(PDOException $e) { |
|
| 65 | + } catch (PDOException $e) { |
|
| 66 | 66 | return "error : ".$e->getMessage(); |
| 67 | 67 | } |
| 68 | 68 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -80,11 +80,11 @@ discard block |
||
| 80 | 80 | */ |
| 81 | 81 | public function addOperator($ident, $correct_ident, $source) { |
| 82 | 82 | $query = "INSERT INTO translation (Operator,Operator_correct,Source) VALUES (:ident,:correct_ident,:source)"; |
| 83 | - $query_values = array(':ident' => $ident,':correct_ident' => $correct_ident, ':source' => $source); |
|
| 83 | + $query_values = array(':ident' => $ident, ':correct_ident' => $correct_ident, ':source' => $source); |
|
| 84 | 84 | try { |
| 85 | 85 | $sth = $this->db->prepare($query); |
| 86 | 86 | $sth->execute($query_values); |
| 87 | - } catch(PDOException $e) { |
|
| 87 | + } catch (PDOException $e) { |
|
| 88 | 88 | return "error : ".$e->getMessage(); |
| 89 | 89 | } |
| 90 | 90 | } |
@@ -97,11 +97,11 @@ discard block |
||
| 97 | 97 | */ |
| 98 | 98 | public function updateOperator($ident, $correct_ident, $source) { |
| 99 | 99 | $query = "UPDATE translation SET Operator_correct = :correct_ident,Source = :source WHERE Operator = :ident"; |
| 100 | - $query_values = array(':ident' => $ident,':correct_ident' => $correct_ident, ':source' => $source); |
|
| 100 | + $query_values = array(':ident' => $ident, ':correct_ident' => $correct_ident, ':source' => $source); |
|
| 101 | 101 | try { |
| 102 | 102 | $sth = $this->db->prepare($query); |
| 103 | 103 | $sth->execute($query_values); |
| 104 | - } catch(PDOException $e) { |
|
| 104 | + } catch (PDOException $e) { |
|
| 105 | 105 | return "error : ".$e->getMessage(); |
| 106 | 106 | } |
| 107 | 107 | } |
@@ -38,16 +38,25 @@ discard block |
||
| 38 | 38 | } elseif (is_numeric(substr(substr($ident, 0, 4), -1, 1))) { |
| 39 | 39 | //$airline_icao = substr($ident, 0, 3); |
| 40 | 40 | return $ident; |
| 41 | - } else return $ident; |
|
| 42 | - } else return $ident; |
|
| 41 | + } else { |
|
| 42 | + return $ident; |
|
| 43 | + } |
|
| 44 | + } else { |
|
| 45 | + return $ident; |
|
| 46 | + } |
|
| 43 | 47 | if ($airline_icao == 'AF') { |
| 44 | - if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident; |
|
| 45 | - else $icao = 'AFR'.ltrim(substr($ident,2),'0'); |
|
| 48 | + if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) { |
|
| 49 | + $icao = $ident; |
|
| 50 | + } else { |
|
| 51 | + $icao = 'AFR'.ltrim(substr($ident,2),'0'); |
|
| 52 | + } |
|
| 46 | 53 | } else { |
| 47 | 54 | $identicao = $Spotter->getAllAirlineInfo($airline_icao); |
| 48 | 55 | if (isset($identicao[0])) { |
| 49 | 56 | $icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0'); |
| 50 | - } else $icao = $ident; |
|
| 57 | + } else { |
|
| 58 | + $icao = $ident; |
|
| 59 | + } |
|
| 51 | 60 | } |
| 52 | 61 | return $icao; |
| 53 | 62 | } |
@@ -69,7 +78,9 @@ discard block |
||
| 69 | 78 | $sth->closeCursor(); |
| 70 | 79 | if (isset($row['operator_correct'])) { |
| 71 | 80 | return $row['operator_correct']; |
| 72 | - } else return $ident; |
|
| 81 | + } else { |
|
| 82 | + return $ident; |
|
| 83 | + } |
|
| 73 | 84 | } |
| 74 | 85 | |
| 75 | 86 | /** |
@@ -115,7 +126,9 @@ discard block |
||
| 115 | 126 | global $globalTranslationSources, $globalTranslationFetch; |
| 116 | 127 | //if (!isset($globalTranslationSources)) $globalTranslationSources = array('planefinder'); |
| 117 | 128 | $globalTranslationSources = array(); |
| 118 | - if (!isset($globalTranslationFetch)) $globalTranslationFetch = TRUE; |
|
| 129 | + if (!isset($globalTranslationFetch)) { |
|
| 130 | + $globalTranslationFetch = TRUE; |
|
| 131 | + } |
|
| 119 | 132 | //echo "Check Translation for ".$ident."..."; |
| 120 | 133 | $correct = $this->getOperator($ident); |
| 121 | 134 | if ($correct != '' && $correct != $ident) { |
@@ -16,13 +16,13 @@ discard block |
||
| 16 | 16 | if ($this->db === null) die('Error: No DB connection. (TrackerArchive)'); |
| 17 | 17 | } |
| 18 | 18 | |
| 19 | - /** |
|
| 20 | - * Get SQL query part for filter used |
|
| 21 | - * @param array $filter the filter |
|
| 22 | - * @param bool $where |
|
| 23 | - * @param bool $and |
|
| 24 | - * @return string the SQL part |
|
| 25 | - */ |
|
| 19 | + /** |
|
| 20 | + * Get SQL query part for filter used |
|
| 21 | + * @param array $filter the filter |
|
| 22 | + * @param bool $where |
|
| 23 | + * @param bool $and |
|
| 24 | + * @return string the SQL part |
|
| 25 | + */ |
|
| 26 | 26 | public function getFilter($filter = array(),$where = false,$and = false) { |
| 27 | 27 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 28 | 28 | $filters = array(); |
@@ -91,27 +91,27 @@ discard block |
||
| 91 | 91 | return $filter_query; |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | - /** |
|
| 95 | - * Add to tracker_archive |
|
| 96 | - * |
|
| 97 | - * @param string $famtrackid |
|
| 98 | - * @param string $ident |
|
| 99 | - * @param string $latitude |
|
| 100 | - * @param string $longitude |
|
| 101 | - * @param string $altitude |
|
| 102 | - * @param string $heading |
|
| 103 | - * @param string $groundspeed |
|
| 104 | - * @param string $date |
|
| 105 | - * @param bool $putinarchive |
|
| 106 | - * @param string $comment |
|
| 107 | - * @param string $type |
|
| 108 | - * @param bool $noarchive |
|
| 109 | - * @param string $format_source |
|
| 110 | - * @param string $source_name |
|
| 111 | - * @param string $over_country |
|
| 112 | - * @return string |
|
| 113 | - */ |
|
| 114 | - public function addTrackerArchiveData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $comment = '', $type = '', $noarchive = false, $format_source = '', $source_name = '', $over_country = '') { |
|
| 94 | + /** |
|
| 95 | + * Add to tracker_archive |
|
| 96 | + * |
|
| 97 | + * @param string $famtrackid |
|
| 98 | + * @param string $ident |
|
| 99 | + * @param string $latitude |
|
| 100 | + * @param string $longitude |
|
| 101 | + * @param string $altitude |
|
| 102 | + * @param string $heading |
|
| 103 | + * @param string $groundspeed |
|
| 104 | + * @param string $date |
|
| 105 | + * @param bool $putinarchive |
|
| 106 | + * @param string $comment |
|
| 107 | + * @param string $type |
|
| 108 | + * @param bool $noarchive |
|
| 109 | + * @param string $format_source |
|
| 110 | + * @param string $source_name |
|
| 111 | + * @param string $over_country |
|
| 112 | + * @return string |
|
| 113 | + */ |
|
| 114 | + public function addTrackerArchiveData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $comment = '', $type = '', $noarchive = false, $format_source = '', $source_name = '', $over_country = '') { |
|
| 115 | 115 | require_once(dirname(__FILE__).'/class.Tracker.php'); |
| 116 | 116 | if ($over_country == '') { |
| 117 | 117 | $Tracker = new Tracker($this->db); |
@@ -134,40 +134,40 @@ discard block |
||
| 134 | 134 | } |
| 135 | 135 | |
| 136 | 136 | |
| 137 | - /** |
|
| 138 | - * Gets all the spotter information based on a particular callsign |
|
| 139 | - * |
|
| 140 | - * @param $ident |
|
| 141 | - * @return array the spotter information |
|
| 142 | - */ |
|
| 143 | - public function getLastArchiveTrackerDataByIdent($ident) |
|
| 144 | - { |
|
| 145 | - $Tracker = new Tracker($this->db); |
|
| 146 | - date_default_timezone_set('UTC'); |
|
| 147 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 148 | - $query = "SELECT tracker_archive.* FROM tracker_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 149 | - $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident)); |
|
| 150 | - return $spotter_array; |
|
| 151 | - } |
|
| 152 | - |
|
| 153 | - |
|
| 154 | - /** |
|
| 155 | - * Gets last the spotter information based on a particular id |
|
| 156 | - * |
|
| 157 | - * @param $id |
|
| 158 | - * @return array the spotter information |
|
| 159 | - */ |
|
| 160 | - public function getLastArchiveTrackerDataById($id) |
|
| 161 | - { |
|
| 162 | - $Tracker = new Tracker($this->db); |
|
| 163 | - date_default_timezone_set('UTC'); |
|
| 164 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 165 | - //$query = TrackerArchive->$global_query." WHERE tracker_archive.famtrackid = :id"; |
|
| 166 | - //$query = "SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.famtrackid = :id GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1"; |
|
| 167 | - $query = "SELECT * FROM tracker_archive WHERE famtrackid = :id ORDER BY date DESC LIMIT 1"; |
|
| 137 | + /** |
|
| 138 | + * Gets all the spotter information based on a particular callsign |
|
| 139 | + * |
|
| 140 | + * @param $ident |
|
| 141 | + * @return array the spotter information |
|
| 142 | + */ |
|
| 143 | + public function getLastArchiveTrackerDataByIdent($ident) |
|
| 144 | + { |
|
| 145 | + $Tracker = new Tracker($this->db); |
|
| 146 | + date_default_timezone_set('UTC'); |
|
| 147 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 148 | + $query = "SELECT tracker_archive.* FROM tracker_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 149 | + $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident)); |
|
| 150 | + return $spotter_array; |
|
| 151 | + } |
|
| 152 | + |
|
| 153 | + |
|
| 154 | + /** |
|
| 155 | + * Gets last the spotter information based on a particular id |
|
| 156 | + * |
|
| 157 | + * @param $id |
|
| 158 | + * @return array the spotter information |
|
| 159 | + */ |
|
| 160 | + public function getLastArchiveTrackerDataById($id) |
|
| 161 | + { |
|
| 162 | + $Tracker = new Tracker($this->db); |
|
| 163 | + date_default_timezone_set('UTC'); |
|
| 164 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 165 | + //$query = TrackerArchive->$global_query." WHERE tracker_archive.famtrackid = :id"; |
|
| 166 | + //$query = "SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.famtrackid = :id GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1"; |
|
| 167 | + $query = "SELECT * FROM tracker_archive WHERE famtrackid = :id ORDER BY date DESC LIMIT 1"; |
|
| 168 | 168 | |
| 169 | 169 | // $spotter_array = Tracker->getDataFromDB($query,array(':id' => $id)); |
| 170 | - /* |
|
| 170 | + /* |
|
| 171 | 171 | try { |
| 172 | 172 | $Connection = new Connection(); |
| 173 | 173 | $sth = Connection->$db->prepare($query); |
@@ -177,245 +177,245 @@ discard block |
||
| 177 | 177 | } |
| 178 | 178 | $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC); |
| 179 | 179 | */ |
| 180 | - $spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id)); |
|
| 181 | - |
|
| 182 | - return $spotter_array; |
|
| 183 | - } |
|
| 184 | - |
|
| 185 | - /** |
|
| 186 | - * Gets all the spotter information based on a particular id |
|
| 187 | - * |
|
| 188 | - * @param $id |
|
| 189 | - * @param string $date |
|
| 190 | - * @return array the spotter information |
|
| 191 | - */ |
|
| 192 | - public function getAllArchiveTrackerDataById($id,$date = '') |
|
| 193 | - { |
|
| 194 | - date_default_timezone_set('UTC'); |
|
| 195 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 196 | - if ($date == '') $query = $this->global_query." WHERE tracker_archive.famtrackid = :id ORDER BY date"; |
|
| 197 | - else $query = $this->global_query." WHERE tracker_archive.famtrackid = :id AND date < '".date('c',$date)."' ORDER BY date"; |
|
| 180 | + $spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id)); |
|
| 181 | + |
|
| 182 | + return $spotter_array; |
|
| 183 | + } |
|
| 184 | + |
|
| 185 | + /** |
|
| 186 | + * Gets all the spotter information based on a particular id |
|
| 187 | + * |
|
| 188 | + * @param $id |
|
| 189 | + * @param string $date |
|
| 190 | + * @return array the spotter information |
|
| 191 | + */ |
|
| 192 | + public function getAllArchiveTrackerDataById($id,$date = '') |
|
| 193 | + { |
|
| 194 | + date_default_timezone_set('UTC'); |
|
| 195 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 196 | + if ($date == '') $query = $this->global_query." WHERE tracker_archive.famtrackid = :id ORDER BY date"; |
|
| 197 | + else $query = $this->global_query." WHERE tracker_archive.famtrackid = :id AND date < '".date('c',$date)."' ORDER BY date"; |
|
| 198 | 198 | |
| 199 | 199 | // $spotter_array = Tracker->getDataFromDB($query,array(':id' => $id)); |
| 200 | 200 | |
| 201 | - try { |
|
| 202 | - $sth = $this->db->prepare($query); |
|
| 203 | - $sth->execute(array(':id' => $id)); |
|
| 204 | - } catch(PDOException $e) { |
|
| 205 | - echo $e->getMessage(); |
|
| 206 | - die; |
|
| 207 | - } |
|
| 208 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 209 | - |
|
| 210 | - return $spotter_array; |
|
| 211 | - } |
|
| 212 | - |
|
| 213 | - /** |
|
| 214 | - * Gets coordinate & time spotter information based on a particular id |
|
| 215 | - * |
|
| 216 | - * @param $id |
|
| 217 | - * @return array the spotter information |
|
| 218 | - */ |
|
| 219 | - public function getCoordArchiveTrackerDataById($id) |
|
| 220 | - { |
|
| 221 | - date_default_timezone_set('UTC'); |
|
| 222 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 223 | - $query = "SELECT tracker_archive.latitude, tracker_archive.longitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id"; |
|
| 201 | + try { |
|
| 202 | + $sth = $this->db->prepare($query); |
|
| 203 | + $sth->execute(array(':id' => $id)); |
|
| 204 | + } catch(PDOException $e) { |
|
| 205 | + echo $e->getMessage(); |
|
| 206 | + die; |
|
| 207 | + } |
|
| 208 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 209 | + |
|
| 210 | + return $spotter_array; |
|
| 211 | + } |
|
| 212 | + |
|
| 213 | + /** |
|
| 214 | + * Gets coordinate & time spotter information based on a particular id |
|
| 215 | + * |
|
| 216 | + * @param $id |
|
| 217 | + * @return array the spotter information |
|
| 218 | + */ |
|
| 219 | + public function getCoordArchiveTrackerDataById($id) |
|
| 220 | + { |
|
| 221 | + date_default_timezone_set('UTC'); |
|
| 222 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 223 | + $query = "SELECT tracker_archive.latitude, tracker_archive.longitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id"; |
|
| 224 | 224 | |
| 225 | 225 | // $spotter_array = Tracker->getDataFromDB($query,array(':id' => $id)); |
| 226 | 226 | |
| 227 | - try { |
|
| 228 | - $sth = $this->db->prepare($query); |
|
| 229 | - $sth->execute(array(':id' => $id)); |
|
| 230 | - } catch(PDOException $e) { |
|
| 231 | - echo $e->getMessage(); |
|
| 232 | - die; |
|
| 233 | - } |
|
| 234 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 235 | - |
|
| 236 | - return $spotter_array; |
|
| 237 | - } |
|
| 238 | - |
|
| 239 | - |
|
| 240 | - /** |
|
| 241 | - * Gets altitude information based on a particular callsign |
|
| 242 | - * |
|
| 243 | - * @param $ident |
|
| 244 | - * @return array the spotter information |
|
| 245 | - */ |
|
| 246 | - public function getAltitudeArchiveTrackerDataByIdent($ident) |
|
| 247 | - { |
|
| 248 | - |
|
| 249 | - date_default_timezone_set('UTC'); |
|
| 250 | - |
|
| 251 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 252 | - $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.ident = :ident AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date"; |
|
| 253 | - |
|
| 254 | - try { |
|
| 255 | - $sth = $this->db->prepare($query); |
|
| 256 | - $sth->execute(array(':ident' => $ident)); |
|
| 257 | - } catch(PDOException $e) { |
|
| 258 | - echo $e->getMessage(); |
|
| 259 | - die; |
|
| 260 | - } |
|
| 261 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 262 | - |
|
| 263 | - return $spotter_array; |
|
| 264 | - } |
|
| 265 | - |
|
| 266 | - /** |
|
| 267 | - * Gets altitude information based on a particular id |
|
| 268 | - * |
|
| 269 | - * @param $id |
|
| 270 | - * @return array the spotter information |
|
| 271 | - */ |
|
| 272 | - public function getAltitudeArchiveTrackerDataById($id) |
|
| 273 | - { |
|
| 274 | - |
|
| 275 | - date_default_timezone_set('UTC'); |
|
| 276 | - |
|
| 277 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 278 | - $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date"; |
|
| 279 | - |
|
| 280 | - try { |
|
| 281 | - $sth = $this->db->prepare($query); |
|
| 282 | - $sth->execute(array(':id' => $id)); |
|
| 283 | - } catch(PDOException $e) { |
|
| 284 | - echo $e->getMessage(); |
|
| 285 | - die; |
|
| 286 | - } |
|
| 287 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 288 | - |
|
| 289 | - return $spotter_array; |
|
| 290 | - } |
|
| 291 | - |
|
| 292 | - /** |
|
| 293 | - * Gets altitude & speed information based on a particular id |
|
| 294 | - * |
|
| 295 | - * @param $id |
|
| 296 | - * @return array the spotter information |
|
| 297 | - */ |
|
| 298 | - public function getAltitudeSpeedArchiveTrackerDataById($id) |
|
| 299 | - { |
|
| 300 | - |
|
| 301 | - date_default_timezone_set('UTC'); |
|
| 302 | - |
|
| 303 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 304 | - $query = "SELECT tracker_archive.altitude, tracker_archive.ground_speed, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id ORDER BY date"; |
|
| 305 | - |
|
| 306 | - try { |
|
| 307 | - $sth = $this->db->prepare($query); |
|
| 308 | - $sth->execute(array(':id' => $id)); |
|
| 309 | - } catch(PDOException $e) { |
|
| 310 | - echo $e->getMessage(); |
|
| 311 | - die; |
|
| 312 | - } |
|
| 313 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 314 | - |
|
| 315 | - return $spotter_array; |
|
| 316 | - } |
|
| 317 | - |
|
| 318 | - |
|
| 319 | - /** |
|
| 320 | - * Gets altitude information based on a particular callsign |
|
| 321 | - * |
|
| 322 | - * @param $ident |
|
| 323 | - * @return array the spotter information |
|
| 324 | - */ |
|
| 325 | - public function getLastAltitudeArchiveTrackerDataByIdent($ident) |
|
| 326 | - { |
|
| 327 | - |
|
| 328 | - date_default_timezone_set('UTC'); |
|
| 329 | - |
|
| 330 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 331 | - $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1"; |
|
| 227 | + try { |
|
| 228 | + $sth = $this->db->prepare($query); |
|
| 229 | + $sth->execute(array(':id' => $id)); |
|
| 230 | + } catch(PDOException $e) { |
|
| 231 | + echo $e->getMessage(); |
|
| 232 | + die; |
|
| 233 | + } |
|
| 234 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 235 | + |
|
| 236 | + return $spotter_array; |
|
| 237 | + } |
|
| 238 | + |
|
| 239 | + |
|
| 240 | + /** |
|
| 241 | + * Gets altitude information based on a particular callsign |
|
| 242 | + * |
|
| 243 | + * @param $ident |
|
| 244 | + * @return array the spotter information |
|
| 245 | + */ |
|
| 246 | + public function getAltitudeArchiveTrackerDataByIdent($ident) |
|
| 247 | + { |
|
| 248 | + |
|
| 249 | + date_default_timezone_set('UTC'); |
|
| 250 | + |
|
| 251 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 252 | + $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.ident = :ident AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date"; |
|
| 253 | + |
|
| 254 | + try { |
|
| 255 | + $sth = $this->db->prepare($query); |
|
| 256 | + $sth->execute(array(':ident' => $ident)); |
|
| 257 | + } catch(PDOException $e) { |
|
| 258 | + echo $e->getMessage(); |
|
| 259 | + die; |
|
| 260 | + } |
|
| 261 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 262 | + |
|
| 263 | + return $spotter_array; |
|
| 264 | + } |
|
| 265 | + |
|
| 266 | + /** |
|
| 267 | + * Gets altitude information based on a particular id |
|
| 268 | + * |
|
| 269 | + * @param $id |
|
| 270 | + * @return array the spotter information |
|
| 271 | + */ |
|
| 272 | + public function getAltitudeArchiveTrackerDataById($id) |
|
| 273 | + { |
|
| 274 | + |
|
| 275 | + date_default_timezone_set('UTC'); |
|
| 276 | + |
|
| 277 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 278 | + $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date"; |
|
| 279 | + |
|
| 280 | + try { |
|
| 281 | + $sth = $this->db->prepare($query); |
|
| 282 | + $sth->execute(array(':id' => $id)); |
|
| 283 | + } catch(PDOException $e) { |
|
| 284 | + echo $e->getMessage(); |
|
| 285 | + die; |
|
| 286 | + } |
|
| 287 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 288 | + |
|
| 289 | + return $spotter_array; |
|
| 290 | + } |
|
| 291 | + |
|
| 292 | + /** |
|
| 293 | + * Gets altitude & speed information based on a particular id |
|
| 294 | + * |
|
| 295 | + * @param $id |
|
| 296 | + * @return array the spotter information |
|
| 297 | + */ |
|
| 298 | + public function getAltitudeSpeedArchiveTrackerDataById($id) |
|
| 299 | + { |
|
| 300 | + |
|
| 301 | + date_default_timezone_set('UTC'); |
|
| 302 | + |
|
| 303 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 304 | + $query = "SELECT tracker_archive.altitude, tracker_archive.ground_speed, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id ORDER BY date"; |
|
| 305 | + |
|
| 306 | + try { |
|
| 307 | + $sth = $this->db->prepare($query); |
|
| 308 | + $sth->execute(array(':id' => $id)); |
|
| 309 | + } catch(PDOException $e) { |
|
| 310 | + echo $e->getMessage(); |
|
| 311 | + die; |
|
| 312 | + } |
|
| 313 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 314 | + |
|
| 315 | + return $spotter_array; |
|
| 316 | + } |
|
| 317 | + |
|
| 318 | + |
|
| 319 | + /** |
|
| 320 | + * Gets altitude information based on a particular callsign |
|
| 321 | + * |
|
| 322 | + * @param $ident |
|
| 323 | + * @return array the spotter information |
|
| 324 | + */ |
|
| 325 | + public function getLastAltitudeArchiveTrackerDataByIdent($ident) |
|
| 326 | + { |
|
| 327 | + |
|
| 328 | + date_default_timezone_set('UTC'); |
|
| 329 | + |
|
| 330 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 331 | + $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1"; |
|
| 332 | 332 | // $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.ident = :ident"; |
| 333 | 333 | |
| 334 | - try { |
|
| 335 | - $sth = $this->db->prepare($query); |
|
| 336 | - $sth->execute(array(':ident' => $ident)); |
|
| 337 | - } catch(PDOException $e) { |
|
| 338 | - echo $e->getMessage(); |
|
| 339 | - die; |
|
| 340 | - } |
|
| 341 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 342 | - |
|
| 343 | - return $spotter_array; |
|
| 344 | - } |
|
| 345 | - |
|
| 346 | - |
|
| 347 | - /** |
|
| 348 | - * Gets all the archive spotter information |
|
| 349 | - * |
|
| 350 | - * @param $ident |
|
| 351 | - * @param $famtrackid |
|
| 352 | - * @param $date |
|
| 353 | - * @return array the spotter information |
|
| 354 | - */ |
|
| 355 | - public function getTrackerArchiveData($ident,$famtrackid,$date) |
|
| 356 | - { |
|
| 357 | - $Tracker = new Tracker($this->db); |
|
| 358 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 359 | - $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.famtrackid = :famtrackid AND l.date LIKE :date GROUP BY l.famtrackid) s on spotter_live.famtrackid = s.famtrackid AND spotter_live.date = s.maxdate"; |
|
| 360 | - |
|
| 361 | - $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident,':famtrackid' => $famtrackid,':date' => $date.'%')); |
|
| 362 | - |
|
| 363 | - return $spotter_array; |
|
| 364 | - } |
|
| 365 | - |
|
| 366 | - public function deleteTrackerArchiveTrackData() |
|
| 367 | - { |
|
| 368 | - global $globalArchiveKeepTrackMonths, $globalDBdriver; |
|
| 369 | - if ($globalDBdriver == 'mysql') { |
|
| 370 | - $query = 'DELETE FROM tracker_archive WHERE tracker_archive.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepTrackMonths.' MONTH)'; |
|
| 371 | - } else { |
|
| 372 | - $query = "DELETE FROM tracker_archive WHERE tracker_archive_id IN (SELECT tracker_archive_id FROM tracker_archive WHERE tracker_archive.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveKeepTrackMonths." MONTH' LIMIT 10000)"; |
|
| 373 | - } |
|
| 374 | - try { |
|
| 375 | - $sth = $this->db->prepare($query); |
|
| 376 | - $sth->execute(); |
|
| 377 | - } catch(PDOException $e) { |
|
| 378 | - echo $e->getMessage(); |
|
| 379 | - die; |
|
| 380 | - } |
|
| 381 | - } |
|
| 382 | - |
|
| 383 | - /** |
|
| 384 | - * Gets Minimal Live Tracker data |
|
| 385 | - * |
|
| 386 | - * @param $begindate |
|
| 387 | - * @param $enddate |
|
| 388 | - * @param array $filter |
|
| 389 | - * @return array the spotter information |
|
| 390 | - */ |
|
| 391 | - public function getMinLiveTrackerData($begindate,$enddate,$filter = array()) |
|
| 392 | - { |
|
| 393 | - global $globalDBdriver; |
|
| 394 | - date_default_timezone_set('UTC'); |
|
| 395 | - |
|
| 396 | - $filter_query = ''; |
|
| 397 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 398 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 399 | - } |
|
| 400 | - // Use spotter_output also ? |
|
| 401 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 402 | - $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid "; |
|
| 403 | - } |
|
| 404 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 405 | - $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid "; |
|
| 406 | - } |
|
| 407 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 408 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 409 | - } |
|
| 410 | - |
|
| 411 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 412 | - if ($globalDBdriver == 'mysql') { |
|
| 413 | - /* |
|
| 334 | + try { |
|
| 335 | + $sth = $this->db->prepare($query); |
|
| 336 | + $sth->execute(array(':ident' => $ident)); |
|
| 337 | + } catch(PDOException $e) { |
|
| 338 | + echo $e->getMessage(); |
|
| 339 | + die; |
|
| 340 | + } |
|
| 341 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 342 | + |
|
| 343 | + return $spotter_array; |
|
| 344 | + } |
|
| 345 | + |
|
| 346 | + |
|
| 347 | + /** |
|
| 348 | + * Gets all the archive spotter information |
|
| 349 | + * |
|
| 350 | + * @param $ident |
|
| 351 | + * @param $famtrackid |
|
| 352 | + * @param $date |
|
| 353 | + * @return array the spotter information |
|
| 354 | + */ |
|
| 355 | + public function getTrackerArchiveData($ident,$famtrackid,$date) |
|
| 356 | + { |
|
| 357 | + $Tracker = new Tracker($this->db); |
|
| 358 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 359 | + $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.famtrackid = :famtrackid AND l.date LIKE :date GROUP BY l.famtrackid) s on spotter_live.famtrackid = s.famtrackid AND spotter_live.date = s.maxdate"; |
|
| 360 | + |
|
| 361 | + $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident,':famtrackid' => $famtrackid,':date' => $date.'%')); |
|
| 362 | + |
|
| 363 | + return $spotter_array; |
|
| 364 | + } |
|
| 365 | + |
|
| 366 | + public function deleteTrackerArchiveTrackData() |
|
| 367 | + { |
|
| 368 | + global $globalArchiveKeepTrackMonths, $globalDBdriver; |
|
| 369 | + if ($globalDBdriver == 'mysql') { |
|
| 370 | + $query = 'DELETE FROM tracker_archive WHERE tracker_archive.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepTrackMonths.' MONTH)'; |
|
| 371 | + } else { |
|
| 372 | + $query = "DELETE FROM tracker_archive WHERE tracker_archive_id IN (SELECT tracker_archive_id FROM tracker_archive WHERE tracker_archive.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveKeepTrackMonths." MONTH' LIMIT 10000)"; |
|
| 373 | + } |
|
| 374 | + try { |
|
| 375 | + $sth = $this->db->prepare($query); |
|
| 376 | + $sth->execute(); |
|
| 377 | + } catch(PDOException $e) { |
|
| 378 | + echo $e->getMessage(); |
|
| 379 | + die; |
|
| 380 | + } |
|
| 381 | + } |
|
| 382 | + |
|
| 383 | + /** |
|
| 384 | + * Gets Minimal Live Tracker data |
|
| 385 | + * |
|
| 386 | + * @param $begindate |
|
| 387 | + * @param $enddate |
|
| 388 | + * @param array $filter |
|
| 389 | + * @return array the spotter information |
|
| 390 | + */ |
|
| 391 | + public function getMinLiveTrackerData($begindate,$enddate,$filter = array()) |
|
| 392 | + { |
|
| 393 | + global $globalDBdriver; |
|
| 394 | + date_default_timezone_set('UTC'); |
|
| 395 | + |
|
| 396 | + $filter_query = ''; |
|
| 397 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 398 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 399 | + } |
|
| 400 | + // Use spotter_output also ? |
|
| 401 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 402 | + $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid "; |
|
| 403 | + } |
|
| 404 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 405 | + $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid "; |
|
| 406 | + } |
|
| 407 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 408 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 409 | + } |
|
| 410 | + |
|
| 411 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 412 | + if ($globalDBdriver == 'mysql') { |
|
| 413 | + /* |
|
| 414 | 414 | $query = 'SELECT a.aircraft_shadow, tracker_archive.ident, tracker_archive.famtrackid, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk |
| 415 | 415 | FROM tracker_archive |
| 416 | 416 | INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON tracker_archive.aircraft_icao = a.icao'; |
| 417 | 417 | */ |
| 418 | - /* |
|
| 418 | + /* |
|
| 419 | 419 | $query = 'SELECT a.aircraft_shadow, tracker_archive.ident, tracker_archive.famtrackid, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk |
| 420 | 420 | FROM tracker_archive |
| 421 | 421 | INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate |
@@ -424,900 +424,900 @@ discard block |
||
| 424 | 424 | GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid |
| 425 | 425 | AND tracker_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON tracker_archive.aircraft_icao = a.icao'; |
| 426 | 426 | */ |
| 427 | - $query = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 427 | + $query = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 428 | 428 | FROM tracker_archive |
| 429 | 429 | INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao |
| 430 | 430 | WHERE tracker_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' |
| 431 | 431 | '.$filter_query.' ORDER BY famtrackid'; |
| 432 | - } else { |
|
| 433 | - //$query = 'SELECT tracker_archive.ident, tracker_archive.famtrackid, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao'; |
|
| 434 | - $query = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 432 | + } else { |
|
| 433 | + //$query = 'SELECT tracker_archive.ident, tracker_archive.famtrackid, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao'; |
|
| 434 | + $query = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 435 | 435 | FROM tracker_archive |
| 436 | 436 | INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao |
| 437 | 437 | WHERE tracker_archive.date >= '."'".$begindate."'".' AND tracker_archive.date <= '."'".$enddate."'".' |
| 438 | 438 | '.$filter_query.' ORDER BY famtrackid'; |
| 439 | - } |
|
| 440 | - //echo $query; |
|
| 441 | - try { |
|
| 442 | - $sth = $this->db->prepare($query); |
|
| 443 | - $sth->execute(); |
|
| 444 | - } catch(PDOException $e) { |
|
| 445 | - echo $e->getMessage(); |
|
| 446 | - die; |
|
| 447 | - } |
|
| 448 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 449 | - |
|
| 450 | - return $spotter_array; |
|
| 451 | - } |
|
| 452 | - |
|
| 453 | - /** |
|
| 454 | - * Gets Minimal Live Tracker data |
|
| 455 | - * |
|
| 456 | - * @param $begindate |
|
| 457 | - * @param $enddate |
|
| 458 | - * @param array $filter |
|
| 459 | - * @return array the spotter information |
|
| 460 | - */ |
|
| 461 | - public function getMinLiveTrackerDataPlayback($begindate,$enddate,$filter = array()) |
|
| 462 | - { |
|
| 463 | - global $globalDBdriver; |
|
| 464 | - date_default_timezone_set('UTC'); |
|
| 465 | - |
|
| 466 | - $filter_query = ''; |
|
| 467 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 468 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 469 | - } |
|
| 470 | - // Should use spotter_output also ? |
|
| 471 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 472 | - $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid "; |
|
| 473 | - } |
|
| 474 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 475 | - $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid "; |
|
| 476 | - } |
|
| 477 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 478 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 479 | - } |
|
| 480 | - |
|
| 481 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 482 | - if ($globalDBdriver == 'mysql') { |
|
| 483 | - /* |
|
| 439 | + } |
|
| 440 | + //echo $query; |
|
| 441 | + try { |
|
| 442 | + $sth = $this->db->prepare($query); |
|
| 443 | + $sth->execute(); |
|
| 444 | + } catch(PDOException $e) { |
|
| 445 | + echo $e->getMessage(); |
|
| 446 | + die; |
|
| 447 | + } |
|
| 448 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 449 | + |
|
| 450 | + return $spotter_array; |
|
| 451 | + } |
|
| 452 | + |
|
| 453 | + /** |
|
| 454 | + * Gets Minimal Live Tracker data |
|
| 455 | + * |
|
| 456 | + * @param $begindate |
|
| 457 | + * @param $enddate |
|
| 458 | + * @param array $filter |
|
| 459 | + * @return array the spotter information |
|
| 460 | + */ |
|
| 461 | + public function getMinLiveTrackerDataPlayback($begindate,$enddate,$filter = array()) |
|
| 462 | + { |
|
| 463 | + global $globalDBdriver; |
|
| 464 | + date_default_timezone_set('UTC'); |
|
| 465 | + |
|
| 466 | + $filter_query = ''; |
|
| 467 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 468 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 469 | + } |
|
| 470 | + // Should use spotter_output also ? |
|
| 471 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 472 | + $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid "; |
|
| 473 | + } |
|
| 474 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 475 | + $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid "; |
|
| 476 | + } |
|
| 477 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 478 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 479 | + } |
|
| 480 | + |
|
| 481 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 482 | + if ($globalDBdriver == 'mysql') { |
|
| 483 | + /* |
|
| 484 | 484 | $query = 'SELECT a.aircraft_shadow, tracker_archive.ident, tracker_archive.famtrackid, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk |
| 485 | 485 | FROM tracker_archive |
| 486 | 486 | INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON tracker_archive.aircraft_icao = a.icao'; |
| 487 | 487 | */ |
| 488 | - $query = 'SELECT a.aircraft_shadow, tracker_archive_output.ident, tracker_archive_output.famtrackid, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk |
|
| 488 | + $query = 'SELECT a.aircraft_shadow, tracker_archive_output.ident, tracker_archive_output.famtrackid, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk |
|
| 489 | 489 | FROM tracker_archive_output |
| 490 | 490 | LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON tracker_archive_output.aircraft_icao = a.icao |
| 491 | 491 | WHERE (tracker_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') |
| 492 | 492 | '.$filter_query.' GROUP BY tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao, tracker_archive_output.arrival_airport_icao, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow'; |
| 493 | 493 | |
| 494 | - } else { |
|
| 495 | - //$query = 'SELECT tracker_archive_output.ident, tracker_archive_output.famtrackid, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow FROM tracker_archive_output INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_archive_output.famtrackid = s.famtrackid AND tracker_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on tracker_archive_output.aircraft_icao = a.icao'; |
|
| 496 | - /* |
|
| 494 | + } else { |
|
| 495 | + //$query = 'SELECT tracker_archive_output.ident, tracker_archive_output.famtrackid, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow FROM tracker_archive_output INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_archive_output.famtrackid = s.famtrackid AND tracker_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on tracker_archive_output.aircraft_icao = a.icao'; |
|
| 496 | + /* |
|
| 497 | 497 | $query = 'SELECT tracker_archive_output.ident, tracker_archive_output.famtrackid, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow |
| 498 | 498 | FROM tracker_archive_output |
| 499 | 499 | INNER JOIN (SELECT * FROM aircraft) a on tracker_archive_output.aircraft_icao = a.icao |
| 500 | 500 | WHERE tracker_archive_output.date >= '."'".$begindate."'".' AND tracker_archive_output.date <= '."'".$enddate."'".' |
| 501 | 501 | '.$filter_query.' GROUP BY tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao, tracker_archive_output.arrival_airport_icao, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow'; |
| 502 | 502 | */ |
| 503 | - $query = 'SELECT DISTINCT tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow |
|
| 503 | + $query = 'SELECT DISTINCT tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow |
|
| 504 | 504 | FROM tracker_archive_output |
| 505 | 505 | INNER JOIN (SELECT * FROM aircraft) a on tracker_archive_output.aircraft_icao = a.icao |
| 506 | 506 | WHERE tracker_archive_output.date >= '."'".$begindate."'".' AND tracker_archive_output.date <= '."'".$enddate."'".' |
| 507 | 507 | '.$filter_query.' LIMIT 200 OFFSET 0'; |
| 508 | 508 | // .' GROUP BY spotter_output.famtrackid, 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'; |
| 509 | 509 | |
| 510 | - } |
|
| 511 | - //echo $query; |
|
| 512 | - try { |
|
| 513 | - $sth = $this->db->prepare($query); |
|
| 514 | - $sth->execute(); |
|
| 515 | - } catch(PDOException $e) { |
|
| 516 | - echo $e->getMessage(); |
|
| 517 | - die; |
|
| 518 | - } |
|
| 519 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 520 | - |
|
| 521 | - return $spotter_array; |
|
| 522 | - } |
|
| 523 | - |
|
| 524 | - /** |
|
| 525 | - * Gets count Live Tracker data |
|
| 526 | - * |
|
| 527 | - * @param $begindate |
|
| 528 | - * @param $enddate |
|
| 529 | - * @param array $filter |
|
| 530 | - * @return array the spotter information |
|
| 531 | - */ |
|
| 532 | - public function getLiveTrackerCount($begindate,$enddate,$filter = array()) |
|
| 533 | - { |
|
| 534 | - global $globalDBdriver, $globalLiveInterval; |
|
| 535 | - date_default_timezone_set('UTC'); |
|
| 536 | - |
|
| 537 | - $filter_query = ''; |
|
| 538 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 539 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 540 | - } |
|
| 541 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 542 | - $filter_query .= " INNER JOIN (SELECT famtrackid FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid "; |
|
| 543 | - } |
|
| 544 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 545 | - $filter_query .= " INNER JOIN (SELECT famtrackid FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid "; |
|
| 546 | - } |
|
| 547 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 548 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 549 | - } |
|
| 550 | - |
|
| 551 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 552 | - if ($globalDBdriver == 'mysql') { |
|
| 553 | - $query = 'SELECT COUNT(DISTINCT famtrackid) as nb |
|
| 510 | + } |
|
| 511 | + //echo $query; |
|
| 512 | + try { |
|
| 513 | + $sth = $this->db->prepare($query); |
|
| 514 | + $sth->execute(); |
|
| 515 | + } catch(PDOException $e) { |
|
| 516 | + echo $e->getMessage(); |
|
| 517 | + die; |
|
| 518 | + } |
|
| 519 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 520 | + |
|
| 521 | + return $spotter_array; |
|
| 522 | + } |
|
| 523 | + |
|
| 524 | + /** |
|
| 525 | + * Gets count Live Tracker data |
|
| 526 | + * |
|
| 527 | + * @param $begindate |
|
| 528 | + * @param $enddate |
|
| 529 | + * @param array $filter |
|
| 530 | + * @return array the spotter information |
|
| 531 | + */ |
|
| 532 | + public function getLiveTrackerCount($begindate,$enddate,$filter = array()) |
|
| 533 | + { |
|
| 534 | + global $globalDBdriver, $globalLiveInterval; |
|
| 535 | + date_default_timezone_set('UTC'); |
|
| 536 | + |
|
| 537 | + $filter_query = ''; |
|
| 538 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 539 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 540 | + } |
|
| 541 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 542 | + $filter_query .= " INNER JOIN (SELECT famtrackid FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid "; |
|
| 543 | + } |
|
| 544 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 545 | + $filter_query .= " INNER JOIN (SELECT famtrackid FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid "; |
|
| 546 | + } |
|
| 547 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 548 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 549 | + } |
|
| 550 | + |
|
| 551 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 552 | + if ($globalDBdriver == 'mysql') { |
|
| 553 | + $query = 'SELECT COUNT(DISTINCT famtrackid) as nb |
|
| 554 | 554 | FROM tracker_archive l |
| 555 | 555 | WHERE (l.date BETWEEN DATE_SUB('."'".$begindate."'".',INTERVAL '.$globalLiveInterval.' SECOND) AND '."'".$begindate."'".')'.$filter_query; |
| 556 | - } else { |
|
| 557 | - $query = 'SELECT COUNT(DISTINCT famtrackid) as nb FROM tracker_archive l WHERE (l.date BETWEEN '."'".$begindate."' - INTERVAL '".$globalLiveInterval." SECONDS' AND "."'".$enddate."'".')'.$filter_query; |
|
| 558 | - } |
|
| 559 | - //echo $query; |
|
| 560 | - try { |
|
| 561 | - $sth = $this->db->prepare($query); |
|
| 562 | - $sth->execute(); |
|
| 563 | - } catch(PDOException $e) { |
|
| 564 | - echo $e->getMessage(); |
|
| 565 | - die; |
|
| 566 | - } |
|
| 567 | - $result = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 568 | - $sth->closeCursor(); |
|
| 569 | - return $result['nb']; |
|
| 570 | - |
|
| 571 | - } |
|
| 572 | - |
|
| 573 | - |
|
| 574 | - |
|
| 575 | - // tracker_archive_output |
|
| 576 | - |
|
| 577 | - /** |
|
| 578 | - * Gets all the spotter information |
|
| 579 | - * |
|
| 580 | - * @param string $q |
|
| 581 | - * @param string $registration |
|
| 582 | - * @param string $aircraft_icao |
|
| 583 | - * @param string $aircraft_manufacturer |
|
| 584 | - * @param string $highlights |
|
| 585 | - * @param string $airline_icao |
|
| 586 | - * @param string $airline_country |
|
| 587 | - * @param string $airline_type |
|
| 588 | - * @param string $airport |
|
| 589 | - * @param string $airport_country |
|
| 590 | - * @param string $callsign |
|
| 591 | - * @param string $departure_airport_route |
|
| 592 | - * @param string $arrival_airport_route |
|
| 593 | - * @param string $owner |
|
| 594 | - * @param string $pilot_id |
|
| 595 | - * @param string $pilot_name |
|
| 596 | - * @param string $altitude |
|
| 597 | - * @param string $date_posted |
|
| 598 | - * @param string $limit |
|
| 599 | - * @param string $sort |
|
| 600 | - * @param string $includegeodata |
|
| 601 | - * @param string $origLat |
|
| 602 | - * @param string $origLon |
|
| 603 | - * @param string $dist |
|
| 604 | - * @param array $filters |
|
| 605 | - * @return array the spotter information |
|
| 606 | - */ |
|
| 607 | - public function searchTrackerData($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()) |
|
| 608 | - { |
|
| 609 | - global $globalTimezone, $globalDBdriver; |
|
| 610 | - require_once(dirname(__FILE__).'/class.Translation.php'); |
|
| 611 | - $Translation = new Translation($this->db); |
|
| 612 | - $Tracker = new Tracker($this->db); |
|
| 613 | - |
|
| 614 | - date_default_timezone_set('UTC'); |
|
| 556 | + } else { |
|
| 557 | + $query = 'SELECT COUNT(DISTINCT famtrackid) as nb FROM tracker_archive l WHERE (l.date BETWEEN '."'".$begindate."' - INTERVAL '".$globalLiveInterval." SECONDS' AND "."'".$enddate."'".')'.$filter_query; |
|
| 558 | + } |
|
| 559 | + //echo $query; |
|
| 560 | + try { |
|
| 561 | + $sth = $this->db->prepare($query); |
|
| 562 | + $sth->execute(); |
|
| 563 | + } catch(PDOException $e) { |
|
| 564 | + echo $e->getMessage(); |
|
| 565 | + die; |
|
| 566 | + } |
|
| 567 | + $result = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 568 | + $sth->closeCursor(); |
|
| 569 | + return $result['nb']; |
|
| 570 | + |
|
| 571 | + } |
|
| 572 | + |
|
| 573 | + |
|
| 574 | + |
|
| 575 | + // tracker_archive_output |
|
| 576 | + |
|
| 577 | + /** |
|
| 578 | + * Gets all the spotter information |
|
| 579 | + * |
|
| 580 | + * @param string $q |
|
| 581 | + * @param string $registration |
|
| 582 | + * @param string $aircraft_icao |
|
| 583 | + * @param string $aircraft_manufacturer |
|
| 584 | + * @param string $highlights |
|
| 585 | + * @param string $airline_icao |
|
| 586 | + * @param string $airline_country |
|
| 587 | + * @param string $airline_type |
|
| 588 | + * @param string $airport |
|
| 589 | + * @param string $airport_country |
|
| 590 | + * @param string $callsign |
|
| 591 | + * @param string $departure_airport_route |
|
| 592 | + * @param string $arrival_airport_route |
|
| 593 | + * @param string $owner |
|
| 594 | + * @param string $pilot_id |
|
| 595 | + * @param string $pilot_name |
|
| 596 | + * @param string $altitude |
|
| 597 | + * @param string $date_posted |
|
| 598 | + * @param string $limit |
|
| 599 | + * @param string $sort |
|
| 600 | + * @param string $includegeodata |
|
| 601 | + * @param string $origLat |
|
| 602 | + * @param string $origLon |
|
| 603 | + * @param string $dist |
|
| 604 | + * @param array $filters |
|
| 605 | + * @return array the spotter information |
|
| 606 | + */ |
|
| 607 | + public function searchTrackerData($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()) |
|
| 608 | + { |
|
| 609 | + global $globalTimezone, $globalDBdriver; |
|
| 610 | + require_once(dirname(__FILE__).'/class.Translation.php'); |
|
| 611 | + $Translation = new Translation($this->db); |
|
| 612 | + $Tracker = new Tracker($this->db); |
|
| 613 | + |
|
| 614 | + date_default_timezone_set('UTC'); |
|
| 615 | 615 | |
| 616 | - $query_values = array(); |
|
| 617 | - $additional_query = ''; |
|
| 618 | - $limit_query = ''; |
|
| 619 | - $filter_query = $this->getFilter($filters); |
|
| 620 | - if ($q != "") |
|
| 621 | - { |
|
| 622 | - if (!is_string($q)) |
|
| 623 | - { |
|
| 624 | - return array(); |
|
| 625 | - } else { |
|
| 616 | + $query_values = array(); |
|
| 617 | + $additional_query = ''; |
|
| 618 | + $limit_query = ''; |
|
| 619 | + $filter_query = $this->getFilter($filters); |
|
| 620 | + if ($q != "") |
|
| 621 | + { |
|
| 622 | + if (!is_string($q)) |
|
| 623 | + { |
|
| 624 | + return array(); |
|
| 625 | + } else { |
|
| 626 | 626 | |
| 627 | - $q_array = explode(" ", $q); |
|
| 627 | + $q_array = explode(" ", $q); |
|
| 628 | 628 | |
| 629 | - foreach ($q_array as $q_item){ |
|
| 630 | - $additional_query .= " AND ("; |
|
| 631 | - $additional_query .= "(tracker_archive_output.spotter_id like '%".$q_item."%') OR "; |
|
| 632 | - $additional_query .= "(tracker_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
|
| 633 | - $additional_query .= "(tracker_archive_output.aircraft_name like '%".$q_item."%') OR "; |
|
| 634 | - $additional_query .= "(tracker_archive_output.aircraft_manufacturer like '%".$q_item."%') OR "; |
|
| 635 | - $additional_query .= "(tracker_archive_output.airline_icao like '%".$q_item."%') OR "; |
|
| 636 | - $additional_query .= "(tracker_archive_output.airline_name like '%".$q_item."%') OR "; |
|
| 637 | - $additional_query .= "(tracker_archive_output.airline_country like '%".$q_item."%') OR "; |
|
| 638 | - $additional_query .= "(tracker_archive_output.departure_airport_icao like '%".$q_item."%') OR "; |
|
| 639 | - $additional_query .= "(tracker_archive_output.departure_airport_name like '%".$q_item."%') OR "; |
|
| 640 | - $additional_query .= "(tracker_archive_output.departure_airport_city like '%".$q_item."%') OR "; |
|
| 641 | - $additional_query .= "(tracker_archive_output.departure_airport_country like '%".$q_item."%') OR "; |
|
| 642 | - $additional_query .= "(tracker_archive_output.arrival_airport_icao like '%".$q_item."%') OR "; |
|
| 643 | - $additional_query .= "(tracker_archive_output.arrival_airport_name like '%".$q_item."%') OR "; |
|
| 644 | - $additional_query .= "(tracker_archive_output.arrival_airport_city like '%".$q_item."%') OR "; |
|
| 645 | - $additional_query .= "(tracker_archive_output.arrival_airport_country like '%".$q_item."%') OR "; |
|
| 646 | - $additional_query .= "(tracker_archive_output.registration like '%".$q_item."%') OR "; |
|
| 647 | - $additional_query .= "(tracker_archive_output.owner_name like '%".$q_item."%') OR "; |
|
| 648 | - $additional_query .= "(tracker_archive_output.pilot_id like '%".$q_item."%') OR "; |
|
| 649 | - $additional_query .= "(tracker_archive_output.pilot_name like '%".$q_item."%') OR "; |
|
| 650 | - $additional_query .= "(tracker_archive_output.ident like '%".$q_item."%') OR "; |
|
| 651 | - $translate = $Translation->ident2icao($q_item); |
|
| 652 | - if ($translate != $q_item) $additional_query .= "(tracker_archive_output.ident like '%".$translate."%') OR "; |
|
| 653 | - $additional_query .= "(tracker_archive_output.highlight like '%".$q_item."%')"; |
|
| 654 | - $additional_query .= ")"; |
|
| 655 | - } |
|
| 656 | - } |
|
| 657 | - } |
|
| 629 | + foreach ($q_array as $q_item){ |
|
| 630 | + $additional_query .= " AND ("; |
|
| 631 | + $additional_query .= "(tracker_archive_output.spotter_id like '%".$q_item."%') OR "; |
|
| 632 | + $additional_query .= "(tracker_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
|
| 633 | + $additional_query .= "(tracker_archive_output.aircraft_name like '%".$q_item."%') OR "; |
|
| 634 | + $additional_query .= "(tracker_archive_output.aircraft_manufacturer like '%".$q_item."%') OR "; |
|
| 635 | + $additional_query .= "(tracker_archive_output.airline_icao like '%".$q_item."%') OR "; |
|
| 636 | + $additional_query .= "(tracker_archive_output.airline_name like '%".$q_item."%') OR "; |
|
| 637 | + $additional_query .= "(tracker_archive_output.airline_country like '%".$q_item."%') OR "; |
|
| 638 | + $additional_query .= "(tracker_archive_output.departure_airport_icao like '%".$q_item."%') OR "; |
|
| 639 | + $additional_query .= "(tracker_archive_output.departure_airport_name like '%".$q_item."%') OR "; |
|
| 640 | + $additional_query .= "(tracker_archive_output.departure_airport_city like '%".$q_item."%') OR "; |
|
| 641 | + $additional_query .= "(tracker_archive_output.departure_airport_country like '%".$q_item."%') OR "; |
|
| 642 | + $additional_query .= "(tracker_archive_output.arrival_airport_icao like '%".$q_item."%') OR "; |
|
| 643 | + $additional_query .= "(tracker_archive_output.arrival_airport_name like '%".$q_item."%') OR "; |
|
| 644 | + $additional_query .= "(tracker_archive_output.arrival_airport_city like '%".$q_item."%') OR "; |
|
| 645 | + $additional_query .= "(tracker_archive_output.arrival_airport_country like '%".$q_item."%') OR "; |
|
| 646 | + $additional_query .= "(tracker_archive_output.registration like '%".$q_item."%') OR "; |
|
| 647 | + $additional_query .= "(tracker_archive_output.owner_name like '%".$q_item."%') OR "; |
|
| 648 | + $additional_query .= "(tracker_archive_output.pilot_id like '%".$q_item."%') OR "; |
|
| 649 | + $additional_query .= "(tracker_archive_output.pilot_name like '%".$q_item."%') OR "; |
|
| 650 | + $additional_query .= "(tracker_archive_output.ident like '%".$q_item."%') OR "; |
|
| 651 | + $translate = $Translation->ident2icao($q_item); |
|
| 652 | + if ($translate != $q_item) $additional_query .= "(tracker_archive_output.ident like '%".$translate."%') OR "; |
|
| 653 | + $additional_query .= "(tracker_archive_output.highlight like '%".$q_item."%')"; |
|
| 654 | + $additional_query .= ")"; |
|
| 655 | + } |
|
| 656 | + } |
|
| 657 | + } |
|
| 658 | 658 | |
| 659 | - if ($registration != "") |
|
| 660 | - { |
|
| 661 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 662 | - if (!is_string($registration)) |
|
| 663 | - { |
|
| 664 | - return array(); |
|
| 665 | - } else { |
|
| 666 | - $additional_query .= " AND (tracker_archive_output.registration = '".$registration."')"; |
|
| 667 | - } |
|
| 668 | - } |
|
| 659 | + if ($registration != "") |
|
| 660 | + { |
|
| 661 | + $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 662 | + if (!is_string($registration)) |
|
| 663 | + { |
|
| 664 | + return array(); |
|
| 665 | + } else { |
|
| 666 | + $additional_query .= " AND (tracker_archive_output.registration = '".$registration."')"; |
|
| 667 | + } |
|
| 668 | + } |
|
| 669 | 669 | |
| 670 | - if ($aircraft_icao != "") |
|
| 671 | - { |
|
| 672 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 673 | - if (!is_string($aircraft_icao)) |
|
| 674 | - { |
|
| 675 | - return array(); |
|
| 676 | - } else { |
|
| 677 | - $additional_query .= " AND (tracker_archive_output.aircraft_icao = '".$aircraft_icao."')"; |
|
| 678 | - } |
|
| 679 | - } |
|
| 670 | + if ($aircraft_icao != "") |
|
| 671 | + { |
|
| 672 | + $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 673 | + if (!is_string($aircraft_icao)) |
|
| 674 | + { |
|
| 675 | + return array(); |
|
| 676 | + } else { |
|
| 677 | + $additional_query .= " AND (tracker_archive_output.aircraft_icao = '".$aircraft_icao."')"; |
|
| 678 | + } |
|
| 679 | + } |
|
| 680 | 680 | |
| 681 | - if ($aircraft_manufacturer != "") |
|
| 682 | - { |
|
| 683 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 684 | - if (!is_string($aircraft_manufacturer)) |
|
| 685 | - { |
|
| 686 | - return array(); |
|
| 687 | - } else { |
|
| 688 | - $additional_query .= " AND (tracker_archive_output.aircraft_manufacturer = '".$aircraft_manufacturer."')"; |
|
| 689 | - } |
|
| 690 | - } |
|
| 681 | + if ($aircraft_manufacturer != "") |
|
| 682 | + { |
|
| 683 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 684 | + if (!is_string($aircraft_manufacturer)) |
|
| 685 | + { |
|
| 686 | + return array(); |
|
| 687 | + } else { |
|
| 688 | + $additional_query .= " AND (tracker_archive_output.aircraft_manufacturer = '".$aircraft_manufacturer."')"; |
|
| 689 | + } |
|
| 690 | + } |
|
| 691 | 691 | |
| 692 | - if ($highlights == "true") |
|
| 693 | - { |
|
| 694 | - if (!is_string($highlights)) |
|
| 695 | - { |
|
| 696 | - return array(); |
|
| 697 | - } else { |
|
| 698 | - $additional_query .= " AND (tracker_archive_output.highlight <> '')"; |
|
| 699 | - } |
|
| 700 | - } |
|
| 692 | + if ($highlights == "true") |
|
| 693 | + { |
|
| 694 | + if (!is_string($highlights)) |
|
| 695 | + { |
|
| 696 | + return array(); |
|
| 697 | + } else { |
|
| 698 | + $additional_query .= " AND (tracker_archive_output.highlight <> '')"; |
|
| 699 | + } |
|
| 700 | + } |
|
| 701 | 701 | |
| 702 | - if ($airline_icao != "") |
|
| 703 | - { |
|
| 704 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 705 | - if (!is_string($airline_icao)) |
|
| 706 | - { |
|
| 707 | - return array(); |
|
| 708 | - } else { |
|
| 709 | - $additional_query .= " AND (tracker_archive_output.airline_icao = '".$airline_icao."')"; |
|
| 710 | - } |
|
| 711 | - } |
|
| 702 | + if ($airline_icao != "") |
|
| 703 | + { |
|
| 704 | + $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 705 | + if (!is_string($airline_icao)) |
|
| 706 | + { |
|
| 707 | + return array(); |
|
| 708 | + } else { |
|
| 709 | + $additional_query .= " AND (tracker_archive_output.airline_icao = '".$airline_icao."')"; |
|
| 710 | + } |
|
| 711 | + } |
|
| 712 | 712 | |
| 713 | - if ($airline_country != "") |
|
| 714 | - { |
|
| 715 | - $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 716 | - if (!is_string($airline_country)) |
|
| 717 | - { |
|
| 718 | - return array(); |
|
| 719 | - } else { |
|
| 720 | - $additional_query .= " AND (tracker_archive_output.airline_country = '".$airline_country."')"; |
|
| 721 | - } |
|
| 722 | - } |
|
| 713 | + if ($airline_country != "") |
|
| 714 | + { |
|
| 715 | + $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 716 | + if (!is_string($airline_country)) |
|
| 717 | + { |
|
| 718 | + return array(); |
|
| 719 | + } else { |
|
| 720 | + $additional_query .= " AND (tracker_archive_output.airline_country = '".$airline_country."')"; |
|
| 721 | + } |
|
| 722 | + } |
|
| 723 | 723 | |
| 724 | - if ($airline_type != "") |
|
| 725 | - { |
|
| 726 | - $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 727 | - if (!is_string($airline_type)) |
|
| 728 | - { |
|
| 729 | - return array(); |
|
| 730 | - } else { |
|
| 731 | - if ($airline_type == "passenger") |
|
| 732 | - { |
|
| 733 | - $additional_query .= " AND (tracker_archive_output.airline_type = 'passenger')"; |
|
| 734 | - } |
|
| 735 | - if ($airline_type == "cargo") |
|
| 736 | - { |
|
| 737 | - $additional_query .= " AND (tracker_archive_output.airline_type = 'cargo')"; |
|
| 738 | - } |
|
| 739 | - if ($airline_type == "military") |
|
| 740 | - { |
|
| 741 | - $additional_query .= " AND (tracker_archive_output.airline_type = 'military')"; |
|
| 742 | - } |
|
| 743 | - } |
|
| 744 | - } |
|
| 724 | + if ($airline_type != "") |
|
| 725 | + { |
|
| 726 | + $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 727 | + if (!is_string($airline_type)) |
|
| 728 | + { |
|
| 729 | + return array(); |
|
| 730 | + } else { |
|
| 731 | + if ($airline_type == "passenger") |
|
| 732 | + { |
|
| 733 | + $additional_query .= " AND (tracker_archive_output.airline_type = 'passenger')"; |
|
| 734 | + } |
|
| 735 | + if ($airline_type == "cargo") |
|
| 736 | + { |
|
| 737 | + $additional_query .= " AND (tracker_archive_output.airline_type = 'cargo')"; |
|
| 738 | + } |
|
| 739 | + if ($airline_type == "military") |
|
| 740 | + { |
|
| 741 | + $additional_query .= " AND (tracker_archive_output.airline_type = 'military')"; |
|
| 742 | + } |
|
| 743 | + } |
|
| 744 | + } |
|
| 745 | 745 | |
| 746 | - if ($airport != "") |
|
| 747 | - { |
|
| 748 | - $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 749 | - if (!is_string($airport)) |
|
| 750 | - { |
|
| 751 | - return array(); |
|
| 752 | - } else { |
|
| 753 | - $additional_query .= " AND ((tracker_archive_output.departure_airport_icao = '".$airport."') OR (tracker_archive_output.arrival_airport_icao = '".$airport."'))"; |
|
| 754 | - } |
|
| 755 | - } |
|
| 746 | + if ($airport != "") |
|
| 747 | + { |
|
| 748 | + $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 749 | + if (!is_string($airport)) |
|
| 750 | + { |
|
| 751 | + return array(); |
|
| 752 | + } else { |
|
| 753 | + $additional_query .= " AND ((tracker_archive_output.departure_airport_icao = '".$airport."') OR (tracker_archive_output.arrival_airport_icao = '".$airport."'))"; |
|
| 754 | + } |
|
| 755 | + } |
|
| 756 | 756 | |
| 757 | - if ($airport_country != "") |
|
| 758 | - { |
|
| 759 | - $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 760 | - if (!is_string($airport_country)) |
|
| 761 | - { |
|
| 762 | - return array(); |
|
| 763 | - } else { |
|
| 764 | - $additional_query .= " AND ((tracker_archive_output.departure_airport_country = '".$airport_country."') OR (tracker_archive_output.arrival_airport_country = '".$airport_country."'))"; |
|
| 765 | - } |
|
| 766 | - } |
|
| 757 | + if ($airport_country != "") |
|
| 758 | + { |
|
| 759 | + $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 760 | + if (!is_string($airport_country)) |
|
| 761 | + { |
|
| 762 | + return array(); |
|
| 763 | + } else { |
|
| 764 | + $additional_query .= " AND ((tracker_archive_output.departure_airport_country = '".$airport_country."') OR (tracker_archive_output.arrival_airport_country = '".$airport_country."'))"; |
|
| 765 | + } |
|
| 766 | + } |
|
| 767 | 767 | |
| 768 | - if ($callsign != "") |
|
| 769 | - { |
|
| 770 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 771 | - if (!is_string($callsign)) |
|
| 772 | - { |
|
| 773 | - return array(); |
|
| 774 | - } else { |
|
| 775 | - $translate = $Translation->ident2icao($callsign); |
|
| 776 | - if ($translate != $callsign) { |
|
| 777 | - $additional_query .= " AND (tracker_archive_output.ident = :callsign OR tracker_archive_output.ident = :translate)"; |
|
| 778 | - $query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate)); |
|
| 779 | - } else { |
|
| 780 | - $additional_query .= " AND (tracker_archive_output.ident = '".$callsign."')"; |
|
| 781 | - } |
|
| 782 | - } |
|
| 783 | - } |
|
| 784 | - |
|
| 785 | - if ($owner != "") |
|
| 786 | - { |
|
| 787 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 788 | - if (!is_string($owner)) |
|
| 789 | - { |
|
| 790 | - return array(); |
|
| 791 | - } else { |
|
| 792 | - $additional_query .= " AND (tracker_archive_output.owner_name = '".$owner."')"; |
|
| 793 | - } |
|
| 794 | - } |
|
| 795 | - |
|
| 796 | - if ($pilot_name != "") |
|
| 797 | - { |
|
| 798 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 799 | - if (!is_string($pilot_name)) |
|
| 800 | - { |
|
| 801 | - return array(); |
|
| 802 | - } else { |
|
| 803 | - $additional_query .= " AND (tracker_archive_output.pilot_name = '".$pilot_name."')"; |
|
| 804 | - } |
|
| 805 | - } |
|
| 768 | + if ($callsign != "") |
|
| 769 | + { |
|
| 770 | + $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 771 | + if (!is_string($callsign)) |
|
| 772 | + { |
|
| 773 | + return array(); |
|
| 774 | + } else { |
|
| 775 | + $translate = $Translation->ident2icao($callsign); |
|
| 776 | + if ($translate != $callsign) { |
|
| 777 | + $additional_query .= " AND (tracker_archive_output.ident = :callsign OR tracker_archive_output.ident = :translate)"; |
|
| 778 | + $query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate)); |
|
| 779 | + } else { |
|
| 780 | + $additional_query .= " AND (tracker_archive_output.ident = '".$callsign."')"; |
|
| 781 | + } |
|
| 782 | + } |
|
| 783 | + } |
|
| 784 | + |
|
| 785 | + if ($owner != "") |
|
| 786 | + { |
|
| 787 | + $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 788 | + if (!is_string($owner)) |
|
| 789 | + { |
|
| 790 | + return array(); |
|
| 791 | + } else { |
|
| 792 | + $additional_query .= " AND (tracker_archive_output.owner_name = '".$owner."')"; |
|
| 793 | + } |
|
| 794 | + } |
|
| 795 | + |
|
| 796 | + if ($pilot_name != "") |
|
| 797 | + { |
|
| 798 | + $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 799 | + if (!is_string($pilot_name)) |
|
| 800 | + { |
|
| 801 | + return array(); |
|
| 802 | + } else { |
|
| 803 | + $additional_query .= " AND (tracker_archive_output.pilot_name = '".$pilot_name."')"; |
|
| 804 | + } |
|
| 805 | + } |
|
| 806 | 806 | |
| 807 | - if ($pilot_id != "") |
|
| 808 | - { |
|
| 809 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 810 | - if (!is_string($pilot_id)) |
|
| 811 | - { |
|
| 812 | - return array(); |
|
| 813 | - } else { |
|
| 814 | - $additional_query .= " AND (tracker_archive_output.pilot_id = '".$pilot_id."')"; |
|
| 815 | - } |
|
| 816 | - } |
|
| 807 | + if ($pilot_id != "") |
|
| 808 | + { |
|
| 809 | + $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 810 | + if (!is_string($pilot_id)) |
|
| 811 | + { |
|
| 812 | + return array(); |
|
| 813 | + } else { |
|
| 814 | + $additional_query .= " AND (tracker_archive_output.pilot_id = '".$pilot_id."')"; |
|
| 815 | + } |
|
| 816 | + } |
|
| 817 | 817 | |
| 818 | - if ($departure_airport_route != "") |
|
| 819 | - { |
|
| 820 | - $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 821 | - if (!is_string($departure_airport_route)) |
|
| 822 | - { |
|
| 823 | - return array(); |
|
| 824 | - } else { |
|
| 825 | - $additional_query .= " AND (tracker_archive_output.departure_airport_icao = '".$departure_airport_route."')"; |
|
| 826 | - } |
|
| 827 | - } |
|
| 818 | + if ($departure_airport_route != "") |
|
| 819 | + { |
|
| 820 | + $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 821 | + if (!is_string($departure_airport_route)) |
|
| 822 | + { |
|
| 823 | + return array(); |
|
| 824 | + } else { |
|
| 825 | + $additional_query .= " AND (tracker_archive_output.departure_airport_icao = '".$departure_airport_route."')"; |
|
| 826 | + } |
|
| 827 | + } |
|
| 828 | 828 | |
| 829 | - if ($arrival_airport_route != "") |
|
| 830 | - { |
|
| 831 | - $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 832 | - if (!is_string($arrival_airport_route)) |
|
| 833 | - { |
|
| 834 | - return array(); |
|
| 835 | - } else { |
|
| 836 | - $additional_query .= " AND (tracker_archive_output.arrival_airport_icao = '".$arrival_airport_route."')"; |
|
| 837 | - } |
|
| 838 | - } |
|
| 829 | + if ($arrival_airport_route != "") |
|
| 830 | + { |
|
| 831 | + $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 832 | + if (!is_string($arrival_airport_route)) |
|
| 833 | + { |
|
| 834 | + return array(); |
|
| 835 | + } else { |
|
| 836 | + $additional_query .= " AND (tracker_archive_output.arrival_airport_icao = '".$arrival_airport_route."')"; |
|
| 837 | + } |
|
| 838 | + } |
|
| 839 | 839 | |
| 840 | - if ($altitude != "") |
|
| 841 | - { |
|
| 842 | - $altitude_array = explode(",", $altitude); |
|
| 840 | + if ($altitude != "") |
|
| 841 | + { |
|
| 842 | + $altitude_array = explode(",", $altitude); |
|
| 843 | 843 | |
| 844 | - $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 845 | - $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 844 | + $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 845 | + $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 846 | 846 | |
| 847 | 847 | |
| 848 | - if ($altitude_array[1] != "") |
|
| 849 | - { |
|
| 850 | - $altitude_array[0] = substr($altitude_array[0], 0, -2); |
|
| 851 | - $altitude_array[1] = substr($altitude_array[1], 0, -2); |
|
| 852 | - $additional_query .= " AND altitude BETWEEN '".$altitude_array[0]."' AND '".$altitude_array[1]."' "; |
|
| 853 | - } else { |
|
| 854 | - $altitude_array[0] = substr($altitude_array[0], 0, -2); |
|
| 855 | - $additional_query .= " AND altitude <= '".$altitude_array[0]."' "; |
|
| 856 | - } |
|
| 857 | - } |
|
| 848 | + if ($altitude_array[1] != "") |
|
| 849 | + { |
|
| 850 | + $altitude_array[0] = substr($altitude_array[0], 0, -2); |
|
| 851 | + $altitude_array[1] = substr($altitude_array[1], 0, -2); |
|
| 852 | + $additional_query .= " AND altitude BETWEEN '".$altitude_array[0]."' AND '".$altitude_array[1]."' "; |
|
| 853 | + } else { |
|
| 854 | + $altitude_array[0] = substr($altitude_array[0], 0, -2); |
|
| 855 | + $additional_query .= " AND altitude <= '".$altitude_array[0]."' "; |
|
| 856 | + } |
|
| 857 | + } |
|
| 858 | 858 | |
| 859 | - if ($date_posted != "") |
|
| 860 | - { |
|
| 861 | - $date_array = explode(",", $date_posted); |
|
| 859 | + if ($date_posted != "") |
|
| 860 | + { |
|
| 861 | + $date_array = explode(",", $date_posted); |
|
| 862 | 862 | |
| 863 | - $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 864 | - $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 863 | + $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 864 | + $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 865 | 865 | |
| 866 | - if ($globalTimezone != '') { |
|
| 867 | - date_default_timezone_set($globalTimezone); |
|
| 868 | - $datetime = new DateTime(); |
|
| 869 | - $offset = $datetime->format('P'); |
|
| 870 | - } else $offset = '+00:00'; |
|
| 871 | - |
|
| 872 | - |
|
| 873 | - if ($date_array[1] != "") |
|
| 874 | - { |
|
| 875 | - $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0])); |
|
| 876 | - $date_array[1] = date("Y-m-d H:i:s", strtotime($date_array[1])); |
|
| 877 | - if ($globalDBdriver == 'mysql') { |
|
| 878 | - $additional_query .= " AND TIMESTAMP(CONVERT_TZ(tracker_archive_output.date,'+00:00', '".$offset."')) >= '".$date_array[0]."' AND TIMESTAMP(CONVERT_TZ(tracker_archive_output.date,'+00:00', '".$offset."')) <= '".$date_array[1]."' "; |
|
| 879 | - } else { |
|
| 880 | - $additional_query .= " AND tracker_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) AND tracker_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." <= CAST('".$date_array[1]."' AS TIMESTAMP) "; |
|
| 881 | - } |
|
| 882 | - } else { |
|
| 883 | - $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0])); |
|
| 884 | - if ($globalDBdriver == 'mysql') { |
|
| 885 | - $additional_query .= " AND TIMESTAMP(CONVERT_TZ(tracker_archive_output.date,'+00:00', '".$offset."')) >= '".$date_array[0]."' "; |
|
| 886 | - } else { |
|
| 887 | - $additional_query .= " AND tracker_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) "; |
|
| 888 | - } |
|
| 889 | - } |
|
| 890 | - } |
|
| 866 | + if ($globalTimezone != '') { |
|
| 867 | + date_default_timezone_set($globalTimezone); |
|
| 868 | + $datetime = new DateTime(); |
|
| 869 | + $offset = $datetime->format('P'); |
|
| 870 | + } else $offset = '+00:00'; |
|
| 871 | + |
|
| 872 | + |
|
| 873 | + if ($date_array[1] != "") |
|
| 874 | + { |
|
| 875 | + $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0])); |
|
| 876 | + $date_array[1] = date("Y-m-d H:i:s", strtotime($date_array[1])); |
|
| 877 | + if ($globalDBdriver == 'mysql') { |
|
| 878 | + $additional_query .= " AND TIMESTAMP(CONVERT_TZ(tracker_archive_output.date,'+00:00', '".$offset."')) >= '".$date_array[0]."' AND TIMESTAMP(CONVERT_TZ(tracker_archive_output.date,'+00:00', '".$offset."')) <= '".$date_array[1]."' "; |
|
| 879 | + } else { |
|
| 880 | + $additional_query .= " AND tracker_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) AND tracker_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." <= CAST('".$date_array[1]."' AS TIMESTAMP) "; |
|
| 881 | + } |
|
| 882 | + } else { |
|
| 883 | + $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0])); |
|
| 884 | + if ($globalDBdriver == 'mysql') { |
|
| 885 | + $additional_query .= " AND TIMESTAMP(CONVERT_TZ(tracker_archive_output.date,'+00:00', '".$offset."')) >= '".$date_array[0]."' "; |
|
| 886 | + } else { |
|
| 887 | + $additional_query .= " AND tracker_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) "; |
|
| 888 | + } |
|
| 889 | + } |
|
| 890 | + } |
|
| 891 | 891 | |
| 892 | - if ($limit != "") |
|
| 893 | - { |
|
| 894 | - $limit_array = explode(",", $limit); |
|
| 892 | + if ($limit != "") |
|
| 893 | + { |
|
| 894 | + $limit_array = explode(",", $limit); |
|
| 895 | 895 | |
| 896 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 897 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 896 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 897 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 898 | 898 | |
| 899 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 900 | - { |
|
| 901 | - //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
|
| 902 | - $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
|
| 903 | - } |
|
| 904 | - } |
|
| 899 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 900 | + { |
|
| 901 | + //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
|
| 902 | + $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
|
| 903 | + } |
|
| 904 | + } |
|
| 905 | 905 | |
| 906 | 906 | |
| 907 | - if ($origLat != "" && $origLon != "" && $dist != "") { |
|
| 908 | - $dist = number_format($dist*0.621371,2,'.',''); |
|
| 909 | - $query="SELECT tracker_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(tracker_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(tracker_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
| 907 | + if ($origLat != "" && $origLon != "" && $dist != "") { |
|
| 908 | + $dist = number_format($dist*0.621371,2,'.',''); |
|
| 909 | + $query="SELECT tracker_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(tracker_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(tracker_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
| 910 | 910 | FROM tracker_archive_output, tracker_archive WHERE spotter_output_archive.famtrackid = tracker_archive.famtrackid AND spotter_output.ident <> '' ".$additional_query."AND CAST(tracker_archive.longitude as double precision) between ($origLon-$dist/ABS(cos(radians($origLat))*69)) and ($origLon+$dist/ABS(cos(radians($origLat))*69)) and CAST(tracker_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) |
| 911 | 911 | AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(tracker_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(tracker_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query." ORDER BY distance"; |
| 912 | - } else { |
|
| 913 | - if ($sort != "") |
|
| 914 | - { |
|
| 915 | - $search_orderby_array = $Tracker->getOrderBy(); |
|
| 916 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 917 | - } else { |
|
| 918 | - $orderby_query = " ORDER BY tracker_archive_output.date DESC"; |
|
| 919 | - } |
|
| 912 | + } else { |
|
| 913 | + if ($sort != "") |
|
| 914 | + { |
|
| 915 | + $search_orderby_array = $Tracker->getOrderBy(); |
|
| 916 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 917 | + } else { |
|
| 918 | + $orderby_query = " ORDER BY tracker_archive_output.date DESC"; |
|
| 919 | + } |
|
| 920 | 920 | |
| 921 | - if ($includegeodata == "true") |
|
| 922 | - { |
|
| 923 | - $additional_query .= " AND (tracker_archive_output.waypoints <> '')"; |
|
| 924 | - } |
|
| 921 | + if ($includegeodata == "true") |
|
| 922 | + { |
|
| 923 | + $additional_query .= " AND (tracker_archive_output.waypoints <> '')"; |
|
| 924 | + } |
|
| 925 | 925 | |
| 926 | - $query = "SELECT tracker_archive_output.* FROM tracker_archive_output |
|
| 926 | + $query = "SELECT tracker_archive_output.* FROM tracker_archive_output |
|
| 927 | 927 | WHERE tracker_archive_output.ident <> '' |
| 928 | 928 | ".$additional_query." |
| 929 | 929 | ".$filter_query.$orderby_query; |
| 930 | - } |
|
| 931 | - $spotter_array = $Tracker->getDataFromDB($query, $query_values,$limit_query); |
|
| 932 | - |
|
| 933 | - return $spotter_array; |
|
| 934 | - } |
|
| 935 | - |
|
| 936 | - public function deleteTrackerArchiveData() |
|
| 937 | - { |
|
| 938 | - global $globalArchiveKeepMonths, $globalDBdriver; |
|
| 939 | - date_default_timezone_set('UTC'); |
|
| 940 | - if ($globalDBdriver == 'mysql') { |
|
| 941 | - $query = 'DELETE FROM tracker_archive_output WHERE tracker_archive_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepMonths.' MONTH)'; |
|
| 942 | - } else { |
|
| 943 | - $query = "DELETE FROM tracker_archive_output WHERE tracker_archive_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveKeepMonths." MONTH'"; |
|
| 944 | - } |
|
| 945 | - try { |
|
| 946 | - $sth = $this->db->prepare($query); |
|
| 947 | - $sth->execute(); |
|
| 948 | - } catch(PDOException $e) { |
|
| 949 | - return "error"; |
|
| 950 | - } |
|
| 951 | - return ''; |
|
| 952 | - } |
|
| 953 | - |
|
| 954 | - /** |
|
| 955 | - * Gets all the spotter information based on the callsign |
|
| 956 | - * |
|
| 957 | - * @param string $ident |
|
| 958 | - * @param string $limit |
|
| 959 | - * @param string $sort |
|
| 960 | - * @return array the spotter information |
|
| 961 | - */ |
|
| 962 | - public function getTrackerDataByIdent($ident = '', $limit = '', $sort = '') |
|
| 963 | - { |
|
| 964 | - $global_query = "SELECT tracker_archive_output.* FROM tracker_archive_output"; |
|
| 930 | + } |
|
| 931 | + $spotter_array = $Tracker->getDataFromDB($query, $query_values,$limit_query); |
|
| 932 | + |
|
| 933 | + return $spotter_array; |
|
| 934 | + } |
|
| 935 | + |
|
| 936 | + public function deleteTrackerArchiveData() |
|
| 937 | + { |
|
| 938 | + global $globalArchiveKeepMonths, $globalDBdriver; |
|
| 939 | + date_default_timezone_set('UTC'); |
|
| 940 | + if ($globalDBdriver == 'mysql') { |
|
| 941 | + $query = 'DELETE FROM tracker_archive_output WHERE tracker_archive_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepMonths.' MONTH)'; |
|
| 942 | + } else { |
|
| 943 | + $query = "DELETE FROM tracker_archive_output WHERE tracker_archive_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveKeepMonths." MONTH'"; |
|
| 944 | + } |
|
| 945 | + try { |
|
| 946 | + $sth = $this->db->prepare($query); |
|
| 947 | + $sth->execute(); |
|
| 948 | + } catch(PDOException $e) { |
|
| 949 | + return "error"; |
|
| 950 | + } |
|
| 951 | + return ''; |
|
| 952 | + } |
|
| 953 | + |
|
| 954 | + /** |
|
| 955 | + * Gets all the spotter information based on the callsign |
|
| 956 | + * |
|
| 957 | + * @param string $ident |
|
| 958 | + * @param string $limit |
|
| 959 | + * @param string $sort |
|
| 960 | + * @return array the spotter information |
|
| 961 | + */ |
|
| 962 | + public function getTrackerDataByIdent($ident = '', $limit = '', $sort = '') |
|
| 963 | + { |
|
| 964 | + $global_query = "SELECT tracker_archive_output.* FROM tracker_archive_output"; |
|
| 965 | 965 | |
| 966 | - date_default_timezone_set('UTC'); |
|
| 967 | - $Tracker = new Tracker($this->db); |
|
| 966 | + date_default_timezone_set('UTC'); |
|
| 967 | + $Tracker = new Tracker($this->db); |
|
| 968 | 968 | |
| 969 | - $query_values = array(); |
|
| 970 | - $limit_query = ''; |
|
| 971 | - $additional_query = ''; |
|
| 969 | + $query_values = array(); |
|
| 970 | + $limit_query = ''; |
|
| 971 | + $additional_query = ''; |
|
| 972 | 972 | |
| 973 | - if ($ident != "") |
|
| 974 | - { |
|
| 975 | - if (!is_string($ident)) |
|
| 976 | - { |
|
| 977 | - return array(); |
|
| 978 | - } else { |
|
| 979 | - $additional_query = " AND (tracker_archive_output.ident = :ident)"; |
|
| 980 | - $query_values = array(':ident' => $ident); |
|
| 981 | - } |
|
| 982 | - } |
|
| 973 | + if ($ident != "") |
|
| 974 | + { |
|
| 975 | + if (!is_string($ident)) |
|
| 976 | + { |
|
| 977 | + return array(); |
|
| 978 | + } else { |
|
| 979 | + $additional_query = " AND (tracker_archive_output.ident = :ident)"; |
|
| 980 | + $query_values = array(':ident' => $ident); |
|
| 981 | + } |
|
| 982 | + } |
|
| 983 | 983 | |
| 984 | - if ($limit != "") |
|
| 985 | - { |
|
| 986 | - $limit_array = explode(",", $limit); |
|
| 984 | + if ($limit != "") |
|
| 985 | + { |
|
| 986 | + $limit_array = explode(",", $limit); |
|
| 987 | 987 | |
| 988 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 989 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 988 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 989 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 990 | 990 | |
| 991 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 992 | - { |
|
| 993 | - //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
|
| 994 | - $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
|
| 995 | - } |
|
| 996 | - } |
|
| 997 | - |
|
| 998 | - if ($sort != "") |
|
| 999 | - { |
|
| 1000 | - $search_orderby_array = $Tracker->getOrderBy(); |
|
| 1001 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1002 | - } else { |
|
| 1003 | - $orderby_query = " ORDER BY tracker_archive_output.date DESC"; |
|
| 1004 | - } |
|
| 1005 | - |
|
| 1006 | - $query = $global_query." WHERE tracker_archive_output.ident <> '' ".$additional_query." ".$orderby_query; |
|
| 1007 | - |
|
| 1008 | - $spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query); |
|
| 1009 | - |
|
| 1010 | - return $spotter_array; |
|
| 1011 | - } |
|
| 1012 | - |
|
| 1013 | - |
|
| 1014 | - /** |
|
| 1015 | - * Gets all the spotter information based on the owner |
|
| 1016 | - * |
|
| 1017 | - * @param string $owner |
|
| 1018 | - * @param string $limit |
|
| 1019 | - * @param string $sort |
|
| 1020 | - * @param array $filter |
|
| 1021 | - * @return array the spotter information |
|
| 1022 | - */ |
|
| 1023 | - public function getTrackerDataByOwner($owner = '', $limit = '', $sort = '', $filter = array()) |
|
| 1024 | - { |
|
| 1025 | - $global_query = "SELECT tracker_archive_output.* FROM tracker_archive_output"; |
|
| 991 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 992 | + { |
|
| 993 | + //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
|
| 994 | + $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
|
| 995 | + } |
|
| 996 | + } |
|
| 997 | + |
|
| 998 | + if ($sort != "") |
|
| 999 | + { |
|
| 1000 | + $search_orderby_array = $Tracker->getOrderBy(); |
|
| 1001 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1002 | + } else { |
|
| 1003 | + $orderby_query = " ORDER BY tracker_archive_output.date DESC"; |
|
| 1004 | + } |
|
| 1005 | + |
|
| 1006 | + $query = $global_query." WHERE tracker_archive_output.ident <> '' ".$additional_query." ".$orderby_query; |
|
| 1007 | + |
|
| 1008 | + $spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query); |
|
| 1009 | + |
|
| 1010 | + return $spotter_array; |
|
| 1011 | + } |
|
| 1012 | + |
|
| 1013 | + |
|
| 1014 | + /** |
|
| 1015 | + * Gets all the spotter information based on the owner |
|
| 1016 | + * |
|
| 1017 | + * @param string $owner |
|
| 1018 | + * @param string $limit |
|
| 1019 | + * @param string $sort |
|
| 1020 | + * @param array $filter |
|
| 1021 | + * @return array the spotter information |
|
| 1022 | + */ |
|
| 1023 | + public function getTrackerDataByOwner($owner = '', $limit = '', $sort = '', $filter = array()) |
|
| 1024 | + { |
|
| 1025 | + $global_query = "SELECT tracker_archive_output.* FROM tracker_archive_output"; |
|
| 1026 | 1026 | |
| 1027 | - date_default_timezone_set('UTC'); |
|
| 1028 | - $Tracker = new Tracker($this->db); |
|
| 1027 | + date_default_timezone_set('UTC'); |
|
| 1028 | + $Tracker = new Tracker($this->db); |
|
| 1029 | 1029 | |
| 1030 | - $query_values = array(); |
|
| 1031 | - $limit_query = ''; |
|
| 1032 | - $additional_query = ''; |
|
| 1033 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 1030 | + $query_values = array(); |
|
| 1031 | + $limit_query = ''; |
|
| 1032 | + $additional_query = ''; |
|
| 1033 | + $filter_query = $this->getFilter($filter,true,true); |
|
| 1034 | 1034 | |
| 1035 | - if ($owner != "") |
|
| 1036 | - { |
|
| 1037 | - if (!is_string($owner)) |
|
| 1038 | - { |
|
| 1039 | - return array(); |
|
| 1040 | - } else { |
|
| 1041 | - $additional_query = " AND (tracker_archive_output.owner_name = :owner)"; |
|
| 1042 | - $query_values = array(':owner' => $owner); |
|
| 1043 | - } |
|
| 1044 | - } |
|
| 1035 | + if ($owner != "") |
|
| 1036 | + { |
|
| 1037 | + if (!is_string($owner)) |
|
| 1038 | + { |
|
| 1039 | + return array(); |
|
| 1040 | + } else { |
|
| 1041 | + $additional_query = " AND (tracker_archive_output.owner_name = :owner)"; |
|
| 1042 | + $query_values = array(':owner' => $owner); |
|
| 1043 | + } |
|
| 1044 | + } |
|
| 1045 | 1045 | |
| 1046 | - if ($limit != "") |
|
| 1047 | - { |
|
| 1048 | - $limit_array = explode(",", $limit); |
|
| 1046 | + if ($limit != "") |
|
| 1047 | + { |
|
| 1048 | + $limit_array = explode(",", $limit); |
|
| 1049 | 1049 | |
| 1050 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1051 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1050 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1051 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1052 | 1052 | |
| 1053 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1054 | - { |
|
| 1055 | - //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
|
| 1056 | - $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
|
| 1057 | - } |
|
| 1058 | - } |
|
| 1059 | - |
|
| 1060 | - if ($sort != "") |
|
| 1061 | - { |
|
| 1062 | - $search_orderby_array = $Tracker->getOrderBy(); |
|
| 1063 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1064 | - } else { |
|
| 1065 | - $orderby_query = " ORDER BY tracker_archive_output.date DESC"; |
|
| 1066 | - } |
|
| 1067 | - |
|
| 1068 | - $query = $global_query.$filter_query." tracker_archive_output.owner_name <> '' ".$additional_query." ".$orderby_query; |
|
| 1069 | - |
|
| 1070 | - $spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query); |
|
| 1071 | - |
|
| 1072 | - return $spotter_array; |
|
| 1073 | - } |
|
| 1074 | - |
|
| 1075 | - /** |
|
| 1076 | - * Gets all the spotter information based on the pilot |
|
| 1077 | - * |
|
| 1078 | - * @param string $pilot |
|
| 1079 | - * @param string $limit |
|
| 1080 | - * @param string $sort |
|
| 1081 | - * @param array $filter |
|
| 1082 | - * @return array the spotter information |
|
| 1083 | - */ |
|
| 1084 | - public function getTrackerDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array()) |
|
| 1085 | - { |
|
| 1086 | - $global_query = "SELECT tracker_archive_output.* FROM tracker_archive_output"; |
|
| 1053 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1054 | + { |
|
| 1055 | + //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
|
| 1056 | + $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
|
| 1057 | + } |
|
| 1058 | + } |
|
| 1059 | + |
|
| 1060 | + if ($sort != "") |
|
| 1061 | + { |
|
| 1062 | + $search_orderby_array = $Tracker->getOrderBy(); |
|
| 1063 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1064 | + } else { |
|
| 1065 | + $orderby_query = " ORDER BY tracker_archive_output.date DESC"; |
|
| 1066 | + } |
|
| 1067 | + |
|
| 1068 | + $query = $global_query.$filter_query." tracker_archive_output.owner_name <> '' ".$additional_query." ".$orderby_query; |
|
| 1069 | + |
|
| 1070 | + $spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query); |
|
| 1071 | + |
|
| 1072 | + return $spotter_array; |
|
| 1073 | + } |
|
| 1074 | + |
|
| 1075 | + /** |
|
| 1076 | + * Gets all the spotter information based on the pilot |
|
| 1077 | + * |
|
| 1078 | + * @param string $pilot |
|
| 1079 | + * @param string $limit |
|
| 1080 | + * @param string $sort |
|
| 1081 | + * @param array $filter |
|
| 1082 | + * @return array the spotter information |
|
| 1083 | + */ |
|
| 1084 | + public function getTrackerDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array()) |
|
| 1085 | + { |
|
| 1086 | + $global_query = "SELECT tracker_archive_output.* FROM tracker_archive_output"; |
|
| 1087 | 1087 | |
| 1088 | - date_default_timezone_set('UTC'); |
|
| 1089 | - $Tracker = new Tracker($this->db); |
|
| 1088 | + date_default_timezone_set('UTC'); |
|
| 1089 | + $Tracker = new Tracker($this->db); |
|
| 1090 | 1090 | |
| 1091 | - $query_values = array(); |
|
| 1092 | - $limit_query = ''; |
|
| 1093 | - $additional_query = ''; |
|
| 1094 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 1091 | + $query_values = array(); |
|
| 1092 | + $limit_query = ''; |
|
| 1093 | + $additional_query = ''; |
|
| 1094 | + $filter_query = $this->getFilter($filter,true,true); |
|
| 1095 | 1095 | |
| 1096 | - if ($pilot != "") |
|
| 1097 | - { |
|
| 1098 | - $additional_query = " AND (tracker_archive_output.pilot_id = :pilot OR tracker_archive_output.pilot_name = :pilot)"; |
|
| 1099 | - $query_values = array(':pilot' => $pilot); |
|
| 1100 | - } |
|
| 1096 | + if ($pilot != "") |
|
| 1097 | + { |
|
| 1098 | + $additional_query = " AND (tracker_archive_output.pilot_id = :pilot OR tracker_archive_output.pilot_name = :pilot)"; |
|
| 1099 | + $query_values = array(':pilot' => $pilot); |
|
| 1100 | + } |
|
| 1101 | 1101 | |
| 1102 | - if ($limit != "") |
|
| 1103 | - { |
|
| 1104 | - $limit_array = explode(",", $limit); |
|
| 1102 | + if ($limit != "") |
|
| 1103 | + { |
|
| 1104 | + $limit_array = explode(",", $limit); |
|
| 1105 | 1105 | |
| 1106 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1107 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1106 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1107 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1108 | 1108 | |
| 1109 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1110 | - { |
|
| 1111 | - //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
|
| 1112 | - $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
|
| 1113 | - } |
|
| 1114 | - } |
|
| 1115 | - |
|
| 1116 | - if ($sort != "") |
|
| 1117 | - { |
|
| 1118 | - $search_orderby_array = $Tracker->getOrderBy(); |
|
| 1119 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1120 | - } else { |
|
| 1121 | - $orderby_query = " ORDER BY tracker_archive_output.date DESC"; |
|
| 1122 | - } |
|
| 1123 | - |
|
| 1124 | - $query = $global_query.$filter_query." tracker_archive_output.pilot_name <> '' ".$additional_query." ".$orderby_query; |
|
| 1125 | - |
|
| 1126 | - $spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query); |
|
| 1127 | - |
|
| 1128 | - return $spotter_array; |
|
| 1129 | - } |
|
| 1130 | - |
|
| 1131 | - /** |
|
| 1132 | - * Gets all number of flight over countries |
|
| 1133 | - * |
|
| 1134 | - * @param bool $limit |
|
| 1135 | - * @param int $olderthanmonths |
|
| 1136 | - * @param string $sincedate |
|
| 1137 | - * @return array the airline country list |
|
| 1138 | - */ |
|
| 1139 | - public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1140 | - { |
|
| 1141 | - global $globalDBdriver; |
|
| 1142 | - /* |
|
| 1109 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1110 | + { |
|
| 1111 | + //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
|
| 1112 | + $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
|
| 1113 | + } |
|
| 1114 | + } |
|
| 1115 | + |
|
| 1116 | + if ($sort != "") |
|
| 1117 | + { |
|
| 1118 | + $search_orderby_array = $Tracker->getOrderBy(); |
|
| 1119 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1120 | + } else { |
|
| 1121 | + $orderby_query = " ORDER BY tracker_archive_output.date DESC"; |
|
| 1122 | + } |
|
| 1123 | + |
|
| 1124 | + $query = $global_query.$filter_query." tracker_archive_output.pilot_name <> '' ".$additional_query." ".$orderby_query; |
|
| 1125 | + |
|
| 1126 | + $spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query); |
|
| 1127 | + |
|
| 1128 | + return $spotter_array; |
|
| 1129 | + } |
|
| 1130 | + |
|
| 1131 | + /** |
|
| 1132 | + * Gets all number of flight over countries |
|
| 1133 | + * |
|
| 1134 | + * @param bool $limit |
|
| 1135 | + * @param int $olderthanmonths |
|
| 1136 | + * @param string $sincedate |
|
| 1137 | + * @return array the airline country list |
|
| 1138 | + */ |
|
| 1139 | + public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1140 | + { |
|
| 1141 | + global $globalDBdriver; |
|
| 1142 | + /* |
|
| 1143 | 1143 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
| 1144 | 1144 | FROM countries c, tracker_archive s |
| 1145 | 1145 | WHERE Within(GeomFromText(CONCAT('POINT(',s.longitude,' ',s.latitude,')')), ogc_geom) "; |
| 1146 | 1146 | */ |
| 1147 | - $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
|
| 1147 | + $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
|
| 1148 | 1148 | FROM countries c, tracker_archive s |
| 1149 | 1149 | WHERE c.iso2 = s.over_country "; |
| 1150 | - if ($olderthanmonths > 0) { |
|
| 1151 | - if ($globalDBdriver == 'mysql') { |
|
| 1152 | - $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) '; |
|
| 1153 | - } else { |
|
| 1154 | - $query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
|
| 1155 | - } |
|
| 1156 | - } |
|
| 1157 | - if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
| 1158 | - $query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
|
| 1159 | - if ($limit) $query .= " LIMIT 0,10"; |
|
| 1150 | + if ($olderthanmonths > 0) { |
|
| 1151 | + if ($globalDBdriver == 'mysql') { |
|
| 1152 | + $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) '; |
|
| 1153 | + } else { |
|
| 1154 | + $query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
|
| 1155 | + } |
|
| 1156 | + } |
|
| 1157 | + if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
| 1158 | + $query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
|
| 1159 | + if ($limit) $query .= " LIMIT 0,10"; |
|
| 1160 | 1160 | |
| 1161 | 1161 | |
| 1162 | - $sth = $this->db->prepare($query); |
|
| 1163 | - $sth->execute(); |
|
| 1162 | + $sth = $this->db->prepare($query); |
|
| 1163 | + $sth->execute(); |
|
| 1164 | 1164 | |
| 1165 | - $flight_array = array(); |
|
| 1166 | - $temp_array = array(); |
|
| 1165 | + $flight_array = array(); |
|
| 1166 | + $temp_array = array(); |
|
| 1167 | 1167 | |
| 1168 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1169 | - { |
|
| 1170 | - $temp_array['flight_count'] = $row['nb']; |
|
| 1171 | - $temp_array['flight_country'] = $row['name']; |
|
| 1172 | - $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1173 | - $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1174 | - $flight_array[] = $temp_array; |
|
| 1175 | - } |
|
| 1176 | - return $flight_array; |
|
| 1177 | - } |
|
| 1178 | - |
|
| 1179 | - /** |
|
| 1180 | - * Gets all number of flight over countries |
|
| 1181 | - * |
|
| 1182 | - * @param bool $limit |
|
| 1183 | - * @param int $olderthanmonths |
|
| 1184 | - * @param string $sincedate |
|
| 1185 | - * @return array the airline country list |
|
| 1186 | - */ |
|
| 1187 | - public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1188 | - { |
|
| 1189 | - global $globalDBdriver; |
|
| 1190 | - /* |
|
| 1168 | + while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1169 | + { |
|
| 1170 | + $temp_array['flight_count'] = $row['nb']; |
|
| 1171 | + $temp_array['flight_country'] = $row['name']; |
|
| 1172 | + $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1173 | + $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1174 | + $flight_array[] = $temp_array; |
|
| 1175 | + } |
|
| 1176 | + return $flight_array; |
|
| 1177 | + } |
|
| 1178 | + |
|
| 1179 | + /** |
|
| 1180 | + * Gets all number of flight over countries |
|
| 1181 | + * |
|
| 1182 | + * @param bool $limit |
|
| 1183 | + * @param int $olderthanmonths |
|
| 1184 | + * @param string $sincedate |
|
| 1185 | + * @return array the airline country list |
|
| 1186 | + */ |
|
| 1187 | + public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1188 | + { |
|
| 1189 | + global $globalDBdriver; |
|
| 1190 | + /* |
|
| 1191 | 1191 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
| 1192 | 1192 | FROM countries c, tracker_archive s |
| 1193 | 1193 | WHERE Within(GeomFromText(CONCAT('POINT(',s.longitude,' ',s.latitude,')')), ogc_geom) "; |
| 1194 | 1194 | */ |
| 1195 | - $query = "SELECT o.airline_icao,c.name, c.iso3, c.iso2, count(c.name) as nb |
|
| 1195 | + $query = "SELECT o.airline_icao,c.name, c.iso3, c.iso2, count(c.name) as nb |
|
| 1196 | 1196 | FROM countries c, tracker_archive s, spotter_output o |
| 1197 | 1197 | WHERE c.iso2 = s.over_country AND o.airline_icao <> '' AND o.famtrackid = s.famtrackid "; |
| 1198 | - if ($olderthanmonths > 0) { |
|
| 1199 | - if ($globalDBdriver == 'mysql') { |
|
| 1200 | - $query .= 'AND s.date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) '; |
|
| 1201 | - } else { |
|
| 1202 | - $query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
|
| 1203 | - } |
|
| 1204 | - } |
|
| 1205 | - if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' "; |
|
| 1206 | - $query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
|
| 1207 | - if ($limit) $query .= " LIMIT 0,10"; |
|
| 1198 | + if ($olderthanmonths > 0) { |
|
| 1199 | + if ($globalDBdriver == 'mysql') { |
|
| 1200 | + $query .= 'AND s.date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) '; |
|
| 1201 | + } else { |
|
| 1202 | + $query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
|
| 1203 | + } |
|
| 1204 | + } |
|
| 1205 | + if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' "; |
|
| 1206 | + $query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
|
| 1207 | + if ($limit) $query .= " LIMIT 0,10"; |
|
| 1208 | 1208 | |
| 1209 | 1209 | |
| 1210 | - $sth = $this->db->prepare($query); |
|
| 1211 | - $sth->execute(); |
|
| 1210 | + $sth = $this->db->prepare($query); |
|
| 1211 | + $sth->execute(); |
|
| 1212 | 1212 | |
| 1213 | - $flight_array = array(); |
|
| 1214 | - $temp_array = array(); |
|
| 1213 | + $flight_array = array(); |
|
| 1214 | + $temp_array = array(); |
|
| 1215 | 1215 | |
| 1216 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1217 | - { |
|
| 1218 | - $temp_array['airline_icao'] = $row['airline_icao']; |
|
| 1219 | - $temp_array['flight_count'] = $row['nb']; |
|
| 1220 | - $temp_array['flight_country'] = $row['name']; |
|
| 1221 | - $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1222 | - $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1223 | - $flight_array[] = $temp_array; |
|
| 1224 | - } |
|
| 1225 | - return $flight_array; |
|
| 1226 | - } |
|
| 1227 | - |
|
| 1228 | - /** |
|
| 1229 | - * Gets last spotter information based on a particular callsign |
|
| 1230 | - * |
|
| 1231 | - * @param $id |
|
| 1232 | - * @param $date |
|
| 1233 | - * @return array the spotter information |
|
| 1234 | - */ |
|
| 1235 | - public function getDateArchiveTrackerDataById($id,$date) |
|
| 1236 | - { |
|
| 1237 | - $Tracker = new Tracker($this->db); |
|
| 1238 | - date_default_timezone_set('UTC'); |
|
| 1239 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 1240 | - $query = 'SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.famtrackid = :id AND l.date <= :date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate ORDER BY tracker_archive.date DESC'; |
|
| 1241 | - $date = date('c',$date); |
|
| 1242 | - $spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id,':date' => $date)); |
|
| 1243 | - return $spotter_array; |
|
| 1244 | - } |
|
| 1245 | - |
|
| 1246 | - /** |
|
| 1247 | - * Gets all the spotter information based on a particular callsign |
|
| 1248 | - * |
|
| 1249 | - * @param $ident |
|
| 1250 | - * @param $date |
|
| 1251 | - * @return array the spotter information |
|
| 1252 | - */ |
|
| 1253 | - public function getDateArchiveTrackerDataByIdent($ident,$date) |
|
| 1254 | - { |
|
| 1255 | - $Tracker = new Tracker($this->db); |
|
| 1256 | - date_default_timezone_set('UTC'); |
|
| 1257 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 1258 | - $query = 'SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate ORDER BY tracker_archive.date DESC'; |
|
| 1259 | - $date = date('c',$date); |
|
| 1260 | - $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
|
| 1261 | - return $spotter_array; |
|
| 1262 | - } |
|
| 1263 | - |
|
| 1264 | - /** |
|
| 1265 | - * Gets all the spotter information based on the airport |
|
| 1266 | - * |
|
| 1267 | - * @param string $airport |
|
| 1268 | - * @param string $limit |
|
| 1269 | - * @param string $sort |
|
| 1270 | - * @param array $filters |
|
| 1271 | - * @return array the spotter information |
|
| 1272 | - */ |
|
| 1273 | - public function getTrackerDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1274 | - { |
|
| 1275 | - global $global_query; |
|
| 1276 | - $Tracker = new Tracker($this->db); |
|
| 1277 | - date_default_timezone_set('UTC'); |
|
| 1278 | - $query_values = array(); |
|
| 1279 | - $limit_query = ''; |
|
| 1280 | - $additional_query = ''; |
|
| 1281 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1216 | + while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1217 | + { |
|
| 1218 | + $temp_array['airline_icao'] = $row['airline_icao']; |
|
| 1219 | + $temp_array['flight_count'] = $row['nb']; |
|
| 1220 | + $temp_array['flight_country'] = $row['name']; |
|
| 1221 | + $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1222 | + $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1223 | + $flight_array[] = $temp_array; |
|
| 1224 | + } |
|
| 1225 | + return $flight_array; |
|
| 1226 | + } |
|
| 1227 | + |
|
| 1228 | + /** |
|
| 1229 | + * Gets last spotter information based on a particular callsign |
|
| 1230 | + * |
|
| 1231 | + * @param $id |
|
| 1232 | + * @param $date |
|
| 1233 | + * @return array the spotter information |
|
| 1234 | + */ |
|
| 1235 | + public function getDateArchiveTrackerDataById($id,$date) |
|
| 1236 | + { |
|
| 1237 | + $Tracker = new Tracker($this->db); |
|
| 1238 | + date_default_timezone_set('UTC'); |
|
| 1239 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 1240 | + $query = 'SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.famtrackid = :id AND l.date <= :date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate ORDER BY tracker_archive.date DESC'; |
|
| 1241 | + $date = date('c',$date); |
|
| 1242 | + $spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id,':date' => $date)); |
|
| 1243 | + return $spotter_array; |
|
| 1244 | + } |
|
| 1245 | + |
|
| 1246 | + /** |
|
| 1247 | + * Gets all the spotter information based on a particular callsign |
|
| 1248 | + * |
|
| 1249 | + * @param $ident |
|
| 1250 | + * @param $date |
|
| 1251 | + * @return array the spotter information |
|
| 1252 | + */ |
|
| 1253 | + public function getDateArchiveTrackerDataByIdent($ident,$date) |
|
| 1254 | + { |
|
| 1255 | + $Tracker = new Tracker($this->db); |
|
| 1256 | + date_default_timezone_set('UTC'); |
|
| 1257 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 1258 | + $query = 'SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate ORDER BY tracker_archive.date DESC'; |
|
| 1259 | + $date = date('c',$date); |
|
| 1260 | + $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
|
| 1261 | + return $spotter_array; |
|
| 1262 | + } |
|
| 1263 | + |
|
| 1264 | + /** |
|
| 1265 | + * Gets all the spotter information based on the airport |
|
| 1266 | + * |
|
| 1267 | + * @param string $airport |
|
| 1268 | + * @param string $limit |
|
| 1269 | + * @param string $sort |
|
| 1270 | + * @param array $filters |
|
| 1271 | + * @return array the spotter information |
|
| 1272 | + */ |
|
| 1273 | + public function getTrackerDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1274 | + { |
|
| 1275 | + global $global_query; |
|
| 1276 | + $Tracker = new Tracker($this->db); |
|
| 1277 | + date_default_timezone_set('UTC'); |
|
| 1278 | + $query_values = array(); |
|
| 1279 | + $limit_query = ''; |
|
| 1280 | + $additional_query = ''; |
|
| 1281 | + $filter_query = $this->getFilter($filters,true,true); |
|
| 1282 | 1282 | |
| 1283 | - if ($airport != "") |
|
| 1284 | - { |
|
| 1285 | - if (!is_string($airport)) |
|
| 1286 | - { |
|
| 1287 | - return array(); |
|
| 1288 | - } else { |
|
| 1289 | - $additional_query .= " AND ((tracker_archive_output.departure_airport_icao = :airport) OR (tracker_archive_output.arrival_airport_icao = :airport))"; |
|
| 1290 | - $query_values = array(':airport' => $airport); |
|
| 1291 | - } |
|
| 1292 | - } |
|
| 1283 | + if ($airport != "") |
|
| 1284 | + { |
|
| 1285 | + if (!is_string($airport)) |
|
| 1286 | + { |
|
| 1287 | + return array(); |
|
| 1288 | + } else { |
|
| 1289 | + $additional_query .= " AND ((tracker_archive_output.departure_airport_icao = :airport) OR (tracker_archive_output.arrival_airport_icao = :airport))"; |
|
| 1290 | + $query_values = array(':airport' => $airport); |
|
| 1291 | + } |
|
| 1292 | + } |
|
| 1293 | 1293 | |
| 1294 | - if ($limit != "") |
|
| 1295 | - { |
|
| 1296 | - $limit_array = explode(",", $limit); |
|
| 1294 | + if ($limit != "") |
|
| 1295 | + { |
|
| 1296 | + $limit_array = explode(",", $limit); |
|
| 1297 | 1297 | |
| 1298 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1299 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1298 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1299 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1300 | 1300 | |
| 1301 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1302 | - { |
|
| 1303 | - //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
|
| 1304 | - $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
|
| 1305 | - } |
|
| 1306 | - } |
|
| 1301 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1302 | + { |
|
| 1303 | + //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
|
| 1304 | + $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
|
| 1305 | + } |
|
| 1306 | + } |
|
| 1307 | 1307 | |
| 1308 | - if ($sort != "") |
|
| 1309 | - { |
|
| 1310 | - $search_orderby_array = $Tracker->getOrderBy(); |
|
| 1311 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1312 | - } else { |
|
| 1313 | - $orderby_query = " ORDER BY tracker_archive_output.date DESC"; |
|
| 1314 | - } |
|
| 1308 | + if ($sort != "") |
|
| 1309 | + { |
|
| 1310 | + $search_orderby_array = $Tracker->getOrderBy(); |
|
| 1311 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1312 | + } else { |
|
| 1313 | + $orderby_query = " ORDER BY tracker_archive_output.date DESC"; |
|
| 1314 | + } |
|
| 1315 | 1315 | |
| 1316 | - $query = $global_query.$filter_query." tracker_archive_output.ident <> '' ".$additional_query." AND ((tracker_archive_output.departure_airport_icao <> 'NA') AND (tracker_archive_output.arrival_airport_icao <> 'NA')) ".$orderby_query; |
|
| 1316 | + $query = $global_query.$filter_query." tracker_archive_output.ident <> '' ".$additional_query." AND ((tracker_archive_output.departure_airport_icao <> 'NA') AND (tracker_archive_output.arrival_airport_icao <> 'NA')) ".$orderby_query; |
|
| 1317 | 1317 | |
| 1318 | - $spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query); |
|
| 1318 | + $spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query); |
|
| 1319 | 1319 | |
| 1320 | - return $spotter_array; |
|
| 1321 | - } |
|
| 1320 | + return $spotter_array; |
|
| 1321 | + } |
|
| 1322 | 1322 | } |
| 1323 | 1323 | ?> |
| 1324 | 1324 | \ No newline at end of file |
@@ -23,33 +23,33 @@ discard block |
||
| 23 | 23 | * @param bool $and |
| 24 | 24 | * @return string the SQL part |
| 25 | 25 | */ |
| 26 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 26 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 27 | 27 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 28 | 28 | $filters = array(); |
| 29 | 29 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 30 | 30 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 31 | 31 | $filters = $globalStatsFilters[$globalFilterName]; |
| 32 | 32 | } else { |
| 33 | - $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
|
| 33 | + $filter = array_merge($filter, $globalStatsFilters[$globalFilterName]); |
|
| 34 | 34 | } |
| 35 | 35 | } |
| 36 | 36 | if (isset($filter[0]['source'])) { |
| 37 | - $filters = array_merge($filters,$filter); |
|
| 37 | + $filters = array_merge($filters, $filter); |
|
| 38 | 38 | } |
| 39 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 39 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 40 | 40 | $filter_query_join = ''; |
| 41 | 41 | $filter_query_where = ''; |
| 42 | - foreach($filters as $flt) { |
|
| 42 | + foreach ($filters as $flt) { |
|
| 43 | 43 | if (isset($flt['idents']) && !empty($flt['idents'])) { |
| 44 | 44 | if (isset($flt['source'])) { |
| 45 | - $filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.ident IN ('".implode("','",$flt['idents'])."') AND tracker_archive_output.format_source IN ('".implode("','",$flt['source'])."')) spid ON spid.famtrackid = tracker_archive.famtrackid"; |
|
| 45 | + $filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.ident IN ('".implode("','", $flt['idents'])."') AND tracker_archive_output.format_source IN ('".implode("','", $flt['source'])."')) spid ON spid.famtrackid = tracker_archive.famtrackid"; |
|
| 46 | 46 | } else { |
| 47 | - $filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.ident IN ('".implode("','",$flt['idents'])."')) spid ON spid.famtrackid = tracker_archive.famtrackid"; |
|
| 47 | + $filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.ident IN ('".implode("','", $flt['idents'])."')) spid ON spid.famtrackid = tracker_archive.famtrackid"; |
|
| 48 | 48 | } |
| 49 | 49 | } |
| 50 | 50 | } |
| 51 | 51 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 52 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 52 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 53 | 53 | } |
| 54 | 54 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 55 | 55 | $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
@@ -77,15 +77,15 @@ discard block |
||
| 77 | 77 | $filter_query_date .= " AND EXTRACT(DAY FROM tracker_archive_output.date) = '".$filter['day']."'"; |
| 78 | 78 | } |
| 79 | 79 | } |
| 80 | - $filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.famtrackid = tracker_archive.famtrackid"; |
|
| 80 | + $filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.famtrackid = tracker_archive.famtrackid"; |
|
| 81 | 81 | } |
| 82 | 82 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 83 | - $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 83 | + $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 84 | 84 | } |
| 85 | 85 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 86 | 86 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
| 87 | 87 | if ($filter_query_where != '') { |
| 88 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
| 88 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
| 89 | 89 | } |
| 90 | 90 | $filter_query = $filter_query_join.$filter_query_where; |
| 91 | 91 | return $filter_query; |
@@ -115,19 +115,19 @@ discard block |
||
| 115 | 115 | require_once(dirname(__FILE__).'/class.Tracker.php'); |
| 116 | 116 | if ($over_country == '') { |
| 117 | 117 | $Tracker = new Tracker($this->db); |
| 118 | - $data_country = $Tracker->getCountryFromLatitudeLongitude($latitude,$longitude); |
|
| 118 | + $data_country = $Tracker->getCountryFromLatitudeLongitude($latitude, $longitude); |
|
| 119 | 119 | if (!empty($data_country)) $country = $data_country['iso2']; |
| 120 | 120 | else $country = ''; |
| 121 | 121 | } else $country = $over_country; |
| 122 | 122 | // Route is not added in tracker_archive |
| 123 | - $query = 'INSERT INTO tracker_archive (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, over_country, comment, type) |
|
| 123 | + $query = 'INSERT INTO tracker_archive (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, over_country, comment, type) |
|
| 124 | 124 | VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:groundspeed,:date,:format_source, :source_name, :over_country,:comment,:type)'; |
| 125 | - $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':altitude' => $altitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $country,':comment' => $comment,':type' => $type); |
|
| 125 | + $query_values = array(':famtrackid' => $famtrackid, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $country, ':comment' => $comment, ':type' => $type); |
|
| 126 | 126 | try { |
| 127 | 127 | $sth = $this->db->prepare($query); |
| 128 | 128 | $sth->execute($query_values); |
| 129 | 129 | $sth->closeCursor(); |
| 130 | - } catch(PDOException $e) { |
|
| 130 | + } catch (PDOException $e) { |
|
| 131 | 131 | return "error : ".$e->getMessage(); |
| 132 | 132 | } |
| 133 | 133 | return "success"; |
@@ -145,8 +145,8 @@ discard block |
||
| 145 | 145 | $Tracker = new Tracker($this->db); |
| 146 | 146 | date_default_timezone_set('UTC'); |
| 147 | 147 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 148 | - $query = "SELECT tracker_archive.* FROM tracker_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 149 | - $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident)); |
|
| 148 | + $query = "SELECT tracker_archive.* FROM tracker_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 149 | + $spotter_array = $Tracker->getDataFromDB($query, array(':ident' => $ident)); |
|
| 150 | 150 | return $spotter_array; |
| 151 | 151 | } |
| 152 | 152 | |
@@ -164,7 +164,7 @@ discard block |
||
| 164 | 164 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 165 | 165 | //$query = TrackerArchive->$global_query." WHERE tracker_archive.famtrackid = :id"; |
| 166 | 166 | //$query = "SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.famtrackid = :id GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1"; |
| 167 | - $query = "SELECT * FROM tracker_archive WHERE famtrackid = :id ORDER BY date DESC LIMIT 1"; |
|
| 167 | + $query = "SELECT * FROM tracker_archive WHERE famtrackid = :id ORDER BY date DESC LIMIT 1"; |
|
| 168 | 168 | |
| 169 | 169 | // $spotter_array = Tracker->getDataFromDB($query,array(':id' => $id)); |
| 170 | 170 | /* |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | } |
| 178 | 178 | $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC); |
| 179 | 179 | */ |
| 180 | - $spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id)); |
|
| 180 | + $spotter_array = $Tracker->getDataFromDB($query, array(':id' => $id)); |
|
| 181 | 181 | |
| 182 | 182 | return $spotter_array; |
| 183 | 183 | } |
@@ -189,19 +189,19 @@ discard block |
||
| 189 | 189 | * @param string $date |
| 190 | 190 | * @return array the spotter information |
| 191 | 191 | */ |
| 192 | - public function getAllArchiveTrackerDataById($id,$date = '') |
|
| 192 | + public function getAllArchiveTrackerDataById($id, $date = '') |
|
| 193 | 193 | { |
| 194 | 194 | date_default_timezone_set('UTC'); |
| 195 | 195 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 196 | - if ($date == '') $query = $this->global_query." WHERE tracker_archive.famtrackid = :id ORDER BY date"; |
|
| 197 | - else $query = $this->global_query." WHERE tracker_archive.famtrackid = :id AND date < '".date('c',$date)."' ORDER BY date"; |
|
| 196 | + if ($date == '') $query = $this->global_query." WHERE tracker_archive.famtrackid = :id ORDER BY date"; |
|
| 197 | + else $query = $this->global_query." WHERE tracker_archive.famtrackid = :id AND date < '".date('c', $date)."' ORDER BY date"; |
|
| 198 | 198 | |
| 199 | 199 | // $spotter_array = Tracker->getDataFromDB($query,array(':id' => $id)); |
| 200 | 200 | |
| 201 | 201 | try { |
| 202 | 202 | $sth = $this->db->prepare($query); |
| 203 | 203 | $sth->execute(array(':id' => $id)); |
| 204 | - } catch(PDOException $e) { |
|
| 204 | + } catch (PDOException $e) { |
|
| 205 | 205 | echo $e->getMessage(); |
| 206 | 206 | die; |
| 207 | 207 | } |
@@ -220,14 +220,14 @@ discard block |
||
| 220 | 220 | { |
| 221 | 221 | date_default_timezone_set('UTC'); |
| 222 | 222 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 223 | - $query = "SELECT tracker_archive.latitude, tracker_archive.longitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id"; |
|
| 223 | + $query = "SELECT tracker_archive.latitude, tracker_archive.longitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id"; |
|
| 224 | 224 | |
| 225 | 225 | // $spotter_array = Tracker->getDataFromDB($query,array(':id' => $id)); |
| 226 | 226 | |
| 227 | 227 | try { |
| 228 | 228 | $sth = $this->db->prepare($query); |
| 229 | 229 | $sth->execute(array(':id' => $id)); |
| 230 | - } catch(PDOException $e) { |
|
| 230 | + } catch (PDOException $e) { |
|
| 231 | 231 | echo $e->getMessage(); |
| 232 | 232 | die; |
| 233 | 233 | } |
@@ -249,12 +249,12 @@ discard block |
||
| 249 | 249 | date_default_timezone_set('UTC'); |
| 250 | 250 | |
| 251 | 251 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 252 | - $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.ident = :ident AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date"; |
|
| 252 | + $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.ident = :ident AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date"; |
|
| 253 | 253 | |
| 254 | 254 | try { |
| 255 | 255 | $sth = $this->db->prepare($query); |
| 256 | 256 | $sth->execute(array(':ident' => $ident)); |
| 257 | - } catch(PDOException $e) { |
|
| 257 | + } catch (PDOException $e) { |
|
| 258 | 258 | echo $e->getMessage(); |
| 259 | 259 | die; |
| 260 | 260 | } |
@@ -275,12 +275,12 @@ discard block |
||
| 275 | 275 | date_default_timezone_set('UTC'); |
| 276 | 276 | |
| 277 | 277 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 278 | - $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date"; |
|
| 278 | + $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date"; |
|
| 279 | 279 | |
| 280 | 280 | try { |
| 281 | 281 | $sth = $this->db->prepare($query); |
| 282 | 282 | $sth->execute(array(':id' => $id)); |
| 283 | - } catch(PDOException $e) { |
|
| 283 | + } catch (PDOException $e) { |
|
| 284 | 284 | echo $e->getMessage(); |
| 285 | 285 | die; |
| 286 | 286 | } |
@@ -301,12 +301,12 @@ discard block |
||
| 301 | 301 | date_default_timezone_set('UTC'); |
| 302 | 302 | |
| 303 | 303 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 304 | - $query = "SELECT tracker_archive.altitude, tracker_archive.ground_speed, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id ORDER BY date"; |
|
| 304 | + $query = "SELECT tracker_archive.altitude, tracker_archive.ground_speed, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id ORDER BY date"; |
|
| 305 | 305 | |
| 306 | 306 | try { |
| 307 | 307 | $sth = $this->db->prepare($query); |
| 308 | 308 | $sth->execute(array(':id' => $id)); |
| 309 | - } catch(PDOException $e) { |
|
| 309 | + } catch (PDOException $e) { |
|
| 310 | 310 | echo $e->getMessage(); |
| 311 | 311 | die; |
| 312 | 312 | } |
@@ -328,13 +328,13 @@ discard block |
||
| 328 | 328 | date_default_timezone_set('UTC'); |
| 329 | 329 | |
| 330 | 330 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 331 | - $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1"; |
|
| 331 | + $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1"; |
|
| 332 | 332 | // $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.ident = :ident"; |
| 333 | 333 | |
| 334 | 334 | try { |
| 335 | 335 | $sth = $this->db->prepare($query); |
| 336 | 336 | $sth->execute(array(':ident' => $ident)); |
| 337 | - } catch(PDOException $e) { |
|
| 337 | + } catch (PDOException $e) { |
|
| 338 | 338 | echo $e->getMessage(); |
| 339 | 339 | die; |
| 340 | 340 | } |
@@ -352,13 +352,13 @@ discard block |
||
| 352 | 352 | * @param $date |
| 353 | 353 | * @return array the spotter information |
| 354 | 354 | */ |
| 355 | - public function getTrackerArchiveData($ident,$famtrackid,$date) |
|
| 355 | + public function getTrackerArchiveData($ident, $famtrackid, $date) |
|
| 356 | 356 | { |
| 357 | 357 | $Tracker = new Tracker($this->db); |
| 358 | 358 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 359 | - $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.famtrackid = :famtrackid AND l.date LIKE :date GROUP BY l.famtrackid) s on spotter_live.famtrackid = s.famtrackid AND spotter_live.date = s.maxdate"; |
|
| 359 | + $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.famtrackid = :famtrackid AND l.date LIKE :date GROUP BY l.famtrackid) s on spotter_live.famtrackid = s.famtrackid AND spotter_live.date = s.maxdate"; |
|
| 360 | 360 | |
| 361 | - $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident,':famtrackid' => $famtrackid,':date' => $date.'%')); |
|
| 361 | + $spotter_array = $Tracker->getDataFromDB($query, array(':ident' => $ident, ':famtrackid' => $famtrackid, ':date' => $date.'%')); |
|
| 362 | 362 | |
| 363 | 363 | return $spotter_array; |
| 364 | 364 | } |
@@ -374,7 +374,7 @@ discard block |
||
| 374 | 374 | try { |
| 375 | 375 | $sth = $this->db->prepare($query); |
| 376 | 376 | $sth->execute(); |
| 377 | - } catch(PDOException $e) { |
|
| 377 | + } catch (PDOException $e) { |
|
| 378 | 378 | echo $e->getMessage(); |
| 379 | 379 | die; |
| 380 | 380 | } |
@@ -388,24 +388,24 @@ discard block |
||
| 388 | 388 | * @param array $filter |
| 389 | 389 | * @return array the spotter information |
| 390 | 390 | */ |
| 391 | - public function getMinLiveTrackerData($begindate,$enddate,$filter = array()) |
|
| 391 | + public function getMinLiveTrackerData($begindate, $enddate, $filter = array()) |
|
| 392 | 392 | { |
| 393 | 393 | global $globalDBdriver; |
| 394 | 394 | date_default_timezone_set('UTC'); |
| 395 | 395 | |
| 396 | 396 | $filter_query = ''; |
| 397 | 397 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 398 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 398 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 399 | 399 | } |
| 400 | 400 | // Use spotter_output also ? |
| 401 | 401 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 402 | - $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid "; |
|
| 402 | + $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid "; |
|
| 403 | 403 | } |
| 404 | 404 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 405 | 405 | $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid "; |
| 406 | 406 | } |
| 407 | 407 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 408 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 408 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 409 | 409 | } |
| 410 | 410 | |
| 411 | 411 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -424,14 +424,14 @@ discard block |
||
| 424 | 424 | GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid |
| 425 | 425 | AND tracker_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON tracker_archive.aircraft_icao = a.icao'; |
| 426 | 426 | */ |
| 427 | - $query = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 427 | + $query = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 428 | 428 | FROM tracker_archive |
| 429 | 429 | INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao |
| 430 | 430 | WHERE tracker_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' |
| 431 | 431 | '.$filter_query.' ORDER BY famtrackid'; |
| 432 | 432 | } else { |
| 433 | 433 | //$query = 'SELECT tracker_archive.ident, tracker_archive.famtrackid, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao'; |
| 434 | - $query = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 434 | + $query = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 435 | 435 | FROM tracker_archive |
| 436 | 436 | INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao |
| 437 | 437 | WHERE tracker_archive.date >= '."'".$begindate."'".' AND tracker_archive.date <= '."'".$enddate."'".' |
@@ -441,7 +441,7 @@ discard block |
||
| 441 | 441 | try { |
| 442 | 442 | $sth = $this->db->prepare($query); |
| 443 | 443 | $sth->execute(); |
| 444 | - } catch(PDOException $e) { |
|
| 444 | + } catch (PDOException $e) { |
|
| 445 | 445 | echo $e->getMessage(); |
| 446 | 446 | die; |
| 447 | 447 | } |
@@ -458,24 +458,24 @@ discard block |
||
| 458 | 458 | * @param array $filter |
| 459 | 459 | * @return array the spotter information |
| 460 | 460 | */ |
| 461 | - public function getMinLiveTrackerDataPlayback($begindate,$enddate,$filter = array()) |
|
| 461 | + public function getMinLiveTrackerDataPlayback($begindate, $enddate, $filter = array()) |
|
| 462 | 462 | { |
| 463 | 463 | global $globalDBdriver; |
| 464 | 464 | date_default_timezone_set('UTC'); |
| 465 | 465 | |
| 466 | 466 | $filter_query = ''; |
| 467 | 467 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 468 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 468 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 469 | 469 | } |
| 470 | 470 | // Should use spotter_output also ? |
| 471 | 471 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 472 | - $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid "; |
|
| 472 | + $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid "; |
|
| 473 | 473 | } |
| 474 | 474 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 475 | 475 | $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid "; |
| 476 | 476 | } |
| 477 | 477 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 478 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 478 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 479 | 479 | } |
| 480 | 480 | |
| 481 | 481 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -485,7 +485,7 @@ discard block |
||
| 485 | 485 | FROM tracker_archive |
| 486 | 486 | INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON tracker_archive.aircraft_icao = a.icao'; |
| 487 | 487 | */ |
| 488 | - $query = 'SELECT a.aircraft_shadow, tracker_archive_output.ident, tracker_archive_output.famtrackid, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk |
|
| 488 | + $query = 'SELECT a.aircraft_shadow, tracker_archive_output.ident, tracker_archive_output.famtrackid, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk |
|
| 489 | 489 | FROM tracker_archive_output |
| 490 | 490 | LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON tracker_archive_output.aircraft_icao = a.icao |
| 491 | 491 | WHERE (tracker_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') |
@@ -500,7 +500,7 @@ discard block |
||
| 500 | 500 | WHERE tracker_archive_output.date >= '."'".$begindate."'".' AND tracker_archive_output.date <= '."'".$enddate."'".' |
| 501 | 501 | '.$filter_query.' GROUP BY tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao, tracker_archive_output.arrival_airport_icao, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow'; |
| 502 | 502 | */ |
| 503 | - $query = 'SELECT DISTINCT tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow |
|
| 503 | + $query = 'SELECT DISTINCT tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow |
|
| 504 | 504 | FROM tracker_archive_output |
| 505 | 505 | INNER JOIN (SELECT * FROM aircraft) a on tracker_archive_output.aircraft_icao = a.icao |
| 506 | 506 | WHERE tracker_archive_output.date >= '."'".$begindate."'".' AND tracker_archive_output.date <= '."'".$enddate."'".' |
@@ -512,7 +512,7 @@ discard block |
||
| 512 | 512 | try { |
| 513 | 513 | $sth = $this->db->prepare($query); |
| 514 | 514 | $sth->execute(); |
| 515 | - } catch(PDOException $e) { |
|
| 515 | + } catch (PDOException $e) { |
|
| 516 | 516 | echo $e->getMessage(); |
| 517 | 517 | die; |
| 518 | 518 | } |
@@ -529,23 +529,23 @@ discard block |
||
| 529 | 529 | * @param array $filter |
| 530 | 530 | * @return array the spotter information |
| 531 | 531 | */ |
| 532 | - public function getLiveTrackerCount($begindate,$enddate,$filter = array()) |
|
| 532 | + public function getLiveTrackerCount($begindate, $enddate, $filter = array()) |
|
| 533 | 533 | { |
| 534 | 534 | global $globalDBdriver, $globalLiveInterval; |
| 535 | 535 | date_default_timezone_set('UTC'); |
| 536 | 536 | |
| 537 | 537 | $filter_query = ''; |
| 538 | 538 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 539 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 539 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 540 | 540 | } |
| 541 | 541 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 542 | - $filter_query .= " INNER JOIN (SELECT famtrackid FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid "; |
|
| 542 | + $filter_query .= " INNER JOIN (SELECT famtrackid FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid "; |
|
| 543 | 543 | } |
| 544 | 544 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 545 | 545 | $filter_query .= " INNER JOIN (SELECT famtrackid FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid "; |
| 546 | 546 | } |
| 547 | 547 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 548 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 548 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 549 | 549 | } |
| 550 | 550 | |
| 551 | 551 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -560,7 +560,7 @@ discard block |
||
| 560 | 560 | try { |
| 561 | 561 | $sth = $this->db->prepare($query); |
| 562 | 562 | $sth->execute(); |
| 563 | - } catch(PDOException $e) { |
|
| 563 | + } catch (PDOException $e) { |
|
| 564 | 564 | echo $e->getMessage(); |
| 565 | 565 | die; |
| 566 | 566 | } |
@@ -604,7 +604,7 @@ discard block |
||
| 604 | 604 | * @param array $filters |
| 605 | 605 | * @return array the spotter information |
| 606 | 606 | */ |
| 607 | - public function searchTrackerData($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()) |
|
| 607 | + public function searchTrackerData($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()) |
|
| 608 | 608 | { |
| 609 | 609 | global $globalTimezone, $globalDBdriver; |
| 610 | 610 | require_once(dirname(__FILE__).'/class.Translation.php'); |
@@ -626,7 +626,7 @@ discard block |
||
| 626 | 626 | |
| 627 | 627 | $q_array = explode(" ", $q); |
| 628 | 628 | |
| 629 | - foreach ($q_array as $q_item){ |
|
| 629 | + foreach ($q_array as $q_item) { |
|
| 630 | 630 | $additional_query .= " AND ("; |
| 631 | 631 | $additional_query .= "(tracker_archive_output.spotter_id like '%".$q_item."%') OR "; |
| 632 | 632 | $additional_query .= "(tracker_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
@@ -658,7 +658,7 @@ discard block |
||
| 658 | 658 | |
| 659 | 659 | if ($registration != "") |
| 660 | 660 | { |
| 661 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 661 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 662 | 662 | if (!is_string($registration)) |
| 663 | 663 | { |
| 664 | 664 | return array(); |
@@ -669,7 +669,7 @@ discard block |
||
| 669 | 669 | |
| 670 | 670 | if ($aircraft_icao != "") |
| 671 | 671 | { |
| 672 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 672 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 673 | 673 | if (!is_string($aircraft_icao)) |
| 674 | 674 | { |
| 675 | 675 | return array(); |
@@ -680,7 +680,7 @@ discard block |
||
| 680 | 680 | |
| 681 | 681 | if ($aircraft_manufacturer != "") |
| 682 | 682 | { |
| 683 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 683 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 684 | 684 | if (!is_string($aircraft_manufacturer)) |
| 685 | 685 | { |
| 686 | 686 | return array(); |
@@ -701,7 +701,7 @@ discard block |
||
| 701 | 701 | |
| 702 | 702 | if ($airline_icao != "") |
| 703 | 703 | { |
| 704 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 704 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 705 | 705 | if (!is_string($airline_icao)) |
| 706 | 706 | { |
| 707 | 707 | return array(); |
@@ -712,7 +712,7 @@ discard block |
||
| 712 | 712 | |
| 713 | 713 | if ($airline_country != "") |
| 714 | 714 | { |
| 715 | - $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 715 | + $airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING); |
|
| 716 | 716 | if (!is_string($airline_country)) |
| 717 | 717 | { |
| 718 | 718 | return array(); |
@@ -723,7 +723,7 @@ discard block |
||
| 723 | 723 | |
| 724 | 724 | if ($airline_type != "") |
| 725 | 725 | { |
| 726 | - $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 726 | + $airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING); |
|
| 727 | 727 | if (!is_string($airline_type)) |
| 728 | 728 | { |
| 729 | 729 | return array(); |
@@ -745,7 +745,7 @@ discard block |
||
| 745 | 745 | |
| 746 | 746 | if ($airport != "") |
| 747 | 747 | { |
| 748 | - $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 748 | + $airport = filter_var($airport, FILTER_SANITIZE_STRING); |
|
| 749 | 749 | if (!is_string($airport)) |
| 750 | 750 | { |
| 751 | 751 | return array(); |
@@ -756,7 +756,7 @@ discard block |
||
| 756 | 756 | |
| 757 | 757 | if ($airport_country != "") |
| 758 | 758 | { |
| 759 | - $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 759 | + $airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING); |
|
| 760 | 760 | if (!is_string($airport_country)) |
| 761 | 761 | { |
| 762 | 762 | return array(); |
@@ -767,7 +767,7 @@ discard block |
||
| 767 | 767 | |
| 768 | 768 | if ($callsign != "") |
| 769 | 769 | { |
| 770 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 770 | + $callsign = filter_var($callsign, FILTER_SANITIZE_STRING); |
|
| 771 | 771 | if (!is_string($callsign)) |
| 772 | 772 | { |
| 773 | 773 | return array(); |
@@ -775,7 +775,7 @@ discard block |
||
| 775 | 775 | $translate = $Translation->ident2icao($callsign); |
| 776 | 776 | if ($translate != $callsign) { |
| 777 | 777 | $additional_query .= " AND (tracker_archive_output.ident = :callsign OR tracker_archive_output.ident = :translate)"; |
| 778 | - $query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate)); |
|
| 778 | + $query_values = array_merge($query_values, array(':callsign' => $callsign, ':translate' => $translate)); |
|
| 779 | 779 | } else { |
| 780 | 780 | $additional_query .= " AND (tracker_archive_output.ident = '".$callsign."')"; |
| 781 | 781 | } |
@@ -784,7 +784,7 @@ discard block |
||
| 784 | 784 | |
| 785 | 785 | if ($owner != "") |
| 786 | 786 | { |
| 787 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 787 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 788 | 788 | if (!is_string($owner)) |
| 789 | 789 | { |
| 790 | 790 | return array(); |
@@ -795,7 +795,7 @@ discard block |
||
| 795 | 795 | |
| 796 | 796 | if ($pilot_name != "") |
| 797 | 797 | { |
| 798 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 798 | + $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING); |
|
| 799 | 799 | if (!is_string($pilot_name)) |
| 800 | 800 | { |
| 801 | 801 | return array(); |
@@ -806,7 +806,7 @@ discard block |
||
| 806 | 806 | |
| 807 | 807 | if ($pilot_id != "") |
| 808 | 808 | { |
| 809 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 809 | + $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT); |
|
| 810 | 810 | if (!is_string($pilot_id)) |
| 811 | 811 | { |
| 812 | 812 | return array(); |
@@ -817,7 +817,7 @@ discard block |
||
| 817 | 817 | |
| 818 | 818 | if ($departure_airport_route != "") |
| 819 | 819 | { |
| 820 | - $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 820 | + $departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING); |
|
| 821 | 821 | if (!is_string($departure_airport_route)) |
| 822 | 822 | { |
| 823 | 823 | return array(); |
@@ -828,7 +828,7 @@ discard block |
||
| 828 | 828 | |
| 829 | 829 | if ($arrival_airport_route != "") |
| 830 | 830 | { |
| 831 | - $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 831 | + $arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING); |
|
| 832 | 832 | if (!is_string($arrival_airport_route)) |
| 833 | 833 | { |
| 834 | 834 | return array(); |
@@ -841,8 +841,8 @@ discard block |
||
| 841 | 841 | { |
| 842 | 842 | $altitude_array = explode(",", $altitude); |
| 843 | 843 | |
| 844 | - $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 845 | - $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 844 | + $altitude_array[0] = filter_var($altitude_array[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 845 | + $altitude_array[1] = filter_var($altitude_array[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 846 | 846 | |
| 847 | 847 | |
| 848 | 848 | if ($altitude_array[1] != "") |
@@ -860,8 +860,8 @@ discard block |
||
| 860 | 860 | { |
| 861 | 861 | $date_array = explode(",", $date_posted); |
| 862 | 862 | |
| 863 | - $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 864 | - $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 863 | + $date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING); |
|
| 864 | + $date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING); |
|
| 865 | 865 | |
| 866 | 866 | if ($globalTimezone != '') { |
| 867 | 867 | date_default_timezone_set($globalTimezone); |
@@ -893,8 +893,8 @@ discard block |
||
| 893 | 893 | { |
| 894 | 894 | $limit_array = explode(",", $limit); |
| 895 | 895 | |
| 896 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 897 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 896 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 897 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 898 | 898 | |
| 899 | 899 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 900 | 900 | { |
@@ -905,8 +905,8 @@ discard block |
||
| 905 | 905 | |
| 906 | 906 | |
| 907 | 907 | if ($origLat != "" && $origLon != "" && $dist != "") { |
| 908 | - $dist = number_format($dist*0.621371,2,'.',''); |
|
| 909 | - $query="SELECT tracker_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(tracker_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(tracker_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
| 908 | + $dist = number_format($dist*0.621371, 2, '.', ''); |
|
| 909 | + $query = "SELECT tracker_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(tracker_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(tracker_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
| 910 | 910 | FROM tracker_archive_output, tracker_archive WHERE spotter_output_archive.famtrackid = tracker_archive.famtrackid AND spotter_output.ident <> '' ".$additional_query."AND CAST(tracker_archive.longitude as double precision) between ($origLon-$dist/ABS(cos(radians($origLat))*69)) and ($origLon+$dist/ABS(cos(radians($origLat))*69)) and CAST(tracker_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) |
| 911 | 911 | AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(tracker_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(tracker_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query." ORDER BY distance"; |
| 912 | 912 | } else { |
@@ -923,12 +923,12 @@ discard block |
||
| 923 | 923 | $additional_query .= " AND (tracker_archive_output.waypoints <> '')"; |
| 924 | 924 | } |
| 925 | 925 | |
| 926 | - $query = "SELECT tracker_archive_output.* FROM tracker_archive_output |
|
| 926 | + $query = "SELECT tracker_archive_output.* FROM tracker_archive_output |
|
| 927 | 927 | WHERE tracker_archive_output.ident <> '' |
| 928 | 928 | ".$additional_query." |
| 929 | 929 | ".$filter_query.$orderby_query; |
| 930 | 930 | } |
| 931 | - $spotter_array = $Tracker->getDataFromDB($query, $query_values,$limit_query); |
|
| 931 | + $spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query); |
|
| 932 | 932 | |
| 933 | 933 | return $spotter_array; |
| 934 | 934 | } |
@@ -945,7 +945,7 @@ discard block |
||
| 945 | 945 | try { |
| 946 | 946 | $sth = $this->db->prepare($query); |
| 947 | 947 | $sth->execute(); |
| 948 | - } catch(PDOException $e) { |
|
| 948 | + } catch (PDOException $e) { |
|
| 949 | 949 | return "error"; |
| 950 | 950 | } |
| 951 | 951 | return ''; |
@@ -985,8 +985,8 @@ discard block |
||
| 985 | 985 | { |
| 986 | 986 | $limit_array = explode(",", $limit); |
| 987 | 987 | |
| 988 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 989 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 988 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 989 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 990 | 990 | |
| 991 | 991 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 992 | 992 | { |
@@ -1030,7 +1030,7 @@ discard block |
||
| 1030 | 1030 | $query_values = array(); |
| 1031 | 1031 | $limit_query = ''; |
| 1032 | 1032 | $additional_query = ''; |
| 1033 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 1033 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 1034 | 1034 | |
| 1035 | 1035 | if ($owner != "") |
| 1036 | 1036 | { |
@@ -1047,8 +1047,8 @@ discard block |
||
| 1047 | 1047 | { |
| 1048 | 1048 | $limit_array = explode(",", $limit); |
| 1049 | 1049 | |
| 1050 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1051 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1050 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1051 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1052 | 1052 | |
| 1053 | 1053 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1054 | 1054 | { |
@@ -1091,7 +1091,7 @@ discard block |
||
| 1091 | 1091 | $query_values = array(); |
| 1092 | 1092 | $limit_query = ''; |
| 1093 | 1093 | $additional_query = ''; |
| 1094 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 1094 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 1095 | 1095 | |
| 1096 | 1096 | if ($pilot != "") |
| 1097 | 1097 | { |
@@ -1103,8 +1103,8 @@ discard block |
||
| 1103 | 1103 | { |
| 1104 | 1104 | $limit_array = explode(",", $limit); |
| 1105 | 1105 | |
| 1106 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1107 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1106 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1107 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1108 | 1108 | |
| 1109 | 1109 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1110 | 1110 | { |
@@ -1136,7 +1136,7 @@ discard block |
||
| 1136 | 1136 | * @param string $sincedate |
| 1137 | 1137 | * @return array the airline country list |
| 1138 | 1138 | */ |
| 1139 | - public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1139 | + public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '') |
|
| 1140 | 1140 | { |
| 1141 | 1141 | global $globalDBdriver; |
| 1142 | 1142 | /* |
@@ -1165,7 +1165,7 @@ discard block |
||
| 1165 | 1165 | $flight_array = array(); |
| 1166 | 1166 | $temp_array = array(); |
| 1167 | 1167 | |
| 1168 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1168 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1169 | 1169 | { |
| 1170 | 1170 | $temp_array['flight_count'] = $row['nb']; |
| 1171 | 1171 | $temp_array['flight_country'] = $row['name']; |
@@ -1184,7 +1184,7 @@ discard block |
||
| 1184 | 1184 | * @param string $sincedate |
| 1185 | 1185 | * @return array the airline country list |
| 1186 | 1186 | */ |
| 1187 | - public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1187 | + public function countAllFlightOverCountriesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '') |
|
| 1188 | 1188 | { |
| 1189 | 1189 | global $globalDBdriver; |
| 1190 | 1190 | /* |
@@ -1213,7 +1213,7 @@ discard block |
||
| 1213 | 1213 | $flight_array = array(); |
| 1214 | 1214 | $temp_array = array(); |
| 1215 | 1215 | |
| 1216 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1216 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1217 | 1217 | { |
| 1218 | 1218 | $temp_array['airline_icao'] = $row['airline_icao']; |
| 1219 | 1219 | $temp_array['flight_count'] = $row['nb']; |
@@ -1232,14 +1232,14 @@ discard block |
||
| 1232 | 1232 | * @param $date |
| 1233 | 1233 | * @return array the spotter information |
| 1234 | 1234 | */ |
| 1235 | - public function getDateArchiveTrackerDataById($id,$date) |
|
| 1235 | + public function getDateArchiveTrackerDataById($id, $date) |
|
| 1236 | 1236 | { |
| 1237 | 1237 | $Tracker = new Tracker($this->db); |
| 1238 | 1238 | date_default_timezone_set('UTC'); |
| 1239 | 1239 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 1240 | - $query = 'SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.famtrackid = :id AND l.date <= :date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate ORDER BY tracker_archive.date DESC'; |
|
| 1241 | - $date = date('c',$date); |
|
| 1242 | - $spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id,':date' => $date)); |
|
| 1240 | + $query = 'SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.famtrackid = :id AND l.date <= :date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate ORDER BY tracker_archive.date DESC'; |
|
| 1241 | + $date = date('c', $date); |
|
| 1242 | + $spotter_array = $Tracker->getDataFromDB($query, array(':id' => $id, ':date' => $date)); |
|
| 1243 | 1243 | return $spotter_array; |
| 1244 | 1244 | } |
| 1245 | 1245 | |
@@ -1250,14 +1250,14 @@ discard block |
||
| 1250 | 1250 | * @param $date |
| 1251 | 1251 | * @return array the spotter information |
| 1252 | 1252 | */ |
| 1253 | - public function getDateArchiveTrackerDataByIdent($ident,$date) |
|
| 1253 | + public function getDateArchiveTrackerDataByIdent($ident, $date) |
|
| 1254 | 1254 | { |
| 1255 | 1255 | $Tracker = new Tracker($this->db); |
| 1256 | 1256 | date_default_timezone_set('UTC'); |
| 1257 | 1257 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 1258 | - $query = 'SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate ORDER BY tracker_archive.date DESC'; |
|
| 1259 | - $date = date('c',$date); |
|
| 1260 | - $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
|
| 1258 | + $query = 'SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate ORDER BY tracker_archive.date DESC'; |
|
| 1259 | + $date = date('c', $date); |
|
| 1260 | + $spotter_array = $Tracker->getDataFromDB($query, array(':ident' => $ident, ':date' => $date)); |
|
| 1261 | 1261 | return $spotter_array; |
| 1262 | 1262 | } |
| 1263 | 1263 | |
@@ -1270,7 +1270,7 @@ discard block |
||
| 1270 | 1270 | * @param array $filters |
| 1271 | 1271 | * @return array the spotter information |
| 1272 | 1272 | */ |
| 1273 | - public function getTrackerDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1273 | + public function getTrackerDataByAirport($airport = '', $limit = '', $sort = '', $filters = array()) |
|
| 1274 | 1274 | { |
| 1275 | 1275 | global $global_query; |
| 1276 | 1276 | $Tracker = new Tracker($this->db); |
@@ -1278,7 +1278,7 @@ discard block |
||
| 1278 | 1278 | $query_values = array(); |
| 1279 | 1279 | $limit_query = ''; |
| 1280 | 1280 | $additional_query = ''; |
| 1281 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1281 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1282 | 1282 | |
| 1283 | 1283 | if ($airport != "") |
| 1284 | 1284 | { |
@@ -1295,8 +1295,8 @@ discard block |
||
| 1295 | 1295 | { |
| 1296 | 1296 | $limit_array = explode(",", $limit); |
| 1297 | 1297 | |
| 1298 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1299 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1298 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1299 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1300 | 1300 | |
| 1301 | 1301 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1302 | 1302 | { |
@@ -13,7 +13,9 @@ discard block |
||
| 13 | 13 | public function __construct($dbc = null) { |
| 14 | 14 | $Connection = new Connection($dbc); |
| 15 | 15 | $this->db = $Connection->db; |
| 16 | - if ($this->db === null) die('Error: No DB connection. (TrackerArchive)'); |
|
| 16 | + if ($this->db === null) { |
|
| 17 | + die('Error: No DB connection. (TrackerArchive)'); |
|
| 18 | + } |
|
| 17 | 19 | } |
| 18 | 20 | |
| 19 | 21 | /** |
@@ -36,7 +38,9 @@ discard block |
||
| 36 | 38 | if (isset($filter[0]['source'])) { |
| 37 | 39 | $filters = array_merge($filters,$filter); |
| 38 | 40 | } |
| 39 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 41 | + if (is_array($globalFilter)) { |
|
| 42 | + $filter = array_merge($filter,$globalFilter); |
|
| 43 | + } |
|
| 40 | 44 | $filter_query_join = ''; |
| 41 | 45 | $filter_query_where = ''; |
| 42 | 46 | foreach($filters as $flt) { |
@@ -82,8 +86,11 @@ discard block |
||
| 82 | 86 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 83 | 87 | $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
| 84 | 88 | } |
| 85 | - if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
|
| 86 | - elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
|
| 89 | + if ($filter_query_where == '' && $where) { |
|
| 90 | + $filter_query_where = ' WHERE'; |
|
| 91 | + } elseif ($filter_query_where != '' && $and) { |
|
| 92 | + $filter_query_where .= ' AND'; |
|
| 93 | + } |
|
| 87 | 94 | if ($filter_query_where != '') { |
| 88 | 95 | $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
| 89 | 96 | } |
@@ -116,9 +123,14 @@ discard block |
||
| 116 | 123 | if ($over_country == '') { |
| 117 | 124 | $Tracker = new Tracker($this->db); |
| 118 | 125 | $data_country = $Tracker->getCountryFromLatitudeLongitude($latitude,$longitude); |
| 119 | - if (!empty($data_country)) $country = $data_country['iso2']; |
|
| 120 | - else $country = ''; |
|
| 121 | - } else $country = $over_country; |
|
| 126 | + if (!empty($data_country)) { |
|
| 127 | + $country = $data_country['iso2']; |
|
| 128 | + } else { |
|
| 129 | + $country = ''; |
|
| 130 | + } |
|
| 131 | + } else { |
|
| 132 | + $country = $over_country; |
|
| 133 | + } |
|
| 122 | 134 | // Route is not added in tracker_archive |
| 123 | 135 | $query = 'INSERT INTO tracker_archive (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, over_country, comment, type) |
| 124 | 136 | VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:groundspeed,:date,:format_source, :source_name, :over_country,:comment,:type)'; |
@@ -193,8 +205,11 @@ discard block |
||
| 193 | 205 | { |
| 194 | 206 | date_default_timezone_set('UTC'); |
| 195 | 207 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 196 | - if ($date == '') $query = $this->global_query." WHERE tracker_archive.famtrackid = :id ORDER BY date"; |
|
| 197 | - else $query = $this->global_query." WHERE tracker_archive.famtrackid = :id AND date < '".date('c',$date)."' ORDER BY date"; |
|
| 208 | + if ($date == '') { |
|
| 209 | + $query = $this->global_query." WHERE tracker_archive.famtrackid = :id ORDER BY date"; |
|
| 210 | + } else { |
|
| 211 | + $query = $this->global_query." WHERE tracker_archive.famtrackid = :id AND date < '".date('c',$date)."' ORDER BY date"; |
|
| 212 | + } |
|
| 198 | 213 | |
| 199 | 214 | // $spotter_array = Tracker->getDataFromDB($query,array(':id' => $id)); |
| 200 | 215 | |
@@ -649,7 +664,9 @@ discard block |
||
| 649 | 664 | $additional_query .= "(tracker_archive_output.pilot_name like '%".$q_item."%') OR "; |
| 650 | 665 | $additional_query .= "(tracker_archive_output.ident like '%".$q_item."%') OR "; |
| 651 | 666 | $translate = $Translation->ident2icao($q_item); |
| 652 | - if ($translate != $q_item) $additional_query .= "(tracker_archive_output.ident like '%".$translate."%') OR "; |
|
| 667 | + if ($translate != $q_item) { |
|
| 668 | + $additional_query .= "(tracker_archive_output.ident like '%".$translate."%') OR "; |
|
| 669 | + } |
|
| 653 | 670 | $additional_query .= "(tracker_archive_output.highlight like '%".$q_item."%')"; |
| 654 | 671 | $additional_query .= ")"; |
| 655 | 672 | } |
@@ -867,7 +884,9 @@ discard block |
||
| 867 | 884 | date_default_timezone_set($globalTimezone); |
| 868 | 885 | $datetime = new DateTime(); |
| 869 | 886 | $offset = $datetime->format('P'); |
| 870 | - } else $offset = '+00:00'; |
|
| 887 | + } else { |
|
| 888 | + $offset = '+00:00'; |
|
| 889 | + } |
|
| 871 | 890 | |
| 872 | 891 | |
| 873 | 892 | if ($date_array[1] != "") |
@@ -1154,9 +1173,13 @@ discard block |
||
| 1154 | 1173 | $query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1155 | 1174 | } |
| 1156 | 1175 | } |
| 1157 | - if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
| 1176 | + if ($sincedate != '') { |
|
| 1177 | + $query .= "AND date > '".$sincedate."' "; |
|
| 1178 | + } |
|
| 1158 | 1179 | $query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1159 | - if ($limit) $query .= " LIMIT 0,10"; |
|
| 1180 | + if ($limit) { |
|
| 1181 | + $query .= " LIMIT 0,10"; |
|
| 1182 | + } |
|
| 1160 | 1183 | |
| 1161 | 1184 | |
| 1162 | 1185 | $sth = $this->db->prepare($query); |
@@ -1202,9 +1225,13 @@ discard block |
||
| 1202 | 1225 | $query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1203 | 1226 | } |
| 1204 | 1227 | } |
| 1205 | - if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' "; |
|
| 1228 | + if ($sincedate != '') { |
|
| 1229 | + $query .= "AND s.date > '".$sincedate."' "; |
|
| 1230 | + } |
|
| 1206 | 1231 | $query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1207 | - if ($limit) $query .= " LIMIT 0,10"; |
|
| 1232 | + if ($limit) { |
|
| 1233 | + $query .= " LIMIT 0,10"; |
|
| 1234 | + } |
|
| 1208 | 1235 | |
| 1209 | 1236 | |
| 1210 | 1237 | $sth = $this->db->prepare($query); |
