Ysurac / FlightAirMap

scripts/daemon-spotter.php

Braces +1228 added lines, -413 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'];
 	$globalSources[$id]['last_exec'] = 0;
@@ -171,32 +218,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)) {
@@ -213,7 +272,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);
@@ -222,37 +283,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);
@@ -261,7 +338,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);
@@ -270,17 +349,26 @@ 
             } 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'] == '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) 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) {
+    			echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
+    		}
         } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
 	    $hostport = explode(':',$host);
 	    if (isset($hostport[1])) {
@@ -320,19 +408,27 @@ 
         		//$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) echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
+		if ($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();
@@ -341,13 +437,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);
@@ -376,7 +478,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;
     }
 }
@@ -387,25 +491,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();
@@ -419,22 +544,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);
 	}
     }
@@ -444,7 +579,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'])) || 
@@ -453,7 +590,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) {
@@ -462,20 +601,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);
             }
@@ -509,10 +669,17 @@ 
                     $data['datetime'] = date('Y-m-d H:i:s');
                     $data['format_source'] = 'radarcapejson';
                     $data['id_source'] = $id_source;
-                    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-                    elseif($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($value['name']) && $value['name'] != '') {
+                    	$data['source_name'] = $value['name'];
+                    } elseif($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);
@@ -528,7 +695,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) {
@@ -537,18 +706,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']) {
@@ -562,8 +755,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);
 		}
     	    }
@@ -586,20 +783,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 {
@@ -607,18 +832,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);
@@ -654,12 +888,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);
 			}
@@ -684,7 +924,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'];
@@ -692,7 +934,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);
 			}
@@ -714,22 +958,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);
 		    }
 		}
@@ -742,11 +1008,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) {
@@ -772,7 +1044,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);
@@ -795,11 +1069,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('https://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'])) {
@@ -807,8 +1087,11 @@ 
 				$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']))) {
-					if (isset($sailaway_authcookie) && $sailaway_authcookie != '') $racebuffer = $Common->getData('https://sailaway.world/cgi-bin/sailaway/GetMission.pl?misnr='.$mission['misnr'],'get','','',$sailaway_authcookie);
-					else $racebuffer = '';
+					if (isset($sailaway_authcookie) && $sailaway_authcookie != '') {
+						$racebuffer = $Common->getData('https://sailaway.world/cgi-bin/sailaway/GetMission.pl?misnr='.$mission['misnr'],'get','','',$sailaway_authcookie);
+					} else {
+						$racebuffer = '';
+					}
 					$bufferm = $Common->getData('https://sailaway.world/cgi-bin/sailaway/GetLeaderboard.pl?misnr='.$mission['misnr']);
 				} else {
 					$bufferm = '';
@@ -872,7 +1155,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.')';
@@ -882,7 +1167,9 @@ 
 								//$data['callsign'] = trim(substr($line,100,7);
 								$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;
+								}
 								//print_r($data);
 								//if ($data['race_id'] == '48') print_r($data);
 								//echo 'Add...'."\n";
@@ -924,16 +1211,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
@@ -949,7 +1248,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] != '') {
@@ -963,27 +1264,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);
@@ -1010,14 +1331,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);
@@ -1065,25 +1392,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)) {
@@ -1100,17 +1461,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)) {
@@ -1146,8 +1516,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);
 		}
@@ -1181,7 +1555,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);
 		}
@@ -1201,15 +1577,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];
@@ -1217,10 +1620,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);
 		}
@@ -1240,22 +1650,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);
 		}
@@ -1271,7 +1713,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();
@@ -1292,8 +1736,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);
 		}
@@ -1322,24 +1770,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);
 		    }
@@ -1365,30 +1831,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);
@@ -1397,16 +1898,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);
 		}
@@ -1421,7 +1934,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)) {
@@ -1429,10 +1944,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
@@ -1448,7 +1969,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'];
@@ -1456,29 +1979,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);
 	    }
@@ -1491,7 +2032,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'])) {
@@ -1502,10 +2045,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
@@ -1518,7 +2067,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'];
@@ -1526,17 +2077,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);
 	    }
@@ -1549,7 +2109,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)) {
@@ -1578,16 +2140,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);
 	    }
@@ -1600,7 +2171,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 != '') {
@@ -1618,12 +2191,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();
@@ -1652,10 +2229,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);
@@ -1672,7 +2254,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) {
@@ -1694,13 +2278,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') {
@@ -1710,9 +2298,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);
@@ -1720,22 +2314,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']);
@@ -1744,7 +2370,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";
@@ -1762,12 +2390,18 @@ 
 				$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();
@@ -1788,8 +2422,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') {
@@ -1799,28 +2437,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') {
@@ -1833,22 +2505,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 );
@@ -1874,47 +2570,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 (
@@ -1926,7 +2671,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']) && (
@@ -1934,8 +2681,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)' || 
@@ -1966,9 +2717,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']);
@@ -1977,7 +2732,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) {
@@ -1987,7 +2744,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']);
@@ -1999,8 +2758,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']);
 				}
 				/*
@@ -2009,7 +2767,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($globalSources[$nb]['last_weather_clean']) && time()-$globalSources[$nb]['last_weather_clean'] > 60*5) {
 					$Source->deleteOldLocationByType('lightning');
 					$Source->deleteOldLocationByType('wx');
@@ -2046,27 +2806,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();
@@ -2074,10 +2854,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];
@@ -2086,10 +2870,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;
@@ -2107,11 +2896,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);
@@ -2119,25 +2914,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();
+	    }
 	}
     }
 }