@@ -13,10 +13,10 @@ discard block |
||
13 | 13 | } |
14 | 14 | |
15 | 15 | /** |
16 | - * Get SQL query part for filter used |
|
17 | - * @param Array $filter the filter |
|
18 | - * @return Array the SQL part |
|
19 | - */ |
|
16 | + * Get SQL query part for filter used |
|
17 | + * @param Array $filter the filter |
|
18 | + * @return Array the SQL part |
|
19 | + */ |
|
20 | 20 | |
21 | 21 | public function getFilter($filter = array(),$where = false,$and = false) { |
22 | 22 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
@@ -80,14 +80,14 @@ discard block |
||
80 | 80 | } |
81 | 81 | |
82 | 82 | /** |
83 | - * Executes the SQL statements to get the spotter information |
|
84 | - * |
|
85 | - * @param String $query the SQL query |
|
86 | - * @param Array $params parameter of the query |
|
87 | - * @param String $limitQuery the limit query |
|
88 | - * @return Array the spotter information |
|
89 | - * |
|
90 | - */ |
|
83 | + * Executes the SQL statements to get the spotter information |
|
84 | + * |
|
85 | + * @param String $query the SQL query |
|
86 | + * @param Array $params parameter of the query |
|
87 | + * @param String $limitQuery the limit query |
|
88 | + * @return Array the spotter information |
|
89 | + * |
|
90 | + */ |
|
91 | 91 | public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false) |
92 | 92 | { |
93 | 93 | date_default_timezone_set('UTC'); |
@@ -199,11 +199,11 @@ discard block |
||
199 | 199 | |
200 | 200 | |
201 | 201 | /** |
202 | - * Gets all the spotter information based on the latest data entry |
|
203 | - * |
|
204 | - * @return Array the spotter information |
|
205 | - * |
|
206 | - */ |
|
202 | + * Gets all the spotter information based on the latest data entry |
|
203 | + * |
|
204 | + * @return Array the spotter information |
|
205 | + * |
|
206 | + */ |
|
207 | 207 | public function getLatestMarineData($limit = '', $sort = '', $filter = array()) |
208 | 208 | { |
209 | 209 | global $global_query; |
@@ -261,11 +261,11 @@ discard block |
||
261 | 261 | } |
262 | 262 | |
263 | 263 | /** |
264 | - * Gets all the spotter information based on the callsign |
|
265 | - * |
|
266 | - * @return Array the spotter information |
|
267 | - * |
|
268 | - */ |
|
264 | + * Gets all the spotter information based on the callsign |
|
265 | + * |
|
266 | + * @return Array the spotter information |
|
267 | + * |
|
268 | + */ |
|
269 | 269 | public function getMarineDataByIdent($ident = '', $limit = '', $sort = '', $filter = array()) |
270 | 270 | { |
271 | 271 | global $global_query; |
@@ -376,12 +376,12 @@ discard block |
||
376 | 376 | |
377 | 377 | |
378 | 378 | /** |
379 | - * Gets all source name |
|
380 | - * |
|
381 | - * @param String type format of source |
|
382 | - * @return Array list of source name |
|
383 | - * |
|
384 | - */ |
|
379 | + * Gets all source name |
|
380 | + * |
|
381 | + * @param String type format of source |
|
382 | + * @return Array list of source name |
|
383 | + * |
|
384 | + */ |
|
385 | 385 | public function getAllSourceName($type = '',$filters = array()) |
386 | 386 | { |
387 | 387 | $filter_query = $this->getFilter($filters,true,true); |
@@ -411,11 +411,11 @@ discard block |
||
411 | 411 | |
412 | 412 | |
413 | 413 | /** |
414 | - * Gets a list of all idents/callsigns |
|
415 | - * |
|
416 | - * @return Array list of ident/callsign names |
|
417 | - * |
|
418 | - */ |
|
414 | + * Gets a list of all idents/callsigns |
|
415 | + * |
|
416 | + * @return Array list of ident/callsign names |
|
417 | + * |
|
418 | + */ |
|
419 | 419 | public function getAllIdents($filters = array()) |
420 | 420 | { |
421 | 421 | $filter_query = $this->getFilter($filters,true,true); |
@@ -439,11 +439,11 @@ discard block |
||
439 | 439 | } |
440 | 440 | |
441 | 441 | /** |
442 | - * Gets all info from a mmsi |
|
443 | - * |
|
444 | - * @return Array list of mmsi info |
|
445 | - * |
|
446 | - */ |
|
442 | + * Gets all info from a mmsi |
|
443 | + * |
|
444 | + * @return Array list of mmsi info |
|
445 | + * |
|
446 | + */ |
|
447 | 447 | public function getIdentity($mmsi) |
448 | 448 | { |
449 | 449 | $mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT); |
@@ -500,18 +500,18 @@ discard block |
||
500 | 500 | |
501 | 501 | |
502 | 502 | /** |
503 | - * Update ident tracker data |
|
504 | - * |
|
505 | - * @param String $fammarine_id the ID |
|
506 | - * @param String $ident the marine ident |
|
507 | - * @return String success or false |
|
508 | - * |
|
509 | - */ |
|
503 | + * Update ident tracker data |
|
504 | + * |
|
505 | + * @param String $fammarine_id the ID |
|
506 | + * @param String $ident the marine ident |
|
507 | + * @return String success or false |
|
508 | + * |
|
509 | + */ |
|
510 | 510 | public function updateIdentMarineData($fammarine_id = '', $ident = '',$fromsource = NULL) |
511 | 511 | { |
512 | 512 | |
513 | 513 | $query = 'UPDATE marine_output SET ident = :ident WHERE fammarine_id = :fammarine_id'; |
514 | - $query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident); |
|
514 | + $query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident); |
|
515 | 515 | |
516 | 516 | try { |
517 | 517 | $sth = $this->db->prepare($query); |
@@ -524,17 +524,17 @@ discard block |
||
524 | 524 | |
525 | 525 | } |
526 | 526 | /** |
527 | - * Update latest marine data |
|
528 | - * |
|
529 | - * @param String $fammarine_id the ID |
|
530 | - * @param String $ident the marine ident |
|
531 | - * @return String success or false |
|
532 | - * |
|
533 | - */ |
|
527 | + * Update latest marine data |
|
528 | + * |
|
529 | + * @param String $fammarine_id the ID |
|
530 | + * @param String $ident the marine ident |
|
531 | + * @return String success or false |
|
532 | + * |
|
533 | + */ |
|
534 | 534 | public function updateLatestMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $groundspeed = NULL, $date = '') |
535 | 535 | { |
536 | 536 | $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 WHERE fammarine_id = :fammarine_id'; |
537 | - $query_values = array(':fammarine_id' => $fammarine_id,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident); |
|
537 | + $query_values = array(':fammarine_id' => $fammarine_id,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident); |
|
538 | 538 | |
539 | 539 | try { |
540 | 540 | $sth = $this->db->prepare($query); |
@@ -548,30 +548,30 @@ discard block |
||
548 | 548 | } |
549 | 549 | |
550 | 550 | /** |
551 | - * Adds a new spotter data |
|
552 | - * |
|
553 | - * @param String $fammarine_id the ID |
|
554 | - * @param String $ident the marine ident |
|
555 | - * @param String $departure_airport_icao the departure airport |
|
556 | - * @param String $arrival_airport_icao the arrival airport |
|
557 | - * @param String $latitude latitude of flight |
|
558 | - * @param String $longitude latitude of flight |
|
559 | - * @param String $waypoints waypoints of flight |
|
560 | - * @param String $heading heading of flight |
|
561 | - * @param String $groundspeed speed of flight |
|
562 | - * @param String $date date of flight |
|
563 | - * @param String $departure_airport_time departure time of flight |
|
564 | - * @param String $arrival_airport_time arrival time of flight |
|
565 | - * @param String $squawk squawk code of flight |
|
566 | - * @param String $route_stop route stop of flight |
|
567 | - * @param String $highlight highlight or not |
|
568 | - * @param String $ModeS ModesS code of flight |
|
569 | - * @param String $registration registration code of flight |
|
570 | - * @param String $pilot_id pilot id of flight (for virtual airlines) |
|
571 | - * @param String $pilot_name pilot name of flight (for virtual airlines) |
|
572 | - * @param String $verticalrate vertival rate of flight |
|
573 | - * @return String success or false |
|
574 | - */ |
|
551 | + * Adds a new spotter data |
|
552 | + * |
|
553 | + * @param String $fammarine_id the ID |
|
554 | + * @param String $ident the marine ident |
|
555 | + * @param String $departure_airport_icao the departure airport |
|
556 | + * @param String $arrival_airport_icao the arrival airport |
|
557 | + * @param String $latitude latitude of flight |
|
558 | + * @param String $longitude latitude of flight |
|
559 | + * @param String $waypoints waypoints of flight |
|
560 | + * @param String $heading heading of flight |
|
561 | + * @param String $groundspeed speed of flight |
|
562 | + * @param String $date date of flight |
|
563 | + * @param String $departure_airport_time departure time of flight |
|
564 | + * @param String $arrival_airport_time arrival time of flight |
|
565 | + * @param String $squawk squawk code of flight |
|
566 | + * @param String $route_stop route stop of flight |
|
567 | + * @param String $highlight highlight or not |
|
568 | + * @param String $ModeS ModesS code of flight |
|
569 | + * @param String $registration registration code of flight |
|
570 | + * @param String $pilot_id pilot id of flight (for virtual airlines) |
|
571 | + * @param String $pilot_name pilot name of flight (for virtual airlines) |
|
572 | + * @param String $verticalrate vertival rate of flight |
|
573 | + * @return String success or false |
|
574 | + */ |
|
575 | 575 | public function addMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $mmsi = '',$type = '',$status = '',$format_source = '', $source_name = '') |
576 | 576 | { |
577 | 577 | global $globalURL; |
@@ -655,16 +655,16 @@ discard block |
||
655 | 655 | $type = filter_var($type,FILTER_SANITIZE_STRING); |
656 | 656 | $status = filter_var($status,FILTER_SANITIZE_STRING); |
657 | 657 | |
658 | - if ($latitude == '' && $longitude == '') { |
|
659 | - $latitude = 0; |
|
660 | - $longitude = 0; |
|
661 | - } |
|
662 | - if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
|
663 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
|
664 | - $query = "INSERT INTO marine_output (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, mmsi, type, status) |
|
658 | + if ($latitude == '' && $longitude == '') { |
|
659 | + $latitude = 0; |
|
660 | + $longitude = 0; |
|
661 | + } |
|
662 | + if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
|
663 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
|
664 | + $query = "INSERT INTO marine_output (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, mmsi, type, status) |
|
665 | 665 | VALUES (:fammarine_id,:ident,:latitude,:longitude,:heading,:speed,:date,:format_source, :source_name,:mmsi,:type,:status)"; |
666 | 666 | |
667 | - $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,':status' => $status); |
|
667 | + $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,':status' => $status); |
|
668 | 668 | |
669 | 669 | try { |
670 | 670 | |
@@ -672,7 +672,7 @@ discard block |
||
672 | 672 | $sth->execute($query_values); |
673 | 673 | $this->db = null; |
674 | 674 | } catch (PDOException $e) { |
675 | - return "error : ".$e->getMessage(); |
|
675 | + return "error : ".$e->getMessage(); |
|
676 | 676 | } |
677 | 677 | |
678 | 678 | return "success"; |
@@ -681,11 +681,11 @@ discard block |
||
681 | 681 | |
682 | 682 | |
683 | 683 | /** |
684 | - * Gets the aircraft ident within the last hour |
|
685 | - * |
|
686 | - * @return String the ident |
|
687 | - * |
|
688 | - */ |
|
684 | + * Gets the aircraft ident within the last hour |
|
685 | + * |
|
686 | + * @return String the ident |
|
687 | + * |
|
688 | + */ |
|
689 | 689 | public function getIdentFromLastHour($ident) |
690 | 690 | { |
691 | 691 | global $globalDBdriver, $globalTimezone; |
@@ -701,11 +701,11 @@ discard block |
||
701 | 701 | AND marine_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS' |
702 | 702 | AND marine_output.date < now() AT TIME ZONE 'UTC'"; |
703 | 703 | $query_data = array(':ident' => $ident); |
704 | - } |
|
704 | + } |
|
705 | 705 | |
706 | 706 | $sth = $this->db->prepare($query); |
707 | 707 | $sth->execute($query_data); |
708 | - $ident_result=''; |
|
708 | + $ident_result=''; |
|
709 | 709 | while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
710 | 710 | { |
711 | 711 | $ident_result = $row['ident']; |
@@ -716,11 +716,11 @@ discard block |
||
716 | 716 | |
717 | 717 | |
718 | 718 | /** |
719 | - * Gets the aircraft data from the last 20 seconds |
|
720 | - * |
|
721 | - * @return Array the spotter data |
|
722 | - * |
|
723 | - */ |
|
719 | + * Gets the aircraft data from the last 20 seconds |
|
720 | + * |
|
721 | + * @return Array the spotter data |
|
722 | + * |
|
723 | + */ |
|
724 | 724 | public function getRealTimeData($q = '') |
725 | 725 | { |
726 | 726 | global $globalDBdriver; |
@@ -758,11 +758,11 @@ discard block |
||
758 | 758 | |
759 | 759 | |
760 | 760 | /** |
761 | - * Gets all number of flight over countries |
|
762 | - * |
|
763 | - * @return Array the airline country list |
|
764 | - * |
|
765 | - */ |
|
761 | + * Gets all number of flight over countries |
|
762 | + * |
|
763 | + * @return Array the airline country list |
|
764 | + * |
|
765 | + */ |
|
766 | 766 | /* |
767 | 767 | public function countAllTrackedOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array()) |
768 | 768 | { |
@@ -813,11 +813,11 @@ discard block |
||
813 | 813 | |
814 | 814 | |
815 | 815 | /** |
816 | - * Gets all callsigns that have flown over |
|
817 | - * |
|
818 | - * @return Array the callsign list |
|
819 | - * |
|
820 | - */ |
|
816 | + * Gets all callsigns that have flown over |
|
817 | + * |
|
818 | + * @return Array the callsign list |
|
819 | + * |
|
820 | + */ |
|
821 | 821 | public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '') |
822 | 822 | { |
823 | 823 | global $globalDBdriver; |
@@ -884,11 +884,11 @@ discard block |
||
884 | 884 | |
885 | 885 | |
886 | 886 | /** |
887 | - * Counts all dates |
|
888 | - * |
|
889 | - * @return Array the date list |
|
890 | - * |
|
891 | - */ |
|
887 | + * Counts all dates |
|
888 | + * |
|
889 | + * @return Array the date list |
|
890 | + * |
|
891 | + */ |
|
892 | 892 | public function countAllDates($filters = array()) |
893 | 893 | { |
894 | 894 | global $globalTimezone, $globalDBdriver; |
@@ -934,11 +934,11 @@ discard block |
||
934 | 934 | |
935 | 935 | |
936 | 936 | /** |
937 | - * Counts all dates during the last 7 days |
|
938 | - * |
|
939 | - * @return Array the date list |
|
940 | - * |
|
941 | - */ |
|
937 | + * Counts all dates during the last 7 days |
|
938 | + * |
|
939 | + * @return Array the date list |
|
940 | + * |
|
941 | + */ |
|
942 | 942 | public function countAllDatesLast7Days($filters = array()) |
943 | 943 | { |
944 | 944 | global $globalTimezone, $globalDBdriver; |
@@ -960,7 +960,7 @@ discard block |
||
960 | 960 | $query .= " GROUP BY date_name |
961 | 961 | ORDER BY date_name ASC"; |
962 | 962 | $query_data = array(':offset' => $offset); |
963 | - } |
|
963 | + } |
|
964 | 964 | |
965 | 965 | $sth = $this->db->prepare($query); |
966 | 966 | $sth->execute($query_data); |
@@ -980,11 +980,11 @@ discard block |
||
980 | 980 | } |
981 | 981 | |
982 | 982 | /** |
983 | - * Counts all dates during the last month |
|
984 | - * |
|
985 | - * @return Array the date list |
|
986 | - * |
|
987 | - */ |
|
983 | + * Counts all dates during the last month |
|
984 | + * |
|
985 | + * @return Array the date list |
|
986 | + * |
|
987 | + */ |
|
988 | 988 | public function countAllDatesLastMonth($filters = array()) |
989 | 989 | { |
990 | 990 | global $globalTimezone, $globalDBdriver; |
@@ -1006,7 +1006,7 @@ discard block |
||
1006 | 1006 | $query .= " GROUP BY date_name |
1007 | 1007 | ORDER BY date_name ASC"; |
1008 | 1008 | $query_data = array(':offset' => $offset); |
1009 | - } |
|
1009 | + } |
|
1010 | 1010 | |
1011 | 1011 | $sth = $this->db->prepare($query); |
1012 | 1012 | $sth->execute($query_data); |
@@ -1028,11 +1028,11 @@ discard block |
||
1028 | 1028 | |
1029 | 1029 | |
1030 | 1030 | /** |
1031 | - * Counts all month |
|
1032 | - * |
|
1033 | - * @return Array the month list |
|
1034 | - * |
|
1035 | - */ |
|
1031 | + * Counts all month |
|
1032 | + * |
|
1033 | + * @return Array the month list |
|
1034 | + * |
|
1035 | + */ |
|
1036 | 1036 | public function countAllMonths($filters = array()) |
1037 | 1037 | { |
1038 | 1038 | global $globalTimezone, $globalDBdriver; |
@@ -1077,11 +1077,11 @@ discard block |
||
1077 | 1077 | |
1078 | 1078 | |
1079 | 1079 | /** |
1080 | - * Counts all dates during the last year |
|
1081 | - * |
|
1082 | - * @return Array the date list |
|
1083 | - * |
|
1084 | - */ |
|
1080 | + * Counts all dates during the last year |
|
1081 | + * |
|
1082 | + * @return Array the date list |
|
1083 | + * |
|
1084 | + */ |
|
1085 | 1085 | public function countAllMonthsLastYear($filters) |
1086 | 1086 | { |
1087 | 1087 | global $globalTimezone, $globalDBdriver; |
@@ -1103,7 +1103,7 @@ discard block |
||
1103 | 1103 | $query .= " GROUP BY year_name, month_name |
1104 | 1104 | ORDER BY year_name, month_name ASC"; |
1105 | 1105 | $query_data = array(':offset' => $offset); |
1106 | - } |
|
1106 | + } |
|
1107 | 1107 | |
1108 | 1108 | $sth = $this->db->prepare($query); |
1109 | 1109 | $sth->execute($query_data); |
@@ -1126,11 +1126,11 @@ discard block |
||
1126 | 1126 | |
1127 | 1127 | |
1128 | 1128 | /** |
1129 | - * Counts all hours |
|
1130 | - * |
|
1131 | - * @return Array the hour list |
|
1132 | - * |
|
1133 | - */ |
|
1129 | + * Counts all hours |
|
1130 | + * |
|
1131 | + * @return Array the hour list |
|
1132 | + * |
|
1133 | + */ |
|
1134 | 1134 | public function countAllHours($orderby,$filters = array()) |
1135 | 1135 | { |
1136 | 1136 | global $globalTimezone, $globalDBdriver; |
@@ -1193,11 +1193,11 @@ discard block |
||
1193 | 1193 | |
1194 | 1194 | |
1195 | 1195 | /** |
1196 | - * Counts all hours by date |
|
1197 | - * |
|
1198 | - * @return Array the hour list |
|
1199 | - * |
|
1200 | - */ |
|
1196 | + * Counts all hours by date |
|
1197 | + * |
|
1198 | + * @return Array the hour list |
|
1199 | + * |
|
1200 | + */ |
|
1201 | 1201 | public function countAllHoursByDate($date, $filters = array()) |
1202 | 1202 | { |
1203 | 1203 | global $globalTimezone, $globalDBdriver; |
@@ -1241,11 +1241,11 @@ discard block |
||
1241 | 1241 | |
1242 | 1242 | |
1243 | 1243 | /** |
1244 | - * Counts all hours by a ident/callsign |
|
1245 | - * |
|
1246 | - * @return Array the hour list |
|
1247 | - * |
|
1248 | - */ |
|
1244 | + * Counts all hours by a ident/callsign |
|
1245 | + * |
|
1246 | + * @return Array the hour list |
|
1247 | + * |
|
1248 | + */ |
|
1249 | 1249 | public function countAllHoursByIdent($ident, $filters = array()) |
1250 | 1250 | { |
1251 | 1251 | global $globalTimezone, $globalDBdriver; |
@@ -1290,11 +1290,11 @@ discard block |
||
1290 | 1290 | |
1291 | 1291 | |
1292 | 1292 | /** |
1293 | - * Counts all flights that have flown over |
|
1294 | - * |
|
1295 | - * @return Integer the number of flights |
|
1296 | - * |
|
1297 | - */ |
|
1293 | + * Counts all flights that have flown over |
|
1294 | + * |
|
1295 | + * @return Integer the number of flights |
|
1296 | + * |
|
1297 | + */ |
|
1298 | 1298 | public function countOverallTracked($filters = array(),$year = '',$month = '') |
1299 | 1299 | { |
1300 | 1300 | global $globalDBdriver; |
@@ -1329,11 +1329,11 @@ discard block |
||
1329 | 1329 | |
1330 | 1330 | |
1331 | 1331 | /** |
1332 | - * Counts all hours of today |
|
1333 | - * |
|
1334 | - * @return Array the hour list |
|
1335 | - * |
|
1336 | - */ |
|
1332 | + * Counts all hours of today |
|
1333 | + * |
|
1334 | + * @return Array the hour list |
|
1335 | + * |
|
1336 | + */ |
|
1337 | 1337 | public function countAllHoursFromToday($filters = array()) |
1338 | 1338 | { |
1339 | 1339 | global $globalTimezone, $globalDBdriver; |
@@ -1373,12 +1373,12 @@ discard block |
||
1373 | 1373 | } |
1374 | 1374 | |
1375 | 1375 | |
1376 | - /** |
|
1377 | - * Gets the Barrie Spotter ID based on the FlightAware ID |
|
1378 | - * |
|
1379 | - * @return Integer the Barrie Spotter ID |
|
1376 | + /** |
|
1377 | + * Gets the Barrie Spotter ID based on the FlightAware ID |
|
1378 | + * |
|
1379 | + * @return Integer the Barrie Spotter ID |
|
1380 | 1380 | q * |
1381 | - */ |
|
1381 | + */ |
|
1382 | 1382 | public function getMarineIDBasedOnFamMarineID($fammarine_id) |
1383 | 1383 | { |
1384 | 1384 | $fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING); |
@@ -1399,13 +1399,13 @@ discard block |
||
1399 | 1399 | |
1400 | 1400 | |
1401 | 1401 | /** |
1402 | - * Parses a date string |
|
1403 | - * |
|
1404 | - * @param String $dateString the date string |
|
1405 | - * @param String $timezone the timezone of a user |
|
1406 | - * @return Array the time information |
|
1407 | - * |
|
1408 | - */ |
|
1402 | + * Parses a date string |
|
1403 | + * |
|
1404 | + * @param String $dateString the date string |
|
1405 | + * @param String $timezone the timezone of a user |
|
1406 | + * @return Array the time information |
|
1407 | + * |
|
1408 | + */ |
|
1409 | 1409 | public function parseDateString($dateString, $timezone = '') |
1410 | 1410 | { |
1411 | 1411 | $time_array = array(); |
@@ -1438,12 +1438,12 @@ discard block |
||
1438 | 1438 | } |
1439 | 1439 | |
1440 | 1440 | /** |
1441 | - * Parses the direction degrees to working |
|
1442 | - * |
|
1443 | - * @param Float $direction the direction in degrees |
|
1444 | - * @return Array the direction information |
|
1445 | - * |
|
1446 | - */ |
|
1441 | + * Parses the direction degrees to working |
|
1442 | + * |
|
1443 | + * @param Float $direction the direction in degrees |
|
1444 | + * @return Array the direction information |
|
1445 | + * |
|
1446 | + */ |
|
1447 | 1447 | public function parseDirection($direction = 0) |
1448 | 1448 | { |
1449 | 1449 | if ($direction == '') $direction = 0; |
@@ -1522,12 +1522,12 @@ discard block |
||
1522 | 1522 | |
1523 | 1523 | |
1524 | 1524 | /** |
1525 | - * Gets Country from latitude/longitude |
|
1526 | - * |
|
1527 | - * @param Float $latitude latitute of the flight |
|
1528 | - * @param Float $longitude longitute of the flight |
|
1529 | - * @return String the countrie |
|
1530 | - */ |
|
1525 | + * Gets Country from latitude/longitude |
|
1526 | + * |
|
1527 | + * @param Float $latitude latitute of the flight |
|
1528 | + * @param Float $longitude longitute of the flight |
|
1529 | + * @return String the countrie |
|
1530 | + */ |
|
1531 | 1531 | public function getCountryFromLatitudeLongitude($latitude,$longitude) |
1532 | 1532 | { |
1533 | 1533 | global $globalDBdriver, $globalDebug; |
@@ -1564,11 +1564,11 @@ discard block |
||
1564 | 1564 | } |
1565 | 1565 | |
1566 | 1566 | /** |
1567 | - * Gets Country from iso2 |
|
1568 | - * |
|
1569 | - * @param String $iso2 ISO2 country code |
|
1570 | - * @return String the countrie |
|
1571 | - */ |
|
1567 | + * Gets Country from iso2 |
|
1568 | + * |
|
1569 | + * @param String $iso2 ISO2 country code |
|
1570 | + * @return String the countrie |
|
1571 | + */ |
|
1572 | 1572 | public function getCountryFromISO2($iso2) |
1573 | 1573 | { |
1574 | 1574 | global $globalDBdriver, $globalDebug; |
@@ -1597,12 +1597,12 @@ discard block |
||
1597 | 1597 | |
1598 | 1598 | |
1599 | 1599 | /** |
1600 | - * Gets the short url from bit.ly |
|
1601 | - * |
|
1602 | - * @param String $url the full url |
|
1603 | - * @return String the bit.ly url |
|
1604 | - * |
|
1605 | - */ |
|
1600 | + * Gets the short url from bit.ly |
|
1601 | + * |
|
1602 | + * @param String $url the full url |
|
1603 | + * @return String the bit.ly url |
|
1604 | + * |
|
1605 | + */ |
|
1606 | 1606 | public function getBitlyURL($url) |
1607 | 1607 | { |
1608 | 1608 | global $globalBitlyAccessToken; |