Ysurac / FlightAirMap

scripts/daemon-spotter.php

Indentation +1103 added lines, -1103 removed lines

@@ -16,8 +16,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;
@@ -25,46 +25,46 @@ 
 // Check if schema is at latest version
 $Connection = new Connection();
 if ($Connection->connectionExists() === false) {
-    echo "Can't connect to your database. Check DB is running, user/password and database logs.";
-    exit();
+	echo "Can't connect to your database. Check DB is running, user/password and database logs.";
+	exit();
 }
 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','enable-aircraft','disable-aircraft','enable-tracker','disable-tracker','enable-marine','disable-marine'));
 //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;
@@ -103,8 +103,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();
@@ -114,14 +114,14 @@ 
 
 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($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();
@@ -134,12 +134,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
@@ -149,46 +149,46 @@ 
 $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('/aircraft.json$/i',$host)) {
-        	//$formats[$id] = 'aircraftjson';
-        	$globalSources[$id]['format'] = 'aircraftjson';
-        	//$last_exec['aircraftlistjson'] = 0;
-        	if ($globalDebug) echo "Connect to aircraft.json source (".$host.")...\n";
-    	    } else if (preg_match('/aircraft$/i',$host)) {
-        	//$formats[$id] = 'planefinderclient';
-        	$globalSources[$id]['format'] = 'planefinderclient';
-        	//$last_exec['aircraftlistjson'] = 0;
-        	if ($globalDebug) echo "Connect to planefinderclient 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";
-    	    /*
+			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('/aircraft.json$/i',$host)) {
+			//$formats[$id] = 'aircraftjson';
+			$globalSources[$id]['format'] = 'aircraftjson';
+			//$last_exec['aircraftlistjson'] = 0;
+			if ($globalDebug) echo "Connect to aircraft.json source (".$host.")...\n";
+			} else if (preg_match('/aircraft$/i',$host)) {
+			//$formats[$id] = 'planefinderclient';
+			$globalSources[$id]['format'] = 'planefinderclient';
+			//$last_exec['aircraftlistjson'] = 0;
+			if ($globalDebug) echo "Connect to planefinderclient 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";
+			/*
     	    // Disabled for now, site change source format
     	    } else if (preg_match('/radarvirtuel.com\/list_aircrafts$/i',$host)) {
         	//$formats[$id] = 'radarvirtueljson';
@@ -200,128 +200,128 @@ 
         	    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('/\/api\/v1\/acars\/data$/i',$host)) {
-        	//$formats[$id] = 'phpvmacars';
-        	$globalSources[$id]['format'] = 'vaos';
-        	//$last_exec['phpvmacars'] = 0;
-        	if ($globalDebug) echo "Connect to vaos 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('/blitzortung/i',$host)) {
-        	$globalSources[$id]['format'] = 'blitzortung';
-        	if ($globalDebug) echo "Connect to blitzortung source (".$host.")...\n";
-            } else if (preg_match('/airwhere/i',$host)) {
-        	$globalSources[$id]['format'] = 'airwhere';
-        	if ($globalDebug) echo "Connect to airwhere 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) || (isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailaway')) {
-    		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 && isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailaway') echo "Connect to ".$globalSources[$id]['format']." source (sailaway)...\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])) {
+			} 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('/\/api\/v1\/acars\/data$/i',$host)) {
+			//$formats[$id] = 'phpvmacars';
+			$globalSources[$id]['format'] = 'vaos';
+			//$last_exec['phpvmacars'] = 0;
+			if ($globalDebug) echo "Connect to vaos 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('/blitzortung/i',$host)) {
+			$globalSources[$id]['format'] = 'blitzortung';
+			if ($globalDebug) echo "Connect to blitzortung source (".$host.")...\n";
+			} else if (preg_match('/airwhere/i',$host)) {
+			$globalSources[$id]['format'] = 'airwhere';
+			if ($globalDebug) echo "Connect to airwhere 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) || (isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailaway')) {
+			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 && isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailaway') echo "Connect to ".$globalSources[$id]['format']." source (sailaway)...\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";
 		sleep(10);
 		connect_all($hosts);
-    	    }
-        }
-    }
+			}
+		}
+	}
 }
 if (!isset($globalMinFetch)) $globalMinFetch = 15;
 
@@ -344,9 +344,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
@@ -355,21 +355,21 @@ 
 	die;
 }
 foreach ($globalSources as $key => $source) {
-    if (!isset($source['format'])) {
-        $globalSources[$key]['format'] = 'auto';
-    }
-    if (isset($source['callback']) && $source['callback'] === TRUE) {
-        unset($globalSources[$key]);
-    }
+	if (!isset($source['format'])) {
+		$globalSources[$key]['format'] = 'auto';
+	}
+	if (isset($source['callback']) && $source['callback'] === TRUE) {
+		unset($globalSources[$key]);
+	}
 }
 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) {
@@ -410,133 +410,133 @@ 
 
 // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time.
 while ($i > 0) {
-    if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
+	if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
 
-    if (!$globalDaemon) $i = $endtime-time();
-    // Delete old ATC
-    if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
+	if (!$globalDaemon) $i = $endtime-time();
+	// Delete old ATC
+	if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
 	if ($globalDebug) echo 'Delete old ATC...'."\n";
-        $ATC->deleteOldATC();
-    }
+		$ATC->deleteOldATC();
+	}
     
-    if (count($last_exec) == count($globalSources)) {
+	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 ($globalDebug) echo 'Source host : '.$value['host'].' - Source format: '.$value['format']."\n";
 	if (!isset($last_exec[$id]['last'])) $last_exec[$id]['last'] = 0;
 	if ($value['format'] === 'deltadbtxt' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
 		(!isset($globalSources[$id]['minfetch']) && (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' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
 		(!isset($globalSources[$id]['minfetch']) && (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'] = substr($ais_data['mmsi'],-9);
-		    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['typeid'])) $data['type_id'] = $ais_data['typeid'];
-		    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'] = substr($ais_data['mmsi'],-9);
+			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['typeid'])) $data['type_id'] = $ais_data['typeid'];
+			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);
-		    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);
+			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");
 			if ($buffer === FALSE) {
-			    connect_all($globalSources);
+				connect_all($globalSources);
 			}
 			$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'];
@@ -554,117 +554,117 @@ 
 				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) {
 			if ($globalDebug) echo 'Reconnect...'."\n";
 			sleep(2);
 			//$sourceeen[] = $value;
 			//connect_all($sourceeen);
 			//$sourceeen = array();
 			connect_all($globalSources);
-		    }
+			}
+		}
 		}
-	    }
 	} elseif ($value['format'] === 'myshiptracking' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
 		(!isset($globalSources[$id]['minfetch']) && (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) {
+			foreach ($all_data[0]['DATA'] as $line) {
 			if ($line != '') {
-			    $data = array();
-			    $data['ident'] = $line['NAME'];
-			    $data['mmsi'] = $line['MMSI'];
-			    if (strlen($data['mmsi']) > 9) {
+				$data = array();
+				$data['ident'] = $line['NAME'];
+				$data['mmsi'] = $line['MMSI'];
+				if (strlen($data['mmsi']) > 9) {
 				$data['mmsi'] = substr($data['mmsi'],-9);
-			    }
-			    $data['speed'] = $line['SOG'];
-			    $data['heading'] = $line['COG'];
-			    $data['latitude'] = $line['LAT'];
-			    $data['longitude'] = $line['LNG'];
-			    //    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
-			    //$data['type_id'] = $line['TYPE'];
-			    $data['imo'] = $line['IMO'];
-			    if ($line['DEST'] != '') $data['arrival_code'] = $line['DEST'];
-			    if ($line['ARV'] != '') $data['arrival_time'] = date('Y-m-d H:i:s',strtotime($line['ARV']));
-			    $data['datetime'] = date('Y-m-d H:i:s',$line['T']);
-			    $data['format_source'] = 'myshiptracking';
-			    $data['id_source'] = $id_source;
-			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-			    $MI->add($data);
-			    unset($data);
+				}
+				$data['speed'] = $line['SOG'];
+				$data['heading'] = $line['COG'];
+				$data['latitude'] = $line['LAT'];
+				$data['longitude'] = $line['LNG'];
+				//    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
+				//$data['type_id'] = $line['TYPE'];
+				$data['imo'] = $line['IMO'];
+				if ($line['DEST'] != '') $data['arrival_code'] = $line['DEST'];
+				if ($line['ARV'] != '') $data['arrival_time'] = date('Y-m-d H:i:s',strtotime($line['ARV']));
+				$data['datetime'] = date('Y-m-d H:i:s',$line['T']);
+				$data['format_source'] = 'myshiptracking';
+				$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'] === 'boatbeaconapp' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
 		(!isset($globalSources[$id]['minfetch']) && (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'] = substr($line['mmsi'],-9);
-			    $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'] = substr($line['mmsi'],-9);
+				$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'] === 'boatnerd' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
-	    )
+		)
 	) {
-	    $buffer = $Common->getData($value['host']);
-	    if ($buffer != '') {
+		$buffer = $Common->getData($value['host']);
+		if ($buffer != '') {
 		$all_data = json_decode($buffer,true);
 		if (isset($all_data['features'][0]['id'])) {
-		    foreach ($all_data['features'] as $line) {
+			foreach ($all_data['features'] as $line) {
 			print_r($line);
 			$data = array();
 			if (isset($line['properties']['name'])) $data['ident'] = $line['properties']['name'];
@@ -684,66 +684,66 @@ 
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
 			if ($line['properties']['vesselType'] != 'Navigation Aid') $MI->add($data);
 			unset($data);
-		    }
+			}
 		}
 		
-	    }
-    	    $last_exec[$id]['last'] = time();
+		}
+			$last_exec[$id]['last'] = time();
 	} elseif ($value['format'] === 'shipplotter' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
-	    )
+		)
 	) {
-	    if ($globalDebug) echo 'download...';
-	    $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
-	    if ($globalDebug) echo 'done !'."\n";
-	    // FIXME: Need more work
-	    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 ($globalDebug) echo 'download...';
+		$buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
+		if ($globalDebug) echo 'done !'."\n";
+		// FIXME: Need more work
+		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();
-		    //echo $line."\n";
-		    $data['mmsi'] = (int)substr($line,0,9);
-		    $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
-		    $data['status_id'] = substr($line,21,2);
-		    $data['type_id'] = 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,78,20)));
-		    //$data['callsign'] = trim(substr($line,100,7);
-		    $data['arrival_code'] = 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();
+			//echo $line."\n";
+			$data['mmsi'] = (int)substr($line,0,9);
+			$data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
+			$data['status_id'] = substr($line,21,2);
+			$data['type_id'] = 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,78,20)));
+			//$data['callsign'] = trim(substr($line,100,7);
+			$data['arrival_code'] = 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['format'] === 'sailaway' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
-	    )
+		)
 	) {
-	    if ($globalDebug) echo 'download...';
-	    for ($i =0; $i <= 1; $i++) {
-	    $buffer = $Common->getData('https://sailaway.world/cgi-bin/sailaway/GetMissions.pl?race=1&tutorial=0&hist=1&racetype='.$i);
-	    if ($globalDebug) echo 'done'."\n";
-	    if ($buffer != '') {
+		if ($globalDebug) echo 'download...';
+		for ($i =0; $i <= 1; $i++) {
+		$buffer = $Common->getData('https://sailaway.world/cgi-bin/sailaway/GetMissions.pl?race=1&tutorial=0&hist=1&racetype='.$i);
+		if ($globalDebug) echo 'done'."\n";
+		if ($buffer != '') {
 		$all_data = json_decode($buffer,true);
 		if (isset($all_data['missions'])) {
 			foreach ($all_data['missions'] as $mission) {
@@ -791,34 +791,34 @@ 
 				}
 			}
 		}
-	    }
-	    }
-    	    $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' && 
 		(
-		    (isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
-		    (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
+			(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
+			(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
 		)
-	    ) || (
+		) || (
 		$value['format'] === 'vatsimtxt' && 
 		(
-		    (isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
-		    (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
+			(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
+			(!isset($globalSources[$id]['minfetch']) && (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];
@@ -831,37 +831,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']);
@@ -882,21 +882,21 @@ 
 					else 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['format'] === 'airwhere' && 
-    	    (
-    		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
-    		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
-    	    )
-    	) {
-	    $buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php','get','','','','','20');
-	    if ($buffer != '') {
+				unset($data);
+				}
+			}
+			}
+			//if ($value === 'whazzup') $last_exec['whazzup'] = time();
+			//elseif ($value === 'vatsimtxt') $last_exec['vatsimtxt'] = time();
+			$last_exec[$id]['last'] = time();
+		} elseif ($value['format'] === 'airwhere' && 
+			(
+			(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
+			(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
+			)
+		) {
+		$buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php','get','','','','','20');
+		if ($buffer != '') {
 		$all_data = simplexml_load_string($buffer);
 		foreach($all_data->children() as $childdata) {
 			$data = array();
@@ -918,10 +918,10 @@ 
 			$SI->add($data);
 			unset($data);
 		}
-	    }
-	    $Source->deleteOldLocationByType('gs');
-	    $buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php','get','','','','','20');
-	    if ($buffer != '') {
+		}
+		$Source->deleteOldLocationByType('gs');
+		$buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php','get','','','','','20');
+		if ($buffer != '') {
 		$all_data = simplexml_load_string($buffer);
 		foreach($all_data->children() as $childdata) {
 			$data = array();
@@ -939,8 +939,8 @@ 
 			}
 			unset($data);
 		}
-	    }
-	    $last_exec[$id]['last'] = time();
+		}
+		$last_exec[$id]['last'] = time();
 	/*
 	} if ($value['format'] === 'aircraftlistjson') {
 	    print_r($globalSources);
@@ -948,17 +948,17 @@ 
 	    echo $globalMinFetch;
 	*/
 	} elseif ($value['format'] === 'aircraftlistjson' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
-	    )
+		)
 	) {
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
-	    if ($buffer != '') {
-	        $all_data = json_decode($buffer,true);
+		$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) {
+			$reset = 0;
+			foreach ($all_data['acList'] as $line) {
 			$data = array();
 			$data['hex'] = $line['Icao']; // hex
 			if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
@@ -981,10 +981,10 @@ 
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
 			if (isset($data['latitude'])) $SI->add($data);
 			unset($data);
-		    }
+			}
 		} elseif (is_array($all_data)) {
-		    $reset = 0;
-		    foreach ($all_data as $line) {
+			$reset = 0;
+			foreach ($all_data as $line) {
 			$data = array();
 			$data['hex'] = $line['hex']; // hex
 			$data['ident'] = $line['flight']; // ident
@@ -1004,291 +1004,291 @@ 
 			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
 			$SI->add($data);
 			unset($data);
-		    }
+			}
 		}
-	    } elseif ($globalDebug) echo 'No data'."\n";
-    	    //$last_exec['aircraftlistjson'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	//} elseif ($value === 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
-    	} elseif ($value['format'] === 'planeupdatefaa' && 
-    	    (
-    		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
-    		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
-    	    )
-    	) {
-	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
-	    if (isset($all_data['planes'])) {
+		} elseif ($globalDebug) echo 'No data'."\n";
+			//$last_exec['aircraftlistjson'] = time();
+			$last_exec[$id]['last'] = time();
+		//} elseif ($value === 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
+		} elseif ($value['format'] === 'planeupdatefaa' && 
+			(
+			(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
+			(!isset($globalSources[$id]['minfetch']) && (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();
+		}
+		//$last_exec['planeupdatefaa'] = time();
+		$last_exec[$id]['last'] = time();
 	} elseif ($value['format'] === 'opensky' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
-	    )
+		)
 	) {
-	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
-	    if (isset($all_data['states'])) {
+		$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[6]; // lat
-		    $data['longitude'] = $line[5]; // 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[6]; // lat
+			$data['longitude'] = $line[5]; // 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();
+		//$last_exec['planeupdatefaa'] = time();
+		$last_exec[$id]['last'] = time();
 	} elseif ($value['format'] === 'aircraftjson' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
-	    )
+		)
 	) {
-	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
-	    if (isset($all_data['aircraft']) && isset($all_data['now']) && $all_data['now'] > time()-1800) {
+		$buffer = $Common->getData($value['host']);
+		$all_data = json_decode($buffer,true);
+		if (isset($all_data['aircraft']) && isset($all_data['now']) && $all_data['now'] > time()-1800) {
 		$reset = 0;
 		foreach ($all_data['aircraft'] as $key => $line) {
-		    $data = array();
-		    // add support for ground vehicule with ~ in front of hex
-		    if (isset($line['hex'])) $data['hex'] = $line['hex']; // hex
-		    if (isset($line['flight'])) $data['ident'] = trim($line['flight']); // ident
-		    if (isset($line['altitude'])) $data['altitude'] = $line['altitude']; // altitude
-		    if (isset($line['speed'])) $data['speed'] = $line['speed']; // speed
-		    if (isset($line['track'])) $data['heading'] = $line['track']; // heading
-		    if (isset($line['lat'])) $data['latitude'] = $line['lat']; // lat
-		    if (isset($line['lon'])) $data['longitude'] = $line['lon']; // long
-		    if (isset($line['vert_rate'])) $data['verticalrate'] = $line['vert_rate']; // verticale rate
-		    if (isset($line['squawk'])) $data['squawk'] = $line['squawk']; // squawk
-		    //$data['emergency'] = ''; // emergency
-		    //$data['registration'] = $line[2];
-		    //$data['aircraft_icao'] = $line[0];
-		    $data['datetime'] = date('Y-m-d H:i:s');
-		    $data['format_source'] = 'aircraftjson';
-		    $data['id_source'] = $id_source;
-		    if (isset($value['name']) && $value['name'] != '') {
-			    if (isset($line['mlat']) && !empty($line['mlat'])) $data['source_name'] = $value['name'].'_MLAT';
-			    else $data['source_name'] = $value['name'];
-		    } elseif (isset($line['mlat']) && !empty($line['mlat'])) $data['source_name'] = 'MLAT';
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    $SI->add($data);
-		    unset($data);
+			$data = array();
+			// add support for ground vehicule with ~ in front of hex
+			if (isset($line['hex'])) $data['hex'] = $line['hex']; // hex
+			if (isset($line['flight'])) $data['ident'] = trim($line['flight']); // ident
+			if (isset($line['altitude'])) $data['altitude'] = $line['altitude']; // altitude
+			if (isset($line['speed'])) $data['speed'] = $line['speed']; // speed
+			if (isset($line['track'])) $data['heading'] = $line['track']; // heading
+			if (isset($line['lat'])) $data['latitude'] = $line['lat']; // lat
+			if (isset($line['lon'])) $data['longitude'] = $line['lon']; // long
+			if (isset($line['vert_rate'])) $data['verticalrate'] = $line['vert_rate']; // verticale rate
+			if (isset($line['squawk'])) $data['squawk'] = $line['squawk']; // squawk
+			//$data['emergency'] = ''; // emergency
+			//$data['registration'] = $line[2];
+			//$data['aircraft_icao'] = $line[0];
+			$data['datetime'] = date('Y-m-d H:i:s');
+			$data['format_source'] = 'aircraftjson';
+			$data['id_source'] = $id_source;
+			if (isset($value['name']) && $value['name'] != '') {
+				if (isset($line['mlat']) && !empty($line['mlat'])) $data['source_name'] = $value['name'].'_MLAT';
+				else $data['source_name'] = $value['name'];
+			} elseif (isset($line['mlat']) && !empty($line['mlat'])) $data['source_name'] = 'MLAT';
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+			$SI->add($data);
+			unset($data);
 		}
-	    }
-	    //$last_exec['planeupdatefaa'] = time();
-	    $last_exec[$id]['last'] = time();
+		}
+		//$last_exec['planeupdatefaa'] = time();
+		$last_exec[$id]['last'] = time();
 	} elseif ($value['format'] === 'planefinderclient' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
-	    )
+		)
 	) {
-	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
-	    if (isset($all_data['aircraft'])) {
+		$buffer = $Common->getData($value['host']);
+		$all_data = json_decode($buffer,true);
+		if (isset($all_data['aircraft'])) {
 		$reset = 0;
 		foreach ($all_data['aircraft'] as $key => $line) {
-		    $data = array();
-		    $data['hex'] = $key; // hex
-		    if (isset($line['callsign'])) $data['ident'] = trim($line['callsign']); // ident
-		    if (isset($line['altitude'])) $data['altitude'] = $line['altitude']; // altitude
-		    if (isset($line['speed'])) $data['speed'] = $line['speed']; // speed
-		    if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
-		    if (isset($line['lat'])) $data['latitude'] = $line['lat']; // lat
-		    if (isset($line['lon'])) $data['longitude'] = $line['lon']; // long
-		    if (isset($line['vert_rate'])) $data['verticalrate'] = $line['vert_rate']; // verticale rate
-		    if (isset($line['squawk'])) $data['squawk'] = $line['squawk']; // squawk
-		    //$data['emergency'] = ''; // emergency
-		    if (isset($line['reg'])) $data['registration'] = $line['reg'];
-		    if (isset($line['type'])) $data['aircraft_icao'] = $line['type'];
-		    $data['datetime'] = date('Y-m-d H:i:s',$line['pos_update_time']);
-		    $data['format_source'] = 'planefinderclient';
-		    $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;
-		    $SI->add($data);
-		    unset($data);
+			$data = array();
+			$data['hex'] = $key; // hex
+			if (isset($line['callsign'])) $data['ident'] = trim($line['callsign']); // ident
+			if (isset($line['altitude'])) $data['altitude'] = $line['altitude']; // altitude
+			if (isset($line['speed'])) $data['speed'] = $line['speed']; // speed
+			if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
+			if (isset($line['lat'])) $data['latitude'] = $line['lat']; // lat
+			if (isset($line['lon'])) $data['longitude'] = $line['lon']; // long
+			if (isset($line['vert_rate'])) $data['verticalrate'] = $line['vert_rate']; // verticale rate
+			if (isset($line['squawk'])) $data['squawk'] = $line['squawk']; // squawk
+			//$data['emergency'] = ''; // emergency
+			if (isset($line['reg'])) $data['registration'] = $line['reg'];
+			if (isset($line['type'])) $data['aircraft_icao'] = $line['type'];
+			$data['datetime'] = date('Y-m-d H:i:s',$line['pos_update_time']);
+			$data['format_source'] = 'planefinderclient';
+			$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;
+			$SI->add($data);
+			unset($data);
+		}
 		}
-	    }
-	    $last_exec[$id]['last'] = time();
+		$last_exec[$id]['last'] = time();
 	//} elseif ($value === 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) {
 	} elseif ($value['format'] === 'fr24json' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
 		(!isset($globalSources[$id]['minfetch']) && (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) {
+		//$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();
+		}
+		//$last_exec['fr24json'] = time();
+		$last_exec[$id]['last'] = time();
 	//} elseif ($value === 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) {
 	} elseif ($value['format'] === 'radarvirtueljson' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
 		(!isset($globalSources[$id]['minfetch']) && (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) {
+		//$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();
+		//$last_exec['radarvirtueljson'] = time();
+		$last_exec[$id]['last'] = time();
 	//} elseif ($value === 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) {
 	} elseif ($value['format'] === 'pirepsjson' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
 		(!isset($globalSources[$id]['minfetch']) && (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);
+		//$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);
@@ -1303,209 +1303,209 @@ 
 			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();
+		//$last_exec['pirepsjson'] = time();
+		$last_exec[$id]['last'] = time();
 	//} elseif ($value === 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) {
 	} elseif ($value['format'] === 'phpvmacars' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
 		(!isset($globalSources[$id]['minfetch']) && (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)) {
+		//$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'];
-	    	    if (isset($value['timezone'])) {
-	    		$datetime = new DateTime($line['lastupdate'],new DateTimeZone($value['timezone']));
-	    		$datetime->setTimeZone(new DateTimeZone('UTC'));
-	    		$data['datetime'] = $datetime->format('Y-m-d H:i:s');
-	    	    } else $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'];
-    		    if (isset($line['registration'])) {
-    			$data['registration'] = $line['registration'];
-    			//if (isset($line['aircraft'])) $data['id'] = $line['aircraft'];
-    		    } else $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'];
+				if (isset($value['timezone'])) {
+				$datetime = new DateTime($line['lastupdate'],new DateTimeZone($value['timezone']));
+				$datetime->setTimeZone(new DateTimeZone('UTC'));
+				$data['datetime'] = $datetime->format('Y-m-d H:i:s');
+				} else $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'];
+				if (isset($line['registration'])) {
+				$data['registration'] = $line['registration'];
+				//if (isset($line['aircraft'])) $data['id'] = $line['aircraft'];
+				} else $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();
+		}
+		//$last_exec['phpvmacars'] = time();
+		$last_exec[$id]['last'] = time();
 	} elseif ($value['format'] === 'vaos' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
 		(!isset($globalSources[$id]['minfetch']) && (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) && isset($all_data['ACARSData'])) {
+		//$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) && isset($all_data['ACARSData'])) {
 		$reset = 0;
 		foreach ($all_data['ACARSData'] as $line) {
-		    //print_r($line);
-	    	    $data = array();
-	    	    //$data['id'] = $line['id']; // id not usable
-	    	    $data['id'] = $line['id'];
-	    	    //$data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
-	    	    if (isset($line['user']['username'])) $data['pilot_name'] = $line['user']['username'];
-	    	    if (isset($line['user_id'])) $data['pilot_id'] = $line['user_id'];
-	    	    $data['ident'] = str_replace(' ','',$line['bid']['flightnum']); // ident
-	    	    if (is_numeric($data['ident'])) $data['ident'] = $line['bid']['airline']['icao'].$data['ident'];
-	    	    $data['altitude'] = $line['altitude']; // altitude
-	    	    $data['speed'] = $line['groundspeed']; // speed
-	    	    $data['heading'] = $line['heading']; // heading
-	    	    $data['latitude'] = $line['lat']; // lat
-	    	    $data['longitude'] = $line['lon']; // long
-	    	    //$data['verticalrate'] = ''; // verticale rate
-	    	    //$data['squawk'] = ''; // squawk
-	    	    //$data['emergency'] = ''; // emergency
-	    	    if (isset($value['timezone'])) {
-	    		$datetime = new DateTime($line['updated_at'],new DateTimeZone($value['timezone']));
-	    		$datetime->setTimeZone(new DateTimeZone('UTC'));
-	    		$data['datetime'] = $datetime->format('Y-m-d H:i:s');
-	    	    } else $data['datetime'] = date('Y-m-d H:i:s');
+			//print_r($line);
+				$data = array();
+				//$data['id'] = $line['id']; // id not usable
+				$data['id'] = $line['id'];
+				//$data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
+				if (isset($line['user']['username'])) $data['pilot_name'] = $line['user']['username'];
+				if (isset($line['user_id'])) $data['pilot_id'] = $line['user_id'];
+				$data['ident'] = str_replace(' ','',$line['bid']['flightnum']); // ident
+				if (is_numeric($data['ident'])) $data['ident'] = $line['bid']['airline']['icao'].$data['ident'];
+				$data['altitude'] = $line['altitude']; // altitude
+				$data['speed'] = $line['groundspeed']; // speed
+				$data['heading'] = $line['heading']; // heading
+				$data['latitude'] = $line['lat']; // lat
+				$data['longitude'] = $line['lon']; // long
+				//$data['verticalrate'] = ''; // verticale rate
+				//$data['squawk'] = ''; // squawk
+				//$data['emergency'] = ''; // emergency
+				if (isset($value['timezone'])) {
+				$datetime = new DateTime($line['updated_at'],new DateTimeZone($value['timezone']));
+				$datetime->setTimeZone(new DateTimeZone('UTC'));
+				$data['datetime'] = $datetime->format('Y-m-d H:i:s');
+				} else $data['datetime'] = date('Y-m-d H:i:s');
 	    	    
-	    	    $data['departure_airport_icao'] = $line['bid']['depapt']['icao'];
-	    	    $data['departure_airport_time'] = $line['bid']['deptime'];
-	    	    $data['arrival_airport_icao'] = $line['bid']['arrapt']['icao'];
-		    $data['arrival_airport_time'] = $line['bid']['arrtime'];
-		    $data['registration'] = $line['bid']['aircraft']['registration'];
+				$data['departure_airport_icao'] = $line['bid']['depapt']['icao'];
+				$data['departure_airport_time'] = $line['bid']['deptime'];
+				$data['arrival_airport_icao'] = $line['bid']['arrapt']['icao'];
+			$data['arrival_airport_time'] = $line['bid']['arrtime'];
+			$data['registration'] = $line['bid']['aircraft']['registration'];
 
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-		    if (isset($line['bid']['route']) && $line['bid']['route'] != '') $data['waypoints'] = $line['bid']['route']; // route
-	    	    $data['aircraft_icao'] = $line['bid']['aircraft']['icao'];
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+			if (isset($line['bid']['route']) && $line['bid']['route'] != '') $data['waypoints'] = $line['bid']['route']; // route
+				$data['aircraft_icao'] = $line['bid']['aircraft']['icao'];
 
-    		    $data['id_source'] = $id_source;
-	    	    $data['format_source'] = 'vaos';
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    $SI->add($data);
-		    unset($data);
+				$data['id_source'] = $id_source;
+				$data['format_source'] = 'vaos';
+			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['format'] === 'vam' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
 		(!isset($globalSources[$id]['minfetch']) && (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)) {
+		//$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['format'] === 'blitzortung' && 
-	    (
+		(
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
 		(!isset($globalSources[$id]['minfetch']) && (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 != '') {
+		//$buffer = $Common->getData($hosts[$id]);
+		if ($globalDebug) echo 'Get Data...'."\n";
+		$buffer = $Common->getData($value['host']);
+		$all_data = json_decode($buffer,true);
+		if ($buffer != '') {
 		$Source->deleteLocationBySource('blitzortung');
 		$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
 		$buffer = explode('\n',$buffer);
 		foreach ($buffer as $buffer_line) {
-		    $line = json_decode($buffer_line,true);
-		    if (isset($line['time'])) {
+			$line = json_decode($buffer_line,true);
+			if (isset($line['time'])) {
 			$data = array();
 			$data['altitude'] = $line['alt']; // altitude
 			$data['latitude'] = $line['lat']; // lat
@@ -1517,94 +1517,94 @@ 
 			if ($globalDebug) echo '☈ Lightning added'."\n";
 			$Source->addLocation('',$data['latitude'],$data['longitude'],0,'','','blitzortung','weather/thunderstorm.png','lightning',$id,0,$data['datetime']);
 			unset($data);
-		    }
+			}
 		}
 		if ($globalDebug) echo 'No more data...'."\n";
 		unset($buffer);
-	    }
-	    $last_exec[$id]['last'] = 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'] === 'famaprs' || $value['format'] === 'beast' || $value['format'] === 'flightgearmp' || $value['format'] === 'flightgearsp' || $value['format'] === 'acars' || $value['format'] === 'acarssbs3' || $value['format'] === 'ais' || $value['format'] === 'vrstcp') {
-	    //$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) {
+		//$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) {
 		$reset = 0;
 		foreach ($read as $nb => $r) {
-		    //$value = $formats[$nb];
-		    $format = $globalSources[$nb]['format'];
-		    if ($format === 'sbs' || $format === 'aprs' || $format === 'famaprs' || $format === 'raw' || $format === 'tsv' || $format === 'acarssbs3') {
+			//$value = $formats[$nb];
+			$format = $globalSources[$nb]['format'];
+			if ($format === 'sbs' || $format === 'aprs' || $format === 'famaprs' || $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 ($buffer !== FALSE) {
+			}
+			//$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 ($buffer !== FALSE) {
 			if ($format === 'vrstcp') {
-			    $buffer = explode('},{',$buffer);
+				$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 !== '') {
+			}
+			// 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'] = substr($ais_data['mmsi'],-9);
-			    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($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
-			    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+				$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'] = substr($ais_data['mmsi'],-9);
+				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($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
+				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
 
-			    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
@@ -1621,38 +1621,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
@@ -1672,158 +1672,158 @@ 
 				*/
 				$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";
-			    date_default_timezone_set('UTC');
-			    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";
+				date_default_timezone_set('UTC');
+				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['imo'])) $data['imo'] = $line['imo'];
-				    if (isset($line['squawk'])) $data['squawk'] = $line['squawk'];
-				    if (isset($line['arrival_code'])) $data['arrival_code'] = $line['arrival_code'];
-				    if (isset($line['arrival_date'])) $data['arrival_date'] = $line['arrival_date'];
-				    if (isset($line['typeid'])) $data['type_id'] = $line['typeid'];
-				    if (isset($line['statusid'])) $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'];
+					$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['imo'])) $data['imo'] = $line['imo'];
+					if (isset($line['squawk'])) $data['squawk'] = $line['squawk'];
+					if (isset($line['arrival_code'])) $data['arrival_code'] = $line['arrival_code'];
+					if (isset($line['arrival_date'])) $data['arrival_date'] = $line['arrival_date'];
+					if (isset($line['typeid'])) $data['type_id'] = $line['typeid'];
+					if (isset($line['statusid'])) $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'];
 				    
-				    if (isset($line['heading']) && isset($line['format_source'])) $data['heading'] = $line['heading'];
-				    //else echo 'No heading...'."\n";
-				    //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($globalAPRSarchive) && $globalAPRSarchive === FALSE) $data['noarchive'] = true;
-				    elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) $data['noarchive'] = false;
-				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
-				    elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) $data['noarchive'] = false;
-    				    $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']);
-				    if ($data['source_type'] != 'modes' && $data['source_type'] != 'ais') $data['altitude_relative'] = 'AMSL';
-				    // 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 (
+					if (isset($line['heading']) && isset($line['format_source'])) $data['heading'] = $line['heading'];
+					//else echo 'No heading...'."\n";
+					//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($globalAPRSarchive) && $globalAPRSarchive === FALSE) $data['noarchive'] = true;
+					elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) $data['noarchive'] = false;
+					if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
+					elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) $data['noarchive'] = false;
+						$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']);
+					if ($data['source_type'] != 'modes' && $data['source_type'] != 'ais') $data['altitude_relative'] = 'AMSL';
+					// 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']) && 
 					(!isset($data['hex']) || $data['hex'] != 'FFFFFF') && 
 					 ($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') {
 					$data['type'] = '';
 					if (isset($globalMarine) && $globalMarine) $send = $MI->add($data);
-				    } elseif (isset($line['stealth']) && $line['stealth'] != 0) {
+					} elseif (isset($line['stealth']) && $line['stealth'] != 0) {
 					 echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
-				    } elseif (isset($globalAircraft) && $globalAircraft && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
-					    //$line['symbol'] === 'Balloon' ||
-					    $line['symbol'] === 'Glider' || 
-					    $line['symbol'] === 'No. Plane' || 
-					    $line['symbol'] === 'Aircraft (small)' || $line['symbol'] === 'Helicopter')) {
-					    if ($line['symbol'] === 'Ballon') $data['aircraft_icao'] = 'BALL';
-					    if ($line['symbol'] === 'Glider') $data['aircraft_icao'] = 'PARAGLIDER';
-					    $send = $SI->add($data);
-				    } elseif (isset($globalMarine) && $globalMarine && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
-					    $line['symbol'] === 'Yacht (Sail)' || 
-					    $line['symbol'] === 'Ship (Power Boat)')) {
-					    $send = $MI->add($data);
-				    } 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'] === 'Tractor' || 
-					    $line['symbol'] === 'Police' || 
-					    $line['symbol'] === 'Bike' || 
-					    $line['symbol'] === 'Jogger' || 
-					    $line['symbol'] === 'Horse' || 
-					    $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'] === 'Glider' || 
-					    $line['symbol'] === 'Aircraft (small)' || $line['symbol'] === 'Helicopter' || 
-					    $line['symbol'] === 'SUV' ||
-					    $line['symbol'] === 'Snowmobile' ||
-					    $line['symbol'] === 'Mobile Satellite Station')) {
-				    //} 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($globalAircraft) && $globalAircraft && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
+						//$line['symbol'] === 'Balloon' ||
+						$line['symbol'] === 'Glider' || 
+						$line['symbol'] === 'No. Plane' || 
+						$line['symbol'] === 'Aircraft (small)' || $line['symbol'] === 'Helicopter')) {
+						if ($line['symbol'] === 'Ballon') $data['aircraft_icao'] = 'BALL';
+						if ($line['symbol'] === 'Glider') $data['aircraft_icao'] = 'PARAGLIDER';
+						$send = $SI->add($data);
+					} elseif (isset($globalMarine) && $globalMarine && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
+						$line['symbol'] === 'Yacht (Sail)' || 
+						$line['symbol'] === 'Ship (Power Boat)')) {
+						$send = $MI->add($data);
+					} 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'] === 'Tractor' || 
+						$line['symbol'] === 'Police' || 
+						$line['symbol'] === 'Bike' || 
+						$line['symbol'] === 'Jogger' || 
+						$line['symbol'] === 'Horse' || 
+						$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'] === 'Glider' || 
+						$line['symbol'] === 'Aircraft (small)' || $line['symbol'] === 'Helicopter' || 
+						$line['symbol'] === 'SUV' ||
+						$line['symbol'] === 'Snowmobile' ||
+						$line['symbol'] === 'Mobile Satellite Station')) {
+					//} 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'] != '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);
-				    } elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident']) && isset($data['altitude'])) {
+					} elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident']) && isset($data['altitude'])) {
 					if (!isset($data['altitude'])) $data['altitude'] = 0;
 					$Source->deleteOldLocationByType('gs');
 					if (count($Source->getLocationInfoByNameType($data['ident'],'gs')) > 0) {
@@ -1831,7 +1831,7 @@ 
 					} else {
 						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']);
 					}
-				    } elseif (isset($line['symbol']) && $line['symbol'] === 'Weather Station') {
+					} elseif (isset($line['symbol']) && $line['symbol'] === 'Weather Station') {
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
 					if ($globalDebug) echo '# Weather Station added'."\n";
 					$Source->deleteOldLocationByType('wx');
@@ -1841,7 +1841,7 @@ 
 					} else {
 						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'wx.png','wx',$id,0,$data['datetime'],$weather_data);
 					}
-				    } elseif (isset($line['symbol']) && ($line['symbol'] === 'Lightning' || $line['symbol'] === 'Thunderstorm')) {
+					} elseif (isset($line['symbol']) && ($line['symbol'] === 'Lightning' || $line['symbol'] === 'Thunderstorm')) {
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
 					if ($globalDebug) echo '☈ Lightning added'."\n";
 					$Source->deleteOldLocationByType('lightning');
@@ -1850,11 +1850,11 @@ 
 					} else {
 						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'weather/thunderstorm.png','lightning',$id,0,$data['datetime'],$data['comment']);
 					}
-				    } elseif ($globalDebug) {
-				    	echo '/!\ Not added: '.$buffer."\n";
-				    	print_r($line);
-				    }
-				    unset($data);
+					} elseif ($globalDebug) {
+						echo '/!\ Not added: '.$buffer."\n";
+						print_r($line);
+					}
+					unset($data);
 				}
 				elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') {
 					$Source->updateLocationDescByName($line['ident'],$line['source'],$id,$line['comment']);
@@ -1873,12 +1873,12 @@ 
 				} elseif (!isset($globalSources[$nb]['last_weather_clean'])) {
 					$globalSources[$nb]['last_weather_clean'] = time();
 				}
-			    }
+				}
 			} 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']);
@@ -1886,31 +1886,31 @@ 
     					$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'];
 				elseif ($line[0] == 'MLAT') $data['source_name'] = 'MLAT';
-    				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 {
@@ -1926,13 +1926,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];
@@ -1941,9 +1941,9 @@ 
 				break;
 				
 			} elseif ($format != 'acars' && $format != 'flightgearsp') {
-			    if (isset($tt[$format])) $tt[$format]++;
-			    else $tt[$format] = 0;
-			    if ($tt[$format] > 30 || $buffer === FALSE) {
+				if (isset($tt[$format])) $tt[$format]++;
+				else $tt[$format] = 0;
+				if ($tt[$format] > 30 || $buffer === FALSE) {
 				if ($globalDebug) echo "ERROR : Reconnect ".$format."...";
 				//@socket_close($r);
 				sleep(2);
@@ -1954,24 +1954,24 @@ 
 				//connect_all($globalSources);
 				$tt[$format]=0;
 				break;
-			    } 
-			    //else if ($globalDebug) echo "Trying again (".$tt[$format]."x) ".$format."...";
+				} 
+				//else if ($globalDebug) echo "Trying again (".$tt[$format]."x) ".$format."...";
+			}
 			}
-		    }
 		}
-	    } 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...";
@@ -1986,15 +1986,15 @@ 
 			if ($globalDebug) echo "Restart all connections...";
 			connect_all($globalSources);
 		}
-	    }
+		}
 	}
 	if ($globalDaemon === false) {
-	    if ($globalDebug) echo 'Check all...'."\n";
-	    if (isset($SI)) $SI->checkAll();
-	    if (isset($TI)) $TI->checkAll();
-	    if (isset($MI)) $MI->checkAll();
+		if ($globalDebug) echo 'Check all...'."\n";
+		if (isset($SI)) $SI->checkAll();
+		if (isset($TI)) $TI->checkAll();
+		if (isset($MI)) $MI->checkAll();
+	}
 	}
-    }
 }
 
 ?>

require/class.MarineImport.php

Indentation +226 added lines, -226 removed lines

@@ -9,25 +9,25 @@ 
 require_once(dirname(__FILE__).'/class.Stats.php');
 require_once(dirname(__FILE__).'/class.Source.php');
 if (isset($globalServerAPRS) && $globalServerAPRS) {
-    require_once(dirname(__FILE__).'/class.APRS.php');
+	require_once(dirname(__FILE__).'/class.APRS.php');
 }
 
 class MarineImport {
-    private $all_tracked = array();
-    private $last_delete_hourly = 0;
-    private $last_delete = 0;
-    private $stats = array();
-    private $tmd = 0;
-    private $source_location = array();
-    public $db = null;
-    public $nb = 0;
+	private $all_tracked = array();
+	private $last_delete_hourly = 0;
+	private $last_delete = 0;
+	private $stats = array();
+	private $tmd = 0;
+	private $source_location = array();
+	public $db = null;
+	public $nb = 0;
 
-    public function __construct($dbc = null) {
+	public function __construct($dbc = null) {
 	global $globalBeta, $globalServerAPRS, $APRSMarine, $globalNoDB;
 	if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-	    $Connection = new Connection($dbc);
-	    $this->db = $Connection->db();
-	    date_default_timezone_set('UTC');
+		$Connection = new Connection($dbc);
+		$this->db = $Connection->db();
+		date_default_timezone_set('UTC');
 	}
 	// Get previous source stats
 	/*
@@ -46,57 +46,57 @@ 
 	}
 	*/
 	if (isset($globalServerAPRS) && $globalServerAPRS) {
-	    $APRSMarine = new APRSMarine();
-	    //$APRSSpotter->connect();
+		$APRSMarine = new APRSMarine();
+		//$APRSSpotter->connect();
+	}
 	}
-    }
 
-    public function checkAll() {
+	public function checkAll() {
 	global $globalDebug, $globalNoDB;
 	if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-	    if ($globalDebug) echo "Update last seen tracked data...\n";
-	    foreach ($this->all_tracked as $key => $flight) {
+		if ($globalDebug) echo "Update last seen tracked data...\n";
+		foreach ($this->all_tracked as $key => $flight) {
 		if (isset($this->all_tracked[$key]['id'])) {
-		    //echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].'  '.$this->all_tracked[$key]['longitude']."\n";
-    		    $Marine = new Marine($this->db);
-    		    $Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
+			//echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].'  '.$this->all_tracked[$key]['longitude']."\n";
+				$Marine = new Marine($this->db);
+				$Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
+		}
 		}
-	    }
 	}
-    }
+	}
 
-    public function del() {
+	public function del() {
 	global $globalDebug, $globalNoDB, $globalNoImport;
 	// Delete old infos
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
 	foreach ($this->all_tracked as $key => $flight) {
-    	    if (isset($flight['lastupdate'])) {
-        	if ($flight['lastupdate'] < (time()-3000)) {
-            	    if ((!isset($globalNoImport) || $globalNoImport !== TRUE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
-            		if (isset($this->all_tracked[$key]['id'])) {
-            		    if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
-			    /*
+			if (isset($flight['lastupdate'])) {
+			if ($flight['lastupdate'] < (time()-3000)) {
+					if ((!isset($globalNoImport) || $globalNoImport !== TRUE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
+					if (isset($this->all_tracked[$key]['id'])) {
+						if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
+				/*
 			    $MarineLive = new MarineLive();
             		    $MarineLive->deleteLiveMarineDataById($this->all_tracked[$key]['id']);
 			    $MarineLive->db = null;
 			    */
-            		    //$real_arrival = $this->arrival($key);
-            		    $Marine = new Marine($this->db);
-            		    if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
+						//$real_arrival = $this->arrival($key);
+						$Marine = new Marine($this->db);
+						if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
 				$result = $Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
-			    }
-			    // Put in archive
+				}
+				// Put in archive
 //				$Marine->db = null;
 			}
-            	    }
-            	    unset($this->all_tracked[$key]);
-    	        }
-	    }
-        }
-    }
+					}
+					unset($this->all_tracked[$key]);
+				}
+		}
+		}
+	}
 
-    public function add($line) {
+	public function add($line) {
 	global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked, $globalNoImport, $globalNoDB, $globalServerAPRS,$APRSMarine;
 	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02';
 	date_default_timezone_set('UTC');
@@ -105,104 +105,104 @@ 
 	
 	// SBS format is CSV format
 	if(is_array($line) && (isset($line['mmsi']) || isset($line['id']))) {
-	    //print_r($line);
-  	    if (isset($line['mmsi']) || isset($line['id'])) {
+		//print_r($line);
+  		if (isset($line['mmsi']) || isset($line['id'])) {
 
 		
 		// Increment message number
 		if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) {
-		    $current_date = date('Y-m-d');
-		    if (isset($line['source_name'])) $source = $line['source_name'];
-		    else $source = '';
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
-		    if (!isset($this->stats[$current_date][$source]['msg'])) {
-		    	$this->stats[$current_date][$source]['msg']['date'] = time();
-		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
+			$current_date = date('Y-m-d');
+			if (isset($line['source_name'])) $source = $line['source_name'];
+			else $source = '';
+			if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
+			if (!isset($this->stats[$current_date][$source]['msg'])) {
+				$this->stats[$current_date][$source]['msg']['date'] = time();
+				$this->stats[$current_date][$source]['msg']['nb'] = 1;
+			} else $this->stats[$current_date][$source]['msg']['nb'] += 1;
 		}
 		
 		
 		$Common = new Common();
 		$AIS = new AIS();
-	        if (!isset($line['id'])) $id = trim($line['mmsi']);
-	        else $id = trim($line['id']);
+			if (!isset($line['id'])) $id = trim($line['mmsi']);
+			else $id = trim($line['id']);
 		
 		if (!isset($this->all_tracked[$id])) {
-		    $this->all_tracked[$id] = array();
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedMarine' => 0));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '0', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','typeid' => '','noarchive' => false,'putinarchive' => true,'over_country' => '','mmsi' => '','status' => '','status_id' => '','imo' => '','callsign' => '','arrival_code' => '','arrival_date' => '','mmsi_type' => '','captain_id' => '','captain_name' => '','race_id' => '','race_name' => ''));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
-		    if (!isset($line['id'])) {
+			$this->all_tracked[$id] = array();
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedMarine' => 0));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '0', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','typeid' => '','noarchive' => false,'putinarchive' => true,'over_country' => '','mmsi' => '','status' => '','status_id' => '','imo' => '','callsign' => '','arrival_code' => '','arrival_date' => '','mmsi_type' => '','captain_id' => '','captain_name' => '','race_id' => '','race_name' => ''));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
+			if (!isset($line['id'])) {
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi')));
-		     } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
-		    if ($globalAllTracked !== FALSE) $dataFound = true;
+			 } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
+			if ($globalAllTracked !== FALSE) $dataFound = true;
 		}
 		
 		if (isset($line['mmsi']) && $line['mmsi'] != '' && $line['mmsi'] != $this->all_tracked[$id]['mmsi']) {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi' => $line['mmsi']));
-		    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi' => $line['mmsi']));
+			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 			$Marine = new Marine($this->db);
 			$identity = $Marine->getIdentity($line['mmsi']);
 			if (!empty($identity)) {
-			    $this->all_tracked[$id]['ident'] = $identity['ship_name'];
-			    $this->all_tracked[$id]['type'] = $identity['type'];
-			    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('typeid' => $AIS->getShipTypeID($identity['type'])));
+				$this->all_tracked[$id]['ident'] = $identity['ship_name'];
+				$this->all_tracked[$id]['type'] = $identity['type'];
+				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('typeid' => $AIS->getShipTypeID($identity['type'])));
 			}
 			//print_r($identity);
 			unset($Marine);
 			//$dataFound = true;
-		    }
+			}
 		}
 		if (isset($line['type_id'])) {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $AIS->getShipType($line['type_id'])));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('typeid' => $line['type_id']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $AIS->getShipType($line['type_id'])));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('typeid' => $line['type_id']));
 		}
 		if (isset($line['type']) && $line['type'] != '' && $this->all_tracked[$id]['type'] == '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type']));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('typeid' => $AIS->getShipTypeID($line['type'])));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('typeid' => $AIS->getShipTypeID($line['type'])));
 		}
 		if (isset($line['status']) && $line['status'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status' => $line['status']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status' => $line['status']));
 		}
 		if (isset($line['status_id']) && (!isset($this->all_tracked[$id]['status_id']) || $this->all_tracked[$id]['status_id'] != $line['status_id'])) {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status_id' => $line['status_id']));
-		    if ($this->all_tracked[$id]['addedMarine'] == 1) {
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status_id' => $line['status_id']));
+			if ($this->all_tracked[$id]['addedMarine'] == 1) {
 			if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
-			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
+				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 				$Marine = new Marine($this->db);
 				$Marine->updateStatusMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['status']);
 				unset($Marine);
-			    }
+				}
+			}
 			}
-		    }
 		}
 
 
 		if (isset($line['mmsi_type']) && $line['mmsi_type'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi_type' => $line['mmsi_type']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi_type' => $line['mmsi_type']));
 		}
 		if (isset($line['imo']) && $line['imo'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('imo' => $line['imo']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('imo' => $line['imo']));
 		}
 		if (isset($line['callsign']) && $line['callsign'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('callsign' => $line['callsign']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('callsign' => $line['callsign']));
 		}
 		if (isset($line['arrival_code']) && $line['arrival_code'] != '') {
-		    if (!isset($this->all_tracked[$id]['arrival_code'])) {
+			if (!isset($this->all_tracked[$id]['arrival_code'])) {
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_code' => $line['arrival_code']));
 			if ($globalDebug) echo $this->all_tracked[$id]['id'].' => New arrival: '.$line['arrival_code']."\n";
 			if ($this->all_tracked[$id]['addedMarine'] != 0) {
-			    if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
+				if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-				    $Marine = new Marine($this->db);
-				    $fromsource = NULL;
-				    $Marine->updateArrivalPortNameMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['arrival_code'],$fromsource);
-				    $Marine->db = null;
+					$Marine = new Marine($this->db);
+					$fromsource = NULL;
+					$Marine->updateArrivalPortNameMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['arrival_code'],$fromsource);
+					$Marine->db = null;
+				}
 				}
-			    }
 			}
-		    } elseif ($this->all_tracked[$id]['arrival_code'] != $line['arrival_code']) {
+			} elseif ($this->all_tracked[$id]['arrival_code'] != $line['arrival_code']) {
 			$this->all_tracked[$id]['arrival_code'] = $line['arrival_code'];
 			if ($globalDebug) echo $this->all_tracked[$id]['id'].' => New arrival: '.$line['arrival_code']."\n";
 			if (!isset($line['id'])) {
@@ -210,38 +210,38 @@ 
 				$this->all_tracked[$id]['forcenew'] = 1;
 				$this->all_tracked[$id]['addedMarine'] = 0;
 			}
-		    }
+			}
 		}
 		if (isset($line['arrival_date']) && $line['arrival_date'] != '') {
-		    if (strtotime($line['arrival_date']) > time()) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_date' => $line['arrival_date']));
+			if (strtotime($line['arrival_date']) > time()) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_date' => $line['arrival_date']));
 		}
 		if (isset($line['captain_id']) && $line['captain_id'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('captain_id' => $line['captain_id']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('captain_id' => $line['captain_id']));
 		}
 		if (isset($line['captain_name']) && $line['captain_name'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('captain_name' => $line['captain_name']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('captain_name' => $line['captain_name']));
 		}
 		if (isset($line['race_id']) && $line['race_id'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('race_id' => $line['race_id']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('race_id' => $line['race_id']));
 		}
 		if (isset($line['race_name']) && $line['race_name'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('race_name' => $line['race_name']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('race_name' => $line['race_name']));
 		}
 
 		//if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9-]+$/', $line['ident'])) {
 		if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident']))) {
-		    if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
+			if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-			    $timeelapsed = microtime(true);
-			    $Marine = new Marine($this->db);
-			    $Marine->addIdentity($this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['ident'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['type']);
-			    $Marine->db = null;
+				$timeelapsed = microtime(true);
+				$Marine = new Marine($this->db);
+				$Marine->addIdentity($this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['ident'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['type']);
+				$Marine->db = null;
+			}
 			}
-		    }
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident'])));
-		    if ($this->all_tracked[$id]['addedMarine'] == 1) {
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident'])));
+			if ($this->all_tracked[$id]['addedMarine'] == 1) {
 			if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
-			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
+				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 				$timeelapsed = microtime(true);
 				$Marine = new Marine($this->db);
 				$fromsource = NULL;
@@ -249,20 +249,20 @@ 
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
 				$Marine->db = null;
 				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-			    }
+				}
+			}
 			}
-		    }
-		    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
+			if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
 		}
 
 		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-30*60 && strtotime($line['datetime']) < time()+20*60) {
-		    if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime'])) {
+			if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime'])) {
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime']));
-		    } else {
+			} else {
 				if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['mmsi']."\n";
 				elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['hex']." - format : ".$line['format_source']."\n";
 				return '';
-		    }
+			}
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) <= time()-30*60) {
 			if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!\n";
 			return '';
@@ -279,24 +279,24 @@ 
 
 
 		if (isset($line['speed'])) {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed'])));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed'])));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true));
 		} else if (!isset($this->all_tracked[$id]['speed_fromsrc']) && isset($this->all_tracked[$id]['time_last_coord']) && $this->all_tracked[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) {
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m');
-		    if ($distance > 1000 && $distance < 10000) {
+			$distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m');
+			if ($distance > 1000 && $distance < 10000) {
 			$speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']);
 			$speed = $speed*3.6;
 			if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
   			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['hex']." : ".$speed." - distance : ".$distance."\n";
-		    }
+			}
 		}
 
-	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
-	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
-	    	    else unset($timediff);
-	    	    if ($this->tmd > 5 || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) {
+			if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
+				if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
+				else unset($timediff);
+				if ($this->tmd > 5 || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) {
 			if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) {
-			    if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
+				if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
 				$this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
 				$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
 				$this->all_tracked[$id]['putinarchive'] = true;
@@ -304,192 +304,192 @@ 
 				if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
 				$timeelapsed = microtime(true);
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-				    $Marine = new Marine($this->db);
-				    $all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
-				    if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2'];
-				    $Marine->db = null;
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					$Marine = new Marine($this->db);
+					$all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
+					if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2'];
+					$Marine->db = null;
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
 				}
 				$this->tmd = 0;
 				if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
-			    }
+				}
 			}
 
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
 				if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
 				if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') {
-				    $this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
-				    $dataFound = true;
-				    $this->all_tracked[$id]['time_last_coord'] = time();
+					$this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
+					$dataFound = true;
+					$this->all_tracked[$id]['time_last_coord'] = time();
 				}
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude']));
 			}
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
+				if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
 				if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
 				if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') {
-				    $this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
-				    $dataFound = true;
-				    $this->all_tracked[$id]['time_last_coord'] = time();
+					$this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
+					$dataFound = true;
+					$this->all_tracked[$id]['time_last_coord'] = time();
 				}
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('longitude' => $line['longitude']));
 			}
 
-		    } else if ($globalDebug && $timediff > 20) {
+			} else if ($globalDebug && $timediff > 20) {
 			$this->tmd = $this->tmd + 1;
 			echo '!!! Too much distance in short time... for '.$this->all_tracked[$id]['ident']."\n";
 			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')."m -";
 			echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
 			echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_tracked[$id]['latitude'].' - prev long : '.$this->all_tracked[$id]['longitude']." \n";
-		    }
+			}
 		}
 		if (isset($line['last_update']) && $line['last_update'] != '') {
-		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
+			if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
 		}
 		if (isset($line['format_source']) && $line['format_source'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source']));
 		}
 		if (isset($line['source_name']) && $line['source_name'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name']));
 		}
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true));
 		}
 		
 		if (isset($line['heading']) && $line['heading'] != '') {
-		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
-		    //$dataFound = true;
+			if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
+			//$dataFound = true;
   		} elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) {
-  		    $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
-		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
+  			$heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
+			if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
+  			if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
   		}
 		//if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
 
 
 
 		if ($dataFound === true && (isset($this->all_tracked[$id]['mmsi']) || isset($this->all_tracked[$id]['id']))) {
-		    $this->all_tracked[$id]['lastupdate'] = time();
-		    if ($this->all_tracked[$id]['addedMarine'] == 0) {
-		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == ''  || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
-			    if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
+			$this->all_tracked[$id]['lastupdate'] = time();
+			if ($this->all_tracked[$id]['addedMarine'] == 0) {
+				if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == ''  || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
+				if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-				    if ($globalDebug) echo "Check if vessel is already in DB...";
-				    $timeelapsed = microtime(true);
-				    $MarineLive = new MarineLive($this->db);
-				    if (isset($line['id'])) {
+					if ($globalDebug) echo "Check if vessel is already in DB...";
+					$timeelapsed = microtime(true);
+					$MarineLive = new MarineLive($this->db);
+					if (isset($line['id'])) {
 					$recent_ident = $MarineLive->checkIdRecent($line['id']);
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-				    } elseif (isset($this->all_tracked[$id]['mmsi']) && $this->all_tracked[$id]['mmsi'] != '') {
+					} elseif (isset($this->all_tracked[$id]['mmsi']) && $this->all_tracked[$id]['mmsi'] != '') {
 					$recent_ident = $MarineLive->checkMMSIRecent($this->all_tracked[$id]['mmsi']);
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-				    } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
+					} elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
 					$recent_ident = $MarineLive->checkIdentRecent($this->all_tracked[$id]['ident']);
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-				    } else $recent_ident = '';
-				    $MarineLive->db=null;
-				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
-				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
+					} else $recent_ident = '';
+					$MarineLive->db=null;
+					if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
+					elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
 				} else $recent_ident = '';
-			    } else {
+				} else {
 				$recent_ident = '';
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0));
-			    }
-			    //if there was no vessel with the same callsign within the last hour and go post it into the archive
-			    if($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '')
-			    {
+				}
+				//if there was no vessel with the same callsign within the last hour and go post it into the archive
+				if($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '')
+				{
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['mmsi']." in archive DB : ";
 				//adds the spotter data for the archive
-				    $highlight = '';
-				    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi')));
-				    if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
+					$highlight = '';
+					if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi')));
+					if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-					    $timeelapsed = microtime(true);
-					    $Marine = new Marine($this->db);
-					    $result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['captain_id'],$this->all_tracked[$id]['captain_name'],$this->all_tracked[$id]['race_id'],$this->all_tracked[$id]['race_name']);
-					    $Marine->db = null;
-					    if ($globalDebug && isset($result)) echo $result."\n";
-					    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+						$timeelapsed = microtime(true);
+						$Marine = new Marine($this->db);
+						$result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['captain_id'],$this->all_tracked[$id]['captain_name'],$this->all_tracked[$id]['race_id'],$this->all_tracked[$id]['race_name']);
+						$Marine->db = null;
+						if ($globalDebug && isset($result)) echo $result."\n";
+						if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					}
 					}
-				    }
-				    if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') {
+					if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') {
 					// Add source stat in DB
 					$Stats = new Stats($this->db);
 					if (!empty($this->stats)) {
-					    if ($globalDebug) echo 'Add source stats : ';
-				    	    foreach($this->stats as $date => $data) {
+						if ($globalDebug) echo 'Add source stats : ';
+							foreach($this->stats as $date => $data) {
 						foreach($data as $source => $sourced) {
-					    	    //print_r($sourced);
-				    	    	    if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_marine',$date);
-				    	    	    if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_marine',$date);
-				    		    if (isset($sourced['msg'])) {
-				    			if (time() - $sourced['msg']['date'] > 10) {
-				    		    	    $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
-				    		    	    echo $Stats->addStatSource($nbmsg,$source,'msg_marine',$date);
-			    			    	    unset($this->stats[$date][$source]['msg']);
-			    				}
-			    			    }
-			    			}
-			    			if ($date != date('Y-m-d')) {
-			    			    unset($this->stats[$date]);
-			    			}
-				    	    }
-				    	    if ($globalDebug) echo 'Done'."\n";
+								//print_r($sourced);
+									if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_marine',$date);
+									if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_marine',$date);
+								if (isset($sourced['msg'])) {
+								if (time() - $sourced['msg']['date'] > 10) {
+										$nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
+										echo $Stats->addStatSource($nbmsg,$source,'msg_marine',$date);
+										unset($this->stats[$date][$source]['msg']);
+								}
+								}
+							}
+							if ($date != date('Y-m-d')) {
+								unset($this->stats[$date]);
+							}
+							}
+							if ($globalDebug) echo 'Done'."\n";
 					}
 					$Stats->db = null;
-				    }
+					}
 				    
-				    $this->del();
+					$this->del();
 				//$ignoreImport = false;
 				$this->all_tracked[$id]['addedMarine'] = 1;
 				//print_r($this->all_tracked[$id]);
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
-				    if ($globalDebug) echo "---- Deleting Live Marine data older than 9 hours...";
-				    //MarineLive->deleteLiveMarineDataNotUpdated();
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
+					if ($globalDebug) echo "---- Deleting Live Marine data older than 9 hours...";
+					//MarineLive->deleteLiveMarineDataNotUpdated();
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					$MarineLive = new MarineLive($this->db);
 					$MarineLive->deleteLiveMarineData();
 					$MarineLive->db=null;
 					if ($globalDebug) echo " Done\n";
-				    }
-				    $this->last_delete = time();
+					}
+					$this->last_delete = time();
 				}
-			    } elseif ($recent_ident != '') {
+				} elseif ($recent_ident != '') {
 				$this->all_tracked[$id]['id'] = $recent_ident;
 				$this->all_tracked[$id]['addedMarine'] = 1;
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-				    if (isset($globalDaemon) && !$globalDaemon) {
+					if (isset($globalDaemon) && !$globalDaemon) {
 					$Marine = new Marine($this->db);
 					$Marine->updateLatestMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime']);
 					$Marine->db = null;
-				    }
+					}
 				}
 				
-			    }
+				}
 			}
-		    }
-		    //adds the spotter LIVE data
-		    if ($globalDebug) {
+			}
+			//adds the spotter LIVE data
+			if ($globalDebug) {
 			echo 'DATA : ident : '.$this->all_tracked[$id]['ident'].' - type : '.$this->all_tracked[$id]['type'].' - Latitude : '.$this->all_tracked[$id]['latitude'].' - Longitude : '.$this->all_tracked[$id]['longitude'].' - Heading : '.$this->all_tracked[$id]['heading'].' - Speed : '.$this->all_tracked[$id]['speed']."\n";
-		    }
-		    $ignoreImport = false;
+			}
+			$ignoreImport = false;
 
-		    if (!$ignoreImport) {
+			if (!$ignoreImport) {
 			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
 				if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					$timeelapsed = microtime(true);
 					$MarineLive = new MarineLive($this->db);
 					$result = $MarineLive->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country'],$this->all_tracked[$id]['captain_id'],$this->all_tracked[$id]['captain_name'],$this->all_tracked[$id]['race_id'],$this->all_tracked[$id]['race_name']);
 					$MarineLive->db = null;
 					if ($globalDebug) echo $result."\n";
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-				    }
+					}
 				}
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_tracked[$id]['putinarchive']) {
 					$APRSMarine->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']);
@@ -524,7 +524,7 @@ 
 					if ($stats_heading == 16) $stats_heading = 0;
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
 						for ($i=0;$i<=15;$i++) {
-						    $this->stats[$current_date][$source]['polar'][$i] = 0;
+							$this->stats[$current_date][$source]['polar'][$i] = 0;
 						}
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
 					} else {
@@ -537,11 +537,11 @@ 
 					//var_dump($this->stats);
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
-						    end($this->stats[$current_date][$source]['hist']);
-						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
+							end($this->stats[$current_date][$source]['hist']);
+							$mini = key($this->stats[$current_date][$source]['hist'])+10;
 						} else $mini = 0;
 						for ($i=$mini;$i<=$distance;$i+=10) {
-						    $this->stats[$current_date][$source]['hist'][$i] = 0;
+							$this->stats[$current_date][$source]['hist'][$i] = 0;
 						}
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
 					} else {
@@ -557,24 +557,24 @@ 
 			
 			
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
-			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
+				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 				if ($globalDebug) echo "---- Deleting Live Marine data Not updated since 2 hour...";
 				$MarineLive = new MarineLive($this->db);
 				$MarineLive->deleteLiveMarineDataNotUpdated();
 				$MarineLive->db = null;
 				//MarineLive->deleteLiveMarineData();
 				if ($globalDebug) echo " Done\n";
-			    }
-			    $this->last_delete_hourly = time();
+				}
+				$this->last_delete_hourly = time();
 			}
 			
-		    }
-		    //$ignoreImport = false;
+			}
+			//$ignoreImport = false;
 		}
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
 		if ($send) return $this->all_tracked[$id];
-	    }
+		}
+	}
 	}
-    }
 }
 ?>

require/class.MarineLive.php

Indentation +196 added lines, -196 removed lines

@@ -13,10 +13,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();
@@ -96,11 +96,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on the latest data entry
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the latest data entry
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLiveMarineData($limit = '', $sort = '', $filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -143,11 +143,11 @@ 
 	}
 
 	/**
-	* Gets Minimal Live Spotter data
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets Minimal Live Spotter data
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMinLiveMarineData($filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -177,11 +177,11 @@ 
 	}
 
 	/**
-	* Gets Minimal Live Spotter data since xx seconds
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets Minimal Live Spotter data since xx seconds
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMinLastLiveMarineData($coord = array(),$filter = array(), $limit = false)
 	{
 		global $globalDBdriver, $globalLiveInterval, $globalMap3DMarinesLimit, $globalArchive;
@@ -252,11 +252,11 @@ 
 	}
 
 	/**
-	* Gets number of latest data entry
-	*
-	* @return String number of entry
-	*
-	*/
+	 * Gets number of latest data entry
+	 *
+	 * @return String number of entry
+	 *
+	 */
 	public function getLiveMarineCount($filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -281,11 +281,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on the latest data entry and coord
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the latest data entry and coord
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLiveMarineDatabyCoord($coord, $filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -309,11 +309,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on the latest data entry and coord
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the latest data entry and coord
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMinLiveMarineDatabyCoord($coord, $filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval, $globalArchive;
@@ -382,11 +382,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on a user's latitude and longitude
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on a user's latitude and longitude
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLatestMarineForLayar($lat, $lng, $radius, $interval)
 	{
 		$Marine = new Marine($this->db);
@@ -399,75 +399,75 @@ 
 		if ($lng != '')
 		{
 			if (!is_numeric($lng))
-                        {
-                                return false;
-                        }
-                }
-
-                if ($radius != '')
-                {
-                        if (!is_numeric($radius))
-                        {
-                                return false;
-                        }
-                }
+						{
+								return false;
+						}
+				}
+
+				if ($radius != '')
+				{
+						if (!is_numeric($radius))
+						{
+								return false;
+						}
+				}
 		$additional_query = '';
 		if ($interval != '')
-                {
-                        if (!is_string($interval))
-                        {
-                                //$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date ';
-			        return false;
-                        } else {
-                if ($interval == '1m')
-                {
-                    $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date ';
-                } else if ($interval == '15m'){
-                    $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= marine_live.date ';
-                } 
-            }
-                } else {
-         $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date ';   
-        }
-
-                $query  = "SELECT marine_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM marine_live 
+				{
+						if (!is_string($interval))
+						{
+								//$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date ';
+					return false;
+						} else {
+				if ($interval == '1m')
+				{
+					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date ';
+				} else if ($interval == '15m'){
+					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= marine_live.date ';
+				} 
+			}
+				} else {
+		 $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date ';   
+		}
+
+				$query  = "SELECT marine_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM marine_live 
                    WHERE marine_live.latitude <> '' 
                                    AND marine_live.longitude <> '' 
                    ".$additional_query."
                    HAVING distance < :radius  
                                    ORDER BY distance";
 
-                $spotter_array = $Marine->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius));
+				$spotter_array = $Marine->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius));
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
     
-        /**
-	* Gets all the spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getLastLiveMarineDataByIdent($ident)
 	{
 		$Marine = new Marine($this->db);
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
+				$query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
 
 		$spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident),'',true);
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets all the spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getDateLiveMarineDataByIdent($ident,$date)
 	{
 		$Marine = new Marine($this->db);
@@ -480,11 +480,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on a particular MMSI
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on a particular MMSI
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getDateLiveMarineDataByMMSI($mmsi,$date)
 	{
 		$Marine = new Marine($this->db);
@@ -496,51 +496,51 @@ 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets last spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets last spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getLastLiveMarineDataById($id)
 	{
 		$Marine = new Marine($this->db);
 		date_default_timezone_set('UTC');
 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
+				$query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
 
 		$spotter_array = $Marine->getDataFromDB($query,array(':id' => $id),'',true);
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets last spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets last spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getDateLiveMarineDataById($id,$date)
 	{
 		$Marine = new Marine($this->db);
 		date_default_timezone_set('UTC');
 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
-                $date = date('c',$date);
+				$query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
+				$date = date('c',$date);
 		$spotter_array = $Marine->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true);
 
 		return $spotter_array;
 	}
 
 
-        /**
-	* Gets all the spotter information based on a particular id
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular id
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getAllLiveMarineDataById($id,$liveinterval = false)
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -568,18 +568,18 @@ 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets all the spotter information based on a particular ident
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular ident
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getAllLiveMarineDataByIdent($ident)
 	{
 		date_default_timezone_set('UTC');
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		$query  = self::$global_query.' WHERE marine_live.ident = :ident';
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
@@ -593,23 +593,23 @@ 
 
 
 	/**
-	* Deletes all info in the table
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveMarineData()
 	{
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			//$query  = "DELETE FROM marine_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE) >= marine_live.date";
 			$query  = 'DELETE FROM marine_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 9 HOUR) >= marine_live.date';
-            		//$query  = "DELETE FROM marine_live WHERE marine_live.id IN (SELECT marine_live.id FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= marine_live.date)";
+					//$query  = "DELETE FROM marine_live WHERE marine_live.id IN (SELECT marine_live.id FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= marine_live.date)";
 		} else {
 			$query  = "DELETE FROM marine_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= marine_live.date";
 		}
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute();
@@ -621,18 +621,18 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for aircraft not seen since 2 HOUR
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for aircraft not seen since 2 HOUR
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveMarineDataNotUpdated()
 	{
 		global $globalDBdriver, $globalDebug;
 		if ($globalDBdriver == 'mysql') {
 			//$query = 'SELECT fammarine_id FROM marine_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) >= marine_live.date AND marine_live.fammarine_id NOT IN (SELECT fammarine_id FROM marine_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) < marine_live.date) LIMIT 800 OFFSET 0';
-    			$query = "SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 1200 OFFSET 0";
-    			try {
+				$query = "SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 1200 OFFSET 0";
+				try {
 				
 				$sth = $this->db->prepare($query);
 				$sth->execute();
@@ -640,8 +640,8 @@ 
 				return "error";
 			}
 			$query_delete = 'DELETE FROM marine_live WHERE fammarine_id IN (';
-                        $i = 0;
-                        $j =0;
+						$i = 0;
+						$j =0;
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			foreach($all as $row)
 			{
@@ -649,20 +649,20 @@ 
 				$j++;
 				if ($j == 30) {
 					if ($globalDebug) echo ".";
-				    	try {
+						try {
 						
 						$sth = $this->db->prepare(substr($query_delete,0,-1).")");
 						$sth->execute();
 					} catch(PDOException $e) {
 						return "error";
 					}
-                                	$query_delete = 'DELETE FROM marine_live WHERE fammarine_id IN (';
-                                	$j = 0;
+									$query_delete = 'DELETE FROM marine_live WHERE fammarine_id IN (';
+									$j = 0;
 				}
 				$query_delete .= "'".$row['fammarine_id']."',";
 			}
 			if ($i > 0) {
-    				try {
+					try {
 					
 					$sth = $this->db->prepare(substr($query_delete,0,-1).")");
 					$sth->execute();
@@ -673,9 +673,9 @@ 
 			return "success";
 		} elseif ($globalDBdriver == 'pgsql') {
 			//$query = "SELECT fammarine_id FROM marine_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= marine_live.date AND marine_live.fammarine_id NOT IN (SELECT fammarine_id FROM marine_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' < marine_live.date) LIMIT 800 OFFSET 0";
-    			//$query = "SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0";
-    			$query = "DELETE FROM marine_live WHERE fammarine_id IN (SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0)";
-    			try {
+				//$query = "SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0";
+				$query = "DELETE FROM marine_live WHERE fammarine_id IN (SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0)";
+				try {
 				
 				$sth = $this->db->prepare($query);
 				$sth->execute();
@@ -719,17 +719,17 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for an ident
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for an ident
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveMarineDataByIdent($ident)
 	{
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		$query  = 'DELETE FROM marine_live WHERE ident = :ident';
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
@@ -741,17 +741,17 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for an id
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for an id
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveMarineDataById($id)
 	{
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
 		$query  = 'DELETE FROM marine_live WHERE fammarine_id = :id';
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':id' => $id));
@@ -764,11 +764,11 @@ 
 
 
 	/**
-	* Gets the marine race
-	*
-	* @return String the ident
-	*
-	*/
+	 * Gets the marine race
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function getAllRaces()
 	{
 		$query  = 'SELECT DISTINCT marine_live.race_id, marine_live.race_name FROM marine_live ORDER BY marine_live.race_name';
@@ -779,11 +779,11 @@ 
 	}
 
 	/**
-	* Gets the aircraft ident within the last hour
-	*
-	* @return String the ident
-	*
-	*/
+	 * Gets the aircraft ident within the last hour
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function getIdentFromLastHour($ident)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -809,14 +809,14 @@ 
 			$ident_result = $row['ident'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Check recent aircraft
-	*
-	* @return String the ident
-	*
-	*/
+	 * Check recent aircraft
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function checkIdentRecent($ident)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -842,14 +842,14 @@ 
 			$ident_result = $row['fammarine_id'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Check recent aircraft by id
-	*
-	* @return String the ident
-	*
-	*/
+	 * Check recent aircraft by id
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function checkIdRecent($id)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -875,14 +875,14 @@ 
 			$ident_result = $row['fammarine_id'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Check recent aircraft by mmsi
-	*
-	* @return String the ident
-	*
-	*/
+	 * Check recent aircraft by mmsi
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function checkMMSIRecent($mmsi)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -908,19 +908,19 @@ 
 			$ident_result = $row['fammarine_id'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Adds a new spotter data
-	*
-	* @param String $fammarine_id the ID from flightaware
-	* @param String $ident the flight ident
-	* @param String $aircraft_icao the aircraft type
-	* @param String $departure_airport_icao the departure airport
-	* @param String $arrival_airport_icao the arrival airport
-	* @return String success or false
-	*
-	*/
+	 * Adds a new spotter data
+	 *
+	 * @param String $fammarine_id the ID from flightaware
+	 * @param String $ident the flight ident
+	 * @param String $aircraft_icao the aircraft type
+	 * @param String $departure_airport_icao the departure airport
+	 * @param String $arrival_airport_icao the arrival airport
+	 * @return String success or false
+	 *
+	 */
 	public function addLiveMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $mmsi = '',$type = '',$typeid = '',$imo = '', $callsign = '',$arrival_code = '',$arrival_date = '',$status = '',$statusid = '',$noarchive = false,$format_source = '', $source_name = '', $over_country = '',$captain_id = '',$captain_name = '',$race_id = '', $race_name = '')
 	{
 		global $globalURL, $globalArchive, $globalDebug;
@@ -998,10 +998,10 @@ 
 		if ($typeid == '') $typeid = NULL;
 		if ($statusid == '') $statusid = NULL;
 
-            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
-            	if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
-            	if ($arrival_date == '') $arrival_date = NULL;
-            	$query = '';
+				if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
+				if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
+				if ($arrival_date == '') $arrival_date = NULL;
+				$query = '';
 		if ($globalArchive) {
 			if ($globalDebug) echo '-- Delete previous data -- ';
 			$query .= 'DELETE FROM marine_live WHERE fammarine_id = :fammarine_id;';

require/class.Marine.php

Indentation +227 added lines, -227 removed lines

@@ -12,10 +12,10 @@ 
 	}
 
 	/**
-	* Get SQL query part for filter used
-	* @param Array $filter the filter
-	* @return Array the SQL part
-	*/
+	 * Get SQL query part for filter used
+	 * @param Array $filter the filter
+	 * @return Array the SQL part
+	 */
 	
 	public function getFilter($filter = array(),$where = false,$and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
@@ -88,14 +88,14 @@ 
 	}
 
 	/**
-	* Executes the SQL statements to get the spotter information
-	*
-	* @param String $query the SQL query
-	* @param Array $params parameter of the query
-	* @param String $limitQuery the limit query
-	* @return Array the spotter information
-	*
-	*/
+	 * Executes the SQL statements to get the spotter information
+	 *
+	 * @param String $query the SQL query
+	 * @param Array $params parameter of the query
+	 * @param String $limitQuery the limit query
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false)
 	{
 		date_default_timezone_set('UTC');
@@ -230,11 +230,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the latest data entry
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the latest data entry
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLatestMarineData($limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -283,11 +283,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on the callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the callsign
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMarineDataByIdent($ident = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -339,11 +339,11 @@ 
 	}
 
 	/**
-	* Gets all the marine information based on the type
-	*
-	* @return Array the marine information
-	*
-	*/
+	 * Gets all the marine information based on the type
+	 *
+	 * @return Array the marine information
+	 *
+	 */
 	public function getMarineDataByType($type = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -451,12 +451,12 @@ 
 
 
 	/**
-	* Gets all source name
-	*
-	* @param String type format of source
-	* @return Array list of source name
-	*
-	*/
+	 * Gets all source name
+	 *
+	 * @param String type format of source
+	 * @return Array list of source name
+	 *
+	 */
 	public function getAllSourceName($type = '',$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -486,11 +486,11 @@ 
 
 
 	/**
-	* Gets a list of all idents/callsigns
-	*
-	* @return Array list of ident/callsign names
-	*
-	*/
+	 * Gets a list of all idents/callsigns
+	 *
+	 * @return Array list of ident/callsign names
+	 *
+	 */
 	public function getAllIdents($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -514,11 +514,11 @@ 
 	}
 
 	/**
-	* Gets all info from a mmsi
-	*
-	* @return Array ident
-	*
-	*/
+	 * Gets all info from a mmsi
+	 *
+	 * @return Array ident
+	 *
+	 */
 	public function getIdentity($mmsi)
 	{
 		$mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT);
@@ -531,9 +531,9 @@ 
 	}
 
 	/**
-	* Add identity
-	*
-	*/
+	 * Add identity
+	 *
+	 */
 	public function addIdentity($mmsi,$imo,$ident,$callsign,$type)
 	{
 		$mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT);
@@ -599,13 +599,13 @@ 
 	}
 
 	/**
-	* Update ident tracker data
-	*
-	* @param String $fammarine_id the ID
-	* @param String $ident the marine ident
-	* @return String success or false
-	*
-	*/
+	 * Update ident tracker data
+	 *
+	 * @param String $fammarine_id the ID
+	 * @param String $ident the marine ident
+	 * @return String success or false
+	 *
+	 */
 	public function updateIdentMarineData($fammarine_id = '', $ident = '',$fromsource = NULL)
 	{
 		$query = 'UPDATE marine_output SET ident = :ident WHERE fammarine_id = :fammarine_id';
@@ -620,13 +620,13 @@ 
 	}
 
 	/**
-	* Update arrival marine data
-	*
-	* @param String $fammarine_id the ID
-	* @param String $arrival_code the marine ident
-	* @return String success or false
-	*
-	*/
+	 * Update arrival marine data
+	 *
+	 * @param String $fammarine_id the ID
+	 * @param String $arrival_code the marine ident
+	 * @return String success or false
+	 *
+	 */
 	public function updateArrivalPortNameMarineData($fammarine_id = '', $arrival_code = '',$fromsource = NULL)
 	{
 		$query = 'UPDATE marine_output SET arrival_port_name = :arrival_code WHERE fammarine_id = :fammarine_id';
@@ -641,19 +641,19 @@ 
 	}
 
 	/**
-	* Update Status data
-	*
-	* @param String $fammarine_id the ID
-	* @param String $status_id the marine status id
-	* @param String $status the marine status
-	* @return String success or false
-	*
-	*/
+	 * Update Status data
+	 *
+	 * @param String $fammarine_id the ID
+	 * @param String $status_id the marine status id
+	 * @param String $status the marine status
+	 * @return String success or false
+	 *
+	 */
 	public function updateStatusMarineData($fammarine_id = '', $status_id = '',$status = '')
 	{
 
 		$query = 'UPDATE marine_output SET status = :status, status_id = :status_id WHERE fammarine_id = :fammarine_id';
-                $query_values = array(':fammarine_id' => $fammarine_id,':status' => $status,':status_id' => $status_id);
+				$query_values = array(':fammarine_id' => $fammarine_id,':status' => $status,':status_id' => $status_id);
 
 		try {
 			$sth = $this->db->prepare($query);
@@ -666,17 +666,17 @@ 
 
 	}
 	/**
-	* Update latest marine data
-	*
-	* @param String $fammarine_id the ID
-	* @param String $ident the marine ident
-	* @return String success or false
-	*
-	*/	
+	 * Update latest marine data
+	 *
+	 * @param String $fammarine_id the ID
+	 * @param String $ident the marine ident
+	 * @return String success or false
+	 *
+	 */	
 	public function updateLatestMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $groundspeed = NULL, $date = '')
 	{
 		$query = 'UPDATE marine_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_seen = :last_seen, last_ground_speed = :last_ground_speed WHERE fammarine_id = :fammarine_id';
-                $query_values = array(':fammarine_id' => $fammarine_id,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident);
+				$query_values = array(':fammarine_id' => $fammarine_id,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident);
 
 		try {
 			$sth = $this->db->prepare($query);
@@ -690,30 +690,30 @@ 
 	}
 
 	/**
-	* Adds a new spotter data
-	*
-	* @param String $fammarine_id the ID
-	* @param String $ident the marine ident
-	* @param String $departure_airport_icao the departure airport
-	* @param String $arrival_airport_icao the arrival airport
-	* @param String $latitude latitude of flight
-	* @param String $longitude latitude of flight
-	* @param String $waypoints waypoints of flight
-	* @param String $heading heading of flight
-	* @param String $groundspeed speed of flight
-	* @param String $date date of flight
-	* @param String $departure_airport_time departure time of flight
-	* @param String $arrival_airport_time arrival time of flight
-	* @param String $squawk squawk code of flight
-	* @param String $route_stop route stop of flight
-	* @param String $highlight highlight or not
-	* @param String $ModeS ModesS code of flight
-	* @param String $registration registration code of flight
-	* @param String $pilot_id pilot id of flight (for virtual airlines)
-	* @param String $pilot_name pilot name of flight (for virtual airlines)
-	* @param String $verticalrate vertival rate of flight
-	* @return String success or false
-	*/
+	 * Adds a new spotter data
+	 *
+	 * @param String $fammarine_id the ID
+	 * @param String $ident the marine ident
+	 * @param String $departure_airport_icao the departure airport
+	 * @param String $arrival_airport_icao the arrival airport
+	 * @param String $latitude latitude of flight
+	 * @param String $longitude latitude of flight
+	 * @param String $waypoints waypoints of flight
+	 * @param String $heading heading of flight
+	 * @param String $groundspeed speed of flight
+	 * @param String $date date of flight
+	 * @param String $departure_airport_time departure time of flight
+	 * @param String $arrival_airport_time arrival time of flight
+	 * @param String $squawk squawk code of flight
+	 * @param String $route_stop route stop of flight
+	 * @param String $highlight highlight or not
+	 * @param String $ModeS ModesS code of flight
+	 * @param String $registration registration code of flight
+	 * @param String $pilot_id pilot id of flight (for virtual airlines)
+	 * @param String $pilot_name pilot name of flight (for virtual airlines)
+	 * @param String $verticalrate vertival rate of flight
+	 * @return String success or false
+	 */
 	public function addMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $mmsi = '',$type = '',$typeid = '',$imo = '',$callsign = '',$arrival_code = '',$arrival_date = '',$status = '',$statusid = '',$format_source = '', $source_name = '', $captain_id = '',$captain_name = '',$race_id = '', $race_name = '')
 	{
 		global $globalURL, $globalMarineImageFetch;
@@ -832,7 +832,7 @@ 
 			$sth->execute($query_values);
 			$this->db = null;
 		} catch (PDOException $e) {
-		    return "error : ".$e->getMessage();
+			return "error : ".$e->getMessage();
 		}
 		
 		return "success";
@@ -841,11 +841,11 @@ 
 	
   
 	/**
-	* Gets the aircraft ident within the last hour
-	*
-	* @return String the ident
-	*
-	*/
+	 * Gets the aircraft ident within the last hour
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function getIdentFromLastHour($ident)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -861,11 +861,11 @@ 
 								AND marine_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
 								AND marine_output.date < now() AT TIME ZONE 'UTC'";
 			$query_data = array(':ident' => $ident);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
-    		$ident_result='';
+			$ident_result='';
 		while($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$ident_result = $row['ident'];
@@ -876,11 +876,11 @@ 
 	
 	
 	/**
-	* Gets the aircraft data from the last 20 seconds
-	*
-	* @return Array the spotter data
-	*
-	*/
+	 * Gets the aircraft data from the last 20 seconds
+	 *
+	 * @return Array the spotter data
+	 *
+	 */
 	public function getRealTimeData($q = '')
 	{
 		global $globalDBdriver;
@@ -918,11 +918,11 @@ 
 	
 
 	/**
-	* Gets all number of flight over countries
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all number of flight over countries
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 
 	public function countAllMarineOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
 	{
@@ -995,11 +995,11 @@ 
 	
 	
 	/**
-	* Gets all callsigns that have flown over
-	*
-	* @return Array the callsign list
-	*
-	*/
+	 * Gets all callsigns that have flown over
+	 *
+	 * @return Array the callsign list
+	 *
+	 */
 	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
@@ -1066,11 +1066,11 @@ 
 
 
 	/**
-	* Counts all dates
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllDates($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1116,11 +1116,11 @@ 
 	
 	
 	/**
-	* Counts all dates during the last 7 days
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates during the last 7 days
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllDatesLast7Days($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1142,7 +1142,7 @@ 
 			$query .= " GROUP BY date_name 
 								ORDER BY date_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -1162,11 +1162,11 @@ 
 	}
 
 	/**
-	* Counts all dates during the last month
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates during the last month
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllDatesLastMonth($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1188,7 +1188,7 @@ 
 			$query .= " GROUP BY date_name 
 								ORDER BY date_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -1210,11 +1210,11 @@ 
 
 
 	/**
-	* Counts all month
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonths($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1259,11 +1259,11 @@ 
 	
 
 	/**
-	* Counts all dates during the last year
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates during the last year
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllMonthsLastYear($filters)
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1285,7 +1285,7 @@ 
 			$query .= " GROUP BY year_name, month_name
 								ORDER BY year_name, month_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -1308,11 +1308,11 @@ 
 	
 	
 	/**
-	* Counts all hours
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHours($orderby,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1375,11 +1375,11 @@ 
 	
 	
 	/**
-	* Counts all hours by date
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by date
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByDate($date, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1423,11 +1423,11 @@ 
 	
 	
 	/**
-	* Counts all hours by a ident/callsign
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by a ident/callsign
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByIdent($ident, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1472,11 +1472,11 @@ 
 	
 	
 	/**
-	* Counts all vessels
-	*
-	* @return Integer the number of vessels
-	*
-	*/
+	 * Counts all vessels
+	 *
+	 * @return Integer the number of vessels
+	 *
+	 */
 	public function countOverallMarine($filters = array(),$year = '',$month = '')
 	{
 		global $globalDBdriver;
@@ -1511,11 +1511,11 @@ 
 	}
 	
 	/**
-	* Counts all vessel type
-	*
-	* @return Integer the number of vessels
-	*
-	*/
+	 * Counts all vessel type
+	 *
+	 * @return Integer the number of vessels
+	 *
+	 */
 	public function countOverallMarineTypes($filters = array(),$year = '',$month = '')
 	{
 		global $globalDBdriver;
@@ -1550,11 +1550,11 @@ 
 	
   
 	/**
-	* Counts all hours of today
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours of today
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursFromToday($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1594,12 +1594,12 @@ 
 	}
     
     
-     /**
-	* Gets the Barrie Spotter ID based on the FlightAware ID
-	*
-	* @return Integer the Barrie Spotter ID
+	 /**
+	  * Gets the Barrie Spotter ID based on the FlightAware ID
+	  *
+	  * @return Integer the Barrie Spotter ID
 q	*
-	*/
+	  */
 	public function getMarineIDBasedOnFamMarineID($fammarine_id)
 	{
 		$fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING);
@@ -1620,13 +1620,13 @@ 
   
  
 	/**
-	* Parses a date string
-	*
-	* @param String $dateString the date string
-	* @param String $timezone the timezone of a user
-	* @return Array the time information
-	*
-	*/
+	 * Parses a date string
+	 *
+	 * @param String $dateString the date string
+	 * @param String $timezone the timezone of a user
+	 * @return Array the time information
+	 *
+	 */
 	public function parseDateString($dateString, $timezone = '')
 	{
 		$time_array = array();
@@ -1659,12 +1659,12 @@ 
 	}
 	
 	/**
-	* Parses the direction degrees to working
-	*
-	* @param Float $direction the direction in degrees
-	* @return Array the direction information
-	*
-	*/
+	 * Parses the direction degrees to working
+	 *
+	 * @param Float $direction the direction in degrees
+	 * @return Array the direction information
+	 *
+	 */
 	public function parseDirection($direction = 0)
 	{
 		if ($direction == '') $direction = 0;
@@ -1743,12 +1743,12 @@ 
 	
 	
 	/**
-	* Gets Country from latitude/longitude
-	*
-	* @param Float $latitude latitute of the flight
-	* @param Float $longitude longitute of the flight
-	* @return String the countrie
-	*/
+	 * Gets Country from latitude/longitude
+	 *
+	 * @param Float $latitude latitute of the flight
+	 * @param Float $longitude longitute of the flight
+	 * @return String the countrie
+	 */
 	public function getCountryFromLatitudeLongitude($latitude,$longitude)
 	{
 		global $globalDBdriver, $globalDebug;
@@ -1785,11 +1785,11 @@ 
 	}
 
 	/**
-	* Gets Country from iso2
-	*
-	* @param String $iso2 ISO2 country code
-	* @return String the countrie
-	*/
+	 * Gets Country from iso2
+	 *
+	 * @param String $iso2 ISO2 country code
+	 * @return String the countrie
+	 */
 	public function getCountryFromISO2($iso2)
 	{
 		global $globalDBdriver, $globalDebug;
@@ -1818,12 +1818,12 @@ 
 
 	
 	/**
-	* Gets the short url from bit.ly
-	*
-	* @param String $url the full url
-	* @return String the bit.ly url
-	*
-	*/
+	 * Gets the short url from bit.ly
+	 *
+	 * @param String $url the full url
+	 * @return String the bit.ly url
+	 *
+	 */
 	public function getBitlyURL($url)
 	{
 		global $globalBitlyAccessToken;
@@ -1850,11 +1850,11 @@ 
 
 	
 	/**
-	* Gets all vessels types that have flown over
-	*
-	* @return Array the vessel type list
-	*
-	*/
+	 * Gets all vessels types that have flown over
+	 *
+	 * @return Array the vessel type list
+	 *
+	 */
 	public function countAllMarineTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
@@ -1920,11 +1920,11 @@ 
 	}
 
 	/**
-	* Gets all the tracker information
-	*
-	* @return Array the tracker information
-	*
-	*/
+	 * Gets all the tracker information
+	 *
+	 * @return Array the tracker information
+	 *
+	 */
 	public function searchMarineData($q = '', $callsign = '',$mmsi = '', $imo = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '',$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;

index.php

Indentation +106 added lines, -106 removed lines

@@ -50,7 +50,7 @@ 
     <?php }; if (isset($globalSatellite) && $globalSatellite) { ?><td><div id="ibxsatellite"><h4><?php echo _("Satellites Displayed"); ?></h4><br /><i class="fa fa-spinner fa-pulse fa-fw"></i></div></td><?php } ?>
 </tr></table></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<?php if (isset($tsk)) print '?tsk='.$tsk; ?>"></script>
 <?php
@@ -74,7 +74,7 @@ 
 <script src="<?php echo $globalURL; ?>/js/map-marine.3d.js.php"></script>
 <?php
 	}
-    }
+	}
 ?>
 
 <div id="sidebar" class="sidebar collapsed">
@@ -85,13 +85,13 @@ 
 	<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') || (isset($globalBeta) && $globalBeta === TRUE)) {
+	//if ((isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') || (isset($globalBeta) && $globalBeta === TRUE)) {
 	if (isset($globalArchive) && $globalArchive == TRUE && (!isset($globalAircraft) || $globalAircraft === 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>
@@ -105,7 +105,7 @@ 
 ?>
 
 <?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>
@@ -115,7 +115,7 @@ 
 	<li><a href="" onclick="show2D(); return false;" role="tab" title="2D"><b>2D</b></a></li>
 <?php
 	}
-    }
+	}
 ?>
     </ul>
 
@@ -264,15 +264,15 @@ 
 		    </div>
 		</li>
 		<?php
-		    if (isset($globalDemo) && $globalDemo) {
+			if (isset($globalDemo) && $globalDemo) {
 		?>
 		<li><button type="button" class="btn btn-primary disabled"><?php echo _("Show archive"); ?></button> Disabled in Demo mode</li>
 		<?php
-		    } else {
+			} else {
 		?>
 		<li><button type="button" onclick="addarchive(begindate,enddate);" class="btn btn-primary"><?php echo _("Show archive"); ?></button></li>
 		<?php
-		    }
+			}
 		?>
 	    </ul>
 	    <ul>
@@ -291,83 +291,83 @@ 
 				if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
 					if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider;
 					else $MapType = $_COOKIE['MapType'];
-			    ?>
+				?>
 			<select  class="selectpicker" onchange="mapType(this);">
 			    <?php
 				} else {
 					if (!isset($_COOKIE['MapType3D']) || $_COOKIE['MapType3D'] == '') $MapType = $globalMapProvider;
 					else $MapType = $_COOKIE['MapType3D'];
-			    ?>
+				?>
 			<select  class="selectpicker" onchange="mapType3D(this);">
 			    <?php
 				}
-			    ?>
+				?>
 			    <?php
 				if (isset($globalMapOffline) && $globalMapOffline === TRUE) {
-			    ?>
+				?>
 			    <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth (local)</option>
 			    <?php
 				} else {
-				    if (file_exists(dirname(__FILE__).'/js/Cesium/Assets/Textures/NaturalEarthII/tilemapresource.xml')) {
-			    ?>
+					if (file_exists(dirname(__FILE__).'/js/Cesium/Assets/Textures/NaturalEarthII/tilemapresource.xml')) {
+				?>
 			    <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth (local)</option>
 			    <?php
-				    }
-			    ?>
+					}
+				?>
 			    <option value="ArcGIS-Streetmap"<?php if ($MapType == 'ArcGIS-Streetmap') print ' selected'; ?>>ArcGIS Streetmap</option>
 			    <option value="ArcGIS-Satellite"<?php if ($MapType == 'ArcGIS-Satellite') print ' selected'; ?>>ArcGIS Satellite</option>
 			    <option value="ArcGIS-Satellite"<?php if ($MapType == 'ArcGIS-Ocean') print ' selected'; ?>>ArcGIS Ocean</option>
 			    <?php
-				    if (isset($globalBingMapKey) && $globalBingMapKey != '') {
-			    ?>
+					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 != '') {
-			    ?>
+				?>
 			    <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 != '') {
-			    ?>
+				?>
 			    <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 != '') {
-			    ?>
+				?>
 			    <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>
 			    <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth</option>
 			    <?php
-				    }
-			    ?>
+					}
+				?>
 			    <option value="NatGeo-Street"<?php if ($MapType == 'NatGeo-Street') print ' selected'; ?>>National Geographic Street</option>
 			    <?php
-				    if (isset($globalMapboxToken) && $globalMapboxToken != '') {
+					if (isset($globalMapboxToken) && $globalMapboxToken != '') {
 					if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default';
 					else $MapBoxId = $_COOKIE['MapTypeId'];
-			    ?>
+				?>
 			    <option value="MapboxGL"<?php if ($MapType == 'MapboxGL') print ' selected'; ?>>Mapbox GL</option>
 			    <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>
@@ -382,17 +382,17 @@ 
 			    <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="OpenSeaMap"<?php if ($MapType == 'OpenSeaMap') print ' selected'; ?>>OpenSeaMap</option>-->
 			    <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option>
 			    <?php
 				}
-			    ?>
+				?>
 			</select>
 		    </li>
 <?php
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d' && (!isset($globalMapOffline) || $globalMapOffline === FALSE)) {
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d' && (!isset($globalMapOffline) || $globalMapOffline === FALSE)) {
 ?>
 		    <li><?php echo _("Type of Terrain:"); ?>
 			<select  class="selectpicker" onchange="terrainType(this);">
@@ -403,18 +403,18 @@ 
 			</select>
 		    </li>
 <?php
-    }
+	}
 ?>
 
 <?php
-    if (isset($globalMap3D) && $globalMap3D) {
+	if (isset($globalMap3D) && $globalMap3D) {
 ?>
 		    <li><div class="checkbox"><label><input type="checkbox" name="synchro2d3d" value="1" onclick="clickSyncMap2D3D(this)" <?php if (isset($_COOKIE['Map2D3DSync']) && $_COOKIE['Map2D3DSync'] == 'true') print 'checked'; ?> ><?php echo _("Use same type of map for 2D & 3D"); ?></label></div></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="display2dbuildings" value="1" onclick="clickDisplay2DBuildings(this)" <?php if (isset($_COOKIE['Map2DBuildings']) && $_COOKIE['Map2DBuildings'] == 'true') print 'checked'; ?> ><?php echo _("Display 2.5D buidings on map"); ?></label></div></li>
 
@@ -437,17 +437,17 @@ 
 		    <li><div class="checkbox"><label><input type="checkbox" name="satelliteestimation" value="1" onclick="clickSatelliteEstimation(this)" <?php if ((isset($_COOKIE['satelliteestimation']) && $_COOKIE['satelliteestimation'] == 'true') || (!isset($_COOKIE['satelliteestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['satelliteestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Satellites 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' || !isset($_COOKIE['displayairports'])) print 'checked'; ?> ><?php echo _("Display airports on map"); ?></label></div></li>
 		    <li><div class="checkbox"><label><input type="checkbox" name="displaygroundstation" value="1" onclick="clickDisplayGroundStation(this)" <?php if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) print 'checked'; ?> ><?php echo _("Display ground station on map"); ?></label></div></li>
 		    <li><div class="checkbox"><label><input type="checkbox" name="displayweatherstation" value="1" onclick="clickDisplayWeatherStation(this)" <?php if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) print 'checked'; ?> ><?php echo _("Display weather station on map"); ?></label></div></li>
 <?php
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d' && isset($globalMETAR) && isset($globalMETARcycle) && $globalMETAR && $globalMETARcycle) {
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d' && isset($globalMETAR) && isset($globalMETARcycle) && $globalMETAR && $globalMETARcycle) {
 ?>
 		    <li><div class="checkbox"><label><input type="checkbox" name="displayweather" value="1" onclick="clickDisplayWeather(this)" <?php if ((isset($_COOKIE['show_Weather']) && $_COOKIE['show_Weather'] == 'true') || (!isset($_COOKIE['show_Weather']) && (isset($globalMapWeather) && $globalMapWeather === TRUE))) print 'checked'; ?> ><?php echo _("Display weather on 3D map"); ?></label></div></li>
 <?php
-    }
+	}
 ?>
 		    <li><div class="checkbox"><label><input type="checkbox" name="displaylightning" value="1" onclick="clickDisplayLightning(this)" <?php if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) print 'checked'; ?> ><?php echo _("Display lightning on map"); ?></label></div></li>
 <?php
@@ -463,82 +463,82 @@ 
 	}
 ?>
 <?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>
 		    <li><div class="checkbox"><label><input type="checkbox" name="shadows" value="1" onclick="clickShadows(this)" <?php if ((!isset($_COOKIE['map3dnoshadows']) && (!isset($globalMap3DShadows) || $globalMap3DShadows)) || (isset($_COOKIE['map3dnoshadows']) && $_COOKIE['map3dnoshadows'] == 'false')) print 'checked'; ?> ><?php echo _("Use shadows"); ?></label></div></li>
 		    <li><div class="checkbox"><label><input type="checkbox" name="one3dmodel" value="1" onclick="useOne3Dmodel(this)" <?php if ((isset($_COOKIE['one3dmodel']) && $_COOKIE['one3dmodel'] == 'true') || (!isset($_COOKIE['one3dmodel']) && isset($globalMap3DOneModel) && $globalMap3DOneModel)) print 'checked'; ?> ><?php echo _("Use same 3D model for all aircraft (use fewer resources)"); ?></label></div></li>
 		    <li><div class="checkbox"><label><input type="checkbox" name="updaterealtime" value="1" onclick="clickUpdateRealtime(this)" <?php if ((isset($_COOKIE['updaterealtime']) && $_COOKIE['updaterealtime'] == 'true') || !isset($_COOKIE['updaterealtime'])) print 'checked'; ?> ><?php echo _("Display realtime data in infobox"); ?></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 (!isset($globalAircraft) || $globalAircraft === TRUE) {
-		    	    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="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) print $_COOKIE['MarineIconColor']; elseif (isset($globalMarineIconColor)) print $globalMarineIconColor; else print '1a3151'; ?>">
 		    </li>
 		    <?php
-			    }
-		        }
-		    ?>
+				}
+				}
+			?>
 		    <?php
 			if (isset($globalTracker) && $globalTracker === TRUE) {
-			    if (extension_loaded('gd') && function_exists('gd_info')) {
-		    ?>
+				if (extension_loaded('gd') && function_exists('gd_info')) {
+			?>
 		    <li><?php echo _("Tracker icon color:"); ?>
 			<input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) print $_COOKIE['TrackerIconColor']; elseif (isset($globalTrackerIconColor)) print $globalTrackerIconColor; else print '1a3151'; ?>">
 		    </li>
 		    <?php
-			    }
-		        }
-		    ?>
+				}
+				}
+			?>
 		    <?php
 			if (!isset($globalAircraft) || $globalAircraft === TRUE) {
-		    ?>
+			?>
 		    <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'; ?>">
@@ -547,9 +547,9 @@ 
 		    </li>
 		    <?php
 			}
-		    ?>
+			?>
 <?php
-    } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') {
+	} elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') {
 ?>
 		    <li><?php echo _("Set scaling factor for rendering resolution:"); ?>
 			<div class="range">
@@ -587,7 +587,7 @@ 
 		    </li>
 <?php
 	}
-    }
+	}
 ?>
 		    <li><?php echo _("Distance unit:"); ?>
 			<select class="selectpicker" onchange="unitdistance(this);">
@@ -620,19 +620,19 @@ 
 		    <ul>
 		    <?php
 			if (!isset($globalAircraft) || $globalAircraft) {
-		    ?>
+			?>
 		    <?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 } ?>
@@ -641,7 +641,7 @@ 
 			<?php } ?>
 		    <?php
 			}
-		    ?>
+			?>
 		    <li><?php echo _("Display airlines:"); ?>
 		    <br/>
 			<select class="selectpicker" multiple onchange="airlines(this);" id="display_airlines">
@@ -661,14 +661,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">
@@ -682,18 +682,18 @@ 
 						echo '<option value="'.$alliance_name.'">'.$alliance_name.'</option>';
 					}
 				}
-			    ?>
+				?>
 			</select>
 		    </li>
 		    <?php
 			}
-		    ?>
+			?>
 		    <?php
 			}
-		    ?>
+			?>
 		    <?php
 			if (isset($globalAPRS) && $globalAPRS) {
-		    ?>
+			?>
 		    <li><?php echo _("Display APRS sources name:"); ?>
 			<select class="selectpicker" multiple onchange="sources(this);">
 			    <?php
@@ -717,18 +717,18 @@ 
 						echo '<option value="'.$src['name'].'">'.$src['name'].'</option>';
 					}
 				}
-			    ?>
+				?>
 			</select>
 		    </li>
 		    <?php
 			}
-		    ?>
+			?>
 		    <?php
 			if (!isset($globalAircraft) || $globalAircraft) {
-		    ?>
+			?>
 		    <?php
-			    if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) {
-		    ?>
+				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>
@@ -738,14 +738,14 @@ 
 			</select>
 		    </li>
 		    <?php
-			    }
-		    ?>
+				}
+			?>
 		    <?php
 			}
-		    ?>
+			?>
 		    <?php
 			if (isset($globalMarine) && $globalMarine) {
-		    ?>
+			?>
 		    <li>
 			<?php echo _("Display vessels with MMSI:"); ?>
 			<input type="text" name="mmsifilter" onchange="mmsifilter();" id="mmsifilter" value="<?php if (isset($_COOKIE['filter_mmsi'])) print $_COOKIE['filter_mmsi']; ?>" />
@@ -764,7 +764,7 @@ 
 						foreach ($races as $race) {
 							print '<option value="'.$race['race_id'].'">'.$race['race_name'].'</option>';
 						}
-			    ?>
+				?>
 			</select>
 		    </li>
 
@@ -772,7 +772,7 @@ 
 					}
 				}
 			}
-		    ?>
+			?>
 		    <li>
 			<?php echo _("Display with ident:"); ?>
 			<input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" />
@@ -785,7 +785,7 @@ 
 	    </form>
     	</div>
 <?php
-    if (isset($globalSatellite) && $globalSatellite) {
+	if (isset($globalSatellite) && $globalSatellite) {
 ?>
         <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>
@@ -825,14 +825,14 @@ 
 						print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>';
 					}
 				}
-			    ?>
+				?>
 			</select>
 		    </li>
 		</ul>
 	    </form>
 	</div>
 <?php
-    }
+	}
 ?>
     </div>
 </div>