Ysurac / FlightAirMap

require/class.Weather.php

Spacing +11 added lines, -11 removed lines

@@ -4,12 +4,12 @@ 
 	public function buildcloudlayer($metar) {
 		//print_r($metar);
 		$result = array();
-		foreach($metar['cloud'] as $key => $data) {
+		foreach ($metar['cloud'] as $key => $data) {
 			$alt_m = $metar['cloud'][$key]['level'];
 			$alt_ft = $alt_m*3.28084;
 			$pressure = $metar['QNH'];
-			$cumulus_base = 122.0 * ($metar['temperature'] - $metar['dew']);
-			$stratus_base = 100.0 * (100.0 * $metar['rh'])*0.3048;
+			$cumulus_base = 122.0*($metar['temperature'] - $metar['dew']);
+			$stratus_base = 100.0*(100.0*$metar['rh'])*0.3048;
 			$coverage_norm = 0.0;
 			if ($metar['cloud'][$key]['type'] == 'Few') {
 				$coverage_norm = 2.0/8.0;
@@ -31,9 +31,9 @@ 
 					$layer_type = 'ns';
 				}
 			} else {
-				if ($cumulus_base * 0.80 < $alt_m && $cumulus_base * 1.20 > $alt_m) {
+				if ($cumulus_base*0.80 < $alt_m && $cumulus_base*1.20 > $alt_m) {
 					$layer_type = 'cu';
-				} elseif ($stratus_base * 0.80 < $alt_m && $stratus_base * 1.40 > $alt_m) {
+				} elseif ($stratus_base*0.80 < $alt_m && $stratus_base*1.40 > $alt_m) {
 					$layer_type = 'st';
 				} else {
 					if ($alt_ft < 2000) {
@@ -46,10 +46,10 @@ 
 				}
 			}
 			//echo 'coverage norm : '.$coverage_norm.' - layer_type: '.$layer_type."\n";
-			$result[] = array('cov' => $coverage_norm, 'type' => $layer_type,'alt' => $alt_m,'rh' => $metar['rh']);
+			$result[] = array('cov' => $coverage_norm, 'type' => $layer_type, 'alt' => $alt_m, 'rh' => $metar['rh']);
 		}
 		if (count($result) < 2 && $metar['rh'] > 60) {
-			$result[] = array('cov' => 0.75, 'type' => 'ci','alt' => 4000,'rh' => $metar['rh']);
+			$result[] = array('cov' => 0.75, 'type' => 'ci', 'alt' => 4000, 'rh' => $metar['rh']);
 		}
 		return $result;
 	}
@@ -68,8 +68,8 @@ 
 		
 		// http://nomads.ncep.noaa.gov/cgi-bin/filter_gfs_0p50.pl?file=gfs.t05z.pgrb2full.0p50.f000&lev_10_m_above_ground=on&lev_surface=on&var_TMP=on&var_UGRD=on&var_VGRD=on&leftlon=0&rightlon=360&toplat=90&bottomlat=-90&dir=/gfs.2017111717
 		$resolution = '0.5';
-		$baseurl = 'http://nomads.ncep.noaa.gov/cgi-bin/filter_gfs_'.($resolution === '1' ? '1p00':'0p50').'.pl';
-		$get = array('file' => 'gfs.t'.sprintf('%02d',(6*floor(date('G')/6))).($resolution === '1' ? 'z.pgrb2.1p00.f000' : 'z.pgrb2full.0p50.f000'),
+		$baseurl = 'http://nomads.ncep.noaa.gov/cgi-bin/filter_gfs_'.($resolution === '1' ? '1p00' : '0p50').'.pl';
+		$get = array('file' => 'gfs.t'.sprintf('%02d', (6*floor(date('G')/6))).($resolution === '1' ? 'z.pgrb2.1p00.f000' : 'z.pgrb2full.0p50.f000'),
 			'lev_10_m_above_ground' => 'on',
 			'lev_surface' => 'on',
 			'var_TMP' => 'on',
@@ -79,12 +79,12 @@ 
 			'rightlon' => 360,
 			'toplat' => 90,
 			'bottomlat' => -90,
-			'dir' => '/gfs.'.date('Ymd').sprintf('%02d',(6*floor(date('G')/6)))
+			'dir' => '/gfs.'.date('Ymd').sprintf('%02d', (6*floor(date('G')/6)))
 		);
 		$url = $baseurl.'?'.http_build_query($get);
 		echo $url;
 		$Common = new Common();
-		$Common->download($url,$windpathsrc);
+		$Common->download($url, $windpathsrc);
 		system($grib2json.' --data --output '.$windpathdest.' --names --compact '.$windpathsrc);
 	}
 }

require/class.Tracker.php

Indentation +210 added lines, -210 removed lines

@@ -14,10 +14,10 @@ 
 	}
 
 	/**
-	* Get SQL query part for filter used
-	* @param Array $filter the filter
-	* @return Array the SQL part
-	*/
+	 * Get SQL query part for filter used
+	 * @param Array $filter the filter
+	 * @return Array the SQL part
+	 */
 	
 	public function getFilter($filter = array(),$where = false,$and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
@@ -84,14 +84,14 @@ 
 	}
 
 	/**
-	* Executes the SQL statements to get the tracker information
-	*
-	* @param String $query the SQL query
-	* @param Array $params parameter of the query
-	* @param String $limitQuery the limit query
-	* @return Array the tracker information
-	*
-	*/
+	 * Executes the SQL statements to get the tracker information
+	 *
+	 * @param String $query the SQL query
+	 * @param Array $params parameter of the query
+	 * @param String $limitQuery the limit query
+	 * @return Array the tracker information
+	 *
+	 */
 	public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false)
 	{
 		date_default_timezone_set('UTC');
@@ -204,11 +204,11 @@ 
 	
 	
 	/**
-	* Gets all the tracker information based on the latest data entry
-	*
-	* @return Array the tracker information
-	*
-	*/
+	 * Gets all the tracker information based on the latest data entry
+	 *
+	 * @return Array the tracker information
+	 *
+	 */
 	public function getLatestTrackerData($limit = '', $sort = '', $filter = array())
 	{
 		global $global_tracker_query;
@@ -266,11 +266,11 @@ 
 	}
 
 	/**
-	* Gets all the tracker information based on the callsign
-	*
-	* @return Array the tracker information
-	*
-	*/
+	 * Gets all the tracker information based on the callsign
+	 *
+	 * @return Array the tracker information
+	 *
+	 */
 	public function getTrackerDataByIdent($ident = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_tracker_query;
@@ -381,12 +381,12 @@ 
 
 
 	/**
-	* Gets all source name
-	*
-	* @param String type format of source
-	* @return Array list of source name
-	*
-	*/
+	 * Gets all source name
+	 *
+	 * @param String type format of source
+	 * @return Array list of source name
+	 *
+	 */
 	public function getAllSourceName($type = '',$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -416,11 +416,11 @@ 
 
 
 	/**
-	* Gets a list of all idents/callsigns
-	*
-	* @return Array list of ident/callsign names
-	*
-	*/
+	 * Gets a list of all idents/callsigns
+	 *
+	 * @return Array list of ident/callsign names
+	 *
+	 */
 	public function getAllIdents($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -488,18 +488,18 @@ 
 	
 	
 	/**
-	* Update ident tracker data
-	*
-	* @param String $flightaware_id the ID from flightaware
-	* @param String $ident the flight ident
-	* @return String success or false
-	*
-	*/	
+	 * Update ident tracker data
+	 *
+	 * @param String $flightaware_id the ID from flightaware
+	 * @param String $ident the flight ident
+	 * @return String success or false
+	 *
+	 */	
 	public function updateIdentTrackerData($famtrackid = '', $ident = '',$fromsource = NULL)
 	{
 
 		$query = 'UPDATE tracker_output SET ident = :ident WHERE famtrackid = :famtrackid';
-                $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident);
+				$query_values = array(':famtrackid' => $famtrackid,':ident' => $ident);
 
 		try {
 			$sth = $this->db->prepare($query);
@@ -512,18 +512,18 @@ 
 
 	}
 	/**
-	* Update latest tracker data
-	*
-	* @param String $flightaware_id the ID from flightaware
-	* @param String $ident the flight ident
-	* @param String $arrival_airport_icao the arrival airport
-	* @return String success or false
-	*
-	*/	
+	 * Update latest tracker data
+	 *
+	 * @param String $flightaware_id the ID from flightaware
+	 * @param String $ident the flight ident
+	 * @param String $arrival_airport_icao the arrival airport
+	 * @return String success or false
+	 *
+	 */	
 	public function updateLatestTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $groundspeed = NULL, $date = '')
 	{
 		$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';
-                $query_values = array(':famtrackid' => $famtrackid,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident);
+				$query_values = array(':famtrackid' => $famtrackid,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident);
 
 		try {
 			$sth = $this->db->prepare($query);
@@ -537,32 +537,32 @@ 
 	}
 
 	/**
-	* Adds a new tracker data
-	*
-	* @param String $flightaware_id the ID from flightaware
-	* @param String $ident the flight ident
-	* @param String $aircraft_icao the aircraft type
-	* @param String $departure_airport_icao the departure airport
-	* @param String $arrival_airport_icao the arrival airport
-	* @param String $latitude latitude of flight
-	* @param String $longitude latitude of flight
-	* @param String $waypoints waypoints of flight
-	* @param String $altitude altitude of flight
-	* @param String $heading heading of flight
-	* @param String $groundspeed speed of flight
-	* @param String $date date of flight
-	* @param String $departure_airport_time departure time of flight
-	* @param String $arrival_airport_time arrival time of flight
-	* @param String $squawk squawk code of flight
-	* @param String $route_stop route stop of flight
-	* @param String $highlight highlight or not
-	* @param String $ModeS ModesS code of flight
-	* @param String $registration registration code of flight
-	* @param String $pilot_id pilot id of flight (for virtual airlines)
-	* @param String $pilot_name pilot name of flight (for virtual airlines)
-	* @param String $verticalrate vertival rate of flight
-	* @return String success or false
-	*/
+	 * Adds a new tracker data
+	 *
+	 * @param String $flightaware_id the ID from flightaware
+	 * @param String $ident the flight ident
+	 * @param String $aircraft_icao the aircraft type
+	 * @param String $departure_airport_icao the departure airport
+	 * @param String $arrival_airport_icao the arrival airport
+	 * @param String $latitude latitude of flight
+	 * @param String $longitude latitude of flight
+	 * @param String $waypoints waypoints of flight
+	 * @param String $altitude altitude of flight
+	 * @param String $heading heading of flight
+	 * @param String $groundspeed speed of flight
+	 * @param String $date date of flight
+	 * @param String $departure_airport_time departure time of flight
+	 * @param String $arrival_airport_time arrival time of flight
+	 * @param String $squawk squawk code of flight
+	 * @param String $route_stop route stop of flight
+	 * @param String $highlight highlight or not
+	 * @param String $ModeS ModesS code of flight
+	 * @param String $registration registration code of flight
+	 * @param String $pilot_id pilot id of flight (for virtual airlines)
+	 * @param String $pilot_name pilot name of flight (for virtual airlines)
+	 * @param String $verticalrate vertival rate of flight
+	 * @return String success or false
+	 */
 	public function addTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $comment = '', $type = '',$format_source = '', $source_name = '')
 	{
 		global $globalURL;
@@ -647,16 +647,16 @@ 
 		$comment = filter_var($comment,FILTER_SANITIZE_STRING);
 		$type = filter_var($type,FILTER_SANITIZE_STRING);
 	
-                if ($latitude == '' && $longitude == '') {
-            		$latitude = 0;
-            		$longitude = 0;
-            	}
-                if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
-                if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
-                $query  = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type) 
+				if ($latitude == '' && $longitude == '') {
+					$latitude = 0;
+					$longitude = 0;
+				}
+				if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
+				if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
+				$query  = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type) 
                 VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:speed,:date,:format_source, :source_name,:comment,:type)";
 
-                $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);
+				$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);
 
 		try {
 		        
@@ -664,7 +664,7 @@ 
 			$sth->execute($query_values);
 			$this->db = null;
 		} catch (PDOException $e) {
-		    return "error : ".$e->getMessage();
+			return "error : ".$e->getMessage();
 		}
 		
 		return "success";
@@ -673,11 +673,11 @@ 
 	
   
 	/**
-	* Gets the aircraft ident within the last hour
-	*
-	* @return String the ident
-	*
-	*/
+	 * Gets the aircraft ident within the last hour
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function getIdentFromLastHour($ident)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -693,11 +693,11 @@ 
 								AND tracker_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
 								AND tracker_output.date < now() AT TIME ZONE 'UTC'";
 			$query_data = array(':ident' => $ident);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
-    		$ident_result='';
+			$ident_result='';
 		while($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$ident_result = $row['ident'];
@@ -708,11 +708,11 @@ 
 	
 	
 	/**
-	* Gets the aircraft data from the last 20 seconds
-	*
-	* @return Array the tracker data
-	*
-	*/
+	 * Gets the aircraft data from the last 20 seconds
+	 *
+	 * @return Array the tracker data
+	 *
+	 */
 	public function getRealTimeData($q = '')
 	{
 		global $globalDBdriver;
@@ -746,11 +746,11 @@ 
 	}
 
 	/**
-	* Gets all number of flight over countries
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all number of flight over countries
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllTrackerOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
 	{
 		global $globalDBdriver, $globalArchive;
@@ -820,11 +820,11 @@ 
 	}
 	
 	/**
-	* Gets all callsigns that have flown over
-	*
-	* @return Array the callsign list
-	*
-	*/
+	 * Gets all callsigns that have flown over
+	 *
+	 * @return Array the callsign list
+	 *
+	 */
 	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
@@ -891,11 +891,11 @@ 
 
 
 	/**
-	* Counts all dates
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllDates($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -941,11 +941,11 @@ 
 	
 	
 	/**
-	* Counts all dates during the last 7 days
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates during the last 7 days
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllDatesLast7Days($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -967,7 +967,7 @@ 
 			$query .= " GROUP BY date_name 
 								ORDER BY date_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -987,11 +987,11 @@ 
 	}
 
 	/**
-	* Counts all dates during the last month
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates during the last month
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllDatesLastMonth($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1013,7 +1013,7 @@ 
 			$query .= " GROUP BY date_name 
 								ORDER BY date_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -1035,11 +1035,11 @@ 
 
 
 	/**
-	* Counts all month
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonths($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1084,11 +1084,11 @@ 
 	
 
 	/**
-	* Counts all dates during the last year
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates during the last year
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllMonthsLastYear($filters)
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1110,7 +1110,7 @@ 
 			$query .= " GROUP BY year_name, month_name
 								ORDER BY year_name, month_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -1133,11 +1133,11 @@ 
 	
 	
 	/**
-	* Counts all hours
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHours($orderby,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1200,11 +1200,11 @@ 
 	
 	
 	/**
-	* Counts all hours by date
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by date
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByDate($date, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1248,11 +1248,11 @@ 
 	
 	
 	/**
-	* Counts all hours by a ident/callsign
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by a ident/callsign
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByIdent($ident, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1297,11 +1297,11 @@ 
 	
 	
 	/**
-	* Counts all trackers that have flown over
-	*
-	* @return Integer the number of trackers
-	*
-	*/
+	 * Counts all trackers that have flown over
+	 *
+	 * @return Integer the number of trackers
+	 *
+	 */
 	public function countOverallTracker($filters = array(),$year = '',$month = '')
 	{
 		global $globalDBdriver;
@@ -1336,11 +1336,11 @@ 
 	}
 	
 	/**
-	* Counts all trackers type that have flown over
-	*
-	* @return Integer the number of flights
-	*
-	*/
+	 * Counts all trackers type that have flown over
+	 *
+	 * @return Integer the number of flights
+	 *
+	 */
 	public function countOverallTrackerTypes($filters = array(),$year = '',$month = '')
 	{
 		global $globalDBdriver;
@@ -1375,11 +1375,11 @@ 
 	
   
 	/**
-	* Counts all hours of today
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours of today
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursFromToday($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1419,12 +1419,12 @@ 
 	}
     
     
-     /**
-	* Gets the Barrie Spotter ID based on the FlightAware ID
-	*
-	* @return Integer the Barrie Spotter ID
+	 /**
+	  * Gets the Barrie Spotter ID based on the FlightAware ID
+	  *
+	  * @return Integer the Barrie Spotter ID
 q	*
-	*/
+	  */
 	public function getTrackerIDBasedOnFamTrackID($famtrackid)
 	{
 		$famtrackid = filter_var($famtrackid,FILTER_SANITIZE_STRING);
@@ -1445,13 +1445,13 @@ 
   
  
 	/**
-	* Parses a date string
-	*
-	* @param String $dateString the date string
-	* @param String $timezone the timezone of a user
-	* @return Array the time information
-	*
-	*/
+	 * Parses a date string
+	 *
+	 * @param String $dateString the date string
+	 * @param String $timezone the timezone of a user
+	 * @return Array the time information
+	 *
+	 */
 	public function parseDateString($dateString, $timezone = '')
 	{
 		$time_array = array();
@@ -1484,12 +1484,12 @@ 
 	}
 	
 	/**
-	* Parses the direction degrees to working
-	*
-	* @param Float $direction the direction in degrees
-	* @return Array the direction information
-	*
-	*/
+	 * Parses the direction degrees to working
+	 *
+	 * @param Float $direction the direction in degrees
+	 * @return Array the direction information
+	 *
+	 */
 	public function parseDirection($direction = 0)
 	{
 		if ($direction == '') $direction = 0;
@@ -1568,12 +1568,12 @@ 
 	
 	
 	/**
-	* Gets Country from latitude/longitude
-	*
-	* @param Float $latitude latitute of the flight
-	* @param Float $longitude longitute of the flight
-	* @return String the countrie
-	*/
+	 * Gets Country from latitude/longitude
+	 *
+	 * @param Float $latitude latitute of the flight
+	 * @param Float $longitude longitute of the flight
+	 * @return String the countrie
+	 */
 	public function getCountryFromLatitudeLongitude($latitude,$longitude)
 	{
 		global $globalDBdriver, $globalDebug;
@@ -1610,11 +1610,11 @@ 
 	}
 
 	/**
-	* Gets Country from iso2
-	*
-	* @param String $iso2 ISO2 country code
-	* @return String the countrie
-	*/
+	 * Gets Country from iso2
+	 *
+	 * @param String $iso2 ISO2 country code
+	 * @return String the countrie
+	 */
 	public function getCountryFromISO2($iso2)
 	{
 		global $globalDBdriver, $globalDebug;
@@ -1642,11 +1642,11 @@ 
 	}
 
 	/**
-	* Gets all vessels types that have flown over
-	*
-	* @return Array the vessel type list
-	*
-	*/
+	 * Gets all vessels types that have flown over
+	 *
+	 * @return Array the vessel type list
+	 *
+	 */
 	public function countAllTrackerTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
@@ -1711,11 +1711,11 @@ 
 	}
 
 	/**
-	* Gets all the tracker information
-	*
-	* @return Array the tracker information
-	*
-	*/
+	 * Gets all the tracker information
+	 *
+	 * @return Array the tracker information
+	 *
+	 */
 	public function searchTrackerData($q = '', $callsign = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '',$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1820,12 +1820,12 @@ 
 	}
 
 	/**
-	* Gets the short url from bit.ly
-	*
-	* @param String $url the full url
-	* @return String the bit.ly url
-	*
-	*/
+	 * Gets the short url from bit.ly
+	 *
+	 * @param String $url the full url
+	 * @return String the bit.ly url
+	 *
+	 */
 	public function getBitlyURL($url)
 	{
 		global $globalBitlyAccessToken;

Spacing +176 added lines, -176 removed lines

@@ -4,7 +4,7 @@ 
 require_once(dirname(__FILE__).'/class.Image.php');
 $global_tracker_query = "SELECT tracker_output.* FROM tracker_output";
 
-class Tracker{
+class Tracker {
 	public $db;
 	
 	public function __construct($dbc = null) {
@@ -19,33 +19,33 @@ 
 	* @return Array the SQL part
 	*/
 	
-	public function getFilter($filter = array(),$where = false,$and = false) {
+	public function getFilter($filter = array(), $where = false, $and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
 		$filters = array();
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
 				$filters = $globalStatsFilters[$globalFilterName];
 			} else {
-				$filter = array_merge($filter,$globalStatsFilters[$globalFilterName]);
+				$filter = array_merge($filter, $globalStatsFilters[$globalFilterName]);
 			}
 		}
 		if (isset($filter[0]['source'])) {
-			$filters = array_merge($filters,$filter);
+			$filters = array_merge($filters, $filter);
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
 		$filter_query_join = '';
 		$filter_query_where = '';
-		foreach($filters as $flt) {
+		foreach ($filters as $flt) {
 			if (isset($flt['idents']) && !empty($flt['idents'])) {
 				if (isset($flt['source'])) {
-					$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";
+					$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";
 				} else {
-					$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";
+					$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";
 				}
 			}
 		}
 		if (isset($filter['source']) && !empty($filter['source'])) {
-			$filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')";
+			$filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')";
 		}
 		if (isset($filter['ident']) && !empty($filter['ident'])) {
 			$filter_query_where .= " AND ident = '".$filter['ident']."'";
@@ -77,7 +77,7 @@ 
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
 		if ($filter_query_where != '') {
-			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
+			$filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where);
 		}
 		$filter_query = $filter_query_join.$filter_query_where;
 		return $filter_query;
@@ -92,7 +92,7 @@ 
 	* @return Array the tracker information
 	*
 	*/
-	public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false)
+	public function getDataFromDB($query, $params = array(), $limitQuery = '', $schedules = false)
 	{
 		date_default_timezone_set('UTC');
 		if (!is_string($query))
@@ -112,13 +112,13 @@ 
 			$sth = $this->db->prepare($query.$limitQuery);
 			$sth->execute($params);
 		} catch (PDOException $e) {
-			printf("Invalid query : %s\nWhole query: %s\n",$e->getMessage(), $query.$limitQuery);
+			printf("Invalid query : %s\nWhole query: %s\n", $e->getMessage(), $query.$limitQuery);
 			exit();
 		}
 		
 		$num_rows = 0;
 		$tracker_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$num_rows++;
 			$temp_array = array();
@@ -174,17 +174,17 @@ 
 				{
 					$temp_array['date'] = "about ".$dateArray['hours']." hours ago";
 				} else {
-					$temp_array['date'] = date("M j Y, g:i a",strtotime($row['date']." UTC"));
+					$temp_array['date'] = date("M j Y, g:i a", strtotime($row['date']." UTC"));
 				}
 				$temp_array['date_minutes_past'] = $dateArray['minutes'];
-				$temp_array['date_iso_8601'] = date("c",strtotime($row['date']." UTC"));
-				$temp_array['date_rfc_2822'] = date("r",strtotime($row['date']." UTC"));
+				$temp_array['date_iso_8601'] = date("c", strtotime($row['date']." UTC"));
+				$temp_array['date_rfc_2822'] = date("r", strtotime($row['date']." UTC"));
 				$temp_array['date_unix'] = strtotime($row['date']." UTC");
 				if (isset($row['last_seen']) && $row['last_seen'] != '') {
 					if (strtotime($row['last_seen']) > strtotime($row['date'])) {
 						$temp_array['duration'] = strtotime($row['last_seen']) - strtotime($row['date']);
-						$temp_array['last_seen_date_iso_8601'] = date("c",strtotime($row['last_seen']." UTC"));
-						$temp_array['last_seen_date_rfc_2822'] = date("r",strtotime($row['last_seen']." UTC"));
+						$temp_array['last_seen_date_iso_8601'] = date("c", strtotime($row['last_seen']." UTC"));
+						$temp_array['last_seen_date_rfc_2822'] = date("r", strtotime($row['last_seen']." UTC"));
 						$temp_array['last_seen_date_unix'] = strtotime($row['last_seen']." UTC");
 					}
 				}
@@ -221,8 +221,8 @@ 
 		{
 			$limit_array = explode(",", $limit);
 			
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
@@ -239,9 +239,9 @@ 
 			$orderby_query = " ORDER BY tracker_output.date DESC";
 		}
 
-		$query  = $global_tracker_query.$filter_query." ".$orderby_query;
+		$query = $global_tracker_query.$filter_query." ".$orderby_query;
 
-		$tracker_array = $this->getDataFromDB($query, array(),$limit_query,true);
+		$tracker_array = $this->getDataFromDB($query, array(), $limit_query, true);
 
 		return $tracker_array;
 	}
@@ -260,8 +260,8 @@ 
 		if ($id == '') return array();
 		$additional_query = "tracker_output.famtrackid = :id";
 		$query_values = array(':id' => $id);
-		$query  = $global_tracker_query." WHERE ".$additional_query." ";
-		$tracker_array = $this->getDataFromDB($query,$query_values);
+		$query = $global_tracker_query." WHERE ".$additional_query." ";
+		$tracker_array = $this->getDataFromDB($query, $query_values);
 		return $tracker_array;
 	}
 
@@ -280,7 +280,7 @@ 
 		$query_values = array();
 		$limit_query = '';
 		$additional_query = '';
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 		if ($ident != "")
 		{
 			if (!is_string($ident))
@@ -296,8 +296,8 @@ 
 		{
 			$limit_array = explode(",", $limit);
 			
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
@@ -321,7 +321,7 @@ 
 		return $tracker_array;
 	}
 	
-	public function getTrackerDataByDate($date = '', $limit = '', $sort = '',$filter = array())
+	public function getTrackerDataByDate($date = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_tracker_query, $globalTimezone, $globalDBdriver;
 		
@@ -329,7 +329,7 @@ 
 		$limit_query = '';
 		$additional_query = '';
 
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 		
 		if ($date != "")
 		{
@@ -355,8 +355,8 @@ 
 		{
 			$limit_array = explode(",", $limit);
 			
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
@@ -387,11 +387,11 @@ 
 	* @return Array list of source name
 	*
 	*/
-	public function getAllSourceName($type = '',$filters = array())
+	public function getAllSourceName($type = '', $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		$query_values = array();
-		$query  = "SELECT DISTINCT tracker_output.source_name 
+		$query = "SELECT DISTINCT tracker_output.source_name 
 				FROM tracker_output".$filter_query." tracker_output.source_name <> ''";
 		if ($type != '') {
 			$query_values = array(':type' => $type);
@@ -406,7 +406,7 @@ 
 		$source_array = array();
 		$temp_array = array();
 		
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['source_name'] = $row['source_name'];
 			$source_array[] = $temp_array;
@@ -423,8 +423,8 @@ 
 	*/
 	public function getAllIdents($filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT tracker_output.ident
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT tracker_output.ident
 								FROM tracker_output".$filter_query." tracker_output.ident <> '' 
 								ORDER BY tracker_output.date ASC LIMIT 700 OFFSET 0";
 
@@ -434,7 +434,7 @@ 
 		$ident_array = array();
 		$temp_array = array();
 		
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['ident'] = $row['ident'];
 			$ident_array[] = $temp_array;
@@ -459,12 +459,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT DISTINCT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) as date
+			$query = "SELECT DISTINCT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) as date
 								FROM tracker_output
 								WHERE tracker_output.date <> '' 
 								ORDER BY tracker_output.date ASC LIMIT 0,100";
 		} else {
-			$query  = "SELECT DISTINCT to_char(tracker_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date
+			$query = "SELECT DISTINCT to_char(tracker_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date
 								FROM tracker_output
 								WHERE tracker_output.date <> '' 
 								ORDER BY tracker_output.date ASC LIMIT 0,100";
@@ -476,7 +476,7 @@ 
 		$date_array = array();
 		$temp_array = array();
 		
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['date'] = $row['date'];
 
@@ -495,11 +495,11 @@ 
 	* @return String success or false
 	*
 	*/	
-	public function updateIdentTrackerData($famtrackid = '', $ident = '',$fromsource = NULL)
+	public function updateIdentTrackerData($famtrackid = '', $ident = '', $fromsource = NULL)
 	{
 
 		$query = 'UPDATE tracker_output SET ident = :ident WHERE famtrackid = :famtrackid';
-                $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident);
+                $query_values = array(':famtrackid' => $famtrackid, ':ident' => $ident);
 
 		try {
 			$sth = $this->db->prepare($query);
@@ -523,7 +523,7 @@ 
 	public function updateLatestTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $groundspeed = NULL, $date = '')
 	{
 		$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';
-                $query_values = array(':famtrackid' => $famtrackid,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident);
+                $query_values = array(':famtrackid' => $famtrackid, ':last_latitude' => $latitude, ':last_longitude' => $longitude, ':last_altitude' => $altitude, ':last_ground_speed' => $groundspeed, ':last_seen' => $date, ':ident' => $ident);
 
 		try {
 			$sth = $this->db->prepare($query);
@@ -563,7 +563,7 @@ 
 	* @param String $verticalrate vertival rate of flight
 	* @return String success or false
 	*/
-	public function addTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $comment = '', $type = '',$format_source = '', $source_name = '')
+	public function addTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $comment = '', $type = '', $format_source = '', $source_name = '')
 	{
 		global $globalURL;
 		
@@ -631,21 +631,21 @@ 
 		}
 
     
-		if ($date == "" || strtotime($date) < time()-20*60)
+		if ($date == "" || strtotime($date) < time() - 20*60)
 		{
 			$date = date("Y-m-d H:i:s", time());
 		}
 
-		$famtrackid = filter_var($famtrackid,FILTER_SANITIZE_STRING);
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$altitude = filter_var($altitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT);
-		$groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$format_source = filter_var($format_source,FILTER_SANITIZE_STRING);
-		$comment = filter_var($comment,FILTER_SANITIZE_STRING);
-		$type = filter_var($type,FILTER_SANITIZE_STRING);
+		$famtrackid = filter_var($famtrackid, FILTER_SANITIZE_STRING);
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$altitude = filter_var($altitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT);
+		$groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$format_source = filter_var($format_source, FILTER_SANITIZE_STRING);
+		$comment = filter_var($comment, FILTER_SANITIZE_STRING);
+		$type = filter_var($type, FILTER_SANITIZE_STRING);
 	
                 if ($latitude == '' && $longitude == '') {
             		$latitude = 0;
@@ -653,10 +653,10 @@ 
             	}
                 if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
                 if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
-                $query  = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type) 
+                $query = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type) 
                 VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:speed,:date,:format_source, :source_name,:comment,:type)";
 
-                $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);
+                $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);
 
 		try {
 		        
@@ -682,13 +682,13 @@ 
 	{
 		global $globalDBdriver, $globalTimezone;
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT tracker_output.ident FROM tracker_output 
+			$query = "SELECT tracker_output.ident FROM tracker_output 
 								WHERE tracker_output.ident = :ident 
 								AND tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) 
 								AND tracker_output.date < UTC_TIMESTAMP()";
 			$query_data = array(':ident' => $ident);
 		} else {
-			$query  = "SELECT tracker_output.ident FROM tracker_output 
+			$query = "SELECT tracker_output.ident FROM tracker_output 
 								WHERE tracker_output.ident = :ident 
 								AND tracker_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
 								AND tracker_output.date < now() AT TIME ZONE 'UTC'";
@@ -697,8 +697,8 @@ 
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
-    		$ident_result='';
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+    		$ident_result = '';
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$ident_result = $row['ident'];
 		}
@@ -724,8 +724,8 @@ 
 				return false;
 			} else {
 				$q_array = explode(" ", $q);
-				foreach ($q_array as $q_item){
-					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
+				foreach ($q_array as $q_item) {
+					$q_item = filter_var($q_item, FILTER_SANITIZE_STRING);
 					$additional_query .= " AND (";
 					$additional_query .= "(tracker_output.ident like '%".$q_item."%')";
 					$additional_query .= ")";
@@ -733,11 +733,11 @@ 
 			}
 		}
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT tracker_output.* FROM tracker_output 
+			$query = "SELECT tracker_output.* FROM tracker_output 
 				WHERE tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 SECOND) ".$additional_query." 
 				AND tracker_output.date < UTC_TIMESTAMP()";
 		} else {
-			$query  = "SELECT tracker_output.* FROM tracker_output 
+			$query = "SELECT tracker_output.* FROM tracker_output 
 				WHERE tracker_output.date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '20 SECONDS' ".$additional_query." 
 				AND tracker_output.date::timestamp < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'";
 		}
@@ -751,16 +751,16 @@ 
 	* @return Array the airline country list
 	*
 	*/
-	public function countAllTrackerOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
+	public function countAllTrackerOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
 	{
 		global $globalDBdriver, $globalArchive;
 		//$filter_query = $this->getFilter($filters,true,true);
-		$Connection= new Connection($this->db);
+		$Connection = new Connection($this->db);
 		if (!$Connection->tableExists('countries')) return array();
 		if (!isset($globalArchive) || $globalArchive !== TRUE) {
 			require_once('class.TrackerLive.php');
 			$TrackerLive = new TrackerLive($this->db);
-			$filter_query = $TrackerLive->getFilter($filters,true,true);
+			$filter_query = $TrackerLive->getFilter($filters, true, true);
 			$filter_query .= " over_country IS NOT NULL AND over_country <> ''";
 			if ($olderthanmonths > 0) {
 				if ($globalDBdriver == 'mysql') {
@@ -780,7 +780,7 @@ 
 		} else {
 			require_once('class.TrackerArchive.php');
 			$TrackerArchive = new TrackerArchive($this->db);
-			$filter_query = $TrackerArchive->getFilter($filters,true,true);
+			$filter_query = $TrackerArchive->getFilter($filters, true, true);
 			$filter_query .= " over_country IS NOT NULL AND over_country <> ''";
 			if ($olderthanmonths > 0) {
 				if ($globalDBdriver == 'mysql') {
@@ -808,7 +808,7 @@ 
 		$flight_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['tracker_count'] = $row['nb'];
 			$temp_array['tracker_country'] = $row['name'];
@@ -825,11 +825,11 @@ 
 	* @return Array the callsign list
 	*
 	*/
-	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '')
+	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT tracker_output.ident, COUNT(tracker_output.ident) AS callsign_icao_count 
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT tracker_output.ident, COUNT(tracker_output.ident) AS callsign_icao_count 
                     FROM tracker_output".$filter_query." tracker_output.ident <> ''";
 		 if ($olderthanmonths > 0) {
 			if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
@@ -843,28 +843,28 @@ 
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(tracker_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			} else {
 				$query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			}
 		}
 		if ($month != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND MONTH(tracker_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			} else {
 				$query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 		}
 		if ($day != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND DAY(tracker_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			} else {
 				$query .= " AND EXTRACT(DAY FROM tracker_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
 		$query .= " GROUP BY tracker_output.ident ORDER BY callsign_icao_count DESC";
@@ -876,7 +876,7 @@ 
 		$callsign_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['callsign_icao'] = $row['ident'];
 			$temp_array['airline_name'] = $row['airline_name'];
@@ -928,7 +928,7 @@ 
 		$date_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['date_name'] = $row['date_name'];
 			$temp_array['date_count'] = $row['date_count'];
@@ -954,7 +954,7 @@ 
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
 		} else $offset = '+00:00';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 								FROM tracker_output".$filter_query." tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY)";
@@ -975,7 +975,7 @@ 
 		$date_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['date_name'] = $row['date_name'];
 			$temp_array['date_count'] = $row['date_count'];
@@ -1000,7 +1000,7 @@ 
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
 		} else $offset = '+00:00';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 								FROM tracker_output".$filter_query." tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MONTH)";
@@ -1021,7 +1021,7 @@ 
 		$date_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['date_name'] = $row['date_name'];
 			$temp_array['date_count'] = $row['date_count'];
@@ -1068,7 +1068,7 @@ 
 		$date_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['month_name'] = $row['month_name'];
 			$temp_array['year_name'] = $row['year_name'];
@@ -1097,7 +1097,7 @@ 
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
 		} else $offset = '+00:00';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		if ($globalDBdriver == 'mysql') {
 			$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
 								FROM tracker_output".$filter_query." tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 YEAR)";
@@ -1118,7 +1118,7 @@ 
 		$date_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['year_name'] = $row['year_name'];
 			$temp_array['month_name'] = $row['month_name'];
@@ -1138,7 +1138,7 @@ 
 	* @return Array the hour list
 	*
 	*/
-	public function countAllHours($orderby,$filters = array())
+	public function countAllHours($orderby, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
 		if ($globalTimezone != '') {
@@ -1186,7 +1186,7 @@ 
 		$hour_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['hour_name'] = $row['hour_name'];
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -1208,8 +1208,8 @@ 
 	public function countAllHoursByDate($date, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
 		if ($globalTimezone != '') {
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime($date);
@@ -1217,12 +1217,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
+			$query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 								FROM tracker_output".$filter_query." DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) = :date
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		} else {
-			$query  = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
+			$query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
 								FROM tracker_output".$filter_query." to_char(tracker_output.date AT TIME ZONE INTERVAL :offset, 'YYYY-mm-dd') = :date
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
@@ -1234,7 +1234,7 @@ 
 		$hour_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['hour_name'] = $row['hour_name'];
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -1256,8 +1256,8 @@ 
 	public function countAllHoursByIdent($ident, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		if ($globalTimezone != '') {
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
@@ -1265,12 +1265,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
+			$query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 								FROM tracker_output".$filter_query." tracker_output.ident = :ident 
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		} else {
-			$query  = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
+			$query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
 								FROM tracker_output".$filter_query." tracker_output.ident = :ident 
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
@@ -1278,12 +1278,12 @@ 
       
 		
 		$sth = $this->db->prepare($query);
-		$sth->execute(array(':ident' => $ident,':offset' => $offset));
+		$sth->execute(array(':ident' => $ident, ':offset' => $offset));
       
 		$hour_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['hour_name'] = $row['hour_name'];
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -1302,33 +1302,33 @@ 
 	* @return Integer the number of trackers
 	*
 	*/
-	public function countOverallTracker($filters = array(),$year = '',$month = '')
+	public function countOverallTracker($filters = array(), $year = '', $month = '')
 	{
 		global $globalDBdriver;
 		//$queryi  = "SELECT COUNT(tracker_output.tracker_id) AS flight_count FROM tracker_output";
-		$queryi  = "SELECT COUNT(DISTINCT tracker_output.ident) AS tracker_count FROM tracker_output";
+		$queryi = "SELECT COUNT(DISTINCT tracker_output.ident) AS tracker_count FROM tracker_output";
 		$query_values = array();
 		$query = '';
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(tracker_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			} else {
 				$query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			}
 		}
 		if ($month != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND MONTH(tracker_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			} else {
 				$query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 		}
 		if (empty($query_values)) $queryi .= $this->getFilter($filters);
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
+		else $queryi .= $this->getFilter($filters, true, true).substr($query, 4);
 		
 		$sth = $this->db->prepare($queryi);
 		$sth->execute($query_values);
@@ -1341,32 +1341,32 @@ 
 	* @return Integer the number of flights
 	*
 	*/
-	public function countOverallTrackerTypes($filters = array(),$year = '',$month = '')
+	public function countOverallTrackerTypes($filters = array(), $year = '', $month = '')
 	{
 		global $globalDBdriver;
-		$queryi  = "SELECT COUNT(DISTINCT tracker_output.type) AS tracker_count FROM tracker_output";
+		$queryi = "SELECT COUNT(DISTINCT tracker_output.type) AS tracker_count FROM tracker_output";
 		$query_values = array();
 		$query = '';
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(tracker_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			} else {
 				$query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			}
 		}
 		if ($month != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND MONTH(tracker_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			} else {
 				$query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 		}
 		if (empty($query_values)) $queryi .= $this->getFilter($filters);
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
+		else $queryi .= $this->getFilter($filters, true, true).substr($query, 4);
 		
 		$sth = $this->db->prepare($queryi);
 		$sth->execute($query_values);
@@ -1383,7 +1383,7 @@ 
 	public function countAllHoursFromToday($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		if ($globalTimezone != '') {
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
@@ -1391,12 +1391,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
+			$query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 								FROM tracker_output".$filter_query." DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) = CURDATE()
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		} else {
-			$query  = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
+			$query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
 								FROM tracker_output".$filter_query." to_char(tracker_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = CAST(NOW() AS date)
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
@@ -1408,7 +1408,7 @@ 
 		$hour_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['hour_name'] = $row['hour_name'];
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -1427,9 +1427,9 @@ 
 	*/
 	public function getTrackerIDBasedOnFamTrackID($famtrackid)
 	{
-		$famtrackid = filter_var($famtrackid,FILTER_SANITIZE_STRING);
+		$famtrackid = filter_var($famtrackid, FILTER_SANITIZE_STRING);
 
-		$query  = "SELECT tracker_output.tracker_id
+		$query = "SELECT tracker_output.tracker_id
 				FROM tracker_output 
 				WHERE tracker_output.famtrackid = '".$famtrackid."'";
         
@@ -1437,7 +1437,7 @@ 
 		$sth = $this->db->prepare($query);
 		$sth->execute();
 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			return $row['tracker_id'];
 		}
@@ -1462,23 +1462,23 @@ 
 		}
 		
 		$current_date = date("Y-m-d H:i:s");
-		$date = date("Y-m-d H:i:s",strtotime($dateString." UTC"));
+		$date = date("Y-m-d H:i:s", strtotime($dateString." UTC"));
 		
 		$diff = abs(strtotime($current_date) - strtotime($date));
 
-		$time_array['years'] = floor($diff / (365*60*60*24)); 
+		$time_array['years'] = floor($diff/(365*60*60*24)); 
 		$years = $time_array['years'];
 		
-		$time_array['months'] = floor(($diff - $years * 365*60*60*24) / (30*60*60*24));
+		$time_array['months'] = floor(($diff - $years*365*60*60*24)/(30*60*60*24));
 		$months = $time_array['months'];
 		
-		$time_array['days'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24)/ (60*60*24));
+		$time_array['days'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24)/(60*60*24));
 		$days = $time_array['days'];
-		$time_array['hours'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/ (60*60));
+		$time_array['hours'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/(60*60));
 		$hours = $time_array['hours'];
-		$time_array['minutes'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/ 60);
+		$time_array['minutes'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/60);
 		$minutes = $time_array['minutes'];
-		$time_array['seconds'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60));  
+		$time_array['seconds'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60));  
 		
 		return $time_array;
 	}
@@ -1501,63 +1501,63 @@ 
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "N";
 			$temp_array['direction_fullname'] = "North";
-		} elseif ($direction >= 22.5 && $direction < 45){
+		} elseif ($direction >= 22.5 && $direction < 45) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "NNE";
 			$temp_array['direction_fullname'] = "North-Northeast";
-		} elseif ($direction >= 45 && $direction < 67.5){
+		} elseif ($direction >= 45 && $direction < 67.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "NE";
 			$temp_array['direction_fullname'] = "Northeast";
-		} elseif ($direction >= 67.5 && $direction < 90){
+		} elseif ($direction >= 67.5 && $direction < 90) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "ENE";
 			$temp_array['direction_fullname'] = "East-Northeast";
-		} elseif ($direction >= 90 && $direction < 112.5){
+		} elseif ($direction >= 90 && $direction < 112.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "E";
 			$temp_array['direction_fullname'] = "East";
-		} elseif ($direction >= 112.5 && $direction < 135){
+		} elseif ($direction >= 112.5 && $direction < 135) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "ESE";
 			$temp_array['direction_fullname'] = "East-Southeast";
-		} elseif ($direction >= 135 && $direction < 157.5){
+		} elseif ($direction >= 135 && $direction < 157.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "SE";
 			$temp_array['direction_fullname'] = "Southeast";
-		} elseif ($direction >= 157.5 && $direction < 180){
+		} elseif ($direction >= 157.5 && $direction < 180) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "SSE";
 			$temp_array['direction_fullname'] = "South-Southeast";
-		} elseif ($direction >= 180 && $direction < 202.5){
+		} elseif ($direction >= 180 && $direction < 202.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "S";
 			$temp_array['direction_fullname'] = "South";
-		} elseif ($direction >= 202.5 && $direction < 225){
+		} elseif ($direction >= 202.5 && $direction < 225) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "SSW";
 			$temp_array['direction_fullname'] = "South-Southwest";
-		} elseif ($direction >= 225 && $direction < 247.5){
+		} elseif ($direction >= 225 && $direction < 247.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "SW";
 			$temp_array['direction_fullname'] = "Southwest";
-		} elseif ($direction >= 247.5 && $direction < 270){
+		} elseif ($direction >= 247.5 && $direction < 270) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "WSW";
 			$temp_array['direction_fullname'] = "West-Southwest";
-		} elseif ($direction >= 270 && $direction < 292.5){
+		} elseif ($direction >= 270 && $direction < 292.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "W";
 			$temp_array['direction_fullname'] = "West";
-		} elseif ($direction >= 292.5 && $direction < 315){
+		} elseif ($direction >= 292.5 && $direction < 315) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "WNW";
 			$temp_array['direction_fullname'] = "West-Northwest";
-		} elseif ($direction >= 315 && $direction < 337.5){
+		} elseif ($direction >= 315 && $direction < 337.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "NW";
 			$temp_array['direction_fullname'] = "Northwest";
-		} elseif ($direction >= 337.5 && $direction < 360){
+		} elseif ($direction >= 337.5 && $direction < 360) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "NNW";
 			$temp_array['direction_fullname'] = "North-Northwest";
@@ -1574,11 +1574,11 @@ 
 	* @param Float $longitude longitute of the flight
 	* @return String the countrie
 	*/
-	public function getCountryFromLatitudeLongitude($latitude,$longitude)
+	public function getCountryFromLatitudeLongitude($latitude, $longitude)
 	{
 		global $globalDBdriver, $globalDebug;
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
 	
 		$Connection = new Connection($this->db);
 		if (!$Connection->tableExists('countries')) return '';
@@ -1618,7 +1618,7 @@ 
 	public function getCountryFromISO2($iso2)
 	{
 		global $globalDBdriver, $globalDebug;
-		$iso2 = filter_var($iso2,FILTER_SANITIZE_STRING);
+		$iso2 = filter_var($iso2, FILTER_SANITIZE_STRING);
 	
 		$Connection = new Connection($this->db);
 		if (!$Connection->tableExists('countries')) return '';
@@ -1647,11 +1647,11 @@ 
 	* @return Array the vessel type list
 	*
 	*/
-	public function countAllTrackerTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '')
+	public function countAllTrackerTypes($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT tracker_output.type AS tracker_type, COUNT(tracker_output.type) AS tracker_type_count 
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT tracker_output.type AS tracker_type, COUNT(tracker_output.type) AS tracker_type_count 
 		    FROM tracker_output ".$filter_query." tracker_output.type  <> ''";
 		if ($olderthanmonths > 0) {
 			if ($globalDBdriver == 'mysql') {
@@ -1671,28 +1671,28 @@ 
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(tracker_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			} else {
 				$query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			}
 		}
 		if ($month != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND MONTH(tracker_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			} else {
 				$query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 		}
 		if ($day != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND DAY(tracker_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			} else {
 				$query .= " AND EXTRACT(DAY FROM tracker_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
 		$query .= " GROUP BY tracker_output.type ORDER BY tracker_type_count DESC";
@@ -1701,7 +1701,7 @@ 
 		$sth->execute($query_values);
 		$tracker_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['tracker_type'] = $row['tracker_type'];
 			$temp_array['tracker_type_count'] = $row['tracker_type_count'];
@@ -1716,13 +1716,13 @@ 
 	* @return Array the tracker information
 	*
 	*/
-	public function searchTrackerData($q = '', $callsign = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '',$filters = array())
+	public function searchTrackerData($q = '', $callsign = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '', $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
 		date_default_timezone_set('UTC');
 		$query_values = array();
 		$additional_query = '';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		if ($q != "")
 		{
 			if (!is_string($q))
@@ -1730,8 +1730,8 @@ 
 				return false;
 			} else {
 				$q_array = explode(" ", $q);
-				foreach ($q_array as $q_item){
-					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
+				foreach ($q_array as $q_item) {
+					$q_item = filter_var($q_item, FILTER_SANITIZE_STRING);
 					$additional_query .= " AND (";
 					if (is_int($q_item)) $additional_query .= "(tracker_output.tracker_id = '".$q_item."') OR ";
 					$additional_query .= "(tracker_output.ident like '%".$q_item."%') OR ";
@@ -1741,20 +1741,20 @@ 
 		}
 		if ($callsign != "")
 		{
-			$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
+			$callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
 			if (!is_string($callsign))
 			{
 				return false;
 			} else {
 				$additional_query .= " AND tracker_output.ident = :callsign";
-				$query_values = array_merge($query_values,array(':callsign' => $callsign));
+				$query_values = array_merge($query_values, array(':callsign' => $callsign));
 			}
 		}
 		if ($date_posted != "")
 		{
 			$date_array = explode(",", $date_posted);
-			$date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
-			$date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
+			$date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING);
+			$date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING);
 			if ($globalTimezone != '') {
 				date_default_timezone_set($globalTimezone);
 				$datetime = new DateTime();
@@ -1781,8 +1781,8 @@ 
 		if ($limit != "")
 		{
 			$limit_array = explode(",", $limit);
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
@@ -1800,22 +1800,22 @@ 
 			}
 		}
 		if ($origLat != "" && $origLon != "" && $dist != "") {
-			$dist = number_format($dist*0.621371,2,'.',''); // convert km to mile
+			$dist = number_format($dist*0.621371, 2, '.', ''); // convert km to mile
 			if ($globalDBdriver == 'mysql') {
-				$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 
+				$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 
 				    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)) 
 				    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;
 			} else {
-				$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 
+				$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 
 				    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)) 
 				    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;
 			}
 		} else {
-			$query  = "SELECT tracker_output.* FROM tracker_output".$filter_query." tracker_output.ident <> '' 
+			$query = "SELECT tracker_output.* FROM tracker_output".$filter_query." tracker_output.ident <> '' 
 			    ".$additional_query."
 			    ".$orderby_query;
 		}
-		$tracker_array = $this->getDataFromDB($query, $query_values,$limit_query);
+		$tracker_array = $this->getDataFromDB($query, $query_values, $limit_query);
 		return $tracker_array;
 	}
 
@@ -1840,7 +1840,7 @@ 
 		curl_close($ch);
 		$bitly_data = json_decode($bitly_data);
 		$bitly_url = '';
-		if ($bitly_data->status_txt = "OK"){
+		if ($bitly_data->status_txt = "OK") {
 			$bitly_url = $bitly_data->data->url;
 		}
 		return $bitly_url;
@@ -1848,7 +1848,7 @@ 
 
 	public function getOrderBy()
 	{
-		$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"));
+		$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"));
 		
 		return $orderby;
 		

Braces +172 added lines, -61 removed lines

@@ -10,7 +10,9 @@ 
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db();
-		if ($this->db === null) die('Error: No DB connection. (Tracker)');
+		if ($this->db === null) {
+			die('Error: No DB connection. (Tracker)');
+		}
 	}
 
 	/**
@@ -32,7 +34,9 @@ 
 		if (isset($filter[0]['source'])) {
 			$filters = array_merge($filters,$filter);
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) {
+			$filter = array_merge($filter,$globalFilter);
+		}
 		$filter_query_join = '';
 		$filter_query_where = '';
 		foreach($filters as $flt) {
@@ -74,8 +78,11 @@ 
 				$filter_query_where .= " AND EXTRACT(DAY FROM tracker_output.date) = '".$filter['day']."'";
 			}
 		}
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
+		if ($filter_query_where == '' && $where) {
+			$filter_query_where = ' WHERE';
+		} elseif ($filter_query_where != '' && $and) {
+			$filter_query_where .= ' AND';
+		}
 		if ($filter_query_where != '') {
 			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
 		}
@@ -129,26 +136,43 @@ 
 				$temp_array['tracker_id'] = $row['tracker_archive_id'];
 			} elseif (isset($row['tracker_archive_output_id'])) {
 				$temp_array['tracker_id'] = $row['tracker_archive_output_id'];
-			*/} 
-			elseif (isset($row['trackerid'])) {
+			*/} elseif (isset($row['trackerid'])) {
 				$temp_array['trackerid'] = $row['trackerid'];
 			} else {
 				$temp_array['trackerid'] = '';
 			}
-			if (isset($row['famtrackid'])) $temp_array['famtrackid'] = $row['famtrackid'];
-			if (isset($row['type'])) $temp_array['type'] = $row['type'];
-			if (isset($row['comment'])) $temp_array['comment'] = $row['comment'];
+			if (isset($row['famtrackid'])) {
+				$temp_array['famtrackid'] = $row['famtrackid'];
+			}
+			if (isset($row['type'])) {
+				$temp_array['type'] = $row['type'];
+			}
+			if (isset($row['comment'])) {
+				$temp_array['comment'] = $row['comment'];
+			}
 			$temp_array['ident'] = $row['ident'];
-			if (isset($row['latitude'])) $temp_array['latitude'] = $row['latitude'];
-			if (isset($row['longitude'])) $temp_array['longitude'] = $row['longitude'];
-			if (isset($row['format_source'])) $temp_array['format_source'] = $row['format_source'];
-			if (isset($row['altitude'])) $temp_array['altitude'] = $row['altitude'];
+			if (isset($row['latitude'])) {
+				$temp_array['latitude'] = $row['latitude'];
+			}
+			if (isset($row['longitude'])) {
+				$temp_array['longitude'] = $row['longitude'];
+			}
+			if (isset($row['format_source'])) {
+				$temp_array['format_source'] = $row['format_source'];
+			}
+			if (isset($row['altitude'])) {
+				$temp_array['altitude'] = $row['altitude'];
+			}
 			if (isset($row['heading'])) {
 				$temp_array['heading'] = $row['heading'];
 				$heading_direction = $this->parseDirection($row['heading']);
-				if (isset($heading_direction[0]['direction_fullname'])) $temp_array['heading_name'] = $heading_direction[0]['direction_fullname'];
+				if (isset($heading_direction[0]['direction_fullname'])) {
+					$temp_array['heading_name'] = $heading_direction[0]['direction_fullname'];
+				}
+			}
+			if (isset($row['ground_speed'])) {
+				$temp_array['ground_speed'] = $row['ground_speed'];
 			}
-			if (isset($row['ground_speed'])) $temp_array['ground_speed'] = $row['ground_speed'];
 			
 			if (isset($row['date'])) {
 				$dateArray = $this->parseDateString($row['date']);
@@ -191,13 +215,21 @@ 
 			}
 			
 			$fromsource = NULL;
-			if (isset($row['source_name']) && $row['source_name'] != '') $temp_array['source_name'] = $row['source_name'];
-			if (isset($row['over_country']) && $row['over_country'] != '') $temp_array['over_country'] = $row['over_country'];
-			if (isset($row['distance']) && $row['distance'] != '') $temp_array['distance'] = $row['distance'];
+			if (isset($row['source_name']) && $row['source_name'] != '') {
+				$temp_array['source_name'] = $row['source_name'];
+			}
+			if (isset($row['over_country']) && $row['over_country'] != '') {
+				$temp_array['over_country'] = $row['over_country'];
+			}
+			if (isset($row['distance']) && $row['distance'] != '') {
+				$temp_array['distance'] = $row['distance'];
+			}
 			$temp_array['query_number_rows'] = $num_rows;
 			$tracker_array[] = $temp_array;
 		}
-		if ($num_rows == 0) return array();
+		if ($num_rows == 0) {
+			return array();
+		}
 		$tracker_array[0]['query_number_rows'] = $num_rows;
 		return $tracker_array;
 	}	
@@ -228,8 +260,12 @@ 
 			{
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-			} else $limit_query = "";
-		} else $limit_query = "";
+			} else {
+				$limit_query = "";
+			}
+		} else {
+			$limit_query = "";
+		}
 		
 		if ($sort != "")
 		{
@@ -257,7 +293,9 @@ 
 		global $global_tracker_query;
 		
 		date_default_timezone_set('UTC');
-		if ($id == '') return array();
+		if ($id == '') {
+			return array();
+		}
 		$additional_query = "tracker_output.famtrackid = :id";
 		$query_values = array(':id' => $id);
 		$query  = $global_tracker_query." WHERE ".$additional_query." ";
@@ -400,8 +438,11 @@ 
 		$query .= " ORDER BY tracker_output.source_name ASC";
 
 		$sth = $this->db->prepare($query);
-		if (!empty($query_values)) $sth->execute($query_values);
-		else $sth->execute();
+		if (!empty($query_values)) {
+			$sth->execute($query_values);
+		} else {
+			$sth->execute();
+		}
 
 		$source_array = array();
 		$temp_array = array();
@@ -456,7 +497,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DISTINCT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) as date
@@ -612,7 +655,9 @@ 
 			{
 				return false;
 			}
-		} else $altitude = 0;
+		} else {
+			$altitude = 0;
+		}
 		
 		if ($heading != "")
 		{
@@ -651,8 +696,12 @@ 
             		$latitude = 0;
             		$longitude = 0;
             	}
-                if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
-                if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
+                if ($heading == '' || $Common->isInteger($heading) === false) {
+                	$heading = 0;
+                }
+                if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) {
+                	$groundspeed = 0;
+                }
                 $query  = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type) 
                 VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:speed,:date,:format_source, :source_name,:comment,:type)";
 
@@ -756,7 +805,9 @@ 
 		global $globalDBdriver, $globalArchive;
 		//$filter_query = $this->getFilter($filters,true,true);
 		$Connection= new Connection($this->db);
-		if (!$Connection->tableExists('countries')) return array();
+		if (!$Connection->tableExists('countries')) {
+			return array();
+		}
 		if (!isset($globalArchive) || $globalArchive !== TRUE) {
 			require_once('class.TrackerLive.php');
 			$TrackerLive = new TrackerLive($this->db);
@@ -799,7 +850,9 @@ 
 			$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 ";
 		}
 		$query .= "GROUP BY c.name,c.iso3,c.iso2 ORDER BY nb DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
       
 		
 		$sth = $this->db->prepare($query);
@@ -832,12 +885,18 @@ 
 		$query  = "SELECT DISTINCT tracker_output.ident, COUNT(tracker_output.ident) AS callsign_icao_count 
                     FROM tracker_output".$filter_query." tracker_output.ident <> ''";
 		 if ($olderthanmonths > 0) {
-			if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
-			else $query .= " AND tracker_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
+			if ($globalDBdriver == 'mysql') {
+				$query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
+			} else {
+				$query .= " AND tracker_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
+			}
 		}
 		if ($sincedate != '') {
-			if ($globalDBdriver == 'mysql') $query .= " AND tracker_output.date > '".$sincedate."'";
-			else $query .= " AND tracker_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
+			if ($globalDBdriver == 'mysql') {
+				$query .= " AND tracker_output.date > '".$sincedate."'";
+			} else {
+				$query .= " AND tracker_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
+			}
 		}
 		$query_values = array();
 		if ($year != '') {
@@ -868,7 +927,9 @@ 
 			}
 		}
 		$query .= " GROUP BY tracker_output.ident ORDER BY callsign_icao_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
       		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
@@ -903,7 +964,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
@@ -953,7 +1016,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		$filter_query = $this->getFilter($filters,true,true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
@@ -999,7 +1064,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		$filter_query = $this->getFilter($filters,true,true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
@@ -1047,7 +1114,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$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
@@ -1096,7 +1165,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		$filter_query = $this->getFilter($filters,true,true);
 		if ($globalDBdriver == 'mysql') {
 			$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
@@ -1145,7 +1216,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		$orderby_sql = '';
 		if ($orderby == "hour")
@@ -1214,7 +1287,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime($date);
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -1262,7 +1337,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -1327,8 +1404,11 @@ 
 				$query_values = array_merge($query_values,array(':month' => $month));
 			}
 		}
-		if (empty($query_values)) $queryi .= $this->getFilter($filters);
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
+		if (empty($query_values)) {
+			$queryi .= $this->getFilter($filters);
+		} else {
+			$queryi .= $this->getFilter($filters,true,true).substr($query,4);
+		}
 		
 		$sth = $this->db->prepare($queryi);
 		$sth->execute($query_values);
@@ -1365,8 +1445,11 @@ 
 				$query_values = array_merge($query_values,array(':month' => $month));
 			}
 		}
-		if (empty($query_values)) $queryi .= $this->getFilter($filters);
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
+		if (empty($query_values)) {
+			$queryi .= $this->getFilter($filters);
+		} else {
+			$queryi .= $this->getFilter($filters,true,true).substr($query,4);
+		}
 		
 		$sth = $this->db->prepare($queryi);
 		$sth->execute($query_values);
@@ -1388,7 +1471,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -1492,7 +1577,9 @@ 
 	*/
 	public function parseDirection($direction = 0)
 	{
-		if ($direction == '') $direction = 0;
+		if ($direction == '') {
+			$direction = 0;
+		}
 		$direction_array = array();
 		$temp_array = array();
 
@@ -1581,7 +1668,9 @@ 
 		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 	
 		$Connection = new Connection($this->db);
-		if (!$Connection->tableExists('countries')) return '';
+		if (!$Connection->tableExists('countries')) {
+			return '';
+		}
 	
 		try {
 			/*
@@ -1601,9 +1690,13 @@ 
 			$sth->closeCursor();
 			if (count($row) > 0) {
 				return $row;
-			} else return '';
+			} else {
+				return '';
+			}
 		} catch (PDOException $e) {
-			if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n";
+			if (isset($globalDebug) && $globalDebug) {
+				echo 'Error : '.$e->getMessage()."\n";
+			}
 			return '';
 		}
 	
@@ -1621,7 +1714,9 @@ 
 		$iso2 = filter_var($iso2,FILTER_SANITIZE_STRING);
 	
 		$Connection = new Connection($this->db);
-		if (!$Connection->tableExists('countries')) return '';
+		if (!$Connection->tableExists('countries')) {
+			return '';
+		}
 	
 		try {
 			$query = "SELECT name,iso2,iso3 FROM countries WHERE iso2 = :iso2 LIMIT 1";
@@ -1633,9 +1728,13 @@ 
 			$sth->closeCursor();
 			if (count($row) > 0) {
 				return $row;
-			} else return '';
+			} else {
+				return '';
+			}
 		} catch (PDOException $e) {
-			if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n";
+			if (isset($globalDebug) && $globalDebug) {
+				echo 'Error : '.$e->getMessage()."\n";
+			}
 			return '';
 		}
 	
@@ -1696,7 +1795,9 @@ 
 			}
 		}
 		$query .= " GROUP BY tracker_output.type ORDER BY tracker_type_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
 		$tracker_array = array();
@@ -1733,7 +1834,9 @@ 
 				foreach ($q_array as $q_item){
 					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
 					$additional_query .= " AND (";
-					if (is_int($q_item)) $additional_query .= "(tracker_output.tracker_id = '".$q_item."') OR ";
+					if (is_int($q_item)) {
+						$additional_query .= "(tracker_output.tracker_id = '".$q_item."') OR ";
+					}
 					$additional_query .= "(tracker_output.ident like '%".$q_item."%') OR ";
 					$additional_query .= ")";
 				}
@@ -1759,7 +1862,9 @@ 
 				date_default_timezone_set($globalTimezone);
 				$datetime = new DateTime();
 				$offset = $datetime->format('P');
-			} else $offset = '+00:00';
+			} else {
+				$offset = '+00:00';
+			}
 			if ($date_array[1] != "")
 			{
 				$date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0]));
@@ -1786,8 +1891,12 @@ 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-			} else $limit_query = "";
-		} else $limit_query = "";
+			} else {
+				$limit_query = "";
+			}
+		} else {
+			$limit_query = "";
+		}
 		if ($sort != "")
 		{
 			$search_orderby_array = $this->getOrderBy();
@@ -1830,7 +1939,9 @@ 
 	{
 		global $globalBitlyAccessToken;
 		
-		if ($globalBitlyAccessToken == '') return $url;
+		if ($globalBitlyAccessToken == '') {
+			return $url;
+		}
 		$google_url = 'https://api-ssl.bitly.com/v3/shorten?access_token='.$globalBitlyAccessToken.'&longUrl='.$url;
 		$ch = curl_init();
 		curl_setopt($ch, CURLOPT_HEADER, 0);

require/class.Marine.php

Indentation +231 added lines, -231 removed lines

@@ -12,10 +12,10 @@ 
 	}
 
 	/**
-	* Get SQL query part for filter used
-	* @param Array $filter the filter
-	* @return Array the SQL part
-	*/
+	 * Get SQL query part for filter used
+	 * @param Array $filter the filter
+	 * @return Array the SQL part
+	 */
 	
 	public function getFilter($filter = array(),$where = false,$and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
@@ -88,14 +88,14 @@ 
 	}
 
 	/**
-	* Executes the SQL statements to get the spotter information
-	*
-	* @param String $query the SQL query
-	* @param Array $params parameter of the query
-	* @param String $limitQuery the limit query
-	* @return Array the spotter information
-	*
-	*/
+	 * Executes the SQL statements to get the spotter information
+	 *
+	 * @param String $query the SQL query
+	 * @param Array $params parameter of the query
+	 * @param String $limitQuery the limit query
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false)
 	{
 		date_default_timezone_set('UTC');
@@ -230,11 +230,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the latest data entry
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the latest data entry
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLatestMarineData($limit = '', $sort = '', $filter = array())
 	{
 		global $global_marine_query;
@@ -283,11 +283,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on the callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the callsign
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMarineDataByIdent($ident = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_marine_query;
@@ -339,11 +339,11 @@ 
 	}
 
 	/**
-	* Gets all the marine information based on the type
-	*
-	* @return Array the marine information
-	*
-	*/
+	 * Gets all the marine information based on the type
+	 *
+	 * @return Array the marine information
+	 *
+	 */
 	public function getMarineDataByType($type = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_marine_query;
@@ -449,11 +449,11 @@ 
 	}
 
 	/**
-	* Gets all the marine information based on the captain
-	*
-	* @return Array the marine information
-	*
-	*/
+	 * Gets all the marine information based on the captain
+	 *
+	 * @return Array the marine information
+	 *
+	 */
 	public function getMarineDataByCaptain($captain = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_marine_query;
@@ -491,12 +491,12 @@ 
 	}
 
 	/**
-	* Gets all source name
-	*
-	* @param String type format of source
-	* @return Array list of source name
-	*
-	*/
+	 * Gets all source name
+	 *
+	 * @param String type format of source
+	 * @return Array list of source name
+	 *
+	 */
 	public function getAllSourceName($type = '',$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -526,11 +526,11 @@ 
 
 
 	/**
-	* Gets a list of all idents/callsigns
-	*
-	* @return Array list of ident/callsign names
-	*
-	*/
+	 * Gets a list of all idents/callsigns
+	 *
+	 * @return Array list of ident/callsign names
+	 *
+	 */
 	public function getAllIdents($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -554,11 +554,11 @@ 
 	}
 
 	/**
-	* Gets all info from a mmsi
-	*
-	* @return Array ident
-	*
-	*/
+	 * Gets all info from a mmsi
+	 *
+	 * @return Array ident
+	 *
+	 */
 	public function getIdentity($mmsi)
 	{
 		$mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT);
@@ -571,9 +571,9 @@ 
 	}
 
 	/**
-	* Add identity
-	*
-	*/
+	 * Add identity
+	 *
+	 */
 	public function addIdentity($mmsi,$imo,$ident,$callsign,$type)
 	{
 		$mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT);
@@ -639,13 +639,13 @@ 
 	}
 
 	/**
-	* Update ident tracker data
-	*
-	* @param String $fammarine_id the ID
-	* @param String $ident the marine ident
-	* @return String success or false
-	*
-	*/
+	 * Update ident tracker data
+	 *
+	 * @param String $fammarine_id the ID
+	 * @param String $ident the marine ident
+	 * @return String success or false
+	 *
+	 */
 	public function updateIdentMarineData($fammarine_id = '', $ident = '',$fromsource = NULL)
 	{
 		$query = 'UPDATE marine_output SET ident = :ident WHERE fammarine_id = :fammarine_id';
@@ -660,13 +660,13 @@ 
 	}
 
 	/**
-	* Update arrival marine data
-	*
-	* @param String $fammarine_id the ID
-	* @param String $arrival_code the marine ident
-	* @return String success or false
-	*
-	*/
+	 * Update arrival marine data
+	 *
+	 * @param String $fammarine_id the ID
+	 * @param String $arrival_code the marine ident
+	 * @return String success or false
+	 *
+	 */
 	public function updateArrivalPortNameMarineData($fammarine_id = '', $arrival_code = '',$fromsource = NULL)
 	{
 		$query = 'UPDATE marine_output SET arrival_port_name = :arrival_code WHERE fammarine_id = :fammarine_id';
@@ -681,19 +681,19 @@ 
 	}
 
 	/**
-	* Update Status data
-	*
-	* @param String $fammarine_id the ID
-	* @param String $status_id the marine status id
-	* @param String $status the marine status
-	* @return String success or false
-	*
-	*/
+	 * Update Status data
+	 *
+	 * @param String $fammarine_id the ID
+	 * @param String $status_id the marine status id
+	 * @param String $status the marine status
+	 * @return String success or false
+	 *
+	 */
 	public function updateStatusMarineData($fammarine_id = '', $status_id = '',$status = '')
 	{
 
 		$query = 'UPDATE marine_output SET status = :status, status_id = :status_id WHERE fammarine_id = :fammarine_id';
-                $query_values = array(':fammarine_id' => $fammarine_id,':status' => $status,':status_id' => $status_id);
+				$query_values = array(':fammarine_id' => $fammarine_id,':status' => $status,':status_id' => $status_id);
 
 		try {
 			$sth = $this->db->prepare($query);
@@ -706,17 +706,17 @@ 
 
 	}
 	/**
-	* Update latest marine data
-	*
-	* @param String $fammarine_id the ID
-	* @param String $ident the marine ident
-	* @return String success or false
-	*
-	*/	
+	 * Update latest marine data
+	 *
+	 * @param String $fammarine_id the ID
+	 * @param String $ident the marine ident
+	 * @return String success or false
+	 *
+	 */	
 	public function updateLatestMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $groundspeed = NULL, $date = '')
 	{
 		$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';
-                $query_values = array(':fammarine_id' => $fammarine_id,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident);
+				$query_values = array(':fammarine_id' => $fammarine_id,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident);
 
 		try {
 			$sth = $this->db->prepare($query);
@@ -730,30 +730,30 @@ 
 	}
 
 	/**
-	* Adds a new spotter data
-	*
-	* @param String $fammarine_id the ID
-	* @param String $ident the marine ident
-	* @param String $departure_airport_icao the departure airport
-	* @param String $arrival_airport_icao the arrival airport
-	* @param String $latitude latitude of flight
-	* @param String $longitude latitude of flight
-	* @param String $waypoints waypoints of flight
-	* @param String $heading heading of flight
-	* @param String $groundspeed speed of flight
-	* @param String $date date of flight
-	* @param String $departure_airport_time departure time of flight
-	* @param String $arrival_airport_time arrival time of flight
-	* @param String $squawk squawk code of flight
-	* @param String $route_stop route stop of flight
-	* @param String $highlight highlight or not
-	* @param String $ModeS ModesS code of flight
-	* @param String $registration registration code of flight
-	* @param String $pilot_id pilot id of flight (for virtual airlines)
-	* @param String $pilot_name pilot name of flight (for virtual airlines)
-	* @param String $verticalrate vertival rate of flight
-	* @return String success or false
-	*/
+	 * Adds a new spotter data
+	 *
+	 * @param String $fammarine_id the ID
+	 * @param String $ident the marine ident
+	 * @param String $departure_airport_icao the departure airport
+	 * @param String $arrival_airport_icao the arrival airport
+	 * @param String $latitude latitude of flight
+	 * @param String $longitude latitude of flight
+	 * @param String $waypoints waypoints of flight
+	 * @param String $heading heading of flight
+	 * @param String $groundspeed speed of flight
+	 * @param String $date date of flight
+	 * @param String $departure_airport_time departure time of flight
+	 * @param String $arrival_airport_time arrival time of flight
+	 * @param String $squawk squawk code of flight
+	 * @param String $route_stop route stop of flight
+	 * @param String $highlight highlight or not
+	 * @param String $ModeS ModesS code of flight
+	 * @param String $registration registration code of flight
+	 * @param String $pilot_id pilot id of flight (for virtual airlines)
+	 * @param String $pilot_name pilot name of flight (for virtual airlines)
+	 * @param String $verticalrate vertival rate of flight
+	 * @return String success or false
+	 */
 	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 = '')
 	{
 		global $globalURL, $globalMarineImageFetch;
@@ -881,11 +881,11 @@ 
 	
   
 	/**
-	* Gets the aircraft ident within the last hour
-	*
-	* @return String the ident
-	*
-	*/
+	 * Gets the aircraft ident within the last hour
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function getIdentFromLastHour($ident)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -901,11 +901,11 @@ 
 								AND marine_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
 								AND marine_output.date < now() AT TIME ZONE 'UTC'";
 			$query_data = array(':ident' => $ident);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
-    		$ident_result='';
+			$ident_result='';
 		while($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$ident_result = $row['ident'];
@@ -916,11 +916,11 @@ 
 	
 	
 	/**
-	* Gets the aircraft data from the last 20 seconds
-	*
-	* @return Array the spotter data
-	*
-	*/
+	 * Gets the aircraft data from the last 20 seconds
+	 *
+	 * @return Array the spotter data
+	 *
+	 */
 	public function getRealTimeData($q = '')
 	{
 		global $globalDBdriver;
@@ -958,11 +958,11 @@ 
 	
 
 	/**
-	* Gets all number of flight over countries
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all number of flight over countries
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 
 	public function countAllMarineOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
 	{
@@ -1035,11 +1035,11 @@ 
 	
 	
 	/**
-	* Gets all callsigns that have flown over
-	*
-	* @return Array the callsign list
-	*
-	*/
+	 * Gets all callsigns that have flown over
+	 *
+	 * @return Array the callsign list
+	 *
+	 */
 	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
@@ -1106,11 +1106,11 @@ 
 
 
 	/**
-	* Counts all dates
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllDates($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1156,11 +1156,11 @@ 
 	
 	
 	/**
-	* Counts all dates during the last 7 days
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates during the last 7 days
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllDatesLast7Days($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1182,7 +1182,7 @@ 
 			$query .= " GROUP BY date_name 
 								ORDER BY date_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -1202,11 +1202,11 @@ 
 	}
 
 	/**
-	* Counts all dates during the last month
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates during the last month
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllDatesLastMonth($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1228,7 +1228,7 @@ 
 			$query .= " GROUP BY date_name 
 								ORDER BY date_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -1250,11 +1250,11 @@ 
 
 
 	/**
-	* Counts all month
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonths($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1299,11 +1299,11 @@ 
 	
 
 	/**
-	* Counts all dates during the last year
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates during the last year
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllMonthsLastYear($filters)
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1325,7 +1325,7 @@ 
 			$query .= " GROUP BY year_name, month_name
 								ORDER BY year_name, month_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -1348,11 +1348,11 @@ 
 	
 	
 	/**
-	* Counts all hours
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHours($orderby,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1415,11 +1415,11 @@ 
 	
 	
 	/**
-	* Counts all hours by date
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by date
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByDate($date, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1463,11 +1463,11 @@ 
 	
 	
 	/**
-	* Counts all hours by a ident/callsign
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by a ident/callsign
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByIdent($ident, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1512,11 +1512,11 @@ 
 	
 	
 	/**
-	* Counts all vessels
-	*
-	* @return Integer the number of vessels
-	*
-	*/
+	 * Counts all vessels
+	 *
+	 * @return Integer the number of vessels
+	 *
+	 */
 	public function countOverallMarine($filters = array(),$year = '',$month = '')
 	{
 		global $globalDBdriver;
@@ -1551,11 +1551,11 @@ 
 	}
 	
 	/**
-	* Counts all vessel type
-	*
-	* @return Integer the number of vessels
-	*
-	*/
+	 * Counts all vessel type
+	 *
+	 * @return Integer the number of vessels
+	 *
+	 */
 	public function countOverallMarineTypes($filters = array(),$year = '',$month = '')
 	{
 		global $globalDBdriver;
@@ -1590,11 +1590,11 @@ 
 	
   
 	/**
-	* Counts all hours of today
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours of today
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursFromToday($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1634,12 +1634,12 @@ 
 	}
     
     
-     /**
-	* Gets the Barrie Spotter ID based on the FlightAware ID
-	*
-	* @return Integer the Barrie Spotter ID
+	 /**
+	  * Gets the Barrie Spotter ID based on the FlightAware ID
+	  *
+	  * @return Integer the Barrie Spotter ID
 q	*
-	*/
+	  */
 	public function getMarineIDBasedOnFamMarineID($fammarine_id)
 	{
 		$fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING);
@@ -1660,13 +1660,13 @@ 
   
  
 	/**
-	* Parses a date string
-	*
-	* @param String $dateString the date string
-	* @param String $timezone the timezone of a user
-	* @return Array the time information
-	*
-	*/
+	 * Parses a date string
+	 *
+	 * @param String $dateString the date string
+	 * @param String $timezone the timezone of a user
+	 * @return Array the time information
+	 *
+	 */
 	public function parseDateString($dateString, $timezone = '')
 	{
 		$time_array = array();
@@ -1699,12 +1699,12 @@ 
 	}
 	
 	/**
-	* Parses the direction degrees to working
-	*
-	* @param Float $direction the direction in degrees
-	* @return Array the direction information
-	*
-	*/
+	 * Parses the direction degrees to working
+	 *
+	 * @param Float $direction the direction in degrees
+	 * @return Array the direction information
+	 *
+	 */
 	public function parseDirection($direction = 0)
 	{
 		if ($direction == '') $direction = 0;
@@ -1783,12 +1783,12 @@ 
 	
 	
 	/**
-	* Gets Country from latitude/longitude
-	*
-	* @param Float $latitude latitute of the flight
-	* @param Float $longitude longitute of the flight
-	* @return String the countrie
-	*/
+	 * Gets Country from latitude/longitude
+	 *
+	 * @param Float $latitude latitute of the flight
+	 * @param Float $longitude longitute of the flight
+	 * @return String the countrie
+	 */
 	public function getCountryFromLatitudeLongitude($latitude,$longitude)
 	{
 		global $globalDBdriver, $globalDebug;
@@ -1825,11 +1825,11 @@ 
 	}
 
 	/**
-	* Gets Country from iso2
-	*
-	* @param String $iso2 ISO2 country code
-	* @return String the countrie
-	*/
+	 * Gets Country from iso2
+	 *
+	 * @param String $iso2 ISO2 country code
+	 * @return String the countrie
+	 */
 	public function getCountryFromISO2($iso2)
 	{
 		global $globalDBdriver, $globalDebug;
@@ -1858,12 +1858,12 @@ 
 
 	
 	/**
-	* Gets the short url from bit.ly
-	*
-	* @param String $url the full url
-	* @return String the bit.ly url
-	*
-	*/
+	 * Gets the short url from bit.ly
+	 *
+	 * @param String $url the full url
+	 * @return String the bit.ly url
+	 *
+	 */
 	public function getBitlyURL($url)
 	{
 		global $globalBitlyAccessToken;
@@ -1890,11 +1890,11 @@ 
 
 	
 	/**
-	* Gets all vessels types that have flown over
-	*
-	* @return Array the vessel type list
-	*
-	*/
+	 * Gets all vessels types that have flown over
+	 *
+	 * @return Array the vessel type list
+	 *
+	 */
 	public function countAllMarineTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
@@ -1960,11 +1960,11 @@ 
 	}
 
 	/**
-	* Gets all the tracker information
-	*
-	* @return Array the tracker information
-	*
-	*/
+	 * Gets all the tracker information
+	 *
+	 * @return Array the tracker information
+	 *
+	 */
 	public function searchMarineData($q = '', $callsign = '',$mmsi = '', $imo = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '',$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;

Spacing +215 added lines, -215 removed lines

@@ -2,7 +2,7 @@ 
 require_once(dirname(__FILE__).'/class.Image.php');
 $global_marine_query = "SELECT marine_output.* FROM marine_output";
 
-class Marine{
+class Marine {
 	public $db;
 	
 	public function __construct($dbc = null) {
@@ -17,33 +17,33 @@ 
 	* @return Array the SQL part
 	*/
 	
-	public function getFilter($filter = array(),$where = false,$and = false) {
+	public function getFilter($filter = array(), $where = false, $and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
 		$filters = array();
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
 				$filters = $globalStatsFilters[$globalFilterName];
 			} else {
-				$filter = array_merge($filter,$globalStatsFilters[$globalFilterName]);
+				$filter = array_merge($filter, $globalStatsFilters[$globalFilterName]);
 			}
 		}
 		if (isset($filter[0]['source'])) {
-			$filters = array_merge($filters,$filter);
+			$filters = array_merge($filters, $filter);
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
 		$filter_query_join = '';
 		$filter_query_where = '';
-		foreach($filters as $flt) {
+		foreach ($filters as $flt) {
 			if (isset($flt['idents']) && !empty($flt['idents'])) {
 				if (isset($flt['source'])) {
-					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id";
+					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','", $flt['idents'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id";
 				} else {
-					$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";
+					$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";
 				}
 			}
 		}
 		if (isset($filter['source']) && !empty($filter['source'])) {
-			$filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')";
+			$filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')";
 		}
 		if (isset($filter['ident']) && !empty($filter['ident'])) {
 			$filter_query_where .= " AND ident = '".$filter['ident']."'";
@@ -81,7 +81,7 @@ 
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
 		if ($filter_query_where != '') {
-			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
+			$filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where);
 		}
 		$filter_query = $filter_query_join.$filter_query_where;
 		return $filter_query;
@@ -96,7 +96,7 @@ 
 	* @return Array the spotter information
 	*
 	*/
-	public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false)
+	public function getDataFromDB($query, $params = array(), $limitQuery = '', $schedules = false)
 	{
 		date_default_timezone_set('UTC');
 		if (!is_string($query))
@@ -116,13 +116,13 @@ 
 			$sth = $this->db->prepare($query.$limitQuery);
 			$sth->execute($params);
 		} catch (PDOException $e) {
-			printf("Invalid query : %s\nWhole query: %s\n",$e->getMessage(), $query.$limitQuery);
+			printf("Invalid query : %s\nWhole query: %s\n", $e->getMessage(), $query.$limitQuery);
 			exit();
 		}
 		
 		$num_rows = 0;
 		$spotter_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$num_rows++;
 			$temp_array = array();
@@ -161,10 +161,10 @@ 
 			}
 			if (isset($row['ground_speed'])) $temp_array['ground_speed'] = $row['ground_speed'];
 
-			if(isset($temp_array['mmsi']) && $temp_array['mmsi'] != "")
+			if (isset($temp_array['mmsi']) && $temp_array['mmsi'] != "")
 			{
 				$Image = new Image($this->db);
-				if (isset($temp_array['ident']) && $temp_array['ident'] != '') $image_array = $Image->getMarineImage($temp_array['mmsi'],'',$temp_array['ident']);
+				if (isset($temp_array['ident']) && $temp_array['ident'] != '') $image_array = $Image->getMarineImage($temp_array['mmsi'], '', $temp_array['ident']);
 				else $image_array = $Image->getMarineImage($temp_array['mmsi']);
 				unset($Image);
 				if (count($image_array) > 0) {
@@ -200,17 +200,17 @@ 
 				{
 					$temp_array['date'] = "about ".$dateArray['hours']." hours ago";
 				} else {
-					$temp_array['date'] = date("M j Y, g:i a",strtotime($row['date']." UTC"));
+					$temp_array['date'] = date("M j Y, g:i a", strtotime($row['date']." UTC"));
 				}
 				$temp_array['date_minutes_past'] = $dateArray['minutes'];
-				$temp_array['date_iso_8601'] = date("c",strtotime($row['date']." UTC"));
-				$temp_array['date_rfc_2822'] = date("r",strtotime($row['date']." UTC"));
+				$temp_array['date_iso_8601'] = date("c", strtotime($row['date']." UTC"));
+				$temp_array['date_rfc_2822'] = date("r", strtotime($row['date']." UTC"));
 				$temp_array['date_unix'] = strtotime($row['date']." UTC");
 				if (isset($row['last_seen']) && $row['last_seen'] != '') {
 					if (strtotime($row['last_seen']) > strtotime($row['date'])) {
 						$temp_array['duration'] = strtotime($row['last_seen']) - strtotime($row['date']);
-						$temp_array['last_seen_date_iso_8601'] = date("c",strtotime($row['last_seen']." UTC"));
-						$temp_array['last_seen_date_rfc_2822'] = date("r",strtotime($row['last_seen']." UTC"));
+						$temp_array['last_seen_date_iso_8601'] = date("c", strtotime($row['last_seen']." UTC"));
+						$temp_array['last_seen_date_rfc_2822'] = date("r", strtotime($row['last_seen']." UTC"));
 						$temp_array['last_seen_date_unix'] = strtotime($row['last_seen']." UTC");
 					}
 				}
@@ -243,8 +243,8 @@ 
 		if ($limit != "")
 		{
 			$limit_array = explode(",", $limit);
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
@@ -258,8 +258,8 @@ 
 		} else {
 			$orderby_query = " ORDER BY marine_output.date DESC";
 		}
-		$query  = $global_marine_query.$filter_query." ".$orderby_query;
-		$spotter_array = $this->getDataFromDB($query, array(),$limit_query,true);
+		$query = $global_marine_query.$filter_query." ".$orderby_query;
+		$spotter_array = $this->getDataFromDB($query, array(), $limit_query, true);
 		return $spotter_array;
 	}
     
@@ -277,8 +277,8 @@ 
 		if ($id == '') return array();
 		$additional_query = "marine_output.fammarine_id = :id";
 		$query_values = array(':id' => $id);
-		$query  = $global_marine_query." WHERE ".$additional_query." ";
-		$spotter_array = $this->getDataFromDB($query,$query_values);
+		$query = $global_marine_query." WHERE ".$additional_query." ";
+		$spotter_array = $this->getDataFromDB($query, $query_values);
 		return $spotter_array;
 	}
 
@@ -297,7 +297,7 @@ 
 		$query_values = array();
 		$limit_query = '';
 		$additional_query = '';
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 		if ($ident != "")
 		{
 			if (!is_string($ident))
@@ -313,8 +313,8 @@ 
 		{
 			$limit_array = explode(",", $limit);
 			
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
@@ -353,7 +353,7 @@ 
 		$query_values = array();
 		$limit_query = '';
 		$additional_query = '';
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 		if (!is_string($type))
 		{
 			return false;
@@ -366,8 +366,8 @@ 
 		{
 			$limit_array = explode(",", $limit);
 			
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
@@ -391,7 +391,7 @@ 
 		return $spotter_array;
 	}
 	
-	public function getMarineDataByDate($date = '', $limit = '', $sort = '',$filter = array())
+	public function getMarineDataByDate($date = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_marine_query, $globalTimezone, $globalDBdriver;
 		
@@ -399,7 +399,7 @@ 
 		$limit_query = '';
 		$additional_query = '';
 
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 		
 		if ($date != "")
 		{
@@ -425,8 +425,8 @@ 
 		{
 			$limit_array = explode(",", $limit);
 			
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
@@ -461,7 +461,7 @@ 
 		$query_values = array();
 		$limit_query = '';
 		$additional_query = '';
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 		if ($captain != "")
 		{
 			$additional_query = " AND (marine_output.captain_name = :captain OR marine_output.captain_id = :captain)";
@@ -470,8 +470,8 @@ 
 		if ($limit != "")
 		{
 			$limit_array = explode(",", $limit);
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
@@ -497,11 +497,11 @@ 
 	* @return Array list of source name
 	*
 	*/
-	public function getAllSourceName($type = '',$filters = array())
+	public function getAllSourceName($type = '', $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		$query_values = array();
-		$query  = "SELECT DISTINCT marine_output.source_name 
+		$query = "SELECT DISTINCT marine_output.source_name 
 				FROM marine_output".$filter_query." marine_output.source_name <> ''";
 		if ($type != '') {
 			$query_values = array(':type' => $type);
@@ -516,7 +516,7 @@ 
 		$source_array = array();
 		$temp_array = array();
 		
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['source_name'] = $row['source_name'];
 			$source_array[] = $temp_array;
@@ -533,8 +533,8 @@ 
 	*/
 	public function getAllIdents($filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT marine_output.ident
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT marine_output.ident
 								FROM marine_output".$filter_query." marine_output.ident <> '' 
 								ORDER BY marine_output.date ASC LIMIT 700 OFFSET 0";
 
@@ -544,7 +544,7 @@ 
 		$ident_array = array();
 		$temp_array = array();
 		
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['ident'] = $row['ident'];
 			$ident_array[] = $temp_array;
@@ -561,7 +561,7 @@ 
 	*/
 	public function getIdentity($mmsi)
 	{
-		$mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT);
+		$mmsi = filter_var($mmsi, FILTER_SANITIZE_NUMBER_INT);
 		$query  = "SELECT * FROM marine_identity WHERE mmsi = :mmsi LIMIT 1";
 		$sth = $this->db->prepare($query);
 		$sth->execute(array(':mmsi' => $mmsi));
@@ -574,23 +574,23 @@ 
 	* Add identity
 	*
 	*/
-	public function addIdentity($mmsi,$imo,$ident,$callsign,$type)
+	public function addIdentity($mmsi, $imo, $ident, $callsign, $type)
 	{
-		$mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT);
+		$mmsi = filter_var($mmsi, FILTER_SANITIZE_NUMBER_INT);
 		if ($mmsi != '') {
-			$imo = filter_var($imo,FILTER_SANITIZE_NUMBER_INT);
-			$ident = filter_var($ident,FILTER_SANITIZE_STRING);
-			$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
-			$type = filter_var($type,FILTER_SANITIZE_STRING);
+			$imo = filter_var($imo, FILTER_SANITIZE_NUMBER_INT);
+			$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+			$callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
+			$type = filter_var($type, FILTER_SANITIZE_STRING);
 			$identinfo = $this->getIdentity($mmsi);
 			if (empty($identinfo)) {
-				$query  = "INSERT INTO marine_identity (mmsi,imo,call_sign,ship_name,type) VALUES (:mmsi,:imo,:call_sign,:ship_name,:type)";
+				$query = "INSERT INTO marine_identity (mmsi,imo,call_sign,ship_name,type) VALUES (:mmsi,:imo,:call_sign,:ship_name,:type)";
 				$sth = $this->db->prepare($query);
-				$sth->execute(array(':mmsi' => $mmsi,':imo' => $imo,':call_sign' => $callsign,':ship_name' => $ident,':type' => $type));
+				$sth->execute(array(':mmsi' => $mmsi, ':imo' => $imo, ':call_sign' => $callsign, ':ship_name' => $ident, ':type' => $type));
 			} elseif ($ident != '' && $identinfo['ship_name'] != $ident) {
-				$query  = "UPDATE marine_identity SET ship_name = :ship_name,type = :type WHERE mmsi = :mmsi";
+				$query = "UPDATE marine_identity SET ship_name = :ship_name,type = :type WHERE mmsi = :mmsi";
 				$sth = $this->db->prepare($query);
-				$sth->execute(array(':mmsi' => $mmsi,':ship_name' => $ident,':type' => $type));
+				$sth->execute(array(':mmsi' => $mmsi, ':ship_name' => $ident, ':type' => $type));
 			}
 		}
 	}
@@ -611,12 +611,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT DISTINCT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) as date
+			$query = "SELECT DISTINCT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) as date
 								FROM marine_output
 								WHERE marine_output.date <> '' 
 								ORDER BY marine_output.date ASC LIMIT 0,100";
 		} else {
-			$query  = "SELECT DISTINCT to_char(marine_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date
+			$query = "SELECT DISTINCT to_char(marine_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date
 								FROM marine_output
 								WHERE marine_output.date <> '' 
 								ORDER BY marine_output.date ASC LIMIT 0,100";
@@ -628,7 +628,7 @@ 
 		$date_array = array();
 		$temp_array = array();
 		
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['date'] = $row['date'];
 
@@ -646,10 +646,10 @@ 
 	* @return String success or false
 	*
 	*/
-	public function updateIdentMarineData($fammarine_id = '', $ident = '',$fromsource = NULL)
+	public function updateIdentMarineData($fammarine_id = '', $ident = '', $fromsource = NULL)
 	{
 		$query = 'UPDATE marine_output SET ident = :ident WHERE fammarine_id = :fammarine_id';
-		$query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident);
+		$query_values = array(':fammarine_id' => $fammarine_id, ':ident' => $ident);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
@@ -667,10 +667,10 @@ 
 	* @return String success or false
 	*
 	*/
-	public function updateArrivalPortNameMarineData($fammarine_id = '', $arrival_code = '',$fromsource = NULL)
+	public function updateArrivalPortNameMarineData($fammarine_id = '', $arrival_code = '', $fromsource = NULL)
 	{
 		$query = 'UPDATE marine_output SET arrival_port_name = :arrival_code WHERE fammarine_id = :fammarine_id';
-		$query_values = array(':fammarine_id' => $fammarine_id,':arrival_code' => $arrival_code);
+		$query_values = array(':fammarine_id' => $fammarine_id, ':arrival_code' => $arrival_code);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
@@ -689,11 +689,11 @@ 
 	* @return String success or false
 	*
 	*/
-	public function updateStatusMarineData($fammarine_id = '', $status_id = '',$status = '')
+	public function updateStatusMarineData($fammarine_id = '', $status_id = '', $status = '')
 	{
 
 		$query = 'UPDATE marine_output SET status = :status, status_id = :status_id WHERE fammarine_id = :fammarine_id';
-                $query_values = array(':fammarine_id' => $fammarine_id,':status' => $status,':status_id' => $status_id);
+                $query_values = array(':fammarine_id' => $fammarine_id, ':status' => $status, ':status_id' => $status_id);
 
 		try {
 			$sth = $this->db->prepare($query);
@@ -716,7 +716,7 @@ 
 	public function updateLatestMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $groundspeed = NULL, $date = '')
 	{
 		$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';
-                $query_values = array(':fammarine_id' => $fammarine_id,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident);
+                $query_values = array(':fammarine_id' => $fammarine_id, ':last_latitude' => $latitude, ':last_longitude' => $longitude, ':last_ground_speed' => $groundspeed, ':last_seen' => $date, ':ident' => $ident);
 
 		try {
 			$sth = $this->db->prepare($query);
@@ -754,7 +754,7 @@ 
 	* @param String $verticalrate vertival rate of flight
 	* @return String success or false
 	*/
-	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 = '')
+	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 = '')
 	{
 		global $globalURL, $globalMarineImageFetch;
 		
@@ -821,36 +821,36 @@ 
 		}
 
     
-		if ($date == "" || strtotime($date) < time()-20*60)
+		if ($date == "" || strtotime($date) < time() - 20*60)
 		{
 			$date = date("Y-m-d H:i:s", time());
 		}
 
-		$fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING);
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT);
-		$groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$format_source = filter_var($format_source,FILTER_SANITIZE_STRING);
-		$mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING);
-		$type = filter_var($type,FILTER_SANITIZE_STRING);
-		$status = filter_var($status,FILTER_SANITIZE_STRING);
-		$type_id = filter_var($typeid,FILTER_SANITIZE_NUMBER_INT);
-		$status_id = filter_var($statusid,FILTER_SANITIZE_NUMBER_INT);
-		$imo = filter_var($imo,FILTER_SANITIZE_STRING);
-		$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
-		$arrival_code = filter_var($arrival_code,FILTER_SANITIZE_STRING);
-		$arrival_date = filter_var($arrival_date,FILTER_SANITIZE_STRING);
-		$captain_id = filter_var($captain_id,FILTER_SANITIZE_STRING);
-		$captain_name = filter_var($captain_name,FILTER_SANITIZE_STRING);
-		$race_id = filter_var($race_id,FILTER_SANITIZE_STRING);
-		$race_name = filter_var($race_name,FILTER_SANITIZE_STRING);
+		$fammarine_id = filter_var($fammarine_id, FILTER_SANITIZE_STRING);
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT);
+		$groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$format_source = filter_var($format_source, FILTER_SANITIZE_STRING);
+		$mmsi = filter_var($mmsi, FILTER_SANITIZE_STRING);
+		$type = filter_var($type, FILTER_SANITIZE_STRING);
+		$status = filter_var($status, FILTER_SANITIZE_STRING);
+		$type_id = filter_var($typeid, FILTER_SANITIZE_NUMBER_INT);
+		$status_id = filter_var($statusid, FILTER_SANITIZE_NUMBER_INT);
+		$imo = filter_var($imo, FILTER_SANITIZE_STRING);
+		$callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
+		$arrival_code = filter_var($arrival_code, FILTER_SANITIZE_STRING);
+		$arrival_date = filter_var($arrival_date, FILTER_SANITIZE_STRING);
+		$captain_id = filter_var($captain_id, FILTER_SANITIZE_STRING);
+		$captain_name = filter_var($captain_name, FILTER_SANITIZE_STRING);
+		$race_id = filter_var($race_id, FILTER_SANITIZE_STRING);
+		$race_name = filter_var($race_name, FILTER_SANITIZE_STRING);
 		if (isset($globalMarineImageFetch) && $globalMarineImageFetch === TRUE) {
 			$Image = new Image($this->db);
-			$image_array = $Image->getMarineImage($mmsi,$imo,$ident);
+			$image_array = $Image->getMarineImage($mmsi, $imo, $ident);
 			if (!isset($image_array[0]['mmsi'])) {
-				$Image->addMarineImage($mmsi,$imo,$ident);
+				$Image->addMarineImage($mmsi, $imo, $ident);
 			}
 			unset($Image);
 		}
@@ -863,10 +863,10 @@ 
 		if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
 		//if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
 		if ($arrival_date == '') $arrival_date = NULL;
-		$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) 
+		$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) 
 		    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)";
 
-		$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);
+		$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);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
@@ -890,13 +890,13 @@ 
 	{
 		global $globalDBdriver, $globalTimezone;
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT marine_output.ident FROM marine_output 
+			$query = "SELECT marine_output.ident FROM marine_output 
 								WHERE marine_output.ident = :ident 
 								AND marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) 
 								AND marine_output.date < UTC_TIMESTAMP()";
 			$query_data = array(':ident' => $ident);
 		} else {
-			$query  = "SELECT marine_output.ident FROM marine_output 
+			$query = "SELECT marine_output.ident FROM marine_output 
 								WHERE marine_output.ident = :ident 
 								AND marine_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
 								AND marine_output.date < now() AT TIME ZONE 'UTC'";
@@ -905,8 +905,8 @@ 
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
-    		$ident_result='';
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+    		$ident_result = '';
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$ident_result = $row['ident'];
 		}
@@ -932,8 +932,8 @@ 
 				return false;
 			} else {
 				$q_array = explode(" ", $q);
-				foreach ($q_array as $q_item){
-					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
+				foreach ($q_array as $q_item) {
+					$q_item = filter_var($q_item, FILTER_SANITIZE_STRING);
 					$additional_query .= " AND (";
 					$additional_query .= "(marine_output.ident like '%".$q_item."%')";
 					$additional_query .= ")";
@@ -941,11 +941,11 @@ 
 			}
 		}
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT marine_output.* FROM marine_output 
+			$query = "SELECT marine_output.* FROM marine_output 
 				WHERE marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 SECOND) ".$additional_query." 
 				AND marine_output.date < UTC_TIMESTAMP()";
 		} else {
-			$query  = "SELECT marine_output.* FROM marine_output 
+			$query = "SELECT marine_output.* FROM marine_output 
 				WHERE marine_output.date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '20 SECONDS' ".$additional_query." 
 				AND marine_output.date::timestamp < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'";
 		}
@@ -964,16 +964,16 @@ 
 	*
 	*/
 
-	public function countAllMarineOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
+	public function countAllMarineOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
 	{
 		global $globalDBdriver, $globalArchive;
 		//$filter_query = $this->getFilter($filters,true,true);
-		$Connection= new Connection($this->db);
+		$Connection = new Connection($this->db);
 		if (!$Connection->tableExists('countries')) return array();
 		require_once('class.SpotterLive.php');
 		if (!isset($globalArchive) || $globalArchive !== TRUE) {
 			$MarineLive = new MarineLive($this->db);
-			$filter_query = $MarineLive->getFilter($filters,true,true);
+			$filter_query = $MarineLive->getFilter($filters, true, true);
 			$filter_query .= " over_country IS NOT NULL AND over_country <> ''";
 			if ($olderthanmonths > 0) {
 				if ($globalDBdriver == 'mysql') {
@@ -993,7 +993,7 @@ 
 		} else {
 			require_once(dirname(__FILE__)."/class.MarineArchive.php");
 			$MarineArchive = new MarineArchive($this->db);
-			$filter_query = $MarineArchive->getFilter($filters,true,true);
+			$filter_query = $MarineArchive->getFilter($filters, true, true);
 			$filter_query .= " over_country <> ''";
 			if ($olderthanmonths > 0) {
 				if ($globalDBdriver == 'mysql') {
@@ -1021,7 +1021,7 @@ 
 		$flight_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['marine_count'] = $row['nb'];
 			$temp_array['marine_country'] = $row['name'];
@@ -1040,11 +1040,11 @@ 
 	* @return Array the callsign list
 	*
 	*/
-	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '')
+	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT marine_output.ident, COUNT(marine_output.ident) AS callsign_icao_count 
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT marine_output.ident, COUNT(marine_output.ident) AS callsign_icao_count 
                     FROM marine_output".$filter_query." marine_output.ident <> ''";
 		 if ($olderthanmonths > 0) {
 			if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
@@ -1058,28 +1058,28 @@ 
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(marine_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			} else {
 				$query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			}
 		}
 		if ($month != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND MONTH(marine_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			} else {
 				$query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 		}
 		if ($day != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND DAY(marine_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			} else {
 				$query .= " AND EXTRACT(DAY FROM marine_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
 		$query .= " GROUP BY marine_output.ident ORDER BY callsign_icao_count DESC";
@@ -1091,7 +1091,7 @@ 
 		$callsign_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['callsign_icao'] = $row['ident'];
 			$temp_array['airline_name'] = $row['airline_name'];
@@ -1143,7 +1143,7 @@ 
 		$date_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['date_name'] = $row['date_name'];
 			$temp_array['date_count'] = $row['date_count'];
@@ -1169,7 +1169,7 @@ 
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
 		} else $offset = '+00:00';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 								FROM marine_output".$filter_query." marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY)";
@@ -1190,7 +1190,7 @@ 
 		$date_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['date_name'] = $row['date_name'];
 			$temp_array['date_count'] = $row['date_count'];
@@ -1215,7 +1215,7 @@ 
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
 		} else $offset = '+00:00';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 								FROM marine_output".$filter_query." marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MONTH)";
@@ -1236,7 +1236,7 @@ 
 		$date_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['date_name'] = $row['date_name'];
 			$temp_array['date_count'] = $row['date_count'];
@@ -1283,7 +1283,7 @@ 
 		$date_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['month_name'] = $row['month_name'];
 			$temp_array['year_name'] = $row['year_name'];
@@ -1312,7 +1312,7 @@ 
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
 		} else $offset = '+00:00';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		if ($globalDBdriver == 'mysql') {
 			$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
 								FROM marine_output".$filter_query." marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 YEAR)";
@@ -1333,7 +1333,7 @@ 
 		$date_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['year_name'] = $row['year_name'];
 			$temp_array['month_name'] = $row['month_name'];
@@ -1353,7 +1353,7 @@ 
 	* @return Array the hour list
 	*
 	*/
-	public function countAllHours($orderby,$filters = array())
+	public function countAllHours($orderby, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
 		if ($globalTimezone != '') {
@@ -1401,7 +1401,7 @@ 
 		$hour_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['hour_name'] = $row['hour_name'];
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -1423,8 +1423,8 @@ 
 	public function countAllHoursByDate($date, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
 		if ($globalTimezone != '') {
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime($date);
@@ -1432,12 +1432,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
+			$query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 								FROM marine_output".$filter_query." DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) = :date
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		} else {
-			$query  = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
+			$query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
 								FROM marine_output".$filter_query." to_char(marine_output.date AT TIME ZONE INTERVAL :offset, 'YYYY-mm-dd') = :date
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
@@ -1449,7 +1449,7 @@ 
 		$hour_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['hour_name'] = $row['hour_name'];
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -1471,8 +1471,8 @@ 
 	public function countAllHoursByIdent($ident, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		if ($globalTimezone != '') {
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
@@ -1480,12 +1480,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
+			$query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 								FROM marine_output".$filter_query." marine_output.ident = :ident 
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		} else {
-			$query  = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
+			$query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
 								FROM marine_output".$filter_query." marine_output.ident = :ident 
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
@@ -1493,12 +1493,12 @@ 
       
 		
 		$sth = $this->db->prepare($query);
-		$sth->execute(array(':ident' => $ident,':offset' => $offset));
+		$sth->execute(array(':ident' => $ident, ':offset' => $offset));
       
 		$hour_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['hour_name'] = $row['hour_name'];
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -1517,33 +1517,33 @@ 
 	* @return Integer the number of vessels
 	*
 	*/
-	public function countOverallMarine($filters = array(),$year = '',$month = '')
+	public function countOverallMarine($filters = array(), $year = '', $month = '')
 	{
 		global $globalDBdriver;
 		//$queryi  = "SELECT COUNT(marine_output.marine_id) AS flight_count FROM marine_output";
-		$queryi  = "SELECT COUNT(DISTINCT marine_output.mmsi) AS flight_count FROM marine_output";
+		$queryi = "SELECT COUNT(DISTINCT marine_output.mmsi) AS flight_count FROM marine_output";
 		$query_values = array();
 		$query = '';
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(marine_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			} else {
 				$query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			}
 		}
 		if ($month != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND MONTH(marine_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			} else {
 				$query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 		}
 		if (empty($query_values)) $queryi .= $this->getFilter($filters);
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
+		else $queryi .= $this->getFilter($filters, true, true).substr($query, 4);
 		
 		$sth = $this->db->prepare($queryi);
 		$sth->execute($query_values);
@@ -1556,32 +1556,32 @@ 
 	* @return Integer the number of vessels
 	*
 	*/
-	public function countOverallMarineTypes($filters = array(),$year = '',$month = '')
+	public function countOverallMarineTypes($filters = array(), $year = '', $month = '')
 	{
 		global $globalDBdriver;
-		$queryi  = "SELECT COUNT(DISTINCT marine_output.type) AS marine_count FROM marine_output";
+		$queryi = "SELECT COUNT(DISTINCT marine_output.type) AS marine_count FROM marine_output";
 		$query_values = array();
 		$query = '';
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(marine_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			} else {
 				$query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			}
 		}
 		if ($month != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND MONTH(marine_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			} else {
 				$query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 		}
 		if (empty($query_values)) $queryi .= $this->getFilter($filters);
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
+		else $queryi .= $this->getFilter($filters, true, true).substr($query, 4);
 		
 		$sth = $this->db->prepare($queryi);
 		$sth->execute($query_values);
@@ -1598,7 +1598,7 @@ 
 	public function countAllHoursFromToday($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		if ($globalTimezone != '') {
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
@@ -1606,12 +1606,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
+			$query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 								FROM marine_output".$filter_query." DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) = CURDATE()
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		} else {
-			$query  = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
+			$query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
 								FROM marine_output".$filter_query." to_char(marine_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = CAST(NOW() AS date)
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
@@ -1623,7 +1623,7 @@ 
 		$hour_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['hour_name'] = $row['hour_name'];
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -1642,9 +1642,9 @@ 
 	*/
 	public function getMarineIDBasedOnFamMarineID($fammarine_id)
 	{
-		$fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING);
+		$fammarine_id = filter_var($fammarine_id, FILTER_SANITIZE_STRING);
 
-		$query  = "SELECT marine_output.marine_id
+		$query = "SELECT marine_output.marine_id
 				FROM marine_output 
 				WHERE marine_output.fammarine_id = '".$fammarine_id."'";
         
@@ -1652,7 +1652,7 @@ 
 		$sth = $this->db->prepare($query);
 		$sth->execute();
 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			return $row['marine_id'];
 		}
@@ -1677,23 +1677,23 @@ 
 		}
 		
 		$current_date = date("Y-m-d H:i:s");
-		$date = date("Y-m-d H:i:s",strtotime($dateString." UTC"));
+		$date = date("Y-m-d H:i:s", strtotime($dateString." UTC"));
 		
 		$diff = abs(strtotime($current_date) - strtotime($date));
 
-		$time_array['years'] = floor($diff / (365*60*60*24)); 
+		$time_array['years'] = floor($diff/(365*60*60*24)); 
 		$years = $time_array['years'];
 		
-		$time_array['months'] = floor(($diff - $years * 365*60*60*24) / (30*60*60*24));
+		$time_array['months'] = floor(($diff - $years*365*60*60*24)/(30*60*60*24));
 		$months = $time_array['months'];
 		
-		$time_array['days'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24)/ (60*60*24));
+		$time_array['days'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24)/(60*60*24));
 		$days = $time_array['days'];
-		$time_array['hours'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/ (60*60));
+		$time_array['hours'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/(60*60));
 		$hours = $time_array['hours'];
-		$time_array['minutes'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/ 60);
+		$time_array['minutes'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/60);
 		$minutes = $time_array['minutes'];
-		$time_array['seconds'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60));  
+		$time_array['seconds'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60));  
 		
 		return $time_array;
 	}
@@ -1716,63 +1716,63 @@ 
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "N";
 			$temp_array['direction_fullname'] = "North";
-		} elseif ($direction >= 22.5 && $direction < 45){
+		} elseif ($direction >= 22.5 && $direction < 45) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "NNE";
 			$temp_array['direction_fullname'] = "North-Northeast";
-		} elseif ($direction >= 45 && $direction < 67.5){
+		} elseif ($direction >= 45 && $direction < 67.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "NE";
 			$temp_array['direction_fullname'] = "Northeast";
-		} elseif ($direction >= 67.5 && $direction < 90){
+		} elseif ($direction >= 67.5 && $direction < 90) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "ENE";
 			$temp_array['direction_fullname'] = "East-Northeast";
-		} elseif ($direction >= 90 && $direction < 112.5){
+		} elseif ($direction >= 90 && $direction < 112.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "E";
 			$temp_array['direction_fullname'] = "East";
-		} elseif ($direction >= 112.5 && $direction < 135){
+		} elseif ($direction >= 112.5 && $direction < 135) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "ESE";
 			$temp_array['direction_fullname'] = "East-Southeast";
-		} elseif ($direction >= 135 && $direction < 157.5){
+		} elseif ($direction >= 135 && $direction < 157.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "SE";
 			$temp_array['direction_fullname'] = "Southeast";
-		} elseif ($direction >= 157.5 && $direction < 180){
+		} elseif ($direction >= 157.5 && $direction < 180) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "SSE";
 			$temp_array['direction_fullname'] = "South-Southeast";
-		} elseif ($direction >= 180 && $direction < 202.5){
+		} elseif ($direction >= 180 && $direction < 202.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "S";
 			$temp_array['direction_fullname'] = "South";
-		} elseif ($direction >= 202.5 && $direction < 225){
+		} elseif ($direction >= 202.5 && $direction < 225) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "SSW";
 			$temp_array['direction_fullname'] = "South-Southwest";
-		} elseif ($direction >= 225 && $direction < 247.5){
+		} elseif ($direction >= 225 && $direction < 247.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "SW";
 			$temp_array['direction_fullname'] = "Southwest";
-		} elseif ($direction >= 247.5 && $direction < 270){
+		} elseif ($direction >= 247.5 && $direction < 270) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "WSW";
 			$temp_array['direction_fullname'] = "West-Southwest";
-		} elseif ($direction >= 270 && $direction < 292.5){
+		} elseif ($direction >= 270 && $direction < 292.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "W";
 			$temp_array['direction_fullname'] = "West";
-		} elseif ($direction >= 292.5 && $direction < 315){
+		} elseif ($direction >= 292.5 && $direction < 315) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "WNW";
 			$temp_array['direction_fullname'] = "West-Northwest";
-		} elseif ($direction >= 315 && $direction < 337.5){
+		} elseif ($direction >= 315 && $direction < 337.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "NW";
 			$temp_array['direction_fullname'] = "Northwest";
-		} elseif ($direction >= 337.5 && $direction < 360){
+		} elseif ($direction >= 337.5 && $direction < 360) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "NNW";
 			$temp_array['direction_fullname'] = "North-Northwest";
@@ -1789,11 +1789,11 @@ 
 	* @param Float $longitude longitute of the flight
 	* @return String the countrie
 	*/
-	public function getCountryFromLatitudeLongitude($latitude,$longitude)
+	public function getCountryFromLatitudeLongitude($latitude, $longitude)
 	{
 		global $globalDBdriver, $globalDebug;
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
 	
 		$Connection = new Connection($this->db);
 		if (!$Connection->tableExists('countries')) return '';
@@ -1833,7 +1833,7 @@ 
 	public function getCountryFromISO2($iso2)
 	{
 		global $globalDBdriver, $globalDebug;
-		$iso2 = filter_var($iso2,FILTER_SANITIZE_STRING);
+		$iso2 = filter_var($iso2, FILTER_SANITIZE_STRING);
 	
 		$Connection = new Connection($this->db);
 		if (!$Connection->tableExists('countries')) return '';
@@ -1881,7 +1881,7 @@ 
 		
 		$bitly_data = json_decode($bitly_data);
 		$bitly_url = '';
-		if ($bitly_data->status_txt = "OK"){
+		if ($bitly_data->status_txt = "OK") {
 			$bitly_url = $bitly_data->data->url;
 		}
 
@@ -1895,11 +1895,11 @@ 
 	* @return Array the vessel type list
 	*
 	*/
-	public function countAllMarineTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '')
+	public function countAllMarineTypes($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT marine_output.type AS marine_type, COUNT(marine_output.type) AS marine_type_count, marine_output.type_id AS marine_type_id 
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT marine_output.type AS marine_type, COUNT(marine_output.type) AS marine_type_count, marine_output.type_id AS marine_type_id 
 		    FROM marine_output ".$filter_query." marine_output.type <> '' AND marine_output.type_id IS NOT NULL";
 		if ($olderthanmonths > 0) {
 			if ($globalDBdriver == 'mysql') {
@@ -1919,28 +1919,28 @@ 
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(marine_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			} else {
 				$query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			}
 		}
 		if ($month != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND MONTH(marine_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			} else {
 				$query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 		}
 		if ($day != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND DAY(marine_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			} else {
 				$query .= " AND EXTRACT(DAY FROM marine_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
 		$query .= " GROUP BY marine_output.type, marine_output.type_id ORDER BY marine_type_count DESC";
@@ -1949,7 +1949,7 @@ 
 		$sth->execute($query_values);
 		$marine_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['marine_type'] = $row['marine_type'];
 			$temp_array['marine_type_id'] = $row['marine_type_id'];
@@ -1965,13 +1965,13 @@ 
 	* @return Array the tracker information
 	*
 	*/
-	public function searchMarineData($q = '', $callsign = '',$mmsi = '', $imo = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '',$filters = array())
+	public function searchMarineData($q = '', $callsign = '', $mmsi = '', $imo = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '', $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
 		date_default_timezone_set('UTC');
 		$query_values = array();
 		$additional_query = '';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		if ($q != "")
 		{
 			if (!is_string($q))
@@ -1979,8 +1979,8 @@ 
 				return false;
 			} else {
 				$q_array = explode(" ", $q);
-				foreach ($q_array as $q_item){
-					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
+				foreach ($q_array as $q_item) {
+					$q_item = filter_var($q_item, FILTER_SANITIZE_STRING);
 					$additional_query .= " AND (";
 					if (is_int($q_item)) $additional_query .= "(marine_output.marine_id = '".$q_item."') OR ";
 					if (is_int($q_item)) $additional_query .= "(marine_output.mmsi = '".$q_item."') OR ";
@@ -1992,42 +1992,42 @@ 
 		}
 		if ($callsign != "")
 		{
-			$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
+			$callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
 			if (!is_string($callsign))
 			{
 				return false;
 			} else {
 				$additional_query .= " AND marine_output.ident = :callsign";
-				$query_values = array_merge($query_values,array(':callsign' => $callsign));
+				$query_values = array_merge($query_values, array(':callsign' => $callsign));
 			}
 		}
 		if ($mmsi != "")
 		{
-			$mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING);
+			$mmsi = filter_var($mmsi, FILTER_SANITIZE_STRING);
 			if (!is_numeric($mmsi))
 			{
 				return false;
 			} else {
 				$additional_query .= " AND marine_output.mmsi = :mmsi";
-				$query_values = array_merge($query_values,array(':mmsi' => $mmsi));
+				$query_values = array_merge($query_values, array(':mmsi' => $mmsi));
 			}
 		}
 		if ($imo != "")
 		{
-			$imo = filter_var($imo,FILTER_SANITIZE_STRING);
+			$imo = filter_var($imo, FILTER_SANITIZE_STRING);
 			if (!is_numeric($imo))
 			{
 				return false;
 			} else {
 				$additional_query .= " AND marine_output.imo = :imo";
-				$query_values = array_merge($query_values,array(':imo' => $imo));
+				$query_values = array_merge($query_values, array(':imo' => $imo));
 			}
 		}
 		if ($date_posted != "")
 		{
 			$date_array = explode(",", $date_posted);
-			$date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
-			$date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
+			$date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING);
+			$date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING);
 			if ($globalTimezone != '') {
 				date_default_timezone_set($globalTimezone);
 				$datetime = new DateTime();
@@ -2054,8 +2054,8 @@ 
 		if ($limit != "")
 		{
 			$limit_array = explode(",", $limit);
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
@@ -2073,28 +2073,28 @@ 
 			}
 		}
 		if ($origLat != "" && $origLon != "" && $dist != "") {
-			$dist = number_format($dist*0.621371,2,'.',''); // convert km to mile
+			$dist = number_format($dist*0.621371, 2, '.', ''); // convert km to mile
 			if ($globalDBdriver == 'mysql') {
-				$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 
+				$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 
 				    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)) 
 				    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;
 			} else {
-				$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 
+				$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 
 				    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)) 
 				    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;
 			}
 		} else {
-			$query  = "SELECT marine_output.* FROM marine_output".$filter_query." marine_output.ident <> '' 
+			$query = "SELECT marine_output.* FROM marine_output".$filter_query." marine_output.ident <> '' 
 			    ".$additional_query."
 			    ".$orderby_query;
 		}
-		$marine_array = $this->getDataFromDB($query, $query_values,$limit_query);
+		$marine_array = $this->getDataFromDB($query, $query_values, $limit_query);
 		return $marine_array;
 	}
 
 	public function getOrderBy()
 	{
-		$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 Airport - ASC", "sql" => "ORDER BY marine_output.departure_airport_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"));
+		$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 Airport - ASC", "sql" => "ORDER BY marine_output.departure_airport_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"));
 		
 		return $orderby;
 		

Braces +215 added lines, -76 removed lines

@@ -8,7 +8,9 @@ 
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db();
-		if ($this->db === null) die('Error: No DB connection. (Marine)');
+		if ($this->db === null) {
+			die('Error: No DB connection. (Marine)');
+		}
 	}
 
 	/**
@@ -30,7 +32,9 @@ 
 		if (isset($filter[0]['source'])) {
 			$filters = array_merge($filters,$filter);
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) {
+			$filter = array_merge($filter,$globalFilter);
+		}
 		$filter_query_join = '';
 		$filter_query_where = '';
 		foreach($filters as $flt) {
@@ -78,8 +82,11 @@ 
 				$filter_query_where .= " AND EXTRACT(DAY FROM marine_output.date) = '".$filter['day']."'";
 			}
 		}
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
+		if ($filter_query_where == '' && $where) {
+			$filter_query_where = ' WHERE';
+		} elseif ($filter_query_where != '' && $and) {
+			$filter_query_where .= ' AND';
+		}
 		if ($filter_query_where != '') {
 			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
 		}
@@ -133,39 +140,75 @@ 
 				$temp_array['spotter_id'] = $row['spotter_archive_id'];
 			} elseif (isset($row['spotter_archive_output_id'])) {
 				$temp_array['spotter_id'] = $row['spotter_archive_output_id'];
-			*/} 
-			elseif (isset($row['marineid'])) {
+			*/} elseif (isset($row['marineid'])) {
 				$temp_array['marine_id'] = $row['marineid'];
 			} else {
 				$temp_array['marine_id'] = '';
 			}
-			if (isset($row['fammarine_id'])) $temp_array['fammarine_id'] = $row['fammarine_id'];
-			if (isset($row['mmsi'])) $temp_array['mmsi'] = $row['mmsi'];
-			if (isset($row['type'])) $temp_array['type'] = $row['type'];
-			if (isset($row['type_id'])) $temp_array['type_id'] = $row['type_id'];
-			if (isset($row['status'])) $temp_array['status'] = $row['status'];
-			if (isset($row['status_id'])) $temp_array['status_id'] = $row['status_id'];
-			if (isset($row['captain_id'])) $temp_array['captain_id'] = $row['captain_id'];
-			if (isset($row['captain_name'])) $temp_array['captain_name'] = $row['captain_name'];
-			if (isset($row['race_id'])) $temp_array['race_id'] = $row['race_id'];
-			if (isset($row['race_name'])) $temp_array['race_name'] = $row['race_name'];
-			if (isset($row['ident'])) $temp_array['ident'] = $row['ident'];
-			if (isset($row['arrival_port_name'])) $temp_array['arrival_port_name'] = $row['arrival_port_name'];
-			if (isset($row['latitude'])) $temp_array['latitude'] = $row['latitude'];
-			if (isset($row['longitude'])) $temp_array['longitude'] = $row['longitude'];
-			if (isset($row['format_source'])) $temp_array['format_source'] = $row['format_source'];
+			if (isset($row['fammarine_id'])) {
+				$temp_array['fammarine_id'] = $row['fammarine_id'];
+			}
+			if (isset($row['mmsi'])) {
+				$temp_array['mmsi'] = $row['mmsi'];
+			}
+			if (isset($row['type'])) {
+				$temp_array['type'] = $row['type'];
+			}
+			if (isset($row['type_id'])) {
+				$temp_array['type_id'] = $row['type_id'];
+			}
+			if (isset($row['status'])) {
+				$temp_array['status'] = $row['status'];
+			}
+			if (isset($row['status_id'])) {
+				$temp_array['status_id'] = $row['status_id'];
+			}
+			if (isset($row['captain_id'])) {
+				$temp_array['captain_id'] = $row['captain_id'];
+			}
+			if (isset($row['captain_name'])) {
+				$temp_array['captain_name'] = $row['captain_name'];
+			}
+			if (isset($row['race_id'])) {
+				$temp_array['race_id'] = $row['race_id'];
+			}
+			if (isset($row['race_name'])) {
+				$temp_array['race_name'] = $row['race_name'];
+			}
+			if (isset($row['ident'])) {
+				$temp_array['ident'] = $row['ident'];
+			}
+			if (isset($row['arrival_port_name'])) {
+				$temp_array['arrival_port_name'] = $row['arrival_port_name'];
+			}
+			if (isset($row['latitude'])) {
+				$temp_array['latitude'] = $row['latitude'];
+			}
+			if (isset($row['longitude'])) {
+				$temp_array['longitude'] = $row['longitude'];
+			}
+			if (isset($row['format_source'])) {
+				$temp_array['format_source'] = $row['format_source'];
+			}
 			if (isset($row['heading'])) {
 				$temp_array['heading'] = $row['heading'];
 				$heading_direction = $this->parseDirection($row['heading']);
-				if (isset($heading_direction[0]['direction_fullname'])) $temp_array['heading_name'] = $heading_direction[0]['direction_fullname'];
+				if (isset($heading_direction[0]['direction_fullname'])) {
+					$temp_array['heading_name'] = $heading_direction[0]['direction_fullname'];
+				}
+			}
+			if (isset($row['ground_speed'])) {
+				$temp_array['ground_speed'] = $row['ground_speed'];
 			}
-			if (isset($row['ground_speed'])) $temp_array['ground_speed'] = $row['ground_speed'];
 
 			if(isset($temp_array['mmsi']) && $temp_array['mmsi'] != "")
 			{
 				$Image = new Image($this->db);
-				if (isset($temp_array['ident']) && $temp_array['ident'] != '') $image_array = $Image->getMarineImage($temp_array['mmsi'],'',$temp_array['ident']);
-				else $image_array = $Image->getMarineImage($temp_array['mmsi']);
+				if (isset($temp_array['ident']) && $temp_array['ident'] != '') {
+					$image_array = $Image->getMarineImage($temp_array['mmsi'],'',$temp_array['ident']);
+				} else {
+					$image_array = $Image->getMarineImage($temp_array['mmsi']);
+				}
 				unset($Image);
 				if (count($image_array) > 0) {
 					$temp_array['image'] = $image_array[0]['image'];
@@ -217,13 +260,21 @@ 
 			}
 			
 			$fromsource = NULL;
-			if (isset($row['source_name']) && $row['source_name'] != '') $temp_array['source_name'] = $row['source_name'];
-			if (isset($row['over_country']) && $row['over_country'] != '') $temp_array['over_country'] = $row['over_country'];
-			if (isset($row['distance']) && $row['distance'] != '') $temp_array['distance'] = $row['distance'];
+			if (isset($row['source_name']) && $row['source_name'] != '') {
+				$temp_array['source_name'] = $row['source_name'];
+			}
+			if (isset($row['over_country']) && $row['over_country'] != '') {
+				$temp_array['over_country'] = $row['over_country'];
+			}
+			if (isset($row['distance']) && $row['distance'] != '') {
+				$temp_array['distance'] = $row['distance'];
+			}
 			$temp_array['query_number_rows'] = $num_rows;
 			$spotter_array[] = $temp_array;
 		}
-		if ($num_rows == 0) return array();
+		if ($num_rows == 0) {
+			return array();
+		}
 		$spotter_array[0]['query_number_rows'] = $num_rows;
 		return $spotter_array;
 	}	
@@ -249,8 +300,12 @@ 
 			{
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-			} else $limit_query = "";
-		} else $limit_query = "";
+			} else {
+				$limit_query = "";
+			}
+		} else {
+			$limit_query = "";
+		}
 		if ($sort != "")
 		{
 			$search_orderby_array = $this->getOrderBy();
@@ -274,7 +329,9 @@ 
 		global $global_marine_query;
 		
 		date_default_timezone_set('UTC');
-		if ($id == '') return array();
+		if ($id == '') {
+			return array();
+		}
 		$additional_query = "marine_output.fammarine_id = :id";
 		$query_values = array(':id' => $id);
 		$query  = $global_marine_query." WHERE ".$additional_query." ";
@@ -510,8 +567,11 @@ 
 		$query .= " ORDER BY marine_output.source_name ASC";
 
 		$sth = $this->db->prepare($query);
-		if (!empty($query_values)) $sth->execute($query_values);
-		else $sth->execute();
+		if (!empty($query_values)) {
+			$sth->execute($query_values);
+		} else {
+			$sth->execute();
+		}
 
 		$source_array = array();
 		$temp_array = array();
@@ -566,8 +626,11 @@ 
 		$sth = $this->db->prepare($query);
 		$sth->execute(array(':mmsi' => $mmsi));
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($result[0])) return $result[0];
-		else return array();
+		if (isset($result[0])) {
+			return $result[0];
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -608,7 +671,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DISTINCT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) as date
@@ -858,11 +923,19 @@ 
 			$latitude = 0;
 			$longitude = 0;
 		}
-		if ($type_id == '') $type_id = NULL;
-		if ($status_id == '') $status_id = NULL;
-		if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
+		if ($type_id == '') {
+			$type_id = NULL;
+		}
+		if ($status_id == '') {
+			$status_id = NULL;
+		}
+		if ($heading == '' || $Common->isInteger($heading) === false) {
+			$heading = 0;
+		}
 		//if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
-		if ($arrival_date == '') $arrival_date = NULL;
+		if ($arrival_date == '') {
+			$arrival_date = NULL;
+		}
 		$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) 
 		    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)";
 
@@ -969,7 +1042,9 @@ 
 		global $globalDBdriver, $globalArchive;
 		//$filter_query = $this->getFilter($filters,true,true);
 		$Connection= new Connection($this->db);
-		if (!$Connection->tableExists('countries')) return array();
+		if (!$Connection->tableExists('countries')) {
+			return array();
+		}
 		require_once('class.SpotterLive.php');
 		if (!isset($globalArchive) || $globalArchive !== TRUE) {
 			$MarineLive = new MarineLive($this->db);
@@ -1013,7 +1088,9 @@ 
 			$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 ";
 		}
 		$query .= "GROUP BY c.name,c.iso3,c.iso2 ORDER BY nb DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
 
 		$sth = $this->db->prepare($query);
 		$sth->execute();
@@ -1047,12 +1124,18 @@ 
 		$query  = "SELECT DISTINCT marine_output.ident, COUNT(marine_output.ident) AS callsign_icao_count 
                     FROM marine_output".$filter_query." marine_output.ident <> ''";
 		 if ($olderthanmonths > 0) {
-			if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
-			else $query .= " AND marine_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
+			if ($globalDBdriver == 'mysql') {
+				$query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
+			} else {
+				$query .= " AND marine_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
+			}
 		}
 		if ($sincedate != '') {
-			if ($globalDBdriver == 'mysql') $query .= " AND marine_output.date > '".$sincedate."'";
-			else $query .= " AND marine_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
+			if ($globalDBdriver == 'mysql') {
+				$query .= " AND marine_output.date > '".$sincedate."'";
+			} else {
+				$query .= " AND marine_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
+			}
 		}
 		$query_values = array();
 		if ($year != '') {
@@ -1083,7 +1166,9 @@ 
 			}
 		}
 		$query .= " GROUP BY marine_output.ident ORDER BY callsign_icao_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
       		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
@@ -1118,7 +1203,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
@@ -1168,7 +1255,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		$filter_query = $this->getFilter($filters,true,true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
@@ -1214,7 +1303,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		$filter_query = $this->getFilter($filters,true,true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
@@ -1262,7 +1353,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$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
@@ -1311,7 +1404,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		$filter_query = $this->getFilter($filters,true,true);
 		if ($globalDBdriver == 'mysql') {
 			$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
@@ -1360,7 +1455,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		$orderby_sql = '';
 		if ($orderby == "hour")
@@ -1429,7 +1526,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime($date);
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -1477,7 +1576,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -1542,8 +1643,11 @@ 
 				$query_values = array_merge($query_values,array(':month' => $month));
 			}
 		}
-		if (empty($query_values)) $queryi .= $this->getFilter($filters);
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
+		if (empty($query_values)) {
+			$queryi .= $this->getFilter($filters);
+		} else {
+			$queryi .= $this->getFilter($filters,true,true).substr($query,4);
+		}
 		
 		$sth = $this->db->prepare($queryi);
 		$sth->execute($query_values);
@@ -1580,8 +1684,11 @@ 
 				$query_values = array_merge($query_values,array(':month' => $month));
 			}
 		}
-		if (empty($query_values)) $queryi .= $this->getFilter($filters);
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
+		if (empty($query_values)) {
+			$queryi .= $this->getFilter($filters);
+		} else {
+			$queryi .= $this->getFilter($filters,true,true).substr($query,4);
+		}
 		
 		$sth = $this->db->prepare($queryi);
 		$sth->execute($query_values);
@@ -1603,7 +1710,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -1707,7 +1816,9 @@ 
 	*/
 	public function parseDirection($direction = 0)
 	{
-		if ($direction == '') $direction = 0;
+		if ($direction == '') {
+			$direction = 0;
+		}
 		$direction_array = array();
 		$temp_array = array();
 
@@ -1796,7 +1907,9 @@ 
 		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 	
 		$Connection = new Connection($this->db);
-		if (!$Connection->tableExists('countries')) return '';
+		if (!$Connection->tableExists('countries')) {
+			return '';
+		}
 	
 		try {
 			/*
@@ -1816,9 +1929,13 @@ 
 			$sth->closeCursor();
 			if (count($row) > 0) {
 				return $row;
-			} else return '';
+			} else {
+				return '';
+			}
 		} catch (PDOException $e) {
-			if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n";
+			if (isset($globalDebug) && $globalDebug) {
+				echo 'Error : '.$e->getMessage()."\n";
+			}
 			return '';
 		}
 	
@@ -1836,7 +1953,9 @@ 
 		$iso2 = filter_var($iso2,FILTER_SANITIZE_STRING);
 	
 		$Connection = new Connection($this->db);
-		if (!$Connection->tableExists('countries')) return '';
+		if (!$Connection->tableExists('countries')) {
+			return '';
+		}
 	
 		try {
 			$query = "SELECT name,iso2,iso3 FROM countries WHERE iso2 = :iso2 LIMIT 1";
@@ -1848,9 +1967,13 @@ 
 			$sth->closeCursor();
 			if (count($row) > 0) {
 				return $row;
-			} else return '';
+			} else {
+				return '';
+			}
 		} catch (PDOException $e) {
-			if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n";
+			if (isset($globalDebug) && $globalDebug) {
+				echo 'Error : '.$e->getMessage()."\n";
+			}
 			return '';
 		}
 	
@@ -1868,7 +1991,9 @@ 
 	{
 		global $globalBitlyAccessToken;
 		
-		if ($globalBitlyAccessToken == '') return $url;
+		if ($globalBitlyAccessToken == '') {
+			return $url;
+		}
         
 		$google_url = 'https://api-ssl.bitly.com/v3/shorten?access_token='.$globalBitlyAccessToken.'&longUrl='.$url;
 		
@@ -1944,7 +2069,9 @@ 
 			}
 		}
 		$query .= " GROUP BY marine_output.type, marine_output.type_id ORDER BY marine_type_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
 		$marine_array = array();
@@ -1982,9 +2109,15 @@ 
 				foreach ($q_array as $q_item){
 					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
 					$additional_query .= " AND (";
-					if (is_int($q_item)) $additional_query .= "(marine_output.marine_id = '".$q_item."') OR ";
-					if (is_int($q_item)) $additional_query .= "(marine_output.mmsi = '".$q_item."') OR ";
-					if (is_int($q_item)) $additional_query .= "(marine_output.imo = '".$q_item."') OR ";
+					if (is_int($q_item)) {
+						$additional_query .= "(marine_output.marine_id = '".$q_item."') OR ";
+					}
+					if (is_int($q_item)) {
+						$additional_query .= "(marine_output.mmsi = '".$q_item."') OR ";
+					}
+					if (is_int($q_item)) {
+						$additional_query .= "(marine_output.imo = '".$q_item."') OR ";
+					}
 					$additional_query .= "(marine_output.ident like '%".$q_item."%') OR ";
 					$additional_query .= ")";
 				}
@@ -2032,7 +2165,9 @@ 
 				date_default_timezone_set($globalTimezone);
 				$datetime = new DateTime();
 				$offset = $datetime->format('P');
-			} else $offset = '+00:00';
+			} else {
+				$offset = '+00:00';
+			}
 			if ($date_array[1] != "")
 			{
 				$date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0]));
@@ -2059,8 +2194,12 @@ 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-			} else $limit_query = "";
-		} else $limit_query = "";
+			} else {
+				$limit_query = "";
+			}
+		} else {
+			$limit_query = "";
+		}
 		if ($sort != "")
 		{
 			$search_orderby_array = $this->getOrderBy();