Ysurac / FlightAirMap

require/class.MarineArchive.php

Indentation +603 added lines, -603 removed lines

@@ -9,10 +9,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;
 		$filters = array();
@@ -110,44 +110,44 @@ 
 	}
 
 
-        /**
-        * Gets all the spotter information based on a particular callsign
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getLastArchiveMarineDataByIdent($ident)
-        {
+		/**
+		 * Gets all the spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
+		public function getLastArchiveMarineDataByIdent($ident)
+		{
 		$Marine = new Marine($this->db);
-                date_default_timezone_set('UTC');
+				date_default_timezone_set('UTC');
 
-                $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                //$query  = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
-                $query  = "SELECT marine_archive.* FROM marine_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
+				$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+				//$query  = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
+				$query  = "SELECT marine_archive.* FROM marine_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
 
-                $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident));
+				$spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident));
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
 
-        /**
-        * Gets last the spotter information based on a particular id
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getLastArchiveMarineDataById($id)
-        {
-    		$Marine = new Marine($this->db);
-                date_default_timezone_set('UTC');
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
-                //$query  = MarineArchive->$global_query." WHERE marine_archive.fammarine_id = :id";
-                //$query  = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
-                $query  = "SELECT * FROM marine_archive WHERE fammarine_id = :id ORDER BY date DESC LIMIT 1";
+		/**
+		 * Gets last the spotter information based on a particular id
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
+		public function getLastArchiveMarineDataById($id)
+		{
+			$Marine = new Marine($this->db);
+				date_default_timezone_set('UTC');
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
+				//$query  = MarineArchive->$global_query." WHERE marine_archive.fammarine_id = :id";
+				//$query  = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
+				$query  = "SELECT * FROM marine_archive WHERE fammarine_id = :id ORDER BY date DESC LIMIT 1";
 
 //              $spotter_array = Marine->getDataFromDB($query,array(':id' => $id));
-                  /*
+				  /*
                 try {
                         $Connection = new Connection();
                         $sth = Connection->$db->prepare($query);
@@ -157,232 +157,232 @@ 
                 }
                 $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC);
                 */
-                $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id));
-
-                return $spotter_array;
-        }
-
-        /**
-        * Gets all the spotter information based on a particular id
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getAllArchiveMarineDataById($id)
+				$spotter_array = $Marine->getDataFromDB($query,array(':id' => $id));
+
+				return $spotter_array;
+		}
+
+		/**
+		 * Gets all the spotter information based on a particular id
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
+		public function getAllArchiveMarineDataById($id)
 	{
-                date_default_timezone_set('UTC');
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = $this->global_query." WHERE marine_archive.fammarine_id = :id ORDER BY date";
+				date_default_timezone_set('UTC');
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
+				$query  = $this->global_query." WHERE marine_archive.fammarine_id = :id ORDER BY date";
 
 //              $spotter_array = Marine->getDataFromDB($query,array(':id' => $id));
 
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':id' => $id));
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
-
-                return $spotter_array;
-        }
-
-        /**
-        * Gets coordinate & time spotter information based on a particular id
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getCoordArchiveMarineDataById($id)
-        {
-                date_default_timezone_set('UTC');
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = "SELECT marine_archive.latitude, marine_archive.longitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id";
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':id' => $id));
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
+
+				return $spotter_array;
+		}
+
+		/**
+		 * Gets coordinate & time spotter information based on a particular id
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
+		public function getCoordArchiveMarineDataById($id)
+		{
+				date_default_timezone_set('UTC');
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
+				$query  = "SELECT marine_archive.latitude, marine_archive.longitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id";
 
 //              $spotter_array = Marine->getDataFromDB($query,array(':id' => $id));
 
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':id' => $id));
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':id' => $id));
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
 
-        /**
-        * Gets altitude information based on a particular callsign
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getAltitudeArchiveMarineDataByIdent($ident)
-        {
+		/**
+		 * Gets altitude information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
+		public function getAltitudeArchiveMarineDataByIdent($ident)
+		{
 
-                date_default_timezone_set('UTC');
+				date_default_timezone_set('UTC');
 
-                $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date";
+				$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+				$query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date";
 
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':ident' => $ident));
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':ident' => $ident));
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
-        /**
-        * Gets altitude information based on a particular id
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getAltitudeArchiveMarineDataById($id)
-        {
+		/**
+		 * Gets altitude information based on a particular id
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
+		public function getAltitudeArchiveMarineDataById($id)
+		{
 
-                date_default_timezone_set('UTC');
+				date_default_timezone_set('UTC');
 
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date";
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
+				$query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date";
 
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':id' => $id));
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':id' => $id));
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
-        /**
-        * Gets altitude & speed information based on a particular id
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getAltitudeSpeedArchiveMarineDataById($id)
-        {
+		/**
+		 * Gets altitude & speed information based on a particular id
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
+		public function getAltitudeSpeedArchiveMarineDataById($id)
+		{
 
-                date_default_timezone_set('UTC');
+				date_default_timezone_set('UTC');
 
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = "SELECT marine_archive.altitude, marine_archive.ground_speed, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id ORDER BY date";
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
+				$query  = "SELECT marine_archive.altitude, marine_archive.ground_speed, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id ORDER BY date";
 
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':id' => $id));
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':id' => $id));
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
 
-        /**
-        * Gets altitude information based on a particular callsign
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getLastAltitudeArchiveMarineDataByIdent($ident)
-        {
+		/**
+		 * Gets altitude information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
+		public function getLastAltitudeArchiveMarineDataByIdent($ident)
+		{
 
-                date_default_timezone_set('UTC');
+				date_default_timezone_set('UTC');
 
-                $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
+				$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+				$query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
 //                $query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident";
 
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':ident' => $ident));
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':ident' => $ident));
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
 
 
-       /**
-        * Gets all the archive spotter information
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getMarineArchiveData($ident,$fammarine_id,$date)
-        {
-    		$Marine = new Marine($this->db);
-                $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.fammarine_id = :fammarine_id AND l.date LIKE :date GROUP BY l.fammarine_id) s on spotter_live.fammarine_id = s.fammarine_id AND spotter_live.date = s.maxdate";
+	   /**
+	    * Gets all the archive spotter information
+	    *
+	    * @return Array the spotter information
+	    *
+	    */
+		public function getMarineArchiveData($ident,$fammarine_id,$date)
+		{
+			$Marine = new Marine($this->db);
+				$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+				$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.fammarine_id = :fammarine_id AND l.date LIKE :date GROUP BY l.fammarine_id) s on spotter_live.fammarine_id = s.fammarine_id AND spotter_live.date = s.maxdate";
 
-                $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':fammarine_id' => $fammarine_id,':date' => $date.'%'));
+				$spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':fammarine_id' => $fammarine_id,':date' => $date.'%'));
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
         
-        public function deleteMarineArchiveTrackData()
-        {
+		public function deleteMarineArchiveTrackData()
+		{
 		global $globalArchiveKeepTrackMonths;
-                date_default_timezone_set('UTC');
+				date_default_timezone_set('UTC');
 		$query = 'DELETE FROM marine_archive WHERE marine_archive.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepTrackMonths.' MONTH)';
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
 	}
 
 	/**
-        * Gets Minimal Live Marine data
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getMinLiveMarineData($begindate,$enddate,$filter = array())
-        {
-                global $globalDBdriver, $globalLiveInterval;
-                date_default_timezone_set('UTC');
-
-                $filter_query = '';
-                if (isset($filter['source']) && !empty($filter['source'])) {
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
-                }
-                // Use spotter_output also ?
-                if (isset($filter['airlines']) && !empty($filter['airlines'])) {
-                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
-                }
-                if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
-                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id ";
-                }
-                if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
-                }
+	 * Gets Minimal Live Marine data
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+		public function getMinLiveMarineData($begindate,$enddate,$filter = array())
+		{
+				global $globalDBdriver, $globalLiveInterval;
+				date_default_timezone_set('UTC');
+
+				$filter_query = '';
+				if (isset($filter['source']) && !empty($filter['source'])) {
+						$filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
+				}
+				// Use spotter_output also ?
+				if (isset($filter['airlines']) && !empty($filter['airlines'])) {
+						$filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
+				}
+				if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
+						$filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id ";
+				}
+				if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
+						$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+				}
 
-                //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
-                if ($globalDBdriver == 'mysql') {
-                        /*
+				//if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+				if ($globalDBdriver == 'mysql') {
+						/*
                         $query  = 'SELECT a.aircraft_shadow, marine_archive.ident, marine_archive.fammarine_id, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk 
                     		    FROM marine_archive 
                     		    INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive.aircraft_icao = a.icao';
@@ -401,56 +401,56 @@ 
 				    INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao
 				    WHERE marine_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' 
                         	    '.$filter_query.' ORDER BY fammarine_id';
-                } else {
-                        //$query  = 'SELECT marine_archive.ident, marine_archive.fammarine_id, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao';
-                        $query  = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
+				} else {
+						//$query  = 'SELECT marine_archive.ident, marine_archive.fammarine_id, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao';
+						$query  = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
                         	    FROM marine_archive 
                         	    INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao
                         	    WHERE marine_archive.date >= '."'".$begindate."'".' AND marine_archive.date <= '."'".$enddate."'".'
                         	    '.$filter_query.' ORDER BY fammarine_id';
-                }
-                //echo $query;
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
+				}
+				//echo $query;
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
 	/**
-        * Gets Minimal Live Marine data
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getMinLiveMarineDataPlayback($begindate,$enddate,$filter = array())
-        {
-                global $globalDBdriver, $globalLiveInterval;
-                date_default_timezone_set('UTC');
-
-                $filter_query = '';
-                if (isset($filter['source']) && !empty($filter['source'])) {
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
-                }
-                // Should use spotter_output also ?
-                if (isset($filter['airlines']) && !empty($filter['airlines'])) {
-                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
-                }
-                if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
-                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id ";
-                }
-                if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
-                }
+	 * Gets Minimal Live Marine data
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+		public function getMinLiveMarineDataPlayback($begindate,$enddate,$filter = array())
+		{
+				global $globalDBdriver, $globalLiveInterval;
+				date_default_timezone_set('UTC');
+
+				$filter_query = '';
+				if (isset($filter['source']) && !empty($filter['source'])) {
+						$filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
+				}
+				// Should use spotter_output also ?
+				if (isset($filter['airlines']) && !empty($filter['airlines'])) {
+						$filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
+				}
+				if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
+						$filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id ";
+				}
+				if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
+						$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+				}
 
-                //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
-                if ($globalDBdriver == 'mysql') {
-                        /*
+				//if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+				if ($globalDBdriver == 'mysql') {
+						/*
                         $query  = 'SELECT a.aircraft_shadow, marine_archive.ident, marine_archive.fammarine_id, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk 
                     		    FROM marine_archive 
                     		    INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive.aircraft_icao = a.icao';
@@ -461,95 +461,95 @@ 
 				    WHERE (marine_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') 
                         	    '.$filter_query.' GROUP BY marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao, marine_archive_output.arrival_airport_icao, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow';
 
-                } else {
-                        //$query  = 'SELECT marine_archive_output.ident, marine_archive_output.fammarine_id, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow FROM marine_archive_output INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_archive_output.fammarine_id = s.fammarine_id AND marine_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on marine_archive_output.aircraft_icao = a.icao';
-                       /*
+				} else {
+						//$query  = 'SELECT marine_archive_output.ident, marine_archive_output.fammarine_id, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow FROM marine_archive_output INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_archive_output.fammarine_id = s.fammarine_id AND marine_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on marine_archive_output.aircraft_icao = a.icao';
+					   /*
                         $query  = 'SELECT marine_archive_output.ident, marine_archive_output.fammarine_id, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow
                         	    FROM marine_archive_output 
                         	    INNER JOIN (SELECT * FROM aircraft) a on marine_archive_output.aircraft_icao = a.icao
                         	    WHERE marine_archive_output.date >= '."'".$begindate."'".' AND marine_archive_output.date <= '."'".$enddate."'".'
                         	    '.$filter_query.' GROUP BY marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao, marine_archive_output.arrival_airport_icao, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow';
                         */
-                        $query  = 'SELECT DISTINCT marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow
+						$query  = 'SELECT DISTINCT marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow
                         	    FROM marine_archive_output 
                         	    INNER JOIN (SELECT * FROM aircraft) a on marine_archive_output.aircraft_icao = a.icao
                         	    WHERE marine_archive_output.date >= '."'".$begindate."'".' AND marine_archive_output.date <= '."'".$enddate."'".'
                         	    '.$filter_query.' LIMIT 200 OFFSET 0';
 //                        	    .' GROUP BY spotter_output.fammarine_id, spotter_output.ident, spotter_output.aircraft_icao, spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao, spotter_output.latitude, spotter_output.longitude, spotter_output.altitude, spotter_output.heading, spotter_output.ground_speed, spotter_output.squawk, a.aircraft_shadow';
                         	    
-                }
-                //echo $query;
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
+				}
+				//echo $query;
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
 	 /**
-        * Gets count Live Marine data
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getLiveMarineCount($begindate,$enddate,$filter = array())
-        {
-                global $globalDBdriver, $globalLiveInterval;
-                date_default_timezone_set('UTC');
-
-                $filter_query = '';
-                if (isset($filter['source']) && !empty($filter['source'])) {
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
-                }
-                if (isset($filter['airlines']) && !empty($filter['airlines'])) {
-                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
-                }
-                if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
-                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id ";
-                }
-                if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
-                }
+	  * Gets count Live Marine data
+	  *
+	  * @return Array the spotter information
+	  *
+	  */
+		public function getLiveMarineCount($begindate,$enddate,$filter = array())
+		{
+				global $globalDBdriver, $globalLiveInterval;
+				date_default_timezone_set('UTC');
 
-                //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
-                if ($globalDBdriver == 'mysql') {
+				$filter_query = '';
+				if (isset($filter['source']) && !empty($filter['source'])) {
+						$filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
+				}
+				if (isset($filter['airlines']) && !empty($filter['airlines'])) {
+						$filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
+				}
+				if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
+						$filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id ";
+				}
+				if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
+						$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+				}
+
+				//if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+				if ($globalDBdriver == 'mysql') {
 			$query = 'SELECT COUNT(DISTINCT fammarine_id) as nb 
 			FROM marine_archive l 
 			WHERE (l.date BETWEEN DATE_SUB('."'".$begindate."'".',INTERVAL '.$globalLiveInterval.' SECOND) AND '."'".$begindate."'".')'.$filter_query;
-                } else {
+				} else {
 			$query = 'SELECT COUNT(DISTINCT fammarine_id) as nb FROM marine_archive l WHERE (l.date BETWEEN '."'".$begindate."' - INTERVAL '".$globalLiveInterval." SECONDS' AND "."'".$enddate."'".')'.$filter_query;
-                }
-                //echo $query;
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
+				}
+				//echo $query;
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
 		$result = $sth->fetch(PDO::FETCH_ASSOC);
 		$sth->closeCursor();
-                return $result['nb'];
+				return $result['nb'];
 
-        }
+		}
 
 
 
 	// marine_archive_output
 	
-    /**
-    * Gets all the spotter information
-    *
-    * @return Array the spotter information
-    *
-    */
-    public function searchMarineData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array())
-    {
+	/**
+	 * Gets all the spotter information
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+	public function searchMarineData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array())
+	{
 	global $globalTimezone, $globalDBdriver;
 	require_once(dirname(__FILE__).'/class.Translation.php');
 	$Translation = new Translation();
@@ -563,159 +563,159 @@ 
 	$filter_query = $this->getFilter($filters);
 	if ($q != "")
 	{
-	    if (!is_string($q))
-	    {
+		if (!is_string($q))
+		{
 		return false;
-	    } else {
+		} else {
 	        
 		$q_array = explode(" ", $q);
 		
 		foreach ($q_array as $q_item){
-		    $additional_query .= " AND (";
-		    $additional_query .= "(marine_archive_output.spotter_id like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.aircraft_icao like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.aircraft_name like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.aircraft_manufacturer like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.airline_icao like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.airline_name like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.airline_country like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.departure_airport_icao like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.departure_airport_name like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.departure_airport_city like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.departure_airport_country like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.arrival_airport_icao like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.arrival_airport_name like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.arrival_airport_city like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.arrival_airport_country like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.registration like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.owner_name like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.pilot_id like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.pilot_name like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.ident like '%".$q_item."%') OR ";
-		    $translate = $Translation->ident2icao($q_item);
-		    if ($translate != $q_item) $additional_query .= "(marine_archive_output.ident like '%".$translate."%') OR ";
-		    $additional_query .= "(marine_archive_output.highlight like '%".$q_item."%')";
-		    $additional_query .= ")";
+			$additional_query .= " AND (";
+			$additional_query .= "(marine_archive_output.spotter_id like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.aircraft_icao like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.aircraft_name like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.aircraft_manufacturer like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.airline_icao like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.airline_name like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.airline_country like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.departure_airport_icao like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.departure_airport_name like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.departure_airport_city like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.departure_airport_country like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.arrival_airport_icao like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.arrival_airport_name like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.arrival_airport_city like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.arrival_airport_country like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.registration like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.owner_name like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.pilot_id like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.pilot_name like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.ident like '%".$q_item."%') OR ";
+			$translate = $Translation->ident2icao($q_item);
+			if ($translate != $q_item) $additional_query .= "(marine_archive_output.ident like '%".$translate."%') OR ";
+			$additional_query .= "(marine_archive_output.highlight like '%".$q_item."%')";
+			$additional_query .= ")";
+		}
 		}
-	    }
 	}
 	
 	if ($registration != "")
 	{
-	    $registration = filter_var($registration,FILTER_SANITIZE_STRING);
-	    if (!is_string($registration))
-	    {
+		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
+		if (!is_string($registration))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (marine_archive_output.registration = '".$registration."')";
-	    }
+		}
 	}
 	
 	if ($aircraft_icao != "")
 	{
-	    $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
-	    if (!is_string($aircraft_icao))
-	    {
+		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
+		if (!is_string($aircraft_icao))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (marine_archive_output.aircraft_icao = '".$aircraft_icao."')";
-	    }
+		}
 	}
 	
 	if ($aircraft_manufacturer != "")
 	{
-	    $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
-	    if (!is_string($aircraft_manufacturer))
-	    {
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
+		if (!is_string($aircraft_manufacturer))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (marine_archive_output.aircraft_manufacturer = '".$aircraft_manufacturer."')";
-	    }
+		}
 	}
 	
 	if ($highlights == "true")
 	{
-	    if (!is_string($highlights))
-	    {
+		if (!is_string($highlights))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (marine_archive_output.highlight <> '')";
-	    }
+		}
 	}
 	
 	if ($airline_icao != "")
 	{
-	    $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
-	    if (!is_string($airline_icao))
-	    {
+		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
+		if (!is_string($airline_icao))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (marine_archive_output.airline_icao = '".$airline_icao."')";
-	    }
+		}
 	}
 	
 	if ($airline_country != "")
 	{
-	    $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
-	    if (!is_string($airline_country))
-	    {
+		$airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
+		if (!is_string($airline_country))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (marine_archive_output.airline_country = '".$airline_country."')";
-	    }
+		}
 	}
 	
 	if ($airline_type != "")
 	{
-	    $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
-	    if (!is_string($airline_type))
-	    {
+		$airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
+		if (!is_string($airline_type))
+		{
 		return false;
-	    } else {
+		} else {
 		if ($airline_type == "passenger")
 		{
-		    $additional_query .= " AND (marine_archive_output.airline_type = 'passenger')";
+			$additional_query .= " AND (marine_archive_output.airline_type = 'passenger')";
 		}
 		if ($airline_type == "cargo")
 		{
-		    $additional_query .= " AND (marine_archive_output.airline_type = 'cargo')";
+			$additional_query .= " AND (marine_archive_output.airline_type = 'cargo')";
 		}
 		if ($airline_type == "military")
 		{
-		    $additional_query .= " AND (marine_archive_output.airline_type = 'military')";
+			$additional_query .= " AND (marine_archive_output.airline_type = 'military')";
+		}
 		}
-	    }
 	}
 	
 	if ($airport != "")
 	{
-	    $airport = filter_var($airport,FILTER_SANITIZE_STRING);
-	    if (!is_string($airport))
-	    {
+		$airport = filter_var($airport,FILTER_SANITIZE_STRING);
+		if (!is_string($airport))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND ((marine_archive_output.departure_airport_icao = '".$airport."') OR (marine_archive_output.arrival_airport_icao = '".$airport."'))";
-	    }
+		}
 	}
 	
 	if ($airport_country != "")
 	{
-	    $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
-	    if (!is_string($airport_country))
-	    {
+		$airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
+		if (!is_string($airport_country))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND ((marine_archive_output.departure_airport_country = '".$airport_country."') OR (marine_archive_output.arrival_airport_country = '".$airport_country."'))";
-	    }
+		}
 	}
     
 	if ($callsign != "")
 	{
-	    $callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
-	    if (!is_string($callsign))
-	    {
+		$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
+		if (!is_string($callsign))
+		{
 		return false;
-	    } else {
+		} else {
 		$translate = $Translation->ident2icao($callsign);
 		if ($translate != $callsign) {
 			$additional_query .= " AND (marine_archive_output.ident = :callsign OR marine_archive_output.ident = :translate)";
@@ -723,99 +723,99 @@ 
 		} else {
 			$additional_query .= " AND (marine_archive_output.ident = '".$callsign."')";
 		}
-	    }
+		}
 	}
 
 	if ($owner != "")
 	{
-	    $owner = filter_var($owner,FILTER_SANITIZE_STRING);
-	    if (!is_string($owner))
-	    {
+		$owner = filter_var($owner,FILTER_SANITIZE_STRING);
+		if (!is_string($owner))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (marine_archive_output.owner_name = '".$owner."')";
-	    }
+		}
 	}
 
 	if ($pilot_name != "")
 	{
-	    $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
-	    if (!is_string($pilot_name))
-	    {
+		$pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
+		if (!is_string($pilot_name))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (marine_archive_output.pilot_name = '".$pilot_name."')";
-	    }
+		}
 	}
 	
 	if ($pilot_id != "")
 	{
-	    $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
-	    if (!is_string($pilot_id))
-	    {
+		$pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
+		if (!is_string($pilot_id))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (marine_archive_output.pilot_id = '".$pilot_id."')";
-	    }
+		}
 	}
 	
 	if ($departure_airport_route != "")
 	{
-	    $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
-	    if (!is_string($departure_airport_route))
-	    {
+		$departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
+		if (!is_string($departure_airport_route))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (marine_archive_output.departure_airport_icao = '".$departure_airport_route."')";
-	    }
+		}
 	}
 	
 	if ($arrival_airport_route != "")
 	{
-	    $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
-	    if (!is_string($arrival_airport_route))
-	    {
+		$arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
+		if (!is_string($arrival_airport_route))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (marine_archive_output.arrival_airport_icao = '".$arrival_airport_route."')";
-	    }
+		}
 	}
 	
 	if ($altitude != "")
 	{
-	    $altitude_array = explode(",", $altitude);
+		$altitude_array = explode(",", $altitude);
 	    
-	    $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-	    $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+		$altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+		$altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 	    
 
-	    if ($altitude_array[1] != "")
-	    {                
+		if ($altitude_array[1] != "")
+		{                
 		$altitude_array[0] = substr($altitude_array[0], 0, -2);
 		$altitude_array[1] = substr($altitude_array[1], 0, -2);
 		$additional_query .= " AND altitude BETWEEN '".$altitude_array[0]."' AND '".$altitude_array[1]."' ";
-	    } else {
+		} else {
 		$altitude_array[0] = substr($altitude_array[0], 0, -2);
 		$additional_query .= " AND altitude <= '".$altitude_array[0]."' ";
-	    }
+		}
 	}
 	
 	if ($date_posted != "")
 	{
-	    $date_array = explode(",", $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 != '') {
+		if ($globalTimezone != '') {
 		date_default_timezone_set($globalTimezone);
 		$datetime = new DateTime();
 		$offset = $datetime->format('P');
-	    } else $offset = '+00:00';
+		} else $offset = '+00:00';
 
 
-	    if ($date_array[1] != "")
-	    {                
+		if ($date_array[1] != "")
+		{                
 		$date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0]));
 		$date_array[1] = date("Y-m-d H:i:s", strtotime($date_array[1]));
 		if ($globalDBdriver == 'mysql') {
@@ -823,28 +823,28 @@ 
 		} else {
 			$additional_query .= " AND marine_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) AND marine_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." <= CAST('".$date_array[1]."' AS TIMESTAMP) ";
 		}
-	    } else {
+		} else {
 		$date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0]));
-                if ($globalDBdriver == 'mysql') {
+				if ($globalDBdriver == 'mysql') {
 			$additional_query .= " AND TIMESTAMP(CONVERT_TZ(marine_archive_output.date,'+00:00', '".$offset."')) >= '".$date_array[0]."' ";
 		} else {
 			$additional_query .= " AND marine_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) ";
 		}
-	    }
+		}
 	}
 	
 	if ($limit != "")
 	{
-	    $limit_array = explode(",", $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)
-	    {
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
+		{
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-	    }
+		}
 	}
 	
 
@@ -875,33 +875,33 @@ 
 	$spotter_array = $Marine->getDataFromDB($query, $query_values,$limit_query);
 
 	return $spotter_array;
-    }
+	}
 
-    public function deleteMarineArchiveData()
-    {
+	public function deleteMarineArchiveData()
+	{
 		global $globalArchiveKeepMonths, $globalDBdriver;
-                date_default_timezone_set('UTC');
-                if ($globalDBdriver == 'mysql') {
+				date_default_timezone_set('UTC');
+				if ($globalDBdriver == 'mysql') {
 			$query = 'DELETE FROM marine_archive_output WHERE marine_archive_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepMonths.' MONTH)';
 		} else {
 			$query = "DELETE FROM marine_archive_output WHERE marine_archive_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveKeepMonths." MONTH'";
 		}
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error";
-                }
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error";
+				}
 	}
 
-    /**
-    * Gets all the spotter information based on the callsign
-    *
-    * @return Array the spotter information
-    *
-    */
-    public function getMarineDataByIdent($ident = '', $limit = '', $sort = '')
-    {
+	/**
+	 * Gets all the spotter information based on the callsign
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+	public function getMarineDataByIdent($ident = '', $limit = '', $sort = '')
+	{
 	$global_query = "SELECT marine_archive_output.* FROM marine_archive_output";
 	
 	date_default_timezone_set('UTC');
@@ -913,35 +913,35 @@ 
 	
 	if ($ident != "")
 	{
-	    if (!is_string($ident))
-	    {
+		if (!is_string($ident))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query = " AND (marine_archive_output.ident = :ident)";
 		$query_values = array(':ident' => $ident);
-	    }
+		}
 	}
 	
 	if ($limit != "")
 	{
-	    $limit_array = explode(",", $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)
-	    {
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
+		{
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-	    }
+		}
 	}
 
 	if ($sort != "")
 	{
-	    $search_orderby_array = $Marine->getOrderBy();
-	    $orderby_query = $search_orderby_array[$sort]['sql'];
+		$search_orderby_array = $Marine->getOrderBy();
+		$orderby_query = $search_orderby_array[$sort]['sql'];
 	} else {
-	    $orderby_query = " ORDER BY marine_archive_output.date DESC";
+		$orderby_query = " ORDER BY marine_archive_output.date DESC";
 	}
 
 	$query = $global_query." WHERE marine_archive_output.ident <> '' ".$additional_query." ".$orderby_query;
@@ -949,17 +949,17 @@ 
 	$spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query);
 
 	return $spotter_array;
-    }
+	}
 
 
-    /**
-    * Gets all the spotter information based on the owner
-    *
-    * @return Array the spotter information
-    *
-    */
-    public function getMarineDataByOwner($owner = '', $limit = '', $sort = '', $filter = array())
-    {
+	/**
+	 * Gets all the spotter information based on the owner
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+	public function getMarineDataByOwner($owner = '', $limit = '', $sort = '', $filter = array())
+	{
 	$global_query = "SELECT marine_archive_output.* FROM marine_archive_output";
 	
 	date_default_timezone_set('UTC');
@@ -972,35 +972,35 @@ 
 	
 	if ($owner != "")
 	{
-	    if (!is_string($owner))
-	    {
+		if (!is_string($owner))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query = " AND (marine_archive_output.owner_name = :owner)";
 		$query_values = array(':owner' => $owner);
-	    }
+		}
 	}
 	
 	if ($limit != "")
 	{
-	    $limit_array = explode(",", $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)
-	    {
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
+		{
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-	    }
+		}
 	}
 
 	if ($sort != "")
 	{
-	    $search_orderby_array = $Marine->getOrderBy();
-	    $orderby_query = $search_orderby_array[$sort]['sql'];
+		$search_orderby_array = $Marine->getOrderBy();
+		$orderby_query = $search_orderby_array[$sort]['sql'];
 	} else {
-	    $orderby_query = " ORDER BY marine_archive_output.date DESC";
+		$orderby_query = " ORDER BY marine_archive_output.date DESC";
 	}
 
 	$query = $global_query.$filter_query." marine_archive_output.owner_name <> '' ".$additional_query." ".$orderby_query;
@@ -1008,16 +1008,16 @@ 
 	$spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query);
 
 	return $spotter_array;
-    }
-
-    /**
-    * Gets all the spotter information based on the pilot
-    *
-    * @return Array the spotter information
-    *
-    */
-    public function getMarineDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array())
-    {
+	}
+
+	/**
+	 * Gets all the spotter information based on the pilot
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+	public function getMarineDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array())
+	{
 	$global_query = "SELECT marine_archive_output.* FROM marine_archive_output";
 	
 	date_default_timezone_set('UTC');
@@ -1036,24 +1036,24 @@ 
 	
 	if ($limit != "")
 	{
-	    $limit_array = explode(",", $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)
-	    {
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
+		{
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-	    }
+		}
 	}
 
 	if ($sort != "")
 	{
-	    $search_orderby_array = $Marine->getOrderBy();
-	    $orderby_query = $search_orderby_array[$sort]['sql'];
+		$search_orderby_array = $Marine->getOrderBy();
+		$orderby_query = $search_orderby_array[$sort]['sql'];
 	} else {
-	    $orderby_query = " ORDER BY marine_archive_output.date DESC";
+		$orderby_query = " ORDER BY marine_archive_output.date DESC";
 	}
 
 	$query = $global_query.$filter_query." marine_archive_output.pilot_name <> '' ".$additional_query." ".$orderby_query;
@@ -1061,16 +1061,16 @@ 
 	$spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query);
 
 	return $spotter_array;
-    }
-
-    /**
-    * Gets all number of flight over countries
-    *
-    * @return Array the airline country list
-    *
-    */
-    public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '')
-    {
+	}
+
+	/**
+	 * Gets all number of flight over countries
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
+	public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '')
+	{
 	global $globalDBdriver;
 	/*
 	$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb 
@@ -1080,14 +1080,14 @@ 
 	$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb
 		    FROM countries c, marine_archive s
 		    WHERE c.iso2 = s.over_country ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+				if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
 	$query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC";
 	if ($limit) $query .= " LIMIT 0,10";
       
@@ -1100,23 +1100,23 @@ 
         
 	while($row = $sth->fetch(PDO::FETCH_ASSOC))
 	{
-	    $temp_array['flight_count'] = $row['nb'];
-	    $temp_array['flight_country'] = $row['name'];
-	    $temp_array['flight_country_iso3'] = $row['iso3'];
-	    $temp_array['flight_country_iso2'] = $row['iso2'];
-	    $flight_array[] = $temp_array;
+		$temp_array['flight_count'] = $row['nb'];
+		$temp_array['flight_country'] = $row['name'];
+		$temp_array['flight_country_iso3'] = $row['iso3'];
+		$temp_array['flight_country_iso2'] = $row['iso2'];
+		$flight_array[] = $temp_array;
 	}
 	return $flight_array;
-    }
-
-    /**
-    * Gets all number of flight over countries
-    *
-    * @return Array the airline country list
-    *
-    */
-    public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '')
-    {
+	}
+
+	/**
+	 * Gets all number of flight over countries
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
+	public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '')
+	{
 	global $globalDBdriver;
 	/*
 	$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb 
@@ -1126,14 +1126,14 @@ 
 	$query = "SELECT o.airline_icao,c.name, c.iso3, c.iso2, count(c.name) as nb
 		    FROM countries c, marine_archive s, spotter_output o
 		    WHERE c.iso2 = s.over_country AND o.airline_icao <> '' AND o.fammarine_id = s.fammarine_id ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND s.date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' ";
+				if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' ";
 	$query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC";
 	if ($limit) $query .= " LIMIT 0,10";
       
@@ -1146,24 +1146,24 @@ 
         
 	while($row = $sth->fetch(PDO::FETCH_ASSOC))
 	{
-	    $temp_array['airline_icao'] = $row['airline_icao'];
-	    $temp_array['flight_count'] = $row['nb'];
-	    $temp_array['flight_country'] = $row['name'];
-	    $temp_array['flight_country_iso3'] = $row['iso3'];
-	    $temp_array['flight_country_iso2'] = $row['iso2'];
-	    $flight_array[] = $temp_array;
+		$temp_array['airline_icao'] = $row['airline_icao'];
+		$temp_array['flight_count'] = $row['nb'];
+		$temp_array['flight_country'] = $row['name'];
+		$temp_array['flight_country_iso3'] = $row['iso3'];
+		$temp_array['flight_country_iso2'] = $row['iso2'];
+		$flight_array[] = $temp_array;
 	}
 	return $flight_array;
-    }
-
-    /**
-    * Gets last spotter information based on a particular callsign
-    *
-    * @return Array the spotter information
-    *
-    */
-    public function getDateArchiveMarineDataById($id,$date)
-    {
+	}
+
+	/**
+	 * Gets last spotter information based on a particular callsign
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+	public function getDateArchiveMarineDataById($id,$date)
+	{
 	$Marine = new Marine($this->db);
 	date_default_timezone_set('UTC');
 	$id = filter_var($id, FILTER_SANITIZE_STRING);
@@ -1171,16 +1171,16 @@ 
 	$date = date('c',$date);
 	$spotter_array = $Marine->getDataFromDB($query,array(':id' => $id,':date' => $date));
 	return $spotter_array;
-    }
-
-    /**
-    * Gets all the spotter information based on a particular callsign
-    *
-    * @return Array the spotter information
-    *
-    */
-    public function getDateArchiveMarineDataByIdent($ident,$date)
-    {
+	}
+
+	/**
+	 * Gets all the spotter information based on a particular callsign
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+	public function getDateArchiveMarineDataByIdent($ident,$date)
+	{
 	$Marine = new Marine($this->db);
 	date_default_timezone_set('UTC');
 	$ident = filter_var($ident, FILTER_SANITIZE_STRING);
@@ -1188,16 +1188,16 @@ 
 	$date = date('c',$date);
 	$spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
 	return $spotter_array;
-    }
-
-    /**
-    * Gets all the spotter information based on the airport
-    *
-    * @return Array the spotter information
-    *
-    */
-    public function getMarineDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
-    {
+	}
+
+	/**
+	 * Gets all the spotter information based on the airport
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+	public function getMarineDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
+	{
 	global $global_query;
 	$Marine = new Marine();
 	date_default_timezone_set('UTC');
@@ -1208,35 +1208,35 @@ 
 	
 	if ($airport != "")
 	{
-	    if (!is_string($airport))
-	    {
+		if (!is_string($airport))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND ((marine_archive_output.departure_airport_icao = :airport) OR (marine_archive_output.arrival_airport_icao = :airport))";
 		$query_values = array(':airport' => $airport);
-	    }
+		}
 	}
 	
 	if ($limit != "")
 	{
-	    $limit_array = explode(",", $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)
-	    {
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
+		{
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-	    }
+		}
 	}
 	
 	if ($sort != "")
 	{
-	    $search_orderby_array = $Marine->getOrderBy();
-	    $orderby_query = $search_orderby_array[$sort]['sql'];
+		$search_orderby_array = $Marine->getOrderBy();
+		$orderby_query = $search_orderby_array[$sort]['sql'];
 	} else {
-	    $orderby_query = " ORDER BY marine_archive_output.date DESC";
+		$orderby_query = " ORDER BY marine_archive_output.date DESC";
 	}
 
 	$query = $global_query.$filter_query." marine_archive_output.ident <> '' ".$additional_query." AND ((marine_archive_output.departure_airport_icao <> 'NA') AND (marine_archive_output.arrival_airport_icao <> 'NA')) ".$orderby_query;
@@ -1244,6 +1244,6 @@ 
 	$spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query);
 
 	return $spotter_array;
-    }
+	}
 }
 ?>
\ No newline at end of file

statistics.php

Indentation +226 added lines, -226 removed lines

@@ -51,7 +51,7 @@ 
 		if (isset($globalTimezone) && $globalTimezone != '') date_default_timezone_set($globalTimezone);
 		print '<i>Last update: '.date('Y-m-d G:i:s',$lastupdate).'</i>';
 	}
-    ?>
+	?>
     </div>
     <?php include('statistics-sub-menu.php'); ?>
     <p class="global-stats">
@@ -60,23 +60,23 @@ 
         <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Arrivals seen"); ?></span>
         <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 	<?php
-	    if ((isset($globalVA) && $globalVA) ||(isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
+		if ((isset($globalVA) && $globalVA) ||(isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
 	?>
     	    <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Pilots"); ?></span>
 	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
         <?php
-    	    } else {
-    	?>
+			} else {
+		?>
     	    <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Owners"); ?></span>
 	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
     	<?php
-    	    }
-    	?>
+			}
+		?>
         <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Aircrafts types"); ?></span>
         <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
         <?php
-    		if ($airline_icao == '') {
-    	?>
+			if ($airline_icao == '') {
+		?>
         <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name,$year,$month)); ?></span> <?php echo _("Airlines"); ?></span>
 	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 	<?php
@@ -99,88 +99,88 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Top 10 Most Common Aircraft Type"); ?></h2>
                  <?php
-                  $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name,$year,$month);
-		    if (count($aircraft_array) == 0) print _("No data available");
-		    else {
-                    print '<div id="chart1" class="chart" width="100%"></div><script>';
-                    $aircraft_data = '';
-                    foreach($aircraft_array as $aircraft_item)
-                    {
-                        $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
-                    }
-                    $aircraft_data = substr($aircraft_data, 0, -1);
-		    print 'var series = ['.$aircraft_data.'];';
-		    print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';
-		    print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#e6e6f6","#1a3151"]);';
-		    print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});';
-                    print 'var aircraftype = new d3pie("chart1",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":';
-                    print 'dataset';
-                    print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});';
-                    print '</script>';
-                  }
-                  ?>
+				  $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name,$year,$month);
+			if (count($aircraft_array) == 0) print _("No data available");
+			else {
+					print '<div id="chart1" class="chart" width="100%"></div><script>';
+					$aircraft_data = '';
+					foreach($aircraft_array as $aircraft_item)
+					{
+						$aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
+					}
+					$aircraft_data = substr($aircraft_data, 0, -1);
+			print 'var series = ['.$aircraft_data.'];';
+			print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';
+			print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#e6e6f6","#1a3151"]);';
+			print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});';
+					print 'var aircraftype = new d3pie("chart1",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":';
+					print 'dataset';
+					print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});';
+					print '</script>';
+				  }
+				  ?>
                 <div class="more">
             	    <?php
-            		if ($year != '' && $month != '') {
-            	    ?>
+					if ($year != '' && $month != '') {
+					?>
             	    <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year; ?>/<?php echo $month ?>/" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
             	    <?php
-            		} else {
-            	    ?>
+					} else {
+					?>
             	    <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
             	    <?php
-            		}
-            	    ?>
+					}
+					?>
                 </div>
             </div>
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 <?php
 //    echo $airline_icao;
-    if ($airline_icao == '' || $airline_icao == 'all') {
+	if ($airline_icao == '' || $airline_icao == 'all') {
 	$airline_array = $Stats->countAllAirlines(true,$filter_name,$year,$month);
 	if (count($airline_array) > 0) {
-            print '<div class="col-md-6">';
-	    print '<h2>'._("Top 10 Most Common Airline").'</h2>';
-	    print '<div id="chart2" class="chart" width="100%"></div><script>';
-	    $airline_data = '';
-	    foreach($airline_array as $airline_item)
-	    {
+			print '<div class="col-md-6">';
+		print '<h2>'._("Top 10 Most Common Airline").'</h2>';
+		print '<div id="chart2" class="chart" width="100%"></div><script>';
+		$airline_data = '';
+		foreach($airline_array as $airline_item)
+		{
 		$airline_data .= '["'.$airline_item['airline_name'].' ('.$airline_item['airline_icao'].')",'.$airline_item['airline_count'].'],';
-	    }
-	    $airline_data = substr($airline_data, 0, -1);
-	    print 'var series = ['.$airline_data.'];';
-	    print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';
-	    print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);';
-	    print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});';
-            print 'var airlinescnt = new d3pie("chart2",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":';
-	    print 'dataset';
-            print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});';
-            print '</script>';
-	    if ($year != '' && $month != '') {
+		}
+		$airline_data = substr($airline_data, 0, -1);
+		print 'var series = ['.$airline_data.'];';
+		print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';
+		print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);';
+		print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});';
+			print 'var airlinescnt = new d3pie("chart2",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":';
+		print 'dataset';
+			print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});';
+			print '</script>';
+		if ($year != '' && $month != '') {
 		print '<div class="more"><a href="'.$globalURL.'/statistics/airline';
 		if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
 		print '/'.$year.'/'.$month.'/" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
-	    } else {
+		} else {
 		print '<div class="more"><a href="'.$globalURL.'/statistics/airline';
 		if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
 		print '" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
-	    }
-    	    print '</div>';
+		}
+			print '</div>';
 	}
 ?>
         </div>
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 <?php
-    }
+	}
 ?>
         <div class="row column">
 <?php
-    $flightover_array = $Stats->countAllFlightOverCountries(false,$airline_icao,$filter_name,$year,$month);
-    if ((isset($globalVA) && $globalVA) ||(isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
+	$flightover_array = $Stats->countAllFlightOverCountries(false,$airline_icao,$filter_name,$year,$month);
+	if ((isset($globalVA) && $globalVA) ||(isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
 	if (empty($flightover_array)) {
-	    print '<div class="col-md-12">';
+		print '<div class="col-md-12">';
 	} else {
-            print '<div class="col-md-6">';
+			print '<div class="col-md-6">';
 	}
 ?>
                 <h2><?php echo _("Top 10 Most Common Pilots"); ?></h2>
@@ -188,23 +188,23 @@ 
 	$pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name,$year,$month);
 	if (count($pilot_array) == 0) print _("No data available");
 	else {
-	    print '<div id="chart7" class="chart" width="100%"></div><script>';
-	    $pilot_data = '';
-	    foreach($pilot_array as $pilot_item)
-	    {
+		print '<div id="chart7" class="chart" width="100%"></div><script>';
+		$pilot_data = '';
+		foreach($pilot_array as $pilot_item)
+		{
 		$pilot_data .= '["'.$pilot_item['pilot_name'].' ('.$pilot_item['pilot_id'].')",'.$pilot_item['pilot_count'].'],';
-	    }
-	    $pilot_data = substr($pilot_data, 0, -1);
-	    print 'var series = ['.$pilot_data.'];';
-	    print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';
-	    print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);';
-	    print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});';
-            print 'var pilotcnt = new d3pie("chart7",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":';
-	    print 'dataset';
-            print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});';
-            print '</script>';
-        }
-        print '<div class="more">';
+		}
+		$pilot_data = substr($pilot_data, 0, -1);
+		print 'var series = ['.$pilot_data.'];';
+		print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';
+		print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);';
+		print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});';
+			print 'var pilotcnt = new d3pie("chart7",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":';
+		print 'dataset';
+			print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});';
+			print '</script>';
+		}
+		print '<div class="more">';
 	print '<a href="'.$globalURL.'/statistics/pilot'; 
 	if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
 	print'" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a>';
@@ -214,7 +214,7 @@ 
         
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 <?php
-    } else {
+	} else {
 ?>
             <div class="col-md-6">
                 <h2><?php echo _("Top 10 Most Common Owners"); ?></h2>
@@ -222,21 +222,21 @@ 
 	$owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name,$year,$month);
 	if (count($owner_array) == 0) print _("No data available");
 	else {
-	    print '<div id="chart7" class="chart" width="100%"></div><script>';
-	    $owner_data = '';
-	    foreach($owner_array as $owner_item)
-	    {
+		print '<div id="chart7" class="chart" width="100%"></div><script>';
+		$owner_data = '';
+		foreach($owner_array as $owner_item)
+		{
 		$owner_data .= '["'.$owner_item['owner_name'].'",'.$owner_item['owner_count'].'],';
-	    }
-	    $owner_data = substr($owner_data, 0, -1);
-	    print 'var series = ['.$owner_data.'];';
-	    print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';
-	    print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);';
-	    print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});';
-            print 'var ownercnt = new d3pie("chart7",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":';
-	    print 'dataset';
-            print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});';
-	    print '</script>';
+		}
+		$owner_data = substr($owner_data, 0, -1);
+		print 'var series = ['.$owner_data.'];';
+		print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';
+		print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);';
+		print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});';
+			print 'var ownercnt = new d3pie("chart7",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":';
+		print 'dataset';
+			print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});';
+		print '</script>';
 	}
 ?>
                 <div class="more">
@@ -246,8 +246,8 @@ 
         
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 <?php
-    }
-    if (!empty($flightover_array)) {
+	}
+	if (!empty($flightover_array)) {
 ?>
             <div class="col-md-6">
                 <h2><?php echo _("Top 20 Most Common Country a Flight was Over"); ?></h2>
@@ -255,20 +255,20 @@ 
 	 //$flightover_array = $Stats->countAllFlightOverCountries();
 	if (count($flightover_array) == 0) print _("No data available");
 	else {
-	    print '<div id="chart10" class="chart" width="100%"></div><script>';
-	    print 'var series = [';
-            $flightover_data = '';
-	    foreach($flightover_array as $flightover_item)
-	    {
+		print '<div id="chart10" class="chart" width="100%"></div><script>';
+		print 'var series = [';
+			$flightover_data = '';
+		foreach($flightover_array as $flightover_item)
+		{
 		$flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],';
-	    }
-	    $flightover_data = substr($flightover_data, 0, -1);
-	    print $flightover_data;
-	    print '];';
-	    print 'var dataset = {};var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';
-	    print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);';
-	    print 'series.forEach(function(item){var iso = item[0], value = item[1]; dataset[iso] = { numberOfThings: value, fillColor: paletteScale(value) };});';
-	    print 'new Datamap({
+		}
+		$flightover_data = substr($flightover_data, 0, -1);
+		print $flightover_data;
+		print '];';
+		print 'var dataset = {};var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';
+		print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);';
+		print 'series.forEach(function(item){var iso = item[0], value = item[1]; dataset[iso] = { numberOfThings: value, fillColor: paletteScale(value) };});';
+		print 'new Datamap({
 		element: document.getElementById("chart10"),
 		projection: "mercator", // big world map
 		fills: { defaultFill: "#F5F5F5" },
@@ -293,7 +293,7 @@ 
         	    }
 		}
 	    });";
-	    print '</script>';
+		print '</script>';
 	}
 ?>
                 <div class="more">
@@ -301,7 +301,7 @@ 
                 </div>
             </div>
 <?php
-    }
+	}
 ?>
         </div>
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
@@ -311,13 +311,13 @@ 
         <div class="row column">
             <div class="col-md-6">
 <?php
-    $airport_airport_array = $Stats->countAllDepartureAirports(true,$airline_icao,$filter_name,$year,$month);
-    if (count($airport_airport_array) > 0) {
+	$airport_airport_array = $Stats->countAllDepartureAirports(true,$airline_icao,$filter_name,$year,$month);
+	if (count($airport_airport_array) > 0) {
 	print '<h2>'._("Top 10 Most Common Departure Airports").'</h2>';
 	print '<div id="chart3" class="chart" width="100%"></div><script>';
-        print "\n";
-        print 'var series = [';
-        $airport_data = '';
+		print "\n";
+		print 'var series = [';
+		$airport_data = '';
 	foreach($airport_airport_array as $airport_item)
 	{
 		$airport_data .= '[ "'.$airport_item['airport_departure_icao_count'].'", "'.$airport_item['airport_departure_icao'].'",'.$airport_item['airport_departure_latitude'].','.$airport_item['airport_departure_longitude'].'],';
@@ -366,20 +366,20 @@ 
 	print '<div class="more"><a href="'.$globalURL.'/statistics/airport-departure'; 
 	if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
 	print '" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
-    }
+	}
 ?>
             </div>
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 
             <div class="col-md-6">
 <?php
-    $airport_airport_array2 = $Stats->countAllArrivalAirports(true,$airline_icao,$filter_name,$year,$month);
-    if (count($airport_airport_array2) > 0) {
+	$airport_airport_array2 = $Stats->countAllArrivalAirports(true,$airline_icao,$filter_name,$year,$month);
+	if (count($airport_airport_array2) > 0) {
 	print '<h2>'._("Top 10 Most Common Arrival Airports").'</h2>';
 	print '<div id="chart4" class="chart" width="100%"></div><script>';
-        print "\n";
-        print 'var series = [';
-        $airport_data = '';
+		print "\n";
+		print 'var series = [';
+		$airport_data = '';
 	foreach($airport_airport_array2 as $airport_item)
 	{
 		$airport_data .= '[ "'.$airport_item['airport_arrival_icao_count'].'", "'.$airport_item['airport_arrival_icao'].'",'.$airport_item['airport_arrival_latitude'].','.$airport_item['airport_arrival_longitude'].'],';
@@ -429,28 +429,28 @@ 
 	print '<div class="more"><a href="'.$globalURL.'/statistics/airport-arrival';
 	if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
 	print '" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
-    }
+	}
 ?>
             </div>
         </div>
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 <?php
-    if ($year == '' && $month == '') {
+	if ($year == '' && $month == '') {
 ?>
         <div class="row column">
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
                 <?php
-                  $year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name);
-		    if (count($year_array) == 0) print _("No data available");
-		    else {
+				  $year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name);
+			if (count($year_array) == 0) print _("No data available");
+			else {
 			print '<div id="chart8" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
 			foreach($year_array as $year_item)
 			{
-			    $year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",';
-			    $year_cnt .= $year_item['date_count'].',';
+				$year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",';
+				$year_cnt .= $year_item['date_count'].',';
 			}
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
 			$year_cnt = "['flights',".substr($year_cnt,0,-1)."]";
@@ -460,8 +460,8 @@ 
                 	     columns: ['.$year_data.','.$year_cnt.'], types: { flights: "area"}, colors: { flights: "#1a3151"}},
                 	     axis: { x: { type: "timeseries", localtime: false,tick: { format: "%Y-%m"}}, y: { label: "# of Flights"}},legend: { show: false }});';
 			print '</script>';
-                    }
-                  ?>
+					}
+				  ?>
                 <div class="more">
                     <a href="<?php print $globalURL; ?>/statistics/year<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
@@ -470,16 +470,16 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
                 <?php
-                  $month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name);
-		    if (count($month_array) == 0) print _("No data available");
-		    else {
-                	print '<div id="chart9" class="chart" width="100%"></div><script>';
-                        $month_data = '';
+				  $month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name);
+			if (count($month_array) == 0) print _("No data available");
+			else {
+					print '<div id="chart9" class="chart" width="100%"></div><script>';
+						$month_data = '';
 			$month_cnt = '';
 			foreach($month_array as $month_item)
 			{
-			    $month_data .= '"'.$month_item['date_name'].'",';
-			    $month_cnt .= $month_item['date_count'].',';
+				$month_data .= '"'.$month_item['date_name'].'",';
+				$month_cnt .= $month_item['date_count'].',';
 			}
 			$month_data = "['x',".substr($month_data, 0, -1)."]";
 			$month_cnt = "['flights',".substr($month_cnt,0,-1)."]";
@@ -489,9 +489,9 @@ 
                 	     columns: ['.$month_data.','.$month_cnt.'], types: { flights: "area"}, colors: { flights: "#1a3151"}},
                 	     axis: { x: { type: "timeseries", localtime: false,tick: { format: "%Y-%m-%d"}}, y: { label: "# of Flights"}},legend: { show: false }});';
 			
-            		print '</script>';
-                    }
-                  ?>
+					print '</script>';
+					}
+				  ?>
                 <div class="more">
                     <a href="<?php print $globalURL; ?>/statistics/month<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
@@ -501,16 +501,16 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
                 <?php
-                    $date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name);
-		    if (empty($date_array)) print _("No data available");
-		    else {
-                	print '<div id="chart5" class="chart" width="100%"></div><script>';
-                        $date_data = '';
+					$date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name);
+			if (empty($date_array)) print _("No data available");
+			else {
+					print '<div id="chart5" class="chart" width="100%"></div><script>';
+						$date_data = '';
 			$date_cnt = '';
 			foreach($date_array as $date_item)
 			{
-			    $date_data .= '"'.$date_item['date_name'].'",';
-			    $date_cnt .= $date_item['date_count'].',';
+				$date_data .= '"'.$date_item['date_name'].'",';
+				$date_cnt .= $date_item['date_count'].',';
 			}
 			$date_data = "['x',".substr($date_data, 0, -1)."]";
 			$date_cnt = "['flights',".substr($date_cnt,0,-1)."]";
@@ -520,9 +520,9 @@ 
                 	     columns: ['.$date_data.','.$date_cnt.'], types: { flights: "area"}, colors: { flights: "#1a3151"}},
                 	     axis: { x: { type: "timeseries",tick: { format: "%Y-%m-%d"}}, y: { label: "# of Flights"}},legend: { show: false }});';
 			
-                	print '</script>';
-                    }
-                  ?>
+					print '</script>';
+					}
+				  ?>
                 <div class="more">
                     <a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
@@ -531,16 +531,16 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
                 <?php
-                  $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name);
-		    if (empty($hour_array)) print _("No data available");
-		    else {
-                	print '<div id="chart6" class="chart" width="100%"></div><script>';
-                        $hour_data = '';
+				  $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name);
+			if (empty($hour_array)) print _("No data available");
+			else {
+					print '<div id="chart6" class="chart" width="100%"></div><script>';
+						$hour_data = '';
 			$hour_cnt = '';
 			foreach($hour_array as $hour_item)
 			{
-			    $hour_data .= '"'.$hour_item['hour_name'].':00",';
-			    $hour_cnt .= $hour_item['hour_count'].',';
+				$hour_data .= '"'.$hour_item['hour_name'].':00",';
+				$hour_cnt .= $hour_item['hour_count'].',';
 			}
 			$hour_data = "[".substr($hour_data, 0, -1)."]";
 			$hour_cnt = "['flights',".substr($hour_cnt,0,-1)."]";
@@ -550,9 +550,9 @@ 
                 	     columns: ['.$hour_cnt.'], types: { flights: "area"}, colors: { flights: "#1a3151"}},
                 	     axis: { x: { type: "category", categories: '.$hour_data.'},y: { label: "# of Flights"}},legend: { show: false }});';
 
-            	     print '</script>';
-                  }
-                ?>
+					 print '</script>';
+				  }
+				?>
                 <div class="more">
                     <a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
@@ -560,26 +560,26 @@ 
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
         </div>
 <?php
-    }
+	}
 ?>
 
 <?php
-    if (($airline_icao == '' || $airline_icao == 'all') && $year == '' && $month == '' && isset($globalAccidents) && $globalAccidents) {
+	if (($airline_icao == '' || $airline_icao == 'all') && $year == '' && $month == '' && isset($globalAccidents) && $globalAccidents) {
 ?>
         <div class="row column">
             <div class="col-md-6">
                 <h2><?php echo _("Fatalities by Years"); ?></h2>
                 <?php
-                  $year_array = $Stats->countFatalitiesByYear();
-		    if (count($year_array) == 0) print _("No data available");
-		    else {
+				  $year_array = $Stats->countFatalitiesByYear();
+			if (count($year_array) == 0) print _("No data available");
+			else {
 			print '<div id="chart32" class="chart" width="100%"></div><script>';
-                        $year_data = '';
+						$year_data = '';
 			$year_cnt = '';
 			foreach($year_array as $year_item)
 			{
-			    $year_data .= '"'.$year_item['year'].'-01-01",';
-			    $year_cnt .= $year_item['count'].',';
+				$year_data .= '"'.$year_item['year'].'-01-01",';
+				$year_cnt .= $year_item['count'].',';
 			}
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
 			$year_cnt = "['flights',".substr($year_cnt,0,-1)."]";
@@ -590,8 +590,8 @@ 
                 	     axis: { x: { type: "timeseries",tick: { format: "%Y"}}, y: { label: "# of Fatalities"}},legend: { show: false }});';
 
 			print '</script>';
-		    }
-                  ?>
+			}
+				  ?>
                 <div class="more">
                     <a href="<?php print $globalURL; ?>/statistics/fatalities/year" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
@@ -602,16 +602,16 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Fatalities last 12 Months"); ?></h2>
                 <?php
-                  $year_array = $Stats->countFatalitiesLast12Months();
-		    if (count($year_array) == 0) print _("No data available");
-		    else {
+				  $year_array = $Stats->countFatalitiesLast12Months();
+			if (count($year_array) == 0) print _("No data available");
+			else {
 			print '<div id="chart33" class="chart" width="100%"></div><script>';
-                        $year_data = '';
+						$year_data = '';
 			$year_cnt = '';
 			foreach($year_array as $year_item)
 			{
-			    $year_data .= '"'.$year_item['year'].'-'.$year_item['month'].'-01",';
-			    $year_cnt .= $year_item['count'].',';
+				$year_data .= '"'.$year_item['year'].'-'.$year_item['month'].'-01",';
+				$year_cnt .= $year_item['count'].',';
 			}
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
 			$year_cnt = "['flights',".substr($year_cnt,0,-1)."]";
@@ -621,8 +621,8 @@ 
                 	     columns: ['.$year_data.','.$year_cnt.'], types: { flights: "area"}, colors: { flights: "#1a3151"}},
                 	     axis: { x: { type: "timeseries",tick: { format: "%Y-%m"}}, y: { label: "# of Fatalities"}},legend: { show: false }});';
 			print '</script>';
-		    }
-                  ?>
+			}
+				  ?>
                 <div class="more">
                     <a href="<?php print $globalURL; ?>/statistics/fatalities/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
@@ -630,30 +630,30 @@ 
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 <br/>
 <?php
-    }
+	}
 ?>
 
 <?php
-    if (($airline_icao == '' || $airline_icao == 'all') && $filter_name == '' && $year == '' && $month == '') {
+	if (($airline_icao == '' || $airline_icao == 'all') && $filter_name == '' && $year == '' && $month == '') {
 ?>
         <div class="row column">
         	<?php
-        	    //$polar = $Stats->getStatsSource(date('Y-m-d'),'polar');
-        	    if ($year == '' && $month == '') {
-		        $polar = $Stats->getStatsSource('polar',date('Y'),date('m'),date('d'));
-		    } else {
-        		$polar = $Stats->getStatsSource('polar',$year,$month);
-        	    }
-        	    if (!empty($polar)) {
-            		print '<h2>'._("Coverage pattern").'</h2>';
-        		foreach ($polar as $eachpolar) {
-        		    unset($polar_data);
-	        	    $Spotter = new Spotter();
-        		    $data = json_decode($eachpolar['source_data']);
-        		    foreach($data as $value => $key) {
-        			$direction = $Spotter->parseDirection(($value*22.5));
-        			$distance = $key;
-        			$unit = 'km';
+				//$polar = $Stats->getStatsSource(date('Y-m-d'),'polar');
+				if ($year == '' && $month == '') {
+				$polar = $Stats->getStatsSource('polar',date('Y'),date('m'),date('d'));
+			} else {
+				$polar = $Stats->getStatsSource('polar',$year,$month);
+				}
+				if (!empty($polar)) {
+					print '<h2>'._("Coverage pattern").'</h2>';
+				foreach ($polar as $eachpolar) {
+					unset($polar_data);
+					$Spotter = new Spotter();
+					$data = json_decode($eachpolar['source_data']);
+					foreach($data as $value => $key) {
+					$direction = $Spotter->parseDirection(($value*22.5));
+					$distance = $key;
+					$unit = 'km';
 				if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
 					$distance = round($distance*0.539957);
 					$unit = 'nm';
@@ -664,10 +664,10 @@ 
 					$distance = $distance;
 					$unit = 'km';
 				}
-        			if (!isset($polar_data)) $polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
-        	    		else $polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
-        		    }
-        	?>
+					if (!isset($polar_data)) $polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
+						else $polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
+					}
+			?>
             <div class="col-md-6">
                 <h4><?php print $eachpolar['source_name']; ?></h4>
         	<div id="polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div>
@@ -699,27 +699,27 @@ 
 		</script>
             </div>
             <?php
-        	    }
-        	}
-            ?>
+				}
+			}
+			?>
         </div>
         <div class="row column">
             <div class="col-md-6">
         	<?php
-        	    //$msg = $Stats->getStatsSource(date('Y-m-d'),'msg');
-        	    if ($year == '' && $month == '') {
-        		$msg = $Stats->getStatsSource('msg',date('Y'),date('m'),date('d'));
-        	    } else {
-        		$msg = $Stats->getStatsSource('msg',$year,$month);
-        	    }
-        	    if (!empty($msg)) {
-            		print '<h2>'._("Messages received").'</h2>';
-        		foreach ($msg as $eachmsg) {
-        		    //$eachmsg = $msg[0];
-        		    $data = $eachmsg['source_data'];
-        		    if ($data > 500) $max = (round(($data+100)/100))*100;
-        		    else $max = 500;
-        	?>
+				//$msg = $Stats->getStatsSource(date('Y-m-d'),'msg');
+				if ($year == '' && $month == '') {
+				$msg = $Stats->getStatsSource('msg',date('Y'),date('m'),date('d'));
+				} else {
+				$msg = $Stats->getStatsSource('msg',$year,$month);
+				}
+				if (!empty($msg)) {
+					print '<h2>'._("Messages received").'</h2>';
+				foreach ($msg as $eachmsg) {
+					//$eachmsg = $msg[0];
+					$data = $eachmsg['source_data'];
+					if ($data > 500) $max = (round(($data+100)/100))*100;
+					else $max = 500;
+			?>
         	<div id="msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div>
         	<script>
 		      var g = new JustGage({
@@ -735,9 +735,9 @@ 
 			  });
 		</script>
             <?php
-        	   }
-        	}
-            ?>
+			   }
+			}
+			?>
             </div>
         </div>
         <div class="row column">
@@ -775,26 +775,26 @@ 
 			//$hist_data = substr($hist_data, 0, -1);
 			$distance_data = "['x',".substr($distance_data, 0, -1)."]";
 			$nb_data = "['flights',".substr($nb_data, 0, -1)."]";
-            ?>
+			?>
             <div class="col-md-6">
                 <h2><?php echo sprintf(_("Flights Distance for %s"),$source); ?></h2>
                 <?php
-                    print '<div id="charthist-'.str_replace(' ','_',strtolower($source)).'" class="chart" width="100%"></div><script>';
-		    print 'c3.generate({
+					print '<div id="charthist-'.str_replace(' ','_',strtolower($source)).'" class="chart" width="100%"></div><script>';
+			print 'c3.generate({
 			bindto: "#charthist-'.str_replace(' ','_',strtolower($source)).'",
 			data: { x: "x",
 			columns: ['.$distance_data.','.$nb_data.'], types: { flights: "area"}, colors: { flights: "#1a3151"}},
 			axis: { x: {label : { text: "Distance in '.$unit.'", position: "outer-right"}}, y: { label: "# of Flights"}},legend: { show: false }});';
-		    print '</script>';
-        	?>
+			print '</script>';
+			?>
     	    </div>
 	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
         	<?php
-                  }
-                ?>
+				  }
+				?>
         </div>
 <?php
-    }
+	}
 ?>
     </div>
 </div>  

require/class.Image.php

Indentation +102 added lines, -102 removed lines

@@ -12,11 +12,11 @@ 
 	}
 
 	/**
-	* Gets the images based on the aircraft registration
-	*
-	* @return Array the images list
-	*
-	*/
+	 * Gets the images based on the aircraft registration
+	 *
+	 * @return Array the images list
+	 *
+	 */
 	public function getSpotterImage($registration,$aircraft_icao = '', $airline_icao = '')
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -37,11 +37,11 @@ 
 	}
 
 	/**
-	* Gets the images based on the ship name
-	*
-	* @return Array the images list
-	*
-	*/
+	 * Gets the images based on the ship name
+	 *
+	 * @return Array the images list
+	 *
+	 */
 	public function getMarineImage($mmsi,$imo = '',$name = '')
 	{
 		$mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING);
@@ -68,11 +68,11 @@ 
 	}
 
 	/**
-	* Gets the image copyright based on the Exif data
-	*
-	* @return String image copyright
-	*
-	*/
+	 * Gets the image copyright based on the Exif data
+	 *
+	 * @return String image copyright
+	 *
+	 */
 	public function getExifCopyright($url) {
 		$exif = exif_read_data($url);
 		$copyright = '';
@@ -87,11 +87,11 @@ 
 	}
 
 	/**
-	* Adds the images based on the aircraft registration
-	*
-	* @return String either success or error
-	*
-	*/
+	 * Adds the images based on the aircraft registration
+	 *
+	 * @return String either success or error
+	 *
+	 */
 	public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '')
 	{
 		global $globalDebug,$globalAircraftImageFetch;
@@ -119,11 +119,11 @@ 
 	}
 
 	/**
-	* Adds the images based on the marine name
-	*
-	* @return String either success or error
-	*
-	*/
+	 * Adds the images based on the marine name
+	 *
+	 * @return String either success or error
+	 *
+	 */
 	public function addMarineImage($mmsi,$imo = '',$name = '')
 	{
 		global $globalDebug,$globalMarineImageFetch;
@@ -160,12 +160,12 @@ 
 	}
 
 	/**
-	* Gets the aircraft image
-	*
-	* @param String $aircraft_registration the registration of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function findAircraftImage($aircraft_registration, $aircraft_icao = '', $airline_icao = '')
 	{
 		global $globalAircraftImageSources, $globalIVAO, $globalAircraftImageCheckICAO, $globalVA;
@@ -209,14 +209,14 @@ 
 	}
 
 	/**
-	* Gets the vessel image
-	*
-	* @param String $mmsi the vessel mmsi
-	* @param String $imo the vessel imo
-	* @param String $name the vessel name
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the vessel image
+	 *
+	 * @param String $mmsi the vessel mmsi
+	 * @param String $imo the vessel imo
+	 * @param String $name the vessel name
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function findMarineImage($mmsi,$imo = '',$name = '')
 	{
 		global $globalMarineImageSources;
@@ -250,13 +250,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from Planespotters
-	*
-	* @param String $aircraft_registration the registration of the aircraft
-	* @param String $aircraft_name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from Planespotters
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromPlanespotters($type,$aircraft_registration, $aircraft_name='') {
 		$Common = new Common();
 		// If aircraft registration is only number, also check with aircraft model
@@ -283,13 +283,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from Deviantart
-	*
-	* @param String $registration the registration of the aircraft
-	* @param String $name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from Deviantart
+	 *
+	 * @param String $registration the registration of the aircraft
+	 * @param String $name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromDeviantart($type,$registration, $name='') {
 		$Common = new Common();
 		if ($type == 'aircraft') {
@@ -321,13 +321,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from JetPhotos
-	*
-	* @param String $aircraft_registration the registration of the aircraft
-	* @param String $aircraft_name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from JetPhotos
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromJetPhotos($type,$aircraft_registration, $aircraft_name='') {
 		$Common = new Common();
 		$url= 'http://jetphotos.net/showphotos.php?displaymode=2&regsearch='.$aircraft_registration;
@@ -363,13 +363,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from PlanePictures
-	*
-	* @param String $aircraft_registration the registration of the aircraft
-	* @param String $aircraft_name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from PlanePictures
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromPlanePictures($type,$aircraft_registration, $aircraft_name='') {
 		$Common = new Common();
 		$url= 'http://www.planepictures.net/netsearch4.cgi?srch='.$aircraft_registration.'&stype=reg&srng=2';
@@ -397,13 +397,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from Flickr
-	*
-	* @param String $registration the registration of the aircraft
-	* @param String $name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from Flickr
+	 *
+	 * @param String $registration the registration of the aircraft
+	 * @param String $name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromFlickr($type,$registration,$name='') {
 		$Common = new Common();
 		if ($type == 'aircraft') {
@@ -446,13 +446,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from Bing
-	*
-	* @param String $aircraft_registration the registration of the aircraft
-	* @param String $aircraft_name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from Bing
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromBing($type,$aircraft_registration,$aircraft_name='') {
 		global $globalImageBingKey;
 		$Common = new Common();
@@ -478,13 +478,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from airport-data
-	*
-	* @param String $aircraft_registration the registration of the aircraft
-	* @param String $aircraft_name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from airport-data
+	 *
+	 * @param String $aircraft_registration the registration of the aircraft
+	 * @param String $aircraft_name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromAirportData($type,$aircraft_registration,$aircraft_name='') {
 		$Common = new Common();
 		$url = 'http://www.airport-data.com/api/ac_thumb.json?&n=1&r='.$aircraft_registration;
@@ -503,13 +503,13 @@ 
 	}
 
 	/**
-	* Gets image from WikiMedia
-	*
-	* @param String $registration the registration of the aircraft/mmsi
-	* @param String $name name
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets image from WikiMedia
+	 *
+	 * @param String $registration the registration of the aircraft/mmsi
+	 * @param String $name name
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromWikimedia($type,$registration,$name='') {
 		$Common = new Common();
 		if ($type == 'aircraft') {
@@ -564,13 +564,13 @@ 
 	}
 
 	/**
-	* Gets the aircraft image from custom url
-	*
-	* @param String $registration the registration of the aircraft
-	* @param String $name type of the aircraft
-	* @return Array the aircraft thumbnail, orignal url and copyright
-	*
-	*/
+	 * Gets the aircraft image from custom url
+	 *
+	 * @param String $registration the registration of the aircraft
+	 * @param String $name type of the aircraft
+	 * @return Array the aircraft thumbnail, orignal url and copyright
+	 *
+	 */
 	public function fromCustomSource($type,$registration,$name='') {
 		global $globalAircraftImageCustomSources, $globalMarineImageCustomSources, $globalDebug;
 		//$globalAircraftImageCustomSource[] = array('thumbnail' => '','original' => '', 'copyright' => '', 'source_website' => '', 'source' => '','exif' => true);

install/class.update_schema.php

Indentation +618 added lines, -618 removed lines

@@ -8,18 +8,18 @@ 
 class update_schema {
 
 	public static function update_schedule() {
-	    $Connection = new Connection();
-	    $Schedule = new Schedule();
-	    $query = "SELECT * FROM schedule";
-            try {
-            	$sth = $Connection->db->prepare($query);
+		$Connection = new Connection();
+		$Schedule = new Schedule();
+		$query = "SELECT * FROM schedule";
+			try {
+				$sth = $Connection->db->prepare($query);
 		$sth->execute();
-    	    } catch(PDOException $e) {
+			} catch(PDOException $e) {
 		return "error : ".$e->getMessage()."\n";
-    	    }
-    	    while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
-    		$Schedule->addSchedule($row['ident'],$row['departure_airport_icao'],$row['departure_airport_time'],$row['arrival_airport_icao'],$row['arrival_airport_time']);
-    	    }
+			}
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
+			$Schedule->addSchedule($row['ident'],$row['departure_airport_icao'],$row['departure_airport_time'],$row['arrival_airport_icao'],$row['arrival_airport_time']);
+			}
 	
 	}
 /*
@@ -43,198 +43,198 @@ 
     	}
 */	
 	private static function update_from_1() {
-    		$Connection = new Connection();
-    		// Add new column to routes table
-    		//$query = "ALTER TABLE `routes` ADD `FromAirport_Time` VARCHAR(10),`ToAirport_Time` VARCHAR(10),`Source` VARCHAR(255),`date_added` DATETIME DEFAULT CURRENT TIMESTAMP,`date_modified` DATETIME,`date_lastseen` DATETIME";
+			$Connection = new Connection();
+			// Add new column to routes table
+			//$query = "ALTER TABLE `routes` ADD `FromAirport_Time` VARCHAR(10),`ToAirport_Time` VARCHAR(10),`Source` VARCHAR(255),`date_added` DATETIME DEFAULT CURRENT TIMESTAMP,`date_modified` DATETIME,`date_lastseen` DATETIME";
 		$query = "ALTER TABLE `routes` ADD `FromAirport_Time` VARCHAR(10) NULL , ADD `ToAirport_Time` VARCHAR(10) NULL , ADD `Source` VARCHAR(255) NULL, ADD `date_added` timestamp DEFAULT CURRENT_TIMESTAMP, ADD `date_modified` timestamp NULL, ADD `date_lastseen` timestamp NULL";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add new columns to routes table) : ".$e->getMessage()."\n";
-    		}
-    		// Copy schedules data to routes table
-    		self::update_schedule();
-    		// Delete schedule table
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add new columns to routes table) : ".$e->getMessage()."\n";
+			}
+			// Copy schedules data to routes table
+			self::update_schedule();
+			// Delete schedule table
 		$query = "DROP TABLE `schedule`";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (delete schedule table) : ".$e->getMessage()."\n";
-    		}
-    		// Add source column
-    		$query = "ALTER TABLE `aircraft_modes` ADD `Source` VARCHAR(255) NULL";
-    		try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add source column to aircraft_modes) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (delete schedule table) : ".$e->getMessage()."\n";
+			}
+			// Add source column
+			$query = "ALTER TABLE `aircraft_modes` ADD `Source` VARCHAR(255) NULL";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add source column to aircraft_modes) : ".$e->getMessage()."\n";
+			}
 		// Delete unused column
 		$query = "ALTER TABLE `aircraft_modes`  DROP `SerialNo`,  DROP `OperatorFlagCode`,  DROP `Manufacturer`,  DROP `Type`,  DROP `FirstRegDate`,  DROP `CurrentRegDate`,  DROP `Country`,  DROP `PreviousID`,  DROP `DeRegDate`,  DROP `Status`,  DROP `PopularName`,  DROP `GenericName`,  DROP `AircraftClass`,  DROP `Engines`,  DROP `OwnershipStatus`,  DROP `RegisteredOwners`,  DROP `MTOW`,  DROP `TotalHours`,  DROP `YearBuilt`,  DROP `CofACategory`,  DROP `CofAExpiry`,  DROP `UserNotes`,  DROP `Interested`,  DROP `UserTag`,  DROP `InfoUrl`,  DROP `PictureUrl1`,  DROP `PictureUrl2`,  DROP `PictureUrl3`,  DROP `UserBool1`,  DROP `UserBool2`,  DROP `UserBool3`,  DROP `UserBool4`,  DROP `UserBool5`,  DROP `UserString1`,  DROP `UserString2`,  DROP `UserString3`,  DROP `UserString4`,  DROP `UserString5`,  DROP `UserInt1`,  DROP `UserInt2`,  DROP `UserInt3`,  DROP `UserInt4`,  DROP `UserInt5`";
-    		try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (Delete unused column of aircraft_modes) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (Delete unused column of aircraft_modes) : ".$e->getMessage()."\n";
+			}
 		// Add ModeS column
 		$query = "ALTER TABLE `spotter_output`  ADD `ModeS` VARCHAR(255) NULL";
-    		try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (Add ModeS column in spotter_output) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (Add ModeS column in spotter_output) : ".$e->getMessage()."\n";
+			}
 		$query = "ALTER TABLE `spotter_live`  ADD `ModeS` VARCHAR(255)";
-    		try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (Add ModeS column in spotter_live) : ".$e->getMessage()."\n";
-    		}
-    		// Add auto_increment for aircraft_modes
-    		$query = "ALTER TABLE `aircraft_modes` CHANGE `AircraftID` `AircraftID` INT(11) NOT NULL AUTO_INCREMENT";
-    		try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (Add Auto increment in aircraft_modes) : ".$e->getMessage()."\n";
-    		}
-    		$error = '';
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (Add ModeS column in spotter_live) : ".$e->getMessage()."\n";
+			}
+			// Add auto_increment for aircraft_modes
+			$query = "ALTER TABLE `aircraft_modes` CHANGE `AircraftID` `AircraftID` INT(11) NOT NULL AUTO_INCREMENT";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (Add Auto increment in aircraft_modes) : ".$e->getMessage()."\n";
+			}
+			$error = '';
 		$error .= create_db::import_file('../db/acars_live.sql');
 		$error .= create_db::import_file('../db/config.sql');
 		// Update schema_version to 2
 		$query = "UPDATE `config` SET `value` = '2' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
-        }
+		}
 
 	private static function update_from_2() {
-    		$Connection = new Connection();
-    		// Add new column decode to acars_live table
+			$Connection = new Connection();
+			// Add new column decode to acars_live table
 		$query = "ALTER TABLE `acars_live` ADD `decode` TEXT";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add new columns to routes table) : ".$e->getMessage()."\n";
-    		}
-    		$error = '';
-    		// Create table acars_archive
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add new columns to routes table) : ".$e->getMessage()."\n";
+			}
+			$error = '';
+			// Create table acars_archive
 		$error .= create_db::import_file('../db/acars_archive.sql');
 		// Update schema_version to 3
 		$query = "UPDATE `config` SET `value` = '3' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_3() {
-    		$Connection = new Connection();
-    		// Add default CURRENT_TIMESTAMP to aircraft_modes column FirstCreated
+			$Connection = new Connection();
+			// Add default CURRENT_TIMESTAMP to aircraft_modes column FirstCreated
 		$query = "ALTER TABLE `aircraft_modes` CHANGE `FirstCreated` `FirstCreated` timestamp DEFAULT CURRENT_TIMESTAMP";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add new columns to aircraft_modes) : ".$e->getMessage()."\n";
-    		}
-    		// Add image_source_website column to spotter_image
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add new columns to aircraft_modes) : ".$e->getMessage()."\n";
+			}
+			// Add image_source_website column to spotter_image
 		$query = "ALTER TABLE `spotter_image` ADD `image_source_website` VARCHAR(999) NULL";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add new columns to spotter_image) : ".$e->getMessage()."\n";
-    		}
-    		$error = '';
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add new columns to spotter_image) : ".$e->getMessage()."\n";
+			}
+			$error = '';
 		// Update schema_version to 4
 		$query = "UPDATE `config` SET `value` = '4' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 	
 	private static function update_from_4() {
-    		$Connection = new Connection();
+			$Connection = new Connection();
 	
-    		$error = '';
-    		// Create table acars_label
+			$error = '';
+			// Create table acars_label
 		$error .= create_db::import_file('../db/acars_label.sql');
 		if ($error == '') {
-		    // Update schema_version to 5
-		    $query = "UPDATE `config` SET `value` = '5' WHERE `name` = 'schema_version'";
-        	    try {
-            		$sth = $Connection->db->prepare($query);
+			// Update schema_version to 5
+			$query = "UPDATE `config` SET `value` = '5' WHERE `name` = 'schema_version'";
+				try {
+					$sth = $Connection->db->prepare($query);
 			$sth->execute();
-    		    } catch(PDOException $e) {
+				} catch(PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
-    		    }
-    		}
+				}
+			}
 		return $error;
 	}
 
 	private static function update_from_5() {
-    		$Connection = new Connection();
-    		// Add columns to translation
+			$Connection = new Connection();
+			// Add columns to translation
 		$query = "ALTER TABLE `translation` ADD `Source` VARCHAR(255) NULL, ADD `date_added` timestamp DEFAULT CURRENT_TIMESTAMP , ADD `date_modified` timestamp DEFAULT CURRENT_TIMESTAMP ;";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add new columns to translation) : ".$e->getMessage()."\n";
-    		}
-    		// Add aircraft_shadow column to aircraft
-    		$query = "ALTER TABLE `aircraft` ADD `aircraft_shadow` VARCHAR(255) NULL";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add new column to aircraft) : ".$e->getMessage()."\n";
-    		}
-    		// Add aircraft_shadow column to spotter_live
-    		$query = "ALTER TABLE `spotter_live` ADD `aircraft_shadow` VARCHAR(255) NULL";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add new column to spotter_live) : ".$e->getMessage()."\n";
-    		}
-    		$error = '';
-    		// Update table aircraft
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add new columns to translation) : ".$e->getMessage()."\n";
+			}
+			// Add aircraft_shadow column to aircraft
+			$query = "ALTER TABLE `aircraft` ADD `aircraft_shadow` VARCHAR(255) NULL";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add new column to aircraft) : ".$e->getMessage()."\n";
+			}
+			// Add aircraft_shadow column to spotter_live
+			$query = "ALTER TABLE `spotter_live` ADD `aircraft_shadow` VARCHAR(255) NULL";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add new column to spotter_live) : ".$e->getMessage()."\n";
+			}
+			$error = '';
+			// Update table aircraft
 		$error .= create_db::import_file('../db/aircraft.sql');
 		$error .= create_db::import_file('../db/spotter_archive.sql');
 
 		// Update schema_version to 6
 		$query = "UPDATE `config` SET `value` = '6' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_6() {
-    		$Connection = new Connection();
-    		if (!$Connection->indexExists('spotter_output','flightaware_id')) {
-    		    $query = "ALTER TABLE spotter_output ADD INDEX(flightaware_id);
+			$Connection = new Connection();
+			if (!$Connection->indexExists('spotter_output','flightaware_id')) {
+				$query = "ALTER TABLE spotter_output ADD INDEX(flightaware_id);
 			ALTER TABLE spotter_output ADD INDEX(date);
 			ALTER TABLE spotter_output ADD INDEX(ident);
 			ALTER TABLE spotter_live ADD INDEX(flightaware_id);
@@ -247,147 +247,147 @@ 
 			ALTER TABLE aircraft ADD INDEX(icao);
 			ALTER TABLE airport ADD INDEX(icao);
 			ALTER TABLE translation ADD INDEX(Operator);";
-        	    try {
-            		$sth = $Connection->db->prepare($query);
+				try {
+					$sth = $Connection->db->prepare($query);
 			$sth->execute();
-    		    } catch(PDOException $e) {
+				} catch(PDOException $e) {
 			return "error (add some indexes) : ".$e->getMessage()."\n";
-    		    }
-    		}
-    		$error = '';
-    		// Update table countries
-    		if ($Connection->tableExists('airspace')) {
-    		    $error .= update_db::update_countries();
-		    if ($error != '') return $error;
+				}
+			}
+			$error = '';
+			// Update table countries
+			if ($Connection->tableExists('airspace')) {
+				$error .= update_db::update_countries();
+			if ($error != '') return $error;
 		}
 		// Update schema_version to 7
 		$query = "UPDATE `config` SET `value` = '7' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
-    	}
+		}
 
 	private static function update_from_7() {
 		global $globalDBname, $globalDBdriver;
-    		$Connection = new Connection();
-    		$query="ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
+			$Connection = new Connection();
+			$query="ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
     			ALTER TABLE spotter_output ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add pilot column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
-    		}
-    		if ($globalDBdriver == 'mysql') {
-    		    $query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
-		    try {
-            		$sth = $Connection->db->prepare($query);
-			$sth->execute();
-    		    } catch(PDOException $e) {
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add pilot column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
+			}
+			if ($globalDBdriver == 'mysql') {
+				$query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+				} catch(PDOException $e) {
 			return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
-    		    }
-    		    $row = $sth->fetch(PDO::FETCH_ASSOC);
-    		    if ($row['engine'] == 'ARCHIVE') {
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['engine'] == 'ARCHIVE') {
 			$query = "CREATE TABLE copy LIKE spotter_archive; 
 				ALTER TABLE copy ENGINE=ARCHIVE;
 				ALTER TABLE copy ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
 				INSERT INTO copy SELECT *, '' as pilot_name, '' as pilot_id FROM spotter_archive ORDER BY `spotter_archive_id`;
 				DROP TABLE spotter_archive;
 				RENAME TABLE copy TO spotter_archive;";
-            	    } else {
-    			$query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
-            	    }
-                } else {
-    		    $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
-                }
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add pilot column to spotter_archive) : ".$e->getMessage()."\n";
-    		}
+					} else {
+				$query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
+					}
+				} else {
+				$query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
+				}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add pilot column to spotter_archive) : ".$e->getMessage()."\n";
+			}
 
-    		$error = '';
-    		// Update table aircraft
+			$error = '';
+			// Update table aircraft
 		$error .= create_db::import_file('../db/source_location.sql');
 		if ($error != '') return $error;
 		// Update schema_version to 6
 		$query = "UPDATE `config` SET `value` = '8' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_8() {
-    		$Connection = new Connection();
-    		$error = '';
-    		// Update table aircraft
+			$Connection = new Connection();
+			$error = '';
+			// Update table aircraft
 		$error .= create_db::import_file('../db/notam.sql');
 		if ($error != '') return $error;
 		$query = "DELETE FROM config WHERE name = 'last_update_db';
                         INSERT INTO config (name,value) VALUES ('last_update_db',NOW());
                         DELETE FROM config WHERE name = 'last_update_notam_db';
                         INSERT INTO config (name,value) VALUES ('last_update_notam_db',NOW());";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (insert last_update values) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (insert last_update values) : ".$e->getMessage()."\n";
+			}
 		$query = "UPDATE `config` SET `value` = '9' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_9() {
-    		$Connection = new Connection();
-    		$query="ALTER TABLE spotter_live ADD verticalrate INT(11) NULL;
+			$Connection = new Connection();
+			$query="ALTER TABLE spotter_live ADD verticalrate INT(11) NULL;
     			ALTER TABLE spotter_output ADD verticalrate INT(11) NULL;";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add verticalrate column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add verticalrate column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
+			}
 		$error = '';
-    		// Update table atc
+			// Update table atc
 		$error .= create_db::import_file('../db/atc.sql');
 		if ($error != '') return $error;
 		
 		$query = "UPDATE `config` SET `value` = '10' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_10() {
-    		$Connection = new Connection();
-    		$query="ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add new enum to ATC table) : ".$e->getMessage()."\n";
-    		}
+			$Connection = new Connection();
+			$query="ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add new enum to ATC table) : ".$e->getMessage()."\n";
+			}
 		$error = '';
-    		// Add tables
+			// Add tables
 		$error .= create_db::import_file('../db/aircraft_owner.sql');
 		if ($error != '') return $error;
 		$error .= create_db::import_file('../db/metar.sql');
@@ -398,76 +398,76 @@ 
 		if ($error != '') return $error;
 		
 		$query = "UPDATE `config` SET `value` = '11' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_11() {
 		global $globalDBdriver, $globalDBname;
-    		$Connection = new Connection();
-    		$query="ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add owner_name & format_source column to spotter_output) : ".$e->getMessage()."\n";
-    		}
-    		$query="ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (format_source column to spotter_live) : ".$e->getMessage()."\n";
-    		}
-    		if ($globalDBdriver == 'mysql') {
-    		    $query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
-		    try {
-            		$sth = $Connection->db->prepare($query);
-			$sth->execute();
-    		    } catch(PDOException $e) {
+			$Connection = new Connection();
+			$query="ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add owner_name & format_source column to spotter_output) : ".$e->getMessage()."\n";
+			}
+			$query="ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (format_source column to spotter_live) : ".$e->getMessage()."\n";
+			}
+			if ($globalDBdriver == 'mysql') {
+				$query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+				} catch(PDOException $e) {
 			return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
-    		    }
-    		    $row = $sth->fetch(PDO::FETCH_ASSOC);
-    		    if ($row['engine'] == 'ARCHIVE') {
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['engine'] == 'ARCHIVE') {
 			$query = "CREATE TABLE copy LIKE spotter_archive; 
 				ALTER TABLE copy ENGINE=ARCHIVE;
 				ALTER TABLE copy ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE;
 				INSERT INTO copy SELECT *, '' as verticalrate, '' as format_source, '0' as ground FROM spotter_archive ORDER BY `spotter_archive_id`;
 				DROP TABLE spotter_archive;
 				RENAME TABLE copy TO spotter_archive;";
-            	    } else {
-    			$query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
-            	    }
-                } else {
-    		    $query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
-                }
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add columns to spotter_archive) : ".$e->getMessage()."\n";
-    		}
+					} else {
+				$query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
+					}
+				} else {
+				$query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
+				}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add columns to spotter_archive) : ".$e->getMessage()."\n";
+			}
 
 		$error = '';
 		
 		$query = "UPDATE `config` SET `value` = '12' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 	private static function update_from_12() {
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
-    		// Add tables
+			// Add tables
 		$error .= create_db::import_file('../db/stats.sql');
 		if ($error != '') return $error;
 		$error .= create_db::import_file('../db/stats_aircraft.sql');
@@ -484,166 +484,166 @@ 
 		if ($error != '') return $error;
 		
 		$query = "UPDATE `config` SET `value` = '13' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_13() {
-    		$Connection = new Connection();
-    		if (!$Connection->checkColumnName('spotter_archive_output','real_departure_airport_icao')) {
-    			$query="ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)";
+			$Connection = new Connection();
+			if (!$Connection->checkColumnName('spotter_archive_output','real_departure_airport_icao')) {
+				$query="ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-	    		} catch(PDOException $e) {
+				} catch(PDOException $e) {
 				return "error (update spotter_archive_output) : ".$e->getMessage()."\n";
-    			}
+				}
 		}
-    		$error = '';
+			$error = '';
 		$query = "UPDATE `config` SET `value` = '14' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_14() {
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
-    		// Add tables
-    		if (!$Connection->tableExists('stats_flight')) {
+			// Add tables
+			if (!$Connection->tableExists('stats_flight')) {
 			$error .= create_db::import_file('../db/stats_flight.sql');
 			if ($error != '') return $error;
 		}
 		$query = "UPDATE `config` SET `value` = '15' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 
 	private static function update_from_15() {
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
-    		// Add tables
-    		$query="ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update stats) : ".$e->getMessage()."\n";
-    		}
+			// Add tables
+			$query="ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update stats) : ".$e->getMessage()."\n";
+			}
 		if ($error != '') return $error;
 		$query = "UPDATE `config` SET `value` = '16' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_16() {
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
-    		// Add tables
-    		if (!$Connection->tableExists('stats_registration')) {
+			// Add tables
+			if (!$Connection->tableExists('stats_registration')) {
 			$error .= create_db::import_file('../db/stats_registration.sql');
 		}
-    		if (!$Connection->tableExists('stats_callsign')) {
+			if (!$Connection->tableExists('stats_callsign')) {
 			$error .= create_db::import_file('../db/stats_callsign.sql');
 		}
 		if ($error != '') return $error;
 		$query = "UPDATE `config` SET `value` = '17' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_17() {
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
-    		// Add tables
-    		if (!$Connection->tableExists('stats_country')) {
+			// Add tables
+			if (!$Connection->tableExists('stats_country')) {
 			$error .= create_db::import_file('../db/stats_country.sql');
 		}
 		if ($error != '') return $error;
 		$query = "UPDATE `config` SET `value` = '18' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 	private static function update_from_18() {
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
-    		// Modify stats_airport table
-    		if (!$Connection->checkColumnName('stats_airport','airport_name')) {
-    			$query = "ALTER TABLE `stats_airport` ADD `stats_type` VARCHAR(50) NOT NULL DEFAULT 'yearly', ADD `airport_name` VARCHAR(255) NOT NULL, ADD `date` DATE NULL DEFAULT NULL, DROP INDEX `airport_icao`, ADD UNIQUE `airport_icao` (`airport_icao`, `type`, `date`)";
-    	        	try {
-	            	    $sth = $Connection->db->prepare($query);
-			    $sth->execute();
-    			} catch(PDOException $e) {
-			    return "error (update stats) : ".$e->getMessage()."\n";
-    			}
-    		}
+			// Modify stats_airport table
+			if (!$Connection->checkColumnName('stats_airport','airport_name')) {
+				$query = "ALTER TABLE `stats_airport` ADD `stats_type` VARCHAR(50) NOT NULL DEFAULT 'yearly', ADD `airport_name` VARCHAR(255) NOT NULL, ADD `date` DATE NULL DEFAULT NULL, DROP INDEX `airport_icao`, ADD UNIQUE `airport_icao` (`airport_icao`, `type`, `date`)";
+					try {
+						$sth = $Connection->db->prepare($query);
+				$sth->execute();
+				} catch(PDOException $e) {
+				return "error (update stats) : ".$e->getMessage()."\n";
+				}
+			}
 		if ($error != '') return $error;
 		$query = "UPDATE `config` SET `value` = '19' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_19() {
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
-    		// Update airport table
+			// Update airport table
 		$error .= create_db::import_file('../db/airport.sql');
 		if ($error != '') return 'Import airport.sql : '.$error;
 		// Remove primary key on Spotter_Archive
 		$query = "alter table spotter_archive drop spotter_archive_id";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (remove primary key on spotter_archive) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (remove primary key on spotter_archive) : ".$e->getMessage()."\n";
+			}
 		$query = "alter table spotter_archive add spotter_archive_id INT(11)";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add id again on spotter_archive) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add id again on spotter_archive) : ".$e->getMessage()."\n";
+			}
 		if (!$Connection->checkColumnName('spotter_archive','over_country')) {
 			// Add column over_country
-    			$query = "ALTER TABLE `spotter_archive` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
+				$query = "ALTER TABLE `spotter_archive` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
 			try {
-            			$sth = $Connection->db->prepare($query);
+						$sth = $Connection->db->prepare($query);
 				$sth->execute();
 			} catch(PDOException $e) {
 				return "error (add over_country) : ".$e->getMessage()."\n";
@@ -651,9 +651,9 @@ 
 		}
 		if (!$Connection->checkColumnName('spotter_live','over_country')) {
 			// Add column over_country
-    			$query = "ALTER TABLE `spotter_live` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
+				$query = "ALTER TABLE `spotter_live` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
 			try {
-            			$sth = $Connection->db->prepare($query);
+						$sth = $Connection->db->prepare($query);
 				$sth->execute();
 			} catch(PDOException $e) {
 				return "error (add over_country) : ".$e->getMessage()."\n";
@@ -661,74 +661,74 @@ 
 		}
 		if (!$Connection->checkColumnName('spotter_output','source_name')) {
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
-    			$query = "ALTER TABLE `spotter_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
+				$query = "ALTER TABLE `spotter_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
 			} catch(PDOException $e) {
 				return "error (add source_name column) : ".$e->getMessage()."\n";
-    			}
-    		}
+				}
+			}
 		if (!$Connection->checkColumnName('spotter_live','source_name')) {
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
-    			$query = "ALTER TABLE `spotter_live` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
+				$query = "ALTER TABLE `spotter_live` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
 			} catch(PDOException $e) {
 				return "error (add source_name column) : ".$e->getMessage()."\n";
-    			}
-    		}
+				}
+			}
 		if (!$Connection->checkColumnName('spotter_archive_output','source_name')) {
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
-    			$query = "ALTER TABLE `spotter_archive_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
+				$query = "ALTER TABLE `spotter_archive_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
 			} catch(PDOException $e) {
 				return "error (add source_name column) : ".$e->getMessage()."\n";
-    			}
-    		}
+				}
+			}
 		if (!$Connection->checkColumnName('spotter_archive','source_name')) {
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
-    			$query = "ALTER TABLE `spotter_archive` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`;";
+				$query = "ALTER TABLE `spotter_archive` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`;";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
 			} catch(PDOException $e) {
 				return "error (add source_name column) : ".$e->getMessage()."\n";
-    			}
-    		}
+				}
+			}
 		if ($error != '') return $error;
 		$query = "UPDATE `config` SET `value` = '20' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_20() {
 		global $globalIVAO, $globalVATSIM, $globalphpVMS;
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
-    		// Update airline table
-    		if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
+			// Update airline table
+			if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
 			$error .= create_db::import_file('../db/airlines.sql');
 			if ($error != '') return 'Import airlines.sql : '.$error;
 		}
 		if (!$Connection->checkColumnName('aircraft_modes','type_flight')) {
 			// Add column over_country
-    			$query = "ALTER TABLE `aircraft_modes` ADD `type_flight` VARCHAR(50) NULL DEFAULT NULL;";
-        		try {
+				$query = "ALTER TABLE `aircraft_modes` ADD `type_flight` VARCHAR(50) NULL DEFAULT NULL;";
+				try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
 			} catch(PDOException $e) {
 				return "error (add over_country) : ".$e->getMessage()."\n";
-    			}
-    		}
+				}
+			}
 		if ($error != '') return $error;
 		/*
     		if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
@@ -738,12 +738,12 @@ 
 		}
 		*/
 		$query = "UPDATE `config` SET `value` = '21' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
@@ -762,35 +762,35 @@ 
 			if ($error != '') return $error;
 		}
 		$query = "UPDATE `config` SET `value` = '22' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_22() {
 		global $globalDBdriver;
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
 		// Add table stats polar
-    		if (!$Connection->tableExists('stats_source')) {
+			if (!$Connection->tableExists('stats_source')) {
 			if ($globalDBdriver == 'mysql') {
-    				$error .= create_db::import_file('../db/stats_source.sql');
+					$error .= create_db::import_file('../db/stats_source.sql');
 			} else {
 				$error .= create_db::import_file('../db/pgsql/stats_source.sql');
 			}
 			if ($error != '') return $error;
 		}
 		$query = "UPDATE config SET value = '23' WHERE name = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
@@ -821,14 +821,14 @@ 
 		}
 		if (!$Connection->checkColumnName('stats_aircraft','aircraft_manufacturer')) {
 			// Add aircraft_manufacturer to stats_aircraft
-    			$query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL";
+				$query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
 			} catch(PDOException $e) {
 				return "error (add aircraft_manufacturer column) : ".$e->getMessage()."\n";
-    			}
-    		}
+				}
+			}
 		
 		$query = "UPDATE config SET value = '24' WHERE name = 'schema_version'";
 		try {
@@ -1176,7 +1176,7 @@ 
 			} catch(PDOException $e) {
 				return "error (add index latitude,longitude on spotter_live) : ".$e->getMessage()."\n";
 			}
-                }
+				}
 		if (!$Connection->checkColumnName('aircraft','mfr')) {
 			// Add mfr to aircraft
 			$query = "ALTER TABLE aircraft ADD mfr VARCHAR(255) NULL";
@@ -1250,7 +1250,7 @@ 
 			} catch(PDOException $e) {
 				return "error (add index ref on notam) : ".$e->getMessage()."\n";
 			}
-                }
+				}
 		if (!$Connection->indexExists('accidents','registration_idx')) {
 			// Add index key
 			$query = "create index registration_idx on accidents (registration)";
@@ -1260,7 +1260,7 @@ 
 			} catch(PDOException $e) {
 				return "error (add index registration on accidents) : ".$e->getMessage()."\n";
 			}
-                }
+				}
 		if (!$Connection->indexExists('accidents','rdts')) {
 			// Add index key
 			$query = "create index rdts on accidents (registration,date,type,source)";
@@ -1270,7 +1270,7 @@ 
 			} catch(PDOException $e) {
 				return "error (add index registration, date, type & source on accidents) : ".$e->getMessage()."\n";
 			}
-                }
+				}
 
 		$query = "UPDATE config SET value = '31' WHERE name = 'schema_version'";
 		try {
@@ -1562,7 +1562,7 @@ 
 			} catch(PDOException $e) {
 				return "error (add index type on accidents) : ".$e->getMessage()."\n";
 			}
-                }
+				}
 		$query = "UPDATE config SET value = '36' WHERE name = 'schema_version'";
 		try {
 			$sth = $Connection->db->prepare($query);
@@ -1700,7 +1700,7 @@ 
 			} catch(PDOException $e) {
 				return "error (add index flightaware_id, date on spotter_archive) : ".$e->getMessage()."\n";
 			}
-                }
+				}
 		$query = "UPDATE config SET value = '38' WHERE name = 'schema_version'";
 		try {
 			$sth = $Connection->db->prepare($query);
@@ -1873,181 +1873,181 @@ 
 	}
 
 
-    	public static function check_version($update = false) {
-    	    global $globalDBname;
-    	    $version = 0;
-    	    $Connection = new Connection();
-    	    if ($Connection->tableExists('aircraft')) {
-    		if (!$Connection->tableExists('config')) {
-    		    $version = '1';
-    		    if ($update) return self::update_from_1();
-    		    else return $version;
+		public static function check_version($update = false) {
+			global $globalDBname;
+			$version = 0;
+			$Connection = new Connection();
+			if ($Connection->tableExists('aircraft')) {
+			if (!$Connection->tableExists('config')) {
+				$version = '1';
+				if ($update) return self::update_from_1();
+				else return $version;
 		} else {
-    		    $Connection = new Connection();
-		    $query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
-		    try {
-            		$sth = $Connection->db->prepare($query);
-		        $sth->execute();
-		    } catch(PDOException $e) {
+				$Connection = new Connection();
+			$query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
+			try {
+					$sth = $Connection->db->prepare($query);
+				$sth->execute();
+			} catch(PDOException $e) {
 			return "error : ".$e->getMessage()."\n";
-    		    }
-    		    $result = $sth->fetch(PDO::FETCH_ASSOC);
-    		    if ($update) {
-    			if ($result['value'] == '2') {
-    			    $error = self::update_from_2();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '3') {
-    			    $error = self::update_from_3();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '4') {
-    			    $error = self::update_from_4();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '5') {
-    			    $error = self::update_from_5();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '6') {
-    			    $error = self::update_from_6();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '7') {
-    			    $error = self::update_from_7();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '8') {
-    			    $error = self::update_from_8();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '9') {
-    			    $error = self::update_from_9();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '10') {
-    			    $error = self::update_from_10();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '11') {
-    			    $error = self::update_from_11();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '12') {
-    			    $error = self::update_from_12();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '13') {
-    			    $error = self::update_from_13();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '14') {
-    			    $error = self::update_from_14();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '15') {
-    			    $error = self::update_from_15();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '16') {
-    			    $error = self::update_from_16();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '17') {
-    			    $error = self::update_from_17();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '18') {
-    			    $error = self::update_from_18();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '19') {
-    			    $error = self::update_from_19();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '20') {
-    			    $error = self::update_from_20();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '21') {
-    			    $error = self::update_from_21();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '22') {
-    			    $error = self::update_from_22();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '23') {
-    			    $error = self::update_from_23();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '24') {
-    			    $error = self::update_from_24();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '25') {
-    			    $error = self::update_from_25();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '26') {
-    			    $error = self::update_from_26();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '27') {
-    			    $error = self::update_from_27();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '28') {
-    			    $error = self::update_from_28();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '29') {
-    			    $error = self::update_from_29();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '30') {
-    			    $error = self::update_from_30();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '31') {
-    			    $error = self::update_from_31();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '32') {
-    			    $error = self::update_from_32();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '33') {
-    			    $error = self::update_from_33();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '34') {
-    			    $error = self::update_from_34();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '35') {
-    			    $error = self::update_from_35();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '36') {
-    			    $error = self::update_from_36();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '37') {
-    			    $error = self::update_from_37();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} elseif ($result['value'] == '38') {
-    			    $error = self::update_from_38();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} else return '';
-    		    }
-    		    else return $result['value'];
+				}
+				$result = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($update) {
+				if ($result['value'] == '2') {
+					$error = self::update_from_2();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '3') {
+					$error = self::update_from_3();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '4') {
+					$error = self::update_from_4();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '5') {
+					$error = self::update_from_5();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '6') {
+					$error = self::update_from_6();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '7') {
+					$error = self::update_from_7();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '8') {
+					$error = self::update_from_8();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '9') {
+					$error = self::update_from_9();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '10') {
+					$error = self::update_from_10();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '11') {
+					$error = self::update_from_11();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '12') {
+					$error = self::update_from_12();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '13') {
+					$error = self::update_from_13();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '14') {
+					$error = self::update_from_14();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '15') {
+					$error = self::update_from_15();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '16') {
+					$error = self::update_from_16();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '17') {
+					$error = self::update_from_17();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '18') {
+					$error = self::update_from_18();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '19') {
+					$error = self::update_from_19();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '20') {
+					$error = self::update_from_20();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '21') {
+					$error = self::update_from_21();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '22') {
+					$error = self::update_from_22();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '23') {
+					$error = self::update_from_23();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '24') {
+					$error = self::update_from_24();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '25') {
+					$error = self::update_from_25();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '26') {
+					$error = self::update_from_26();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '27') {
+					$error = self::update_from_27();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '28') {
+					$error = self::update_from_28();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '29') {
+					$error = self::update_from_29();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '30') {
+					$error = self::update_from_30();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '31') {
+					$error = self::update_from_31();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '32') {
+					$error = self::update_from_32();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '33') {
+					$error = self::update_from_33();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '34') {
+					$error = self::update_from_34();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '35') {
+					$error = self::update_from_35();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '36') {
+					$error = self::update_from_36();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '37') {
+					$error = self::update_from_37();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} elseif ($result['value'] == '38') {
+					$error = self::update_from_38();
+					if ($error != '') return $error;
+					else return self::check_version(true);
+				} else return '';
+				}
+				else return $result['value'];
 		}
 		
-	    } else return $version;
-    	}
+		} else return $version;
+		}
     	
 }
 //echo update_schema::check_version();

require/class.Connection.php

Indentation +30 added lines, -30 removed lines

@@ -7,35 +7,35 @@ 
 	public $latest_schema = 39;
 	
 	public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) {
-	    global $globalDBdriver, $globalNoDB;
-	    if (isset($globalNoDB) && $globalNoDB === TRUE) {
+		global $globalDBdriver, $globalNoDB;
+		if (isset($globalNoDB) && $globalNoDB === TRUE) {
 		$this->db = null;
-	    } else {
+		} else {
 		if ($dbc === null) {
-		    if ($this->db === null && $dbname === null) {
+			if ($this->db === null && $dbname === null) {
 			if ($user === null && $pass === null) {
-			    $this->createDBConnection();
+				$this->createDBConnection();
 			} else {
-			    $this->createDBConnection(null,$user,$pass);
+				$this->createDBConnection(null,$user,$pass);
 			}
-		    } else {
+			} else {
 			$this->createDBConnection($dbname);
-		    }
+			}
 		} elseif ($dbname === null || $dbname === 'default') {
-	    	    $this->db = $dbc;
-	    	    if ($this->connectionExists() === false) {
+				$this->db = $dbc;
+				if ($this->connectionExists() === false) {
 			/*
 			echo 'Restart Connection !!!'."\n";
 			$e = new \Exception;
 			var_dump($e->getTraceAsString());
 			*/
 			$this->createDBConnection();
-		    }
+			}
 		} else {
-		    //$this->connectionExists();
-		    $this->dbs[$dbname] = $dbc;
+			//$this->connectionExists();
+			$this->dbs[$dbname] = $dbc;
+		}
 		}
-	    }
 	}
 
 	public function db() {
@@ -56,11 +56,11 @@ 
 	}
 
 	/**
-	* Creates the database connection
-	*
-	* @return Boolean of the database connection
-	*
-	*/
+	 * Creates the database connection
+	 *
+	 * @return Boolean of the database connection
+	 *
+	 */
 
 	public function createDBConnection($DBname = null, $user = null, $pass = null)
 	{
@@ -157,7 +157,7 @@ 
 			return false;
 		}
 		if($results->rowCount()>0) {
-		    return true; 
+			return true; 
 		}
 		else return false;
 	}
@@ -174,14 +174,14 @@ 
 				$sum = $sum->fetchColumn(0);
 			} else $sum = 0;
 			if (intval($sum) !== 2) {
-			     return false;
+				 return false;
 			}
 			
 		} catch(PDOException $e) {
 			if($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) {
-            			throw $e;
-	                }
-	                //echo 'error ! '.$e->getMessage();
+						throw $e;
+					}
+					//echo 'error ! '.$e->getMessage();
 			return false;
 		}
 		return true; 
@@ -285,8 +285,8 @@ 
 		$version = 0;
 		if ($this->tableExists('aircraft')) {
 			if (!$this->tableExists('config')) {
-	    			$version = '1';
-	    			return $version;
+					$version = '1';
+					return $version;
 			} else {
 				$query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
 				try {
@@ -307,10 +307,10 @@ 
 	* @return Boolean if latest version or not
 	*/
 	public function latest() {
-	    global $globalNoDB;
-	    if (isset($globalNoDB) && $globalNoDB === TRUE) return true;
-	    if ($this->check_schema_version() == $this->latest_schema) return true;
-	    else return false;
+		global $globalNoDB;
+		if (isset($globalNoDB) && $globalNoDB === TRUE) return true;
+		if ($this->check_schema_version() == $this->latest_schema) return true;
+		else return false;
 	}
 
 }

require/class.MarineLive.php

Indentation +190 added lines, -190 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;
 		$filters = array();
@@ -86,11 +86,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 getLiveMarineData($limit = '', $sort = '', $filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -132,11 +132,11 @@ 
 	}
 
 	/**
-	* Gets Minimal Live Spotter data
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets Minimal Live Spotter data
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMinLiveMarineData($filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -166,11 +166,11 @@ 
 	}
 
 	/**
-	* Gets Minimal Live Spotter data since xx seconds
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets Minimal Live Spotter data since xx seconds
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMinLastLiveMarineData($filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -183,13 +183,13 @@ 
 			$query  = 'SELECT marine_live.ident, marine_live.fammarine_id,marine_live.type, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source 
 			FROM marine_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= marine_live.date AND marine_live.latitude <> '0' AND marine_live.longitude <> '0' 
 			ORDER BY marine_live.fammarine_id, marine_live.date";
-                } else {
+				} else {
 			$query  = "SELECT marine_live.ident, marine_live.fammarine_id, marine_live.type,marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source 
 			FROM marine_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= marine_live.date AND marine_live.latitude <> '0' AND marine_live.longitude <> '0' 
 			ORDER BY marine_live.fammarine_id, marine_live.date";
 		}
 
-    		try {
+			try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
 		} catch(PDOException $e) {
@@ -201,11 +201,11 @@ 
 	}
 
 	/**
-	* Gets number of latest data entry
-	*
-	* @return String number of entry
-	*
-	*/
+	 * Gets number of latest data entry
+	 *
+	 * @return String number of entry
+	 *
+	 */
 	public function getLiveMarineCount($filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -230,11 +230,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on the latest data entry and coord
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the latest data entry and coord
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLiveMarineDatabyCoord($coord, $filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -258,11 +258,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on the latest data entry and coord
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the latest data entry and coord
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMinLiveMarineDatabyCoord($coord, $filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -290,11 +290,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on a user's latitude and longitude
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on a user's latitude and longitude
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLatestMarineForLayar($lat, $lng, $radius, $interval)
 	{
 		$Marine = new Marine($this->db);
@@ -307,134 +307,134 @@ 
 		if ($lng != '')
 		{
 			if (!is_numeric($lng))
-                        {
-                                return false;
-                        }
-                }
-
-                if ($radius != '')
-                {
-                        if (!is_numeric($radius))
-                        {
-                                return false;
-                        }
-                }
+						{
+								return false;
+						}
+				}
+
+				if ($radius != '')
+				{
+						if (!is_numeric($radius))
+						{
+								return false;
+						}
+				}
 		$additional_query = '';
 		if ($interval != '')
-                {
-                        if (!is_string($interval))
-                        {
-                                //$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date ';
-			        return false;
-                        } else {
-                if ($interval == '1m')
-                {
-                    $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date ';
-                } else if ($interval == '15m'){
-                    $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= marine_live.date ';
-                } 
-            }
-                } else {
-         $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date ';   
-        }
-
-                $query  = "SELECT marine_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM marine_live 
+				{
+						if (!is_string($interval))
+						{
+								//$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date ';
+					return false;
+						} else {
+				if ($interval == '1m')
+				{
+					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date ';
+				} else if ($interval == '15m'){
+					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= marine_live.date ';
+				} 
+			}
+				} else {
+		 $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date ';   
+		}
+
+				$query  = "SELECT marine_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM marine_live 
                    WHERE marine_live.latitude <> '' 
                                    AND marine_live.longitude <> '' 
                    ".$additional_query."
                    HAVING distance < :radius  
                                    ORDER BY distance";
 
-                $spotter_array = $Marine->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius));
+				$spotter_array = $Marine->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius));
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
     
-        /**
-	* Gets all the spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getLastLiveMarineDataByIdent($ident)
 	{
 		$Marine = new Marine($this->db);
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
+				$query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
 
 		$spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident),'',true);
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets all the spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getDateLiveMarineDataByIdent($ident,$date)
 	{
 		$Marine = new Marine($this->db);
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
+				$query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
 
-                $date = date('c',$date);
+				$date = date('c',$date);
 		$spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets last spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets last spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getLastLiveMarineDataById($id)
 	{
 		$Marine = new Marine($this->db);
 		date_default_timezone_set('UTC');
 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
+				$query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
 
 		$spotter_array = $Marine->getDataFromDB($query,array(':id' => $id),'',true);
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets last spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets last spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getDateLiveMarineDataById($id,$date)
 	{
 		$Marine = new Marine($this->db);
 		date_default_timezone_set('UTC');
 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
-                $date = date('c',$date);
+				$query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
+				$date = date('c',$date);
 		$spotter_array = $Marine->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true);
 
 		return $spotter_array;
 	}
 
 
-        /**
-	* Gets all the spotter information based on a particular id
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular id
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getAllLiveMarineDataById($id,$liveinterval = false)
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -462,18 +462,18 @@ 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets all the spotter information based on a particular ident
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular ident
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getAllLiveMarineDataByIdent($ident)
 	{
 		date_default_timezone_set('UTC');
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		$query  = self::$global_query.' WHERE marine_live.ident = :ident';
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
@@ -487,23 +487,23 @@ 
 
 
 	/**
-	* Deletes all info in the table
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveMarineData()
 	{
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			//$query  = "DELETE FROM marine_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE) >= marine_live.date";
 			$query  = 'DELETE FROM marine_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 9 HOUR) >= marine_live.date';
-            		//$query  = "DELETE FROM marine_live WHERE marine_live.id IN (SELECT marine_live.id FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= marine_live.date)";
+					//$query  = "DELETE FROM marine_live WHERE marine_live.id IN (SELECT marine_live.id FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= marine_live.date)";
 		} else {
 			$query  = "DELETE FROM marine_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= marine_live.date";
 		}
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute();
@@ -515,18 +515,18 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for aircraft not seen since 2 HOUR
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for aircraft not seen since 2 HOUR
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveMarineDataNotUpdated()
 	{
 		global $globalDBdriver, $globalDebug;
 		if ($globalDBdriver == 'mysql') {
 			//$query = 'SELECT fammarine_id FROM marine_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) >= marine_live.date AND marine_live.fammarine_id NOT IN (SELECT fammarine_id FROM marine_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) < marine_live.date) LIMIT 800 OFFSET 0';
-    			$query = "SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 1200 OFFSET 0";
-    			try {
+				$query = "SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 1200 OFFSET 0";
+				try {
 				
 				$sth = $this->db->prepare($query);
 				$sth->execute();
@@ -534,8 +534,8 @@ 
 				return "error";
 			}
 			$query_delete = 'DELETE FROM marine_live WHERE fammarine_id IN (';
-                        $i = 0;
-                        $j =0;
+						$i = 0;
+						$j =0;
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			foreach($all as $row)
 			{
@@ -543,20 +543,20 @@ 
 				$j++;
 				if ($j == 30) {
 					if ($globalDebug) echo ".";
-				    	try {
+						try {
 						
 						$sth = $this->db->prepare(substr($query_delete,0,-1).")");
 						$sth->execute();
 					} catch(PDOException $e) {
 						return "error";
 					}
-                                	$query_delete = 'DELETE FROM marine_live WHERE fammarine_id IN (';
-                                	$j = 0;
+									$query_delete = 'DELETE FROM marine_live WHERE fammarine_id IN (';
+									$j = 0;
 				}
 				$query_delete .= "'".$row['fammarine_id']."',";
 			}
 			if ($i > 0) {
-    				try {
+					try {
 					
 					$sth = $this->db->prepare(substr($query_delete,0,-1).")");
 					$sth->execute();
@@ -567,9 +567,9 @@ 
 			return "success";
 		} elseif ($globalDBdriver == 'pgsql') {
 			//$query = "SELECT fammarine_id FROM marine_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= marine_live.date AND marine_live.fammarine_id NOT IN (SELECT fammarine_id FROM marine_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' < marine_live.date) LIMIT 800 OFFSET 0";
-    			//$query = "SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0";
-    			$query = "DELETE FROM marine_live WHERE fammarine_id IN (SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0)";
-    			try {
+				//$query = "SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0";
+				$query = "DELETE FROM marine_live WHERE fammarine_id IN (SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0)";
+				try {
 				
 				$sth = $this->db->prepare($query);
 				$sth->execute();
@@ -613,17 +613,17 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for an ident
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for an ident
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveMarineDataByIdent($ident)
 	{
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		$query  = 'DELETE FROM marine_live WHERE ident = :ident';
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
@@ -635,17 +635,17 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for an id
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for an id
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveMarineDataById($id)
 	{
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
 		$query  = 'DELETE FROM marine_live WHERE fammarine_id = :id';
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':id' => $id));
@@ -658,11 +658,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;
@@ -688,14 +688,14 @@ 
 			$ident_result = $row['ident'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Check recent aircraft
-	*
-	* @return String the ident
-	*
-	*/
+	 * Check recent aircraft
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function checkIdentRecent($ident)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -721,14 +721,14 @@ 
 			$ident_result = $row['fammarine_id'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Check recent aircraft by id
-	*
-	* @return String the ident
-	*
-	*/
+	 * Check recent aircraft by id
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function checkIdRecent($id)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -754,14 +754,14 @@ 
 			$ident_result = $row['fammarine_id'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Check recent aircraft by mmsi
-	*
-	* @return String the ident
-	*
-	*/
+	 * Check recent aircraft by mmsi
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function checkMMSIRecent($mmsi)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -787,19 +787,19 @@ 
 			$ident_result = $row['fammarine_id'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Adds a new spotter data
-	*
-	* @param String $fammarine_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
-	* @return String success or false
-	*
-	*/
+	 * Adds a new spotter data
+	 *
+	 * @param String $fammarine_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
+	 * @return String success or false
+	 *
+	 */
 	public function addLiveMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $mmsi = '',$type = '',$typeid = '',$imo = '', $callsign = '',$arrival_code = '',$arrival_date = '',$status = '',$statusid = '',$noarchive = false,$format_source = '', $source_name = '', $over_country = '')
 	{
 		global $globalURL, $globalArchive, $globalDebug;
@@ -870,10 +870,10 @@ 
 		$arrival_date = filter_var($arrival_date,FILTER_SANITIZE_STRING);
 		
 
-            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
-            	if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
-            	if ($arrival_date == '') $arrival_date = NULL;
-            	$query = '';
+				if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
+				if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
+				if ($arrival_date == '') $arrival_date = NULL;
+				$query = '';
 		if ($globalArchive) {
 			if ($globalDebug) echo '-- Delete previous data -- ';
 			$query .= 'DELETE FROM marine_live WHERE fammarine_id = :fammarine_id;';

require/class.Marine.php

Indentation +196 added lines, -196 removed lines

@@ -11,10 +11,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;
@@ -78,14 +78,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');
@@ -213,11 +213,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_query;
@@ -275,11 +275,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_query;
@@ -390,12 +390,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);
@@ -425,11 +425,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);
@@ -453,11 +453,11 @@ 
 	}
 
 	/**
-	* Gets all info from a mmsi
-	*
-	* @return Array list of mmsi info
-	*
-	*/
+	 * Gets all info from a mmsi
+	 *
+	 * @return Array list of mmsi info
+	 *
+	 */
 	public function getIdentity($mmsi)
 	{
 		$mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT);
@@ -514,18 +514,18 @@ 
 	
 	
 	/**
-	* 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';
-                $query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident);
+				$query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident);
 
 		try {
 			$sth = $this->db->prepare($query);
@@ -538,17 +538,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);
@@ -562,30 +562,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 = '')
 	{
 		global $globalURL, $globalMarineImageFetch;
@@ -682,13 +682,13 @@ 
 			unset($Image);
 		}
 		
-                if ($latitude == '' && $longitude == '') {
-            		$latitude = 0;
-            		$longitude = 0;
-            	}
-                if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
-                if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
-                if ($arrival_date == '') $arrival_date = NULL;
+				if ($latitude == '' && $longitude == '') {
+					$latitude = 0;
+					$longitude = 0;
+				}
+				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, status,imo,arrival_port_name,arrival_port_date) 
 		    VALUES (:fammarine_id,:ident,:latitude,:longitude,:heading,:speed,:date,:format_source, :source_name,:mmsi,:type,:status,:imo,:arrival_port_name,:arrival_port_date)";
 
@@ -699,7 +699,7 @@ 
 			$sth->execute($query_values);
 			$this->db = null;
 		} catch (PDOException $e) {
-		    return "error : ".$e->getMessage();
+			return "error : ".$e->getMessage();
 		}
 		
 		return "success";
@@ -708,11 +708,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;
@@ -728,11 +728,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'];
@@ -743,11 +743,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;
@@ -785,11 +785,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 countAllTrackedOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
 	{
@@ -840,11 +840,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;
@@ -911,11 +911,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;
@@ -961,11 +961,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;
@@ -987,7 +987,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);
@@ -1007,11 +1007,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;
@@ -1033,7 +1033,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);
@@ -1055,11 +1055,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;
@@ -1104,11 +1104,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;
@@ -1130,7 +1130,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);
@@ -1153,11 +1153,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;
@@ -1220,11 +1220,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;
@@ -1268,11 +1268,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;
@@ -1317,11 +1317,11 @@ 
 	
 	
 	/**
-	* Counts all flights that have flown over
-	*
-	* @return Integer the number of flights
-	*
-	*/
+	 * Counts all flights that have flown over
+	 *
+	 * @return Integer the number of flights
+	 *
+	 */
 	public function countOverallTracked($filters = array(),$year = '',$month = '')
 	{
 		global $globalDBdriver;
@@ -1356,11 +1356,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;
@@ -1400,12 +1400,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);
@@ -1426,13 +1426,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();
@@ -1465,12 +1465,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;
@@ -1549,12 +1549,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;
@@ -1591,11 +1591,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;
@@ -1624,12 +1624,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;

require/class.SpotterImport.php

Indentation +402 added lines, -402 removed lines

@@ -8,20 +8,20 @@ 
 require_once(dirname(__FILE__).'/class.Stats.php');
 require_once(dirname(__FILE__).'/class.Source.php');
 if (isset($globalServerAPRS) && $globalServerAPRS) {
-    require_once(dirname(__FILE__).'/class.APRS.php');
+	require_once(dirname(__FILE__).'/class.APRS.php');
 }
 
 class SpotterImport {
-    private $all_flights = array();
-    private $last_delete_hourly = 0;
-    private $last_delete = 0;
-    private $stats = array();
-    private $tmd = 0;
-    private $source_location = array();
-    public $db = null;
-    public $nb = 0;
-
-    public function __construct($dbc = null) {
+	private $all_flights = array();
+	private $last_delete_hourly = 0;
+	private $last_delete = 0;
+	private $stats = array();
+	private $tmd = 0;
+	private $source_location = array();
+	public $db = null;
+	public $nb = 0;
+
+	public function __construct($dbc = null) {
 	global $globalBeta, $globalServerAPRS, $APRSSpotter, $globalNoDB;
 	if (!(isset($globalNoDB) && $globalNoDB)) {
 		$Connection = new Connection($dbc);
@@ -33,14 +33,14 @@ 
 		$currentdate = date('Y-m-d');
 		$sourcestat = $Stats->getStatsSource($currentdate);
 		if (!empty($sourcestat)) {
-		    foreach($sourcestat as $srcst) {
-		    	$type = $srcst['stats_type'];
+			foreach($sourcestat as $srcst) {
+				$type = $srcst['stats_type'];
 			if ($type == 'polar' || $type == 'hist') {
-			    $source = $srcst['source_name'];
-			    $data = $srcst['source_data'];
-			    $this->stats[$currentdate][$source][$type] = json_decode($data,true);
-	    		}
-		    }
+				$source = $srcst['source_name'];
+				$data = $srcst['source_data'];
+				$this->stats[$currentdate][$source][$type] = json_decode($data,true);
+				}
+			}
 		}
 	}
 	if (isset($globalServerAPRS) && $globalServerAPRS) {
@@ -48,9 +48,9 @@ 
 		//$APRSSpotter->connect();
 	}
 
-    }
+	}
 
-    public function get_Schedule($id,$ident) {
+	public function get_Schedule($id,$ident) {
 	global $globalDebug, $globalFork, $globalSchedulesFetch;
 	// Get schedule here, so it's done only one time
 	
@@ -70,42 +70,42 @@ 
 	$operator = $Spotter->getOperator($ident);
 	$scheduleexist = false;
 	if ($Schedule->checkSchedule($operator) == 0) {
-	    $operator = $Translation->checkTranslation($ident);
-	    if ($Schedule->checkSchedule($operator) == 0) {
+		$operator = $Translation->checkTranslation($ident);
+		if ($Schedule->checkSchedule($operator) == 0) {
 		$schedule = $Schedule->fetchSchedule($operator);
 		if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) {
-		    if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
-		    // Should also check if route schedule = route from DB
-		    if ($schedule['DepartureAirportIATA'] != '') {
+			if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
+			// Should also check if route schedule = route from DB
+			if ($schedule['DepartureAirportIATA'] != '') {
 			if ($this->all_flights[$id]['departure_airport'] != $Spotter->getAirportIcao($schedule['DepartureAirportIATA'])) {
-			    $airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']);
-			    if (trim($airport_icao) != '') {
+				$airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']);
+				if (trim($airport_icao) != '') {
 				$this->all_flights[$id]['departure_airport'] = $airport_icao;
 				if ($globalDebug) echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n";
-			    }
+				}
+			}
 			}
-		    }
-		    if ($schedule['ArrivalAirportIATA'] != '') {
+			if ($schedule['ArrivalAirportIATA'] != '') {
 			if ($this->all_flights[$id]['arrival_airport'] != $Spotter->getAirportIcao($schedule['ArrivalAirportIATA'])) {
-			    $airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']);
-			    if (trim($airport_icao) != '') {
+				$airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']);
+				if (trim($airport_icao) != '') {
 				$this->all_flights[$id]['arrival_airport'] = $airport_icao;
 				if ($globalDebug) echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n";
-			    }
+				}
 			}
-		    }
-		    $Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']);
+			}
+			$Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']);
 		}
-	    } else $scheduleexist = true;
+		} else $scheduleexist = true;
 	} else $scheduleexist = true;
 	// close connection, at least one way will work ?
-       if ($scheduleexist) {
+	   if ($scheduleexist) {
 		if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n";
-    		$sch = $Schedule->getSchedule($operator);
+			$sch = $Schedule->getSchedule($operator);
 		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport' => $sch['arrival_airport_icao'],'departure_airport' => $sch['departure_airport_icao'],'departure_airport_time' => $sch['departure_airport_time'],'arrival_airport_time' => $sch['arrival_airport_time']));
-       }
+	   }
 	$Spotter->db = null;
 	$Schedule->db = null;
 	$Translation->db = null;
@@ -120,96 +120,96 @@ 
 	}
 	  */
 	}
-    }
+	}
 
-    public function checkAll() {
+	public function checkAll() {
 	global $globalDebug, $globalNoImport;
 	if ($globalDebug) echo "Update last seen flights data...\n";
 	if (!isset($globalNoImport) || $globalNoImport === FALSE) {
-	    foreach ($this->all_flights as $key => $flight) {
+		foreach ($this->all_flights as $key => $flight) {
 		if (isset($this->all_flights[$key]['id'])) {
-		    //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
-    		    $Spotter = new Spotter($this->db);
-        	    $real_arrival = $this->arrival($key);
-        	    if (isset($this->all_flights[$key]['altitude'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
-        	}
-	    }
+			//echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
+				$Spotter = new Spotter($this->db);
+				$real_arrival = $this->arrival($key);
+				if (isset($this->all_flights[$key]['altitude'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
+			}
+		}
+	}
 	}
-    }
 
-    public function arrival($key) {
+	public function arrival($key) {
 	global $globalClosestMinDist, $globalDebug;
 	if ($globalDebug) echo 'Update arrival...'."\n";
 	$Spotter = new Spotter($this->db);
-        $airport_icao = '';
-        $airport_time = '';
-        if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
+		$airport_icao = '';
+		$airport_time = '';
+		if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
 	if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
-	    $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
-    	    if (isset($closestAirports[0])) {
-        	if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
-        	    $airport_icao = $closestAirports[0]['icao'];
-        	    $airport_time = $this->all_flights[$key]['datetime'];
-        	    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
-        	} elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') {
-        	    foreach ($closestAirports as $airport) {
-        		if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) {
-        		    $airport_icao = $airport['icao'];
-        		    $airport_time = $this->all_flights[$key]['datetime'];
-        		    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
-        		    break;
-        		}
-        	    }
-        	} elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) {
-        		$airport_icao = $closestAirports[0]['icao'];
-        		$airport_time = $this->all_flights[$key]['datetime'];
-        	} else {
-        		if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
-        	}
-    	    } else {
-    		    if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
-    	    }
-
-        } else {
-        	if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
-        }
-        return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
-    }
-
-
-
-    public function del() {
+		$closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
+			if (isset($closestAirports[0])) {
+			if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
+				$airport_icao = $closestAirports[0]['icao'];
+				$airport_time = $this->all_flights[$key]['datetime'];
+				if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
+			} elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') {
+				foreach ($closestAirports as $airport) {
+				if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) {
+					$airport_icao = $airport['icao'];
+					$airport_time = $this->all_flights[$key]['datetime'];
+					if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
+					break;
+				}
+				}
+			} elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) {
+				$airport_icao = $closestAirports[0]['icao'];
+				$airport_time = $this->all_flights[$key]['datetime'];
+			} else {
+				if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
+			}
+			} else {
+				if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
+			}
+
+		} else {
+			if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
+		}
+		return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
+	}
+
+
+
+	public function del() {
 	global $globalDebug, $globalNoImport, $globalNoDB;
 	// Delete old infos
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
 	foreach ($this->all_flights as $key => $flight) {
-    	    if (isset($flight['lastupdate'])) {
-        	if ($flight['lastupdate'] < (time()-3000)) {
-            	    if (isset($this->all_flights[$key]['id'])) {
-            		if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n";
+			if (isset($flight['lastupdate'])) {
+			if ($flight['lastupdate'] < (time()-3000)) {
+					if (isset($this->all_flights[$key]['id'])) {
+					if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n";
 			/*
 			$SpotterLive = new SpotterLive();
             		$SpotterLive->deleteLiveSpotterDataById($this->all_flights[$key]['id']);
 			$SpotterLive->db = null;
 			*/
 			if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
-            		    $real_arrival = $this->arrival($key);
-            		    $Spotter = new Spotter($this->db);
-            	    	    if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
+						$real_arrival = $this->arrival($key);
+						$Spotter = new Spotter($this->db);
+							if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
 				$result = $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
-			    }
+				}
 			// Put in archive
 //				$Spotter->db = null;
 			}
-            	    }
-            	    unset($this->all_flights[$key]);
-    	        }
-	    }
-        }
-    }
+					}
+					unset($this->all_flights[$key]);
+				}
+		}
+		}
+	}
 
-    public function add($line) {
+	public function add($line) {
 	global $globalPilotIdAccept, $globalAirportAccept, $globalAirlineAccept, $globalAirlineIgnore, $globalAirportIgnore, $globalFork, $globalDistanceIgnore, $globalDaemon, $globalSBS1update, $globalDebug, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAirlinesSource, $globalVAM, $globalAllFlights, $globalServerAPRS, $APRSSpotter, $globalNoImport, $globalNoDB, $globalVA;
 	//if (!isset($globalDebugTimeElapsed) || $globalDebugTimeElapsed == '') $globalDebugTimeElapsed = FALSE;
 	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02';
@@ -234,18 +234,18 @@ 
 	
 	// SBS format is CSV format
 	if(is_array($line) && (isset($line['hex']) || isset($line['id']))) {
-	    //print_r($line);
-  	    if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) {
+		//print_r($line);
+  		if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) {
 
 		// Increment message number
 		if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) {
-		    $current_date = date('Y-m-d');
-		    $source = $line['source_name'];
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
-		    if (!isset($this->stats[$current_date][$source]['msg'])) {
-		    	$this->stats[$current_date][$source]['msg']['date'] = time();
-		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
+			$current_date = date('Y-m-d');
+			$source = $line['source_name'];
+			if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
+			if (!isset($this->stats[$current_date][$source]['msg'])) {
+				$this->stats[$current_date][$source]['msg']['date'] = time();
+				$this->stats[$current_date][$source]['msg']['nb'] = 1;
+			} else $this->stats[$current_date][$source]['msg']['nb'] += 1;
 		}
 		
 		/*
@@ -261,49 +261,49 @@ 
 		//$this->db = $dbc;
 
 		//$hex = trim($line['hex']);
-	        if (!isset($line['id'])) $id = trim($line['hex']);
-	        else $id = trim($line['id']);
+			if (!isset($line['id'])) $id = trim($line['hex']);
+			else $id = trim($line['id']);
 		
 		if (!isset($this->all_flights[$id])) {
-		    $this->all_flights[$id] = array();
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => ''));
-		    if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
-		    if (!isset($line['id'])) {
+			$this->all_flights[$id] = array();
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => ''));
+			if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
+			if (!isset($line['id'])) {
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
 //			if (isset($line['format_source']) && ($line['format_source'] == 'sbs' || $line['format_source'] == 'tsv' || $line['format_source'] == 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'].'-'.date('YmdGi')));
 //			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
 			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
-		        //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
-		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
+				//else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
+			 } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
+			if ($globalAllFlights !== FALSE) $dataFound = true;
 		}
 		if (isset($line['source_type']) && $line['source_type'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type']));
 		}
 		
 		//print_r($this->all_flights);
 		if (isset($line['hex']) && !isset($this->all_flights[$id]['hex']) && ctype_xdigit($line['hex'])) {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex'])));
-		    //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex'])));
+			//if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
 			//$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
-		    //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
-		    if (!isset($line['aircraft_name']) && (!isset($line['aircraft_icao']) || $line['aircraft_icao'] == '????') && $line['format_source'] != 'whazzup' && $line['format_source'] != 'vatsimtxt' && $line['format_source'] != 'pireps' && $line['format_source'] != 'phpvmacars' && $line['format_source'] != 'vam' && $line['format_source'] != 'flightgearsp' && $line['format_source'] != 'flightgearmp') {
+			//} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
+			if (!isset($line['aircraft_name']) && (!isset($line['aircraft_icao']) || $line['aircraft_icao'] == '????') && $line['format_source'] != 'whazzup' && $line['format_source'] != 'vatsimtxt' && $line['format_source'] != 'pireps' && $line['format_source'] != 'phpvmacars' && $line['format_source'] != 'vam' && $line['format_source'] != 'flightgearsp' && $line['format_source'] != 'flightgearmp') {
 			$timeelapsed = microtime(true);
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-			    $Spotter = new Spotter($this->db);
-			    if (isset($this->all_flights[$id]['source_type'])) {
+				$Spotter = new Spotter($this->db);
+				if (isset($this->all_flights[$id]['source_type'])) {
 				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']),$this->all_flights[$id]['source_type']);
-			    } else {
+				} else {
 				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']));
-			    }
-			    $Spotter->db = null;
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-			    if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
+				}
+				$Spotter->db = null;
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
 			}
-		    }
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
-		    if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
+			}
+			if ($globalAllFlights !== FALSE) $dataFound = true;
+			if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
 		}
 		if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') {
 			$icao = $line['aircraft_icao'];
@@ -333,9 +333,9 @@ 
 		}
 		//if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
 		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) {
-		    if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
+			if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
-		    } else {
+			} else {
 				if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
 				elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
 				/*
@@ -344,7 +344,7 @@ 
 				print_r($line);
 				*/
 				return '';
-		    }
+			}
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
 			if ($globalDebug) echo "!!! Date is too old ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!";
 			return '';
@@ -360,36 +360,36 @@ 
 		}
 
 		if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration']));
 		}
 		if (isset($line['waypoints']) && $line['waypoints'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints']));
 		}
 		if (isset($line['pilot_id']) && $line['pilot_id'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => $line['pilot_id']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => $line['pilot_id']));
 		}
 		if (isset($line['pilot_name']) && $line['pilot_name'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => $line['pilot_name']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => $line['pilot_name']));
 		}
  
 		if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_flights[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9]+$/', $line['ident'])) {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
-		    if ($this->all_flights[$id]['addedSpotter'] == 1) {
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
+			if ($this->all_flights[$id]['addedSpotter'] == 1) {
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-			    $timeelapsed = microtime(true);
-            		    $Spotter = new Spotter($this->db);
-            		    $fromsource = NULL;
-            		    if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
-            		    elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
-			    elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao';
-			    elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
-			    elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
-            		    $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
-			    if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
-			    $Spotter->db = null;
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-			}
-		    }
+				$timeelapsed = microtime(true);
+						$Spotter = new Spotter($this->db);
+						$fromsource = NULL;
+						if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
+						elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
+				elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao';
+				elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
+				elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
+						$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
+				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
+				$Spotter->db = null;
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+			}
+			}
 
 /*
 		    if (!isset($line['id'])) {
@@ -399,104 +399,104 @@ 
 		        else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
 		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
   */
-		    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
+			if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
 
-		    //$putinarchive = true;
-		    if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
+			//$putinarchive = true;
+			if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time']));
-		    }
-		    if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) {
+			}
+			if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) {
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time']));
-		    }
-		    if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) {
-		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
-		    } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
+			}
+			if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) {
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
+			} elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
 			$timeelapsed = microtime(true);
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 				$Spotter = new Spotter($this->db);
 				$line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']);
 				$line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']);
-		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
 				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-                        }
-		    } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
+						}
+			} elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
 			$timeelapsed = microtime(true);
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-			    $Spotter = new Spotter($this->db);
-			    $route = $Spotter->getRouteInfo(trim($line['ident']));
-			    if (!isset($route['fromairport_icao']) && !isset($route['toairport_icao'])) {
+				$Spotter = new Spotter($this->db);
+				$route = $Spotter->getRouteInfo(trim($line['ident']));
+				if (!isset($route['fromairport_icao']) && !isset($route['toairport_icao'])) {
 				$Translation = new Translation($this->db);
 				$ident = $Translation->checkTranslation(trim($line['ident']));
 				$route = $Spotter->getRouteInfo($ident);
 				$Translation->db = null;
-			    }
-			    $Spotter->db = null;
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-                    	}
+				}
+				$Spotter->db = null;
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+						}
 			if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) {
-			    //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
-			    if ($route['fromairport_icao'] != $route['toairport_icao']) {
+				//if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
+				if ($route['fromairport_icao'] != $route['toairport_icao']) {
 				//    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['FromAirport_ICAO'],'arrival_airport' => $route['ToAirport_ICAO'],'route_stop' => $route['RouteStop']));
-		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['fromairport_icao'],'arrival_airport' => $route['toairport_icao'],'route_stop' => $route['routestop']));
-		    	    }
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['fromairport_icao'],'arrival_airport' => $route['toairport_icao'],'route_stop' => $route['routestop']));
+					}
 			}
 			if (!isset($globalFork)) $globalFork = TRUE;
 			if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) {
 				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident']));
 			}
-		    }
+			}
 		}
 
 		if (isset($line['speed']) && $line['speed'] != '') {
 		//    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12]));
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed'])));
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true));
-		    //$dataFound = true;
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed'])));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true));
+			//$dataFound = true;
 		} else if (!isset($this->all_flights[$id]['speed_fromsrc']) && isset($this->all_flights[$id]['time_last_coord']) && $this->all_flights[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) {
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m');
-		    if ($distance > 1000 && $distance < 10000) {
-		    // use datetime
+			$distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m');
+			if ($distance > 1000 && $distance < 10000) {
+			// use datetime
 			$speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']);
 			$speed = $speed*3.6;
 			if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed)));
   			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
-		    }
+			}
 		}
 
 
 
-	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
-	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
-	    	    else unset($timediff);
-	    	    if ($this->tmd > 5 || (isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) {
+			if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
+				if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
+				else unset($timediff);
+				if ($this->tmd > 5 || (isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) {
 			if (isset($this->all_flights[$id]['archive_latitude']) && isset($this->all_flights[$id]['archive_longitude']) && isset($this->all_flights[$id]['livedb_latitude']) && isset($this->all_flights[$id]['livedb_longitude'])) {
-			    if (!$Common->checkLine($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
+				if (!$Common->checkLine($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
 				$this->all_flights[$id]['archive_latitude'] = $line['latitude'];
 				$this->all_flights[$id]['archive_longitude'] = $line['longitude'];
 				$this->all_flights[$id]['putinarchive'] = true;
 				$this->tmd = 0;
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
-				    if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
-				    $timeelapsed = microtime(true);
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
+					if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
+					$timeelapsed = microtime(true);
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					$Spotter = new Spotter($this->db);
 					$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
 					if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2'];
 					$Spotter->db = null;
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
 					if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
-				    }
+					}
+				}
 				}
-			    }
 			}
 
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
-			    //if (!isset($this->all_flights[$id]['latitude']) || $this->all_flights[$id]['latitude'] == '' || abs($this->all_flights[$id]['latitude']-$line['latitude']) < 3 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
+				//if (!isset($this->all_flights[$id]['latitude']) || $this->all_flights[$id]['latitude'] == '' || abs($this->all_flights[$id]['latitude']-$line['latitude']) < 3 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
 				if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude'];
 				if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') {
-				    $this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
-				    $dataFound = true;
-				    $this->all_flights[$id]['time_last_coord'] = time();
+					$this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
+					$dataFound = true;
+					$this->all_flights[$id]['time_last_coord'] = time();
 				}
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude']));
@@ -507,20 +507,20 @@ 
 				    //$putinarchive = true;
 				}
 				*/
-			    /*
+				/*
 			    } elseif (isset($this->all_flights[$id]['latitude'])) {
 				if ($globalDebug) echo '!!! Strange latitude value - diff : '.abs($this->all_flights[$id]['latitude']-$line['latitude']).'- previous lat : '.$this->all_flights[$id]['latitude'].'- new lat : '.$line['latitude']."\n";
 			    }
 			    */
 			}
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
-			    //if (!isset($this->all_flights[$id]['longitude']) || $this->all_flights[$id]['longitude'] == ''  || abs($this->all_flights[$id]['longitude']-$line['longitude']) < 2 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
+				if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
+				//if (!isset($this->all_flights[$id]['longitude']) || $this->all_flights[$id]['longitude'] == ''  || abs($this->all_flights[$id]['longitude']-$line['longitude']) < 2 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
 				if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude'];
 				if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') {
-				    $this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
-				    $dataFound = true;
-				    $this->all_flights[$id]['time_last_coord'] = time();
+					$this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
+					$dataFound = true;
+					$this->all_flights[$id]['time_last_coord'] = time();
 				}
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude']));
@@ -538,95 +538,95 @@ 
 			    */
 			}
 
-		    } else if ($globalDebug && $timediff > 30) {
+			} else if ($globalDebug && $timediff > 30) {
 			$this->tmd = $this->tmd + 1;
 			echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n";
 			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -";
 			echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
 			echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n";
-		    }
+			}
 		}
 		if (isset($line['last_update']) && $line['last_update'] != '') {
-		    if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
+			if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
 		}
 		if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate']));
-		    //$dataFound = true;
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate']));
+			//$dataFound = true;
 		}
 		if (isset($line['format_source']) && $line['format_source'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source']));
 		}
 		if (isset($line['source_name']) && $line['source_name'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name']));
 		}
 		if (isset($line['emergency']) && $line['emergency'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency']));
-		    //$dataFound = true;
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency']));
+			//$dataFound = true;
 		}
 		if (isset($line['ground']) && $line['ground'] != '') {
-		    if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) {
+			if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) {
 			// Here we force archive of flight because after ground it's a new one (or should be)
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
 			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdGi')));
-		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
+				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
 			elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
-		    }
-		    if ($line['ground'] != 1) $line['ground'] = 0;
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
-		    //$dataFound = true;
+			}
+			if ($line['ground'] != 1) $line['ground'] = 0;
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
+			//$dataFound = true;
 		}
 		if (isset($line['squawk']) && $line['squawk'] != '') {
-		    if (isset($this->all_flights[$id]['squawk']) && $this->all_flights[$id]['squawk'] != '7500' && $this->all_flights[$id]['squawk'] != '7600' && $this->all_flights[$id]['squawk'] != '7700' && isset($this->all_flights[$id]['id'])) {
-			    if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
-			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
-			    $highlight = '';
-			    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
-			    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
-			    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
-			    if ($highlight != '') {
+			if (isset($this->all_flights[$id]['squawk']) && $this->all_flights[$id]['squawk'] != '7500' && $this->all_flights[$id]['squawk'] != '7600' && $this->all_flights[$id]['squawk'] != '7700' && isset($this->all_flights[$id]['id'])) {
+				if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
+				$highlight = '';
+				if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
+				if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
+				if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
+				if ($highlight != '') {
 				$timeelapsed = microtime(true);
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-				    $Spotter = new Spotter($this->db);
-				    $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
-				    $Spotter->db = null;
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					$Spotter = new Spotter($this->db);
+					$Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
+					$Spotter->db = null;
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
 				}
 				//$putinarchive = true;
 				//$highlight = '';
-			    }
+				}
 			    
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
-		    //$dataFound = true;
+			} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
+			//$dataFound = true;
 		}
 
 		if (isset($line['altitude']) && $line['altitude'] != '') {
-		    //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
+			//if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
 			if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) $this->all_flights[$id]['putinarchive'] = true;
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100)));
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude']));
 			//$dataFound = true;
-		    //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
+			//} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
   		}
 
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true));
 		}
 		
 		if (isset($line['heading']) && $line['heading'] != '') {
-		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
-		    //$dataFound = true;
+			if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
+			//$dataFound = true;
   		} elseif (!isset($this->all_flights[$id]['heading_fromsrc']) && isset($this->all_flights[$id]['archive_latitude']) && $this->all_flights[$id]['archive_latitude'] != $this->all_flights[$id]['latitude'] && isset($this->all_flights[$id]['archive_longitude']) && $this->all_flights[$id]['archive_longitude'] != $this->all_flights[$id]['longitude']) {
-  		    $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
-		    if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
+  			$heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
+			if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
+  			if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
   		} elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') {
-  		    // If not enough messages and ACARS set heading to 0
-  		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
+  			// If not enough messages and ACARS set heading to 0
+  			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
   		}
 		if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
 		elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
@@ -637,125 +637,125 @@ 
 		//if ($dataFound == true && isset($this->all_flights[$id]['hex']) && $this->all_flights[$id]['ident'] != '' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
 		//if ($dataFound === true && isset($this->all_flights[$id]['hex']) && $this->all_flights[$id]['heading'] != '' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
 		if ($dataFound === true && isset($this->all_flights[$id]['hex'])) {
-		    $this->all_flights[$id]['lastupdate'] = time();
-		    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) {
-		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == ''  || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
-			    //print_r($this->all_flights);
-			    //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n";
-			    //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
-			    if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) {
+			$this->all_flights[$id]['lastupdate'] = time();
+			if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) {
+				if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == ''  || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
+				//print_r($this->all_flights);
+				//echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n";
+				//$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
+				if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) {
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-				    if ($globalDebug) echo "Check if aircraft is already in DB...";
-				    $timeelapsed = microtime(true);
-				    $SpotterLive = new SpotterLive($this->db);
-				    if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) {
+					if ($globalDebug) echo "Check if aircraft is already in DB...";
+					$timeelapsed = microtime(true);
+					$SpotterLive = new SpotterLive($this->db);
+					if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) {
 					$recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']);
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-				    } elseif (isset($line['id'])) {
+					} elseif (isset($line['id'])) {
 					$recent_ident = $SpotterLive->checkIdRecent($line['id']);
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-				    } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
+					} elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
 					$recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']);
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-				    } else $recent_ident = '';
-				    $SpotterLive->db=null;
-				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
-				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
+					} else $recent_ident = '';
+					$SpotterLive->db=null;
+					if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
+					elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
 				} else $recent_ident = '';
-			    } else {
+				} else {
 				$recent_ident = '';
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0));
-			    }
-			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
-			    if($recent_ident == "")
-			    {
+				}
+				//if there was no aircraft with the same callsign within the last hour and go post it into the archive
+				if($recent_ident == "")
+				{
 				if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : ";
 				if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
 				if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
 				//adds the spotter data for the archive
 				$ignoreImport = false;
 				foreach($globalAirportIgnore as $airportIgnore) {
-				    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
+					if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
 					$ignoreImport = true;
-				    }
+					}
 				}
 				if (count($globalAirportAccept) > 0) {
-				    $ignoreImport = true;
-				    foreach($globalAirportIgnore as $airportIgnore) {
+					$ignoreImport = true;
+					foreach($globalAirportIgnore as $airportIgnore) {
 					if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
-					    $ignoreImport = false;
+						$ignoreImport = false;
+					}
 					}
-				    }
 				}
 				if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
-				    foreach($globalAirlineIgnore as $airlineIgnore) {
+					foreach($globalAirlineIgnore as $airlineIgnore) {
 					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) {
-					    $ignoreImport = true;
+						$ignoreImport = true;
+					}
 					}
-				    }
 				}
 				if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
-				    $ignoreImport = true;
-				    foreach($globalAirlineAccept as $airlineAccept) {
+					$ignoreImport = true;
+					foreach($globalAirlineAccept as $airlineAccept) {
 					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) {
-					    $ignoreImport = false;
+						$ignoreImport = false;
+					}
 					}
-				    }
 				}
 				if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
-				    $ignoreImport = true;
-				    foreach($globalPilotIdAccept as $pilotIdAccept) {
+					$ignoreImport = true;
+					foreach($globalPilotIdAccept as $pilotIdAccept) {
 					if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
-					    $ignoreImport = false;
+						$ignoreImport = false;
+					}
 					}
-				    }
 				}
 				
 				if (!$ignoreImport) {
-				    $highlight = '';
-				    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
-				    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
-				    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
-				    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
-				    $timeelapsed = microtime(true);
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
+					$highlight = '';
+					if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
+					if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
+					if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
+					if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
+					$timeelapsed = microtime(true);
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-					    $Spotter = new Spotter($this->db);
-					    $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['source_type']);
-					    $Spotter->db = null;
-					    if ($globalDebug && isset($result)) echo $result."\n";
+						$Spotter = new Spotter($this->db);
+						$result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['source_type']);
+						$Spotter->db = null;
+						if ($globalDebug && isset($result)) echo $result."\n";
+					}
 					}
-				    }
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 
-				    // Add source stat in DB
-				    $Stats = new Stats($this->db);
-				    if (!empty($this->stats)) {
+					// Add source stat in DB
+					$Stats = new Stats($this->db);
+					if (!empty($this->stats)) {
 					if ($globalDebug) echo 'Add source stats : ';
-				        foreach($this->stats as $date => $data) {
-					    foreach($data as $source => $sourced) {
-					        //print_r($sourced);
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
-				    		if (isset($sourced['msg'])) {
-				    		    if (time() - $sourced['msg']['date'] > 10) {
-				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
-				    		        echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
-			    			        unset($this->stats[$date][$source]['msg']);
-			    			    }
-			    			}
-			    		    }
-			    		    if ($date != date('Y-m-d')) {
-			    			unset($this->stats[$date]);
-			    		    }
-				    	}
-				    	if ($globalDebug) echo 'Done'."\n";
-
-				    }
-				    $Stats->db = null;
-				    }
-				    $this->del();
+						foreach($this->stats as $date => $data) {
+						foreach($data as $source => $sourced) {
+							//print_r($sourced);
+								if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
+								if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
+							if (isset($sourced['msg'])) {
+								if (time() - $sourced['msg']['date'] > 10) {
+									$nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
+									echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
+									unset($this->stats[$date][$source]['msg']);
+								}
+							}
+							}
+							if ($date != date('Y-m-d')) {
+							unset($this->stats[$date]);
+							}
+						}
+						if ($globalDebug) echo 'Done'."\n";
+
+					}
+					$Stats->db = null;
+					}
+					$this->del();
 				} elseif ($globalDebug) echo 'Ignore data'."\n";
 				//$ignoreImport = false;
 				$this->all_flights[$id]['addedSpotter'] = 1;
@@ -773,41 +773,41 @@ 
 			*/
 			//SpotterLive->deleteLiveSpotterDataByIdent($this->all_flights[$id]['ident']);
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
-				    if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours...";
-				    //SpotterLive->deleteLiveSpotterDataNotUpdated();
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
+					if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours...";
+					//SpotterLive->deleteLiveSpotterDataNotUpdated();
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-					    $SpotterLive = new SpotterLive($this->db);
-					    $SpotterLive->deleteLiveSpotterData();
-					    $SpotterLive->db=null;
+						$SpotterLive = new SpotterLive($this->db);
+						$SpotterLive->deleteLiveSpotterData();
+						$SpotterLive->db=null;
+					}
 					}
-				    }
-				    if ($globalDebug) echo " Done\n";
-				    $this->last_delete = time();
+					if ($globalDebug) echo " Done\n";
+					$this->last_delete = time();
 				}
-			    } else {
+				} else {
 				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt'|| $line['format_source'] === 'planeupdatefaa'  || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'famaprs')) {
-				    $this->all_flights[$id]['id'] = $recent_ident;
-				    $this->all_flights[$id]['addedSpotter'] = 1;
+					$this->all_flights[$id]['id'] = $recent_ident;
+					$this->all_flights[$id]['addedSpotter'] = 1;
 				}
 				if (isset($globalDaemon) && !$globalDaemon) {
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-					    $Spotter = new Spotter($this->db);
-					    $Spotter->updateLatestSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time']);
-					    $Spotter->db = null;
+						$Spotter = new Spotter($this->db);
+						$Spotter->updateLatestSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time']);
+						$Spotter->db = null;
+					}
 					}
-				    }
 				}
 				
-			    }
+				}
+			}
 			}
-		    }
-		    //adds the spotter LIVE data
-		    //SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed);
-		    //echo "\nAdd in Live !! \n";
-		    //echo "{$line[8]} {$line[7]} - MODES:{$line[4]}  CALLSIGN:{$line[10]}   ALT:{$line[11]}   VEL:{$line[12]}   HDG:{$line[13]}   LAT:{$line[14]}   LON:{$line[15]}   VR:{$line[16]}   SQUAWK:{$line[17]}\n";
-		    if ($globalDebug) {
+			//adds the spotter LIVE data
+			//SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed);
+			//echo "\nAdd in Live !! \n";
+			//echo "{$line[8]} {$line[7]} - MODES:{$line[4]}  CALLSIGN:{$line[10]}   ALT:{$line[11]}   VEL:{$line[12]}   HDG:{$line[13]}   LAT:{$line[14]}   LON:{$line[15]}   VR:{$line[16]}   SQUAWK:{$line[17]}\n";
+			if ($globalDebug) {
 			if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM)) {
 				if (isset($this->all_flights[$id]['source_name'])) echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name'].' - Source name : '.$this->all_flights[$id]['source_name']."\n";
 				else echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name']."\n";
@@ -815,60 +815,60 @@ 
 				if (isset($this->all_flights[$id]['source_name'])) echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Source Name : '.$this->all_flights[$id]['source_name']."\n";
 				else echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time']."\n";
 			}
-		    }
-		    $ignoreImport = false;
-		    if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
-		    if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
+			}
+			$ignoreImport = false;
+			if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
+			if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
 
-		    foreach($globalAirportIgnore as $airportIgnore) {
-		        if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
-			    $ignoreImport = true;
+			foreach($globalAirportIgnore as $airportIgnore) {
+				if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
+				$ignoreImport = true;
 			}
-		    }
-		    if (count($globalAirportAccept) > 0) {
-		        $ignoreImport = true;
-		        foreach($globalAirportIgnore as $airportIgnore) {
-			    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
+			}
+			if (count($globalAirportAccept) > 0) {
+				$ignoreImport = true;
+				foreach($globalAirportIgnore as $airportIgnore) {
+				if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
 				$ignoreImport = false;
-			    }
+				}
+			}
 			}
-		    }
-		    if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
+			if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
 			foreach($globalAirlineIgnore as $airlineIgnore) {
-			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) {
+				if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) {
 				$ignoreImport = true;
-			    }
+				}
 			}
-		    }
-		    if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
+			}
+			if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
 			$ignoreImport = true;
 			foreach($globalAirlineAccept as $airlineAccept) {
-			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) {
+				if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) {
 				$ignoreImport = false;
-			    }
+				}
+			}
 			}
-		    }
-		    if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
+			if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
 			$ignoreImport = true;
 			foreach($globalPilotIdAccept as $pilotIdAccept) {
-			    if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
-			        $ignoreImport = false;
-			    }
+				if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
+					$ignoreImport = false;
+				}
+			}
 			}
-		    }
 
-		    if (!$ignoreImport) {
+			if (!$ignoreImport) {
 			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
 				if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
 				$timeelapsed = microtime(true);
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : ";
 					$SpotterLive = new SpotterLive($this->db);
 					$result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']);
 					$SpotterLive->db = null;
 					if ($globalDebug) echo $result."\n";
-				    }
+					}
 				}
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) {
 					$APRSSpotter->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']);
@@ -880,7 +880,7 @@ 
 				//if ($line['format_source'] != 'aprs') {
 				//if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt')) {
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-				    if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $line['format_source'] != 'aprs' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
+					if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $line['format_source'] != 'aprs' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
 					$source = $this->all_flights[$id]['source_name'];
 					if ($source == '') $source = $this->all_flights[$id]['format_source'];
 					if (!isset($this->source_location[$source])) {
@@ -906,7 +906,7 @@ 
 					if ($stats_heading == 16) $stats_heading = 0;
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
 						for ($i=0;$i<=15;$i++) {
-						    $this->stats[$current_date][$source]['polar'][$i] = 0;
+							$this->stats[$current_date][$source]['polar'][$i] = 0;
 						}
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
 					} else {
@@ -919,17 +919,17 @@ 
 					//var_dump($this->stats);
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
-						    end($this->stats[$current_date][$source]['hist']);
-						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
+							end($this->stats[$current_date][$source]['hist']);
+							$mini = key($this->stats[$current_date][$source]['hist'])+10;
 						} else $mini = 0;
 						for ($i=$mini;$i<=$distance;$i+=10) {
-						    $this->stats[$current_date][$source]['hist'][$i] = 0;
+							$this->stats[$current_date][$source]['hist'][$i] = 0;
 						}
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
 					} else {
 						$this->stats[$current_date][$source]['hist'][$distance] += 1;
 					}
-				    }
+					}
 				}
 
 				$this->all_flights[$id]['lastupdate'] = time();
@@ -939,7 +939,7 @@ 
 			//$this->del();
 			
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
-			    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
+				if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
 				if ($globalDebug) echo "---- Deleting Live Spotter data Not updated since 2 hour...";
 				$SpotterLive = new SpotterLive($this->db);
 				$SpotterLive->deleteLiveSpotterDataNotUpdated();
@@ -947,19 +947,19 @@ 
 				//SpotterLive->deleteLiveSpotterData();
 				if ($globalDebug) echo " Done\n";
 				$this->last_delete_hourly = time();
-			    } else {
+				} else {
 				$this->del();
 				$this->last_delete_hourly = time();
-			    }
+				}
 			}
 			
-		    }
-		    //$ignoreImport = false;
+			}
+			//$ignoreImport = false;
 		}
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
 		if ($send) return $this->all_flights[$id];
-	    }
+		}
+	}
 	}
-    }
 }
 ?>

require/class.APRS.php

Indentation +142 added lines, -142 removed lines

@@ -2,10 +2,10 @@ 
 require_once(dirname(__FILE__).'/settings.php');
 require_once(dirname(__FILE__).'/class.Common.php');
 class aprs {
-    private $socket;
-    private $connected = false;
+	private $socket;
+	private $connected = false;
 
-    protected $symbols = array('!' => 'Police',
+	protected $symbols = array('!' => 'Police',
 	'#' => 'DIGI',
 	'$' => 'Phone',
 	'%' => 'DX Cluster',
@@ -89,13 +89,13 @@ 
 	'y' => 'Yagi At QTH');
 	
 
-    private function urshift($n, $s) {
+	private function urshift($n, $s) {
 	return ($n >= 0) ? ($n >> $s) :
-	    (($n & 0x7fffffff) >> $s) | 
+		(($n & 0x7fffffff) >> $s) | 
 		(0x40000000 >> ($s - 1));
-    }
+	}
 
-    public function parse($input) {
+	public function parse($input) {
 	global $globalDebug;
 	$debug = false;
 	$result = array();
@@ -107,8 +107,8 @@ 
 	
 	/* Check that end was found and body has at least one byte. */
 	if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) {
-	    if ($globalDebug) echo '!!! APRS invalid : '.$input."\n";
-	    return false;
+		if ($globalDebug) echo '!!! APRS invalid : '.$input."\n";
+		return false;
 	}
 	
 	if ($debug) echo 'input : '.$input."\n";
@@ -122,31 +122,31 @@ 
 	/* Parse source, target and path. */
 	//FLRDF0A52>APRS,qAS,LSTB
 	if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/',$header,$matches)) {
-	    $ident = $matches[1];
-	    $all_elements = $matches[2];
-	    if ($ident == 'AIRCRAFT') {
+		$ident = $matches[1];
+		$all_elements = $matches[2];
+		if ($ident == 'AIRCRAFT') {
 		$result['format_source'] = 'famaprs';
 		$result['source_type'] = 'modes';
-	    } elseif ($ident == 'MARINE') {
+		} elseif ($ident == 'MARINE') {
 		$result['format_source'] = 'famaprs';
 		$result['source_type'] = 'ais';
-	    } else {
+		} else {
 		if ($debug) echo 'ident : '.$ident."\n";
 		$result['ident'] = $ident;
-	    }
+		}
 	} else return false;
 	$elements = explode(',',$all_elements);
 	$source = end($elements);
 	$result['source'] = $source;
 	foreach ($elements as $element) {
-	    if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) {
-	        //echo "ok";
-	        //if ($element == 'TCPIP*') return false;
-	    } elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) {
+		if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) {
+			//echo "ok";
+			//if ($element == 'TCPIP*') return false;
+		} elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) {
 		if ($debug) echo 'element : '.$element."\n";
 		return false;
-	    }
-	    /*
+		}
+		/*
 	    } elseif (preg_match('/^([0-9A-F]{32})$/',$element)) {
 		//echo "ok";
 	    } else {
@@ -173,49 +173,49 @@ 
 	$body_parse = substr($body,1);
 	//echo 'Body : '.$body."\n";
 	if (preg_match('/^;(.){9}\*/',$body,$matches)) {
-	    $body_parse = substr($body_parse,10);
-	    $find = true;
-	    //echo $body_parse."\n";
+		$body_parse = substr($body_parse,10);
+		$find = true;
+		//echo $body_parse."\n";
 	}
 	if (preg_match('/^`(.*)\//',$body,$matches)) {
-	    $body_parse = substr($body_parse,strlen($matches[1])-1);
-	    $find = true;
-	    //echo $body_parse."\n";
+		$body_parse = substr($body_parse,strlen($matches[1])-1);
+		$find = true;
+		//echo $body_parse."\n";
 	}
 	if (preg_match("/^'(.*)\//",$body,$matches)) {
-	    $body_parse = substr($body_parse,strlen($matches[1])-1);
-	    $find = true;
-	    //echo $body_parse."\n";
+		$body_parse = substr($body_parse,strlen($matches[1])-1);
+		$find = true;
+		//echo $body_parse."\n";
 	}
 	if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/',$body_parse,$matches)) {
-	    $find = true;
-	    //print_r($matches);
-	    $timestamp = $matches[0];
-	    if ($matches[4] == 'h') {
+		$find = true;
+		//print_r($matches);
+		$timestamp = $matches[0];
+		if ($matches[4] == 'h') {
 		$timestamp = strtotime(date('Ymd').' '.$matches[1].':'.$matches[2].':'.$matches[3]);
 		//echo 'timestamp : '.$timestamp.' - now : '.time()."\n";
 		/*
 		if (time() + 3900 < $timestamp) $timestamp -= 86400;
 		elseif (time() - 82500 > $timestamp) $timestamp += 86400;
 		*/
-	    } elseif ($matches[4] == 'z' || $matches[4] == '/') {
+		} elseif ($matches[4] == 'z' || $matches[4] == '/') {
 		// This work or not ?
 		$timestamp = strtotime(date('Ym').$matches[1].' '.$matches[2].':'.$matches[3]);
-	    }
-	    $body_parse = substr($body_parse,7);
-	    $result['timestamp'] = $timestamp;
-	    //echo date('Ymd H:i:s',$timestamp);
+		}
+		$body_parse = substr($body_parse,7);
+		$result['timestamp'] = $timestamp;
+		//echo date('Ymd H:i:s',$timestamp);
 	}
 	if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/',$body_parse,$matches)) {
-	    $find = true;
-	    $timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]);
-	    $body_parse = substr($body_parse,8);
-	    $result['timestamp'] = $timestamp;
-	    //echo date('Ymd H:i:s',$timestamp);
+		$find = true;
+		$timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]);
+		$body_parse = substr($body_parse,8);
+		$result['timestamp'] = $timestamp;
+		//echo date('Ymd H:i:s',$timestamp);
 	}
 	//if (strlen($body_parse) > 19) {
-	    if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) {
-	    $find = true;
+		if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) {
+		$find = true;
 		// 4658.70N/00707.78Ez
 		//print_r(str_split($body_parse));
 		
@@ -232,7 +232,7 @@ 
 		$lon = intval($lon_deg);
 		if ($lat > 89 || $lon > 179) return false;
 	    
-	    /*
+		/*
 	    $tmp_5b = str_replace('.','',$lat_min);
 	    if (preg_match('/^([0-9]{0,4})( {0,4})$/',$tmp_5b,$matches)) {
 	        print_r($matches);
@@ -246,9 +246,9 @@ 
 		$result['longitude'] = $longitude;
 		$body_parse = substr($body_parse,18);
 		$body_parse_len = strlen($body_parse);
-	    }
-	    $body_parse_len = strlen($body_parse);
-	    if ($body_parse_len > 0) {
+		}
+		$body_parse_len = strlen($body_parse);
+		if ($body_parse_len > 0) {
 		/*
 		if (!isset($result['timestamp']) && !isset($result['latitude'])) {
 			$body_split = str_split($body);
@@ -278,92 +278,92 @@ 
 			if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code];
 			if ($symbol_code != '_') {
 			}
-		    //$body_parse = substr($body_parse,1);
-		    //$body_parse = trim($body_parse);
-		    //$body_parse_len = strlen($body_parse);
-		    if ($body_parse_len >= 7) {
+			//$body_parse = substr($body_parse,1);
+			//$body_parse = trim($body_parse);
+			//$body_parse_len = strlen($body_parse);
+			if ($body_parse_len >= 7) {
 			
-		        if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
-		    	    $course = substr($body_parse,0,3);
-		    	    $tmp_s = intval($course);
-		    	    if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course);
-		    	    $speed = substr($body_parse,4,3);
-		    	    if ($speed != '...') {
-		    		//$result['speed'] = round($speed*1.852);
-		    		$result['speed'] = intval($speed);
-		    	    }
-		    	    $body_parse = substr($body_parse,7);
-		        }
-		        // Check PHGR, PHG, RNG
-		    } 
-		    /*
+				if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
+					$course = substr($body_parse,0,3);
+					$tmp_s = intval($course);
+					if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course);
+					$speed = substr($body_parse,4,3);
+					if ($speed != '...') {
+					//$result['speed'] = round($speed*1.852);
+					$result['speed'] = intval($speed);
+					}
+					$body_parse = substr($body_parse,7);
+				}
+				// Check PHGR, PHG, RNG
+			} 
+			/*
 		    else if ($body_parse_len > 0) {
 			$rest = $body_parse;
 		    }
 		    */
-		    if (strlen($body_parse) > 0) {
-		        if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) {
-		            $altitude = intval($matches[1]);
-		            //$result['altitude'] = round($altitude*0.3048);
-		            $result['altitude'] = $altitude;
-		            //$body_parse = trim(substr($body_parse,strlen($matches[0])));
-		            $body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/','',$body_parse));
-		        }
-		    }
+			if (strlen($body_parse) > 0) {
+				if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) {
+					$altitude = intval($matches[1]);
+					//$result['altitude'] = round($altitude*0.3048);
+					$result['altitude'] = $altitude;
+					//$body_parse = trim(substr($body_parse,strlen($matches[0])));
+					$body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/','',$body_parse));
+				}
+			}
 		    
-		    // Telemetry
-		    /*
+			// Telemetry
+			/*
 		    if (preg_match('/^([0-9]+),(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,([01]{0,8})/',$body_parse,$matches)) {
 		        // Nothing yet...
 		    }
 		    */
-		    // DAO
+			// DAO
 		    
-		    if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) {
+			if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) {
 			    
-			    $dao = $matches[1];
-			    if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) {
+				$dao = $matches[1];
+				if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) {
 				$dao_split = str_split($dao);
-			        $lat_off = (($dao_split[1])-48.0)*0.001/60.0;
-			        $lon_off = (($dao_split[2])-48.0)*0.001/60.0;
+					$lat_off = (($dao_split[1])-48.0)*0.001/60.0;
+					$lon_off = (($dao_split[2])-48.0)*0.001/60.0;
 			    
 				if ($result['latitude'] < 0) $result['latitude'] -= $lat_off;
 				else $result['latitude'] += $lat_off;
 				if ($result['longitude'] < 0) $result['longitude'] -= $lon_off;
 				else $result['longitude'] += $lon_off;
-			    }
+				}
 			    
-		            $body_parse = substr($body_parse,6);
-		    }
+					$body_parse = substr($body_parse,6);
+			}
 		    
-		    if (preg_match('/CS=([0-9A-Z_]*)/',$body_parse,$matches)) {
+			if (preg_match('/CS=([0-9A-Z_]*)/',$body_parse,$matches)) {
 			$result['ident'] = str_replace('_',' ',$matches[1]);
-		    }
-		    if (preg_match('/SQ=([0-9]{4})/',$body_parse,$matches)) {
+			}
+			if (preg_match('/SQ=([0-9]{4})/',$body_parse,$matches)) {
 			$result['squawk'] = $matches[1];
-		    }
-		    if (preg_match('/AI=([0-9A-Z]{4})/',$body_parse,$matches)) {
+			}
+			if (preg_match('/AI=([0-9A-Z]{4})/',$body_parse,$matches)) {
 			$result['aircraft_icao'] = $matches[1];
-		    }
-		    if (preg_match('/TI=([0-9]*)/',$body_parse,$matches)) {
+			}
+			if (preg_match('/TI=([0-9]*)/',$body_parse,$matches)) {
 			$result['typeid'] = $matches[1];
-		    }
-		    if (preg_match('/SI=([0-9]*)/',$body_parse,$matches)) {
+			}
+			if (preg_match('/SI=([0-9]*)/',$body_parse,$matches)) {
 			$result['statusid'] = $matches[1];
-		    }
-		    if (preg_match('/IMO=([0-9]{7})/',$body_parse,$matches)) {
+			}
+			if (preg_match('/IMO=([0-9]{7})/',$body_parse,$matches)) {
 			$result['imo'] = $matches[1];
-		    }
-		    if (preg_match('/AD=([0-9]*)/',$body_parse,$matches)) {
+			}
+			if (preg_match('/AD=([0-9]*)/',$body_parse,$matches)) {
 			$result['arrival_date'] = $matches[1];
-		    }
-		    if (preg_match('/AC=([0-9A-Z_]*)/',$body_parse,$matches)) {
+			}
+			if (preg_match('/AC=([0-9A-Z_]*)/',$body_parse,$matches)) {
 			$result['arrival_code'] = str_replace('_',' ',$matches[1]);
-		    }
-		    // OGN comment
+			}
+			// OGN comment
 		   // echo "Before OGN : ".$body_parse."\n";
-		    //if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) {
-		    if (preg_match('/^id([0-9A-F]{8})/',$body_parse,$matches)) {
+			//if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) {
+			if (preg_match('/^id([0-9A-F]{8})/',$body_parse,$matches)) {
 			$id = $matches[1];
 			//$mode = substr($id,0,2);
 			$address = substr($id,2);
@@ -393,53 +393,53 @@ 
 			$stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0;
 			$result['stealth'] = $stealth;
 			$result['address'] = $address;
-		    }
+			}
 		    
-		    //Comment
-		    $result['comment'] = trim($body_parse);
+			//Comment
+			$result['comment'] = trim($body_parse);
 		} else {
-		    // parse weather
-		    //$body_parse = substr($body_parse,1);
-		    //$body_parse_len = strlen($body_parse);
+			// parse weather
+			//$body_parse = substr($body_parse,1);
+			//$body_parse_len = strlen($body_parse);
 
-		    if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
-			    $result['wind_dir'] = intval($matches[1]);
-			    $result['wind_speed'] = round(intval($matches[2])*1.60934,1);
-			    $result['wind_gust'] = round(intval($matches[3])*1.60934,1);
-			    $result['temp'] = round(5/9*((intval($matches[4]))-32),1);
-		    	    $body_parse = substr($body_parse,strlen($matches[0])+1);
-		    } elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
+			if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
+				$result['wind_dir'] = intval($matches[1]);
+				$result['wind_speed'] = round(intval($matches[2])*1.60934,1);
+				$result['wind_gust'] = round(intval($matches[3])*1.60934,1);
+				$result['temp'] = round(5/9*((intval($matches[4]))-32),1);
+					$body_parse = substr($body_parse,strlen($matches[0])+1);
+			} elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
 			$result['wind_dir'] = intval($matches[1]);
 			$result['wind_speed'] = round($matches[2]*1.60934,1);
 			$result['wind_gust'] = round($matches[3]*1.60934,1);
 			$result['temp'] = round(5/9*(($matches[4])-32),1);
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
-		    } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
+				$body_parse = substr($body_parse,strlen($matches[0])+1);
+			} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
 			$result['wind_dir'] = intval($matches[1]);
 			$result['wind_speed'] = round($matches[2]*1.60934,1);
 			$result['wind_gust'] = round($matches[3]*1.60934,1);
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
-		    } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) {
+				$body_parse = substr($body_parse,strlen($matches[0])+1);
+			} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) {
 			$result['wind_dir'] = intval($matches[1]);
 			$result['wind_speed'] = round($matches[2]*1.60934,1);
 			$result['wind_gust'] = round($matches[3]*1.60934,1);
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
-		    }
-		    if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) {
+				$body_parse = substr($body_parse,strlen($matches[0])+1);
+			}
+			if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) {
 			$result['temp'] = round(5/9*(($matches[1])-32),1);
-		    }
+			}
 		}
 		} else $result['comment'] = trim($body_parse);
 
-	    }
+		}
 	//}
 	if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4);
 	if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4);
 	if ($debug) print_r($result);
 	return $result;
-    }
+	}
     
-    public function connect() {
+	public function connect() {
 	global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass,$globalName, $globalServerAPRShost, $globalServerAPRSport;
 	$aprs_connect = 0;
 	$aprs_keep = 120;
@@ -462,32 +462,32 @@ 
 		$send = socket_send( $this->socket  , $aprs_login , strlen($aprs_login) , 0 );
 		while ($msgin = socket_read($this->socket, 1000,PHP_NORMAL_READ)) {
 			if (strpos($msgin, "$aprs_ssid verified") !== FALSE) {
-			    echo 'APRS user verified !'."\n";
-			    $this->connected = true;
-			    return true;
-			    break;
+				echo 'APRS user verified !'."\n";
+				$this->connected = true;
+				return true;
+				break;
 			}
 			if (time()-$authstart > 5) {
-			    echo 'APRS timeout'."\n";
-			    break;
+				echo 'APRS timeout'."\n";
+				break;
 			}
 		}
 		socket_set_option($this->socket,SOL_SOCKET,SO_KEEPALIVE);
 	}
-    }
+	}
 
-    public function disconnect() {
+	public function disconnect() {
 	socket_close($this->socket);
-    }
+	}
     
-    public function send($data) {
+	public function send($data) {
 	if ($this->connected === false) $this->connect();
 	$send = socket_send( $this->socket  , $data , strlen($data),0);
 	if ($send === FALSE) {
 		socket_close($this->socket);
 		$this->connect();
 	}
-    }
+	}
 }
 
 class APRSSpotter extends APRS {