Ysurac / FlightAirMap

scripts/daemon-spotter.php

Indentation +1218 added lines, -1218 removed lines

@@ -15,65 +15,65 @@ 
 require_once(dirname(__FILE__).'/../require/class.Connection.php');
 require_once(dirname(__FILE__).'/../require/class.Common.php');
 if (isset($globalTracker) && $globalTracker) {
-    require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
+	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;
 
 if ($globalInstalled === FALSE) {
-    echo "This script MUST be run after install script. Use your web browser to run install/index.php";
-    sleep(5);
-    die();
+	echo "This script MUST be run after install script. Use your web browser to run install/index.php";
+	sleep(5);
+	die();
 }
 
 
 // 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. Use your web browser to run install/index.php";
-    exit();
+	echo "You MUST update to latest schema. Use your web browser to 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;
@@ -112,8 +112,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();
@@ -123,14 +123,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();
@@ -143,12 +143,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
@@ -158,47 +158,47 @@ 
 $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'];
 	$udp = false;
 	$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';
@@ -210,131 +210,131 @@ 
         	    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') || (isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailawayfull') || (isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'acarsjson')) {
-    		if ($globalSources[$id]['format'] == 'aisnmeahttp' || $globalSources[$id]['format'] == 'acarsjson') {
-    		    $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 && isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailawayfull') echo "Connect to ".$globalSources[$id]['format']." source (sailawayfull)...\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') || (isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailawayfull') || (isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'acarsjson')) {
+			if ($globalSources[$id]['format'] == 'aisnmeahttp' || $globalSources[$id]['format'] == 'acarsjson') {
+				$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 && isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailawayfull') echo "Connect to ".$globalSources[$id]['format']." source (sailawayfull)...\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'] != 'acarsjsonudp' && $globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
-        	$s = $Common->create_socket($hostn,$port, $errno, $errstr);
-    	    } else {
-    		$udp = true;
-        	$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'] != 'acarsjsonudp' && $globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
+			$s = $Common->create_socket($hostn,$port, $errno, $errstr);
+			} else {
+			$udp = true;
+			$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 && $udp) echo 'Listening in UDP from '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
 		elseif ($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;
 
@@ -357,9 +357,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
@@ -368,21 +368,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) {
@@ -423,173 +423,173 @@ 
 
 // 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();
-    } elseif ($value['format'] === 'radarcapejson' &&
-            (
-                (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 != '') {
-                $all_data = json_decode($buffer,true);
-                foreach ($all_data as $line) {
-                    $data = array();
-                    $data['datetime'] = date('Y-m-d H:i:s',$line['uti']);
-                    $data['hex'] = $line['hex']; // hex
-                    $data['ident'] = $line['fli']; // ident
-                    $data['altitude'] = $line['alt']; // altitude
-                    $data['speed'] = $line['spd']; // speed
-                    $data['heading'] = $line['trk']; // heading
-                    $data['latitude'] = $line['lat']; // lat
-                    $data['longitude'] = $line['lon']; // long
-                    $data['verticalrate'] = $line['vrt']; // vertical rate
-                    $data['squawk'] = $line['squ']; // squawk
-                    $data['ground'] = $line['gda']; // ground
-                    $data['registration'] = $line['reg'];
-                    //$data['emergency'] = ''; // emergency
-                    $data['datetime'] = date('Y-m-d H:i:s');
-                    $data['format_source'] = 'radarcapejson';
-                    $data['id_source'] = $id_source;
-                    if (isset($value['name']) && $value['name'] != '') {
-                        if (isset($line['src']) && !$line['src'] == 'M') $data['source_name'] = $value['name'].'_MLAT';
-                        else $data['source_name'] = $value['name'];
-                    } elseif (isset($line['src']) && $line['src'] == 'M') $data['source_name'] = 'MLAT';
-                    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-                    if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
+		//$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'] === 'radarcapejson' &&
+			(
+				(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 != '') {
+				$all_data = json_decode($buffer,true);
+				foreach ($all_data as $line) {
+					$data = array();
+					$data['datetime'] = date('Y-m-d H:i:s',$line['uti']);
+					$data['hex'] = $line['hex']; // hex
+					$data['ident'] = $line['fli']; // ident
+					$data['altitude'] = $line['alt']; // altitude
+					$data['speed'] = $line['spd']; // speed
+					$data['heading'] = $line['trk']; // heading
+					$data['latitude'] = $line['lat']; // lat
+					$data['longitude'] = $line['lon']; // long
+					$data['verticalrate'] = $line['vrt']; // vertical rate
+					$data['squawk'] = $line['squ']; // squawk
+					$data['ground'] = $line['gda']; // ground
+					$data['registration'] = $line['reg'];
+					//$data['emergency'] = ''; // emergency
+					$data['datetime'] = date('Y-m-d H:i:s');
+					$data['format_source'] = 'radarcapejson';
+					$data['id_source'] = $id_source;
+					if (isset($value['name']) && $value['name'] != '') {
+						if (isset($line['src']) && !$line['src'] == 'M') $data['source_name'] = $value['name'].'_MLAT';
+						else $data['source_name'] = $value['name'];
+					} elseif (isset($line['src']) && $line['src'] == 'M') $data['source_name'] = 'MLAT';
+					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();
+					$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'];
@@ -607,117 +607,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'];
@@ -737,75 +737,75 @@ 
 			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'] === 'sailawayfull' && 
-	    (
+		(
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > 5*60))
-	    )
+		)
 	) {
-	    if (isset($globalSailaway['email']) && $globalSailaway['email'] != '' && isset($globalSailaway['password']) && $globalSailaway['password'] != '') {
+		if (isset($globalSailaway['email']) && $globalSailaway['email'] != '' && isset($globalSailaway['password']) && $globalSailaway['password'] != '') {
 		$authsailaway = $Common->getData('http://backend.sailaway.world/cgi-bin/sailaway/weblogin.pl','post',array('submitlogin' => 'Login','email' => $globalSailaway['email'],'pwd' => $globalSailaway['password'], 'page' => 'http://sailaway.world/cgi-bin/sailaway/missions.pl'),'','','','','',false,false,true);
 		//echo $authsailaway;
 		preg_match_all('/^Set-Cookie:\s*([^;]*)/mi', $authsailaway, $setcookie);
 		if (isset($setcookie[1][0])) {
-		    $sailaway_authcookie = $setcookie[1][0];
+			$sailaway_authcookie = $setcookie[1][0];
+		}
 		}
-	    }
 
-	    if ($globalDebug) echo '! Download... ';
-	    for ($i =0; $i <= 1; $i++) {
+		if ($globalDebug) echo '! Download... ';
+		for ($i =0; $i <= 1; $i++) {
 		if ($globalDebug) echo 'Racetype: '.$i.' ';
 		$buffer = $Common->getData('http://backend.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 'done'."\n";
+		if ($buffer != '') {
 		$all_data = json_decode($buffer,true);
 		if (isset($all_data['missions'])) {
 			foreach ($all_data['missions'] as $mission) {
@@ -826,19 +826,19 @@ 
 					//print_r($race_data);
 					unset($racebuffer);
 					if (isset($race_data['mission'])) {
-					    $datar = array();
-					    $datar['id'] = $mission['misnr'];
-					    $datar['desc'] = $race_data['mission']['misdescr'];
-					    $datar['creator'] = trim(preg_replace('/[\x00-\x1F\x7F-\xFF]/', '',$Common->remove_accents($race_data['mission']['usrname'])));
-					    $datar['name'] = trim(preg_replace('/[\x00-\x1F\x7F-\xFF]/', '',$Common->remove_accents($race_data['mission']['mistitle'])));
-					    $datar['startdate'] = $race_data['mission']['misstartdatetime'];
-					    $markers = array();
-					    foreach ($race_data['mission']['course'] as $course) {
+						$datar = array();
+						$datar['id'] = $mission['misnr'];
+						$datar['desc'] = $race_data['mission']['misdescr'];
+						$datar['creator'] = trim(preg_replace('/[\x00-\x1F\x7F-\xFF]/', '',$Common->remove_accents($race_data['mission']['usrname'])));
+						$datar['name'] = trim(preg_replace('/[\x00-\x1F\x7F-\xFF]/', '',$Common->remove_accents($race_data['mission']['mistitle'])));
+						$datar['startdate'] = $race_data['mission']['misstartdatetime'];
+						$markers = array();
+						foreach ($race_data['mission']['course'] as $course) {
 						$markers[] = array('lat' => $course['miclat'],'lon' => $course['miclon'],'name' => $course['micname'],'type' => $course['mictype']);
-					    }
-					    $datar['markers'] = json_encode($markers);
-					    //print_r($datar);
-					    $MI->race_add($datar);
+						}
+						$datar['markers'] = json_encode($markers);
+						//print_r($datar);
+						$MI->race_add($datar);
 					}
 				}
 				if ($bufferm != '') {
@@ -903,16 +903,16 @@ 
 				sleep(30);
 			}
 		}
-	    }
-	    sleep(5);
-	    }
-    	    $last_exec[$id]['last'] = time();
+		}
+		sleep(5);
+		}
+			$last_exec[$id]['last'] = time();
 	} elseif ($value['format'] === 'sailaway' && 
-	    (
+		(
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > 5*60))
-	    )
+		)
 	) {
-	    /*
+		/*
 	    if (isset($globalSailaway['email']) && $globalSailaway['email'] != '' && isset($globalSailaway['password']) && $globalSailaway['password'] != '') {
 		$authsailaway = $Common->getData('http://backend.sailaway.world/cgi-bin/sailaway/weblogin.pl','post',array('submitlogin' => 'Login','email' => $globalSailaway['email'],'pwd' => $globalSailaway['password'], 'page' => 'http://sailaway.world/cgi-bin/sailaway/missions.pl'),'','','','','',false,false,true);
 		//echo $authsailaway;
@@ -923,17 +923,17 @@ 
 		}
 	    }
 	    */
-	    if (!isset($globalSailaway['key']) || $globalSailaway['key'] == '') {
+		if (!isset($globalSailaway['key']) || $globalSailaway['key'] == '') {
 		echo 'Sailaway API key MUST be defined';
 		exit(0);
-	    }
-	    if ($globalDebug) echo '! Download... ';
-	    $buffer = $Common->getData('http://backend.sailaway.world/cgi-bin/sailaway/TrackAllBoats.pl?key='.$globalSailaway['key'],'get','','','','',30);
-	    if ($buffer != '') {
+		}
+		if ($globalDebug) echo '! Download... ';
+		$buffer = $Common->getData('http://backend.sailaway.world/cgi-bin/sailaway/TrackAllBoats.pl?key='.$globalSailaway['key'],'get','','','','',30);
+		if ($buffer != '') {
 		$data = json_decode($buffer,true);
 		//print_r($data);
 		if (isset($data['boats'])) {
-		    foreach ($data['boats'] as $sail) {
+			foreach ($data['boats'] as $sail) {
 			$data = array();
 			$data['id'] = $sail['ubtnr'];
 			$data['datetime'] = date('Y-m-d H:i:s');
@@ -953,35 +953,35 @@ 
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
 			$MI->add($data);
 			unset($data);
-		    }
+			}
 		} elseif ($globalDebug) echo 'Error in JSON parsing';
-	    } elseif ($globalDebug) echo 'Empty result !'."\n";
-    	    $last_exec[$id]['last'] = time();
+		} elseif ($globalDebug) echo 'Empty result !'."\n";
+			$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];
@@ -994,37 +994,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']);
@@ -1045,21 +1045,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();
@@ -1081,10 +1081,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();
@@ -1102,8 +1102,8 @@ 
 			}
 			unset($data);
 		}
-	    }
-	    $last_exec[$id]['last'] = time();
+		}
+		$last_exec[$id]['last'] = time();
 	/*
 	} if ($value['format'] === 'aircraftlistjson') {
 	    print_r($globalSources);
@@ -1111,17 +1111,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
@@ -1144,10 +1144,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
@@ -1167,291 +1167,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);
@@ -1466,209 +1466,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
@@ -1680,92 +1680,92 @@ 
 			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['format'] === 'acarsjson') {
-        $arr = $httpfeeds;
-        $w = $e = null;
-        if (isset($arr[$id])) {
-            $nn = stream_select($arr,$w,$e,$timeout);
-            if ($nn > 0) {
-                foreach ($httpfeeds as $feed) {
-                    $buffer = stream_get_line($feed,2000,"\n");
-                    if ($buffer === FALSE) {
-                        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 != '') {
-                            $line = json_decode($line, true);
-                            if (!empty($line)) {
-                                $ACARS->add(isset($line['text']) ? $line['text'] : '', array('registration' => str_replace('.', '', $line['tail']), 'ident' => $line['flight'], 'label' => $line['label'], 'block_id' => $line['block_id'], 'msg_no' => $line['msgno'], 'message' => (isset($line['text']) ? $line['text'] : '')));
-                                $ACARS->deleteLiveAcarsData();
-                            }
-                        }
-                    }
-                }
-            } else {
-                $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);
-                }
-            }
-        }
+		$arr = $httpfeeds;
+		$w = $e = null;
+		if (isset($arr[$id])) {
+			$nn = stream_select($arr,$w,$e,$timeout);
+			if ($nn > 0) {
+				foreach ($httpfeeds as $feed) {
+					$buffer = stream_get_line($feed,2000,"\n");
+					if ($buffer === FALSE) {
+						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 != '') {
+							$line = json_decode($line, true);
+							if (!empty($line)) {
+								$ACARS->add(isset($line['text']) ? $line['text'] : '', array('registration' => str_replace('.', '', $line['tail']), 'ident' => $line['flight'], 'label' => $line['label'], 'block_id' => $line['block_id'], 'msg_no' => $line['msgno'], 'message' => (isset($line['text']) ? $line['text'] : '')));
+								$ACARS->deleteLiveAcarsData();
+							}
+						}
+					}
+				}
+			} else {
+				$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 === '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'] === 'acarsjsonudp' || $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)) {
 				//if (!empty($data)) print_r($data);
 				$data['datetime'] = date('Y-m-d H:i:s');
 				$data['format_source'] = 'raw';
@@ -1775,39 +1775,39 @@ 
 				//if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
 				$SI->add($data);
 				unset($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
@@ -1824,47 +1824,47 @@ 
 				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 === 'acarsjsonudp') {
-			    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
-                            $line = json_decode(trim($buffer), true);
-                            if (!empty($line)) {
+				if ($globalDebug) echo 'ACARS : '.$buffer."\n";
+							$line = json_decode(trim($buffer), true);
+							if (!empty($line)) {
 				$line = array_merge(array('text' => '','tail' => '','label' => '','block_id' => '','flight' => '','msgno' => ''),$line);
-                                $ACARS->add(isset($line['text']) ? $line['text'] : '', array('registration' => str_replace('.', '', $line['tail']), 'ident' => $line['flight'], 'label' => $line['label'], 'block_id' => $line['block_id'], 'msg_no' => $line['msgno'], 'message' => (isset($line['text']) ? $line['text'] : '')));
-                                $ACARS->deleteLiveAcarsData();
-                            }
-			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
+								$ACARS->add(isset($line['text']) ? $line['text'] : '', array('registration' => str_replace('.', '', $line['tail']), 'ident' => $line['flight'], 'label' => $line['label'], 'block_id' => $line['block_id'], 'msg_no' => $line['msgno'], 'message' => (isset($line['text']) ? $line['text'] : '')));
+								$ACARS->deleteLiveAcarsData();
+							}
+				socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
 			} 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
@@ -1884,158 +1884,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) {
@@ -2043,7 +2043,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');
@@ -2053,7 +2053,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');
@@ -2062,11 +2062,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']);
@@ -2085,13 +2085,13 @@ 
 				} elseif (!isset($globalSources[$nb]['last_weather_clean'])) {
 					$globalSources[$nb]['last_weather_clean'] = time();
 				}
-			    }
+				}
 			} else {
-			    $line = explode(',', $buffer);
-			    //print_r($line);
-    			    if (count($line) > 20) {
-    			    	$data['hex'] = $line[4];
-    				/*
+				$line = explode(',', $buffer);
+				//print_r($line);
+					if (count($line) > 20) {
+						$data['hex'] = $line[4];
+					/*
     				$data['datetime'] = $line[6].' '.$line[7];
     					date_default_timezone_set($globalTimezone);
     					$datetime = new DateTime($data['datetime']);
@@ -2099,31 +2099,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]['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 {
@@ -2139,13 +2139,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];
@@ -2154,9 +2154,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);
@@ -2167,24 +2167,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...";
@@ -2199,15 +2199,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();
+	}
 	}
-    }
 }
 
 ?>

Spacing +231 added lines, -231 removed lines

@@ -59,20 +59,20 @@ 
 	    die;
 	}
 	//$hosts = array($globalSBS1Host.':'.$globalSBS1Port);
-	$globalSources[] = array('host' => $globalSBS1Host,'port' => $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'));
+$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']);
+    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']);
+    if (isset($options['format'])) $globalSources[] = array('host' => $options['source'], 'format' => $options['format']);
     else $globalSources[] = array('host' => $options['source']);
 }
 if (isset($options['aprsserverhost'])) {
@@ -113,13 +113,13 @@ 
 else $id_source = 1;
 if (isset($globalServer) && $globalServer) {
     if ($globalDebug) echo "Using Server Mode\n";
-    $SI=new SpotterServer();
+    $SI = new SpotterServer();
 /*
     require_once(dirname(__FILE__).'/../require/class.APRS.php');
     $SI = new adsb2aprs();
     $SI->connect();
 */
-} else $SI=new SpotterImport($Connection->db);
+} else $SI = new SpotterImport($Connection->db);
 
 if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
 if (isset($globalMarine) && $globalMarine) {
@@ -133,17 +133,17 @@ 
     $MI = new MarineImport($Connection->db);
 }
 //$APRS=new APRS($Connection->db);
-$SBS=new SBS();
+$SBS = new SBS();
 if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-	$ACARS=new ACARS($Connection->db,true);
-	$Source=new Source($Connection->db);
+	$ACARS = new ACARS($Connection->db, true);
+	$Source = new Source($Connection->db);
 }
-$Common=new Common();
+$Common = new Common();
 date_default_timezone_set('UTC');
 //$servertz = system('date +%Z');
 // signal handler - playing nice with sockets and dump1090
 if (function_exists('pcntl_fork')) {
-    pcntl_signal(SIGINT,  function() {
+    pcntl_signal(SIGINT, function() {
         global $sockets;
         echo "\n\nctrl-c or kill signal received. Tidying up ... ";
         die("Bye!\n");
@@ -159,7 +159,7 @@ 
 
 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;
+    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) {
@@ -167,33 +167,33 @@ 
 	$udp = false;
 	$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)) {
+	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)) {
+            } 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)) {
+    	    } 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)) {
+    	    } 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)) {
+    	    } 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)) {
+    	    } else if (preg_match('/opensky/i', $host)) {
         	//$formats[$id] = 'aircraftlistjson';
         	$globalSources[$id]['format'] = 'opensky';
         	//$last_exec['aircraftlistjson'] = 0;
@@ -210,7 +210,7 @@ 
         	    exit(0);
         	}
     	    */
-    	    } else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
+    	    } else if (preg_match('/planeUpdateFAA.php$/i', $host)) {
         	//$formats[$id] = 'planeupdatefaa';
         	$globalSources[$id]['format'] = 'planeupdatefaa';
         	//$last_exec['planeupdatefaa'] = 0;
@@ -219,37 +219,37 @@ 
         	    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)) {
+            } 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)) {
+            } 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)) {
+            } 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)) {
+            } 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)) {
+            } 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)) {
+            } 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)) {
+            } 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)) {
+            } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i', $host)) {
         	//$formats[$id] = 'fr24json';
         	$globalSources[$id]['format'] = 'fr24json';
         	//$last_exec['fr24json'] = 0;
@@ -258,7 +258,7 @@ 
         	    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)) {
+            } else if (preg_match(':myshiptracking.com/:i', $host)) {
         	//$formats[$id] = 'fr24json';
         	$globalSources[$id]['format'] = 'myshiptracking';
         	//$last_exec['fr24json'] = 0;
@@ -268,14 +268,14 @@ 
         	    exit(0);
         	}
             //} else if (preg_match('/10001/',$host)) {
-            } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
+            } 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') || (isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailawayfull') || (isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'acarsjson')) {
+        } elseif (filter_var($host, FILTER_VALIDATE_URL) || (isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailaway') || (isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailawayfull') || (isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'acarsjson')) {
     		if ($globalSources[$id]['format'] == 'aisnmeahttp' || $globalSources[$id]['format'] == 'acarsjson') {
-    		    $idf = fopen($globalSources[$id]['host'],'r',false,$context);
+    		    $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";
@@ -283,8 +283,8 @@ 
     		} elseif ($globalDebug && isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailaway') echo "Connect to ".$globalSources[$id]['format']." source (sailaway)...\n";
     		elseif ($globalDebug && isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailawayfull') echo "Connect to ".$globalSources[$id]['format']." source (sailawayfull)...\n";
     		elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
-        } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
-	    $hostport = explode(':',$host);
+        } elseif (!filter_var($host, FILTER_VALIDATE_URL)) {
+	    $hostport = explode(':', $host);
 	    if (isset($hostport[1])) {
 		$port = $hostport[1];
 		$hostn = $hostport[0];
@@ -294,20 +294,20 @@ 
 	    }
 	    $Common = new Common();
 	    if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acarsjsonudp' && $globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
-        	$s = $Common->create_socket($hostn,$port, $errno, $errstr);
+        	$s = $Common->create_socket($hostn, $port, $errno, $errstr);
     	    } else {
     		$udp = true;
-        	$s = $Common->create_socket_udp($hostn,$port, $errno, $errstr);
+        	$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') {
+		    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';
@@ -349,7 +349,7 @@ 
 else if (isset($globalSBS1TimeOut)) $timeout = $globalSBS1TimeOut;
 else $timeout = 20;
 $errno = '';
-$errstr='';
+$errstr = '';
 
 if (!isset($globalDaemon)) $globalDaemon = TRUE;
 /* Initiate connections to all the hosts simultaneously */
@@ -357,7 +357,7 @@ 
 //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)));
 }
@@ -387,16 +387,16 @@ 
 
 if ($use_aprs) {
 	require_once(dirname(__FILE__).'/../require/class.APRS.php');
-	$APRS=new APRS();
+	$APRS = new APRS();
 	$aprs_connect = 0;
 	$aprs_keep = 120;
 	$aprs_last_tx = time();
 	if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
-	else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
+	else $aprs_version = 'FlightAirMap '.str_replace(' ', '_', $globalName);
 	if (isset($globalAPRSssid)) $aprs_ssid = $globalAPRSssid;
-	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
+	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ', '_', $globalName)), 0, 8);
 	if (isset($globalAPRSfilter)) $aprs_filter = $globalAPRSfilter;
-	else $aprs_filter =  'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
+	else $aprs_filter = 'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
 	if ($aprs_full) $aprs_filter = '';
 	if (isset($globalAPRSpass)) $aprs_pass = $globalAPRSpass;
 	else $aprs_pass = '-1';
@@ -410,12 +410,12 @@ 
 sleep(1);
 if ($globalDebug) echo "SCAN MODE \n\n";
 if (!isset($globalCronEnd)) $globalCronEnd = 60;
-$endtime = time()+$globalCronEnd;
+$endtime = time() + $globalCronEnd;
 $i = 1;
 $tt = array();
 // Delete all ATC
 if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM)) {
-	$ATC=new ATC($Connection->db);
+	$ATC = new ATC($Connection->db);
 }
 if (!$globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
 	$ATC->deleteAll();
@@ -425,7 +425,7 @@ 
 while ($i > 0) {
     if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
 
-    if (!$globalDaemon) $i = $endtime-time();
+    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";
@@ -439,7 +439,7 @@ 
 	}
 	if ($max < $globalMinFetch) {
 	    if ($globalDebug) echo 'Sleeping...'."\n";
-	    sleep($globalMinFetch-$max+2);
+	    sleep($globalMinFetch - $max + 2);
 	}
     }
 
@@ -494,10 +494,10 @@ 
             //$buffer = $Common->getData($hosts[$id]);
             $buffer = $Common->getData($value['host']);
             if ($buffer != '') {
-                $all_data = json_decode($buffer,true);
+                $all_data = json_decode($buffer, true);
                 foreach ($all_data as $line) {
                     $data = array();
-                    $data['datetime'] = date('Y-m-d H:i:s',$line['uti']);
+                    $data['datetime'] = date('Y-m-d H:i:s', $line['uti']);
                     $data['hex'] = $line['hex']; // hex
                     $data['ident'] = $line['fli']; // ident
                     $data['altitude'] = $line['alt']; // altitude
@@ -532,11 +532,11 @@ 
 	    )
 	) {
 	    date_default_timezone_set('CET');
-	    $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
+	    $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);
+    	    $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";
@@ -544,7 +544,7 @@ 
 		    $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['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'];
@@ -556,7 +556,7 @@ 
 		    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']);
+			$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;
@@ -579,21 +579,21 @@ 
 	    $w = $e = null;
 	    
 	    if (isset($arr[$id])) {
-		$nn = stream_select($arr,$w,$e,$timeout);
+		$nn = stream_select($arr, $w, $e, $timeout);
 		if ($nn > 0) {
 		    foreach ($httpfeeds as $feed) {
-			$buffer = stream_get_line($feed,2000,"\n");
+			$buffer = stream_get_line($feed, 2000, "\n");
 			if ($buffer === FALSE) {
 			    connect_all($globalSources);
 			}
-			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-			$buffer = explode('\n',$buffer);
+			$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 != '') {
 				$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['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'];
@@ -605,9 +605,9 @@ 
 				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($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');
 				}
@@ -639,10 +639,10 @@ 
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
 	    )
 	) {
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20');
 	    if ($buffer != '') {
 		//echo $buffer;
-		$all_data = json_decode($buffer,true);
+		$all_data = json_decode($buffer, true);
 		//print_r($all_data);
 		if (isset($all_data[0]['DATA'])) {
 		    foreach ($all_data[0]['DATA'] as $line) {
@@ -651,7 +651,7 @@ 
 			    $data['ident'] = $line['NAME'];
 			    $data['mmsi'] = $line['MMSI'];
 			    if (strlen($data['mmsi']) > 9) {
-				$data['mmsi'] = substr($data['mmsi'],-9);
+				$data['mmsi'] = substr($data['mmsi'], -9);
 			    }
 			    $data['speed'] = $line['SOG'];
 			    $data['heading'] = $line['COG'];
@@ -661,8 +661,8 @@ 
 			    //$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']);
+			    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;
@@ -679,16 +679,16 @@ 
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
 	    )
 	) {
-	    $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host']));
+	    $buffer = $Common->getData(str_replace('{timestamp}', time(), $value['host']));
 	    if ($buffer != '') {
-		$all_data = json_decode($buffer,true);
+		$all_data = json_decode($buffer, true);
 		if (isset($all_data[0]['mmsi'])) {
 		    foreach ($all_data as $line) {
 			if ($line != '') {
 			    $data = array();
 			    $data['ident'] = $line['shipname'];
 			    $data['callsign'] = $line['callsign'];
-			    $data['mmsi'] = substr($line['mmsi'],-9);
+			    $data['mmsi'] = substr($line['mmsi'], -9);
 			    $data['speed'] = $line['sog'];
 			    if ($line['heading'] != '511') $data['heading'] = $line['heading'];
 			    $data['latitude'] = $line['latitude'];
@@ -715,14 +715,14 @@ 
 	) {
 	    $buffer = $Common->getData($value['host']);
 	    if ($buffer != '') {
-		$all_data = json_decode($buffer,true);
+		$all_data = json_decode($buffer, true);
 		if (isset($all_data['features'][0]['id'])) {
 		    foreach ($all_data['features'] as $line) {
 			print_r($line);
 			$data = array();
 			if (isset($line['properties']['name'])) $data['ident'] = $line['properties']['name'];
 			if (isset($line['properties']['callsign'])) $data['callsign'] = $line['properties']['callsign'];
-			if (isset($line['properties']['mmsi'])) $data['mmsi'] = substr($line['properties']['mmsi'],-9);
+			if (isset($line['properties']['mmsi'])) $data['mmsi'] = substr($line['properties']['mmsi'], -9);
 			if (isset($line['properties']['imo'])) $data['imo'] = $line['properties']['imo'];
 			if (isset($line['properties']['speed'])) $data['speed'] = $line['properties']['speed'];
 			if (isset($line['properties']['heading']) && $line['properties']['heading'] != 0) $data['heading'] = $line['properties']['heading'];
@@ -749,31 +749,31 @@ 
 	    )
 	) {
 	    if ($globalDebug) echo 'download...';
-	    $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
+	    $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);
+    	    $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['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['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['ident'] = trim(utf8_encode(substr($line, 78, 20)));
 		    //$data['callsign'] = trim(substr($line,100,7);
-		    $data['arrival_code'] = substr($line,108,20);
+		    $data['arrival_code'] = substr($line, 108, 20);
 		    //$data['etaDate'] = substr($line,129,5);
 		    //$data['etaTime'] = substr($line,135,5);
 		    $data['format_source'] = 'shipplotter';
@@ -792,7 +792,7 @@ 
 	    )
 	) {
 	    if (isset($globalSailaway['email']) && $globalSailaway['email'] != '' && isset($globalSailaway['password']) && $globalSailaway['password'] != '') {
-		$authsailaway = $Common->getData('http://backend.sailaway.world/cgi-bin/sailaway/weblogin.pl','post',array('submitlogin' => 'Login','email' => $globalSailaway['email'],'pwd' => $globalSailaway['password'], 'page' => 'http://sailaway.world/cgi-bin/sailaway/missions.pl'),'','','','','',false,false,true);
+		$authsailaway = $Common->getData('http://backend.sailaway.world/cgi-bin/sailaway/weblogin.pl', 'post', array('submitlogin' => 'Login', 'email' => $globalSailaway['email'], 'pwd' => $globalSailaway['password'], 'page' => 'http://sailaway.world/cgi-bin/sailaway/missions.pl'), '', '', '', '', '', false, false, true);
 		//echo $authsailaway;
 		preg_match_all('/^Set-Cookie:\s*([^;]*)/mi', $authsailaway, $setcookie);
 		if (isset($setcookie[1][0])) {
@@ -801,19 +801,19 @@ 
 	    }
 
 	    if ($globalDebug) echo '! Download... ';
-	    for ($i =0; $i <= 1; $i++) {
+	    for ($i = 0; $i <= 1; $i++) {
 		if ($globalDebug) echo 'Racetype: '.$i.' ';
 		$buffer = $Common->getData('http://backend.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);
+		$all_data = json_decode($buffer, true);
 		if (isset($all_data['missions'])) {
 			foreach ($all_data['missions'] as $mission) {
 				$mission_user = $mission['usrname'];
-				$mission_name = preg_replace('/[\x00-\x1F\x7F-\xFF]/', '',$Common->remove_accents($mission['mistitle']));
-				if (!isset($globalFilter['sailway']['race']) || (isset($globalFilter['sailway']['race']) && in_array($mission['misnr'],$globalFilter['sailway']['race']))) {
+				$mission_name = preg_replace('/[\x00-\x1F\x7F-\xFF]/', '', $Common->remove_accents($mission['mistitle']));
+				if (!isset($globalFilter['sailway']['race']) || (isset($globalFilter['sailway']['race']) && in_array($mission['misnr'], $globalFilter['sailway']['race']))) {
 					if (isset($sailaway_authcookie) && $sailaway_authcookie != '') {
-						$racebuffer = $Common->getData('http://backend.sailaway.world/cgi-bin/sailaway/GetMission.pl?misnr='.$mission['misnr'],'get','','',$sailaway_authcookie);
+						$racebuffer = $Common->getData('http://backend.sailaway.world/cgi-bin/sailaway/GetMission.pl?misnr='.$mission['misnr'], 'get', '', '', $sailaway_authcookie);
 						sleep(30);
 					} else $racebuffer = '';
 					$bufferm = $Common->getData('http://backend.sailaway.world/cgi-bin/sailaway/GetLeaderboard.pl?misnr='.$mission['misnr']);
@@ -822,19 +822,19 @@ 
 					$racebuffer = '';
 				}
 				if ($racebuffer != '') {
-					$race_data = json_decode($racebuffer,true);
+					$race_data = json_decode($racebuffer, true);
 					//print_r($race_data);
 					unset($racebuffer);
 					if (isset($race_data['mission'])) {
 					    $datar = array();
 					    $datar['id'] = $mission['misnr'];
 					    $datar['desc'] = $race_data['mission']['misdescr'];
-					    $datar['creator'] = trim(preg_replace('/[\x00-\x1F\x7F-\xFF]/', '',$Common->remove_accents($race_data['mission']['usrname'])));
-					    $datar['name'] = trim(preg_replace('/[\x00-\x1F\x7F-\xFF]/', '',$Common->remove_accents($race_data['mission']['mistitle'])));
+					    $datar['creator'] = trim(preg_replace('/[\x00-\x1F\x7F-\xFF]/', '', $Common->remove_accents($race_data['mission']['usrname'])));
+					    $datar['name'] = trim(preg_replace('/[\x00-\x1F\x7F-\xFF]/', '', $Common->remove_accents($race_data['mission']['mistitle'])));
 					    $datar['startdate'] = $race_data['mission']['misstartdatetime'];
 					    $markers = array();
 					    foreach ($race_data['mission']['course'] as $course) {
-						$markers[] = array('lat' => $course['miclat'],'lon' => $course['miclon'],'name' => $course['micname'],'type' => $course['mictype']);
+						$markers[] = array('lat' => $course['miclat'], 'lon' => $course['miclon'], 'name' => $course['micname'], 'type' => $course['mictype']);
 					    }
 					    $datar['markers'] = json_encode($markers);
 					    //print_r($datar);
@@ -842,7 +842,7 @@ 
 					}
 				}
 				if ($bufferm != '') {
-					$mission_data = json_decode($bufferm,true);
+					$mission_data = json_decode($bufferm, true);
 					unset($bufferm);
 					if (isset($mission_data['leaderboard'][0]['results'])) {
 						foreach ($mission_data['leaderboard'][0]['results'] as $sail) {
@@ -855,7 +855,7 @@ 
 								//$data['id'] = $sail['misnr'].'-'.$sail['usrnr'].'-'.$sail['ubtnr'];
 								$data['id'] = $sail['misnr'].'-'.$sail['usrnr'];
 								$data['datetime'] = date('Y-m-d H:i:s');
-								$data['race_begin'] = date('Y-m-d H:i:s',strtotime($mission_data['leaderboard'][0]['misstart']));
+								$data['race_begin'] = date('Y-m-d H:i:s', strtotime($mission_data['leaderboard'][0]['misstart']));
 								$data['last_update'] = date('Y-m-d H:i:s');
 								$data['status'] = $sail['status'];
 								$data['type'] = $sail['btptype'];
@@ -866,16 +866,16 @@ 
 									$data['longitude'] = $pos['longitude'];
 								}
 								if ($sail['status'] == 'Racing' && $sail['resultdescr'] != '-') {
-									$resultdescr = explode(',',$sail['resultdescr']);
+									$resultdescr = explode(',', $sail['resultdescr']);
 									if (count($resultdescr) > 2) {
-										$data['speed'] = round(str_replace(array('Spd: ','kn.'),'',trim($resultdescr[2]))*1.852,2);
-										$data['heading'] = str_replace(array('Hdg: ','°'),'',trim($resultdescr[1]));
+										$data['speed'] = round(str_replace(array('Spd: ', 'kn.'), '', trim($resultdescr[2]))*1.852, 2);
+										$data['heading'] = str_replace(array('Hdg: ', '°'), '', trim($resultdescr[1]));
 										if (isset($resultdescr[3])) {
-											$data['distance'] = round(str_replace('nm.','',trim(explode(' ',$resultdescr[3])[1]))*1.852,3);
+											$data['distance'] = round(str_replace('nm.', '', trim(explode(' ', $resultdescr[3])[1]))*1.852, 3);
 										}
 									}
 								}
-								$data['ident'] = trim(preg_replace('/[\x00-\x1F\x7F-\xFF]/', '',$Common->remove_accents($sail['ubtname'])));
+								$data['ident'] = trim(preg_replace('/[\x00-\x1F\x7F-\xFF]/', '', $Common->remove_accents($sail['ubtname'])));
 								$data['captain_id'] = $sail['usrnr'];
 								$data['captain_name'] = $sail['usrname'];
 								$data['race_id'] = $sail['misnr'];
@@ -928,9 +928,9 @@ 
 		exit(0);
 	    }
 	    if ($globalDebug) echo '! Download... ';
-	    $buffer = $Common->getData('http://backend.sailaway.world/cgi-bin/sailaway/TrackAllBoats.pl?key='.$globalSailaway['key'],'get','','','','',30);
+	    $buffer = $Common->getData('http://backend.sailaway.world/cgi-bin/sailaway/TrackAllBoats.pl?key='.$globalSailaway['key'], 'get', '', '', '', '', 30);
 	    if ($buffer != '') {
-		$data = json_decode($buffer,true);
+		$data = json_decode($buffer, true);
 		//print_r($data);
 		if (isset($data['boats'])) {
 		    foreach ($data['boats'] as $sail) {
@@ -942,12 +942,12 @@ 
 			$data['longitude'] = $sail['ubtlon'];
 			$data['type_id'] = 36;
 			$data['heading'] = $sail['ubtheading'];
-			$data['ident'] = trim(preg_replace('/[\x00-\x1F\x7F-\xFF]/', '',$Common->remove_accents($sail['ubtname'])));
+			$data['ident'] = trim(preg_replace('/[\x00-\x1F\x7F-\xFF]/', '', $Common->remove_accents($sail['ubtname'])));
 			$data['captain_name'] = $sail['usrname'];
-			$allboats = array('Sailaway Cruiser 38','Mini Transat','Caribbean Rose','52&#39; Cruising Cat','50&#39; Performance Cruiser','Nordic Folkboat');
+			$allboats = array('Sailaway Cruiser 38', 'Mini Transat', 'Caribbean Rose', '52&#39; Cruising Cat', '50&#39; Performance Cruiser', 'Nordic Folkboat');
 			$boattype = $sail['ubtbtpnr'];
-			$data['type'] = $allboats[$boattype-1];
-			$data['speed'] = round($sail['ubtspeed']*3.6,2);
+			$data['type'] = $allboats[$boattype - 1];
+			$data['speed'] = round($sail['ubtspeed']*3.6, 2);
 			$data['format_source'] = 'sailaway';
 			$data['id_source'] = $id_source;
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -975,8 +975,8 @@ 
 	) {
 	    //$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);
+    	    $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 != '') {
@@ -987,7 +987,7 @@ 
 			else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
 			$data['pilot_id'] = $line[1];
 			$data['pilot_name'] = $line[2];
-			$data['hex'] = str_pad(dechex($Common->str2int($line[1])),6,'000000',STR_PAD_LEFT);
+			$data['hex'] = str_pad(dechex($Common->str2int($line[1])), 6, '000000', STR_PAD_LEFT);
 			$data['ident'] = $line[0]; // ident
 			if ($line[7] != '' && $line[7] != 0) $data['altitude'] = $line[7]; // altitude
 			$data['speed'] = $line[8]; // speed
@@ -1003,7 +1003,7 @@ 
 			//$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['departure_airport_time'] = rtrim(chunk_split($line[22], 2, ':'), ':');
 		        $data['arrival_airport_icao'] = $line[13];
 			$data['frequency'] = $line[4];
 			$data['type'] = $line[18];
@@ -1012,7 +1012,7 @@ 
     			$data['id_source'] = $id_source;
 	    		//$data['arrival_airport_time'] = ;
 	    		if ($line[9] != '') {
-	    		    $aircraft_data = explode('/',$line[9]);
+	    		    $aircraft_data = explode('/', $line[9]);
 	    		    if (isset($aircraft_data[1])) {
 	    			$data['aircraft_icao'] = $aircraft_data[1];
 	    		    }
@@ -1027,9 +1027,9 @@ 
     			if ($line[3] === 'PILOT') $SI->add($data);
 			elseif ($line[3] === 'ATC') {
 				//print_r($data);
-				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
-				$data['info'] = str_replace('&amp;sect;','',$data['info']);
-				$typec = substr($data['ident'],-3);
+				$data['info'] = str_replace('^&sect;', '<br />', $data['info']);
+				$data['info'] = str_replace('&amp;sect;', '', $data['info']);
+				$typec = substr($data['ident'], -3);
 				if ($typec === 'APP') $data['type'] = 'Approach';
 				elseif ($typec === 'TWR') $data['type'] = 'Tower';
 				elseif ($typec === 'OBS') $data['type'] = 'Observer';
@@ -1041,8 +1041,8 @@ 
 				elseif ($data['type'] === '') $data['type'] = 'Observer';
 				if (!isset($data['source_name'])) $data['source_name'] = '';
 				if (isset($ATC)) {
-					if (count($ATC->getByIdent($data['ident'],$data['format_source'])) > 0) echo $ATC->update($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']);
-					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']);
+					if (count($ATC->getByIdent($data['ident'], $data['format_source'])) > 0) echo $ATC->update($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']);
+					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);
@@ -1058,24 +1058,24 @@ 
     		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
     	    )
     	) {
-	    $buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php','get','','','','','20');
+	    $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) {
+		foreach ($all_data->children() as $childdata) {
 			$data = array();
 			$line = $childdata;
 			//$data['hex'] = str_pad(dechex((int)$line['pktPilotID']),6,'000000',STR_PAD_LEFT);
-			$data['id'] = date('Ymd').(int)$line['pktPilotID'];
-			$data['datetime'] = date('Y-m-d H:i:s',strtotime((string)$line['entryTime'].' BST'));
-			$data['latitude'] = (float)$line['pktLatitude'];
-			$data['longitude'] = (float)$line['pktLongitude'];
-			if ((float)$line['pktTrack'] != 0) $data['heading'] = (float)$line['pktTrack'];
-			if ((int)$line['pktSpeed'] != 0) $data['speed'] = (int)$line['pktSpeed'];
-			$data['altitude'] = round((int)$line['pktAltitude']*3.28084);
+			$data['id'] = date('Ymd').(int) $line['pktPilotID'];
+			$data['datetime'] = date('Y-m-d H:i:s', strtotime((string) $line['entryTime'].' BST'));
+			$data['latitude'] = (float) $line['pktLatitude'];
+			$data['longitude'] = (float) $line['pktLongitude'];
+			if ((float) $line['pktTrack'] != 0) $data['heading'] = (float) $line['pktTrack'];
+			if ((int) $line['pktSpeed'] != 0) $data['speed'] = (int) $line['pktSpeed'];
+			$data['altitude'] = round((int) $line['pktAltitude']*3.28084);
 			$data['altitude_relative'] = 'AMSL';
-			$data['pilot_id'] = (int)$line['pktPilotID'];
+			$data['pilot_id'] = (int) $line['pktPilotID'];
 			$data['aircraft_icao'] = 'PARAGLIDER';
-			$pilot_data = explode(',',$Common->getData('http://www.airwhere.co.uk/pilotdetails.php?pilot='.$data['pilot_id']));
+			$pilot_data = explode(',', $Common->getData('http://www.airwhere.co.uk/pilotdetails.php?pilot='.$data['pilot_id']));
 			if (isset($pilot_data[4])) $data['pilot_name'] = $pilot_data[4];
 			$data['format_source'] = $value['format'];
 			$SI->add($data);
@@ -1083,22 +1083,22 @@ 
 		}
 	    }
 	    $Source->deleteOldLocationByType('gs');
-	    $buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php','get','','','','','20');
+	    $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) {
+		foreach ($all_data->children() as $childdata) {
 			$data = array();
 			$line = $childdata;
-			$data['id'] = (int)$line['gsID'];
-			$data['latitude'] = (float)$line['gsLatitude'];
-			$data['longitude'] = (float)$line['gsLongitude'];
-			$data['altitude'] = round((int)$line['gsHeight']*3.28084);
+			$data['id'] = (int) $line['gsID'];
+			$data['latitude'] = (float) $line['gsLatitude'];
+			$data['longitude'] = (float) $line['gsLongitude'];
+			$data['altitude'] = round((int) $line['gsHeight']*3.28084);
 			$data['altitude_relative'] = 'AMSL';
-			$data['datetime'] = date('Y-m-d H:i:s',strtotime((string)$line['gsLastUpdate'].' BST'));
+			$data['datetime'] = date('Y-m-d H:i:s', strtotime((string) $line['gsLastUpdate'].' BST'));
 			if (count($Source->getLocationInfoByLocationID($data['id'])) > 0) {
-				$Source->updateLocationByLocationID('',$data['latitude'],$data['longitude'],$data['altitude'],'','','airwhere','antenna.png','gs',$id,$data['id'],$data['datetime']);
+				$Source->updateLocationByLocationID('', $data['latitude'], $data['longitude'], $data['altitude'], '', '', 'airwhere', 'antenna.png', 'gs', $id, $data['id'], $data['datetime']);
 			} else {
-				$Source->addLocation('',$data['latitude'],$data['longitude'],$data['altitude'],'','','airwhere','antenna.png','gs',$id,$data['id'],$data['datetime']);
+				$Source->addLocation('', $data['latitude'], $data['longitude'], $data['altitude'], '', '', 'airwhere', 'antenna.png', 'gs', $id, $data['id'], $data['datetime']);
 			}
 			unset($data);
 		}
@@ -1116,9 +1116,9 @@ 
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
 	    )
 	) {
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20');
 	    if ($buffer != '') {
-	        $all_data = json_decode($buffer,true);
+	        $all_data = json_decode($buffer, true);
 		if (isset($all_data['acList'])) {
 		    $reset = 0;
 		    foreach ($all_data['acList'] as $line) {
@@ -1134,7 +1134,7 @@ 
 			if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
 			$data['emergency'] = ''; // emergency
 			if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
-			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
+			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s', round($line['PosTime']/1000));
 			else $data['datetime'] = date('Y-m-d H:i:s');
 			//$data['datetime'] = date('Y-m-d H:i:s');
 			if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
@@ -1159,7 +1159,7 @@ 
 			$data['verticalrate'] = $line['vrt']; // verticale rate
 			$data['squawk'] = $line['squawk']; // squawk
 			$data['emergency'] = ''; // emergency
-			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
+			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s', round($line['PosTime']/1000));
 			else $data['datetime'] = date('Y-m-d H:i:s');
 			$data['format_source'] = 'aircraftlistjson';
 			$data['id_source'] = $id_source;
@@ -1180,7 +1180,7 @@ 
     	    )
     	) {
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $all_data = json_decode($buffer, true);
 	    if (isset($all_data['planes'])) {
 		$reset = 0;
 		foreach ($all_data['planes'] as $key => $line) {
@@ -1197,12 +1197,12 @@ 
 		    $data['emergency'] = ''; // emergency
 		    $data['registration'] = $line[2];
 		    $data['aircraft_icao'] = $line[0];
-		    $deparr = explode('-',$line[1]);
+		    $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['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;
@@ -1220,7 +1220,7 @@ 
 	    )
 	) {
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $all_data = json_decode($buffer, true);
 	    if (isset($all_data['states'])) {
 		$reset = 0;
 		foreach ($all_data['states'] as $key => $line) {
@@ -1237,7 +1237,7 @@ 
 		    //$data['emergency'] = ''; // emergency
 		    //$data['registration'] = $line[2];
 		    //$data['aircraft_icao'] = $line[0];
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]);
+		    $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;
@@ -1254,8 +1254,8 @@ 
 	    )
 	) {
 	    $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) {
+	    $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();
@@ -1293,7 +1293,7 @@ 
 	    )
 	) {
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $all_data = json_decode($buffer, true);
 	    if (isset($all_data['aircraft'])) {
 		$reset = 0;
 		foreach ($all_data['aircraft'] as $key => $line) {
@@ -1310,7 +1310,7 @@ 
 		    //$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['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'];
@@ -1329,7 +1329,7 @@ 
 	) {
 	    //$buffer = $Common->getData($hosts[$id]);
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $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') {
@@ -1367,11 +1367,11 @@ 
 	    )
 	) {
 	    //$buffer = $Common->getData($hosts[$id],'get','','','','','150');
-	    $buffer = $Common->getData($value['host'],'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);
+	    $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());
 	    }
@@ -1394,7 +1394,7 @@ 
 			//$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['inf']['dt']); //$line[10]
+			$data['datetime'] = date('Y-m-d H:i:s', $line['inf']['dt']); //$line[10]
 	    		$data['format_source'] = 'radarvirtueljson';
     			$data['id_source'] = $id_source;
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -1415,14 +1415,14 @@ 
 	) {
 	    //$buffer = $Common->getData($hosts[$id]);
 	    $buffer = $Common->getData($value['host'].'?'.time());
-	    $all_data = json_decode(utf8_encode($buffer),true);
+	    $all_data = json_decode(utf8_encode($buffer), true);
 	    
 	    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['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
@@ -1452,9 +1452,9 @@ 
 			$SI->add($data);
 		    //    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);
+			$data['info'] = str_replace('^&sect;', '<br />', $data['info']);
+			$data['info'] = str_replace('&amp;sect;', '', $data['info']);
+			$typec = substr($data['ident'], -3);
 			$data['type'] = '';
 			if ($typec === 'APP') $data['type'] = 'Approach';
 			elseif ($typec === 'TWR') $data['type'] = 'Tower';
@@ -1465,7 +1465,7 @@ 
 			elseif ($typec === 'FSS') $data['type'] = 'Flight Service Station';
 			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']);
+			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);
 		}
@@ -1482,14 +1482,14 @@ 
 	    //$buffer = $Common->getData($hosts[$id]);
 	    if ($globalDebug) echo 'Get Data...'."\n";
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $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
+	    	    $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
@@ -1504,7 +1504,7 @@ 
 	    	    //$data['datetime'] = $line['lastupdate'];
 	    	    //$data['last_update'] = $line['lastupdate'];
 	    	    if (isset($value['timezone'])) {
-	    		$datetime = new DateTime($line['lastupdate'],new DateTimeZone($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');
@@ -1520,14 +1520,14 @@ 
 		    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']);
+			$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']);
+	    		    $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'];
@@ -1552,7 +1552,7 @@ 
 	    //$buffer = $Common->getData($hosts[$id]);
 	    if ($globalDebug) echo 'Get Data...'."\n";
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $all_data = json_decode($buffer, true);
 	    if ($buffer != '' && is_array($all_data) && isset($all_data['ACARSData'])) {
 		$reset = 0;
 		foreach ($all_data['ACARSData'] as $line) {
@@ -1563,7 +1563,7 @@ 
 	    	    //$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
+	    	    $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
@@ -1574,7 +1574,7 @@ 
 	    	    //$data['squawk'] = ''; // squawk
 	    	    //$data['emergency'] = ''; // emergency
 	    	    if (isset($value['timezone'])) {
-	    		$datetime = new DateTime($line['updated_at'],new DateTimeZone($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');
@@ -1610,14 +1610,14 @@ 
 	    //$buffer = $Common->getData($hosts[$id]);
 	    if ($globalDebug) echo 'Get Data...'."\n";
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $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['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
@@ -1661,24 +1661,24 @@ 
 	    //$buffer = $Common->getData($hosts[$id]);
 	    if ($globalDebug) echo 'Get Data...'."\n";
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $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);
+		$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);
+		    $line = json_decode($buffer_line, true);
 		    if (isset($line['time'])) {
 			$data = array();
 			$data['altitude'] = $line['alt']; // altitude
 			$data['latitude'] = $line['lat']; // lat
 			$data['longitude'] = $line['lon']; // long
-			$data['datetime'] = date('Y-m-d H:i:s',substr($line['time'],0,10));
+			$data['datetime'] = date('Y-m-d H:i:s', substr($line['time'], 0, 10));
 			$data['id_source'] = $id_source;
 			$data['format_source'] = 'blitzortung';
 			$SI->add($data);
 			if ($globalDebug) echo '☈ Lightning added'."\n";
-			$Source->addLocation('',$data['latitude'],$data['longitude'],0,'','','blitzortung','weather/thunderstorm.png','lightning',$id,0,$data['datetime']);
+			$Source->addLocation('', $data['latitude'], $data['longitude'], 0, '', '', 'blitzortung', 'weather/thunderstorm.png', 'lightning', $id, 0, $data['datetime']);
 			unset($data);
 		    }
 		}
@@ -1690,15 +1690,15 @@ 
         $arr = $httpfeeds;
         $w = $e = null;
         if (isset($arr[$id])) {
-            $nn = stream_select($arr,$w,$e,$timeout);
+            $nn = stream_select($arr, $w, $e, $timeout);
             if ($nn > 0) {
                 foreach ($httpfeeds as $feed) {
-                    $buffer = stream_get_line($feed,2000,"\n");
+                    $buffer = stream_get_line($feed, 2000, "\n");
                     if ($buffer === FALSE) {
                         connect_all($globalSources);
                     }
-                    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-                    $buffer = explode('\n',$buffer);
+                    $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 != '') {
                             $line = json_decode($line, true);
@@ -1738,11 +1738,11 @@ 
 		    //$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);
+			$buffer = @socket_read($r, 6000, PHP_NORMAL_READ);
 		    } elseif ($format === 'vrstcp') {
 			$buffer = @socket_read($r, 6000);
 		    } else {
-			$az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port);
+			$az = socket_recvfrom($r, $buffer, 6000, 0, $remote_ip, $remote_port);
 		    }
 		    //$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
 		    //echo $buffer."\n";
@@ -1752,8 +1752,8 @@ 
 		    //$SI::del();
 		    if ($buffer !== FALSE) {
 			if ($format === 'vrstcp') {
-			    $buffer = explode('},{',$buffer);
-			} else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$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 !== '') {
@@ -1780,7 +1780,7 @@ 
 			    $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['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'];
@@ -1791,13 +1791,13 @@ 
 			    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($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'])) {
-				$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');
 			    }
@@ -1808,10 +1808,10 @@ 
                         } elseif ($format === 'flightgearsp') {
                     	    //echo $buffer."\n";
                     	    if (strlen($buffer) > 5) {
-				$line = explode(',',$buffer);
+				$line = explode(',', $buffer);
 				$data = array();
 				//XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p
-				$data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]),6,'000000',STR_PAD_LEFT),0,6);
+				$data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]), 6, '000000', STR_PAD_LEFT), 0, 6);
 				$data['ident'] = $line[6];
 				$data['aircraft_name'] = $line[7];
 				$data['longitude'] = $line[1];
@@ -1828,25 +1828,25 @@ 
                         } elseif ($format === 'acars') {
                     	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
 			    $ACARS->add(trim($buffer));
-			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
+			    socket_sendto($r, "OK ".$buffer, 100, 0, $remote_ip, $remote_port);
 			    $ACARS->deleteLiveAcarsData();
 			} elseif ($format === 'acarsjsonudp') {
 			    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
                             $line = json_decode(trim($buffer), true);
                             if (!empty($line)) {
-				$line = array_merge(array('text' => '','tail' => '','label' => '','block_id' => '','flight' => '','msgno' => ''),$line);
+				$line = array_merge(array('text' => '', 'tail' => '', 'label' => '', 'block_id' => '', 'flight' => '', 'msgno' => ''), $line);
                                 $ACARS->add(isset($line['text']) ? $line['text'] : '', array('registration' => str_replace('.', '', $line['tail']), 'ident' => $line['flight'], 'label' => $line['label'], 'block_id' => $line['block_id'], 'msg_no' => $line['msgno'], 'message' => (isset($line['text']) ? $line['text'] : '')));
                                 $ACARS->deleteLiveAcarsData();
                             }
-			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
+			    socket_sendto($r, "OK ".$buffer, 100, 0, $remote_ip, $remote_port);
 			} elseif ($format === 'flightgearmp') {
-			    if (substr($buffer,0,1) != '#') {
+			    if (substr($buffer, 0, 1) != '#') {
 				$data = array();
 				//echo $buffer."\n";
-				$line = explode(' ',$buffer);
+				$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
+				    $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];
@@ -1854,8 +1854,8 @@ 
 				    $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);
+				    $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);
 				}
@@ -1864,8 +1864,8 @@ 
 			    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) {
-				$line = json_decode('{'.$all_data.'}',true);
+			    foreach ($buffer as $all_data) {
+				$line = json_decode('{'.$all_data.'}', true);
 				$data = array();
 				if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex
 				if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
@@ -1891,16 +1891,16 @@ 
 				if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data);
 				unset($data);
 			    }
-			} elseif ($format === 'tsv' || substr($buffer,0,4) === 'clock') {
+			} elseif ($format === 'tsv' || substr($buffer, 0, 4) === 'clock') {
 			    $line = explode("\t", $buffer);
-			    for($k = 0; $k < count($line); $k=$k+2) {
+			    for ($k = 0; $k < count($line); $k = $k + 2) {
 				$key = $line[$k];
-			        $lined[$key] = $line[$k+1];
+			        $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');;
+    				$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'];
@@ -1919,23 +1919,23 @@ 
     			    } else $error = true;
 			} elseif ($format === 'aprs' && $use_aprs) {
 			    if ($aprs_connect === 0) {
-				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 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 );
+				$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);
+			    $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 ') {
+			    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']))) {
@@ -1950,7 +1950,7 @@ 
 				    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']);
+				    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'];
@@ -2038,29 +2038,29 @@ 
 				    } 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) {
-						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']);
+					if (count($Source->getLocationInfoByNameType($data['ident'], 'gs')) > 0) {
+						$Source->updateLocation($data['ident'], $data['latitude'], $data['longitude'], $data['altitude'], '', '', $data['source_name'], 'antenna.png', 'gs', $id, 0, $data['datetime']);
 					} else {
-						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']);
+						$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') {
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
 					if ($globalDebug) echo '# Weather Station added'."\n";
 					$Source->deleteOldLocationByType('wx');
 					$weather_data = json_encode($line);
-					if (count($Source->getLocationInfoByNameType($data['ident'],'wx')) > 0) {
-						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'wx.png','wx',$id,0,$data['datetime'],$weather_data);
+					if (count($Source->getLocationInfoByNameType($data['ident'], 'wx')) > 0) {
+						$Source->updateLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'wx.png', 'wx', $id, 0, $data['datetime'], $weather_data);
 					} else {
-						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'wx.png','wx',$id,0,$data['datetime'],$weather_data);
+						$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')) {
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
 					if ($globalDebug) echo '☈ Lightning added'."\n";
 					$Source->deleteOldLocationByType('lightning');
-					if (count($Source->getLocationInfoByNameType($data['ident'],'lightning')) > 0) {
-						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'weather/thunderstorm.png','lightning',$id,0,$data['datetime'],$data['comment']);
+					if (count($Source->getLocationInfoByNameType($data['ident'], 'lightning')) > 0) {
+						$Source->updateLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'weather/thunderstorm.png', 'lightning', $id, 0, $data['datetime'], $data['comment']);
 					} else {
-						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'weather/thunderstorm.png','lightning',$id,0,$data['datetime'],$data['comment']);
+						$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";
@@ -2069,7 +2069,7 @@ 
 				    unset($data);
 				}
 				elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') {
-					$Source->updateLocationDescByName($line['ident'],$line['source'],$id,$line['comment']);
+					$Source->updateLocationDescByName($line['ident'], $line['source'], $id, $line['comment']);
 				}
 				/*
 				elseif (is_array($line) && $globalDebug && 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')) {
@@ -2078,7 +2078,7 @@ 
 				*/
 				//elseif ($line === false && $globalDebug) echo 'Ignored ('.$buffer.")\n";
 				elseif ($line === true && $globalDebug) echo '!! Failed : '.$buffer."!!\n";
-				if (isset($Source) && isset($globalSources[$nb]['last_weather_clean']) && time()-$globalSources[$nb]['last_weather_clean'] > 60*5) {
+				if (isset($Source) && isset($globalSources[$nb]['last_weather_clean']) && time() - $globalSources[$nb]['last_weather_clean'] > 60*5) {
 					$Source->deleteOldLocationByType('lightning');
 					$Source->deleteOldLocationByType('wx');
 					$globalSources[$nb]['last_weather_clean'] = time();
@@ -2165,7 +2165,7 @@ 
 				connect_all($sourceee);
 				$sourceee = array();
 				//connect_all($globalSources);
-				$tt[$format]=0;
+				$tt[$format] = 0;
 				break;
 			    } 
 			    //else if ($globalDebug) echo "Trying again (".$tt[$format]."x) ".$format."...";
@@ -2175,14 +2175,14 @@ 
 	    } 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 ($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...";
 			    
 			    foreach ($sockets as $sock) {
-				@socket_shutdown($sock,2);
+				@socket_shutdown($sock, 2);
 				@socket_close($sock);
 			    }
 			    

Braces +1251 added lines, -421 removed lines

@@ -22,7 +22,9 @@ 
     require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
 }
 
-if (!isset($globalDebug)) $globalDebug = FALSE;
+if (!isset($globalDebug)) {
+	$globalDebug = FALSE;
+}
 
 if ($globalInstalled === FALSE) {
     echo "This script MUST be run after install script. Use your web browser to run install/index.php";
@@ -68,66 +70,107 @@ 
 //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']);
-} elseif (isset($options['source'])) {
+    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']);
-}
+    if (isset($options['format'])) {
+    	$globalSources[] = array('host' => $options['source'],'format' => $options['format']);
+    } else {
+    	$globalSources[] = array('host' => $options['source']);
+    }
+    }
 if (isset($options['aprsserverhost'])) {
 	$globalServerAPRS = TRUE;
 	$globalServerAPRShost = $options['aprsserverhost'];
 }
-if (isset($options['aprsserverport'])) $globalServerAPRSport = $options['aprsserverport'];
-if (isset($options['aprsserverssid'])) $globalServerAPRSssid = $options['aprsserverssid'];
-if (isset($options['aprsserverpass'])) $globalServerAPRSpass = $options['aprsserverpass'];
-if (isset($options['noaprsserver'])) $globalServerAPRS = FALSE; 
+if (isset($options['aprsserverport'])) {
+	$globalServerAPRSport = $options['aprsserverport'];
+}
+if (isset($options['aprsserverssid'])) {
+	$globalServerAPRSssid = $options['aprsserverssid'];
+}
+if (isset($options['aprsserverpass'])) {
+	$globalServerAPRSpass = $options['aprsserverpass'];
+}
+if (isset($options['noaprsserver'])) {
+	$globalServerAPRS = FALSE;
+}
 if (isset($options['enable-aircraft'])) {
-	if ($globalDebug) echo 'Enable Aircraft mode'."\n";
+	if ($globalDebug) {
+		echo 'Enable Aircraft mode'."\n";
+	}
 	$globalAircraft = TRUE; 
 }
 if (isset($options['disable-aircraft'])) {
-	if ($globalDebug) echo 'Disable Aircraft mode'."\n";
+	if ($globalDebug) {
+		echo 'Disable Aircraft mode'."\n";
+	}
 	$globalAircraft = FALSE;
 }
 if (isset($options['enable-tracker'])) {
-	if ($globalDebug) echo 'Enable Tracker mode'."\n";
+	if ($globalDebug) {
+		echo 'Enable Tracker mode'."\n";
+	}
 	$globalTracker = TRUE; 
 }
 if (isset($options['disable-tracker'])) {
-	if ($globalDebug) echo 'Disable Tracker mode'."\n";
+	if ($globalDebug) {
+		echo 'Disable Tracker mode'."\n";
+	}
 	$globalTracker = FALSE;
 }
 if (isset($options['enable-marine'])) {
-	if ($globalDebug) echo 'Enable Marine mode'."\n";
+	if ($globalDebug) {
+		echo 'Enable Marine mode'."\n";
+	}
 	$globalMarine = TRUE;
 }
 if (isset($options['disable-marine'])) {
-	if ($globalDebug) echo 'Disable Marine mode'."\n";
+	if ($globalDebug) {
+		echo 'Disable Marine mode'."\n";
+	}
 	$globalMarine = FALSE;
 }
-if (isset($options['nodaemon'])) $globalDaemon = FALSE;
-if (isset($options['server'])) $globalServer = TRUE;
-if (isset($options['idsource'])) $id_source = $options['idsource'];
-else $id_source = 1;
+if (isset($options['nodaemon'])) {
+	$globalDaemon = FALSE;
+}
+if (isset($options['server'])) {
+	$globalServer = TRUE;
+}
+if (isset($options['idsource'])) {
+	$id_source = $options['idsource'];
+} else {
+	$id_source = 1;
+}
 if (isset($globalServer) && $globalServer) {
-    if ($globalDebug) echo "Using Server Mode\n";
+    if ($globalDebug) {
+    	echo "Using Server Mode\n";
+    }
     $SI=new SpotterServer();
 /*
     require_once(dirname(__FILE__).'/../require/class.APRS.php');
     $SI = new adsb2aprs();
     $SI->connect();
 */
-} else $SI=new SpotterImport($Connection->db);
+} else {
+	$SI=new SpotterImport($Connection->db);
+}
 
-if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.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');
 }
 
-if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db);
+if (isset($globalTracker) && $globalTracker) {
+	$TI = new TrackerImport($Connection->db);
+}
 if (isset($globalMarine) && $globalMarine) {
     $AIS = new AIS();
     $MI = new MarineImport($Connection->db);
@@ -152,7 +195,9 @@ 
 }
 
 // let's try and connect
-if ($globalDebug) echo "Connecting...\n";
+if ($globalDebug) {
+	echo "Connecting...\n";
+}
 $use_aprs = false;
 $aprs_full = false;
 $reset = 0;
@@ -161,7 +206,9 @@ 
     //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";
+    if ($globalDebug) {
+    	echo 'Connect to all...'."\n";
+    }
     foreach ($hosts as $id => $value) {
 	$host = $value['host'];
 	$udp = false;
@@ -172,32 +219,44 @@ 
         	//$formats[$id] = 'deltadbtxt';
         	$globalSources[$id]['format'] = 'deltadbtxt';
         	//$last_exec['deltadbtxt'] = 0;
-        	if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
+        	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";
+        	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";
+        	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";
+        	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";
+        	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 ($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)) {
@@ -214,7 +273,9 @@ 
         	//$formats[$id] = 'planeupdatefaa';
         	$globalSources[$id]['format'] = 'planeupdatefaa';
         	//$last_exec['planeupdatefaa'] = 0;
-        	if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
+        	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);
@@ -223,37 +284,53 @@ 
         	//$formats[$id] = 'phpvmacars';
         	$globalSources[$id]['format'] = 'phpvmacars';
         	//$last_exec['phpvmacars'] = 0;
-        	if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
+        	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";
+        	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";
+        	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";
+        	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";
+        	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";
+        	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";
+        	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 ($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);
@@ -262,7 +339,9 @@ 
         	//$formats[$id] = 'fr24json';
         	$globalSources[$id]['format'] = 'myshiptracking';
         	//$last_exec['fr24json'] = 0;
-        	if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n";
+        	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);
@@ -271,18 +350,28 @@ 
             } 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";
+        	if ($globalDebug) {
+        		echo "Connect to tsv source (".$host.")...\n";
+        	}
             }
         } elseif (filter_var($host,FILTER_VALIDATE_URL) || (isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailaway') || (isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailawayfull') || (isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'acarsjson')) {
     		if ($globalSources[$id]['format'] == 'aisnmeahttp' || $globalSources[$id]['format'] == 'acarsjson') {
     		    $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 && isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailawayfull') echo "Connect to ".$globalSources[$id]['format']." source (sailawayfull)...\n";
-    		elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
+        		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 && isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailawayfull') {
+    			echo "Connect to ".$globalSources[$id]['format']." source (sailawayfull)...\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])) {
@@ -323,20 +412,29 @@ 
         		//$formats[$id] = 'beast';
         		$globalSources[$id]['format'] = 'beast';
 		    //} else $formats[$id] = 'sbs';
-		    } else $globalSources[$id]['format'] = 'sbs';
+		    } else {
+		    	$globalSources[$id]['format'] = 'sbs';
+		    }
 		    //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
 		}
-		if ($globalDebug && $udp) echo 'Listening in UDP from '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
-		elseif ($globalDebug) echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
+		if ($globalDebug && $udp) {
+			echo 'Listening in UDP from '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
+		} elseif ($globalDebug) {
+			echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
+		}
             } else {
-		if ($globalDebug) echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";
+		if ($globalDebug) {
+			echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";
+		}
 		sleep(10);
 		connect_all($hosts);
     	    }
         }
     }
 }
-if (!isset($globalMinFetch)) $globalMinFetch = 15;
+if (!isset($globalMinFetch)) {
+	$globalMinFetch = 15;
+}
 
 // Initialize all
 $status = array();
@@ -345,13 +443,19 @@ 
 $formats = array();
 $last_exec = array();
 $time = time();
-if (isset($globalSourcesTimeout)) $timeout = $globalSourcesTimeOut;
-else if (isset($globalSBS1TimeOut)) $timeout = $globalSBS1TimeOut;
-else $timeout = 20;
+if (isset($globalSourcesTimeout)) {
+	$timeout = $globalSourcesTimeOut;
+} else if (isset($globalSBS1TimeOut)) {
+	$timeout = $globalSBS1TimeOut;
+} else {
+	$timeout = 20;
+}
 $errno = '';
 $errstr='';
 
-if (!isset($globalDaemon)) $globalDaemon = TRUE;
+if (!isset($globalDaemon)) {
+	$globalDaemon = TRUE;
+}
 /* Initiate connections to all the hosts simultaneously */
 //connect_all($hosts);
 //connect_all($globalSources);
@@ -380,7 +484,9 @@ 
     if (isset($source['format']) && $source['format'] == 'aprs') {
 	$aprs_connect = 0;
 	$use_aprs = true;
-	if (isset($source['port']) && $source['port'] == '10152') $aprs_full = true;
+	if (isset($source['port']) && $source['port'] == '10152') {
+		$aprs_full = true;
+	}
 	break;
     }
 }
@@ -391,25 +497,46 @@ 
 	$aprs_connect = 0;
 	$aprs_keep = 120;
 	$aprs_last_tx = time();
-	if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
-	else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
-	if (isset($globalAPRSssid)) $aprs_ssid = $globalAPRSssid;
-	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
-	if (isset($globalAPRSfilter)) $aprs_filter = $globalAPRSfilter;
-	else $aprs_filter =  'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
-	if ($aprs_full) $aprs_filter = '';
-	if (isset($globalAPRSpass)) $aprs_pass = $globalAPRSpass;
-	else $aprs_pass = '-1';
+	if (isset($globalAPRSversion)) {
+		$aprs_version = $globalAPRSversion;
+	} else {
+		$aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
+	}
+	if (isset($globalAPRSssid)) {
+		$aprs_ssid = $globalAPRSssid;
+	} else {
+		$aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
+	}
+	if (isset($globalAPRSfilter)) {
+		$aprs_filter = $globalAPRSfilter;
+	} else {
+		$aprs_filter =  'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
+	}
+	if ($aprs_full) {
+		$aprs_filter = '';
+	}
+	if (isset($globalAPRSpass)) {
+		$aprs_pass = $globalAPRSpass;
+	} else {
+		$aprs_pass = '-1';
+	}
 
-	if ($aprs_filter != '') $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version} filter {$aprs_filter}\n";
-	else $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n";
-}
+	if ($aprs_filter != '') {
+		$aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version} filter {$aprs_filter}\n";
+	} else {
+		$aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n";
+	}
+	}
 
 // connected - lets do some work
 //if ($globalDebug) echo "Connected!\n";
 sleep(1);
-if ($globalDebug) echo "SCAN MODE \n\n";
-if (!isset($globalCronEnd)) $globalCronEnd = 60;
+if ($globalDebug) {
+	echo "SCAN MODE \n\n";
+}
+if (!isset($globalCronEnd)) {
+	$globalCronEnd = 60;
+}
 $endtime = time()+$globalCronEnd;
 $i = 1;
 $tt = array();
@@ -423,22 +550,32 @@ 
 
 // 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();
+    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";
+	if ($globalDebug) {
+		echo 'Delete old ATC...'."\n";
+	}
         $ATC->deleteOldATC();
     }
     
     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";
+	    if ($globalDebug) {
+	    	echo 'Sleeping...'."\n";
+	    }
 	    sleep($globalMinFetch-$max+2);
 	}
     }
@@ -448,7 +585,9 @@ 
     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 (!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'])) || 
@@ -457,7 +596,9 @@ 
 	) {
         //$buffer = $Common->getData($hosts[$id]);
         $buffer = $Common->getData($value['host']);
-        if ($buffer != '') $reset = 0;
+        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) {
@@ -466,20 +607,41 @@ 
                 $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
+                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'];
+                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);
             }
@@ -514,11 +676,20 @@ 
                     $data['format_source'] = 'radarcapejson';
                     $data['id_source'] = $id_source;
                     if (isset($value['name']) && $value['name'] != '') {
-                        if (isset($line['src']) && !$line['src'] == 'M') $data['source_name'] = $value['name'].'_MLAT';
-                        else $data['source_name'] = $value['name'];
-                    } elseif (isset($line['src']) && $line['src'] == 'M') $data['source_name'] = 'MLAT';
-                    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-                    if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
+                        if (isset($line['src']) && !$line['src'] == 'M') {
+                        	$data['source_name'] = $value['name'].'_MLAT';
+                        } else {
+                        	$data['source_name'] = $value['name'];
+                        }
+                    } elseif (isset($line['src']) && $line['src'] == 'M') {
+                    	$data['source_name'] = 'MLAT';
+                    }
+                    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+                    	$data['noarchive'] = true;
+                    }
+                    if (isset($value['sourcestats'])) {
+                    	$data['sourcestats'] = $value['sourcestats'];
+                    }
 
                     $SI->add($data);
                     unset($data);
@@ -534,7 +705,9 @@ 
 	    date_default_timezone_set('CET');
 	    $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
 	    date_default_timezone_set('UTC');
-	    if ($buffer != '') $reset = 0;
+	    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) {
@@ -543,18 +716,42 @@ 
 		    $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['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']) {
@@ -568,8 +765,12 @@ 
 		    $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);
+		    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);
 		}
     	    }
@@ -592,20 +793,48 @@ 
 			    if ($line != '') {
 				$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['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['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['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']);
 				} else {
@@ -613,18 +842,27 @@ 
 				}
 				$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);
+				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 (isset($tt[$format])) {
+		    	$tt[$format]++;
+		    } else {
+		    	$tt[$format] = 0;
+		    }
 		    if ($tt[$format] > 30) {
-			if ($globalDebug) echo 'Reconnect...'."\n";
+			if ($globalDebug) {
+				echo 'Reconnect...'."\n";
+			}
 			sleep(2);
 			//$sourceeen[] = $value;
 			//connect_all($sourceeen);
@@ -660,12 +898,18 @@ 
 			    //    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']));
+			    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;
+			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+			    	$data['noarchive'] = true;
+			    }
 			    $MI->add($data);
 			    unset($data);
 			}
@@ -690,7 +934,9 @@ 
 			    $data['callsign'] = $line['callsign'];
 			    $data['mmsi'] = substr($line['mmsi'],-9);
 			    $data['speed'] = $line['sog'];
-			    if ($line['heading'] != '511') $data['heading'] = $line['heading'];
+			    if ($line['heading'] != '511') {
+			    	$data['heading'] = $line['heading'];
+			    }
 			    $data['latitude'] = $line['latitude'];
 			    $data['longitude'] = $line['longitude'];
 			    $data['type_id'] = $line['shiptype'];
@@ -698,7 +944,9 @@ 
 			    $data['datetime'] = $line['time'];
 			    $data['format_source'] = 'boatbeaconapp';
 			    $data['id_source'] = $id_source;
-			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+			    	$data['noarchive'] = true;
+			    }
 			    $MI->add($data);
 			    unset($data);
 			}
@@ -720,22 +968,44 @@ 
 		    foreach ($all_data['features'] as $line) {
 			print_r($line);
 			$data = array();
-			if (isset($line['properties']['name'])) $data['ident'] = $line['properties']['name'];
-			if (isset($line['properties']['callsign'])) $data['callsign'] = $line['properties']['callsign'];
-			if (isset($line['properties']['mmsi'])) $data['mmsi'] = substr($line['properties']['mmsi'],-9);
-			if (isset($line['properties']['imo'])) $data['imo'] = $line['properties']['imo'];
-			if (isset($line['properties']['speed'])) $data['speed'] = $line['properties']['speed'];
-			if (isset($line['properties']['heading']) && $line['properties']['heading'] != 0) $data['heading'] = $line['properties']['heading'];
+			if (isset($line['properties']['name'])) {
+				$data['ident'] = $line['properties']['name'];
+			}
+			if (isset($line['properties']['callsign'])) {
+				$data['callsign'] = $line['properties']['callsign'];
+			}
+			if (isset($line['properties']['mmsi'])) {
+				$data['mmsi'] = substr($line['properties']['mmsi'],-9);
+			}
+			if (isset($line['properties']['imo'])) {
+				$data['imo'] = $line['properties']['imo'];
+			}
+			if (isset($line['properties']['speed'])) {
+				$data['speed'] = $line['properties']['speed'];
+			}
+			if (isset($line['properties']['heading']) && $line['properties']['heading'] != 0) {
+				$data['heading'] = $line['properties']['heading'];
+			}
 			$data['latitude'] = $line['geometry']['coordinates'][1];
 			$data['longitude'] = $line['geometry']['coordinates'][0];
-			if (isset($line['properties']['vesselType'])) $data['type'] = $line['properties']['vesselType'];
-			if (isset($line['properties']['destination'])) $data['arrival_code'] = $line['properties']['destination'];
-			if (isset($line['properties']['eta']) && $line['properties']['eta'] != '') $data['arrival_date'] = $line['properties']['eta'];
+			if (isset($line['properties']['vesselType'])) {
+				$data['type'] = $line['properties']['vesselType'];
+			}
+			if (isset($line['properties']['destination'])) {
+				$data['arrival_code'] = $line['properties']['destination'];
+			}
+			if (isset($line['properties']['eta']) && $line['properties']['eta'] != '') {
+				$data['arrival_date'] = $line['properties']['eta'];
+			}
 			$data['format_source'] = 'boatnerd';
 			$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 ($line['properties']['vesselType'] != 'Navigation Aid') $MI->add($data);
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+				$data['noarchive'] = true;
+			}
+			if ($line['properties']['vesselType'] != 'Navigation Aid') {
+				$MI->add($data);
+			}
 			unset($data);
 		    }
 		}
@@ -748,11 +1018,17 @@ 
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
 	    )
 	) {
-	    if ($globalDebug) echo 'download...';
+	    if ($globalDebug) {
+	    	echo 'download...';
+	    }
 	    $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
-	    if ($globalDebug) echo 'done !'."\n";
+	    if ($globalDebug) {
+	    	echo 'done !'."\n";
+	    }
 	    // FIXME: Need more work
-	    if ($buffer != '') $reset = 0;
+	    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) {
@@ -778,7 +1054,9 @@ 
 		    //$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;
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+		    	$data['noarchive'] = true;
+		    }
 		    //print_r($data);
 		    //echo 'Add...'."\n";
 		    $MI->add($data);
@@ -800,11 +1078,17 @@ 
 		}
 	    }
 
-	    if ($globalDebug) echo '! Download... ';
+	    if ($globalDebug) {
+	    	echo '! Download... ';
+	    }
 	    for ($i =0; $i <= 1; $i++) {
-		if ($globalDebug) echo 'Racetype: '.$i.' ';
+		if ($globalDebug) {
+			echo 'Racetype: '.$i.' ';
+		}
 		$buffer = $Common->getData('http://backend.sailaway.world/cgi-bin/sailaway/GetMissions.pl?race=1&tutorial=0&hist=1&racetype='.$i);
-	    if ($globalDebug) echo 'done'."\n";
+	    if ($globalDebug) {
+	    	echo 'done'."\n";
+	    }
 	    if ($buffer != '') {
 		$all_data = json_decode($buffer,true);
 		if (isset($all_data['missions'])) {
@@ -815,7 +1099,9 @@ 
 					if (isset($sailaway_authcookie) && $sailaway_authcookie != '') {
 						$racebuffer = $Common->getData('http://backend.sailaway.world/cgi-bin/sailaway/GetMission.pl?misnr='.$mission['misnr'],'get','','',$sailaway_authcookie);
 						sleep(30);
-					} else $racebuffer = '';
+					} else {
+						$racebuffer = '';
+					}
 					$bufferm = $Common->getData('http://backend.sailaway.world/cgi-bin/sailaway/GetLeaderboard.pl?misnr='.$mission['misnr']);
 				} else {
 					$bufferm = '';
@@ -879,7 +1165,9 @@ 
 								$data['captain_id'] = $sail['usrnr'];
 								$data['captain_name'] = $sail['usrname'];
 								$data['race_id'] = $sail['misnr'];
-								if ($sail['rank'] != 'DNF') $data['race_rank'] = $sail['rank'];
+								if ($sail['rank'] != 'DNF') {
+									$data['race_rank'] = $sail['rank'];
+								}
 								$data['race_time'] = $sail['racetime'];
 								if ($mission_user != '') {
 									$data['race_name'] = $mission_name.' ('.$mission_user.')';
@@ -889,7 +1177,9 @@ 
 								//$data['callsign'] = trim(substr($line,100,7);
 								$data['format_source'] = 'sailawayfull';
 								$data['id_source'] = $id_source;
-								if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+								if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+									$data['noarchive'] = true;
+								}
 								//print_r($data);
 								//if ($data['race_id'] == '48') print_r($data);
 								//echo 'Add...'."\n";
@@ -927,7 +1217,9 @@ 
 		echo 'Sailaway API key MUST be defined';
 		exit(0);
 	    }
-	    if ($globalDebug) echo '! Download... ';
+	    if ($globalDebug) {
+	    	echo '! Download... ';
+	    }
 	    $buffer = $Common->getData('http://backend.sailaway.world/cgi-bin/sailaway/TrackAllBoats.pl?key='.$globalSailaway['key'],'get','','','','',30);
 	    if ($buffer != '') {
 		$data = json_decode($buffer,true);
@@ -937,7 +1229,9 @@ 
 			$data = array();
 			$data['id'] = $sail['ubtnr'];
 			$data['datetime'] = date('Y-m-d H:i:s');
-			if ($sail['online'] == '1') $data['last_update'] = date('Y-m-d H:i:s');
+			if ($sail['online'] == '1') {
+				$data['last_update'] = date('Y-m-d H:i:s');
+			}
 			$data['latitude'] = $sail['ubtlat'];
 			$data['longitude'] = $sail['ubtlon'];
 			$data['type_id'] = 36;
@@ -950,12 +1244,18 @@ 
 			$data['speed'] = round($sail['ubtspeed']*3.6,2);
 			$data['format_source'] = 'sailaway';
 			$data['id_source'] = $id_source;
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+				$data['noarchive'] = true;
+			}
 			$MI->add($data);
 			unset($data);
 		    }
-		} elseif ($globalDebug) echo 'Error in JSON parsing';
-	    } elseif ($globalDebug) echo 'Empty result !'."\n";
+		} elseif ($globalDebug) {
+			echo 'Error in JSON parsing';
+		}
+	    } elseif ($globalDebug) {
+	    	echo 'Empty result !'."\n";
+	    }
     	    $last_exec[$id]['last'] = time();
 	//} elseif (($value === 'whazzup' && (time() - $last_exec['whazzup'] > $globalMinFetch)) || ($value === 'vatsimtxt' && (time() - $last_exec['vatsimtxt'] > $globalMinFetch))) {
 	} elseif (
@@ -983,16 +1283,28 @@ 
     		    $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];
+			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];
+			}
 			$data['pilot_id'] = $line[1];
 			$data['pilot_name'] = $line[2];
 			$data['hex'] = str_pad(dechex($Common->str2int($line[1])),6,'000000',STR_PAD_LEFT);
 			$data['ident'] = $line[0]; // ident
-			if ($line[7] != '' && $line[7] != 0) $data['altitude'] = $line[7]; // altitude
+			if ($line[7] != '' && $line[7] != 0) {
+				$data['altitude'] = $line[7];
+			}
+			// altitude
 			$data['speed'] = $line[8]; // speed
-			if (isset($line[45])) $data['heading'] = $line[45]; // heading
-			elseif (isset($line[38])) $data['heading'] = $line[38]; // heading
+			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
@@ -1008,7 +1320,9 @@ 
 			$data['frequency'] = $line[4];
 			$data['type'] = $line[18];
 			$data['range'] = $line[19];
-			if (isset($line[35])) $data['info'] = $line[35];
+			if (isset($line[35])) {
+				$data['info'] = $line[35];
+			}
     			$data['id_source'] = $id_source;
 	    		//$data['arrival_airport_time'] = ;
 	    		if ($line[9] != '') {
@@ -1022,27 +1336,47 @@ 
 	    		elseif ($value === 'vatsimtxt') $data['format_source'] = 'vatsimtxt';
 	    		*/
 	    		$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);
-			elseif ($line[3] === 'ATC') {
+			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);
+    			} elseif ($line[3] === 'ATC') {
 				//print_r($data);
 				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
 				$data['info'] = str_replace('&amp;sect;','',$data['info']);
 				$typec = substr($data['ident'],-3);
-				if ($typec === 'APP') $data['type'] = 'Approach';
-				elseif ($typec === 'TWR') $data['type'] = 'Tower';
-				elseif ($typec === 'OBS') $data['type'] = 'Observer';
-				elseif ($typec === 'GND') $data['type'] = 'Ground';
-				elseif ($typec === 'DEL') $data['type'] = 'Delivery';
-				elseif ($typec === 'DEP') $data['type'] = 'Departure';
-				elseif ($typec === 'FSS') $data['type'] = 'Flight Service Station';
-				elseif ($typec === 'CTR') $data['type'] = 'Control Radar or Centre';
-				elseif ($data['type'] === '') $data['type'] = 'Observer';
-				if (!isset($data['source_name'])) $data['source_name'] = '';
+				if ($typec === 'APP') {
+					$data['type'] = 'Approach';
+				} elseif ($typec === 'TWR') {
+					$data['type'] = 'Tower';
+				} elseif ($typec === 'OBS') {
+					$data['type'] = 'Observer';
+				} elseif ($typec === 'GND') {
+					$data['type'] = 'Ground';
+				} elseif ($typec === 'DEL') {
+					$data['type'] = 'Delivery';
+				} elseif ($typec === 'DEP') {
+					$data['type'] = 'Departure';
+				} elseif ($typec === 'FSS') {
+					$data['type'] = 'Flight Service Station';
+				} elseif ($typec === 'CTR') {
+					$data['type'] = 'Control Radar or Centre';
+				} elseif ($data['type'] === '') {
+					$data['type'] = 'Observer';
+				}
+				if (!isset($data['source_name'])) {
+					$data['source_name'] = '';
+				}
 				if (isset($ATC)) {
-					if (count($ATC->getByIdent($data['ident'],$data['format_source'])) > 0) echo $ATC->update($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']);
-					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']);
+					if (count($ATC->getByIdent($data['ident'],$data['format_source'])) > 0) {
+						echo $ATC->update($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']);
+					} 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);
@@ -1069,14 +1403,20 @@ 
 			$data['datetime'] = date('Y-m-d H:i:s',strtotime((string)$line['entryTime'].' BST'));
 			$data['latitude'] = (float)$line['pktLatitude'];
 			$data['longitude'] = (float)$line['pktLongitude'];
-			if ((float)$line['pktTrack'] != 0) $data['heading'] = (float)$line['pktTrack'];
-			if ((int)$line['pktSpeed'] != 0) $data['speed'] = (int)$line['pktSpeed'];
+			if ((float)$line['pktTrack'] != 0) {
+				$data['heading'] = (float)$line['pktTrack'];
+			}
+			if ((int)$line['pktSpeed'] != 0) {
+				$data['speed'] = (int)$line['pktSpeed'];
+			}
 			$data['altitude'] = round((int)$line['pktAltitude']*3.28084);
 			$data['altitude_relative'] = 'AMSL';
 			$data['pilot_id'] = (int)$line['pktPilotID'];
 			$data['aircraft_icao'] = 'PARAGLIDER';
 			$pilot_data = explode(',',$Common->getData('http://www.airwhere.co.uk/pilotdetails.php?pilot='.$data['pilot_id']));
-			if (isset($pilot_data[4])) $data['pilot_name'] = $pilot_data[4];
+			if (isset($pilot_data[4])) {
+				$data['pilot_name'] = $pilot_data[4];
+			}
 			$data['format_source'] = $value['format'];
 			$SI->add($data);
 			unset($data);
@@ -1124,25 +1464,59 @@ 
 		    foreach ($all_data['acList'] as $line) {
 			$data = array();
 			$data['hex'] = $line['Icao']; // hex
-			if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
-			if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
-			if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
-			if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
-			if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
-			if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
+			if (isset($line['Call'])) {
+				$data['ident'] = $line['Call'];
+			}
+			// ident
+			if (isset($line['Alt'])) {
+				$data['altitude'] = $line['Alt'];
+			}
+			// altitude
+			if (isset($line['Spd'])) {
+				$data['speed'] = $line['Spd'];
+			}
+			// speed
+			if (isset($line['Trak'])) {
+				$data['heading'] = $line['Trak'];
+			}
+			// heading
+			if (isset($line['Lat'])) {
+				$data['latitude'] = $line['Lat'];
+			}
+			// lat
+			if (isset($line['Long'])) {
+				$data['longitude'] = $line['Long'];
+			}
+			// long
 			//$data['verticalrate'] = $line['']; // verticale rate
-			if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
+			if (isset($line['Sqk'])) {
+				$data['squawk'] = $line['Sqk'];
+			}
+			// squawk
 			$data['emergency'] = ''; // emergency
-			if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
-			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
-			else $data['datetime'] = date('Y-m-d H:i:s');
+			if (isset($line['Reg'])) {
+				$data['registration'] = $line['Reg'];
+			}
+			if (isset($line['PosTime'])) {
+				$data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
+			} else {
+				$data['datetime'] = date('Y-m-d H:i:s');
+			}
 			//$data['datetime'] = date('Y-m-d H:i:s');
-			if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
+			if (isset($line['Type'])) {
+				$data['aircraft_icao'] = $line['Type'];
+			}
 			$data['format_source'] = 'aircraftlistjson';
 			$data['id_source'] = $id_source;
-			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-			if (isset($data['latitude'])) $SI->add($data);
+			if (isset($value['name']) && $value['name'] != '') {
+				$data['source_name'] = $value['name'];
+			}
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+				$data['noarchive'] = true;
+			}
+			if (isset($data['latitude'])) {
+				$SI->add($data);
+			}
 			unset($data);
 		    }
 		} elseif (is_array($all_data)) {
@@ -1159,17 +1533,26 @@ 
 			$data['verticalrate'] = $line['vrt']; // verticale rate
 			$data['squawk'] = $line['squawk']; // squawk
 			$data['emergency'] = ''; // emergency
-			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
-			else $data['datetime'] = date('Y-m-d H:i:s');
+			if (isset($line['PosTime'])) {
+				$data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
+			} else {
+				$data['datetime'] = date('Y-m-d H:i:s');
+			}
 			$data['format_source'] = 'aircraftlistjson';
 			$data['id_source'] = $id_source;
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
-			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			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);
 		    }
 		}
-	    } elseif ($globalDebug) echo 'No data'."\n";
+	    } elseif ($globalDebug) {
+	    	echo 'No data'."\n";
+	    }
     	    //$last_exec['aircraftlistjson'] = time();
     	    $last_exec[$id]['last'] = time();
     	//} elseif ($value === 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
@@ -1205,8 +1588,12 @@ 
 		    $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'];
+		    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);
 		}
@@ -1240,7 +1627,9 @@ 
 		    $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;
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
+		    	$data['noarchive'] = true;
+		    }
 		    $SI->add($data);
 		    unset($data);
 		}
@@ -1260,15 +1649,42 @@ 
 		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
+		    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];
@@ -1276,10 +1692,17 @@ 
 		    $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;
+			    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);
 		}
@@ -1299,22 +1722,54 @@ 
 		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
+		    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'];
+		    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;
+		    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);
 		}
@@ -1330,7 +1785,9 @@ 
 	    //$buffer = $Common->getData($hosts[$id]);
 	    $buffer = $Common->getData($value['host']);
 	    $all_data = json_decode($buffer,true);
-	    if (!empty($all_data)) $reset = 0;
+	    if (!empty($all_data)) {
+	    	$reset = 0;
+	    }
 	    foreach ($all_data as $key => $line) {
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
 		    $data = array();
@@ -1351,8 +1808,12 @@ 
 		    $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'];
+		    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);
 		}
@@ -1381,24 +1842,42 @@ 
 		    if (isset($line['inf'])) {
 			$data = array();
 			$data['hex'] = $line['inf']['ia'];
-			if (isset($line['inf']['cs'])) $data['ident'] = $line['inf']['cs']; //$line[13]
+			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
+	    		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
+	    		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'];
+	    		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['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10]
 	    		$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'];
+			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);
 		    }
@@ -1424,30 +1903,65 @@ 
 		    $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
+		    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'];
+		    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'] = '';
+		    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 (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);
@@ -1456,16 +1970,28 @@ 
 			$data['info'] = str_replace('&amp;sect;','',$data['info']);
 			$typec = substr($data['ident'],-3);
 			$data['type'] = '';
-			if ($typec === 'APP') $data['type'] = 'Approach';
-			elseif ($typec === 'TWR') $data['type'] = 'Tower';
-			elseif ($typec === 'OBS') $data['type'] = 'Observer';
-			elseif ($typec === 'GND') $data['type'] = 'Ground';
-			elseif ($typec === 'DEL') $data['type'] = 'Delivery';
-			elseif ($typec === 'DEP') $data['type'] = 'Departure';
-			elseif ($typec === 'FSS') $data['type'] = 'Flight Service Station';
-			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']);
+			if ($typec === 'APP') {
+				$data['type'] = 'Approach';
+			} elseif ($typec === 'TWR') {
+				$data['type'] = 'Tower';
+			} elseif ($typec === 'OBS') {
+				$data['type'] = 'Observer';
+			} elseif ($typec === 'GND') {
+				$data['type'] = 'Ground';
+			} elseif ($typec === 'DEL') {
+				$data['type'] = 'Delivery';
+			} elseif ($typec === 'DEP') {
+				$data['type'] = 'Departure';
+			} elseif ($typec === 'FSS') {
+				$data['type'] = 'Flight Service Station';
+			} 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);
 		}
@@ -1480,7 +2006,9 @@ 
 	    )
 	) {
 	    //$buffer = $Common->getData($hosts[$id]);
-	    if ($globalDebug) echo 'Get Data...'."\n";
+	    if ($globalDebug) {
+	    	echo 'Get Data...'."\n";
+	    }
 	    $buffer = $Common->getData($value['host']);
 	    $all_data = json_decode($buffer,true);
 	    if ($buffer != '' && is_array($all_data)) {
@@ -1488,10 +2016,16 @@ 
 		foreach ($all_data as $line) {
 	    	    $data = array();
 	    	    //$data['id'] = $line['id']; // id not usable
-	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
+	    	    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'];
+	    	    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
@@ -1507,7 +2041,9 @@ 
 	    		$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');
+	    	    } 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'];
@@ -1515,29 +2051,47 @@ 
     		    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
+    		    } 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 {
+	    		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($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'];
+    		    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'];
+		    if (isset($value['name']) && $value['name'] != '') {
+		    	$data['source_name'] = $value['name'];
+		    }
 		    $SI->add($data);
 		    unset($data);
 		}
-		if ($globalDebug) echo 'No more data...'."\n";
+		if ($globalDebug) {
+			echo 'No more data...'."\n";
+		}
 		unset($buffer);
 		unset($all_data);
 	    }
@@ -1550,7 +2104,9 @@ 
 	    )
 	) {
 	    //$buffer = $Common->getData($hosts[$id]);
-	    if ($globalDebug) echo 'Get Data...'."\n";
+	    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'])) {
@@ -1561,10 +2117,16 @@ 
 	    	    //$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'];
+	    	    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'];
+	    	    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
@@ -1577,7 +2139,9 @@ 
 	    		$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');
+	    	    } 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'];
@@ -1585,17 +2149,26 @@ 
 		    $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
+		    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'];
+		    if (isset($value['name']) && $value['name'] != '') {
+		    	$data['source_name'] = $value['name'];
+		    }
 		    $SI->add($data);
 		    unset($data);
 		}
-		if ($globalDebug) echo 'No more data...'."\n";
+		if ($globalDebug) {
+			echo 'No more data...'."\n";
+		}
 		unset($buffer);
 		unset($all_data);
 	    }
@@ -1608,7 +2181,9 @@ 
 	    )
 	) {
 	    //$buffer = $Common->getData($hosts[$id]);
-	    if ($globalDebug) echo 'Get Data...'."\n";
+	    if ($globalDebug) {
+	    	echo 'Get Data...'."\n";
+	    }
 	    $buffer = $Common->getData($value['host']);
 	    $all_data = json_decode($buffer,true);
 	    if ($buffer != '' && is_array($all_data)) {
@@ -1637,16 +2212,25 @@ 
 	    	    $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
+		    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'];
+		    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";
+		if ($globalDebug) {
+			echo 'No more data...'."\n";
+		}
 		unset($buffer);
 		unset($all_data);
 	    }
@@ -1659,7 +2243,9 @@ 
 	    )
 	) {
 	    //$buffer = $Common->getData($hosts[$id]);
-	    if ($globalDebug) echo 'Get Data...'."\n";
+	    if ($globalDebug) {
+	    	echo 'Get Data...'."\n";
+	    }
 	    $buffer = $Common->getData($value['host']);
 	    $all_data = json_decode($buffer,true);
 	    if ($buffer != '') {
@@ -1677,12 +2263,16 @@ 
 			$data['id_source'] = $id_source;
 			$data['format_source'] = 'blitzortung';
 			$SI->add($data);
-			if ($globalDebug) echo '☈ Lightning added'."\n";
+			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";
+		if ($globalDebug) {
+			echo 'No more data...'."\n";
+		}
 		unset($buffer);
 	    }
 	    $last_exec[$id]['last'] = time();
@@ -1711,10 +2301,15 @@ 
                 }
             } else {
                 $format = $value['format'];
-                if (isset($tt[$format])) $tt[$format]++;
-                else $tt[$format] = 0;
+                if (isset($tt[$format])) {
+                	$tt[$format]++;
+                } else {
+                	$tt[$format] = 0;
+                }
                 if ($tt[$format] > 30) {
-                    if ($globalDebug) echo 'Reconnect...'."\n";
+                    if ($globalDebug) {
+                    	echo 'Reconnect...'."\n";
+                    }
                     sleep(2);
                     //$sourceeen[] = $value;
                     //connect_all($sourceeen);
@@ -1731,7 +2326,9 @@ 
 	    $write = NULL;
 	    $e = NULL;
 	    $n = socket_select($read, $write, $e, $timeout);
-	    if ($e != NULL) var_dump($e);
+	    if ($e != NULL) {
+	    	var_dump($e);
+	    }
 	    if ($n > 0) {
 		$reset = 0;
 		foreach ($read as $nb => $r) {
@@ -1753,13 +2350,17 @@ 
 		    if ($buffer !== FALSE) {
 			if ($format === 'vrstcp') {
 			    $buffer = explode('},{',$buffer);
-			} else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
+			} else {
+				$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
+			}
 		    }
 		    // SBS format is CSV format
 		    if ($buffer !== FALSE && $buffer !== '') {
 			$tt[$format] = 0;
 			if ($format === 'acarssbs3') {
-			    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
+			    if ($globalDebug) {
+			    	echo 'ACARS : '.$buffer."\n";
+			    }
 			    $ACARS->add(trim($buffer));
 			    $ACARS->deleteLiveAcarsData();
 			} elseif ($format === 'raw') {
@@ -1769,9 +2370,15 @@ 
 				//if (!empty($data)) print_r($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 (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);
 				$SI->add($data);
 				unset($data);
@@ -1779,22 +2386,54 @@ 
 			} 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'];
+			    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'])) {
 				$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
@@ -1803,7 +2442,9 @@ 
 			    }
 			    $data['format_source'] = 'aisnmea';
     			    $data['id_source'] = $id_source;
-			    if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') $MI->add($data);
+			    if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') {
+			    	$MI->add($data);
+			    }
 			    unset($data);
                         } elseif ($format === 'flightgearsp') {
                     	    //echo $buffer."\n";
@@ -1821,17 +2462,25 @@ 
 				$data['speed'] = round($line[5]*1.94384);
 				$data['datetime'] = date('Y-m-d H:i:s');
 				$data['format_source'] = 'flightgearsp';
-				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);
+				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";
+                    	    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 === 'acarsjsonudp') {
-			    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
+			    if ($globalDebug) {
+			    	echo 'ACARS : '.$buffer."\n";
+			    }
                             $line = json_decode(trim($buffer), true);
                             if (!empty($line)) {
 				$line = array_merge(array('text' => '','tail' => '','label' => '','block_id' => '','flight' => '','msgno' => ''),$line);
@@ -1856,8 +2505,12 @@ 
 				    $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);
+				    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') {
@@ -1867,28 +2520,62 @@ 
 			    foreach($buffer as $all_data) {
 				$line = json_decode('{'.$all_data.'}',true);
 				$data = array();
-				if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex
-				if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
-				if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
-				if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
-				if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
-				if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
-				if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
+				if (isset($line['Icao'])) {
+					$data['hex'] = $line['Icao'];
+				}
+				// hex
+				if (isset($line['Call'])) {
+					$data['ident'] = $line['Call'];
+				}
+				// ident
+				if (isset($line['Alt'])) {
+					$data['altitude'] = $line['Alt'];
+				}
+				// altitude
+				if (isset($line['Spd'])) {
+					$data['speed'] = $line['Spd'];
+				}
+				// speed
+				if (isset($line['Trak'])) {
+					$data['heading'] = $line['Trak'];
+				}
+				// heading
+				if (isset($line['Lat'])) {
+					$data['latitude'] = $line['Lat'];
+				}
+				// lat
+				if (isset($line['Long'])) {
+					$data['longitude'] = $line['Long'];
+				}
+				// long
 				//$data['verticalrate'] = $line['']; // verticale rate
-				if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
+				if (isset($line['Sqk'])) {
+					$data['squawk'] = $line['Sqk'];
+				}
+				// squawk
 				$data['emergency'] = ''; // emergency
-				if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
+				if (isset($line['Reg'])) {
+					$data['registration'] = $line['Reg'];
+				}
 				/*
 				if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',$line['PosTime']/1000);
 				else $data['datetime'] = date('Y-m-d H:i:s');
 				*/
 				$data['datetime'] = date('Y-m-d H:i:s');
-				if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
+				if (isset($line['Type'])) {
+					$data['aircraft_icao'] = $line['Type'];
+				}
 		    		$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);
+				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') {
@@ -1901,22 +2588,46 @@ 
     				$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'];
+    				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);
+    				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;
+    			    } else {
+    			    	$error = true;
+    			    }
 			} elseif ($format === 'aprs' && $use_aprs) {
 			    if ($aprs_connect === 0) {
 				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
@@ -1942,47 +2653,96 @@ 
 				    $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');
+				    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'];
+				    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'];
+				    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['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'];
+				    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['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;
+				    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';
+    				    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'];
+				    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';
+				    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 (
@@ -1994,7 +2754,9 @@ 
 					$send = $SI->add($data);
 				    } elseif ($data['source_type'] === 'ais') {
 					$data['type'] = '';
-					if (isset($globalMarine) && $globalMarine) $send = $MI->add($data);
+					if (isset($globalMarine) && $globalMarine) {
+						$send = $MI->add($data);
+					}
 				    } 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']) && (
@@ -2002,8 +2764,12 @@ 
 					    $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';
+					    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)' || 
@@ -2034,9 +2800,13 @@ 
 				    //} 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);
+					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'])) {
-					if (!isset($data['altitude'])) $data['altitude'] = 0;
+					if (!isset($data['altitude'])) {
+						$data['altitude'] = 0;
+					}
 					$Source->deleteOldLocationByType('gs');
 					if (count($Source->getLocationInfoByNameType($data['ident'],'gs')) > 0) {
 						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']);
@@ -2045,7 +2815,9 @@ 
 					}
 				    } elseif (isset($line['symbol']) && $line['symbol'] === 'Weather Station') {
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
-					if ($globalDebug) echo '# Weather Station added'."\n";
+					if ($globalDebug) {
+						echo '# Weather Station added'."\n";
+					}
 					$Source->deleteOldLocationByType('wx');
 					$weather_data = json_encode($line);
 					if (count($Source->getLocationInfoByNameType($data['ident'],'wx')) > 0) {
@@ -2055,7 +2827,9 @@ 
 					}
 				    } 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";
+					if ($globalDebug) {
+						echo '☈ Lightning added'."\n";
+					}
 					$Source->deleteOldLocationByType('lightning');
 					if (count($Source->getLocationInfoByNameType($data['ident'],'lightning')) > 0) {
 						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'weather/thunderstorm.png','lightning',$id,0,$data['datetime'],$data['comment']);
@@ -2067,8 +2841,7 @@ 
 				    	print_r($line);
 				    }
 				    unset($data);
-				}
-				elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') {
+				} elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') {
 					$Source->updateLocationDescByName($line['ident'],$line['source'],$id,$line['comment']);
 				}
 				/*
@@ -2077,7 +2850,9 @@ 
 				}
 				*/
 				//elseif ($line === false && $globalDebug) echo 'Ignored ('.$buffer.")\n";
-				elseif ($line === true && $globalDebug) echo '!! Failed : '.$buffer."!!\n";
+				elseif ($line === true && $globalDebug) {
+					echo '!! Failed : '.$buffer."!!\n";
+				}
 				if (isset($Source) && isset($globalSources[$nb]['last_weather_clean']) && time()-$globalSources[$nb]['last_weather_clean'] > 60*5) {
 					$Source->deleteOldLocationByType('lightning');
 					$Source->deleteOldLocationByType('wx');
@@ -2114,27 +2889,47 @@ 
     				$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]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
+				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]['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;
+    				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;
+    			    } 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";
+					if ($globalDebug) {
+						echo "Not a message. Ignoring... \n";
+					}
 				} else {
-					if ($globalDebug) echo "Wrong line format. Ignoring... \n";
+					if ($globalDebug) {
+						echo "Wrong line format. Ignoring... \n";
+					}
 					if ($globalDebug) {
 						echo $buffer;
 						//print_r($line);
 					}
 					//socket_close($r);
-					if ($globalDebug) echo "Reconnect after an error...\n";
-					if ($format === 'aprs') $aprs_connect = 0;
+					if ($globalDebug) {
+						echo "Reconnect after an error...\n";
+					}
+					if ($format === 'aprs') {
+						$aprs_connect = 0;
+					}
 					$sourceer[$nb] = $globalSources[$nb];
 					connect_all($sourceer);
 					$sourceer = array();
@@ -2142,10 +2937,14 @@ 
 			    }
 			}
 			// Sleep for xxx microseconds
-			if (isset($globalSBSSleep)) usleep($globalSBSSleep);
+			if (isset($globalSBSSleep)) {
+				usleep($globalSBSSleep);
+			}
 		    } 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];
@@ -2154,10 +2953,15 @@ 
 				break;
 				
 			} elseif ($format != 'acars' && $format != 'flightgearsp') {
-			    if (isset($tt[$format])) $tt[$format]++;
-			    else $tt[$format] = 0;
+			    if (isset($tt[$format])) {
+			    	$tt[$format]++;
+			    } else {
+			    	$tt[$format] = 0;
+			    }
 			    if ($tt[$format] > 30 || $buffer === FALSE) {
-				if ($globalDebug) echo "ERROR : Reconnect ".$format."...";
+				if ($globalDebug) {
+					echo "ERROR : Reconnect ".$format."...";
+				}
 				//@socket_close($r);
 				sleep(2);
 				$aprs_connect = 0;
@@ -2175,11 +2979,17 @@ 
 	    } 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";
+			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) {
 				@socket_shutdown($sock,2);
@@ -2187,25 +2997,45 @@ 
 			    }
 			    
 			}
-			if ($globalDebug) echo "Waiting...";
+			if ($globalDebug) {
+				echo "Waiting...";
+			}
 			sleep(2);
 			$time = time();
 			//connect_all($hosts);
 			$aprs_connect = 0;
-			if ($reset%5 === 0) sleep(20);
-			if ($reset%10 === 0) sleep(100);
-			if ($reset%20 === 0) sleep(200);
-			if ($reset > 100) exit('Too many attempts...');
-			if ($globalDebug) echo "Restart all connections...";
+			if ($reset%5 === 0) {
+				sleep(20);
+			}
+			if ($reset%10 === 0) {
+				sleep(100);
+			}
+			if ($reset%20 === 0) {
+				sleep(200);
+			}
+			if ($reset > 100) {
+				exit('Too many attempts...');
+			}
+			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();
+	    }
 	}
     }
 }