Completed
Push — master ( 7303c2...e8d7a9 )
by Yannick
29:27
created
require/class.Marine.php 1 patch
Indentation   +275 added lines, -275 removed lines patch added patch discarded remove patch
@@ -12,10 +12,10 @@  discard block
 block discarded – undo
12 12
 	}
13 13
 
14 14
 	/**
15
-	* Get SQL query part for filter used
16
-	* @param Array $filter the filter
17
-	* @return Array the SQL part
18
-	*/
15
+	 * Get SQL query part for filter used
16
+	 * @param Array $filter the filter
17
+	 * @return Array the SQL part
18
+	 */
19 19
 	
20 20
 	public function getFilter($filter = array(),$where = false,$and = false) {
21 21
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
@@ -88,14 +88,14 @@  discard block
 block discarded – undo
88 88
 	}
89 89
 
90 90
 	/**
91
-	* Executes the SQL statements to get the spotter information
92
-	*
93
-	* @param String $query the SQL query
94
-	* @param Array $params parameter of the query
95
-	* @param String $limitQuery the limit query
96
-	* @return Array the spotter information
97
-	*
98
-	*/
91
+	 * Executes the SQL statements to get the spotter information
92
+	 *
93
+	 * @param String $query the SQL query
94
+	 * @param Array $params parameter of the query
95
+	 * @param String $limitQuery the limit query
96
+	 * @return Array the spotter information
97
+	 *
98
+	 */
99 99
 	public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false)
100 100
 	{
101 101
 		date_default_timezone_set('UTC');
@@ -233,11 +233,11 @@  discard block
 block discarded – undo
233 233
 	
234 234
 	
235 235
 	/**
236
-	* Gets all the spotter information based on the latest data entry
237
-	*
238
-	* @return Array the spotter information
239
-	*
240
-	*/
236
+	 * Gets all the spotter information based on the latest data entry
237
+	 *
238
+	 * @return Array the spotter information
239
+	 *
240
+	 */
241 241
 	public function getLatestMarineData($limit = '', $sort = '', $filter = array())
242 242
 	{
243 243
 		global $global_marine_query;
@@ -286,11 +286,11 @@  discard block
 block discarded – undo
286 286
 	}
287 287
 
288 288
 	/**
289
-	* Gets all the spotter information based on the callsign
290
-	*
291
-	* @return Array the spotter information
292
-	*
293
-	*/
289
+	 * Gets all the spotter information based on the callsign
290
+	 *
291
+	 * @return Array the spotter information
292
+	 *
293
+	 */
294 294
 	public function getMarineDataByIdent($ident = '', $limit = '', $sort = '', $filter = array())
295 295
 	{
296 296
 		global $global_marine_query;
@@ -342,11 +342,11 @@  discard block
 block discarded – undo
342 342
 	}
343 343
 
344 344
 	/**
345
-	* Gets all the marine information based on the type
346
-	*
347
-	* @return Array the marine information
348
-	*
349
-	*/
345
+	 * Gets all the marine information based on the type
346
+	 *
347
+	 * @return Array the marine information
348
+	 *
349
+	 */
350 350
 	public function getMarineDataByType($type = '', $limit = '', $sort = '', $filter = array())
351 351
 	{
352 352
 		global $global_marine_query;
@@ -452,11 +452,11 @@  discard block
 block discarded – undo
452 452
 	}
453 453
 
454 454
 	/**
455
-	* Gets all the marine information based on the captain
456
-	*
457
-	* @return Array the marine information
458
-	*
459
-	*/
455
+	 * Gets all the marine information based on the captain
456
+	 *
457
+	 * @return Array the marine information
458
+	 *
459
+	 */
460 460
 	public function getMarineDataByCaptain($captain = '', $limit = '', $sort = '', $filter = array())
461 461
 	{
462 462
 		global $global_marine_query;
@@ -495,11 +495,11 @@  discard block
 block discarded – undo
495 495
 	}
496 496
 
497 497
 	/**
498
-	* Gets all the marine information based on the race
499
-	*
500
-	* @return Array the marine information
501
-	*
502
-	*/
498
+	 * Gets all the marine information based on the race
499
+	 *
500
+	 * @return Array the marine information
501
+	 *
502
+	 */
503 503
 	public function getMarineDataByRace($race = '', $limit = '', $sort = '', $filter = array())
504 504
 	{
505 505
 		global $global_marine_query,$globalDBdriver;
@@ -542,11 +542,11 @@  discard block
 block discarded – undo
542 542
 	}
543 543
 
544 544
 	/**
545
-	* Count races by captain
546
-	*
547
-	* @return String Duration of all races
548
-	*
549
-	*/
545
+	 * Count races by captain
546
+	 *
547
+	 * @return String Duration of all races
548
+	 *
549
+	 */
550 550
 	public function countRacesByCaptain($captain,$filters = array())
551 551
 	{
552 552
 		$captain = filter_var($captain,FILTER_SANITIZE_STRING);
@@ -562,11 +562,11 @@  discard block
 block discarded – undo
562 562
 	}
563 563
 
564 564
 	/**
565
-	* Count captains by race
566
-	*
567
-	* @return String Duration of all races
568
-	*
569
-	*/
565
+	 * Count captains by race
566
+	 *
567
+	 * @return String Duration of all races
568
+	 *
569
+	 */
570 570
 	public function countCaptainsByRace($race,$filters = array())
571 571
 	{
572 572
 		$race = filter_var($race,FILTER_SANITIZE_STRING);
@@ -582,11 +582,11 @@  discard block
 block discarded – undo
582 582
 	}
583 583
 
584 584
 	/**
585
-	* Gets all boat types that have been used by a captain
586
-	*
587
-	* @return Array the boat list
588
-	*
589
-	*/
585
+	 * Gets all boat types that have been used by a captain
586
+	 *
587
+	 * @return Array the boat list
588
+	 *
589
+	 */
590 590
 	public function countAllBoatTypesByCaptain($captain,$filters = array(),$year = '',$month = '',$day = '')
591 591
 	{
592 592
 		global $globalDBdriver;
@@ -631,11 +631,11 @@  discard block
 block discarded – undo
631 631
 	}
632 632
 
633 633
 	/**
634
-	* Gets all boat types that have been used on a race
635
-	*
636
-	* @return Array the boat list
637
-	*
638
-	*/
634
+	 * Gets all boat types that have been used on a race
635
+	 *
636
+	 * @return Array the boat list
637
+	 *
638
+	 */
639 639
 	public function countAllBoatTypesByRace($race,$filters = array(),$year = '',$month = '',$day = '')
640 640
 	{
641 641
 		global $globalDBdriver;
@@ -680,11 +680,11 @@  discard block
 block discarded – undo
680 680
 	}
681 681
 
682 682
 	/**
683
-	* Gets race duration by captain
684
-	*
685
-	* @return String Duration of all race
686
-	*
687
-	*/
683
+	 * Gets race duration by captain
684
+	 *
685
+	 * @return String Duration of all race
686
+	 *
687
+	 */
688 688
 	public function getRaceDurationByCaptain($captain,$filters = array(),$year = '',$month = '',$day = '')
689 689
 	{
690 690
 		global $globalDBdriver;
@@ -730,11 +730,11 @@  discard block
 block discarded – undo
730 730
 	}
731 731
 
732 732
 	/**
733
-	* Gets a list of all captain names and captain ids
734
-	*
735
-	* @return Array list of captain names and captain ids
736
-	*
737
-	*/
733
+	 * Gets a list of all captain names and captain ids
734
+	 *
735
+	 * @return Array list of captain names and captain ids
736
+	 *
737
+	 */
738 738
 	public function getAllCaptainNames($filters = array())
739 739
 	{
740 740
 		$filter_query = $this->getFilter($filters,true,true);
@@ -748,11 +748,11 @@  discard block
 block discarded – undo
748 748
 	} 
749 749
 
750 750
 	/**
751
-	* Gets a list of all race names and race ids
752
-	*
753
-	* @return Array list of race names and race ids
754
-	*
755
-	*/
751
+	 * Gets a list of all race names and race ids
752
+	 *
753
+	 * @return Array list of race names and race ids
754
+	 *
755
+	 */
756 756
 	public function getAllRaceNames($filters = array())
757 757
 	{
758 758
 		$filter_query = $this->getFilter($filters,true,true);
@@ -766,12 +766,12 @@  discard block
 block discarded – undo
766 766
 	} 
767 767
 
768 768
 	/**
769
-	* Gets all source name
770
-	*
771
-	* @param String type format of source
772
-	* @return Array list of source name
773
-	*
774
-	*/
769
+	 * Gets all source name
770
+	 *
771
+	 * @param String type format of source
772
+	 * @return Array list of source name
773
+	 *
774
+	 */
775 775
 	public function getAllSourceName($type = '',$filters = array())
776 776
 	{
777 777
 		$filter_query = $this->getFilter($filters,true,true);
@@ -801,11 +801,11 @@  discard block
 block discarded – undo
801 801
 
802 802
 
803 803
 	/**
804
-	* Gets a list of all idents/callsigns
805
-	*
806
-	* @return Array list of ident/callsign names
807
-	*
808
-	*/
804
+	 * Gets a list of all idents/callsigns
805
+	 *
806
+	 * @return Array list of ident/callsign names
807
+	 *
808
+	 */
809 809
 	public function getAllIdents($filters = array())
810 810
 	{
811 811
 		$filter_query = $this->getFilter($filters,true,true);
@@ -829,11 +829,11 @@  discard block
 block discarded – undo
829 829
 	}
830 830
 
831 831
 	/**
832
-	* Gets all info from a mmsi
833
-	*
834
-	* @return Array ident
835
-	*
836
-	*/
832
+	 * Gets all info from a mmsi
833
+	 *
834
+	 * @return Array ident
835
+	 *
836
+	 */
837 837
 	public function getIdentity($mmsi)
838 838
 	{
839 839
 		$mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT);
@@ -846,9 +846,9 @@  discard block
 block discarded – undo
846 846
 	}
847 847
 
848 848
 	/**
849
-	* Add identity
850
-	*
851
-	*/
849
+	 * Add identity
850
+	 *
851
+	 */
852 852
 	public function addIdentity($mmsi,$imo,$ident,$callsign,$type)
853 853
 	{
854 854
 		$mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT);
@@ -914,13 +914,13 @@  discard block
 block discarded – undo
914 914
 	}
915 915
 
916 916
 	/**
917
-	* Update ident tracker data
918
-	*
919
-	* @param String $fammarine_id the ID
920
-	* @param String $ident the marine ident
921
-	* @return String success or false
922
-	*
923
-	*/
917
+	 * Update ident tracker data
918
+	 *
919
+	 * @param String $fammarine_id the ID
920
+	 * @param String $ident the marine ident
921
+	 * @return String success or false
922
+	 *
923
+	 */
924 924
 	public function updateIdentMarineData($fammarine_id = '', $ident = '',$fromsource = NULL)
925 925
 	{
926 926
 		$query = 'UPDATE marine_output SET ident = :ident WHERE fammarine_id = :fammarine_id';
@@ -935,13 +935,13 @@  discard block
 block discarded – undo
935 935
 	}
936 936
 
937 937
 	/**
938
-	* Update arrival marine data
939
-	*
940
-	* @param String $fammarine_id the ID
941
-	* @param String $arrival_code the marine ident
942
-	* @return String success or false
943
-	*
944
-	*/
938
+	 * Update arrival marine data
939
+	 *
940
+	 * @param String $fammarine_id the ID
941
+	 * @param String $arrival_code the marine ident
942
+	 * @return String success or false
943
+	 *
944
+	 */
945 945
 	public function updateArrivalPortNameMarineData($fammarine_id = '', $arrival_code = '',$fromsource = NULL)
946 946
 	{
947 947
 		$query = 'UPDATE marine_output SET arrival_port_name = :arrival_code WHERE fammarine_id = :fammarine_id';
@@ -956,19 +956,19 @@  discard block
 block discarded – undo
956 956
 	}
957 957
 
958 958
 	/**
959
-	* Update Status data
960
-	*
961
-	* @param String $fammarine_id the ID
962
-	* @param String $status_id the marine status id
963
-	* @param String $status the marine status
964
-	* @return String success or false
965
-	*
966
-	*/
959
+	 * Update Status data
960
+	 *
961
+	 * @param String $fammarine_id the ID
962
+	 * @param String $status_id the marine status id
963
+	 * @param String $status the marine status
964
+	 * @return String success or false
965
+	 *
966
+	 */
967 967
 	public function updateStatusMarineData($fammarine_id = '', $status_id = '',$status = '')
968 968
 	{
969 969
 
970 970
 		$query = 'UPDATE marine_output SET status = :status, status_id = :status_id WHERE fammarine_id = :fammarine_id';
971
-                $query_values = array(':fammarine_id' => $fammarine_id,':status' => $status,':status_id' => $status_id);
971
+				$query_values = array(':fammarine_id' => $fammarine_id,':status' => $status,':status_id' => $status_id);
972 972
 
973 973
 		try {
974 974
 			$sth = $this->db->prepare($query);
@@ -981,13 +981,13 @@  discard block
 block discarded – undo
981 981
 
982 982
 	}
983 983
 	/**
984
-	* Update latest marine data
985
-	*
986
-	* @param String $fammarine_id the ID
987
-	* @param String $ident the marine ident
988
-	* @return String success or false
989
-	*
990
-	*/	
984
+	 * Update latest marine data
985
+	 *
986
+	 * @param String $fammarine_id the ID
987
+	 * @param String $ident the marine ident
988
+	 * @return String success or false
989
+	 *
990
+	 */	
991 991
 	public function updateLatestMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $groundspeed = NULL, $date = '',$distance = NULL,$race_rank = NULL, $race_time = NULL, $status = '', $race_begin = '')
992 992
 	{
993 993
 		if ($latitude == '') $latitude = NULL;
@@ -1013,30 +1013,30 @@  discard block
 block discarded – undo
1013 1013
 	}
1014 1014
 
1015 1015
 	/**
1016
-	* Adds a new marine data
1017
-	*
1018
-	* @param String $fammarine_id the ID
1019
-	* @param String $ident the marine ident
1020
-	* @param String $departure_airport_icao the departure airport
1021
-	* @param String $arrival_airport_icao the arrival airport
1022
-	* @param String $latitude latitude of flight
1023
-	* @param String $longitude latitude of flight
1024
-	* @param String $waypoints waypoints of flight
1025
-	* @param String $heading heading of flight
1026
-	* @param String $groundspeed speed of flight
1027
-	* @param String $date date of flight
1028
-	* @param String $departure_airport_time departure time of flight
1029
-	* @param String $arrival_airport_time arrival time of flight
1030
-	* @param String $squawk squawk code of flight
1031
-	* @param String $route_stop route stop of flight
1032
-	* @param String $highlight highlight or not
1033
-	* @param String $ModeS ModesS code of flight
1034
-	* @param String $registration registration code of flight
1035
-	* @param String $pilot_id pilot id of flight (for virtual airlines)
1036
-	* @param String $pilot_name pilot name of flight (for virtual airlines)
1037
-	* @param String $verticalrate vertival rate of flight
1038
-	* @return String success or false
1039
-	*/
1016
+	 * Adds a new marine data
1017
+	 *
1018
+	 * @param String $fammarine_id the ID
1019
+	 * @param String $ident the marine ident
1020
+	 * @param String $departure_airport_icao the departure airport
1021
+	 * @param String $arrival_airport_icao the arrival airport
1022
+	 * @param String $latitude latitude of flight
1023
+	 * @param String $longitude latitude of flight
1024
+	 * @param String $waypoints waypoints of flight
1025
+	 * @param String $heading heading of flight
1026
+	 * @param String $groundspeed speed of flight
1027
+	 * @param String $date date of flight
1028
+	 * @param String $departure_airport_time departure time of flight
1029
+	 * @param String $arrival_airport_time arrival time of flight
1030
+	 * @param String $squawk squawk code of flight
1031
+	 * @param String $route_stop route stop of flight
1032
+	 * @param String $highlight highlight or not
1033
+	 * @param String $ModeS ModesS code of flight
1034
+	 * @param String $registration registration code of flight
1035
+	 * @param String $pilot_id pilot id of flight (for virtual airlines)
1036
+	 * @param String $pilot_name pilot name of flight (for virtual airlines)
1037
+	 * @param String $verticalrate vertival rate of flight
1038
+	 * @return String success or false
1039
+	 */
1040 1040
 	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 = '')
1041 1041
 	{
1042 1042
 		global $globalURL, $globalMarineImageFetch;
@@ -1170,11 +1170,11 @@  discard block
 block discarded – undo
1170 1170
 	
1171 1171
   
1172 1172
 	/**
1173
-	* Gets the aircraft ident within the last hour
1174
-	*
1175
-	* @return String the ident
1176
-	*
1177
-	*/
1173
+	 * Gets the aircraft ident within the last hour
1174
+	 *
1175
+	 * @return String the ident
1176
+	 *
1177
+	 */
1178 1178
 	public function getIdentFromLastHour($ident)
1179 1179
 	{
1180 1180
 		global $globalDBdriver, $globalTimezone;
@@ -1190,11 +1190,11 @@  discard block
 block discarded – undo
1190 1190
 								AND marine_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
1191 1191
 								AND marine_output.date < now() AT TIME ZONE 'UTC'";
1192 1192
 			$query_data = array(':ident' => $ident);
1193
-    		}
1193
+			}
1194 1194
 		
1195 1195
 		$sth = $this->db->prepare($query);
1196 1196
 		$sth->execute($query_data);
1197
-    		$ident_result='';
1197
+			$ident_result='';
1198 1198
 		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1199 1199
 		{
1200 1200
 			$ident_result = $row['ident'];
@@ -1205,11 +1205,11 @@  discard block
 block discarded – undo
1205 1205
 	
1206 1206
 	
1207 1207
 	/**
1208
-	* Gets the aircraft data from the last 20 seconds
1209
-	*
1210
-	* @return Array the marine data
1211
-	*
1212
-	*/
1208
+	 * Gets the aircraft data from the last 20 seconds
1209
+	 *
1210
+	 * @return Array the marine data
1211
+	 *
1212
+	 */
1213 1213
 	public function getRealTimeData($q = '')
1214 1214
 	{
1215 1215
 		global $globalDBdriver;
@@ -1247,11 +1247,11 @@  discard block
 block discarded – undo
1247 1247
 	
1248 1248
 
1249 1249
 	/**
1250
-	* Gets all number of flight over countries
1251
-	*
1252
-	* @return Array the airline country list
1253
-	*
1254
-	*/
1250
+	 * Gets all number of flight over countries
1251
+	 *
1252
+	 * @return Array the airline country list
1253
+	 *
1254
+	 */
1255 1255
 
1256 1256
 	public function countAllMarineOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
1257 1257
 	{
@@ -1324,11 +1324,11 @@  discard block
 block discarded – undo
1324 1324
 	
1325 1325
 	
1326 1326
 	/**
1327
-	* Gets all callsigns that have flown over
1328
-	*
1329
-	* @return Array the callsign list
1330
-	*
1331
-	*/
1327
+	 * Gets all callsigns that have flown over
1328
+	 *
1329
+	 * @return Array the callsign list
1330
+	 *
1331
+	 */
1332 1332
 	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '')
1333 1333
 	{
1334 1334
 		global $globalDBdriver;
@@ -1395,11 +1395,11 @@  discard block
 block discarded – undo
1395 1395
 
1396 1396
 
1397 1397
 	/**
1398
-	* Counts all dates
1399
-	*
1400
-	* @return Array the date list
1401
-	*
1402
-	*/
1398
+	 * Counts all dates
1399
+	 *
1400
+	 * @return Array the date list
1401
+	 *
1402
+	 */
1403 1403
 	public function countAllDates($filters = array())
1404 1404
 	{
1405 1405
 		global $globalTimezone, $globalDBdriver;
@@ -1445,11 +1445,11 @@  discard block
 block discarded – undo
1445 1445
 	
1446 1446
 	
1447 1447
 	/**
1448
-	* Counts all dates during the last 7 days
1449
-	*
1450
-	* @return Array the date list
1451
-	*
1452
-	*/
1448
+	 * Counts all dates during the last 7 days
1449
+	 *
1450
+	 * @return Array the date list
1451
+	 *
1452
+	 */
1453 1453
 	public function countAllDatesLast7Days($filters = array())
1454 1454
 	{
1455 1455
 		global $globalTimezone, $globalDBdriver;
@@ -1471,7 +1471,7 @@  discard block
 block discarded – undo
1471 1471
 			$query .= " GROUP BY date_name 
1472 1472
 								ORDER BY date_name ASC";
1473 1473
 			$query_data = array(':offset' => $offset);
1474
-    		}
1474
+			}
1475 1475
 		
1476 1476
 		$sth = $this->db->prepare($query);
1477 1477
 		$sth->execute($query_data);
@@ -1491,11 +1491,11 @@  discard block
 block discarded – undo
1491 1491
 	}
1492 1492
 
1493 1493
 	/**
1494
-	* Counts all dates during the last month
1495
-	*
1496
-	* @return Array the date list
1497
-	*
1498
-	*/
1494
+	 * Counts all dates during the last month
1495
+	 *
1496
+	 * @return Array the date list
1497
+	 *
1498
+	 */
1499 1499
 	public function countAllDatesLastMonth($filters = array())
1500 1500
 	{
1501 1501
 		global $globalTimezone, $globalDBdriver;
@@ -1517,7 +1517,7 @@  discard block
 block discarded – undo
1517 1517
 			$query .= " GROUP BY date_name 
1518 1518
 								ORDER BY date_name ASC";
1519 1519
 			$query_data = array(':offset' => $offset);
1520
-    		}
1520
+			}
1521 1521
 		
1522 1522
 		$sth = $this->db->prepare($query);
1523 1523
 		$sth->execute($query_data);
@@ -1539,11 +1539,11 @@  discard block
 block discarded – undo
1539 1539
 
1540 1540
 
1541 1541
 	/**
1542
-	* Counts all month
1543
-	*
1544
-	* @return Array the month list
1545
-	*
1546
-	*/
1542
+	 * Counts all month
1543
+	 *
1544
+	 * @return Array the month list
1545
+	 *
1546
+	 */
1547 1547
 	public function countAllMonths($filters = array())
1548 1548
 	{
1549 1549
 		global $globalTimezone, $globalDBdriver;
@@ -1588,11 +1588,11 @@  discard block
 block discarded – undo
1588 1588
 	
1589 1589
 
1590 1590
 	/**
1591
-	* Counts all dates during the last year
1592
-	*
1593
-	* @return Array the date list
1594
-	*
1595
-	*/
1591
+	 * Counts all dates during the last year
1592
+	 *
1593
+	 * @return Array the date list
1594
+	 *
1595
+	 */
1596 1596
 	public function countAllMonthsLastYear($filters)
1597 1597
 	{
1598 1598
 		global $globalTimezone, $globalDBdriver;
@@ -1614,7 +1614,7 @@  discard block
 block discarded – undo
1614 1614
 			$query .= " GROUP BY year_name, month_name
1615 1615
 								ORDER BY year_name, month_name ASC";
1616 1616
 			$query_data = array(':offset' => $offset);
1617
-    		}
1617
+			}
1618 1618
 		
1619 1619
 		$sth = $this->db->prepare($query);
1620 1620
 		$sth->execute($query_data);
@@ -1637,11 +1637,11 @@  discard block
 block discarded – undo
1637 1637
 	
1638 1638
 	
1639 1639
 	/**
1640
-	* Counts all hours
1641
-	*
1642
-	* @return Array the hour list
1643
-	*
1644
-	*/
1640
+	 * Counts all hours
1641
+	 *
1642
+	 * @return Array the hour list
1643
+	 *
1644
+	 */
1645 1645
 	public function countAllHours($orderby,$filters = array())
1646 1646
 	{
1647 1647
 		global $globalTimezone, $globalDBdriver;
@@ -1704,11 +1704,11 @@  discard block
 block discarded – undo
1704 1704
 	
1705 1705
 	
1706 1706
 	/**
1707
-	* Counts all hours by date
1708
-	*
1709
-	* @return Array the hour list
1710
-	*
1711
-	*/
1707
+	 * Counts all hours by date
1708
+	 *
1709
+	 * @return Array the hour list
1710
+	 *
1711
+	 */
1712 1712
 	public function countAllHoursByDate($date, $filters = array())
1713 1713
 	{
1714 1714
 		global $globalTimezone, $globalDBdriver;
@@ -1752,11 +1752,11 @@  discard block
 block discarded – undo
1752 1752
 	
1753 1753
 	
1754 1754
 	/**
1755
-	* Counts all hours by a ident/callsign
1756
-	*
1757
-	* @return Array the hour list
1758
-	*
1759
-	*/
1755
+	 * Counts all hours by a ident/callsign
1756
+	 *
1757
+	 * @return Array the hour list
1758
+	 *
1759
+	 */
1760 1760
 	public function countAllHoursByIdent($ident, $filters = array())
1761 1761
 	{
1762 1762
 		global $globalTimezone, $globalDBdriver;
@@ -1801,11 +1801,11 @@  discard block
 block discarded – undo
1801 1801
 	
1802 1802
 	
1803 1803
 	/**
1804
-	* Counts all vessels
1805
-	*
1806
-	* @return Integer the number of vessels
1807
-	*
1808
-	*/
1804
+	 * Counts all vessels
1805
+	 *
1806
+	 * @return Integer the number of vessels
1807
+	 *
1808
+	 */
1809 1809
 	public function countOverallMarine($filters = array(),$year = '',$month = '')
1810 1810
 	{
1811 1811
 		global $globalDBdriver;
@@ -1840,11 +1840,11 @@  discard block
 block discarded – undo
1840 1840
 	}
1841 1841
 	
1842 1842
 	/**
1843
-	* Counts all vessel type
1844
-	*
1845
-	* @return Integer the number of vessels
1846
-	*
1847
-	*/
1843
+	 * Counts all vessel type
1844
+	 *
1845
+	 * @return Integer the number of vessels
1846
+	 *
1847
+	 */
1848 1848
 	public function countOverallMarineTypes($filters = array(),$year = '',$month = '')
1849 1849
 	{
1850 1850
 		global $globalDBdriver;
@@ -1879,11 +1879,11 @@  discard block
 block discarded – undo
1879 1879
 	
1880 1880
   
1881 1881
 	/**
1882
-	* Counts all hours of today
1883
-	*
1884
-	* @return Array the hour list
1885
-	*
1886
-	*/
1882
+	 * Counts all hours of today
1883
+	 *
1884
+	 * @return Array the hour list
1885
+	 *
1886
+	 */
1887 1887
 	public function countAllHoursFromToday($filters = array())
1888 1888
 	{
1889 1889
 		global $globalTimezone, $globalDBdriver;
@@ -1923,12 +1923,12 @@  discard block
 block discarded – undo
1923 1923
 	}
1924 1924
     
1925 1925
     
1926
-     /**
1927
-	* Gets the Barrie Spotter ID based on the FlightAware ID
1928
-	*
1929
-	* @return Integer the Barrie Spotter ID
1926
+	 /**
1927
+	  * Gets the Barrie Spotter ID based on the FlightAware ID
1928
+	  *
1929
+	  * @return Integer the Barrie Spotter ID
1930 1930
 q	*
1931
-	*/
1931
+	  */
1932 1932
 	public function getMarineIDBasedOnFamMarineID($fammarine_id)
1933 1933
 	{
1934 1934
 		$fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING);
@@ -1949,13 +1949,13 @@  discard block
 block discarded – undo
1949 1949
   
1950 1950
  
1951 1951
 	/**
1952
-	* Parses a date string
1953
-	*
1954
-	* @param String $dateString the date string
1955
-	* @param String $timezone the timezone of a user
1956
-	* @return Array the time information
1957
-	*
1958
-	*/
1952
+	 * Parses a date string
1953
+	 *
1954
+	 * @param String $dateString the date string
1955
+	 * @param String $timezone the timezone of a user
1956
+	 * @return Array the time information
1957
+	 *
1958
+	 */
1959 1959
 	public function parseDateString($dateString, $timezone = '')
1960 1960
 	{
1961 1961
 		$time_array = array();
@@ -1988,12 +1988,12 @@  discard block
 block discarded – undo
1988 1988
 	}
1989 1989
 	
1990 1990
 	/**
1991
-	* Parses the direction degrees to working
1992
-	*
1993
-	* @param Float $direction the direction in degrees
1994
-	* @return Array the direction information
1995
-	*
1996
-	*/
1991
+	 * Parses the direction degrees to working
1992
+	 *
1993
+	 * @param Float $direction the direction in degrees
1994
+	 * @return Array the direction information
1995
+	 *
1996
+	 */
1997 1997
 	public function parseDirection($direction = 0)
1998 1998
 	{
1999 1999
 		if ($direction == '') $direction = 0;
@@ -2072,12 +2072,12 @@  discard block
 block discarded – undo
2072 2072
 	
2073 2073
 	
2074 2074
 	/**
2075
-	* Gets Country from latitude/longitude
2076
-	*
2077
-	* @param Float $latitude latitute of the flight
2078
-	* @param Float $longitude longitute of the flight
2079
-	* @return String the countrie
2080
-	*/
2075
+	 * Gets Country from latitude/longitude
2076
+	 *
2077
+	 * @param Float $latitude latitute of the flight
2078
+	 * @param Float $longitude longitute of the flight
2079
+	 * @return String the countrie
2080
+	 */
2081 2081
 	public function getCountryFromLatitudeLongitude($latitude,$longitude)
2082 2082
 	{
2083 2083
 		global $globalDBdriver, $globalDebug;
@@ -2114,11 +2114,11 @@  discard block
 block discarded – undo
2114 2114
 	}
2115 2115
 
2116 2116
 	/**
2117
-	* Gets Country from iso2
2118
-	*
2119
-	* @param String $iso2 ISO2 country code
2120
-	* @return String the countrie
2121
-	*/
2117
+	 * Gets Country from iso2
2118
+	 *
2119
+	 * @param String $iso2 ISO2 country code
2120
+	 * @return String the countrie
2121
+	 */
2122 2122
 	public function getCountryFromISO2($iso2)
2123 2123
 	{
2124 2124
 		global $globalDBdriver, $globalDebug;
@@ -2147,12 +2147,12 @@  discard block
 block discarded – undo
2147 2147
 
2148 2148
 	
2149 2149
 	/**
2150
-	* Gets the short url from bit.ly
2151
-	*
2152
-	* @param String $url the full url
2153
-	* @return String the bit.ly url
2154
-	*
2155
-	*/
2150
+	 * Gets the short url from bit.ly
2151
+	 *
2152
+	 * @param String $url the full url
2153
+	 * @return String the bit.ly url
2154
+	 *
2155
+	 */
2156 2156
 	public function getBitlyURL($url)
2157 2157
 	{
2158 2158
 		global $globalBitlyAccessToken;
@@ -2179,11 +2179,11 @@  discard block
 block discarded – undo
2179 2179
 
2180 2180
 	
2181 2181
 	/**
2182
-	* Gets all vessels types that have flown over
2183
-	*
2184
-	* @return Array the vessel type list
2185
-	*
2186
-	*/
2182
+	 * Gets all vessels types that have flown over
2183
+	 *
2184
+	 * @return Array the vessel type list
2185
+	 *
2186
+	 */
2187 2187
 	public function countAllMarineTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '')
2188 2188
 	{
2189 2189
 		global $globalDBdriver;
@@ -2249,11 +2249,11 @@  discard block
 block discarded – undo
2249 2249
 	}
2250 2250
 
2251 2251
 	/**
2252
-	* Gets all the tracker information
2253
-	*
2254
-	* @return Array the tracker information
2255
-	*
2256
-	*/
2252
+	 * Gets all the tracker information
2253
+	 *
2254
+	 * @return Array the tracker information
2255
+	 *
2256
+	 */
2257 2257
 	public function searchMarineData($q = '', $callsign = '',$mmsi = '', $imo = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '',$filters = array())
2258 2258
 	{
2259 2259
 		global $globalTimezone, $globalDBdriver;
@@ -2382,11 +2382,11 @@  discard block
 block discarded – undo
2382 2382
 	}
2383 2383
 
2384 2384
 	/**
2385
-	* Check marine by id
2386
-	*
2387
-	* @return String the ident
2388
-	*
2389
-	*/
2385
+	 * Check marine by id
2386
+	 *
2387
+	 * @return String the ident
2388
+	 *
2389
+	 */
2390 2390
 	public function checkId($id)
2391 2391
 	{
2392 2392
 		global $globalDBdriver, $globalTimezone;
Please login to merge, or discard this patch.