Ysurac / FlightAirMap

live-geojson.php

Indentation +35 added lines, -35 removed lines

@@ -5,23 +5,23 @@ 
 $marine = false;
 $usecoord = false;
 if (isset($_GET['tracker'])) {
-    $tracker = true;
+	$tracker = true;
 }
 if (isset($_GET['marine'])) {
-    $marine = true;
+	$marine = true;
 }
 if ($tracker) {
-    require_once('require/class.Tracker.php');
-    require_once('require/class.TrackerLive.php');
-    //require_once('require/class.TrackerArchive.php');
+	require_once('require/class.Tracker.php');
+	require_once('require/class.TrackerLive.php');
+	//require_once('require/class.TrackerArchive.php');
 } elseif ($marine) {
-    require_once('require/class.Marine.php');
-    require_once('require/class.MarineLive.php');
-    //require_once('require/class.MarineArchive.php');
+	require_once('require/class.Marine.php');
+	require_once('require/class.MarineLive.php');
+	//require_once('require/class.MarineArchive.php');
 } else {
-    require_once('require/class.Spotter.php');
-    require_once('require/class.SpotterLive.php');
-    require_once('require/class.SpotterArchive.php');
+	require_once('require/class.Spotter.php');
+	require_once('require/class.SpotterLive.php');
+	require_once('require/class.SpotterArchive.php');
 }
 
 $begintime = microtime(true);
@@ -41,10 +41,10 @@ 
 $Common = new Common();
 
 if (isset($_GET['download'])) {
-    if ($_GET['download'] == "true")
-    {
+	if ($_GET['download'] == "true")
+	{
 	header('Content-disposition: attachment; filename="flightairmap.json"');
-    }
+	}
 }
 header('Content-Type: text/javascript');
 
@@ -497,17 +497,17 @@ 
 				if ($history == '' && isset($_COOKIE['history'])) $history = $_COOKIE['history'];
 				
 				if (
-				    (isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') 
-				    || ((isset($globalMapHistory) && $globalMapHistory) || $allhistory)
+					(isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') 
+					|| ((isset($globalMapHistory) && $globalMapHistory) || $allhistory)
 				//    || (isset($history) && $history != '' && $history != 'NA' && ($history == $spotter_item['ident'] || $history == $spotter_item['flightaware_id']))
 				//    || (isset($history) && $history != '' && $history != 'NA' && $history == $spotter_item['ident'])
-				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
-				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])
-				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['fammarine_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['fammarine_id']))
-				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['fammarine_id']) && $_GET['fammarine_id'] == $spotter_item['fammarine_id'])
-				    || (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['famtrackid']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['famtrackid']))
-				    || (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['famtrackid']) && $_GET['famtrackid'] == $spotter_item['famtrackid'])
-				    ) {
+					|| (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['flightaware_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
+					|| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])
+					|| (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['fammarine_id']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['fammarine_id']))
+					|| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['fammarine_id']) && $_GET['fammarine_id'] == $spotter_item['fammarine_id'])
+					|| (isset($history) && $history != '' && $history != 'NA' && isset($spotter_item['famtrackid']) && str_replace('-','',$history) == str_replace('-','',$spotter_item['famtrackid']))
+					|| (isset($history) && $history == '' && isset($spotter_item['flightaware_id']) && isset($_GET['famtrackid']) && $_GET['famtrackid'] == $spotter_item['famtrackid'])
+					) {
 					if ($tracker) {
 						$spotter_history_array = $TrackerLive->getAllLiveTrackerDataById($spotter_item['famtrackid']);
 					} elseif ($marine) {
@@ -592,26 +592,26 @@ 
 				}
 				
 				if (isset($history) && $history == $spotter_item['ident'] && isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA' && isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA' && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true") || (!isset($_COOKIE['MapRoute']) && (!isset($globalMapRoute) || (isset($globalMapRoute) && $globalMapRoute))))) {
-				    $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
-				    if (isset($spotter_item['departure_airport_latitude'])) {
+					$output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
+					if (isset($spotter_item['departure_airport_latitude'])) {
 					$output_air .= '['.$spotter_item['departure_airport_longitude'].','.$spotter_item['departure_airport_latitude'].'],';
-				    } elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') {
+					} elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') {
 					$dairport = $Spotter->getAllAirportInfo($spotter_item['departure_airport']);
 					if (isset($dairport[0]['latitude'])) {
-					    $output_air .= '['.$dairport[0]['longitude'].','.$dairport[0]['latitude'].'],';
+						$output_air .= '['.$dairport[0]['longitude'].','.$dairport[0]['latitude'].'],';
 					}
-				    }
-				    if (isset($spotter_item['arrival_airport_latitude'])) {
+					}
+					if (isset($spotter_item['arrival_airport_latitude'])) {
 					$output_air .= '['.$spotter_item['arrival_airport_longitude'].','.$spotter_item['arrival_airport_latitude'].']';
-				    } elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
+					} elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
 					$aairport = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']);
 					if (isset($aairport[0]['latitude'])) {
-					    $output_air .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].']';
+						$output_air .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].']';
 					}
-				    }
-				    $output_air .= ']}},';
-				    $output .= $output_air;
-				    unset($output_air);
+					}
+					$output_air .= ']}},';
+					$output .= $output_air;
+					unset($output_air);
 				}
 			}
 			$output  = substr($output, 0, -1);

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

index.php

Indentation +83 added lines, -83 removed lines

@@ -36,7 +36,7 @@ 
 <div id="showdetails" class="showdetails"></div>
 <div id="infobox" class="infobox"><h4><?php echo _("Aircrafts detected"); ?></h4><br /><i class="fa fa-spinner fa-pulse fa-fw"></i></div>
 <?php
-    if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) {
+	if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) {
 
 ?>
 <script src="<?php echo $globalURL; ?>/js/map.3d.js.php"></script>
@@ -56,7 +56,7 @@ 
 <script src="<?php echo $globalURL; ?>/js/map-marine.3d.js.php"></script>
 <?php
 	}
-    }
+	}
 ?>
 <div id="dialog" title="<?php echo _("Session has timed-out"); ?>">
   <p><?php echo _("In order to save data consumption web page times out after 30 minutes. Close this dialog to continue."); ?></p>
@@ -70,34 +70,34 @@ 
 	<li><a href="#" onclick="getUserLocation(); return false;" title="<?php echo _("Plot your Location"); ?>"><i class="fa fa-map-marker"></i></a></li>
 	<li><a href="#" onclick="getCompassDirection(); return false;" title="<?php echo _("Compass Mode"); ?>"><i class="fa fa-compass"></i></a></li>
 <?php
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
 	if (isset($globalArchive) && $globalArchive == TRUE) {
 ?>
 	<li><a href="#archive" role="tab" title="<?php echo _("Archive"); ?>"><i class="fa fa-archive"></i></a></li>
 <?php
 	}
-    }
+	}
 ?>
 	<li><a href="#home" role="tab" title="<?php echo _("Layers"); ?>"><i class="fa fa-map"></i></a></li>
 	<li><a href="#filters" role="tab" title="<?php echo _("Filters"); ?>"><i class="fa fa-filter"></i></a></li>
 	<li><a href="#settings" role="tab" title="<?php echo _("Settings"); ?>"><i class="fa fa-gears"></i></a></li>
 <?php
-    if (isset($globalMap3D) && $globalMap3D) {
+	if (isset($globalMap3D) && $globalMap3D) {
 	if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
 ?>
 	<li><a href="#" onclick="show3D(); return false;" role="tab" title="3D"><b>3D</b></a></li>
 <?php
-        } else {
-    	    if (isset($globalMapSatellites) && $globalMapSatellites) {
+		} else {
+			if (isset($globalMapSatellites) && $globalMapSatellites) {
 ?>
 	<li><a href="#satellites" role="tab" title="<?php echo _("Satellites"); ?>"><i class="satellite"></i></a></li>
 <?php
-	    }
+		}
 ?>
 	<li><a href="#" onclick="show2D(); return false;" role="tab" title="2D"><b>2D</b></a></li>
 <?php
 	}
-    }
+	}
 ?>
     </ul>
 
@@ -171,7 +171,7 @@ 
 ?>
         </div>
 <?php
-    if (isset($globalArchive) && $globalArchive == TRUE) {
+	if (isset($globalArchive) && $globalArchive == TRUE) {
 ?>
         <div class="sidebar-pane" id="archive">
 	    <h1 class="sidebar-header"><?php echo _("Playback"); ?> <i>Bêta</i><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
@@ -231,7 +231,7 @@ 
 	    </form>
 	</div>
 <?php
-    }
+	}
 ?>
         <div class="sidebar-pane" id="settings">
 	    <h1 class="sidebar-header"><?php echo _("Settings"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
@@ -242,56 +242,56 @@ 
 			    <?php
 				if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider;
 				else $MapType = $_COOKIE['MapType'];
-			    ?>
+				?>
 			    <?php
 				if (isset($globalBingMapKey) && $globalBingMapKey != '') {
-			    ?>
+				?>
 			    <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option>
 			    <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option>
 			    <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option>
 			    <?php
 				}
-			    ?>
+				?>
 			    <?php
-			        if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
-			    ?>
+					if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
+				?>
 			    <?php
-				    if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
-			    ?>
+					if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
+				?>
 			    <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option>
 			    <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option>
 			    <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option>
 			    <?php
-				    }
-			    ?>
+					}
+				?>
 			    <?php
-				    if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') {
-			    ?>
+					if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') {
+				?>
 			    <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option>
 			    <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option>
 			    <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option>
 			    <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option>
 			    <?php
-				    }
-			    ?>
+					}
+				?>
 			    <?php
-				    if (isset($globalMapQuestKey) && $globalMapQuestKey != '') {
-			    ?>
+					if (isset($globalMapQuestKey) && $globalMapQuestKey != '') {
+				?>
 			    <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option>
 			    <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option>
 			    <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option>
 			    <?php
-				    }
-			    ?>
+					}
+				?>
 			    <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option>
 			    <?php
 				}
-			    ?>
+				?>
 			    <?php
-				    if (isset($globalMapboxToken) && $globalMapboxToken != '') {
+					if (isset($globalMapboxToken) && $globalMapboxToken != '') {
 					if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default';
 					else $MapBoxId = $_COOKIE['MapTypeId'];
-			    ?>
+				?>
 			    <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option>
 			    <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option>
 			    <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option>
@@ -305,13 +305,13 @@ 
 			    <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option>
 			    <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option>
 			    <?php
-				    }
-			    ?>
+					}
+				?>
 			    <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option>
 			</select>
 		    </li>
 <?php
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
 ?>
 		    <li><?php echo _("Type of Terrain:"); ?>
 			<select  class="selectpicker" onchange="terrainType(this);">
@@ -321,10 +321,10 @@ 
 			</select>
 		    </li>
 <?php
-    }
+	}
 ?>
 <?php
-    if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
+	if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
 ?>
 		    
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') print 'checked'; ?> ><?php echo _("Display flight info as popup"); ?></label></div></li>
@@ -332,70 +332,70 @@ 
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightroute" value="1" onclick="clickFlightRoute(this)" <?php if ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == 'true') || !isset($_COOKIE['MapRoute'])) print 'checked'; ?> ><?php echo _("Display flight route on click"); ?></label></div></li>
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightestimation" value="1" onclick="clickFlightEstimation(this)" <?php if ((isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'true') || (!isset($_COOKIE['flightestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Planes animate between updates"); ?></label></div></li>
 <?php
-    }
+	}
 ?>
 		    <li><div class="checkbox"><label><input type="checkbox" name="displayairports" value="1" onclick="clickDisplayAirports(this)" <?php if (isset($_COOKIE['displayairports']) && $_COOKIE['displayairports'] == 'true') print 'checked'; ?> ><?php echo _("Display airports on map"); ?></label></div></li>
 <?php
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
 ?>
 		    <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) print 'checked'; ?> ><?php echo _("Show mini-map"); ?></label></div></li>
 <?php
-    }
-    if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
+	}
+	if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
 ?>
 		    <li><div class="checkbox"><label><input type="checkbox" name="displaysanta" value="1" onclick="clickSanta(this)"><i class="fa fa-snowflake-o" aria-hidden="true"></i> <?php echo _("Show Santa Claus now"); ?> <i class="fa fa-snowflake-o" aria-hidden="true"></i></label></div></li>
 <?php
-    }
+	}
 ?>
 
 		    <?php
 			if (function_exists('array_column')) {
-			    if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
-		    ?>
+				if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
+			?>
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li>
 		    <?php
-			    }
+				}
 			} elseif (isset($globalSources)) {
-			    $dispolar = false;
-			    foreach ($globalSources as $testsource) {
-			        if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true;
-			    }
-			    if ($dispolar) {
-		    ?>
+				$dispolar = false;
+				foreach ($globalSources as $testsource) {
+					if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true;
+				}
+				if ($dispolar) {
+			?>
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li>
 		    <?php
-			    }
-		        }
-		    ?>
+				}
+				}
+			?>
 <?php
-    if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
+	if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
 ?>
 
 		    <?php
-		        if (extension_loaded('gd') && function_exists('gd_info')) {
-		    ?>
+				if (extension_loaded('gd') && function_exists('gd_info')) {
+			?>
 		    <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') print 'checked'; ?> ><?php echo _("Aircraft icon color based on altitude"); ?></li>
 		    <?php 
 			if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') {
-		    ?>
+			?>
 		    <li><?php echo _("Aircraft icon color:"); ?>
 			<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print '1a3151'; ?>">
 		    </li>
 		    <?php
-			    }
-		        }
-		    ?>
+				}
+				}
+			?>
 		    <?php
 			if (isset($globalMarine) && $globalMarine === TRUE) {
-			    if (extension_loaded('gd') && function_exists('gd_info')) {
-		    ?>
+				if (extension_loaded('gd') && function_exists('gd_info')) {
+			?>
 		    <li><?php echo _("Marine icon color:"); ?>
 			<input type="color" name="marinecolor" id="html5colorpicker" onchange="iconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) print $_COOKIE['MarineIconColor']; elseif (isset($globalMarineIconColor)) print $globalMarineIconColor; else print '1a3151'; ?>">
 		    </li>
 		    <?php
-			    }
-		        }
-		    ?>
+				}
+				}
+			?>
 		    <li><?php echo _("Show airport icon at zoom level:"); ?>
 			<div class="range">
 			    <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?>">
@@ -403,7 +403,7 @@ 
 			</div>
 		    </li>
 <?php
-    } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') {
+	} elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') {
 ?>
 		    <li><input type="checkbox" name="aircraftcolorforce" value="1" onclick="iconColorForce(this)" <?php if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true') print 'checked'; ?> ><?php echo _("Force Aircraft color"); ?></li>
 		    <li><?php echo _("Aircraft icon color:"); ?>
@@ -418,7 +418,7 @@ 
 		    </li>
 <?php
 	}
-    }
+	}
 ?>
 		    <li><?php echo _("Distance unit:"); ?>
 			<select class="selectpicker" onchange="unitdistance(this);">
@@ -451,16 +451,16 @@ 
 		    <ul>
 		    <?php
 			if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) {
-		    ?>
+			?>
 			<?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) print 'checked'; ?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?>
 			<?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) print 'checked'; ?> ><?php echo _("Display IVAO data"); ?></li><?php } ?>
 			<?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') || !isset($_COOKIE['ShowVMS'])) print 'checked'; ?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?>
 		    <?php
 			}
-		    ?>
+			?>
 		    <?php
 			if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) {
-		    ?>
+			?>
 			<?php if (isset($globalSBS1) && $globalSBS1) { ?>
 			    <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) print 'checked'; ?> ><?php echo _("Display ADS-B data"); ?></label></div></li>
 			<?php } ?>
@@ -469,7 +469,7 @@ 
 			<?php } ?>
 		    <?php
 			}
-		    ?>
+			?>
 		    <li><?php echo _("Display airlines:"); ?>
 		    <br/>
 			<select class="selectpicker" multiple onchange="airlines(this);" id="display_airlines">
@@ -489,14 +489,14 @@ 
 						echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>';
 					}
 				}
-			    ?>
+				?>
 			</select>
 		    </li>
 		    <?php
 			$Spotter = new Spotter();
 			$allalliancenames = $Spotter->getAllAllianceNames();
 			if (!empty($allalliancenames)) {
-		    ?>
+			?>
 		    <li><?php echo _("Display alliance:"); ?>
 		    <br/>
 			<select class="selectpicker" onchange="alliance(this);" id="display_alliance">
@@ -510,15 +510,15 @@ 
 						echo '<option value="'.$alliance_name.'">'.$alliance_name.'</option>';
 					}
 				}
-			    ?>
+				?>
 			</select>
 		    </li>
 		    <?php
 			}
-		    ?>
+			?>
 		    <?php
 			if (isset($globalAPRS) && $globalAPRS) {
-		    ?>
+			?>
 		    <li><?php echo _("Display APRS sources name:"); ?>
 			<select class="selectpicker" multiple onchange="sources(this);">
 			    <?php
@@ -530,15 +530,15 @@ 
 						echo '<option value="'.$source['source_name'].'">'.$source['source_name'].'</option>';
 					}
 				}
-			    ?>
+				?>
 			</select>
 		    </li>
 		    <?php
 			}
-		    ?>
+			?>
 		    <?php
 			if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) {
-		    ?>
+			?>
 		    <li><?php echo _("Display airlines of type:"); ?><br/>
 			<select class="selectpicker" onchange="airlinestype(this);">
 			    <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option>
@@ -549,7 +549,7 @@ 
 		    </li>
 		    <?php
 			}
-		    ?>
+			?>
 		    <li>
 			<?php echo _("Display flight with ident:"); ?>
 			<input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" />
@@ -562,7 +562,7 @@ 
 	    </form>
     	</div>
 <?php
-    if (isset($globalMapSatellites) && $globalMapSatellites && isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
+	if (isset($globalMapSatellites) && $globalMapSatellites && isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
 ?>
         <div class="sidebar-pane" id="satellites">
 	    <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
@@ -602,14 +602,14 @@ 
 						print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>';
 					}
 				}
-			    ?>
+				?>
 			</select>
 		    </li>
 		</ul>
 	    </form>
 	</div>
 <?php
-    }
+	}
 ?>
     </div>
 </div>

header.php

Indentation +49 added lines, -49 removed lines

@@ -28,7 +28,7 @@ 
 // When button "Remove all filters" is clicked
 if (isset($_POST['removefilters'])) {
 	$allfilters = array_filter(array_keys($_COOKIE),function($key) {
-	    return strpos($key,'filter_') === 0;
+		return strpos($key,'filter_') === 0;
 	});
 	foreach ($allfilters as $filt) {
 		unset($_COOKIE[$filt]);
@@ -168,17 +168,17 @@ 
 	}
 ?>
 <?php 
-    if (isset($_POST['archive'])) {
+	if (isset($_POST['archive'])) {
 ?>
 <script src="<?php print $globalURL; ?>/js/map.common.js"></script>
 <?php 
-	    if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
+		if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
 ?>
 
 <script src="<?php print $globalURL; ?>/js/map.js.php?<?php print time(); ?>&archive&begindate=<?php print strtotime($_POST['start_date']); ?>&enddate=<?php print strtotime($_POST['end_date']); ?>&archivespeed=<?php print $_POST['archivespeed']; ?>"></script>
 <?php    
-	    }
-    } else {
+		}
+	} else {
 ?>
 <?php
 /*	if (isset($globalBeta) && $globalBeta) {
@@ -190,7 +190,7 @@ 
 */
 ?>
 <?php 
-	    if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
+		if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
 ?>
 <?php
 //		if (isset($globalBeta) && $globalBeta) {
@@ -217,13 +217,13 @@ 
 <script src="<?php print $globalURL; ?>/js/map-marine.2d.js.php?<?php print time(); ?>"></script>
 <?php
 		}
-	    }
+		}
 ?>
 <?php
 //	}
 ?>
 <?php
-    }
+	}
 }
 ?>
 <?php
@@ -380,15 +380,15 @@ 
 			<li><a href="<?php print $globalURL; ?>/airline"><?php echo _("Airlines"); ?></a></li>
 			<li><a href="<?php print $globalURL; ?>/airport"><?php echo _("Airports"); ?></a></li>
 <?php
-    if ((!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM)) {
+	if ((!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM)) {
 ?>
 			<li><a href="<?php print $globalURL; ?>/owner"><?php echo _("Owners"); ?></a></li>
 <?php
-    } else {
+	} else {
 ?>
 			<li><a href="<?php print $globalURL; ?>/pilot"><?php echo _("Pilots"); ?></a></li>
 <?php
-    }
+	}
 ?>
 			<li><hr /></li>
             <li><a href="<?php print $globalURL; ?>/currently"><?php echo _("Current Activity"); ?></a></li>
@@ -396,34 +396,34 @@ 
             <li><a href="<?php print $globalURL; ?>/date/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Activity"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/newest"><?php echo _("Newest by Category"); ?></a></li>
             <?php
-        	if ($globalACARS) {
-        	    if (isset($globalDemo) && $globalDemo) {
-    	    ?>
+			if ($globalACARS) {
+				if (isset($globalDemo) && $globalDemo) {
+			?>
             <li><hr /></li>
             <li><i><?php echo _('ACARS data not available publicly'); ?></i></li>
             <li><a href=""><?php echo _('Latest ACARS messages'); ?></a></li>
             <li><a href=""><?php echo _('Archive ACARS messages'); ?></a></li>
             <?php
-        	    } else {
-    	    ?>
+				} else {
+			?>
             <li><hr /></li>
             <li><a href="<?php print $globalURL; ?>/acars-latest"><?php echo _("Latest ACARS messages"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/acars-archive"><?php echo _("Archive ACARS messages"); ?></a></li>
             <?php
-        	    }
-        	}
-    	    ?>
+				}
+			}
+			?>
     	    <?php
-    	        if (isset($globalAccidents) && $globalAccidents) {
-    	    ?>
+				if (isset($globalAccidents) && $globalAccidents) {
+			?>
             <li><hr /></li>
             <li><a href="<?php print $globalURL; ?>/accident-latest"><?php echo _("Latest accident"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/accident/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Accident"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/incident-latest"><?php echo _("Latest incident"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/incident/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Incident"); ?></a></li>
             <?php
-        	}
-    	    ?>
+			}
+			?>
             <li><hr /></li>
             <li><a href="<?php print $globalURL; ?>/highlights/table"><?php echo _("Special Highlights"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/upcoming"><?php echo _("Upcoming Flights"); ?></a></li>
@@ -465,14 +465,14 @@ 
   	    <form>
   		<select class="selectpicker" data-width="120px" onchange="language(this);">
   		    <?php
-  		        $Language = new Language();
-  		        $alllang = $Language->getLanguages();
-  		        foreach ($alllang as $key => $lang) {
-  		            print '<option value="'.$key.'"';
-  		            if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
-  		            print '>'.$lang[0].'</option>';
-  		        }
-  		    ?>
+  				$Language = new Language();
+  				$alllang = $Language->getLanguages();
+  				foreach ($alllang as $key => $lang) {
+  					print '<option value="'.$key.'"';
+  					if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
+  					print '>'.$lang[0].'</option>';
+  				}
+  			?>
   		</select>
   	    </form>
   	</div>
@@ -503,18 +503,18 @@ 
 ?>
     <div class="top-header clear" role="main">
 <?php
-    if (isset($longitude) && isset($latitude) && $longitude != 0 && $latitude != 0) {
+	if (isset($longitude) && isset($latitude) && $longitude != 0 && $latitude != 0) {
 ?>
     <div id="archive-map"></div>
 <?php
-    }
+	}
 ?>
     </div>
 <?php
 }
 if ((strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) || (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false))
 {
-    ?>
+	?>
     <div class="top-header clear" role="main">
         <div id="map"></div>
 	<link rel="stylesheet" href="<?php print $globalURL; ?>/css/leaflet.css" />
@@ -525,15 +525,15 @@ 
         var zoom = 13;
 //create the map
 <?php
-    if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) {
+	if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $airport_array[0]['latitude']; ?>,<?php print $airport_array[0]['longitude']; ?>], zoom);
 <?php
-    } elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) {
+	} elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) {
 ?>
   map = L.map('map', { zoomControl:true });
 <?php
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
+	} elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['departure_airport_latitude']; ?>,<?php print $spotter_array[0]['arrival_airport_longitude']; ?>]);
     var line = L.polyline([[<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>],[<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>]]).addTo(map);
@@ -541,22 +541,22 @@ 
     var departure_airport = L.marker([<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/departure_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map);
     var arrival_airport = L.marker([<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/arrival_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map);
 <?php
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude'])) {
+	} elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['latitude']; ?>,<?php print $spotter_array[0]['longitude']; ?>]);
 <?php
-    } elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) {
+	} elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) {
 ?>
   map = L.map('map', { zoomControl:true });
 <?php
-    }
+	}
 ?>
   //initialize the layer group for the aircrft markers
   var layer_data = L.layerGroup();
 
   //a few title layers
 <?php
-    if ($globalMapProvider == 'Mapbox') {
+	if ($globalMapProvider == 'Mapbox') {
 ?>
   L.tileLayer('https://{s}.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={token}', {
     maxZoom: 18,
@@ -567,7 +567,7 @@ 
     token : '<?php print $globalMapboxToken; ?>'
   }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'OpenStreetMap') {
+	} elseif ($globalMapProvider == 'OpenStreetMap') {
 ?>
   L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
     maxZoom: 18,
@@ -575,7 +575,7 @@ 
       '<a href="http://www.openstreetmap.org/copyright">Open Database Licence</a>'
   }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'MapQuest-OSM') {
+	} elseif ($globalMapProvider == 'MapQuest-OSM') {
 ?>
   L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png', {
     maxZoom: 18,
@@ -584,7 +584,7 @@ 
       'Tiles Courtesy of <a href="http://www.mapquest.com">MapQuest</a>'
   }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'MapQuest-Aerial') {
+	} elseif ($globalMapProvider == 'MapQuest-Aerial') {
 ?>
   L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.png', {
     maxZoom: 18,
@@ -593,27 +593,27 @@ 
       'Tiles Courtesy of <a href="http://www.mapquest.com">MapQuest</a>, Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency"'
   }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'Google-Roadmap') {
+	} elseif ($globalMapProvider == 'Google-Roadmap') {
 ?>
     var googleLayer = new L.Google('ROADMAP');
     map.addLayer(googleLayer);
 <?php
-    } elseif ($globalMapProvider == 'Google-Satellite') {
+	} elseif ($globalMapProvider == 'Google-Satellite') {
 ?>
     var googleLayer = new L.Google('SATELLITE');
     map.addLayer(googleLayer);
 <?php
-    } elseif ($globalMapProvider == 'Google-Hybrid') {
+	} elseif ($globalMapProvider == 'Google-Hybrid') {
 ?>
     var googleLayer = new L.Google('HYBRID');
     map.addLayer(googleLayer);
 <?php
-    } elseif ($globalMapProvider == 'Google-Terrain') {
+	} elseif ($globalMapProvider == 'Google-Terrain') {
 ?>
     var googleLayer = new L.Google('Terrain');
     map.addLayer(googleLayer);
 <?php
-    }
+	}
 ?>
         </script>
     </div>

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);

scripts/daemon-spotter.php

Indentation +863 added lines, -863 removed lines

@@ -15,8 +15,8 @@ 
 require_once(dirname(__FILE__).'/../require/class.Common.php');
 if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
 if (isset($globalMarine) && $globalMarine) {
-    require_once(dirname(__FILE__).'/../require/class.AIS.php');
-    require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
+	require_once(dirname(__FILE__).'/../require/class.AIS.php');
+	require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
 }
 
 if (!isset($globalDebug)) $globalDebug = FALSE;
@@ -24,42 +24,42 @@ 
 // Check if schema is at latest version
 $Connection = new Connection();
 if ($Connection->latest() === false) {
-    echo "You MUST update to latest schema. Run install/index.php";
-    exit();
+	echo "You MUST update to latest schema. Run install/index.php";
+	exit();
 }
 if (PHP_SAPI != 'cli') {
-    echo "This script MUST be called from console, not a web browser.";
+	echo "This script MUST be called from console, not a web browser.";
 //    exit();
 }
 
 // This is to be compatible with old version of settings.php
 if (!isset($globalSources)) {
-    if (isset($globalSBS1Hosts)) {
-        //$hosts = $globalSBS1Hosts;
-        foreach ($globalSBS1Hosts as $host) {
-	    $globalSources[] = array('host' => $host);
-    	}
-    } else {
-        if (!isset($globalSBS1Host)) {
-	    echo '$globalSources MUST be defined !';
-	    die;
+	if (isset($globalSBS1Hosts)) {
+		//$hosts = $globalSBS1Hosts;
+		foreach ($globalSBS1Hosts as $host) {
+		$globalSources[] = array('host' => $host);
+		}
+	} else {
+		if (!isset($globalSBS1Host)) {
+		echo '$globalSources MUST be defined !';
+		die;
 	}
 	//$hosts = array($globalSBS1Host.':'.$globalSBS1Port);
 	$globalSources[] = array('host' => $globalSBS1Host,'port' => $globalSBS1Port);
-    }
+	}
 }
 
 $options = getopt('s::',array('source::','server','nodaemon','idsource::','aprsserverssid::','aprsserverpass::','aprsserverhost::','aprsserverport::','format::','noaprsserver'));
 //if (isset($options['s'])) $hosts = array($options['s']);
 //elseif (isset($options['source'])) $hosts = array($options['source']);
 if (isset($options['s'])) {
-    $globalSources = array();
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']);
-    else $globalSources[] = array('host' => $options['s']);
+	$globalSources = array();
+	if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']);
+	else $globalSources[] = array('host' => $options['s']);
 } elseif (isset($options['source'])) {
-    $globalSources = array();
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']);
-    else $globalSources[] = array('host' => $options['source']);
+	$globalSources = array();
+	if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']);
+	else $globalSources[] = array('host' => $options['source']);
 }
 if (isset($options['aprsserverhost'])) {
 	$globalServerAPRS = TRUE;
@@ -74,8 +74,8 @@ 
 if (isset($options['idsource'])) $id_source = $options['idsource'];
 else $id_source = 1;
 if (isset($globalServer) && $globalServer) {
-    if ($globalDebug) echo "Using Server Mode\n";
-    $SI=new SpotterServer();
+	if ($globalDebug) echo "Using Server Mode\n";
+	$SI=new SpotterServer();
 /*
     require_once(dirname(__FILE__).'/../require/class.APRS.php');
     $SI = new adsb2aprs();
@@ -84,8 +84,8 @@ 
 } else $SI=new SpotterImport($Connection->db);
 if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db);
 if (isset($globalMarine) && $globalMarine) {
-    $AIS = new AIS();
-    $MI = new MarineImport($Connection->db);
+	$AIS = new AIS();
+	$MI = new MarineImport($Connection->db);
 }
 //$APRS=new APRS($Connection->db);
 $SBS=new SBS();
@@ -95,12 +95,12 @@ 
 //$servertz = system('date +%Z');
 // signal handler - playing nice with sockets and dump1090
 if (function_exists('pcntl_fork')) {
-    pcntl_signal(SIGINT,  function() {
-        global $sockets;
-        echo "\n\nctrl-c or kill signal received. Tidying up ... ";
-        die("Bye!\n");
-    });
-    pcntl_signal_dispatch();
+	pcntl_signal(SIGINT,  function() {
+		global $sockets;
+		echo "\n\nctrl-c or kill signal received. Tidying up ... ";
+		die("Bye!\n");
+	});
+	pcntl_signal_dispatch();
 }
 
 // let's try and connect
@@ -110,153 +110,153 @@ 
 $reset = 0;
 
 function connect_all($hosts) {
-    //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
-    global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;
-    $reset++;
-    if ($globalDebug) echo 'Connect to all...'."\n";
-    foreach ($hosts as $id => $value) {
+	//global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
+	global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;
+	$reset++;
+	if ($globalDebug) echo 'Connect to all...'."\n";
+	foreach ($hosts as $id => $value) {
 	$host = $value['host'];
 	$globalSources[$id]['last_exec'] = 0;
 	// Here we check type of source(s)
 	if (filter_var($host,FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) {
-            if (preg_match('/deltadb.txt$/i',$host)) {
-        	//$formats[$id] = 'deltadbtxt';
-        	$globalSources[$id]['format'] = 'deltadbtxt';
-        	//$last_exec['deltadbtxt'] = 0;
-        	if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
-            } else if (preg_match('/vatsim-data.txt$/i',$host)) {
-        	//$formats[$id] = 'vatsimtxt';
-        	$globalSources[$id]['format'] = 'vatsimtxt';
-        	//$last_exec['vatsimtxt'] = 0;
-        	if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
-    	    } else if (preg_match('/aircraftlist.json$/i',$host)) {
-        	//$formats[$id] = 'aircraftlistjson';
-        	$globalSources[$id]['format'] = 'aircraftlistjson';
-        	//$last_exec['aircraftlistjson'] = 0;
-        	if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
-    	    } else if (preg_match('/opensky/i',$host)) {
-        	//$formats[$id] = 'aircraftlistjson';
-        	$globalSources[$id]['format'] = 'opensky';
-        	//$last_exec['aircraftlistjson'] = 0;
-        	if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
-    	    } else if (preg_match('/radarvirtuel.com\/file.json$/i',$host)) {
-        	//$formats[$id] = 'radarvirtueljson';
-        	$globalSources[$id]['format'] = 'radarvirtueljson';
-        	//$last_exec['radarvirtueljson'] = 0;
-        	if ($globalDebug) echo "Connect to radarvirtuel.com/file.json source (".$host.")...\n";
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
-        	    exit(0);
-        	}
-    	    } else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
-        	//$formats[$id] = 'planeupdatefaa';
-        	$globalSources[$id]['format'] = 'planeupdatefaa';
-        	//$last_exec['planeupdatefaa'] = 0;
-        	if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
-        	    exit(0);
-        	}
-            } else if (preg_match('/\/action.php\/acars\/data$/i',$host)) {
-        	//$formats[$id] = 'phpvmacars';
-        	$globalSources[$id]['format'] = 'phpvmacars';
-        	//$last_exec['phpvmacars'] = 0;
-        	if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
-            } else if (preg_match('/VAM-json.php$/i',$host)) {
-        	//$formats[$id] = 'phpvmacars';
-        	$globalSources[$id]['format'] = 'vam';
-        	if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
-            } else if (preg_match('/whazzup/i',$host)) {
-        	//$formats[$id] = 'whazzup';
-        	$globalSources[$id]['format'] = 'whazzup';
-        	//$last_exec['whazzup'] = 0;
-        	if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
-            } else if (preg_match('/recentpireps/i',$host)) {
-        	//$formats[$id] = 'pirepsjson';
-        	$globalSources[$id]['format'] = 'pirepsjson';
-        	//$last_exec['pirepsjson'] = 0;
-        	if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
-            } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
-        	//$formats[$id] = 'fr24json';
-        	$globalSources[$id]['format'] = 'fr24json';
-        	//$last_exec['fr24json'] = 0;
-        	if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n";
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
-        	    exit(0);
-        	}
-            } else if (preg_match(':myshiptracking.com/:i',$host)) {
-        	//$formats[$id] = 'fr24json';
-        	$globalSources[$id]['format'] = 'myshiptracking';
-        	//$last_exec['fr24json'] = 0;
-        	if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n";
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
-        	    exit(0);
-        	}
-            //} else if (preg_match('/10001/',$host)) {
-            } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
-        	//$formats[$id] = 'tsv';
-        	$globalSources[$id]['format'] = 'tsv';
-        	if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
-            }
-        } elseif (filter_var($host,FILTER_VALIDATE_URL)) {
-    		if ($globalSources[$id]['format'] == 'aisnmeahttp') {
-    		    $idf = fopen($globalSources[$id]['host'],'r',false,$context);
-    		    if ($idf !== false) {
-    			$httpfeeds[$id] = $idf;
-        		if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
-    		    }
-    		    elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
-    		} elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
-        } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
-	    $hostport = explode(':',$host);
-	    if (isset($hostport[1])) {
+			if (preg_match('/deltadb.txt$/i',$host)) {
+			//$formats[$id] = 'deltadbtxt';
+			$globalSources[$id]['format'] = 'deltadbtxt';
+			//$last_exec['deltadbtxt'] = 0;
+			if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
+			} else if (preg_match('/vatsim-data.txt$/i',$host)) {
+			//$formats[$id] = 'vatsimtxt';
+			$globalSources[$id]['format'] = 'vatsimtxt';
+			//$last_exec['vatsimtxt'] = 0;
+			if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
+			} else if (preg_match('/aircraftlist.json$/i',$host)) {
+			//$formats[$id] = 'aircraftlistjson';
+			$globalSources[$id]['format'] = 'aircraftlistjson';
+			//$last_exec['aircraftlistjson'] = 0;
+			if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
+			} else if (preg_match('/opensky/i',$host)) {
+			//$formats[$id] = 'aircraftlistjson';
+			$globalSources[$id]['format'] = 'opensky';
+			//$last_exec['aircraftlistjson'] = 0;
+			if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
+			} else if (preg_match('/radarvirtuel.com\/file.json$/i',$host)) {
+			//$formats[$id] = 'radarvirtueljson';
+			$globalSources[$id]['format'] = 'radarvirtueljson';
+			//$last_exec['radarvirtueljson'] = 0;
+			if ($globalDebug) echo "Connect to radarvirtuel.com/file.json source (".$host.")...\n";
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
+				exit(0);
+			}
+			} else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
+			//$formats[$id] = 'planeupdatefaa';
+			$globalSources[$id]['format'] = 'planeupdatefaa';
+			//$last_exec['planeupdatefaa'] = 0;
+			if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
+				exit(0);
+			}
+			} else if (preg_match('/\/action.php\/acars\/data$/i',$host)) {
+			//$formats[$id] = 'phpvmacars';
+			$globalSources[$id]['format'] = 'phpvmacars';
+			//$last_exec['phpvmacars'] = 0;
+			if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
+			} else if (preg_match('/VAM-json.php$/i',$host)) {
+			//$formats[$id] = 'phpvmacars';
+			$globalSources[$id]['format'] = 'vam';
+			if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
+			} else if (preg_match('/whazzup/i',$host)) {
+			//$formats[$id] = 'whazzup';
+			$globalSources[$id]['format'] = 'whazzup';
+			//$last_exec['whazzup'] = 0;
+			if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
+			} else if (preg_match('/recentpireps/i',$host)) {
+			//$formats[$id] = 'pirepsjson';
+			$globalSources[$id]['format'] = 'pirepsjson';
+			//$last_exec['pirepsjson'] = 0;
+			if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
+			} else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
+			//$formats[$id] = 'fr24json';
+			$globalSources[$id]['format'] = 'fr24json';
+			//$last_exec['fr24json'] = 0;
+			if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n";
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
+				exit(0);
+			}
+			} else if (preg_match(':myshiptracking.com/:i',$host)) {
+			//$formats[$id] = 'fr24json';
+			$globalSources[$id]['format'] = 'myshiptracking';
+			//$last_exec['fr24json'] = 0;
+			if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n";
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
+				exit(0);
+			}
+			//} else if (preg_match('/10001/',$host)) {
+			} else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
+			//$formats[$id] = 'tsv';
+			$globalSources[$id]['format'] = 'tsv';
+			if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
+			}
+		} elseif (filter_var($host,FILTER_VALIDATE_URL)) {
+			if ($globalSources[$id]['format'] == 'aisnmeahttp') {
+				$idf = fopen($globalSources[$id]['host'],'r',false,$context);
+				if ($idf !== false) {
+				$httpfeeds[$id] = $idf;
+				if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
+				}
+				elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
+			} elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
+		} elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
+		$hostport = explode(':',$host);
+		if (isset($hostport[1])) {
 		$port = $hostport[1];
 		$hostn = $hostport[0];
-	    } else {
+		} else {
 		$port = $globalSources[$id]['port'];
 		$hostn = $globalSources[$id]['host'];
-	    }
-	    $Common = new Common();
-	    if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
-        	$s = $Common->create_socket($hostn,$port, $errno, $errstr);
-    	    } else {
-        	$s = $Common->create_socket_udp($hostn,$port, $errno, $errstr);
-	    }
-	    if ($s) {
-    	        $sockets[$id] = $s;
-    	        if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
-		    if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') {
+		}
+		$Common = new Common();
+		if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
+			$s = $Common->create_socket($hostn,$port, $errno, $errstr);
+			} else {
+			$s = $Common->create_socket_udp($hostn,$port, $errno, $errstr);
+		}
+		if ($s) {
+				$sockets[$id] = $s;
+				if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
+			if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') {
 			//$formats[$id] = 'aprs';
 			$globalSources[$id]['format'] = 'aprs';
 			//$aprs_connect = 0;
 			//$use_aprs = true;
-		    } elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
+			} elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
 			$globalSources[$id]['format'] = 'vrstcp';
-    		    } elseif ($port == '10001') {
-        		//$formats[$id] = 'tsv';
-        		$globalSources[$id]['format'] = 'tsv';
-		    } elseif ($port == '30002') {
-        		//$formats[$id] = 'raw';
-        		$globalSources[$id]['format'] = 'raw';
-		    } elseif ($port == '5001') {
-        		//$formats[$id] = 'raw';
-        		$globalSources[$id]['format'] = 'flightgearmp';
-		    } elseif ($port == '30005') {
+				} elseif ($port == '10001') {
+				//$formats[$id] = 'tsv';
+				$globalSources[$id]['format'] = 'tsv';
+			} elseif ($port == '30002') {
+				//$formats[$id] = 'raw';
+				$globalSources[$id]['format'] = 'raw';
+			} elseif ($port == '5001') {
+				//$formats[$id] = 'raw';
+				$globalSources[$id]['format'] = 'flightgearmp';
+			} elseif ($port == '30005') {
 			// Not yet supported
-        		//$formats[$id] = 'beast';
-        		$globalSources[$id]['format'] = 'beast';
-		    //} else $formats[$id] = 'sbs';
-		    } else $globalSources[$id]['format'] = 'sbs';
-		    //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
+				//$formats[$id] = 'beast';
+				$globalSources[$id]['format'] = 'beast';
+			//} else $formats[$id] = 'sbs';
+			} else $globalSources[$id]['format'] = 'sbs';
+			//if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
 		}
 		if ($globalDebug) echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
-            } else {
+			} else {
 		if ($globalDebug) echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";
-    	    }
-        }
-    }
+			}
+		}
+	}
 }
 if (!isset($globalMinFetch)) $globalMinFetch = 15;
 
@@ -279,9 +279,9 @@ 
 //connect_all($globalSources);
 
 if (isset($globalProxy) && $globalProxy) {
-    $context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true)));
+	$context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true)));
 } else {
-    $context = stream_context_create(array('http' => array('timeout' => $timeout)));
+	$context = stream_context_create(array('http' => array('timeout' => $timeout)));
 }
 
 // APRS Configuration
@@ -290,18 +290,18 @@ 
 	die;
 }
 foreach ($globalSources as $key => $source) {
-    if (!isset($source['format'])) {
-        $globalSources[$key]['format'] = 'auto';
-    }
+	if (!isset($source['format'])) {
+		$globalSources[$key]['format'] = 'auto';
+	}
 }
 connect_all($globalSources);
 foreach ($globalSources as $key => $source) {
-    if (isset($source['format']) && $source['format'] == 'aprs') {
+	if (isset($source['format']) && $source['format'] == 'aprs') {
 	$aprs_connect = 0;
 	$use_aprs = true;
 	if (isset($source['port']) && $source['port'] == '10152') $aprs_full = true;
 	break;
-    }
+	}
 }
 
 if ($use_aprs) {
@@ -342,117 +342,117 @@ 
 
 // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time.
 while ($i > 0) {
-    if (!$globalDaemon) $i = $endtime-time();
-    // Delete old ATC
-    if ($globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
+	if (!$globalDaemon) $i = $endtime-time();
+	// Delete old ATC
+	if ($globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
 	if ($globalDebug) echo 'Delete old ATC...'."\n";
-        $ATC->deleteOldATC();
-    }
+		$ATC->deleteOldATC();
+	}
     
-    //if (count($last_exec) > 0) {
-    if (count($last_exec) == count($globalSources)) {
+	//if (count($last_exec) > 0) {
+	if (count($last_exec) == count($globalSources)) {
 	$max = $globalMinFetch;
 	foreach ($last_exec as $last) {
-	    if ((time() - $last['last']) < $max) $max = time() - $last['last'];
+		if ((time() - $last['last']) < $max) $max = time() - $last['last'];
 	}
 	if ($max != $globalMinFetch) {
-	    if ($globalDebug) echo 'Sleeping...'."\n";
-	    sleep($globalMinFetch-$max+2);
+		if ($globalDebug) echo 'Sleeping...'."\n";
+		sleep($globalMinFetch-$max+2);
+	}
 	}
-    }
 
     
-    //foreach ($formats as $id => $value) {
-    foreach ($globalSources as $id => $value) {
+	//foreach ($formats as $id => $value) {
+	foreach ($globalSources as $id => $value) {
 	date_default_timezone_set('UTC');
 	if (!isset($last_exec[$id]['last'])) $last_exec[$id]['last'] = 0;
 	if ($value['format'] == 'deltadbtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    //$buffer = $Common->getData($hosts[$id]);
-	    $buffer = $Common->getData($value['host']);
-	    if ($buffer != '') $reset = 0;
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-	    $buffer = explode('\n',$buffer);
-	    foreach ($buffer as $line) {
-    		if ($line != '' && count($line) > 7) {
-    		    $line = explode(',', $line);
-	            $data = array();
-	            $data['hex'] = $line[1]; // hex
-	            $data['ident'] = $line[2]; // ident
-	            if (isset($line[3])) $data['altitude'] = $line[3]; // altitude
-	            if (isset($line[4])) $data['speed'] = $line[4]; // speed
-	            if (isset($line[5])) $data['heading'] = $line[5]; // heading
-	            if (isset($line[6])) $data['latitude'] = $line[6]; // lat
-	            if (isset($line[7])) $data['longitude'] = $line[7]; // long
-	            $data['verticalrate'] = ''; // vertical rate
-	            //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk
-	            $data['emergency'] = ''; // emergency
-		    $data['datetime'] = date('Y-m-d H:i:s');
-		    $data['format_source'] = 'deltadbtxt';
-    		    $data['id_source'] = $id_source;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
-    		    $SI->add($data);
-		    unset($data);
-    		}
-    	    }
-    	    $last_exec[$id]['last'] = time();
+		//$buffer = $Common->getData($hosts[$id]);
+		$buffer = $Common->getData($value['host']);
+		if ($buffer != '') $reset = 0;
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
+		$buffer = explode('\n',$buffer);
+		foreach ($buffer as $line) {
+			if ($line != '' && count($line) > 7) {
+				$line = explode(',', $line);
+				$data = array();
+				$data['hex'] = $line[1]; // hex
+				$data['ident'] = $line[2]; // ident
+				if (isset($line[3])) $data['altitude'] = $line[3]; // altitude
+				if (isset($line[4])) $data['speed'] = $line[4]; // speed
+				if (isset($line[5])) $data['heading'] = $line[5]; // heading
+				if (isset($line[6])) $data['latitude'] = $line[6]; // lat
+				if (isset($line[7])) $data['longitude'] = $line[7]; // long
+				$data['verticalrate'] = ''; // vertical rate
+				//if (isset($line[9])) $data['squawk'] = $line[9]; // squawk
+				$data['emergency'] = ''; // emergency
+			$data['datetime'] = date('Y-m-d H:i:s');
+			$data['format_source'] = 'deltadbtxt';
+				$data['id_source'] = $id_source;
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+			if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
+				$SI->add($data);
+			unset($data);
+			}
+			}
+			$last_exec[$id]['last'] = time();
 	} elseif ($value['format'] == 'aisnmeatxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
-	    date_default_timezone_set('CET');
-	    $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
-	    date_default_timezone_set('UTC');
-	    if ($buffer != '') $reset = 0;
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-	    $buffer = explode('\n',$buffer);
-	    foreach ($buffer as $line) {
+		date_default_timezone_set('CET');
+		$buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
+		date_default_timezone_set('UTC');
+		if ($buffer != '') $reset = 0;
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
+		$buffer = explode('\n',$buffer);
+		foreach ($buffer as $line) {
 		if ($line != '') {
-		    echo "'".$line."'\n";
-		    $add = false;
-		    $ais_data = $AIS->parse_line(trim($line));
-		    $data = array();
-		    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
-		    if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
-		    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
-		    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
-		    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
-		    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
-		    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
-		    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
-		    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
-		    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
-		    if (isset($ais_data['timestamp'])) {
+			echo "'".$line."'\n";
+			$add = false;
+			$ais_data = $AIS->parse_line(trim($line));
+			$data = array();
+			if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
+			if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
+			if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
+			if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
+			if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
+			if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
+			if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
+			if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
+			if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
+			if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
+			if (isset($ais_data['timestamp'])) {
 			$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
 			if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) {
-			    $last_exec[$id]['timestamp'] = $ais_data['timestamp'];
-			    $add = true;
+				$last_exec[$id]['timestamp'] = $ais_data['timestamp'];
+				$add = true;
 			}
-		    } else {
+			} else {
 			$data['datetime'] = date('Y-m-d H:i:s');
 			$add = true;
-		    }
-		    $data['format_source'] = 'aisnmeatxt';
-    		    $data['id_source'] = $id_source;
-		    //print_r($data);
-		    echo 'Add...'."\n";
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
-		    unset($data);
+			}
+			$data['format_source'] = 'aisnmeatxt';
+				$data['id_source'] = $id_source;
+			//print_r($data);
+			echo 'Add...'."\n";
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+			if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
+			unset($data);
 		}
-    	    }
-    	    $last_exec[$id]['last'] = time();
+			}
+			$last_exec[$id]['last'] = time();
 	} elseif ($value['format'] == 'aisnmeahttp') {
-	    $arr = $httpfeeds;
-	    $w = $e = null;
+		$arr = $httpfeeds;
+		$w = $e = null;
 	    
-	    if (isset($arr[$id])) {
+		if (isset($arr[$id])) {
 		$nn = stream_select($arr,$w,$e,$timeout);
 		if ($nn > 0) {
-		    foreach ($httpfeeds as $feed) {
+			foreach ($httpfeeds as $feed) {
 			$buffer = stream_get_line($feed,2000,"\n");
 			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
 			$buffer = explode('\n',$buffer);
 			foreach ($buffer as $line) {
-			    if ($line != '') {
+				if ($line != '') {
 				$ais_data = $AIS->parse_line(trim($line));
 				$data = array();
 				if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
@@ -469,39 +469,39 @@ 
 				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
 				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
 				if (isset($ais_data['timestamp'])) {
-				    $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
+					$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
 				} else {
-				    $data['datetime'] = date('Y-m-d H:i:s');
+					$data['datetime'] = date('Y-m-d H:i:s');
 				}
 				$data['format_source'] = 'aisnmeahttp';
 				$data['id_source'] = $id_source;
 				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
 				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
 				unset($data);
-			    }
+				}
+			}
 			}
-		    }
 		} else {
-		    $format = $value['format'];
-		    if (isset($tt[$format])) $tt[$format]++;
-		    else $tt[$format] = 0;
-		    if ($tt[$format] > 30) {
+			$format = $value['format'];
+			if (isset($tt[$format])) $tt[$format]++;
+			else $tt[$format] = 0;
+			if ($tt[$format] > 30) {
 			sleep(2);
 			$sourceeen[] = $value;
 			connect_all($sourceeen);
 			$sourceeen = array();
-		    }
+			}
+		}
 		}
-	    }
 	} elseif ($value['format'] == 'myshiptracking' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
-	    if ($buffer != '') {
+		$buffer = $Common->getData($value['host'],'get','','','','','20');
+		if ($buffer != '') {
 		//echo $buffer;
 		$all_data = json_decode($buffer,true);
 		//print_r($all_data);
 		if (isset($all_data[0]['DATA'])) {
 		foreach ($all_data[0]['DATA'] as $line) {
-		    if ($line != '') {
+			if ($line != '') {
 			$data = array();
 			$data['ident'] = $line['NAME'];
 			$data['mmsi'] = $line['MMSI'];
@@ -518,89 +518,89 @@ 
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
 			$MI->add($data);
 			unset($data);
-		    }
+			}
 		}
 		}
 		
-	    }
-    	    $last_exec[$id]['last'] = time();
+		}
+			$last_exec[$id]['last'] = time();
 	} elseif ($value['format'] == 'boatbeaconapp' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
-	    $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host']));
-	    if ($buffer != '') {
+		$buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host']));
+		if ($buffer != '') {
 		$all_data = json_decode($buffer,true);
 		if (isset($all_data[0]['mmsi'])) {
-		    foreach ($all_data as $line) {
+			foreach ($all_data as $line) {
 			if ($line != '') {
-			    $data = array();
-			    $data['ident'] = $line['shipname'];
-			    $data['callsign'] = $line['callsign'];
-			    $data['mmsi'] = $line['mmsi'];
-			    $data['speed'] = $line['sog'];
-			    if ($line['heading'] != '511') $data['heading'] = $line['heading'];
-			    $data['latitude'] = $line['latitude'];
-			    $data['longitude'] = $line['longitude'];
-			    $data['type_id'] = $line['shiptype'];
-			    $data['arrival_code'] = $line['destination'];
-			    $data['datetime'] = $line['time'];
-			    $data['format_source'] = 'boatbeaconapp';
-			    $data['id_source'] = $id_source;
-			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-			    $MI->add($data);
-			    unset($data);
+				$data = array();
+				$data['ident'] = $line['shipname'];
+				$data['callsign'] = $line['callsign'];
+				$data['mmsi'] = $line['mmsi'];
+				$data['speed'] = $line['sog'];
+				if ($line['heading'] != '511') $data['heading'] = $line['heading'];
+				$data['latitude'] = $line['latitude'];
+				$data['longitude'] = $line['longitude'];
+				$data['type_id'] = $line['shiptype'];
+				$data['arrival_code'] = $line['destination'];
+				$data['datetime'] = $line['time'];
+				$data['format_source'] = 'boatbeaconapp';
+				$data['id_source'] = $id_source;
+				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+				$MI->add($data);
+				unset($data);
+			}
 			}
-		    }
 		}
 		
-	    }
-    	    $last_exec[$id]['last'] = time();
+		}
+			$last_exec[$id]['last'] = time();
 	} elseif ($value['format'] == 'shipplotter' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
-	    echo 'download...';
-	    $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
-	    echo 'done !'."\n";
-	    if ($buffer != '') $reset = 0;
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-	    $buffer = explode('\n',$buffer);
-	    foreach ($buffer as $line) {
+		echo 'download...';
+		$buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
+		echo 'done !'."\n";
+		if ($buffer != '') $reset = 0;
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
+		$buffer = explode('\n',$buffer);
+		foreach ($buffer as $line) {
 		if ($line != '') {
-		    $data = array();
-		    $data['mmsi'] = (int)substr($line,0,9);
-		    $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
-		    //$data['status'] = substr($line,21,2);
-		    //$data['type'] = substr($line,24,3);
-		    $data['latitude'] = substr($line,29,9);
-		    $data['longitude'] = substr($line,41,9);
-		    $data['speed'] = round(substr($line,51,5));
-		    //$data['course'] = substr($line,57,5);
-		    $data['heading'] = round(substr($line,63,3));
-		    //$data['draft'] = substr($line,67,4);
-		    //$data['length'] = substr($line,72,3);
-		    //$data['beam'] = substr($line,76,2);
-		    $data['ident'] = trim(utf8_encode(substr($line,79,20)));
-		    //$data['callsign'] = trim(substr($line,100,7);
-		    //$data['dest'] = substr($line,108,20);
-		    //$data['etaDate'] = substr($line,129,5);
-		    //$data['etaTime'] = substr($line,135,5);
-		    $data['format_source'] = 'shipplotter';
-    		    $data['id_source'] = $id_source;
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    //print_r($data);
-		    echo 'Add...'."\n";
-		    $MI->add($data);
-		    unset($data);
+			$data = array();
+			$data['mmsi'] = (int)substr($line,0,9);
+			$data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
+			//$data['status'] = substr($line,21,2);
+			//$data['type'] = substr($line,24,3);
+			$data['latitude'] = substr($line,29,9);
+			$data['longitude'] = substr($line,41,9);
+			$data['speed'] = round(substr($line,51,5));
+			//$data['course'] = substr($line,57,5);
+			$data['heading'] = round(substr($line,63,3));
+			//$data['draft'] = substr($line,67,4);
+			//$data['length'] = substr($line,72,3);
+			//$data['beam'] = substr($line,76,2);
+			$data['ident'] = trim(utf8_encode(substr($line,79,20)));
+			//$data['callsign'] = trim(substr($line,100,7);
+			//$data['dest'] = substr($line,108,20);
+			//$data['etaDate'] = substr($line,129,5);
+			//$data['etaTime'] = substr($line,135,5);
+			$data['format_source'] = 'shipplotter';
+				$data['id_source'] = $id_source;
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+			//print_r($data);
+			echo 'Add...'."\n";
+			$MI->add($data);
+			unset($data);
 		}
-    	    }
-    	    $last_exec[$id]['last'] = time();
+			}
+			$last_exec[$id]['last'] = time();
 	//} elseif (($value == 'whazzup' && (time() - $last_exec['whazzup'] > $globalMinFetch)) || ($value == 'vatsimtxt' && (time() - $last_exec['vatsimtxt'] > $globalMinFetch))) {
 	} elseif (($value['format'] == 'whazzup' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) || ($value['format'] == 'vatsimtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch))) {
-	    //$buffer = $Common->getData($hosts[$id]);
-	    $buffer = $Common->getData($value['host']);
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-	    $buffer = explode('\n',$buffer);
-	    $reset = 0;
-	    foreach ($buffer as $line) {
-    		if ($line != '') {
-    		    $line = explode(':', $line);
-    		    if (count($line) > 30 && $line[0] != 'callsign') {
+		//$buffer = $Common->getData($hosts[$id]);
+		$buffer = $Common->getData($value['host']);
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
+		$buffer = explode('\n',$buffer);
+		$reset = 0;
+		foreach ($buffer as $line) {
+			if ($line != '') {
+				$line = explode(':', $line);
+				if (count($line) > 30 && $line[0] != 'callsign') {
 			$data = array();
 			if (isset($line[37]) && $line[37] != '') $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37];
 			else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
@@ -613,37 +613,37 @@ 
 			if (isset($line[45])) $data['heading'] = $line[45]; // heading
 			elseif (isset($line[38])) $data['heading'] = $line[38]; // heading
 			$data['latitude'] = $line[5]; // lat
-	        	$data['longitude'] = $line[6]; // long
-	        	$data['verticalrate'] = ''; // vertical rate
-	        	$data['squawk'] = ''; // squawk
-	        	$data['emergency'] = ''; // emergency
-	        	$data['waypoints'] = $line[30];
+				$data['longitude'] = $line[6]; // long
+				$data['verticalrate'] = ''; // vertical rate
+				$data['squawk'] = ''; // squawk
+				$data['emergency'] = ''; // emergency
+				$data['waypoints'] = $line[30];
 			$data['datetime'] = date('Y-m-d H:i:s');
 			//$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37]));
 			//if (isset($line[37])) $data['last_update'] = $line[37];
-		        $data['departure_airport_icao'] = $line[11];
-		        $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
-		        $data['arrival_airport_icao'] = $line[13];
+				$data['departure_airport_icao'] = $line[11];
+				$data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
+				$data['arrival_airport_icao'] = $line[13];
 			$data['frequency'] = $line[4];
 			$data['type'] = $line[18];
 			$data['range'] = $line[19];
 			if (isset($line[35])) $data['info'] = $line[35];
-    			$data['id_source'] = $id_source;
-	    		//$data['arrival_airport_time'] = ;
-	    		if ($line[9] != '') {
-	    		    $aircraft_data = explode('/',$line[9]);
-	    		    if (isset($aircraft_data[1])) {
-	    			$data['aircraft_icao'] = $aircraft_data[1];
-	    		    }
-        		}
-	    		/*
+				$data['id_source'] = $id_source;
+				//$data['arrival_airport_time'] = ;
+				if ($line[9] != '') {
+					$aircraft_data = explode('/',$line[9]);
+					if (isset($aircraft_data[1])) {
+					$data['aircraft_icao'] = $aircraft_data[1];
+					}
+				}
+				/*
 	    		if ($value == 'whazzup') $data['format_source'] = 'whazzup';
 	    		elseif ($value == 'vatsimtxt') $data['format_source'] = 'vatsimtxt';
 	    		*/
-	    		$data['format_source'] = $value['format'];
+				$data['format_source'] = $value['format'];
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
 			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-    			if ($line[3] == 'PILOT') $SI->add($data);
+				if ($line[3] == 'PILOT') $SI->add($data);
 			elseif ($line[3] == 'ATC') {
 				//print_r($data);
 				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
@@ -661,255 +661,255 @@ 
 				if (!isset($data['source_name'])) $data['source_name'] = '';
 				if (isset($ATC)) echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
 			}
-    			unset($data);
-    		    }
-    		}
-    	    }
-    	    //if ($value == 'whazzup') $last_exec['whazzup'] = time();
-    	    //elseif ($value == 'vatsimtxt') $last_exec['vatsimtxt'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	//} elseif ($value == 'aircraftlistjson' && (time() - $last_exec['aircraftlistjson'] > $globalMinFetch)) {
-    	} elseif ($value['format'] == 'aircraftlistjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
-	    if ($buffer != '') {
-	    $all_data = json_decode($buffer,true);
-	    if (isset($all_data['acList'])) {
+				unset($data);
+				}
+			}
+			}
+			//if ($value == 'whazzup') $last_exec['whazzup'] = time();
+			//elseif ($value == 'vatsimtxt') $last_exec['vatsimtxt'] = time();
+			$last_exec[$id]['last'] = time();
+		//} elseif ($value == 'aircraftlistjson' && (time() - $last_exec['aircraftlistjson'] > $globalMinFetch)) {
+		} elseif ($value['format'] == 'aircraftlistjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
+		$buffer = $Common->getData($value['host'],'get','','','','','20');
+		if ($buffer != '') {
+		$all_data = json_decode($buffer,true);
+		if (isset($all_data['acList'])) {
 		$reset = 0;
 		foreach ($all_data['acList'] as $line) {
-		    $data = array();
-		    $data['hex'] = $line['Icao']; // hex
-		    if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
-		    if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
-		    if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
-		    if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
-		    if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
-		    if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
-		    //$data['verticalrate'] = $line['']; // verticale rate
-		    if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
-		    $data['emergency'] = ''; // emergency
-		    if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
+			$data = array();
+			$data['hex'] = $line['Icao']; // hex
+			if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
+			if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
+			if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
+			if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
+			if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
+			if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
+			//$data['verticalrate'] = $line['']; // verticale rate
+			if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
+			$data['emergency'] = ''; // emergency
+			if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
 		    
-		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
-		    else $data['datetime'] = date('Y-m-d H:i:s');
+			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
+			else $data['datetime'] = date('Y-m-d H:i:s');
 		    
-		    //$data['datetime'] = date('Y-m-d H:i:s');
-		    if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
-	    	    $data['format_source'] = 'aircraftlistjson';
-		    $data['id_source'] = $id_source;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    if (isset($data['latitude'])) $SI->add($data);
-		    unset($data);
+			//$data['datetime'] = date('Y-m-d H:i:s');
+			if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
+				$data['format_source'] = 'aircraftlistjson';
+			$data['id_source'] = $id_source;
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+			if (isset($data['latitude'])) $SI->add($data);
+			unset($data);
 		}
-	    } elseif (is_array($all_data)) {
+		} elseif (is_array($all_data)) {
 		$reset = 0;
 		foreach ($all_data as $line) {
-		    $data = array();
-		    $data['hex'] = $line['hex']; // hex
-		    $data['ident'] = $line['flight']; // ident
-		    $data['altitude'] = $line['altitude']; // altitude
-		    $data['speed'] = $line['speed']; // speed
-		    $data['heading'] = $line['track']; // heading
-		    $data['latitude'] = $line['lat']; // lat
-		    $data['longitude'] = $line['lon']; // long
-		    $data['verticalrate'] = $line['vrt']; // verticale rate
-		    $data['squawk'] = $line['squawk']; // squawk
-		    $data['emergency'] = ''; // emergency
-		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
-		    else $data['datetime'] = date('Y-m-d H:i:s');
-	    	    $data['format_source'] = 'aircraftlistjson';
-    		    $data['id_source'] = $id_source;
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    $SI->add($data);
-		    unset($data);
+			$data = array();
+			$data['hex'] = $line['hex']; // hex
+			$data['ident'] = $line['flight']; // ident
+			$data['altitude'] = $line['altitude']; // altitude
+			$data['speed'] = $line['speed']; // speed
+			$data['heading'] = $line['track']; // heading
+			$data['latitude'] = $line['lat']; // lat
+			$data['longitude'] = $line['lon']; // long
+			$data['verticalrate'] = $line['vrt']; // verticale rate
+			$data['squawk'] = $line['squawk']; // squawk
+			$data['emergency'] = ''; // emergency
+			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
+			else $data['datetime'] = date('Y-m-d H:i:s');
+				$data['format_source'] = 'aircraftlistjson';
+				$data['id_source'] = $id_source;
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			$SI->add($data);
+			unset($data);
+		}
 		}
-	    }
-	    }
-    	    //$last_exec['aircraftlistjson'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	//} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
-    	} elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
-	    if (isset($all_data['planes'])) {
+		}
+			//$last_exec['aircraftlistjson'] = time();
+			$last_exec[$id]['last'] = time();
+		//} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
+		} elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
+		$buffer = $Common->getData($value['host']);
+		$all_data = json_decode($buffer,true);
+		if (isset($all_data['planes'])) {
 		$reset = 0;
 		foreach ($all_data['planes'] as $key => $line) {
-		    $data = array();
-		    $data['hex'] = $key; // hex
-		    $data['ident'] = $line[3]; // ident
-		    $data['altitude'] = $line[6]; // altitude
-		    $data['speed'] = $line[8]; // speed
-		    $data['heading'] = $line[7]; // heading
-		    $data['latitude'] = $line[4]; // lat
-		    $data['longitude'] = $line[5]; // long
-		    //$data['verticalrate'] = $line[]; // verticale rate
-		    $data['squawk'] = $line[10]; // squawk
-		    $data['emergency'] = ''; // emergency
-		    $data['registration'] = $line[2];
-		    $data['aircraft_icao'] = $line[0];
-		    $deparr = explode('-',$line[1]);
-		    if (count($deparr) == 2) {
+			$data = array();
+			$data['hex'] = $key; // hex
+			$data['ident'] = $line[3]; // ident
+			$data['altitude'] = $line[6]; // altitude
+			$data['speed'] = $line[8]; // speed
+			$data['heading'] = $line[7]; // heading
+			$data['latitude'] = $line[4]; // lat
+			$data['longitude'] = $line[5]; // long
+			//$data['verticalrate'] = $line[]; // verticale rate
+			$data['squawk'] = $line[10]; // squawk
+			$data['emergency'] = ''; // emergency
+			$data['registration'] = $line[2];
+			$data['aircraft_icao'] = $line[0];
+			$deparr = explode('-',$line[1]);
+			if (count($deparr) == 2) {
 			$data['departure_airport_icao'] = $deparr[0];
 			$data['arrival_airport_icao'] = $deparr[1];
-		    }
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]);
-	    	    $data['format_source'] = 'planeupdatefaa';
-    		    $data['id_source'] = $id_source;
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    $SI->add($data);
-		    unset($data);
+			}
+			$data['datetime'] = date('Y-m-d H:i:s',$line[9]);
+				$data['format_source'] = 'planeupdatefaa';
+				$data['id_source'] = $id_source;
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			$SI->add($data);
+			unset($data);
+		}
 		}
-	    }
-    	    //$last_exec['planeupdatefaa'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	} elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
-	    if (isset($all_data['states'])) {
+			//$last_exec['planeupdatefaa'] = time();
+			$last_exec[$id]['last'] = time();
+		} elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
+		$buffer = $Common->getData($value['host']);
+		$all_data = json_decode($buffer,true);
+		if (isset($all_data['states'])) {
 		$reset = 0;
 		foreach ($all_data['states'] as $key => $line) {
-		    $data = array();
-		    $data['hex'] = $line[0]; // hex
-		    $data['ident'] = trim($line[1]); // ident
-		    $data['altitude'] = round($line[7]*3.28084); // altitude
-		    $data['speed'] = round($line[9]*1.94384); // speed
-		    $data['heading'] = round($line[10]); // heading
-		    $data['latitude'] = $line[5]; // lat
-		    $data['longitude'] = $line[6]; // long
-		    $data['verticalrate'] = $line[11]; // verticale rate
-		    //$data['squawk'] = $line[10]; // squawk
-		    //$data['emergency'] = ''; // emergency
-		    //$data['registration'] = $line[2];
-		    //$data['aircraft_icao'] = $line[0];
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]);
-	    	    $data['format_source'] = 'opensky';
-    		    $data['id_source'] = $id_source;
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    $SI->add($data);
-		    unset($data);
+			$data = array();
+			$data['hex'] = $line[0]; // hex
+			$data['ident'] = trim($line[1]); // ident
+			$data['altitude'] = round($line[7]*3.28084); // altitude
+			$data['speed'] = round($line[9]*1.94384); // speed
+			$data['heading'] = round($line[10]); // heading
+			$data['latitude'] = $line[5]; // lat
+			$data['longitude'] = $line[6]; // long
+			$data['verticalrate'] = $line[11]; // verticale rate
+			//$data['squawk'] = $line[10]; // squawk
+			//$data['emergency'] = ''; // emergency
+			//$data['registration'] = $line[2];
+			//$data['aircraft_icao'] = $line[0];
+			$data['datetime'] = date('Y-m-d H:i:s',$line[3]);
+				$data['format_source'] = 'opensky';
+				$data['id_source'] = $id_source;
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+			$SI->add($data);
+			unset($data);
+		}
 		}
-	    }
-    	    //$last_exec['planeupdatefaa'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	//} elseif ($value == 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) {
-    	} elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    //$buffer = $Common->getData($hosts[$id]);
-	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
-	    if (!empty($all_data)) $reset = 0;
-	    foreach ($all_data as $key => $line) {
+			//$last_exec['planeupdatefaa'] = time();
+			$last_exec[$id]['last'] = time();
+		//} elseif ($value == 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) {
+		} elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
+		//$buffer = $Common->getData($hosts[$id]);
+		$buffer = $Common->getData($value['host']);
+		$all_data = json_decode($buffer,true);
+		if (!empty($all_data)) $reset = 0;
+		foreach ($all_data as $key => $line) {
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
-		    $data = array();
-		    $data['hex'] = $line[0];
-		    $data['ident'] = $line[16]; //$line[13]
-	    	    $data['altitude'] = $line[4]; // altitude
-	    	    $data['speed'] = $line[5]; // speed
-	    	    $data['heading'] = $line[3]; // heading
-	    	    $data['latitude'] = $line[1]; // lat
-	    	    $data['longitude'] = $line[2]; // long
-	    	    $data['verticalrate'] = $line[15]; // verticale rate
-	    	    $data['squawk'] = $line[6]; // squawk
-	    	    $data['aircraft_icao'] = $line[8];
-	    	    $data['registration'] = $line[9];
-		    $data['departure_airport_iata'] = $line[11];
-		    $data['arrival_airport_iata'] = $line[12];
-	    	    $data['emergency'] = ''; // emergency
-		    $data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
-	    	    $data['format_source'] = 'fr24json';
-    		    $data['id_source'] = $id_source;
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    $SI->add($data);
-		    unset($data);
+			$data = array();
+			$data['hex'] = $line[0];
+			$data['ident'] = $line[16]; //$line[13]
+				$data['altitude'] = $line[4]; // altitude
+				$data['speed'] = $line[5]; // speed
+				$data['heading'] = $line[3]; // heading
+				$data['latitude'] = $line[1]; // lat
+				$data['longitude'] = $line[2]; // long
+				$data['verticalrate'] = $line[15]; // verticale rate
+				$data['squawk'] = $line[6]; // squawk
+				$data['aircraft_icao'] = $line[8];
+				$data['registration'] = $line[9];
+			$data['departure_airport_iata'] = $line[11];
+			$data['arrival_airport_iata'] = $line[12];
+				$data['emergency'] = ''; // emergency
+			$data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
+				$data['format_source'] = 'fr24json';
+				$data['id_source'] = $id_source;
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			$SI->add($data);
+			unset($data);
+		}
 		}
-	    }
-    	    //$last_exec['fr24json'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	//} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) {
-    	} elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    //$buffer = $Common->getData($hosts[$id],'get','','','','','150');
-	    $buffer = $Common->getData($value['host'],'get','','','','','150');
-	    //echo $buffer;
-	    $buffer = str_replace(array("\n","\r"),"",$buffer);
-	    $buffer = preg_replace('/,"num":(.+)/','}',$buffer);
-	    $all_data = json_decode($buffer,true);
-	    if (json_last_error() != JSON_ERROR_NONE) {
+			//$last_exec['fr24json'] = time();
+			$last_exec[$id]['last'] = time();
+		//} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) {
+		} elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
+		//$buffer = $Common->getData($hosts[$id],'get','','','','','150');
+		$buffer = $Common->getData($value['host'],'get','','','','','150');
+		//echo $buffer;
+		$buffer = str_replace(array("\n","\r"),"",$buffer);
+		$buffer = preg_replace('/,"num":(.+)/','}',$buffer);
+		$all_data = json_decode($buffer,true);
+		if (json_last_error() != JSON_ERROR_NONE) {
 		die(json_last_error_msg());
-	    }
-	    if (isset($all_data['mrkrs'])) {
+		}
+		if (isset($all_data['mrkrs'])) {
 		$reset = 0;
 		foreach ($all_data['mrkrs'] as $key => $line) {
-		    if (isset($line['inf'])) {
+			if (isset($line['inf'])) {
 			$data = array();
 			$data['hex'] = $line['inf']['ia'];
 			if (isset($line['inf']['cs'])) $data['ident'] = $line['inf']['cs']; //$line[13]
-	    		$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
-	    		if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
-	    		if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
-	    		$data['latitude'] = $line['pt'][0]; // lat
-	    		$data['longitude'] = $line['pt'][1]; // long
-	    		//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
-	    		if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
-	    		//$data['aircraft_icao'] = $line[8];
-	    		if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
+				$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
+				if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
+				if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
+				$data['latitude'] = $line['pt'][0]; // lat
+				$data['longitude'] = $line['pt'][1]; // long
+				//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
+				if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
+				//$data['aircraft_icao'] = $line[8];
+				if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
 			//$data['departure_airport_iata'] = $line[11];
 			//$data['arrival_airport_iata'] = $line[12];
-	    		//$data['emergency'] = ''; // emergency
+				//$data['emergency'] = ''; // emergency
 			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10]
-	    		$data['format_source'] = 'radarvirtueljson';
-    			$data['id_source'] = $id_source;
+				$data['format_source'] = 'radarvirtueljson';
+				$data['id_source'] = $id_source;
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
 			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
 			$SI->add($data);
 			unset($data);
-		    }
+			}
+		}
 		}
-	    }
-    	    //$last_exec['radarvirtueljson'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	//} elseif ($value == 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) {
-    	} elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    //$buffer = $Common->getData($hosts[$id]);
-	    $buffer = $Common->getData($value['host'].'?'.time());
-	    $all_data = json_decode(utf8_encode($buffer),true);
+			//$last_exec['radarvirtueljson'] = time();
+			$last_exec[$id]['last'] = time();
+		//} elseif ($value == 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) {
+		} elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
+		//$buffer = $Common->getData($hosts[$id]);
+		$buffer = $Common->getData($value['host'].'?'.time());
+		$all_data = json_decode(utf8_encode($buffer),true);
 	    
-	    if (isset($all_data['pireps'])) {
+		if (isset($all_data['pireps'])) {
 		$reset = 0;
-	        foreach ($all_data['pireps'] as $line) {
-		    $data = array();
-		    $data['id'] = $line['id'];
-		    $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
-		    $data['ident'] = $line['callsign']; // ident
-		    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
-		    if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
-		    if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
-		    if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
-		    if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
-		    $data['latitude'] = $line['lat']; // lat
-		    $data['longitude'] = $line['lon']; // long
-		    //$data['verticalrate'] = $line['vrt']; // verticale rate
-		    //$data['squawk'] = $line['squawk']; // squawk
-		    //$data['emergency'] = ''; // emergency
-		    if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
-		    if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
-		    if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
-		    //$data['arrival_airport_time'] = $line['arrtime'];
-		    if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
-		    if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
-		    if (isset($line['atis'])) $data['info'] = $line['atis'];
-		    else $data['info'] = '';
-		    $data['format_source'] = 'pireps';
-    		    $data['id_source'] = $id_source;
-		    $data['datetime'] = date('Y-m-d H:i:s');
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    if ($line['icon'] == 'plane') {
+			foreach ($all_data['pireps'] as $line) {
+			$data = array();
+			$data['id'] = $line['id'];
+			$data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
+			$data['ident'] = $line['callsign']; // ident
+			if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
+			if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
+			if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
+			if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
+			if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
+			$data['latitude'] = $line['lat']; // lat
+			$data['longitude'] = $line['lon']; // long
+			//$data['verticalrate'] = $line['vrt']; // verticale rate
+			//$data['squawk'] = $line['squawk']; // squawk
+			//$data['emergency'] = ''; // emergency
+			if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
+			if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
+			if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
+			//$data['arrival_airport_time'] = $line['arrtime'];
+			if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
+			if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
+			if (isset($line['atis'])) $data['info'] = $line['atis'];
+			else $data['info'] = '';
+			$data['format_source'] = 'pireps';
+				$data['id_source'] = $id_source;
+			$data['datetime'] = date('Y-m-d H:i:s');
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			if ($line['icon'] == 'plane') {
 			$SI->add($data);
-		    //    print_r($data);
-    		    } elseif ($line['icon'] == 'ct') {
+			//    print_r($data);
+				} elseif ($line['icon'] == 'ct') {
 			$data['info'] = str_replace('^&sect;','<br />',$data['info']);
 			$data['info'] = str_replace('&amp;sect;','',$data['info']);
 			$typec = substr($data['ident'],-3);
@@ -924,197 +924,197 @@ 
 			elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
 			else $data['type'] = 'Observer';
 			if (isset($ATC)) echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']);
-		    }
-		    unset($data);
+			}
+			unset($data);
 		}
-	    }
-    	    //$last_exec['pirepsjson'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	//} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) {
-    	} elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    //$buffer = $Common->getData($hosts[$id]);
-	    if ($globalDebug) echo 'Get Data...'."\n";
-	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
-	    if ($buffer != '' && is_array($all_data)) {
+		}
+			//$last_exec['pirepsjson'] = time();
+			$last_exec[$id]['last'] = time();
+		//} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) {
+		} elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
+		//$buffer = $Common->getData($hosts[$id]);
+		if ($globalDebug) echo 'Get Data...'."\n";
+		$buffer = $Common->getData($value['host']);
+		$all_data = json_decode($buffer,true);
+		if ($buffer != '' && is_array($all_data)) {
 		$reset = 0;
 		foreach ($all_data as $line) {
-	    	    $data = array();
-	    	    //$data['id'] = $line['id']; // id not usable
-	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
-	    	    if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
-	    	    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
-	    	    $data['ident'] = $line['flightnum']; // ident
-	    	    $data['altitude'] = $line['alt']; // altitude
-	    	    $data['speed'] = $line['gs']; // speed
-	    	    $data['heading'] = $line['heading']; // heading
-	    	    $data['latitude'] = $line['lat']; // lat
-	    	    $data['longitude'] = $line['lng']; // long
-	    	    $data['verticalrate'] = ''; // verticale rate
-	    	    $data['squawk'] = ''; // squawk
-	    	    $data['emergency'] = ''; // emergency
-	    	    //$data['datetime'] = $line['lastupdate'];
-	    	    $data['last_update'] = $line['lastupdate'];
-		    $data['datetime'] = date('Y-m-d H:i:s');
-	    	    $data['departure_airport_icao'] = $line['depicao'];
-	    	    $data['departure_airport_time'] = $line['deptime'];
-	    	    $data['arrival_airport_icao'] = $line['arricao'];
-    		    $data['arrival_airport_time'] = $line['arrtime'];
-    		    $data['registration'] = $line['aircraft'];
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
-		    if (isset($line['aircraftname'])) {
+				$data = array();
+				//$data['id'] = $line['id']; // id not usable
+				if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
+				$data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
+				if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
+				if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
+				$data['ident'] = $line['flightnum']; // ident
+				$data['altitude'] = $line['alt']; // altitude
+				$data['speed'] = $line['gs']; // speed
+				$data['heading'] = $line['heading']; // heading
+				$data['latitude'] = $line['lat']; // lat
+				$data['longitude'] = $line['lng']; // long
+				$data['verticalrate'] = ''; // verticale rate
+				$data['squawk'] = ''; // squawk
+				$data['emergency'] = ''; // emergency
+				//$data['datetime'] = $line['lastupdate'];
+				$data['last_update'] = $line['lastupdate'];
+			$data['datetime'] = date('Y-m-d H:i:s');
+				$data['departure_airport_icao'] = $line['depicao'];
+				$data['departure_airport_time'] = $line['deptime'];
+				$data['arrival_airport_icao'] = $line['arricao'];
+				$data['arrival_airport_time'] = $line['arrtime'];
+				$data['registration'] = $line['aircraft'];
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
+			if (isset($line['aircraftname'])) {
 			$line['aircraftname'] = strtoupper($line['aircraftname']);
 			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']);
-	    		$aircraft_data = explode('-',$line['aircraftname']);
-	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
-	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
-	    		else {
-	    		    $aircraft_data = explode(' ',$line['aircraftname']);
-	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
-	    		    else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
-	    		}
-	    	    }
-    		    if (isset($line['route'])) $data['waypoints'] = $line['route'];
-    		    $data['id_source'] = $id_source;
-	    	    $data['format_source'] = 'phpvmacars';
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    $SI->add($data);
-		    unset($data);
+				$aircraft_data = explode('-',$line['aircraftname']);
+				if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
+				elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
+				else {
+					$aircraft_data = explode(' ',$line['aircraftname']);
+					if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
+					else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
+				}
+				}
+				if (isset($line['route'])) $data['waypoints'] = $line['route'];
+				$data['id_source'] = $id_source;
+				$data['format_source'] = 'phpvmacars';
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			$SI->add($data);
+			unset($data);
 		}
 		if ($globalDebug) echo 'No more data...'."\n";
 		unset($buffer);
 		unset($all_data);
-	    }
-    	    //$last_exec['phpvmacars'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	} elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    //$buffer = $Common->getData($hosts[$id]);
-	    if ($globalDebug) echo 'Get Data...'."\n";
-	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
-	    if ($buffer != '' && is_array($all_data)) {
+		}
+			//$last_exec['phpvmacars'] = time();
+			$last_exec[$id]['last'] = time();
+		} elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
+		//$buffer = $Common->getData($hosts[$id]);
+		if ($globalDebug) echo 'Get Data...'."\n";
+		$buffer = $Common->getData($value['host']);
+		$all_data = json_decode($buffer,true);
+		if ($buffer != '' && is_array($all_data)) {
 		$reset = 0;
 		foreach ($all_data as $line) {
-	    	    $data = array();
-	    	    //$data['id'] = $line['id']; // id not usable
-	    	    $data['id'] = trim($line['flight_id']);
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
-	    	    $data['pilot_name'] = $line['pilot_name'];
-	    	    $data['pilot_id'] = $line['pilot_id'];
-	    	    $data['ident'] = trim($line['callsign']); // ident
-	    	    $data['altitude'] = $line['altitude']; // altitude
-	    	    $data['speed'] = $line['gs']; // speed
-	    	    $data['heading'] = $line['heading']; // heading
-	    	    $data['latitude'] = $line['latitude']; // lat
-	    	    $data['longitude'] = $line['longitude']; // long
-	    	    $data['verticalrate'] = ''; // verticale rate
-	    	    $data['squawk'] = ''; // squawk
-	    	    $data['emergency'] = ''; // emergency
-	    	    //$data['datetime'] = $line['lastupdate'];
-	    	    $data['last_update'] = $line['last_update'];
-		    $data['datetime'] = date('Y-m-d H:i:s');
-	    	    $data['departure_airport_icao'] = $line['departure'];
-	    	    //$data['departure_airport_time'] = $line['departure_time'];
-	    	    $data['arrival_airport_icao'] = $line['arrival'];
-    		    //$data['arrival_airport_time'] = $line['arrival_time'];
-    		    //$data['registration'] = $line['aircraft'];
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
-	    	    $data['aircraft_icao'] = $line['plane_type'];
-    		    $data['id_source'] = $id_source;
-	    	    $data['format_source'] = 'vam';
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    $SI->add($data);
-		    unset($data);
+				$data = array();
+				//$data['id'] = $line['id']; // id not usable
+				$data['id'] = trim($line['flight_id']);
+				$data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
+				$data['pilot_name'] = $line['pilot_name'];
+				$data['pilot_id'] = $line['pilot_id'];
+				$data['ident'] = trim($line['callsign']); // ident
+				$data['altitude'] = $line['altitude']; // altitude
+				$data['speed'] = $line['gs']; // speed
+				$data['heading'] = $line['heading']; // heading
+				$data['latitude'] = $line['latitude']; // lat
+				$data['longitude'] = $line['longitude']; // long
+				$data['verticalrate'] = ''; // verticale rate
+				$data['squawk'] = ''; // squawk
+				$data['emergency'] = ''; // emergency
+				//$data['datetime'] = $line['lastupdate'];
+				$data['last_update'] = $line['last_update'];
+			$data['datetime'] = date('Y-m-d H:i:s');
+				$data['departure_airport_icao'] = $line['departure'];
+				//$data['departure_airport_time'] = $line['departure_time'];
+				$data['arrival_airport_icao'] = $line['arrival'];
+				//$data['arrival_airport_time'] = $line['arrival_time'];
+				//$data['registration'] = $line['aircraft'];
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
+				$data['aircraft_icao'] = $line['plane_type'];
+				$data['id_source'] = $id_source;
+				$data['format_source'] = 'vam';
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			$SI->add($data);
+			unset($data);
 		}
 		if ($globalDebug) echo 'No more data...'."\n";
 		unset($buffer);
 		unset($all_data);
-	    }
-    	    //$last_exec['phpvmacars'] = time();
-    	    $last_exec[$id]['last'] = time();
+		}
+			//$last_exec['phpvmacars'] = time();
+			$last_exec[$id]['last'] = time();
 	//} elseif ($value == 'sbs' || $value == 'tsv' || $value == 'raw' || $value == 'aprs' || $value == 'beast') {
 	} elseif ($value['format'] == 'sbs' || $value['format'] == 'tsv' || $value['format'] == 'raw' || $value['format'] == 'aprs' || $value['format'] == 'beast' || $value['format'] == 'flightgearmp' || $value['format'] == 'flightgearsp' || $value['format'] == 'acars' || $value['format'] == 'acarssbs3' || $value['format'] == 'ais' || $value['format'] == 'vrstcp') {
-	    if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
-    	    //$last_exec[$id]['last'] = time();
+		if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
+			//$last_exec[$id]['last'] = time();
 
-	    //$read = array( $sockets[$id] );
-	    $read = $sockets;
-	    $write = NULL;
-	    $e = NULL;
-	    $n = socket_select($read, $write, $e, $timeout);
-	    if ($e != NULL) var_dump($e);
-	    if ($n > 0) {
+		//$read = array( $sockets[$id] );
+		$read = $sockets;
+		$write = NULL;
+		$e = NULL;
+		$n = socket_select($read, $write, $e, $timeout);
+		if ($e != NULL) var_dump($e);
+		if ($n > 0) {
 		$reset = 0;
 		foreach ($read as $nb => $r) {
-		    //$value = $formats[$nb];
-		    $format = $globalSources[$nb]['format'];
-		    if ($format == 'sbs' || $format == 'aprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') {
+			//$value = $formats[$nb];
+			$format = $globalSources[$nb]['format'];
+			if ($format == 'sbs' || $format == 'aprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') {
 			$buffer = @socket_read($r, 6000,PHP_NORMAL_READ);
-		    } elseif ($format == 'vrstcp') {
+			} elseif ($format == 'vrstcp') {
 			$buffer = @socket_read($r, 6000);
-		    } else {
+			} else {
 			$az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port);
-		    }
-		    //$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
-		    //echo $buffer."\n";
-		    // lets play nice and handle signals such as ctrl-c/kill properly
-		    //if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
-		    $error = false;
-		    //$SI::del();
-		    if ($format == 'vrstcp') {
+			}
+			//$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
+			//echo $buffer."\n";
+			// lets play nice and handle signals such as ctrl-c/kill properly
+			//if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
+			$error = false;
+			//$SI::del();
+			if ($format == 'vrstcp') {
 			$buffer = explode('},{',$buffer);
-		    } else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
-		    // SBS format is CSV format
-		    if ($buffer !== FALSE && $buffer != '') {
+			} else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
+			// SBS format is CSV format
+			if ($buffer !== FALSE && $buffer != '') {
 			$tt[$format] = 0;
 			if ($format == 'acarssbs3') {
-			    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
-			    $ACARS->add(trim($buffer));
-			    $ACARS->deleteLiveAcarsData();
+				if ($globalDebug) echo 'ACARS : '.$buffer."\n";
+				$ACARS->add(trim($buffer));
+				$ACARS->deleteLiveAcarsData();
 			} elseif ($format == 'raw') {
-			    // AVR format
-			    $data = $SBS->parse($buffer);
-			    if (is_array($data)) {
+				// AVR format
+				$data = $SBS->parse($buffer);
+				if (is_array($data)) {
 				$data['datetime'] = date('Y-m-d H:i:s');
 				$data['format_source'] = 'raw';
 				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
 				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
 				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
-			    }
+				}
 			} elseif ($format == 'ais') {
-			    $ais_data = $AIS->parse_line(trim($buffer));
-			    $data = array();
-			    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
-			    if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
-			    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
-			    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
-			    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
-			    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
-			    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
-			    if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
-			    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
-			    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
-			    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
-			    if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
-			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
-			    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
+				$ais_data = $AIS->parse_line(trim($buffer));
+				$data = array();
+				if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
+				if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
+				if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
+				if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
+				if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
+				if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
+				if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
+				if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
+				if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
+				if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
+				if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
+				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
+				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
 
-			    if (isset($ais_data['timestamp'])) {
+				if (isset($ais_data['timestamp'])) {
 				$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
-			    } else {
+				} else {
 				$data['datetime'] = date('Y-m-d H:i:s');
-			    }
-			    $data['format_source'] = 'aisnmea';
-    			    $data['id_source'] = $id_source;
-			    if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
-			    unset($data);
-                        } elseif ($format == 'flightgearsp') {
-                    	    //echo $buffer."\n";
-                    	    if (strlen($buffer) > 5) {
+				}
+				$data['format_source'] = 'aisnmea';
+					$data['id_source'] = $id_source;
+				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
+				unset($data);
+						} elseif ($format == 'flightgearsp') {
+							//echo $buffer."\n";
+							if (strlen($buffer) > 5) {
 				$line = explode(',',$buffer);
 				$data = array();
 				//XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p
@@ -1131,38 +1131,38 @@ 
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
 				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
 				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
-			    }
-                        } elseif ($format == 'acars') {
-                    	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
-			    $ACARS->add(trim($buffer));
-			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
-			    $ACARS->deleteLiveAcarsData();
+				}
+						} elseif ($format == 'acars') {
+							if ($globalDebug) echo 'ACARS : '.$buffer."\n";
+				$ACARS->add(trim($buffer));
+				socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
+				$ACARS->deleteLiveAcarsData();
 			} elseif ($format == 'flightgearmp') {
-			    if (substr($buffer,0,1) != '#') {
+				if (substr($buffer,0,1) != '#') {
 				$data = array();
 				//echo $buffer."\n";
 				$line = explode(' ',$buffer);
 				if (count($line) == 11) {
-				    $userserver = explode('@',$line[0]);
-				    $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
-				    $data['ident'] = $userserver[0];
-				    $data['registration'] = $userserver[0];
-				    $data['latitude'] = $line[4];
-				    $data['longitude'] = $line[5];
-				    $data['altitude'] = $line[6];
-				    $data['datetime'] = date('Y-m-d H:i:s');
-				    $aircraft_type = $line[10];
-				    $aircraft_type = preg_split(':/:',$aircraft_type);
-				    $data['aircraft_name'] = substr(end($aircraft_type),0,-4);
-				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
-				    if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
+					$userserver = explode('@',$line[0]);
+					$data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
+					$data['ident'] = $userserver[0];
+					$data['registration'] = $userserver[0];
+					$data['latitude'] = $line[4];
+					$data['longitude'] = $line[5];
+					$data['altitude'] = $line[6];
+					$data['datetime'] = date('Y-m-d H:i:s');
+					$aircraft_type = $line[10];
+					$aircraft_type = preg_split(':/:',$aircraft_type);
+					$data['aircraft_name'] = substr(end($aircraft_type),0,-4);
+					if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
+					if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
+				}
 				}
-			    }
 			} elseif ($format == 'beast') {
-			    echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
-			    die;
+				echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
+				die;
 			} elseif ($format == 'vrstcp') {
-			    foreach($buffer as $all_data) {
+				foreach($buffer as $all_data) {
 				$line = json_decode('{'.$all_data.'}',true);
 				$data = array();
 				if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex
@@ -1182,109 +1182,109 @@ 
 				*/
 				$data['datetime'] = date('Y-m-d H:i:s');
 				if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
-		    		$data['format_source'] = 'vrstcp';
+					$data['format_source'] = 'vrstcp';
 				$data['id_source'] = $id_source;
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
 				if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
 				if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data);
 				unset($data);
-			    }
+				}
 			} elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') {
-			    $line = explode("\t", $buffer);
-			    for($k = 0; $k < count($line); $k=$k+2) {
+				$line = explode("\t", $buffer);
+				for($k = 0; $k < count($line); $k=$k+2) {
 				$key = $line[$k];
-			        $lined[$key] = $line[$k+1];
-			    }
-    			    if (count($lined) > 3) {
-    				$data['hex'] = $lined['hexid'];
-    				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
-    				$data['datetime'] = date('Y-m-d H:i:s');;
-    				if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
-    				if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
-    				if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
-    				if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
-    				if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
-    				if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
-    				if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
-    				$data['id_source'] = $id_source;
-    				$data['format_source'] = 'tsv';
-    				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+					$lined[$key] = $line[$k+1];
+				}
+					if (count($lined) > 3) {
+					$data['hex'] = $lined['hexid'];
+					//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
+					$data['datetime'] = date('Y-m-d H:i:s');;
+					if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
+					if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
+					if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
+					if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
+					if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
+					if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
+					if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
+					$data['id_source'] = $id_source;
+					$data['format_source'] = 'tsv';
+					if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
+					if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
-    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
-    				unset($lined);
-    				unset($data);
-    			    } else $error = true;
+					if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
+					unset($lined);
+					unset($data);
+					} else $error = true;
 			} elseif ($format == 'aprs' && $use_aprs) {
-			    if ($aprs_connect == 0) {
+				if ($aprs_connect == 0) {
 				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
 				$aprs_connect = 1;
-			    }
+				}
 			    
-			    if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
+				if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
 				$aprs_last_tx = time();
 				$data_aprs = "# Keep alive";
 				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
-			    }
+				}
 			    
-			    //echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
-			    //echo 'APRS data : '.$buffer."\n";
-			    $buffer = str_replace('APRS <- ','',$buffer);
-			    $buffer = str_replace('APRS -> ','',$buffer);
-			    //echo $buffer."\n";
-			    if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
+				//echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
+				//echo 'APRS data : '.$buffer."\n";
+				$buffer = str_replace('APRS <- ','',$buffer);
+				$buffer = str_replace('APRS -> ','',$buffer);
+				//echo $buffer."\n";
+				if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
 				$line = $APRS->parse($buffer);
 				//if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) {
 				if (is_array($line) && isset($line['latitude']) && isset($line['longitude']) && (isset($line['ident']) || isset($line['address']) || isset($line['mmsi']))) {
-				    $aprs_last_tx = time();
-				    $data = array();
-				    //print_r($line);
-				    if (isset($line['address'])) $data['hex'] = $line['address'];
-				    if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi'];
-				    if (isset($line['type_id'])) $data['type_id'] = $line['typeid'];
-				    if (isset($line['status_id'])) $data['status_id'] = $line['statusid'];
-				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
-				    else $data['datetime'] = date('Y-m-d H:i:s');
-				    //$data['datetime'] = date('Y-m-d H:i:s');
-				    if (isset($line['ident'])) $data['ident'] = $line['ident'];
-				    $data['latitude'] = $line['latitude'];
-				    $data['longitude'] = $line['longitude'];
-				    //$data['verticalrate'] = $line[16];
-				    if (isset($line['speed'])) $data['speed'] = $line['speed'];
-				    else $data['speed'] = 0;
-				    if (isset($line['altitude'])) $data['altitude'] = $line['altitude'];
-				    if (isset($line['comment'])) $data['comment'] = $line['comment'];
-				    if (isset($line['symbol'])) $data['type'] = $line['symbol'];
-				    if (isset($line['heading'])) $data['heading'] = $line['heading'];
-				    //else $data['heading'] = 0;
-				    if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth'];
-				    if (!isset($line['source_type']) && (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE))) $data['noarchive'] = true;
-				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
-    				    $data['id_source'] = $id_source;
-    				    if (isset($line['format_source'])) $data['format_source'] = $line['format_source'];
-				    else $data['format_source'] = 'aprs';
-				    $data['source_name'] = $line['source'];
-				    if (isset($line['source_type'])) $data['source_type'] = $line['source_type'];
-				    else $data['source_type'] = 'flarm';
-    				    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
-				    $currentdate = date('Y-m-d H:i:s');
-				    $aprsdate = strtotime($data['datetime']);
-				    // Accept data if time <= system time + 20s
-				    //if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
-				    if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
+					$aprs_last_tx = time();
+					$data = array();
+					//print_r($line);
+					if (isset($line['address'])) $data['hex'] = $line['address'];
+					if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi'];
+					if (isset($line['type_id'])) $data['type_id'] = $line['typeid'];
+					if (isset($line['status_id'])) $data['status_id'] = $line['statusid'];
+					if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
+					else $data['datetime'] = date('Y-m-d H:i:s');
+					//$data['datetime'] = date('Y-m-d H:i:s');
+					if (isset($line['ident'])) $data['ident'] = $line['ident'];
+					$data['latitude'] = $line['latitude'];
+					$data['longitude'] = $line['longitude'];
+					//$data['verticalrate'] = $line[16];
+					if (isset($line['speed'])) $data['speed'] = $line['speed'];
+					else $data['speed'] = 0;
+					if (isset($line['altitude'])) $data['altitude'] = $line['altitude'];
+					if (isset($line['comment'])) $data['comment'] = $line['comment'];
+					if (isset($line['symbol'])) $data['type'] = $line['symbol'];
+					if (isset($line['heading'])) $data['heading'] = $line['heading'];
+					//else $data['heading'] = 0;
+					if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth'];
+					if (!isset($line['source_type']) && (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE))) $data['noarchive'] = true;
+					if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
+						$data['id_source'] = $id_source;
+						if (isset($line['format_source'])) $data['format_source'] = $line['format_source'];
+					else $data['format_source'] = 'aprs';
+					$data['source_name'] = $line['source'];
+					if (isset($line['source_type'])) $data['source_type'] = $line['source_type'];
+					else $data['source_type'] = 'flarm';
+						if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+					$currentdate = date('Y-m-d H:i:s');
+					$aprsdate = strtotime($data['datetime']);
+					// Accept data if time <= system time + 20s
+					//if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
+					if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
 					$send = $SI->add($data);
-				    } elseif ($data['source_type'] == 'ais') {
+					} elseif ($data['source_type'] == 'ais') {
 					echo 'add...'."\n";
 					$send = $MI->add($data);
-				    } elseif (isset($line['stealth'])) {
+					} elseif (isset($line['stealth'])) {
 					if ($line['stealth'] != 0) echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
 					else echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n";
-				    //} elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && ($line['symbol'] == 'Car' || $line['symbol'] == 'Ambulance' || $line['symbol'] == 'Van' || $line['symbol'] == 'Truck' || $line['symbol'] == 'Truck (18 Wheeler)' || $line['symbol'] == 'Motorcycle' || $line['symbol'] == 'Police' || $line['symbol'] == 'Bike' || $line['symbol'] == 'Jogger' || $line['symbol'] == 'Bus' || $line['symbol'] == 'Jeep' || $line['symbol'] == 'Recreational Vehicle' || $line['symbol'] == 'Yacht (Sail)' || $line['symbol'] == 'Ship (Power Boat)' || $line['symbol'] == 'Firetruck' || $line['symbol'] == 'Balloon' || $line['symbol'] == 'Aircraft (small)' || $line['symbol'] == 'Helicopter')) {
-				    } elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && isset($line['speed']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') {
+					//} elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && ($line['symbol'] == 'Car' || $line['symbol'] == 'Ambulance' || $line['symbol'] == 'Van' || $line['symbol'] == 'Truck' || $line['symbol'] == 'Truck (18 Wheeler)' || $line['symbol'] == 'Motorcycle' || $line['symbol'] == 'Police' || $line['symbol'] == 'Bike' || $line['symbol'] == 'Jogger' || $line['symbol'] == 'Bus' || $line['symbol'] == 'Jeep' || $line['symbol'] == 'Recreational Vehicle' || $line['symbol'] == 'Yacht (Sail)' || $line['symbol'] == 'Ship (Power Boat)' || $line['symbol'] == 'Firetruck' || $line['symbol'] == 'Balloon' || $line['symbol'] == 'Aircraft (small)' || $line['symbol'] == 'Helicopter')) {
+					} elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && isset($line['speed']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') {
 					//echo '!!!!!!!!!!!!!!!! SEND !!!!!!!!!!!!!!!!!!!!'."\n";
 					if (isset($globalTracker) && $globalTracker) $send = $TI->add($data);
-				    }
-				    unset($data);
+					}
+					unset($data);
 				} 
 				elseif (is_array($line) && $globalDebug && isset($line['symbol']) && $line['symbol'] == 'Weather Station') {
 					echo '!! Weather Station not yet supported'."\n";
@@ -1294,12 +1294,12 @@ 
 				}
 				//elseif ($line == false && $globalDebug) echo 'Ignored ('.$buffer.")\n";
 				//elseif ($line == true && $globalDebug) echo '!! Failed : '.$buffer."!!\n";
-			    }
+				}
 			} else {
-			    $line = explode(',', $buffer);
-    			    if (count($line) > 20) {
-    			    	$data['hex'] = $line[4];
-    				/*
+				$line = explode(',', $buffer);
+					if (count($line) > 20) {
+						$data['hex'] = $line[4];
+					/*
     				$data['datetime'] = $line[6].' '.$line[7];
     					date_default_timezone_set($globalTimezone);
     					$datetime = new DateTime($data['datetime']);
@@ -1307,30 +1307,30 @@ 
     					$data['datetime'] = $datetime->format('Y-m-d H:i:s');
     					date_default_timezone_set('UTC');
     				*/
-    				// Force datetime to current UTC datetime
-    				date_default_timezone_set('UTC');
-    				$data['datetime'] = date('Y-m-d H:i:s');
-    				$data['ident'] = trim($line[10]);
-    				$data['latitude'] = $line[14];
-    				$data['longitude'] = $line[15];
-    				$data['verticalrate'] = $line[16];
-    				$data['emergency'] = $line[20];
-    				$data['speed'] = $line[12];
-    				$data['squawk'] = $line[17];
-    				$data['altitude'] = $line[11];
-    				$data['heading'] = $line[13];
-    				$data['ground'] = $line[21];
-    				$data['emergency'] = $line[19];
-    				$data['format_source'] = 'sbs';
+					// Force datetime to current UTC datetime
+					date_default_timezone_set('UTC');
+					$data['datetime'] = date('Y-m-d H:i:s');
+					$data['ident'] = trim($line[10]);
+					$data['latitude'] = $line[14];
+					$data['longitude'] = $line[15];
+					$data['verticalrate'] = $line[16];
+					$data['emergency'] = $line[20];
+					$data['speed'] = $line[12];
+					$data['squawk'] = $line[17];
+					$data['altitude'] = $line[11];
+					$data['heading'] = $line[13];
+					$data['ground'] = $line[21];
+					$data['emergency'] = $line[19];
+					$data['format_source'] = 'sbs';
 				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+					if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
-    				$data['id_source'] = $id_source;
-    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
-    				else $error = true;
-    				unset($data);
-    			    } else $error = true;
-			    if ($error) {
+					$data['id_source'] = $id_source;
+					if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
+					else $error = true;
+					unset($data);
+					} else $error = true;
+				if ($error) {
 				if (count($line) > 1 && ($line[0] == 'STA' || $line[0] == 'AIR' || $line[0] == 'SEL' || $line[0] == 'ID' || $line[0] == 'CLK')) { 
 					if ($globalDebug) echo "Not a message. Ignoring... \n";
 				} else {
@@ -1346,13 +1346,13 @@ 
 					connect_all($sourceer);
 					$sourceer = array();
 				}
-			    }
+				}
 			}
 			// Sleep for xxx microseconds
 			if (isset($globalSBSSleep)) usleep($globalSBSSleep);
-		    } else {
+			} else {
 			if ($format == 'flightgearmp') {
-			    	if ($globalDebug) echo "Reconnect FlightGear MP...";
+					if ($globalDebug) echo "Reconnect FlightGear MP...";
 				//@socket_close($r);
 				sleep($globalMinFetch);
 				$sourcefg[$nb] = $globalSources[$nb];
@@ -1361,9 +1361,9 @@ 
 				break;
 				
 			} elseif ($format != 'acars' && $format != 'flightgearsp') {
-			    if (isset($tt[$format])) $tt[$format]++;
-			    else $tt[$format] = 0;
-			    if ($tt[$format] > 30) {
+				if (isset($tt[$format])) $tt[$format]++;
+				else $tt[$format] = 0;
+				if ($tt[$format] > 30) {
 				if ($globalDebug) echo "ERROR : Reconnect ".$format."...";
 				//@socket_close($r);
 				sleep(2);
@@ -1374,23 +1374,23 @@ 
 				//connect_all($globalSources);
 				$tt[$format]=0;
 				break;
-			    }
+				}
+			}
 			}
-		    }
 		}
-	    } else {
+		} else {
 		$error = socket_strerror(socket_last_error());
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) {
 			if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
 			if (isset($globalDebug)) echo "Restarting...\n";
 			// Restart the script if possible
 			if (is_array($sockets)) {
-			    if ($globalDebug) echo "Shutdown all sockets...";
+				if ($globalDebug) echo "Shutdown all sockets...";
 			    
-			    foreach ($sockets as $sock) {
+				foreach ($sockets as $sock) {
 				@socket_shutdown($sock,2);
 				@socket_close($sock);
-			    }
+				}
 			    
 			}
 			if ($globalDebug) echo "Waiting...";
@@ -1405,13 +1405,13 @@ 
 			if ($globalDebug) echo "Restart all connections...";
 			connect_all($globalSources);
 		}
-	    }
+		}
 	}
 	if ($globalDaemon === false) {
-	    if ($globalDebug) echo 'Check all...'."\n";
-	    $SI->checkAll();
+		if ($globalDebug) echo 'Check all...'."\n";
+		$SI->checkAll();
+	}
 	}
-    }
 }
 
 ?>

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;
 	}
 
 }