Ysurac / FlightAirMap

waypoints-geojson.php

Indentation +16 added lines, -16 removed lines

@@ -26,7 +26,7 @@ 
 		date_default_timezone_set('UTC');
 		//waypoint plotting
 		$output .= '{"type": "Feature",';
-		    $output .= '"properties": {';
+			$output .= '"properties": {';
 			$output .= '"segment_name": "'.$spotter_item['segment_name'].'",';
 			$output .= '"base": "'.$spotter_item['base'].'",';
 			$output .= '"top": "'.$spotter_item['top'].'",';
@@ -49,15 +49,15 @@ 
 				$output .= '"stroke": "#f0f0f0",';
 				$output .= '"stroke-width": 2';
 //			}
-		    $output .= '},';
-		    $output .= '"geometry": {';
+			$output .= '},';
+			$output .= '"geometry": {';
 			$output .= '"type": "LineString",';
 			$output .= '"coordinates": [';
-			    //$output .= '['.$spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].'], ['.$spotter_item['longitude_end'].', '.$spotter_item['latitude_end'].'], ['.$spotter_item['longitude_end_seg2'].', '.$spotter_item['latitude_end_seg2'].']';
-			    $output .= '['.$spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].','.round($spotter_item['base']*100*0.3048).'], ['.$spotter_item['longitude_end'].', '.$spotter_item['latitude_end'].','.round($spotter_item['base']*100*0.3048).']';
+				//$output .= '['.$spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].'], ['.$spotter_item['longitude_end'].', '.$spotter_item['latitude_end'].'], ['.$spotter_item['longitude_end_seg2'].', '.$spotter_item['latitude_end_seg2'].']';
+				$output .= '['.$spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].','.round($spotter_item['base']*100*0.3048).'], ['.$spotter_item['longitude_end'].', '.$spotter_item['latitude_end'].','.round($spotter_item['base']*100*0.3048).']';
 			//    $output .= '['.$spotter_item['latitude_begin'].', '.$spotter_item['longitude_begin'].'], ['.$spotter_item['latitude_end'].', '.$spotter_item['longitude_end'].']';
 			$output .= ']';
-		    $output .= '}';
+			$output .= '}';
 /*		    $output .= '"geometry": {';
 			$output .= '"type": "Point",';
 			$output .= '"coordinates": [';
@@ -68,7 +68,7 @@ 
 		$output .= '},';
 		//waypoint plotting
 		$output .= '{"type": "Feature",';
-		    $output .= '"properties": {';
+			$output .= '"properties": {';
 			$output .= '"ident": "'.$spotter_item['name_begin'].'",';
 			$output .= '"high": "'.$spotter_item['high'].'",';
 			$output .= '"alt": "'.$spotter_item['base'].'",';
@@ -98,17 +98,17 @@ 
 				$output .= '"marker-size": "small",';
 				$output .= '"marker-color": "#0000ff"';
 			}
-		    $output .= '},';
-		    $output .= '"geometry": {';
+			$output .= '},';
+			$output .= '"geometry": {';
 			$output .= '"type": "Point",';
 			$output .= '"coordinates": [';
-			    $output .= $spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].', '.round($spotter_item['base']*100*0.3048);;
+				$output .= $spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].', '.round($spotter_item['base']*100*0.3048);;
 			$output .= ']';
-		    $output .= '}';
+			$output .= '}';
 
 		$output .= '},';
 		$output .= '{"type": "Feature",';
-		    $output .= '"properties": {';
+			$output .= '"properties": {';
 			$output .= '"ident": "'.$spotter_item['name_end'].'",';
 			$output .= '"high": "'.$spotter_item['high'].'",';
 			$output .= '"alt": "'.$spotter_item['top'].'",';
@@ -145,13 +145,13 @@ 
 				$output .= '"marker-size": "small",';
 				$output .= '"marker-color": "#0000ff"';
 			}
-		    $output .= '},';
-		    $output .= '"geometry": {';
+			$output .= '},';
+			$output .= '"geometry": {';
 			$output .= '"type": "Point",';
 			$output .= '"coordinates": [';
-			    $output .= $spotter_item['longitude_end'].', '.$spotter_item['latitude_end'].', '.round($spotter_item['base']*100*0.3048);
+				$output .= $spotter_item['longitude_end'].', '.$spotter_item['latitude_end'].', '.round($spotter_item['base']*100*0.3048);
 			$output .= ']';
-		    $output .= '}';
+			$output .= '}';
 
 		$output .= '},';
 	}

Spacing +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
 
 if (isset($_GET['coord'])) 
 {
-	$coords = explode(',',$_GET['coord']);
+	$coords = explode(',', $_GET['coord']);
 	$spotter_array = $Spotter->getAllWaypointsInfobyCoord($coords);
 } else {
 	die;
@@ -21,7 +21,7 @@ 
 if (!empty($spotter_array))
 {	  
 //	print_r($spotter_array);
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		date_default_timezone_set('UTC');
 		//waypoint plotting
@@ -102,7 +102,7 @@ 
 		    $output .= '"geometry": {';
 			$output .= '"type": "Point",';
 			$output .= '"coordinates": [';
-			    $output .= $spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].', '.round($spotter_item['base']*100*0.3048);;
+			    $output .= $spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].', '.round($spotter_item['base']*100*0.3048); ;
 			$output .= ']';
 		    $output .= '}';
 

airspace-data.php

Spacing +3 added lines, -3 removed lines

@@ -7,7 +7,7 @@ 
 <button type="button" class="close">&times;</button>
 <?php
 
-$airspaceid = filter_input(INPUT_GET,'airspace',FILTER_SANITIZE_NUMBER_INT);
+$airspaceid = filter_input(INPUT_GET, 'airspace', FILTER_SANITIZE_NUMBER_INT);
 //$notamref = urldecode($notamref);
 if ($globalDBdriver == 'mysql') {
 	$query = "SELECT * FROM airspace WHERE ogr_fid = :id";
@@ -18,10 +18,10 @@ 
 try {
 	$sth = $Connection->db->prepare($query);
 	$sth->execute(array(':id' => $airspaceid));
-} catch(PDOException $e) {
+} catch (PDOException $e) {
 	echo "error";
 }
-$result=$sth->fetchAll(PDO::FETCH_ASSOC);
+$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 $airspace = $result[0];
 date_default_timezone_set('UTC');
 print '<div class="top">';

Braces +9 added lines, -3 removed lines

@@ -25,7 +25,9 @@ 
 $airspace = $result[0];
 date_default_timezone_set('UTC');
 print '<div class="top">';
-if (isset($airspace['name'])) $airspace['title'] = $airspace['name']; 
+if (isset($airspace['name'])) {
+	$airspace['title'] = $airspace['name'];
+}
 print '<div class="right"><div class="callsign-details"><div class="callsign">'.$airspace['title'].'</a></div>';
 print '</div>';
 print '<div class="details">';
@@ -44,13 +46,17 @@ 
 	print '</div>';
 }
 
-if (isset($airspace['ceiling'])) $airspace['tops'] = $airspace['ceiling'];
+if (isset($airspace['ceiling'])) {
+	$airspace['tops'] = $airspace['ceiling'];
+}
 print '<div>';
 print '<span>'._("Tops").'</span>';
 print $airspace['tops'];
 print '</div>';
 
-if (isset($airspace['floor'])) $airspace['base'] = $airspace['floor'];
+if (isset($airspace['floor'])) {
+	$airspace['base'] = $airspace['floor'];
+}
 print '<div>';
 print '<span>'._("Base").'</span>';
 print $airspace['base'];

scripts/update_db.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
 	exec("ps ux", $output, $result);
 	$j = 0;
-	foreach ($output as $line) if(strpos($line, "update_db.php") && !strpos($line, "sh ")) $j++;
+	foreach ($output as $line) if (strpos($line, "update_db.php") && !strpos($line, "sh ")) $j++;
 	if ($j > 1) {
 		echo "Script is already runnning...";
 		die();

Braces +20 added lines, -8 removed lines

@@ -9,7 +9,9 @@ 
 if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
 	exec("ps ux", $output, $result);
 	$j = 0;
-	foreach ($output as $line) if(strpos($line, "update_db.php") && !strpos($line, "sh ")) $j++;
+	foreach ($output as $line) {
+		if(strpos($line, "update_db.php") && !strpos($line, "sh ")) $j++;
+	}
 	if ($j > 1) {
 		echo "Script is already runnning...";
 		die();
@@ -28,8 +30,10 @@ 
 			$update_db->update_notam();
 		}
 		$update_db->insert_last_notam_update();
-	} elseif (isset($globalDebug) && $globalDebug && isset($globalNOTAM) && $globalNOTAM) echo "NOTAM are only updated once a day.\n";
-}
+	} elseif (isset($globalDebug) && $globalDebug && isset($globalNOTAM) && $globalNOTAM) {
+		echo "NOTAM are only updated once a day.\n";
+	}
+	}
 
 if ($update_db->check_last_update() && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
 	$update_db->update_all();
@@ -37,7 +41,9 @@ 
 //	$Spotter = new Spotter();
 //	$Spotter->updateFieldsFromOtherTables();
 	$update_db->insert_last_update();
-} elseif (isset($globalDebug) && $globalDebug && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM)) echo "DB are populated with external data only every 15 days ! Files are not updated more often.\n";
+} elseif (isset($globalDebug) && $globalDebug && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM)) {
+	echo "DB are populated with external data only every 15 days ! Files are not updated more often.\n";
+}
 
 
 if (isset($globalMETAR) && isset($globalMETARcycle) && $globalMETAR && $globalMETARcycle) {
@@ -47,22 +53,28 @@ 
 	if ($METAR->check_last_update()) {
 		$METAR->addMETARCycle();
 		$METAR->insert_last_update();
-	} else echo "METAR are only updated every 30 minutes.\n";
-}
+	} else {
+		echo "METAR are only updated every 30 minutes.\n";
+	}
+	}
 
 
 if (isset($globalOwner) && $globalOwner && $update_db->check_last_owner_update() && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
 	echo "Updating private aircraft's owners...";
 	$update_db->update_owner();
 	$update_db->insert_last_owner_update();
-} elseif (isset($globalDebug) && $globalDebug && isset($globalOwner) && $globalOwner && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) echo "Owner are only updated every 15 days.\n";
+} elseif (isset($globalDebug) && $globalDebug && isset($globalOwner) && $globalOwner && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
+	echo "Owner are only updated every 15 days.\n";
+}
 
 if (isset($globalSchedules) && $globalSchedules && $update_db->check_last_schedules_update() && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
 	echo "Updating schedules...";
 	$update_db->update_oneworld();
 	$update_db->update_skyteam();
 	$update_db->insert_last_schedules_update();
-} elseif (isset($globalDebug) && $globalDebug && isset($globalOwner) && $globalOwner && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) echo "Schedules are only updated every 15 days.\n";
+} elseif (isset($globalDebug) && $globalDebug && isset($globalOwner) && $globalOwner && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
+	echo "Schedules are only updated every 15 days.\n";
+}
 
 if (isset($globalArchiveMonths) && $globalArchiveMonths > 0) {
 	echo "Updating statistics and archive old data...";

scripts/daemon-spotter.php

Spacing +100 added lines, -100 removed lines

@@ -37,11 +37,11 @@ 
 	    die;
 	}
 	//$hosts = array($globalSBS1Host.':'.$globalSBS1Port);
-	$globalSources[] = array('host' => $globalSBS1Host,'port' => $globalSBS1Port);
+	$globalSources[] = array('host' => $globalSBS1Host, 'port' => $globalSBS1Port);
     }
 }
 
-$options = getopt('s::',array('source::','server','idsource::'));
+$options = getopt('s::', array('source::', 'server', 'idsource::'));
 //if (isset($options['s'])) $hosts = array($options['s']);
 //elseif (isset($options['source'])) $hosts = array($options['source']);
 if (isset($options['s'])) {
@@ -56,17 +56,17 @@ 
 else $id_source = 1;
 if (isset($globalServer) && $globalServer) {
     if ($globalDebug) echo "Using Server Mode\n";
-    $SI=new SpotterServer();
-} else $SI=new SpotterImport($Connection->db);
+    $SI = new SpotterServer();
+} else $SI = new SpotterImport($Connection->db);
 //$APRS=new APRS($Connection->db);
-$SBS=new SBS();
-$ACARS=new ACARS($Connection->db);
-$Common=new Common();
+$SBS = new SBS();
+$ACARS = new ACARS($Connection->db);
+$Common = new Common();
 date_default_timezone_set('UTC');
 //$servertz = system('date +%Z');
 // signal handler - playing nice with sockets and dump1090
 if (function_exists('pcntl_fork')) {
-    pcntl_signal(SIGINT,  function() {
+    pcntl_signal(SIGINT, function() {
         global $sockets;
         echo "\n\nctrl-c or kill signal received. Tidying up ... ";
         die("Bye!\n");
@@ -109,34 +109,34 @@ 
 
 function connect_all($hosts) {
     //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
-    global $sockets, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
+    global $sockets, $globalSources, $globalDebug, $aprs_connect, $last_exec, $globalSourcesRights, $use_aprs;
     if ($globalDebug) echo 'Connect to all...'."\n";
     foreach ($hosts as $id => $value) {
 	$host = $value['host'];
 	$globalSources[$id]['last_exec'] = 0;
 	// Here we check type of source(s)
-	if (filter_var($host,FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) {
-            if (preg_match('/deltadb.txt$/i',$host)) {
+	if (filter_var($host, FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) {
+            if (preg_match('/deltadb.txt$/i', $host)) {
         	//$formats[$id] = 'deltadbtxt';
         	$globalSources[$id]['format'] = 'deltadbtxt';
         	//$last_exec['deltadbtxt'] = 0;
         	if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
-            } else if (preg_match('/vatsim-data.txt$/i',$host)) {
+            } else if (preg_match('/vatsim-data.txt$/i', $host)) {
         	//$formats[$id] = 'vatsimtxt';
         	$globalSources[$id]['format'] = 'vatsimtxt';
         	//$last_exec['vatsimtxt'] = 0;
         	if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
-    	    } else if (preg_match('/aircraftlist.json$/i',$host)) {
+    	    } else if (preg_match('/aircraftlist.json$/i', $host)) {
         	//$formats[$id] = 'aircraftlistjson';
         	$globalSources[$id]['format'] = 'aircraftlistjson';
         	//$last_exec['aircraftlistjson'] = 0;
         	if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
-    	    } else if (preg_match('/opensky/i',$host)) {
+    	    } else if (preg_match('/opensky/i', $host)) {
         	//$formats[$id] = 'aircraftlistjson';
         	$globalSources[$id]['format'] = 'opensky';
         	//$last_exec['aircraftlistjson'] = 0;
         	if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
-    	    } else if (preg_match('/radarvirtuel.com\/file.json$/i',$host)) {
+    	    } else if (preg_match('/radarvirtuel.com\/file.json$/i', $host)) {
         	//$formats[$id] = 'radarvirtueljson';
         	$globalSources[$id]['format'] = 'radarvirtueljson';
         	//$last_exec['radarvirtueljson'] = 0;
@@ -145,7 +145,7 @@ 
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
         	    exit(0);
         	}
-    	    } else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
+    	    } else if (preg_match('/planeUpdateFAA.php$/i', $host)) {
         	//$formats[$id] = 'planeupdatefaa';
         	$globalSources[$id]['format'] = 'planeupdatefaa';
         	//$last_exec['planeupdatefaa'] = 0;
@@ -154,26 +154,26 @@ 
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
         	    exit(0);
         	}
-            } else if (preg_match('/\/action.php\/acars\/data$/i',$host)) {
+            } else if (preg_match('/\/action.php\/acars\/data$/i', $host)) {
         	//$formats[$id] = 'phpvmacars';
         	$globalSources[$id]['format'] = 'phpvmacars';
         	//$last_exec['phpvmacars'] = 0;
         	if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
-            } else if (preg_match('/VAM-json.php$/i',$host)) {
+            } else if (preg_match('/VAM-json.php$/i', $host)) {
         	//$formats[$id] = 'phpvmacars';
         	$globalSources[$id]['format'] = 'vam';
         	if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
-            } else if (preg_match('/whazzup/i',$host)) {
+            } else if (preg_match('/whazzup/i', $host)) {
         	//$formats[$id] = 'whazzup';
         	$globalSources[$id]['format'] = 'whazzup';
         	//$last_exec['whazzup'] = 0;
         	if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
-            } else if (preg_match('/recentpireps/i',$host)) {
+            } else if (preg_match('/recentpireps/i', $host)) {
         	//$formats[$id] = 'pirepsjson';
         	$globalSources[$id]['format'] = 'pirepsjson';
         	//$last_exec['pirepsjson'] = 0;
         	if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
-            } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
+            } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i', $host)) {
         	//$formats[$id] = 'fr24json';
         	$globalSources[$id]['format'] = 'fr24json';
         	//$last_exec['fr24json'] = 0;
@@ -183,15 +183,15 @@ 
         	    exit(0);
         	}
             //} else if (preg_match('/10001/',$host)) {
-            } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
+            } else if (preg_match('/10001/', $host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
         	//$formats[$id] = 'tsv';
         	$globalSources[$id]['format'] = 'tsv';
         	if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
             }
-        } elseif (filter_var($host,FILTER_VALIDATE_URL)) {
+        } elseif (filter_var($host, FILTER_VALIDATE_URL)) {
         	if ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
-        } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
-	    $hostport = explode(':',$host);
+        } elseif (!filter_var($host, FILTER_VALIDATE_URL)) {
+	    $hostport = explode(':', $host);
 	    if (isset($hostport[1])) {
 		$port = $hostport[1];
 		$hostn = $hostport[0];
@@ -200,14 +200,14 @@ 
 		$hostn = $globalSources[$id]['host'];
 	    }
 	    if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
-        	$s = create_socket($hostn,$port, $errno, $errstr);
+        	$s = create_socket($hostn, $port, $errno, $errstr);
     	    } else {
-        	$s = create_socket_udp($hostn,$port, $errno, $errstr);
+        	$s = create_socket_udp($hostn, $port, $errno, $errstr);
 	    }
 	    if ($s) {
     	        $sockets[$id] = $s;
     	        if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
-		    if (preg_match('/aprs/',$hostn)) {
+		    if (preg_match('/aprs/', $hostn)) {
 			//$formats[$id] = 'aprs';
 			$globalSources[$id]['format'] = 'aprs';
 			//$aprs_connect = 0;
@@ -248,7 +248,7 @@ 
 else if (isset($globalSBS1TimeOut)) $timeout = $globalSBS1TimeOut;
 else $timeout = 20;
 $errno = '';
-$errstr='';
+$errstr = '';
 
 if (!isset($globalDaemon)) $globalDaemon = TRUE;
 /* Initiate connections to all the hosts simultaneously */
@@ -277,7 +277,7 @@ 
 
 if ($use_aprs) {
 	require_once(dirname(__FILE__).'/../require/class.APRS.php');
-	$APRS=new APRS();
+	$APRS = new APRS();
 	$aprs_connect = 0;
 	$aprs_keep = 120;
 	$aprs_last_tx = time();
@@ -288,7 +288,7 @@ 
 	else $aprs_ssid = 'FAM';
 	//else $aprs_ssid = 'PerlEx';
 	if (isset($globalAPRSfilter)) $aprs_filter = $globalAPRSfilter;
-	else $aprs_filter =  'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
+	else $aprs_filter = 'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
 	if ($aprs_full) $aprs_filter = '';
 	if ($aprs_filter != '') $aprs_login = "user {$aprs_ssid} appid {$aprs_version} filter {$aprs_filter}\n";
 	else $aprs_login = "user {$aprs_ssid} appid {$aprs_version}\n";
@@ -299,12 +299,12 @@ 
 sleep(1);
 if ($globalDebug) echo "SCAN MODE \n\n";
 if (!isset($globalCronEnd)) $globalCronEnd = 60;
-$endtime = time()+$globalCronEnd;
+$endtime = time() + $globalCronEnd;
 $i = 1;
 $tt = array();
 // Delete all ATC
 if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM)) {
-	$ATC=new ATC($Connection->db);
+	$ATC = new ATC($Connection->db);
 }
 if (!$globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
 	$ATC->deleteAll();
@@ -312,7 +312,7 @@ 
 
 // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time.
 while ($i > 0) {
-    if (!$globalDaemon) $i = $endtime-time();
+    if (!$globalDaemon) $i = $endtime - time();
     // Delete old ATC
     if ($globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
 	if ($globalDebug) echo 'Delete old ATC...'."\n";
@@ -326,7 +326,7 @@ 
 	}
 	if ($max != $globalMinFetch) {
 	    if ($globalDebug) echo 'Sleeping...'."\n";
-	    sleep($globalMinFetch-$max+2);
+	    sleep($globalMinFetch - $max + 2);
 	}
     }
 
@@ -337,8 +337,8 @@ 
 	if ($value['format'] == 'deltadbtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
 	    //$buffer = $Common->getData($hosts[$id]);
 	    $buffer = $Common->getData($value['host']);
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-	    $buffer = explode('\n',$buffer);
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
+	    $buffer = explode('\n', $buffer);
 	    foreach ($buffer as $line) {
     		if ($line != '') {
     		    $line = explode(',', $line);
@@ -367,8 +367,8 @@ 
 	} elseif (($value['format'] == 'whazzup' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) || ($value['format'] == 'vatsimtxt' && (time() - $value[' last_exec'] > $globalMinFetch))) {
 	    //$buffer = $Common->getData($hosts[$id]);
 	    $buffer = $Common->getData($value['host']);
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-	    $buffer = explode('\n',$buffer);
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
+	    $buffer = explode('\n', $buffer);
 	    foreach ($buffer as $line) {
     		if ($line != '') {
     		    $line = explode(':', $line);
@@ -377,7 +377,7 @@ 
 			$data['id'] = $line[1].'-'.$line[0];
 			$data['pilot_id'] = $line[1];
 			$data['pilot_name'] = $line[2];
-			$data['hex'] = str_pad(dechex($line[1]),6,'000000',STR_PAD_LEFT);
+			$data['hex'] = str_pad(dechex($line[1]), 6, '000000', STR_PAD_LEFT);
 			$data['ident'] = $line[0]; // ident
 			if ($line[7] != '' && $line[7] != 0) $data['altitude'] = $line[7]; // altitude
 			$data['speed'] = $line[8]; // speed
@@ -393,7 +393,7 @@ 
 			//$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37]));
 			if (isset($line[37])) $data['last_update'] = $line[37];
 		        $data['departure_airport_icao'] = $line[11];
-		        $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
+		        $data['departure_airport_time'] = rtrim(chunk_split($line[22], 2, ':'), ':');
 		        $data['arrival_airport_icao'] = $line[13];
 			$data['frequency'] = $line[4];
 			$data['type'] = $line[18];
@@ -402,7 +402,7 @@ 
     			$data['id_source'] = $id_source;
 	    		//$data['arrival_airport_time'] = ;
 	    		if ($line[9] != '') {
-	    		    $aircraft_data = explode('/',$line[9]);
+	    		    $aircraft_data = explode('/', $line[9]);
 	    		    if (isset($aircraft_data[1])) {
 	    			$data['aircraft_icao'] = $aircraft_data[1];
 	    		    }
@@ -416,9 +416,9 @@ 
     			if ($line[3] == 'PILOT') $SI->add($data);
 			elseif ($line[3] == 'ATC') {
 				//print_r($data);
-				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
-				$data['info'] = str_replace('&amp;sect;','',$data['info']);
-				$typec = substr($data['ident'],-3);
+				$data['info'] = str_replace('^&sect;', '<br />', $data['info']);
+				$data['info'] = str_replace('&amp;sect;', '', $data['info']);
+				$typec = substr($data['ident'], -3);
 				if ($typec == 'APP') $data['type'] = 'Approach';
 				elseif ($typec == 'TWR') $data['type'] = 'Tower';
 				elseif ($typec == 'OBS') $data['type'] = 'Observer';
@@ -429,7 +429,7 @@ 
 				elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
 				elseif ($data['type'] == '') $data['type'] = 'Observer';
 				
-				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']);
+				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']);
 			}
     			unset($data);
     		    }
@@ -440,9 +440,9 @@ 
     	    $last_exec[$id]['last'] = time();
     	//} elseif ($value == 'aircraftlistjson' && (time() - $last_exec['aircraftlistjson'] > $globalMinFetch)) {
     	} elseif ($value['format'] == 'aircraftlistjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20');
 	    if ($buffer != '') {
-	    $all_data = json_decode($buffer,true);
+	    $all_data = json_decode($buffer, true);
 	    if (isset($all_data['acList'])) {
 		foreach ($all_data['acList'] as $line) {
 		    $data = array();
@@ -496,7 +496,7 @@ 
     	//} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
     	} elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $all_data = json_decode($buffer, true);
 	    if (isset($all_data['planes'])) {
 		foreach ($all_data['planes'] as $key => $line) {
 		    $data = array();
@@ -512,12 +512,12 @@ 
 		    $data['emergency'] = ''; // emergency
 		    $data['registration'] = $line[2];
 		    $data['aircraft_icao'] = $line[0];
-		    $deparr = explode('-',$line[1]);
+		    $deparr = explode('-', $line[1]);
 		    if (count($deparr) == 2) {
 			$data['departure_airport_icao'] = $deparr[0];
 			$data['arrival_airport_icao'] = $deparr[1];
 		    }
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]);
+		    $data['datetime'] = date('Y-m-d H:i:s', $line[9]);
 	    	    $data['format_source'] = 'planeupdatefaa';
     		    $data['id_source'] = $id_source;
 		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
@@ -529,7 +529,7 @@ 
     	    $last_exec[$id]['last'] = time();
     	} elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $all_data = json_decode($buffer, true);
 	    if (isset($all_data['states'])) {
 		foreach ($all_data['states'] as $key => $line) {
 		    $data = array();
@@ -545,7 +545,7 @@ 
 		    //$data['emergency'] = ''; // emergency
 		    //$data['registration'] = $line[2];
 		    //$data['aircraft_icao'] = $line[0];
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]);
+		    $data['datetime'] = date('Y-m-d H:i:s', $line[3]);
 	    	    $data['format_source'] = 'opensky';
     		    $data['id_source'] = $id_source;
 		    $SI->add($data);
@@ -558,7 +558,7 @@ 
     	} elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
 	    //$buffer = $Common->getData($hosts[$id]);
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $all_data = json_decode($buffer, true);
 	    foreach ($all_data as $key => $line) {
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
 		    $data = array();
@@ -589,11 +589,11 @@ 
     	//} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) {
     	} elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
 	    //$buffer = $Common->getData($hosts[$id],'get','','','','','150');
-	    $buffer = $Common->getData($value['host'],'get','','','','','150');
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '150');
 	    //echo $buffer;
-	    $buffer = str_replace(array("\n","\r"),"",$buffer);
-	    $buffer = preg_replace('/,"num":(.+)/','}',$buffer);
-	    $all_data = json_decode($buffer,true);
+	    $buffer = str_replace(array("\n", "\r"), "", $buffer);
+	    $buffer = preg_replace('/,"num":(.+)/', '}', $buffer);
+	    $all_data = json_decode($buffer, true);
 	    if (json_last_error() != JSON_ERROR_NONE) {
 		die(json_last_error_msg());
 	    }
@@ -615,7 +615,7 @@ 
 			//$data['departure_airport_iata'] = $line[11];
 			//$data['arrival_airport_iata'] = $line[12];
 	    		//$data['emergency'] = ''; // emergency
-			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10]
+			$data['datetime'] = date('Y-m-d H:i:s', $line['inf']['dt']); //$line[10]
 	    		$data['format_source'] = 'radarvirtueljson';
     			$data['id_source'] = $id_source;
 			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
@@ -630,13 +630,13 @@ 
     	} elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
 	    //$buffer = $Common->getData($hosts[$id]);
 	    $buffer = $Common->getData($value['host'].'?'.time());
-	    $all_data = json_decode(utf8_encode($buffer),true);
+	    $all_data = json_decode(utf8_encode($buffer), true);
 	    
 	    if (isset($all_data['pireps'])) {
 	        foreach ($all_data['pireps'] as $line) {
 		    $data = array();
 		    $data['id'] = $line['id'];
-		    $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
+		    $data['hex'] = substr(str_pad(dechex($line['id']), 6, '000000', STR_PAD_LEFT), 0, 6);
 		    $data['ident'] = $line['callsign']; // ident
 		    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
 		    if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
@@ -665,9 +665,9 @@ 
 			$SI->add($data);
 		    //    print_r($data);
     		    } elseif ($line['icon'] == 'ct') {
-			$data['info'] = str_replace('^&sect;','<br />',$data['info']);
-			$data['info'] = str_replace('&amp;sect;','',$data['info']);
-			$typec = substr($data['ident'],-3);
+			$data['info'] = str_replace('^&sect;', '<br />', $data['info']);
+			$data['info'] = str_replace('&amp;sect;', '', $data['info']);
+			$typec = substr($data['ident'], -3);
 			$data['type'] = '';
 			if ($typec == 'APP') $data['type'] = 'Approach';
 			elseif ($typec == 'TWR') $data['type'] = 'Tower';
@@ -678,7 +678,7 @@ 
 			elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station';
 			elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
 			else $data['type'] = 'Observer';
-			echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name']);
+			echo $ATC->add($data['ident'], '', $data['latitude'], $data['longitude'], '0', $data['info'], $data['datetime'], $data['type'], $data['pilot_id'], $data['pilot_name']);
 		    }
 		    unset($data);
 		}
@@ -690,13 +690,13 @@ 
 	    //$buffer = $Common->getData($hosts[$id]);
 	    if ($globalDebug) echo 'Get Data...'."\n";
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $all_data = json_decode($buffer, true);
 	    if ($buffer != '' && is_array($all_data)) {
 		foreach ($all_data as $line) {
 	    	    $data = array();
 	    	    //$data['id'] = $line['id']; // id not usable
 	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
+	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']), 6, '000000', STR_PAD_LEFT), -6); // hex
 	    	    if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
 	    	    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
 	    	    $data['ident'] = $line['flightnum']; // ident
@@ -719,12 +719,12 @@ 
 		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
 		    if (isset($line['aircraftname'])) {
 			$line['aircraftname'] = strtoupper($line['aircraftname']);
-			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']);
-	    		$aircraft_data = explode('-',$line['aircraftname']);
+			$line['aircraftname'] = str_replace('BOEING ', 'B', $line['aircraftname']);
+	    		$aircraft_data = explode('-', $line['aircraftname']);
 	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) < 5) $data['aircraft_icao'] = $aircraft_data[0];
 	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) < 5) $data['aircraft_icao'] = $aircraft_data[1];
 	    		else {
-	    		    $aircraft_data = explode(' ',$line['aircraftname']);
+	    		    $aircraft_data = explode(' ', $line['aircraftname']);
 	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = $aircraft_data[1];
 	    		    else $data['aircraft_icao'] = $line['aircraftname'];
 	    		}
@@ -746,13 +746,13 @@ 
 	    //$buffer = $Common->getData($hosts[$id]);
 	    if ($globalDebug) echo 'Get Data...'."\n";
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $all_data = json_decode($buffer, true);
 	    if ($buffer != '' && is_array($all_data)) {
 		foreach ($all_data as $line) {
 	    	    $data = array();
 	    	    //$data['id'] = $line['id']; // id not usable
 	    	    $data['id'] = $line['flight_id'];
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
+	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']), 6, '000000', STR_PAD_LEFT), -6); // hex
 	    	    $data['pilot_name'] = $line['pilot_name'];
 	    	    $data['pilot_id'] = $line['pilot_id'];
 	    	    $data['ident'] = $line['callsign']; // ident
@@ -802,9 +802,9 @@ 
 		    //$value = $formats[$nb];
 		    $format = $globalSources[$nb]['format'];
         	    if ($format == 'sbs' || $format == 'aprs' || $format == 'raw' || $format == 'tsv') {
-        		$buffer = socket_read($r, 6000,PHP_NORMAL_READ);
+        		$buffer = socket_read($r, 6000, PHP_NORMAL_READ);
         	    } else {
-	    	        $az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port);
+	    	        $az = socket_recvfrom($r, $buffer, 6000, 0, $remote_ip, $remote_port);
 	    	    }
         	    //$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
         	    //echo $buffer."\n";
@@ -812,7 +812,7 @@ 
 		    //if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
 		    $error = false;
 		    //$SI::del();
-		    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
+		    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '', $buffer));
 		    // SBS format is CSV format
 		    if ($buffer != '') {
 			$tt[$format] = 0;
@@ -831,10 +831,10 @@ 
                         } elseif ($format == 'flightgearsp') {
                     	    //echo $buffer."\n";
                     	    if (strlen($buffer) > 5) {
-				$line = explode(',',$buffer);
+				$line = explode(',', $buffer);
 				$data = array();
 				//XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p
-				$data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]),6,'000000',STR_PAD_LEFT),0,6);
+				$data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]), 6, '000000', STR_PAD_LEFT), 0, 6);
 				$data['ident'] = $line[6];
 				$data['aircraft_name'] = $line[7];
 				$data['longitude'] = $line[1];
@@ -845,21 +845,21 @@ 
 				$data['datetime'] = date('Y-m-d H:i:s');
 				$data['format_source'] = 'flightgearsp';
 				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 );
+				$send = @ socket_send($r, $data_aprs, strlen($data_aprs), 0);
 			    }
                         } elseif ($format == 'acars') {
                     	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
 			    $ACARS->add(trim($buffer));
-			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
+			    socket_sendto($r, "OK ".$buffer, 100, 0, $remote_ip, $remote_port);
 			    $ACARS->deleteLiveAcarsData();
 			} elseif ($format == 'flightgearmp') {
-			    if (substr($buffer,0,1) != '#') {
+			    if (substr($buffer, 0, 1) != '#') {
 				$data = array();
 				//echo $buffer."\n";
-				$line = explode(' ',$buffer);
+				$line = explode(' ', $buffer);
 				if (count($line) == 11) {
-				    $userserver = explode('@',$line[0]);
-				    $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
+				    $userserver = explode('@', $line[0]);
+				    $data['hex'] = substr(str_pad(bin2hex($line[0]), 6, '000000', STR_PAD_LEFT), 0, 6); // hex
 				    $data['ident'] = $userserver[0];
 				    $data['registration'] = $userserver[0];
 				    $data['latitude'] = $line[4];
@@ -867,24 +867,24 @@ 
 				    $data['altitude'] = $line[6];
 				    $data['datetime'] = date('Y-m-d H:i:s');
 				    $aircraft_type = $line[10];
-				    $aircraft_type = preg_split(':/:',$aircraft_type);
-				    $data['aircraft_name'] = substr(end($aircraft_type),0,-4);
+				    $aircraft_type = preg_split(':/:', $aircraft_type);
+				    $data['aircraft_name'] = substr(end($aircraft_type), 0, -4);
 				    if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
 				}
 			    }
 			} elseif ($format == 'beast') {
 			    echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
 			    die;
-			} elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') {
+			} elseif ($format == 'tsv' || substr($buffer, 0, 4) == 'clock') {
 			    $line = explode("\t", $buffer);
-			    for($k = 0; $k < count($line); $k=$k+2) {
+			    for ($k = 0; $k < count($line); $k = $k + 2) {
 				$key = $line[$k];
-			        $lined[$key] = $line[$k+1];
+			        $lined[$key] = $line[$k + 1];
 			    }
     			    if (count($lined) > 3) {
     				$data['hex'] = $lined['hexid'];
     				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
-    				$data['datetime'] = date('Y-m-d H:i:s');;
+    				$data['datetime'] = date('Y-m-d H:i:s'); ;
     				if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
     				if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
     				if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
@@ -902,24 +902,24 @@ 
     			    } else $error = true;
 			} elseif ($format == 'aprs' && $use_aprs) {
 			    if ($aprs_connect == 0) {
-				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
+				$send = @ socket_send($r, $aprs_login, strlen($aprs_login), 0);
 				$aprs_connect = 1;
 			    }
-			    if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
+			    if ($aprs_keep > 60 && time() - $aprs_last_tx > $aprs_keep) {
 				$aprs_last_tx = time();
 				$data_aprs = "# Keep alive";
-				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
+				$send = @ socket_send($r, $data_aprs, strlen($data_aprs), 0);
 			    }
 			    //echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
-			    $buffer = str_replace('APRS <- ','',$buffer);
-			    $buffer = str_replace('APRS -> ','',$buffer);
-			    if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
+			    $buffer = str_replace('APRS <- ', '', $buffer);
+			    $buffer = str_replace('APRS -> ', '', $buffer);
+			    if (substr($buffer, 0, 1) != '#' && substr($buffer, 0, 1) != '@' && substr($buffer, 0, 5) != 'APRS ') {
 				$line = $APRS->parse($buffer);
 				if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) {
 				    $data = array();
 				    //print_r($line);
 				    $data['hex'] = $line['address'];
-				    $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
+				    $data['datetime'] = date('Y-m-d H:i:s', $line['timestamp']);
 				    //$data['datetime'] = date('Y-m-d H:i:s');
 				    $data['ident'] = $line['ident'];
 				    $data['latitude'] = $line['latitude'];
@@ -939,7 +939,7 @@ 
 				    $currentdate = date('Y-m-d H:i:s');
 				    $aprsdate = strtotime($data['datetime']);
 				    // Accept data if time <= system time + 20s
-				    if ($line['stealth'] == 0 && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) $send = $SI->add($data);
+				    if ($line['stealth'] == 0 && (strtotime($data['datetime']) <= strtotime($currentdate) + 20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) $send = $SI->add($data);
 				    else {
 					if ($line['stealth'] != 0) echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
 					else echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n";
@@ -1024,7 +1024,7 @@ 
 				connect_all($sourceee);
 				$sourceee = array();
 				//connect_all($globalSources);
-				$tt[$format]=0;
+				$tt[$format] = 0;
 				break;
 			    }
 			}
@@ -1032,7 +1032,7 @@ 
 		}
 	    } else {
 		$error = socket_strerror(socket_last_error());
-		if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
+		if ($globalDebug) echo "ERROR : socket_select give this error ".$error."\n";
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY) || time() - $time >= $timeout) {
 			if (isset($globalDebug)) echo "Restarting...\n";
 			// Restart the script if possible
@@ -1040,7 +1040,7 @@ 
 			    if ($globalDebug) echo "Shutdown all sockets...";
 			    
 			    foreach ($sockets as $sock) {
-				@socket_shutdown($sock,2);
+				@socket_shutdown($sock, 2);
 				@socket_close($sock);
 			    }
 			    

Braces +532 added lines, -182 removed lines

@@ -14,7 +14,9 @@ 
 require_once(dirname(__FILE__).'/../require/class.Connection.php');
 require_once(dirname(__FILE__).'/../require/class.Common.php');
 
-if (!isset($globalDebug)) $globalDebug = FALSE;
+if (!isset($globalDebug)) {
+	$globalDebug = FALSE;
+}
 
 // Check if schema is at latest version
 $Connection = new Connection();
@@ -51,13 +53,22 @@ 
     $globalSources = array();
     $globalSources[] = array('host' => $options['source']);
 }
-if (isset($options['server'])) $globalServer = TRUE;
-if (isset($options['idsource'])) $id_source = $options['idsource'];
-else $id_source = 1;
+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();
-} else $SI=new SpotterImport($Connection->db);
+} else {
+	$SI=new SpotterImport($Connection->db);
+}
 //$APRS=new APRS($Connection->db);
 $SBS=new SBS();
 $ACARS=new ACARS($Connection->db);
@@ -75,7 +86,9 @@ 
 }
 
 // let's try and connect
-if ($globalDebug) echo "Connecting...\n";
+if ($globalDebug) {
+	echo "Connecting...\n";
+}
 $use_aprs = false;
 $aprs_full = false;
 
@@ -83,7 +96,9 @@ 
     $ip = gethostbyname($host);
     $s = socket_create(AF_INET, SOCK_STREAM, 0);
     $r = @socket_connect($s, $ip, $port);
-    if (!socket_set_nonblock($s)) echo "Unable to set nonblock on socket\n";
+    if (!socket_set_nonblock($s)) {
+    	echo "Unable to set nonblock on socket\n";
+    }
     if ($r || socket_last_error() == 114 || socket_last_error() == 115) {
         return $s;
     }
@@ -110,7 +125,9 @@ 
 function connect_all($hosts) {
     //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
     global $sockets, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
-    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;
@@ -120,27 +137,37 @@ 
         	//$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('/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";
+        	}
     	    } else if (preg_match('/radarvirtuel.com\/file.json$/i',$host)) {
         	//$formats[$id] = 'radarvirtueljson';
         	$globalSources[$id]['format'] = 'radarvirtueljson';
         	//$last_exec['radarvirtueljson'] = 0;
-        	if ($globalDebug) echo "Connect to radarvirtuel.com/file.json source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to radarvirtuel.com/file.json source (".$host.")...\n";
+        	}
         	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
         	    exit(0);
@@ -149,7 +176,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);
@@ -158,26 +187,36 @@ 
         	//$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('/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('/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);
@@ -186,10 +225,14 @@ 
             } 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)) {
-        	if ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
+        	if ($globalDebug) {
+        		echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
+        	}
         } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
 	    $hostport = explode(':',$host);
 	    if (isset($hostport[1])) {
@@ -226,17 +269,25 @@ 
         		//$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";
+		}
     	    }
         }
     }
 }
-if (!isset($globalMinFetch)) $globalMinFetch = 15;
+if (!isset($globalMinFetch)) {
+	$globalMinFetch = 15;
+}
 
 // Initialize all
 $status = array();
@@ -244,13 +295,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);
@@ -270,7 +327,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;
     }
 }
@@ -281,24 +340,44 @@ 
 	$aprs_connect = 0;
 	$aprs_keep = 120;
 	$aprs_last_tx = time();
-	if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
-	else $aprs_version = $globalName.' using FlightAirMap';
+	if (isset($globalAPRSversion)) {
+		$aprs_version = $globalAPRSversion;
+	} else {
+		$aprs_version = $globalName.' using FlightAirMap';
+	}
 	//else $aprs_version = 'Perl Example App';
-	if (isset($globalAPRSssid)) $aprs_ssid = $globalAPRSssid;
-	else $aprs_ssid = 'FAM';
+	if (isset($globalAPRSssid)) {
+		$aprs_ssid = $globalAPRSssid;
+	} else {
+		$aprs_ssid = 'FAM';
+	}
 	//else $aprs_ssid = 'PerlEx';
-	if (isset($globalAPRSfilter)) $aprs_filter = $globalAPRSfilter;
-	else $aprs_filter =  'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
-	if ($aprs_full) $aprs_filter = '';
-	if ($aprs_filter != '') $aprs_login = "user {$aprs_ssid} appid {$aprs_version} filter {$aprs_filter}\n";
-	else $aprs_login = "user {$aprs_ssid} appid {$aprs_version}\n";
-}
+	if (isset($globalAPRSfilter)) {
+		$aprs_filter = $globalAPRSfilter;
+	} else {
+		$aprs_filter =  'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
+	}
+	if ($aprs_full) {
+		$aprs_filter = '';
+	}
+	if ($aprs_filter != '') {
+		$aprs_login = "user {$aprs_ssid} appid {$aprs_version} filter {$aprs_filter}\n";
+	} else {
+		$aprs_login = "user {$aprs_ssid} appid {$aprs_version}\n";
+	}
+	}
 
 // connected - lets do some work
-if ($globalDebug) echo "Connected!\n";
+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();
@@ -312,20 +391,28 @@ 
 
 // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time.
 while ($i > 0) {
-    if (!$globalDaemon) $i = $endtime-time();
+    if (!$globalDaemon) {
+    	$i = $endtime-time();
+    }
     // Delete old ATC
     if ($globalDaemon && ((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) > 0) {
 	$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);
 	}
     }
@@ -333,7 +420,9 @@ 
     
     //foreach ($formats as $id => $value) {
     foreach ($globalSources as $id => $value) {
-	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' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
 	    //$buffer = $Common->getData($hosts[$id]);
 	    $buffer = $Common->getData($value['host']);
@@ -345,19 +434,38 @@ 
 	            $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['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
+		    if (isset($value['name']) && $value['name'] != '') {
+		    	$data['source_name'] = $value['name'];
+		    }
+		    if (isset($value['sourcestats'])) {
+		    	$data['sourcestats'] = $value['sourcestats'];
+		    }
     		    $SI->add($data);
 		    unset($data);
     		}
@@ -379,10 +487,19 @@ 
 			$data['pilot_name'] = $line[2];
 			$data['hex'] = str_pad(dechex($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
@@ -391,14 +508,18 @@ 
 	        	$data['waypoints'] = $line[30];
 			$data['datetime'] = date('Y-m-d H:i:s');
 			//$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37]));
-			if (isset($line[37])) $data['last_update'] = $line[37];
+			if (isset($line[37])) {
+				$data['last_update'] = $line[37];
+			}
 		        $data['departure_airport_icao'] = $line[11];
 		        $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
 		        $data['arrival_airport_icao'] = $line[13];
 			$data['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] != '') {
@@ -412,22 +533,35 @@ 
 	    		elseif ($value == 'vatsimtxt') $data['format_source'] = 'vatsimtxt';
 	    		*/
 	    		$data['format_source'] = $value['format'];
-			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['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 ($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';
+				}
 				
 				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']);
 			}
@@ -447,26 +581,55 @@ 
 		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['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'] = 'aircraftlistjson';
 		    $data['id_source'] = $id_source;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    if (isset($data['datetime'])) $SI->add($data);
+		    if (isset($value['name']) && $value['name'] != '') {
+		    	$data['source_name'] = $value['name'];
+		    }
+		    if (isset($data['datetime'])) {
+		    	$SI->add($data);
+		    }
 		    unset($data);
 		}
 	    } else {
@@ -485,7 +648,9 @@ 
 		    $data['datetime'] = date('Y-m-d H:i:s');
 	    	    $data['format_source'] = 'aircraftlistjson';
     		    $data['id_source'] = $id_source;
-		    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);
 		}
@@ -520,7 +685,9 @@ 
 		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]);
 	    	    $data['format_source'] = 'planeupdatefaa';
     		    $data['id_source'] = $id_source;
-		    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);
 		}
@@ -579,7 +746,9 @@ 
 		    $data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
 	    	    $data['format_source'] = 'fr24json';
     		    $data['id_source'] = $id_source;
-		    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);
 		}
@@ -602,23 +771,39 @@ 
 		    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['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			if (isset($value['name']) && $value['name'] != '') {
+				$data['source_name'] = $value['name'];
+			}
 			$SI->add($data);
 			unset($data);
 		    }
@@ -638,29 +823,62 @@ 
 		    $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['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+		    if (isset($value['name']) && $value['name'] != '') {
+		    	$data['source_name'] = $value['name'];
+		    }
 		    if ($line['icon'] == 'plane') {
 			$SI->add($data);
 		    //    print_r($data);
@@ -669,15 +887,25 @@ 
 			$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 ($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';
+			}
 			echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name']);
 		    }
 		    unset($data);
@@ -688,17 +916,25 @@ 
     	//} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) {
     	} elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
 	    //$buffer = $Common->getData($hosts[$id]);
-	    if ($globalDebug) echo 'Get Data...'."\n";
+	    if ($globalDebug) {
+	    	echo 'Get Data...'."\n";
+	    }
 	    $buffer = $Common->getData($value['host']);
 	    $all_data = json_decode($buffer,true);
 	    if ($buffer != '' && is_array($all_data)) {
 		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
@@ -716,27 +952,41 @@ 
 	    	    $data['arrival_airport_icao'] = $line['arricao'];
     		    $data['arrival_airport_time'] = $line['arrtime'];
     		    $data['registration'] = $line['aircraft'];
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
+		    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]) < 5) $data['aircraft_icao'] = $aircraft_data[0];
-	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) < 5) $data['aircraft_icao'] = $aircraft_data[1];
-	    		else {
+	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) < 5) {
+	    			$data['aircraft_icao'] = $aircraft_data[0];
+	    		} elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) < 5) {
+	    			$data['aircraft_icao'] = $aircraft_data[1];
+	    		} else {
 	    		    $aircraft_data = explode(' ',$line['aircraftname']);
-	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = $aircraft_data[1];
-	    		    else $data['aircraft_icao'] = $line['aircraftname'];
+	    		    if (isset($aircraft_data[1])) {
+	    		    	$data['aircraft_icao'] = $aircraft_data[1];
+	    		    } else {
+	    		    	$data['aircraft_icao'] = $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);
 	    }
@@ -744,7 +994,9 @@ 
     	    $last_exec[$id]['last'] = time();
     	} elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
 	    //$buffer = $Common->getData($hosts[$id]);
-	    if ($globalDebug) echo 'Get Data...'."\n";
+	    if ($globalDebug) {
+	    	echo 'Get Data...'."\n";
+	    }
 	    $buffer = $Common->getData($value['host']);
 	    $all_data = json_decode($buffer,true);
 	    if ($buffer != '' && is_array($all_data)) {
@@ -772,15 +1024,22 @@ 
 	    	    $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['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);
 	    }
@@ -788,7 +1047,9 @@ 
     	    $last_exec[$id]['last'] = time();
 	//} elseif ($value == 'sbs' || $value == 'tsv' || $value == 'raw' || $value == 'aprs' || $value == 'beast') {
 	} elseif ($value['format'] == 'sbs' || $value['format'] == 'tsv' || $value['format'] == 'raw' || $value['format'] == 'aprs' || $value['format'] == 'beast' || $value['format'] == 'flightgearmp' || $value['format'] == 'flightgearsp' || $value['format'] == 'acars' || $value['format'] == 'acarssbs3') {
-	    if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
+	    if (function_exists('pcntl_fork')) {
+	    	pcntl_signal_dispatch();
+	    }
     	    //$last_exec[$id]['last'] = time();
 
 	    //$read = array( $sockets[$id] );
@@ -796,7 +1057,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) {
 		foreach ($read as $nb => $r) {
 		    //$value = $formats[$nb];
@@ -817,7 +1080,9 @@ 
 		    if ($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') {
@@ -826,9 +1091,15 @@ 
 			    if (is_array($data)) {
 				$data['datetime'] = date('Y-m-d H:i:s');
 				$data['format_source'] = 'raw';
-				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
-                                if (($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 (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
+                                	$SI->add($data);
+                                }
                             }
                         } elseif ($format == 'flightgearsp') {
                     	    //echo $buffer."\n";
@@ -846,11 +1117,15 @@ 
 				$data['speed'] = round($line[5]*1.94384);
 				$data['datetime'] = date('Y-m-d H:i:s');
 				$data['format_source'] = 'flightgearsp';
-				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
+				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();
@@ -871,7 +1146,9 @@ 
 				    $aircraft_type = $line[10];
 				    $aircraft_type = preg_split(':/:',$aircraft_type);
 				    $data['aircraft_name'] = substr(end($aircraft_type),0,-4);
-				    if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
+				    if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
+				    	$SI->add($data);
+				    }
 				}
 			    }
 			} elseif ($format == 'beast') {
@@ -887,21 +1164,43 @@ 
     				$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 (($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 (($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 );
@@ -927,29 +1226,44 @@ 
 				    $data['latitude'] = $line['latitude'];
 				    $data['longitude'] = $line['longitude'];
 				    //$data['verticalrate'] = $line[16];
-				    if (isset($line['speed'])) $data['speed'] = $line['speed'];
-				    else $data['speed'] = 0;
+				    if (isset($line['speed'])) {
+				    	$data['speed'] = $line['speed'];
+				    } else {
+				    	$data['speed'] = 0;
+				    }
 				    $data['altitude'] = $line['altitude'];
-				    if (isset($line['course'])) $data['heading'] = $line['course'];
+				    if (isset($line['course'])) {
+				    	$data['heading'] = $line['course'];
+				    }
 				    //else $data['heading'] = 0;
 				    $data['aircraft_type'] = $line['stealth'];
-				    if (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive == FALSE)) $data['noarchive'] = true;
+				    if (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive == FALSE)) {
+				    	$data['noarchive'] = true;
+				    }
     				    $data['id_source'] = $id_source;
 				    $data['format_source'] = 'aprs';
 				    $data['source_name'] = $line['source'];
-    				    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+    				    if (isset($globalSources[$nb]['sourcestats'])) {
+    				    	$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+    				    }
 				    $currentdate = date('Y-m-d H:i:s');
 				    $aprsdate = strtotime($data['datetime']);
 				    // Accept data if time <= system time + 20s
-				    if ($line['stealth'] == 0 && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) $send = $SI->add($data);
-				    else {
-					if ($line['stealth'] != 0) echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
-					else echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n";
+				    if ($line['stealth'] == 0 && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
+				    	$send = $SI->add($data);
+				    } else {
+					if ($line['stealth'] != 0) {
+						echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
+					} else {
+						echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n";
+					}
 				    }
 				    unset($data);
 				} 
 				//elseif ($line == false && $globalDebug) echo 'Ignored ('.$buffer.")\n";
-				elseif ($line == true && $globalDebug) echo '!! Failed : '.$buffer."!!\n";
+				elseif ($line == true && $globalDebug) {
+					echo '!! Failed : '.$buffer."!!\n";
+				}
 			    }
 			} else {
 			    $line = explode(',', $buffer);
@@ -977,25 +1291,42 @@ 
     				$data['ground'] = $line[21];
     				$data['emergency'] = $line[19];
     				$data['format_source'] = 'sbs';
-				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') {
+					$data['source_name'] = $globalSources[$nb]['name'];
+				}
+    				if (isset($globalSources[$nb]['sourcestats'])) {
+    					$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+    				}
     				$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();
@@ -1003,10 +1334,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];
@@ -1015,10 +1350,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) {
-				if ($globalDebug) echo "ERROR : Reconnect ".$format."...";
+				if ($globalDebug) {
+					echo "ERROR : Reconnect ".$format."...";
+				}
 				//@socket_close($r);
 				sleep(2);
 				$aprs_connect = 0;
@@ -1034,12 +1374,18 @@ 
 		}
 	    } else {
 		$error = socket_strerror(socket_last_error());
-		if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
+		if ($globalDebug) {
+			echo "ERROR : socket_select give this error ".$error . "\n";
+		}
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || time() - $time >= $timeout) {
-			if (isset($globalDebug)) echo "Restarting...\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);
@@ -1047,7 +1393,9 @@ 
 			    }
 			    
 			}
-			    if ($globalDebug) echo "Restart all connections...";
+			    if ($globalDebug) {
+			    	echo "Restart all connections...";
+			    }
 			    sleep(2);
 			    $time = time();
 			    //connect_all($hosts);
@@ -1058,7 +1406,9 @@ 
 	    }
 	}
 	if ($globalDaemon === false) {
-	    if ($globalDebug) echo 'Check all...'."\n";
+	    if ($globalDebug) {
+	    	echo 'Check all...'."\n";
+	    }
 	    $SI->checkAll();
 	}
     }

Indentation +695 added lines, -695 removed lines

@@ -19,47 +19,47 @@ 
 // Check if schema is at latest version
 $Connection = new Connection();
 if ($Connection->latest() === false) {
-    echo "You MUST update to latest schema. Run install/index.php";
-    exit();
+	echo "You MUST update to latest schema. Run install/index.php";
+	exit();
 }
 if (PHP_SAPI != 'cli') {
-    echo "This script MUST be called from console, not a web browser.";
-    exit();
+	echo "This script MUST be called from console, not a web browser.";
+	exit();
 }
 
 // This is to be compatible with old version of settings.php
 if (!isset($globalSources)) {
-    if (isset($globalSBS1Hosts)) {
-        //$hosts = $globalSBS1Hosts;
-        foreach ($globalSBS1Hosts as $host) {
-	    $globalSources[] = array('host' => $host);
-    	}
-    } else {
-        if (!isset($globalSBS1Host)) {
-	    echo '$globalSources MUST be defined !';
-	    die;
+	if (isset($globalSBS1Hosts)) {
+		//$hosts = $globalSBS1Hosts;
+		foreach ($globalSBS1Hosts as $host) {
+		$globalSources[] = array('host' => $host);
+		}
+	} else {
+		if (!isset($globalSBS1Host)) {
+		echo '$globalSources MUST be defined !';
+		die;
 	}
 	//$hosts = array($globalSBS1Host.':'.$globalSBS1Port);
 	$globalSources[] = array('host' => $globalSBS1Host,'port' => $globalSBS1Port);
-    }
+	}
 }
 
 $options = getopt('s::',array('source::','server','idsource::'));
 //if (isset($options['s'])) $hosts = array($options['s']);
 //elseif (isset($options['source'])) $hosts = array($options['source']);
 if (isset($options['s'])) {
-    $globalSources = array();
-    $globalSources[] = array('host' => $options['s']);
+	$globalSources = array();
+	$globalSources[] = array('host' => $options['s']);
 } elseif (isset($options['source'])) {
-    $globalSources = array();
-    $globalSources[] = array('host' => $options['source']);
+	$globalSources = array();
+	$globalSources[] = array('host' => $options['source']);
 }
 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";
-    $SI=new SpotterServer();
+	if ($globalDebug) echo "Using Server Mode\n";
+	$SI=new SpotterServer();
 } else $SI=new SpotterImport($Connection->db);
 //$APRS=new APRS($Connection->db);
 $SBS=new SBS();
@@ -69,12 +69,12 @@ 
 //$servertz = system('date +%Z');
 // signal handler - playing nice with sockets and dump1090
 if (function_exists('pcntl_fork')) {
-    pcntl_signal(SIGINT,  function() {
-        global $sockets;
-        echo "\n\nctrl-c or kill signal received. Tidying up ... ";
-        die("Bye!\n");
-    });
-    pcntl_signal_dispatch();
+	pcntl_signal(SIGINT,  function() {
+		global $sockets;
+		echo "\n\nctrl-c or kill signal received. Tidying up ... ";
+		die("Bye!\n");
+	});
+	pcntl_signal_dispatch();
 }
 
 // let's try and connect
@@ -83,161 +83,161 @@ 
 $aprs_full = false;
 
 function create_socket($host, $port, &$errno, &$errstr) {
-    $ip = gethostbyname($host);
-    $s = socket_create(AF_INET, SOCK_STREAM, 0);
-    $r = @socket_connect($s, $ip, $port);
-    if (!socket_set_nonblock($s)) echo "Unable to set nonblock on socket\n";
-    if ($r || socket_last_error() == 114 || socket_last_error() == 115) {
-        return $s;
-    }
-    $errno = socket_last_error($s);
-    $errstr = socket_strerror($errno);
-    socket_close($s);
-    return false;
+	$ip = gethostbyname($host);
+	$s = socket_create(AF_INET, SOCK_STREAM, 0);
+	$r = @socket_connect($s, $ip, $port);
+	if (!socket_set_nonblock($s)) echo "Unable to set nonblock on socket\n";
+	if ($r || socket_last_error() == 114 || socket_last_error() == 115) {
+		return $s;
+	}
+	$errno = socket_last_error($s);
+	$errstr = socket_strerror($errno);
+	socket_close($s);
+	return false;
 }
 
 function create_socket_udp($host, $port, &$errno, &$errstr) {
-    echo "UDP !!";
-    $ip = gethostbyname($host);
-    $s = socket_create(AF_INET, SOCK_DGRAM, 0);
-    $r = @socket_bind($s, $ip, $port);
-    if ($r || socket_last_error() == 114 || socket_last_error() == 115) {
-        return $s;
-    }
-    $errno = socket_last_error($s);
-    $errstr = socket_strerror($errno);
-    socket_close($s);
-    return false;
+	echo "UDP !!";
+	$ip = gethostbyname($host);
+	$s = socket_create(AF_INET, SOCK_DGRAM, 0);
+	$r = @socket_bind($s, $ip, $port);
+	if ($r || socket_last_error() == 114 || socket_last_error() == 115) {
+		return $s;
+	}
+	$errno = socket_last_error($s);
+	$errstr = socket_strerror($errno);
+	socket_close($s);
+	return false;
 }
 
 function connect_all($hosts) {
-    //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
-    global $sockets, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
-    if ($globalDebug) echo 'Connect to all...'."\n";
-    foreach ($hosts as $id => $value) {
+	//global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
+	global $sockets, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
+	if ($globalDebug) echo 'Connect to all...'."\n";
+	foreach ($hosts as $id => $value) {
 	$host = $value['host'];
 	$globalSources[$id]['last_exec'] = 0;
 	// Here we check type of source(s)
 	if (filter_var($host,FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) {
-            if (preg_match('/deltadb.txt$/i',$host)) {
-        	//$formats[$id] = 'deltadbtxt';
-        	$globalSources[$id]['format'] = 'deltadbtxt';
-        	//$last_exec['deltadbtxt'] = 0;
-        	if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
-            } else if (preg_match('/vatsim-data.txt$/i',$host)) {
-        	//$formats[$id] = 'vatsimtxt';
-        	$globalSources[$id]['format'] = 'vatsimtxt';
-        	//$last_exec['vatsimtxt'] = 0;
-        	if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
-    	    } else if (preg_match('/aircraftlist.json$/i',$host)) {
-        	//$formats[$id] = 'aircraftlistjson';
-        	$globalSources[$id]['format'] = 'aircraftlistjson';
-        	//$last_exec['aircraftlistjson'] = 0;
-        	if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
-    	    } else if (preg_match('/opensky/i',$host)) {
-        	//$formats[$id] = 'aircraftlistjson';
-        	$globalSources[$id]['format'] = 'opensky';
-        	//$last_exec['aircraftlistjson'] = 0;
-        	if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
-    	    } else if (preg_match('/radarvirtuel.com\/file.json$/i',$host)) {
-        	//$formats[$id] = 'radarvirtueljson';
-        	$globalSources[$id]['format'] = 'radarvirtueljson';
-        	//$last_exec['radarvirtueljson'] = 0;
-        	if ($globalDebug) echo "Connect to radarvirtuel.com/file.json source (".$host.")...\n";
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
-        	    exit(0);
-        	}
-    	    } else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
-        	//$formats[$id] = 'planeupdatefaa';
-        	$globalSources[$id]['format'] = 'planeupdatefaa';
-        	//$last_exec['planeupdatefaa'] = 0;
-        	if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
-        	    exit(0);
-        	}
-            } else if (preg_match('/\/action.php\/acars\/data$/i',$host)) {
-        	//$formats[$id] = 'phpvmacars';
-        	$globalSources[$id]['format'] = 'phpvmacars';
-        	//$last_exec['phpvmacars'] = 0;
-        	if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
-            } else if (preg_match('/VAM-json.php$/i',$host)) {
-        	//$formats[$id] = 'phpvmacars';
-        	$globalSources[$id]['format'] = 'vam';
-        	if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
-            } else if (preg_match('/whazzup/i',$host)) {
-        	//$formats[$id] = 'whazzup';
-        	$globalSources[$id]['format'] = 'whazzup';
-        	//$last_exec['whazzup'] = 0;
-        	if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
-            } else if (preg_match('/recentpireps/i',$host)) {
-        	//$formats[$id] = 'pirepsjson';
-        	$globalSources[$id]['format'] = 'pirepsjson';
-        	//$last_exec['pirepsjson'] = 0;
-        	if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
-            } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
-        	//$formats[$id] = 'fr24json';
-        	$globalSources[$id]['format'] = 'fr24json';
-        	//$last_exec['fr24json'] = 0;
-        	if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n";
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
-        	    exit(0);
-        	}
-            //} else if (preg_match('/10001/',$host)) {
-            } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
-        	//$formats[$id] = 'tsv';
-        	$globalSources[$id]['format'] = 'tsv';
-        	if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
-            }
-        } elseif (filter_var($host,FILTER_VALIDATE_URL)) {
-        	if ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
-        } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
-	    $hostport = explode(':',$host);
-	    if (isset($hostport[1])) {
+			if (preg_match('/deltadb.txt$/i',$host)) {
+			//$formats[$id] = 'deltadbtxt';
+			$globalSources[$id]['format'] = 'deltadbtxt';
+			//$last_exec['deltadbtxt'] = 0;
+			if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
+			} else if (preg_match('/vatsim-data.txt$/i',$host)) {
+			//$formats[$id] = 'vatsimtxt';
+			$globalSources[$id]['format'] = 'vatsimtxt';
+			//$last_exec['vatsimtxt'] = 0;
+			if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
+			} else if (preg_match('/aircraftlist.json$/i',$host)) {
+			//$formats[$id] = 'aircraftlistjson';
+			$globalSources[$id]['format'] = 'aircraftlistjson';
+			//$last_exec['aircraftlistjson'] = 0;
+			if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
+			} else if (preg_match('/opensky/i',$host)) {
+			//$formats[$id] = 'aircraftlistjson';
+			$globalSources[$id]['format'] = 'opensky';
+			//$last_exec['aircraftlistjson'] = 0;
+			if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
+			} else if (preg_match('/radarvirtuel.com\/file.json$/i',$host)) {
+			//$formats[$id] = 'radarvirtueljson';
+			$globalSources[$id]['format'] = 'radarvirtueljson';
+			//$last_exec['radarvirtueljson'] = 0;
+			if ($globalDebug) echo "Connect to radarvirtuel.com/file.json source (".$host.")...\n";
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
+				exit(0);
+			}
+			} else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
+			//$formats[$id] = 'planeupdatefaa';
+			$globalSources[$id]['format'] = 'planeupdatefaa';
+			//$last_exec['planeupdatefaa'] = 0;
+			if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
+				exit(0);
+			}
+			} else if (preg_match('/\/action.php\/acars\/data$/i',$host)) {
+			//$formats[$id] = 'phpvmacars';
+			$globalSources[$id]['format'] = 'phpvmacars';
+			//$last_exec['phpvmacars'] = 0;
+			if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
+			} else if (preg_match('/VAM-json.php$/i',$host)) {
+			//$formats[$id] = 'phpvmacars';
+			$globalSources[$id]['format'] = 'vam';
+			if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
+			} else if (preg_match('/whazzup/i',$host)) {
+			//$formats[$id] = 'whazzup';
+			$globalSources[$id]['format'] = 'whazzup';
+			//$last_exec['whazzup'] = 0;
+			if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
+			} else if (preg_match('/recentpireps/i',$host)) {
+			//$formats[$id] = 'pirepsjson';
+			$globalSources[$id]['format'] = 'pirepsjson';
+			//$last_exec['pirepsjson'] = 0;
+			if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
+			} else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
+			//$formats[$id] = 'fr24json';
+			$globalSources[$id]['format'] = 'fr24json';
+			//$last_exec['fr24json'] = 0;
+			if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n";
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
+				exit(0);
+			}
+			//} else if (preg_match('/10001/',$host)) {
+			} else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
+			//$formats[$id] = 'tsv';
+			$globalSources[$id]['format'] = 'tsv';
+			if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
+			}
+		} elseif (filter_var($host,FILTER_VALIDATE_URL)) {
+			if ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
+		} elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
+		$hostport = explode(':',$host);
+		if (isset($hostport[1])) {
 		$port = $hostport[1];
 		$hostn = $hostport[0];
-	    } else {
+		} else {
 		$port = $globalSources[$id]['port'];
 		$hostn = $globalSources[$id]['host'];
-	    }
-	    if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
-        	$s = create_socket($hostn,$port, $errno, $errstr);
-    	    } else {
-        	$s = create_socket_udp($hostn,$port, $errno, $errstr);
-	    }
-	    if ($s) {
-    	        $sockets[$id] = $s;
-    	        if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
-		    if (preg_match('/aprs/',$hostn)) {
+		}
+		if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
+			$s = create_socket($hostn,$port, $errno, $errstr);
+			} else {
+			$s = create_socket_udp($hostn,$port, $errno, $errstr);
+		}
+		if ($s) {
+				$sockets[$id] = $s;
+				if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
+			if (preg_match('/aprs/',$hostn)) {
 			//$formats[$id] = 'aprs';
 			$globalSources[$id]['format'] = 'aprs';
 			//$aprs_connect = 0;
 			//$use_aprs = true;
-    		    } elseif ($port == '10001') {
-        		//$formats[$id] = 'tsv';
-        		$globalSources[$id]['format'] = 'tsv';
-		    } elseif ($port == '30002') {
-        		//$formats[$id] = 'raw';
-        		$globalSources[$id]['format'] = 'raw';
-		    } elseif ($port == '5001') {
-        		//$formats[$id] = 'raw';
-        		$globalSources[$id]['format'] = 'flightgearmp';
-		    } elseif ($port == '30005') {
+				} elseif ($port == '10001') {
+				//$formats[$id] = 'tsv';
+				$globalSources[$id]['format'] = 'tsv';
+			} elseif ($port == '30002') {
+				//$formats[$id] = 'raw';
+				$globalSources[$id]['format'] = 'raw';
+			} elseif ($port == '5001') {
+				//$formats[$id] = 'raw';
+				$globalSources[$id]['format'] = 'flightgearmp';
+			} elseif ($port == '30005') {
 			// Not yet supported
-        		//$formats[$id] = 'beast';
-        		$globalSources[$id]['format'] = 'beast';
-		    //} else $formats[$id] = 'sbs';
-		    } else $globalSources[$id]['format'] = 'sbs';
-		    //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
+				//$formats[$id] = 'beast';
+				$globalSources[$id]['format'] = 'beast';
+			//} else $formats[$id] = 'sbs';
+			} else $globalSources[$id]['format'] = 'sbs';
+			//if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
 		}
 		if ($globalDebug) echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
-            } else {
+			} else {
 		if ($globalDebug) echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";
-    	    }
-        }
-    }
+			}
+		}
+	}
 }
 if (!isset($globalMinFetch)) $globalMinFetch = 15;
 
@@ -264,18 +264,18 @@ 
 	die;
 }
 foreach ($globalSources as $key => $source) {
-    if (!isset($source['format'])) {
-        $globalSources[$key]['format'] = 'auto';
-    }
+	if (!isset($source['format'])) {
+		$globalSources[$key]['format'] = 'auto';
+	}
 }
 connect_all($globalSources);
 foreach ($globalSources as $key => $source) {
-    if (isset($source['format']) && $source['format'] == 'aprs') {
+	if (isset($source['format']) && $source['format'] == 'aprs') {
 	$aprs_connect = 0;
 	$use_aprs = true;
 	if (isset($source['port']) && $source['port'] == '10152') $aprs_full = true;
 	break;
-    }
+	}
 }
 
 if ($use_aprs) {
@@ -315,67 +315,67 @@ 
 
 // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time.
 while ($i > 0) {
-    if (!$globalDaemon) $i = $endtime-time();
-    // Delete old ATC
-    if ($globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
+	if (!$globalDaemon) $i = $endtime-time();
+	// Delete old ATC
+	if ($globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
 	if ($globalDebug) echo 'Delete old ATC...'."\n";
-        $ATC->deleteOldATC();
-    }
+		$ATC->deleteOldATC();
+	}
     
-    if (count($last_exec) > 0) {
+	if (count($last_exec) > 0) {
 	$max = $globalMinFetch;
 	foreach ($last_exec as $last) {
-	    if ((time() - $last['last']) < $max) $max = time() - $last['last'];
+		if ((time() - $last['last']) < $max) $max = time() - $last['last'];
 	}
 	if ($max != $globalMinFetch) {
-	    if ($globalDebug) echo 'Sleeping...'."\n";
-	    sleep($globalMinFetch-$max+2);
+		if ($globalDebug) echo 'Sleeping...'."\n";
+		sleep($globalMinFetch-$max+2);
+	}
 	}
-    }
 
     
-    //foreach ($formats as $id => $value) {
-    foreach ($globalSources as $id => $value) {
+	//foreach ($formats as $id => $value) {
+	foreach ($globalSources as $id => $value) {
 	if (!isset($last_exec[$id]['last'])) $last_exec[$id]['last'] = 0;
 	if ($value['format'] == 'deltadbtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    //$buffer = $Common->getData($hosts[$id]);
-	    $buffer = $Common->getData($value['host']);
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-	    $buffer = explode('\n',$buffer);
-	    foreach ($buffer as $line) {
-    		if ($line != '' && count($line) > 7) {
-    		    $line = explode(',', $line);
-	            $data = array();
-	            $data['hex'] = $line[1]; // hex
-	            $data['ident'] = $line[2]; // ident
-	            if (isset($line[3])) $data['altitude'] = $line[3]; // altitude
-	            if (isset($line[4])) $data['speed'] = $line[4]; // speed
-	            if (isset($line[5])) $data['heading'] = $line[5]; // heading
-	            if (isset($line[6])) $data['latitude'] = $line[6]; // lat
-	            if (isset($line[7])) $data['longitude'] = $line[7]; // long
-	            $data['verticalrate'] = ''; // vertical rate
-	            //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk
-	            $data['emergency'] = ''; // emergency
-		    $data['datetime'] = date('Y-m-d H:i:s');
-		    $data['format_source'] = 'deltadbtxt';
-    		    $data['id_source'] = $id_source;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
-    		    $SI->add($data);
-		    unset($data);
-    		}
-    	    }
-    	    $last_exec[$id]['last'] = time();
+		//$buffer = $Common->getData($hosts[$id]);
+		$buffer = $Common->getData($value['host']);
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
+		$buffer = explode('\n',$buffer);
+		foreach ($buffer as $line) {
+			if ($line != '' && count($line) > 7) {
+				$line = explode(',', $line);
+				$data = array();
+				$data['hex'] = $line[1]; // hex
+				$data['ident'] = $line[2]; // ident
+				if (isset($line[3])) $data['altitude'] = $line[3]; // altitude
+				if (isset($line[4])) $data['speed'] = $line[4]; // speed
+				if (isset($line[5])) $data['heading'] = $line[5]; // heading
+				if (isset($line[6])) $data['latitude'] = $line[6]; // lat
+				if (isset($line[7])) $data['longitude'] = $line[7]; // long
+				$data['verticalrate'] = ''; // vertical rate
+				//if (isset($line[9])) $data['squawk'] = $line[9]; // squawk
+				$data['emergency'] = ''; // emergency
+			$data['datetime'] = date('Y-m-d H:i:s');
+			$data['format_source'] = 'deltadbtxt';
+				$data['id_source'] = $id_source;
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
+				$SI->add($data);
+			unset($data);
+			}
+			}
+			$last_exec[$id]['last'] = time();
 	//} elseif (($value == 'whazzup' && (time() - $last_exec['whazzup'] > $globalMinFetch)) || ($value == 'vatsimtxt' && (time() - $last_exec['vatsimtxt'] > $globalMinFetch))) {
 	} elseif (($value['format'] == 'whazzup' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) || ($value['format'] == 'vatsimtxt' && (time() - $value[' last_exec'] > $globalMinFetch))) {
-	    //$buffer = $Common->getData($hosts[$id]);
-	    $buffer = $Common->getData($value['host']);
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-	    $buffer = explode('\n',$buffer);
-	    foreach ($buffer as $line) {
-    		if ($line != '') {
-    		    $line = explode(':', $line);
-    		    if (count($line) > 30 && $line[0] != 'callsign') {
+		//$buffer = $Common->getData($hosts[$id]);
+		$buffer = $Common->getData($value['host']);
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
+		$buffer = explode('\n',$buffer);
+		foreach ($buffer as $line) {
+			if ($line != '') {
+				$line = explode(':', $line);
+				if (count($line) > 30 && $line[0] != 'callsign') {
 			$data = array();
 			$data['id'] = $line[1].'-'.$line[0];
 			$data['pilot_id'] = $line[1];
@@ -387,36 +387,36 @@ 
 			if (isset($line[45])) $data['heading'] = $line[45]; // heading
 			elseif (isset($line[38])) $data['heading'] = $line[38]; // heading
 			$data['latitude'] = $line[5]; // lat
-	        	$data['longitude'] = $line[6]; // long
-	        	$data['verticalrate'] = ''; // vertical rate
-	        	$data['squawk'] = ''; // squawk
-	        	$data['emergency'] = ''; // emergency
-	        	$data['waypoints'] = $line[30];
+				$data['longitude'] = $line[6]; // long
+				$data['verticalrate'] = ''; // vertical rate
+				$data['squawk'] = ''; // squawk
+				$data['emergency'] = ''; // emergency
+				$data['waypoints'] = $line[30];
 			$data['datetime'] = date('Y-m-d H:i:s');
 			//$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37]));
 			if (isset($line[37])) $data['last_update'] = $line[37];
-		        $data['departure_airport_icao'] = $line[11];
-		        $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
-		        $data['arrival_airport_icao'] = $line[13];
+				$data['departure_airport_icao'] = $line[11];
+				$data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
+				$data['arrival_airport_icao'] = $line[13];
 			$data['frequency'] = $line[4];
 			$data['type'] = $line[18];
 			$data['range'] = $line[19];
 			if (isset($line[35])) $data['info'] = $line[35];
-    			$data['id_source'] = $id_source;
-	    		//$data['arrival_airport_time'] = ;
-	    		if ($line[9] != '') {
-	    		    $aircraft_data = explode('/',$line[9]);
-	    		    if (isset($aircraft_data[1])) {
-	    			$data['aircraft_icao'] = $aircraft_data[1];
-	    		    }
-        		}
-	    		/*
+				$data['id_source'] = $id_source;
+				//$data['arrival_airport_time'] = ;
+				if ($line[9] != '') {
+					$aircraft_data = explode('/',$line[9]);
+					if (isset($aircraft_data[1])) {
+					$data['aircraft_icao'] = $aircraft_data[1];
+					}
+				}
+				/*
 	    		if ($value == 'whazzup') $data['format_source'] = 'whazzup';
 	    		elseif ($value == 'vatsimtxt') $data['format_source'] = 'vatsimtxt';
 	    		*/
-	    		$data['format_source'] = $value['format'];
+				$data['format_source'] = $value['format'];
 			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-    			if ($line[3] == 'PILOT') $SI->add($data);
+				if ($line[3] == 'PILOT') $SI->add($data);
 			elseif ($line[3] == 'ATC') {
 				//print_r($data);
 				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
@@ -434,240 +434,240 @@ 
 				
 				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']);
 			}
-    			unset($data);
-    		    }
-    		}
-    	    }
-    	    //if ($value == 'whazzup') $last_exec['whazzup'] = time();
-    	    //elseif ($value == 'vatsimtxt') $last_exec['vatsimtxt'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	//} elseif ($value == 'aircraftlistjson' && (time() - $last_exec['aircraftlistjson'] > $globalMinFetch)) {
-    	} elseif ($value['format'] == 'aircraftlistjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
-	    if ($buffer != '') {
-	    $all_data = json_decode($buffer,true);
-	    if (isset($all_data['acList'])) {
+				unset($data);
+				}
+			}
+			}
+			//if ($value == 'whazzup') $last_exec['whazzup'] = time();
+			//elseif ($value == 'vatsimtxt') $last_exec['vatsimtxt'] = time();
+			$last_exec[$id]['last'] = time();
+		//} elseif ($value == 'aircraftlistjson' && (time() - $last_exec['aircraftlistjson'] > $globalMinFetch)) {
+		} elseif ($value['format'] == 'aircraftlistjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
+		$buffer = $Common->getData($value['host'],'get','','','','','20');
+		if ($buffer != '') {
+		$all_data = json_decode($buffer,true);
+		if (isset($all_data['acList'])) {
 		foreach ($all_data['acList'] as $line) {
-		    $data = array();
-		    $data['hex'] = $line['Icao']; // hex
-		    if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
-		    if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
-		    if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
-		    if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
-		    if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
-		    if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
-		    //$data['verticalrate'] = $line['']; // verticale rate
-		    if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
-		    $data['emergency'] = ''; // emergency
-		    if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
-		    /*
+			$data = array();
+			$data['hex'] = $line['Icao']; // hex
+			if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
+			if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
+			if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
+			if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
+			if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
+			if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
+			//$data['verticalrate'] = $line['']; // verticale rate
+			if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
+			$data['emergency'] = ''; // emergency
+			if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
+			/*
 		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',$line['PosTime']/1000);
 		    else $data['datetime'] = date('Y-m-d H:i:s');
 		    */
-		    $data['datetime'] = date('Y-m-d H:i:s');
-		    if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
-	    	    $data['format_source'] = 'aircraftlistjson';
-		    $data['id_source'] = $id_source;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    if (isset($data['datetime'])) $SI->add($data);
-		    unset($data);
+			$data['datetime'] = date('Y-m-d H:i:s');
+			if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
+				$data['format_source'] = 'aircraftlistjson';
+			$data['id_source'] = $id_source;
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			if (isset($data['datetime'])) $SI->add($data);
+			unset($data);
 		}
-	    } else {
+		} else {
 		foreach ($all_data as $line) {
-		    $data = array();
-		    $data['hex'] = $line['hex']; // hex
-		    $data['ident'] = $line['flight']; // ident
-		    $data['altitude'] = $line['altitude']; // altitude
-		    $data['speed'] = $line['speed']; // speed
-		    $data['heading'] = $line['track']; // heading
-		    $data['latitude'] = $line['lat']; // lat
-		    $data['longitude'] = $line['lon']; // long
-		    $data['verticalrate'] = $line['vrt']; // verticale rate
-		    $data['squawk'] = $line['squawk']; // squawk
-		    $data['emergency'] = ''; // emergency
-		    $data['datetime'] = date('Y-m-d H:i:s');
-	    	    $data['format_source'] = 'aircraftlistjson';
-    		    $data['id_source'] = $id_source;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    $SI->add($data);
-		    unset($data);
+			$data = array();
+			$data['hex'] = $line['hex']; // hex
+			$data['ident'] = $line['flight']; // ident
+			$data['altitude'] = $line['altitude']; // altitude
+			$data['speed'] = $line['speed']; // speed
+			$data['heading'] = $line['track']; // heading
+			$data['latitude'] = $line['lat']; // lat
+			$data['longitude'] = $line['lon']; // long
+			$data['verticalrate'] = $line['vrt']; // verticale rate
+			$data['squawk'] = $line['squawk']; // squawk
+			$data['emergency'] = ''; // emergency
+			$data['datetime'] = date('Y-m-d H:i:s');
+				$data['format_source'] = 'aircraftlistjson';
+				$data['id_source'] = $id_source;
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			$SI->add($data);
+			unset($data);
+		}
+		}
 		}
-	    }
-	    }
-    	    //$last_exec['aircraftlistjson'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	//} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
-    	} elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
-	    if (isset($all_data['planes'])) {
+			//$last_exec['aircraftlistjson'] = time();
+			$last_exec[$id]['last'] = time();
+		//} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
+		} elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
+		$buffer = $Common->getData($value['host']);
+		$all_data = json_decode($buffer,true);
+		if (isset($all_data['planes'])) {
 		foreach ($all_data['planes'] as $key => $line) {
-		    $data = array();
-		    $data['hex'] = $key; // hex
-		    $data['ident'] = $line[3]; // ident
-		    $data['altitude'] = $line[6]; // altitude
-		    $data['speed'] = $line[8]; // speed
-		    $data['heading'] = $line[7]; // heading
-		    $data['latitude'] = $line[4]; // lat
-		    $data['longitude'] = $line[5]; // long
-		    //$data['verticalrate'] = $line[]; // verticale rate
-		    $data['squawk'] = $line[10]; // squawk
-		    $data['emergency'] = ''; // emergency
-		    $data['registration'] = $line[2];
-		    $data['aircraft_icao'] = $line[0];
-		    $deparr = explode('-',$line[1]);
-		    if (count($deparr) == 2) {
+			$data = array();
+			$data['hex'] = $key; // hex
+			$data['ident'] = $line[3]; // ident
+			$data['altitude'] = $line[6]; // altitude
+			$data['speed'] = $line[8]; // speed
+			$data['heading'] = $line[7]; // heading
+			$data['latitude'] = $line[4]; // lat
+			$data['longitude'] = $line[5]; // long
+			//$data['verticalrate'] = $line[]; // verticale rate
+			$data['squawk'] = $line[10]; // squawk
+			$data['emergency'] = ''; // emergency
+			$data['registration'] = $line[2];
+			$data['aircraft_icao'] = $line[0];
+			$deparr = explode('-',$line[1]);
+			if (count($deparr) == 2) {
 			$data['departure_airport_icao'] = $deparr[0];
 			$data['arrival_airport_icao'] = $deparr[1];
-		    }
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]);
-	    	    $data['format_source'] = 'planeupdatefaa';
-    		    $data['id_source'] = $id_source;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    $SI->add($data);
-		    unset($data);
+			}
+			$data['datetime'] = date('Y-m-d H:i:s',$line[9]);
+				$data['format_source'] = 'planeupdatefaa';
+				$data['id_source'] = $id_source;
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			$SI->add($data);
+			unset($data);
 		}
-	    }
-    	    //$last_exec['planeupdatefaa'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	} elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
-	    if (isset($all_data['states'])) {
+		}
+			//$last_exec['planeupdatefaa'] = time();
+			$last_exec[$id]['last'] = time();
+		} elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
+		$buffer = $Common->getData($value['host']);
+		$all_data = json_decode($buffer,true);
+		if (isset($all_data['states'])) {
 		foreach ($all_data['states'] as $key => $line) {
-		    $data = array();
-		    $data['hex'] = $line[0]; // hex
-		    $data['ident'] = trim($line[1]); // ident
-		    $data['altitude'] = round($line[7]*3.28084); // altitude
-		    $data['speed'] = round($line[9]*1.94384); // speed
-		    $data['heading'] = round($line[10]); // heading
-		    $data['latitude'] = $line[5]; // lat
-		    $data['longitude'] = $line[6]; // long
-		    $data['verticalrate'] = $line[11]; // verticale rate
-		    //$data['squawk'] = $line[10]; // squawk
-		    //$data['emergency'] = ''; // emergency
-		    //$data['registration'] = $line[2];
-		    //$data['aircraft_icao'] = $line[0];
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]);
-	    	    $data['format_source'] = 'opensky';
-    		    $data['id_source'] = $id_source;
-		    $SI->add($data);
-		    unset($data);
+			$data = array();
+			$data['hex'] = $line[0]; // hex
+			$data['ident'] = trim($line[1]); // ident
+			$data['altitude'] = round($line[7]*3.28084); // altitude
+			$data['speed'] = round($line[9]*1.94384); // speed
+			$data['heading'] = round($line[10]); // heading
+			$data['latitude'] = $line[5]; // lat
+			$data['longitude'] = $line[6]; // long
+			$data['verticalrate'] = $line[11]; // verticale rate
+			//$data['squawk'] = $line[10]; // squawk
+			//$data['emergency'] = ''; // emergency
+			//$data['registration'] = $line[2];
+			//$data['aircraft_icao'] = $line[0];
+			$data['datetime'] = date('Y-m-d H:i:s',$line[3]);
+				$data['format_source'] = 'opensky';
+				$data['id_source'] = $id_source;
+			$SI->add($data);
+			unset($data);
 		}
-	    }
-    	    //$last_exec['planeupdatefaa'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	//} elseif ($value == 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) {
-    	} elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    //$buffer = $Common->getData($hosts[$id]);
-	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
-	    foreach ($all_data as $key => $line) {
+		}
+			//$last_exec['planeupdatefaa'] = time();
+			$last_exec[$id]['last'] = time();
+		//} elseif ($value == 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) {
+		} elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
+		//$buffer = $Common->getData($hosts[$id]);
+		$buffer = $Common->getData($value['host']);
+		$all_data = json_decode($buffer,true);
+		foreach ($all_data as $key => $line) {
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
-		    $data = array();
-		    $data['hex'] = $line[0];
-		    $data['ident'] = $line[16]; //$line[13]
-	    	    $data['altitude'] = $line[4]; // altitude
-	    	    $data['speed'] = $line[5]; // speed
-	    	    $data['heading'] = $line[3]; // heading
-	    	    $data['latitude'] = $line[1]; // lat
-	    	    $data['longitude'] = $line[2]; // long
-	    	    $data['verticalrate'] = $line[15]; // verticale rate
-	    	    $data['squawk'] = $line[6]; // squawk
-	    	    $data['aircraft_icao'] = $line[8];
-	    	    $data['registration'] = $line[9];
-		    $data['departure_airport_iata'] = $line[11];
-		    $data['arrival_airport_iata'] = $line[12];
-	    	    $data['emergency'] = ''; // emergency
-		    $data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
-	    	    $data['format_source'] = 'fr24json';
-    		    $data['id_source'] = $id_source;
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    $SI->add($data);
-		    unset($data);
+			$data = array();
+			$data['hex'] = $line[0];
+			$data['ident'] = $line[16]; //$line[13]
+				$data['altitude'] = $line[4]; // altitude
+				$data['speed'] = $line[5]; // speed
+				$data['heading'] = $line[3]; // heading
+				$data['latitude'] = $line[1]; // lat
+				$data['longitude'] = $line[2]; // long
+				$data['verticalrate'] = $line[15]; // verticale rate
+				$data['squawk'] = $line[6]; // squawk
+				$data['aircraft_icao'] = $line[8];
+				$data['registration'] = $line[9];
+			$data['departure_airport_iata'] = $line[11];
+			$data['arrival_airport_iata'] = $line[12];
+				$data['emergency'] = ''; // emergency
+			$data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
+				$data['format_source'] = 'fr24json';
+				$data['id_source'] = $id_source;
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			$SI->add($data);
+			unset($data);
 		}
-	    }
-    	    //$last_exec['fr24json'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	//} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) {
-    	} elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    //$buffer = $Common->getData($hosts[$id],'get','','','','','150');
-	    $buffer = $Common->getData($value['host'],'get','','','','','150');
-	    //echo $buffer;
-	    $buffer = str_replace(array("\n","\r"),"",$buffer);
-	    $buffer = preg_replace('/,"num":(.+)/','}',$buffer);
-	    $all_data = json_decode($buffer,true);
-	    if (json_last_error() != JSON_ERROR_NONE) {
+		}
+			//$last_exec['fr24json'] = time();
+			$last_exec[$id]['last'] = time();
+		//} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) {
+		} elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
+		//$buffer = $Common->getData($hosts[$id],'get','','','','','150');
+		$buffer = $Common->getData($value['host'],'get','','','','','150');
+		//echo $buffer;
+		$buffer = str_replace(array("\n","\r"),"",$buffer);
+		$buffer = preg_replace('/,"num":(.+)/','}',$buffer);
+		$all_data = json_decode($buffer,true);
+		if (json_last_error() != JSON_ERROR_NONE) {
 		die(json_last_error_msg());
-	    }
-	    if (isset($all_data['mrkrs'])) {
+		}
+		if (isset($all_data['mrkrs'])) {
 		foreach ($all_data['mrkrs'] as $key => $line) {
-		    if (isset($line['inf'])) {
+			if (isset($line['inf'])) {
 			$data = array();
 			$data['hex'] = $line['inf']['ia'];
 			if (isset($line['inf']['cs'])) $data['ident'] = $line['inf']['cs']; //$line[13]
-	    		$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
-	    		if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
-	    		if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
-	    		$data['latitude'] = $line['pt'][0]; // lat
-	    		$data['longitude'] = $line['pt'][1]; // long
-	    		//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
-	    		if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
-	    		//$data['aircraft_icao'] = $line[8];
-	    		if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
+				$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
+				if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
+				if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
+				$data['latitude'] = $line['pt'][0]; // lat
+				$data['longitude'] = $line['pt'][1]; // long
+				//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
+				if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
+				//$data['aircraft_icao'] = $line[8];
+				if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
 			//$data['departure_airport_iata'] = $line[11];
 			//$data['arrival_airport_iata'] = $line[12];
-	    		//$data['emergency'] = ''; // emergency
+				//$data['emergency'] = ''; // emergency
 			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10]
-	    		$data['format_source'] = 'radarvirtueljson';
-    			$data['id_source'] = $id_source;
+				$data['format_source'] = 'radarvirtueljson';
+				$data['id_source'] = $id_source;
 			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
 			$SI->add($data);
 			unset($data);
-		    }
+			}
 		}
-	    }
-    	    //$last_exec['radarvirtueljson'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	//} elseif ($value == 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) {
-    	} elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    //$buffer = $Common->getData($hosts[$id]);
-	    $buffer = $Common->getData($value['host'].'?'.time());
-	    $all_data = json_decode(utf8_encode($buffer),true);
+		}
+			//$last_exec['radarvirtueljson'] = time();
+			$last_exec[$id]['last'] = time();
+		//} elseif ($value == 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) {
+		} elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
+		//$buffer = $Common->getData($hosts[$id]);
+		$buffer = $Common->getData($value['host'].'?'.time());
+		$all_data = json_decode(utf8_encode($buffer),true);
 	    
-	    if (isset($all_data['pireps'])) {
-	        foreach ($all_data['pireps'] as $line) {
-		    $data = array();
-		    $data['id'] = $line['id'];
-		    $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
-		    $data['ident'] = $line['callsign']; // ident
-		    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
-		    if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
-		    if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
-		    if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
-		    if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
-		    $data['latitude'] = $line['lat']; // lat
-		    $data['longitude'] = $line['lon']; // long
-		    //$data['verticalrate'] = $line['vrt']; // verticale rate
-		    //$data['squawk'] = $line['squawk']; // squawk
-		    //$data['emergency'] = ''; // emergency
-		    if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
-		    if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
-		    if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
-		    //$data['arrival_airport_time'] = $line['arrtime'];
-		    if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
-		    if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
-		    if (isset($line['atis'])) $data['info'] = $line['atis'];
-		    else $data['info'] = '';
-		    $data['format_source'] = 'pireps';
-    		    $data['id_source'] = $id_source;
-		    $data['datetime'] = date('Y-m-d H:i:s');
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    if ($line['icon'] == 'plane') {
+		if (isset($all_data['pireps'])) {
+			foreach ($all_data['pireps'] as $line) {
+			$data = array();
+			$data['id'] = $line['id'];
+			$data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
+			$data['ident'] = $line['callsign']; // ident
+			if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
+			if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
+			if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
+			if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
+			if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
+			$data['latitude'] = $line['lat']; // lat
+			$data['longitude'] = $line['lon']; // long
+			//$data['verticalrate'] = $line['vrt']; // verticale rate
+			//$data['squawk'] = $line['squawk']; // squawk
+			//$data['emergency'] = ''; // emergency
+			if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
+			if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
+			if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
+			//$data['arrival_airport_time'] = $line['arrtime'];
+			if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
+			if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
+			if (isset($line['atis'])) $data['info'] = $line['atis'];
+			else $data['info'] = '';
+			$data['format_source'] = 'pireps';
+				$data['id_source'] = $id_source;
+			$data['datetime'] = date('Y-m-d H:i:s');
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			if ($line['icon'] == 'plane') {
 			$SI->add($data);
-		    //    print_r($data);
-    		    } elseif ($line['icon'] == 'ct') {
+			//    print_r($data);
+				} elseif ($line['icon'] == 'ct') {
 			$data['info'] = str_replace('^&sect;','<br />',$data['info']);
 			$data['info'] = str_replace('&amp;sect;','',$data['info']);
 			$typec = substr($data['ident'],-3);
@@ -682,160 +682,160 @@ 
 			elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
 			else $data['type'] = 'Observer';
 			echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name']);
-		    }
-		    unset($data);
+			}
+			unset($data);
 		}
-	    }
-    	    //$last_exec['pirepsjson'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	//} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) {
-    	} elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    //$buffer = $Common->getData($hosts[$id]);
-	    if ($globalDebug) echo 'Get Data...'."\n";
-	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
-	    if ($buffer != '' && is_array($all_data)) {
+		}
+			//$last_exec['pirepsjson'] = time();
+			$last_exec[$id]['last'] = time();
+		//} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) {
+		} elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
+		//$buffer = $Common->getData($hosts[$id]);
+		if ($globalDebug) echo 'Get Data...'."\n";
+		$buffer = $Common->getData($value['host']);
+		$all_data = json_decode($buffer,true);
+		if ($buffer != '' && is_array($all_data)) {
 		foreach ($all_data as $line) {
-	    	    $data = array();
-	    	    //$data['id'] = $line['id']; // id not usable
-	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
-	    	    if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
-	    	    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
-	    	    $data['ident'] = $line['flightnum']; // ident
-	    	    $data['altitude'] = $line['alt']; // altitude
-	    	    $data['speed'] = $line['gs']; // speed
-	    	    $data['heading'] = $line['heading']; // heading
-	    	    $data['latitude'] = $line['lat']; // lat
-	    	    $data['longitude'] = $line['lng']; // long
-	    	    $data['verticalrate'] = ''; // verticale rate
-	    	    $data['squawk'] = ''; // squawk
-	    	    $data['emergency'] = ''; // emergency
-	    	    //$data['datetime'] = $line['lastupdate'];
-	    	    $data['last_update'] = $line['lastupdate'];
-		    $data['datetime'] = date('Y-m-d H:i:s');
-	    	    $data['departure_airport_icao'] = $line['depicao'];
-	    	    $data['departure_airport_time'] = $line['deptime'];
-	    	    $data['arrival_airport_icao'] = $line['arricao'];
-    		    $data['arrival_airport_time'] = $line['arrtime'];
-    		    $data['registration'] = $line['aircraft'];
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
-		    if (isset($line['aircraftname'])) {
+				$data = array();
+				//$data['id'] = $line['id']; // id not usable
+				if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
+				$data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
+				if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
+				if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
+				$data['ident'] = $line['flightnum']; // ident
+				$data['altitude'] = $line['alt']; // altitude
+				$data['speed'] = $line['gs']; // speed
+				$data['heading'] = $line['heading']; // heading
+				$data['latitude'] = $line['lat']; // lat
+				$data['longitude'] = $line['lng']; // long
+				$data['verticalrate'] = ''; // verticale rate
+				$data['squawk'] = ''; // squawk
+				$data['emergency'] = ''; // emergency
+				//$data['datetime'] = $line['lastupdate'];
+				$data['last_update'] = $line['lastupdate'];
+			$data['datetime'] = date('Y-m-d H:i:s');
+				$data['departure_airport_icao'] = $line['depicao'];
+				$data['departure_airport_time'] = $line['deptime'];
+				$data['arrival_airport_icao'] = $line['arricao'];
+				$data['arrival_airport_time'] = $line['arrtime'];
+				$data['registration'] = $line['aircraft'];
+			if (isset($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]) < 5) $data['aircraft_icao'] = $aircraft_data[0];
-	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) < 5) $data['aircraft_icao'] = $aircraft_data[1];
-	    		else {
-	    		    $aircraft_data = explode(' ',$line['aircraftname']);
-	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = $aircraft_data[1];
-	    		    else $data['aircraft_icao'] = $line['aircraftname'];
-	    		}
-	    	    }
-    		    if (isset($line['route'])) $data['waypoints'] = $line['route'];
-    		    $data['id_source'] = $id_source;
-	    	    $data['format_source'] = 'phpvmacars';
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    $SI->add($data);
-		    unset($data);
+				$aircraft_data = explode('-',$line['aircraftname']);
+				if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) < 5) $data['aircraft_icao'] = $aircraft_data[0];
+				elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) < 5) $data['aircraft_icao'] = $aircraft_data[1];
+				else {
+					$aircraft_data = explode(' ',$line['aircraftname']);
+					if (isset($aircraft_data[1])) $data['aircraft_icao'] = $aircraft_data[1];
+					else $data['aircraft_icao'] = $line['aircraftname'];
+				}
+				}
+				if (isset($line['route'])) $data['waypoints'] = $line['route'];
+				$data['id_source'] = $id_source;
+				$data['format_source'] = 'phpvmacars';
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			$SI->add($data);
+			unset($data);
 		}
 		if ($globalDebug) echo 'No more data...'."\n";
 		unset($buffer);
 		unset($all_data);
-	    }
-    	    //$last_exec['phpvmacars'] = time();
-    	    $last_exec[$id]['last'] = time();
-    	} elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
-	    //$buffer = $Common->getData($hosts[$id]);
-	    if ($globalDebug) echo 'Get Data...'."\n";
-	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
-	    if ($buffer != '' && is_array($all_data)) {
+		}
+			//$last_exec['phpvmacars'] = time();
+			$last_exec[$id]['last'] = time();
+		} elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
+		//$buffer = $Common->getData($hosts[$id]);
+		if ($globalDebug) echo 'Get Data...'."\n";
+		$buffer = $Common->getData($value['host']);
+		$all_data = json_decode($buffer,true);
+		if ($buffer != '' && is_array($all_data)) {
 		foreach ($all_data as $line) {
-	    	    $data = array();
-	    	    //$data['id'] = $line['id']; // id not usable
-	    	    $data['id'] = trim($line['flight_id']);
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
-	    	    $data['pilot_name'] = $line['pilot_name'];
-	    	    $data['pilot_id'] = $line['pilot_id'];
-	    	    $data['ident'] = trim($line['callsign']); // ident
-	    	    $data['altitude'] = $line['altitude']; // altitude
-	    	    $data['speed'] = $line['gs']; // speed
-	    	    $data['heading'] = $line['heading']; // heading
-	    	    $data['latitude'] = $line['latitude']; // lat
-	    	    $data['longitude'] = $line['longitude']; // long
-	    	    $data['verticalrate'] = ''; // verticale rate
-	    	    $data['squawk'] = ''; // squawk
-	    	    $data['emergency'] = ''; // emergency
-	    	    //$data['datetime'] = $line['lastupdate'];
-	    	    $data['last_update'] = $line['last_update'];
-		    $data['datetime'] = date('Y-m-d H:i:s');
-	    	    $data['departure_airport_icao'] = $line['departure'];
-	    	    //$data['departure_airport_time'] = $line['departure_time'];
-	    	    $data['arrival_airport_icao'] = $line['arrival'];
-    		    //$data['arrival_airport_time'] = $line['arrival_time'];
-    		    //$data['registration'] = $line['aircraft'];
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
-	    	    $data['aircraft_icao'] = $line['plane_type'];
-    		    $data['id_source'] = $id_source;
-	    	    $data['format_source'] = 'vam';
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
-		    $SI->add($data);
-		    unset($data);
+				$data = array();
+				//$data['id'] = $line['id']; // id not usable
+				$data['id'] = trim($line['flight_id']);
+				$data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
+				$data['pilot_name'] = $line['pilot_name'];
+				$data['pilot_id'] = $line['pilot_id'];
+				$data['ident'] = trim($line['callsign']); // ident
+				$data['altitude'] = $line['altitude']; // altitude
+				$data['speed'] = $line['gs']; // speed
+				$data['heading'] = $line['heading']; // heading
+				$data['latitude'] = $line['latitude']; // lat
+				$data['longitude'] = $line['longitude']; // long
+				$data['verticalrate'] = ''; // verticale rate
+				$data['squawk'] = ''; // squawk
+				$data['emergency'] = ''; // emergency
+				//$data['datetime'] = $line['lastupdate'];
+				$data['last_update'] = $line['last_update'];
+			$data['datetime'] = date('Y-m-d H:i:s');
+				$data['departure_airport_icao'] = $line['departure'];
+				//$data['departure_airport_time'] = $line['departure_time'];
+				$data['arrival_airport_icao'] = $line['arrival'];
+				//$data['arrival_airport_time'] = $line['arrival_time'];
+				//$data['registration'] = $line['aircraft'];
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
+				$data['aircraft_icao'] = $line['plane_type'];
+				$data['id_source'] = $id_source;
+				$data['format_source'] = 'vam';
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
+			$SI->add($data);
+			unset($data);
 		}
 		if ($globalDebug) echo 'No more data...'."\n";
 		unset($buffer);
 		unset($all_data);
-	    }
-    	    //$last_exec['phpvmacars'] = time();
-    	    $last_exec[$id]['last'] = time();
+		}
+			//$last_exec['phpvmacars'] = time();
+			$last_exec[$id]['last'] = time();
 	//} elseif ($value == 'sbs' || $value == 'tsv' || $value == 'raw' || $value == 'aprs' || $value == 'beast') {
 	} elseif ($value['format'] == 'sbs' || $value['format'] == 'tsv' || $value['format'] == 'raw' || $value['format'] == 'aprs' || $value['format'] == 'beast' || $value['format'] == 'flightgearmp' || $value['format'] == 'flightgearsp' || $value['format'] == 'acars' || $value['format'] == 'acarssbs3') {
-	    if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
-    	    //$last_exec[$id]['last'] = time();
+		if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
+			//$last_exec[$id]['last'] = time();
 
-	    //$read = array( $sockets[$id] );
-	    $read = $sockets;
-	    $write = NULL;
-	    $e = NULL;
-	    $n = socket_select($read, $write, $e, $timeout);
-	    if ($e != NULL) var_dump($e);
-	    if ($n > 0) {
+		//$read = array( $sockets[$id] );
+		$read = $sockets;
+		$write = NULL;
+		$e = NULL;
+		$n = socket_select($read, $write, $e, $timeout);
+		if ($e != NULL) var_dump($e);
+		if ($n > 0) {
 		foreach ($read as $nb => $r) {
-		    //$value = $formats[$nb];
-		    $format = $globalSources[$nb]['format'];
-        	    if ($format == 'sbs' || $format == 'aprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') {
-        		$buffer = socket_read($r, 6000,PHP_NORMAL_READ);
-        	    } else {
-	    	        $az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port);
-	    	    }
-        	    //$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
-        	    //echo $buffer."\n";
-		    // lets play nice and handle signals such as ctrl-c/kill properly
-		    //if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
-		    $error = false;
-		    //$SI::del();
-		    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
-		    // SBS format is CSV format
-		    if ($buffer != '') {
+			//$value = $formats[$nb];
+			$format = $globalSources[$nb]['format'];
+				if ($format == 'sbs' || $format == 'aprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') {
+				$buffer = socket_read($r, 6000,PHP_NORMAL_READ);
+				} else {
+					$az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port);
+				}
+				//$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
+				//echo $buffer."\n";
+			// lets play nice and handle signals such as ctrl-c/kill properly
+			//if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
+			$error = false;
+			//$SI::del();
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
+			// SBS format is CSV format
+			if ($buffer != '') {
 			$tt[$format] = 0;
 			if ($format == 'acarssbs3') {
-                    	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
-			    $ACARS->add(trim($buffer));
-			    $ACARS->deleteLiveAcarsData();
+							if ($globalDebug) echo 'ACARS : '.$buffer."\n";
+				$ACARS->add(trim($buffer));
+				$ACARS->deleteLiveAcarsData();
 			} elseif ($format == 'raw') {
-			    // AVR format
-			    $data = $SBS->parse($buffer);
-			    if (is_array($data)) {
+				// AVR format
+				$data = $SBS->parse($buffer);
+				if (is_array($data)) {
 				$data['datetime'] = date('Y-m-d H:i:s');
 				$data['format_source'] = 'raw';
 				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
-                                if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
-                            }
-                        } elseif ($format == 'flightgearsp') {
-                    	    //echo $buffer."\n";
-                    	    if (strlen($buffer) > 5) {
+					if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+								if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
+							}
+						} elseif ($format == 'flightgearsp') {
+							//echo $buffer."\n";
+							if (strlen($buffer) > 5) {
 				$line = explode(',',$buffer);
 				$data = array();
 				//XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p
@@ -851,114 +851,114 @@ 
 				$data['format_source'] = 'flightgearsp';
 				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
 				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
-			    }
-                        } elseif ($format == 'acars') {
-                    	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
-			    $ACARS->add(trim($buffer));
-			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
-			    $ACARS->deleteLiveAcarsData();
+				}
+						} elseif ($format == 'acars') {
+							if ($globalDebug) echo 'ACARS : '.$buffer."\n";
+				$ACARS->add(trim($buffer));
+				socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
+				$ACARS->deleteLiveAcarsData();
 			} elseif ($format == 'flightgearmp') {
-			    if (substr($buffer,0,1) != '#') {
+				if (substr($buffer,0,1) != '#') {
 				$data = array();
 				//echo $buffer."\n";
 				$line = explode(' ',$buffer);
 				if (count($line) == 11) {
-				    $userserver = explode('@',$line[0]);
-				    $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
-				    $data['ident'] = $userserver[0];
-				    $data['registration'] = $userserver[0];
-				    $data['latitude'] = $line[4];
-				    $data['longitude'] = $line[5];
-				    $data['altitude'] = $line[6];
-				    $data['datetime'] = date('Y-m-d H:i:s');
-				    $aircraft_type = $line[10];
-				    $aircraft_type = preg_split(':/:',$aircraft_type);
-				    $data['aircraft_name'] = substr(end($aircraft_type),0,-4);
-				    if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
+					$userserver = explode('@',$line[0]);
+					$data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
+					$data['ident'] = $userserver[0];
+					$data['registration'] = $userserver[0];
+					$data['latitude'] = $line[4];
+					$data['longitude'] = $line[5];
+					$data['altitude'] = $line[6];
+					$data['datetime'] = date('Y-m-d H:i:s');
+					$aircraft_type = $line[10];
+					$aircraft_type = preg_split(':/:',$aircraft_type);
+					$data['aircraft_name'] = substr(end($aircraft_type),0,-4);
+					if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
+				}
 				}
-			    }
 			} elseif ($format == 'beast') {
-			    echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
-			    die;
+				echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
+				die;
 			} elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') {
-			    $line = explode("\t", $buffer);
-			    for($k = 0; $k < count($line); $k=$k+2) {
+				$line = explode("\t", $buffer);
+				for($k = 0; $k < count($line); $k=$k+2) {
 				$key = $line[$k];
-			        $lined[$key] = $line[$k+1];
-			    }
-    			    if (count($lined) > 3) {
-    				$data['hex'] = $lined['hexid'];
-    				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
-    				$data['datetime'] = date('Y-m-d H:i:s');;
-    				if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
-    				if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
-    				if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
-    				if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
-    				if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
-    				if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
-    				if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
-    				$data['id_source'] = $id_source;
-    				$data['format_source'] = 'tsv';
-    				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
-    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
-    				unset($lined);
-    				unset($data);
-    			    } else $error = true;
+					$lined[$key] = $line[$k+1];
+				}
+					if (count($lined) > 3) {
+					$data['hex'] = $lined['hexid'];
+					//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
+					$data['datetime'] = date('Y-m-d H:i:s');;
+					if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
+					if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
+					if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
+					if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
+					if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
+					if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
+					if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
+					$data['id_source'] = $id_source;
+					$data['format_source'] = 'tsv';
+					if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
+					if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+					if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
+					unset($lined);
+					unset($data);
+					} else $error = true;
 			} elseif ($format == 'aprs' && $use_aprs) {
-			    if ($aprs_connect == 0) {
+				if ($aprs_connect == 0) {
 				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
 				$aprs_connect = 1;
-			    }
-			    if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
+				}
+				if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
 				$aprs_last_tx = time();
 				$data_aprs = "# Keep alive";
 				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
-			    }
-			    //echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
-			    $buffer = str_replace('APRS <- ','',$buffer);
-			    $buffer = str_replace('APRS -> ','',$buffer);
-			    if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
+				}
+				//echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
+				$buffer = str_replace('APRS <- ','',$buffer);
+				$buffer = str_replace('APRS -> ','',$buffer);
+				if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
 				$line = $APRS->parse($buffer);
 				if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) {
-				    $data = array();
-				    //print_r($line);
-				    $data['hex'] = $line['address'];
-				    $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
-				    //$data['datetime'] = date('Y-m-d H:i:s');
-				    $data['ident'] = $line['ident'];
-				    $data['latitude'] = $line['latitude'];
-				    $data['longitude'] = $line['longitude'];
-				    //$data['verticalrate'] = $line[16];
-				    if (isset($line['speed'])) $data['speed'] = $line['speed'];
-				    else $data['speed'] = 0;
-				    $data['altitude'] = $line['altitude'];
-				    if (isset($line['course'])) $data['heading'] = $line['course'];
-				    //else $data['heading'] = 0;
-				    $data['aircraft_type'] = $line['stealth'];
-				    if (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive == FALSE)) $data['noarchive'] = true;
-    				    $data['id_source'] = $id_source;
-				    $data['format_source'] = 'aprs';
-				    $data['source_name'] = $line['source'];
-    				    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
-				    $currentdate = date('Y-m-d H:i:s');
-				    $aprsdate = strtotime($data['datetime']);
-				    // Accept data if time <= system time + 20s
-				    if ($line['stealth'] == 0 && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) $send = $SI->add($data);
-				    else {
+					$data = array();
+					//print_r($line);
+					$data['hex'] = $line['address'];
+					$data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
+					//$data['datetime'] = date('Y-m-d H:i:s');
+					$data['ident'] = $line['ident'];
+					$data['latitude'] = $line['latitude'];
+					$data['longitude'] = $line['longitude'];
+					//$data['verticalrate'] = $line[16];
+					if (isset($line['speed'])) $data['speed'] = $line['speed'];
+					else $data['speed'] = 0;
+					$data['altitude'] = $line['altitude'];
+					if (isset($line['course'])) $data['heading'] = $line['course'];
+					//else $data['heading'] = 0;
+					$data['aircraft_type'] = $line['stealth'];
+					if (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive == FALSE)) $data['noarchive'] = true;
+						$data['id_source'] = $id_source;
+					$data['format_source'] = 'aprs';
+					$data['source_name'] = $line['source'];
+						if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+					$currentdate = date('Y-m-d H:i:s');
+					$aprsdate = strtotime($data['datetime']);
+					// Accept data if time <= system time + 20s
+					if ($line['stealth'] == 0 && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) $send = $SI->add($data);
+					else {
 					if ($line['stealth'] != 0) echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
 					else echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n";
-				    }
-				    unset($data);
+					}
+					unset($data);
 				} 
 				//elseif ($line == false && $globalDebug) echo 'Ignored ('.$buffer.")\n";
 				elseif ($line == true && $globalDebug) echo '!! Failed : '.$buffer."!!\n";
-			    }
+				}
 			} else {
-			    $line = explode(',', $buffer);
-    			    if (count($line) > 20) {
-    			    	$data['hex'] = $line[4];
-    				/*
+				$line = explode(',', $buffer);
+					if (count($line) > 20) {
+						$data['hex'] = $line[4];
+					/*
     				$data['datetime'] = $line[6].' '.$line[7];
     					date_default_timezone_set($globalTimezone);
     					$datetime = new DateTime($data['datetime']);
@@ -966,28 +966,28 @@ 
     					$data['datetime'] = $datetime->format('Y-m-d H:i:s');
     					date_default_timezone_set('UTC');
     				*/
-    				// Force datetime to current UTC datetime
-    				$data['datetime'] = date('Y-m-d H:i:s');
-    				$data['ident'] = trim($line[10]);
-    				$data['latitude'] = $line[14];
-    				$data['longitude'] = $line[15];
-    				$data['verticalrate'] = $line[16];
-    				$data['emergency'] = $line[20];
-    				$data['speed'] = $line[12];
-    				$data['squawk'] = $line[17];
-    				$data['altitude'] = $line[11];
-    				$data['heading'] = $line[13];
-    				$data['ground'] = $line[21];
-    				$data['emergency'] = $line[19];
-    				$data['format_source'] = 'sbs';
+					// Force datetime to current UTC datetime
+					$data['datetime'] = date('Y-m-d H:i:s');
+					$data['ident'] = trim($line[10]);
+					$data['latitude'] = $line[14];
+					$data['longitude'] = $line[15];
+					$data['verticalrate'] = $line[16];
+					$data['emergency'] = $line[20];
+					$data['speed'] = $line[12];
+					$data['squawk'] = $line[17];
+					$data['altitude'] = $line[11];
+					$data['heading'] = $line[13];
+					$data['ground'] = $line[21];
+					$data['emergency'] = $line[19];
+					$data['format_source'] = 'sbs';
 				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
-    				$data['id_source'] = $id_source;
-    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
-    				else $error = true;
-    				unset($data);
-    			    } else $error = true;
-			    if ($error) {
+					if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
+					$data['id_source'] = $id_source;
+					if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
+					else $error = true;
+					unset($data);
+					} else $error = true;
+				if ($error) {
 				if (count($line) > 1 && ($line[0] == 'STA' || $line[0] == 'AIR' || $line[0] == 'SEL' || $line[0] == 'ID' || $line[0] == 'CLK')) { 
 					if ($globalDebug) echo "Not a message. Ignoring... \n";
 				} else {
@@ -1003,13 +1003,13 @@ 
 					connect_all($sourceer);
 					$sourceer = array();
 				}
-			    }
+				}
 			}
 			// Sleep for xxx microseconds
 			if (isset($globalSBSSleep)) usleep($globalSBSSleep);
-		    } else {
+			} else {
 			if ($format == 'flightgearmp') {
-			    	if ($globalDebug) echo "Reconnect FlightGear MP...";
+					if ($globalDebug) echo "Reconnect FlightGear MP...";
 				//@socket_close($r);
 				sleep($globalMinFetch);
 				$sourcefg[$nb] = $globalSources[$nb];
@@ -1018,9 +1018,9 @@ 
 				break;
 				
 			} elseif ($format != 'acars' && $format != 'flightgearsp') {
-			    if (isset($tt[$format])) $tt[$format]++;
-			    else $tt[$format] = 0;
-			    if ($tt[$format] > 30) {
+				if (isset($tt[$format])) $tt[$format]++;
+				else $tt[$format] = 0;
+				if ($tt[$format] > 30) {
 				if ($globalDebug) echo "ERROR : Reconnect ".$format."...";
 				//@socket_close($r);
 				sleep(2);
@@ -1031,40 +1031,40 @@ 
 				//connect_all($globalSources);
 				$tt[$format]=0;
 				break;
-			    }
+				}
+			}
 			}
-		    }
 		}
-	    } else {
+		} else {
 		$error = socket_strerror(socket_last_error());
 		if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || time() - $time >= $timeout) {
 			if (isset($globalDebug)) echo "Restarting...\n";
 			// Restart the script if possible
 			if (is_array($sockets)) {
-			    if ($globalDebug) echo "Shutdown all sockets...";
+				if ($globalDebug) echo "Shutdown all sockets...";
 			    
-			    foreach ($sockets as $sock) {
+				foreach ($sockets as $sock) {
 				@socket_shutdown($sock,2);
 				@socket_close($sock);
-			    }
+				}
 			    
 			}
-			    if ($globalDebug) echo "Restart all connections...";
-			    sleep(2);
-			    $time = time();
-			    //connect_all($hosts);
-			    $aprs_connect = 0;
-			    connect_all($globalSources);
+				if ($globalDebug) echo "Restart all connections...";
+				sleep(2);
+				$time = time();
+				//connect_all($hosts);
+				$aprs_connect = 0;
+				connect_all($globalSources);
 
 		}
-	    }
+		}
 	}
 	if ($globalDaemon === false) {
-	    if ($globalDebug) echo 'Check all...'."\n";
-	    $SI->checkAll();
+		if ($globalDebug) echo 'Check all...'."\n";
+		$SI->checkAll();
+	}
 	}
-    }
 }
 
 ?>

install/VAM/VAM-json.php

Spacing +17 added lines, -17 removed lines

@@ -11,27 +11,27 @@
 	die();
 }
 $query = 'select * from vam_live_flights rc, gvausers gu where gu.gvauser_id = rc.gvauser_id';  
-$json_data=array();  
+$json_data = array();  
 $result = $db->query($query);
 while ($rec = $result->fetch_assoc())
 {  
-	$json_array['gvauser_id']=$rec['gvauser_id']; // users "pilot unique ID" "40"
-	$json_array['flight_id']=$rec['flight_id']; // flight_id
-	$json_array['pilot_id']=$rec['callsign']; // users pilot_id "VAM500"
-	$json_array['callsign']=substr($rec['flight_id'],-7);  // substr icao Flight "AFR524"
-	$json_array['pilot_name']=$rec['name'] .' '.$rec['surname'] ;  // Users "name + surname"
-	$json_array['plane_type']=$rec['plane_type'];  // type Plane "B739"
-	$json_array['departure']=$rec['departure'];  // departure ICAO
-	$json_array['arrival']=$rec['arrival'];     // arrival Ident
-	$json_array['latitude']=$rec['latitude'];  // return 55.7328860921521
-	$json_array['longitude']=$rec['longitude'];  // return 8.87433614409404
-	$json_array['altitude']=$rec['altitude'];  // return "147"
-	$json_array['heading']=$rec['heading'];  // return "307"
-	$json_array['ias']=$rec['ias'];  // return speed "IAS"
-	$json_array['gs']=$rec['gs'];  // return speed "GS"
+	$json_array['gvauser_id'] = $rec['gvauser_id']; // users "pilot unique ID" "40"
+	$json_array['flight_id'] = $rec['flight_id']; // flight_id
+	$json_array['pilot_id'] = $rec['callsign']; // users pilot_id "VAM500"
+	$json_array['callsign'] = substr($rec['flight_id'], -7); // substr icao Flight "AFR524"
+	$json_array['pilot_name'] = $rec['name'].' '.$rec['surname']; // Users "name + surname"
+	$json_array['plane_type'] = $rec['plane_type']; // type Plane "B739"
+	$json_array['departure'] = $rec['departure']; // departure ICAO
+	$json_array['arrival'] = $rec['arrival']; // arrival Ident
+	$json_array['latitude'] = $rec['latitude']; // return 55.7328860921521
+	$json_array['longitude'] = $rec['longitude']; // return 8.87433614409404
+	$json_array['altitude'] = $rec['altitude']; // return "147"
+	$json_array['heading'] = $rec['heading']; // return "307"
+	$json_array['ias'] = $rec['ias']; // return speed "IAS"
+	$json_array['gs'] = $rec['gs']; // return speed "GS"
 	// $json_array['routes']=$rec['routes'];  // (unusable)
-	$json_array['flight_status']=$rec['flight_status'];  // "return Status"
-	$json_array['last_update']=$rec['last_update'];  // return "DateTime"
+	$json_array['flight_status'] = $rec['flight_status']; // "return Status"
+	$json_array['last_update'] = $rec['last_update']; // return "DateTime"
 	$json_data[] = $json_array;
  }  
 echo json_encode($json_data);

statistics-pilot.php

Indentation +7 added lines, -7 removed lines

@@ -7,13 +7,13 @@ 
 
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 if ($airline_icao == 'all') {
-    unset($_COOKIE['stats_airline_icao']);
-    setcookie('stats_airline_icao', '', time()-3600);
-    $airline_icao = '';
+	unset($_COOKIE['stats_airline_icao']);
+	setcookie('stats_airline_icao', '', time()-3600);
+	$airline_icao = '';
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
-    $airline_icao = $_COOKIE['stats_airline_icao'];
+	$airline_icao = $_COOKIE['stats_airline_icao'];
 } elseif ($airline_icao == '' && isset($globalFilter)) {
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
+	if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
 setcookie('stats_airline_icao',$airline_icao);
 
@@ -34,14 +34,14 @@ 
           function drawChart() {
             var data = google.visualization.arrayToDataTable([
             	["'._("Pilot").'", "'._("# of times").'"], ';
-            	$pilot_data = '';
+				$pilot_data = '';
 		foreach($pilot_array as $pilot_item)
 		{
 			$pilot_data .= '[ "'.$pilot_item['pilot_name'].' ('.$pilot_item['pilot_id'].')",'.$pilot_item['pilot_count'].'],';
 		}
 		$pilot_data = substr($pilot_data, 0, -1);
 		print $pilot_data;
-            print ']);
+			print ']);
     
             var options = {
             	chartArea: {"width": "80%", "height": "60%"},

Spacing +6 added lines, -6 removed lines

@@ -6,17 +6,17 @@ 
 $title = _("Statistics").' - '._("Most common Pilots");
 
 if (!isset($filter_name)) $filter_name = '';
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 if ($airline_icao == 'all') {
     unset($_COOKIE['stats_airline_icao']);
-    setcookie('stats_airline_icao', '', time()-3600);
+    setcookie('stats_airline_icao', '', time() - 3600);
     $airline_icao = '';
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
     $airline_icao = $_COOKIE['stats_airline_icao'];
 } elseif ($airline_icao == '' && isset($globalFilter)) {
     if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
-setcookie('stats_airline_icao',$airline_icao);
+setcookie('stats_airline_icao', $airline_icao);
 
 require_once('header.php');
 include('statistics-sub-menu.php');
@@ -27,7 +27,7 @@ 
 	</div>
 	<p>'._("Below are the <strong>Top 10</strong> most common pilot.").'</p>';
 	  
-	$pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name);
+	$pilot_array = $Stats->countAllPilots(true, $airline_icao, $filter_name);
 	print '<div id="chart" class="chart" width="100%"></div>
       	<script> 
       		google.load("visualization", "1", {packages:["corechart"]});
@@ -36,7 +36,7 @@ 
             var data = google.visualization.arrayToDataTable([
             	["'._("Pilot").'", "'._("# of times").'"], ';
             	$pilot_data = '';
-		foreach($pilot_array as $pilot_item)
+		foreach ($pilot_array as $pilot_item)
 		{
 			$pilot_data .= '[ "'.$pilot_item['pilot_name'].' ('.$pilot_item['pilot_id'].')",'.$pilot_item['pilot_count'].'],';
 		}
@@ -69,7 +69,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($pilot_array as $pilot_item)
+	foreach ($pilot_array as $pilot_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

Braces +7 added lines, -3 removed lines

@@ -5,7 +5,9 @@ 
 $Stats = new Stats();
 $title = _("Statistics").' - '._("Most common Callsign");
 
-if (!isset($filter_name)) $filter_name = '';
+if (!isset($filter_name)) {
+	$filter_name = '';
+}
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 if ($airline_icao == 'all') {
     unset($_COOKIE['stats_airline_icao']);
@@ -14,8 +16,10 @@ 
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
     $airline_icao = $_COOKIE['stats_airline_icao'];
 } elseif ($airline_icao == '' && isset($globalFilter)) {
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
-}
+    if (isset($globalFilter['airline'])) {
+    	$airline_icao = $globalFilter['airline'][0];
+    }
+    }
 setcookie('stats_airline_icao',$airline_icao);
 
 require_once('header.php');

statistics-owner.php

Indentation +7 added lines, -7 removed lines

@@ -7,13 +7,13 @@ 
 
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 if ($airline_icao == 'all') {
-    unset($_COOKIE['stats_airline_icao']);
-    setcookie('stats_airline_icao', '', time()-3600);
-    $airline_icao = '';
+	unset($_COOKIE['stats_airline_icao']);
+	setcookie('stats_airline_icao', '', time()-3600);
+	$airline_icao = '';
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
-    $airline_icao = $_COOKIE['stats_airline_icao'];
+	$airline_icao = $_COOKIE['stats_airline_icao'];
 } elseif ($airline_icao == '' && isset($globalFilter)) {
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
+	if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
 setcookie('stats_airline_icao',$airline_icao);
 
@@ -33,14 +33,14 @@ 
           function drawChart() {
             var data = google.visualization.arrayToDataTable([
             	["'._("Owner").'", "'._("# of times").'"], ';
-            	$owner_data = '';
+				$owner_data = '';
 		foreach($owner_array as $owner_item)
 		{
 			$owner_data .= '[ "'.$owner_item['owner_name'].'",'.$owner_item['owner_count'].'],';
 		}
 		$owner_data = substr($owner_data, 0, -1);
 		print $owner_data;
-            print ']);
+			print ']);
     
             var options = {
             	chartArea: {"width": "80%", "height": "60%"},

Spacing +6 added lines, -6 removed lines

@@ -6,17 +6,17 @@ 
 $title = _("Statistics").' - '._("Most common owners");
 
 if (!isset($filter_name)) $filter_name = '';
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 if ($airline_icao == 'all') {
     unset($_COOKIE['stats_airline_icao']);
-    setcookie('stats_airline_icao', '', time()-3600);
+    setcookie('stats_airline_icao', '', time() - 3600);
     $airline_icao = '';
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
     $airline_icao = $_COOKIE['stats_airline_icao'];
 } elseif ($airline_icao == '' && isset($globalFilter)) {
     if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
-setcookie('stats_airline_icao',$airline_icao);
+setcookie('stats_airline_icao', $airline_icao);
 
 require_once('header.php');
 include('statistics-sub-menu.php');
@@ -26,7 +26,7 @@ 
 	</div>
 	<p>'._("Below are the <strong>Top 10</strong> most common owner.").'</p>';
  
-	$owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name);
+	$owner_array = $Stats->countAllOwners(true, $airline_icao, $filter_name);
 	print '<div id="chart" class="chart" width="100%"></div>
       	<script> 
       		google.load("visualization", "1", {packages:["corechart"]});
@@ -35,7 +35,7 @@ 
             var data = google.visualization.arrayToDataTable([
             	["'._("Owner").'", "'._("# of times").'"], ';
             	$owner_data = '';
-		foreach($owner_array as $owner_item)
+		foreach ($owner_array as $owner_item)
 		{
 			$owner_data .= '[ "'.$owner_item['owner_name'].'",'.$owner_item['owner_count'].'],';
 		}
@@ -68,7 +68,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($owner_array as $owner_item)
+	foreach ($owner_array as $owner_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

Braces +7 added lines, -3 removed lines

@@ -5,7 +5,9 @@ 
 $Stats = new Stats();
 $title = _("Statistics").' - '._("Most common Callsign");
 
-if (!isset($filter_name)) $filter_name = '';
+if (!isset($filter_name)) {
+	$filter_name = '';
+}
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 if ($airline_icao == 'all') {
     unset($_COOKIE['stats_airline_icao']);
@@ -14,8 +16,10 @@ 
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
     $airline_icao = $_COOKIE['stats_airline_icao'];
 } elseif ($airline_icao == '' && isset($globalFilter)) {
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
-}
+    if (isset($globalFilter['airline'])) {
+    	$airline_icao = $globalFilter['airline'][0];
+    }
+    }
 setcookie('stats_airline_icao',$airline_icao);
 
 require_once('header.php');

statistics-registration.php

Indentation +6 added lines, -6 removed lines

@@ -7,13 +7,13 @@ 
 
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 if ($airline_icao == 'all') {
-    unset($_COOKIE['stats_airline_icao']);
-    setcookie('stats_airline_icao', '', time()-3600);
-    $airline_icao = '';
+	unset($_COOKIE['stats_airline_icao']);
+	setcookie('stats_airline_icao', '', time()-3600);
+	$airline_icao = '';
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
-    $airline_icao = $_COOKIE['stats_airline_icao'];
+	$airline_icao = $_COOKIE['stats_airline_icao'];
 } elseif ($airline_icao == '' && isset($globalFilter)) {
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
+	if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
 setcookie('stats_airline_icao',$airline_icao);
 
@@ -34,7 +34,7 @@ 
           function drawChart() {
             var data = google.visualization.arrayToDataTable([
             	["'._("Aircraft Manufacturer").'", "'._("# of times").'"], ';
-            	$registration_data = '';
+				$registration_data = '';
 foreach($registration_array as $registration_item)
 {
 	$registration_data .= '[ "'.$registration_item['registration'].' - '.$registration_item['aircraft_name'].' ('.$registration_item['aircraft_icao'].')",'.$registration_item['aircraft_registration_count'].'],';

Spacing +6 added lines, -6 removed lines

@@ -6,17 +6,17 @@ 
 $title = _("Statistics").' - '._("Most common Aircraft Registrations");
 
 if (!isset($filter_name)) $filter_name = '';
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 if ($airline_icao == 'all') {
     unset($_COOKIE['stats_airline_icao']);
-    setcookie('stats_airline_icao', '', time()-3600);
+    setcookie('stats_airline_icao', '', time() - 3600);
     $airline_icao = '';
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
     $airline_icao = $_COOKIE['stats_airline_icao'];
 } elseif ($airline_icao == '' && isset($globalFilter)) {
     if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
-setcookie('stats_airline_icao',$airline_icao);
+setcookie('stats_airline_icao', $airline_icao);
 
 require_once('header.php');
 include('statistics-sub-menu.php'); 
@@ -27,7 +27,7 @@ 
 	</div>
     	<p>'._("Below are the <strong>Top 10</strong> most common aircraft registrations.").'</p>';
   
-$registration_array = $Stats->countAllAircraftRegistrations(true,$airline_icao,$filter_name);
+$registration_array = $Stats->countAllAircraftRegistrations(true, $airline_icao, $filter_name);
 print '<div id="chart" class="chart" width="100%"></div>
       	    <script> 
       		google.load("visualization", "1", {packages:["corechart"]});
@@ -36,7 +36,7 @@ 
             var data = google.visualization.arrayToDataTable([
             	["'._("Aircraft Manufacturer").'", "'._("# of times").'"], ';
             	$registration_data = '';
-foreach($registration_array as $registration_item)
+foreach ($registration_array as $registration_item)
 {
 	$registration_data .= '[ "'.$registration_item['registration'].' - '.$registration_item['aircraft_name'].' ('.$registration_item['aircraft_icao'].')",'.$registration_item['aircraft_registration_count'].'],';
 }
@@ -71,7 +71,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($registration_array as $registration_item)
+	foreach ($registration_array as $registration_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

Braces +7 added lines, -3 removed lines

@@ -5,7 +5,9 @@ 
 $Stats = new Stats();
 $title = _("Statistics").' - '._("Most common Callsign");
 
-if (!isset($filter_name)) $filter_name = '';
+if (!isset($filter_name)) {
+	$filter_name = '';
+}
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 if ($airline_icao == 'all') {
     unset($_COOKIE['stats_airline_icao']);
@@ -14,8 +16,10 @@ 
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
     $airline_icao = $_COOKIE['stats_airline_icao'];
 } elseif ($airline_icao == '' && isset($globalFilter)) {
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
-}
+    if (isset($globalFilter['airline'])) {
+    	$airline_icao = $globalFilter['airline'][0];
+    }
+    }
 setcookie('stats_airline_icao',$airline_icao);
 
 require_once('header.php');

statistics-country.php

Indentation +5 added lines, -5 removed lines

@@ -7,13 +7,13 @@
 
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 if ($airline_icao == 'all') {
-    unset($_COOKIE['stats_airline_icao']);
-    setcookie('stats_airline_icao', '', time()-3600);
-    $airline_icao = '';
+	unset($_COOKIE['stats_airline_icao']);
+	setcookie('stats_airline_icao', '', time()-3600);
+	$airline_icao = '';
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
-    $airline_icao = $_COOKIE['stats_airline_icao'];
+	$airline_icao = $_COOKIE['stats_airline_icao'];
 } elseif ($airline_icao == '' && isset($globalFilter)) {
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
+	if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
 setcookie('stats_airline_icao',$airline_icao);
 

Spacing +6 added lines, -6 removed lines

@@ -6,17 +6,17 @@ 
 $title = _("Statistics").' - '._("Most common Country a flight was over");
 
 if (!isset($filter_name)) $filter_name = '';
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 if ($airline_icao == 'all') {
     unset($_COOKIE['stats_airline_icao']);
-    setcookie('stats_airline_icao', '', time()-3600);
+    setcookie('stats_airline_icao', '', time() - 3600);
     $airline_icao = '';
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
     $airline_icao = $_COOKIE['stats_airline_icao'];
 } elseif ($airline_icao == '' && isset($globalFilter)) {
     if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
-setcookie('stats_airline_icao',$airline_icao);
+setcookie('stats_airline_icao', $airline_icao);
 
 require_once('header.php');
 include('statistics-sub-menu.php'); 
@@ -27,7 +27,7 @@ 
 	  </div>
 	<p>'._("Below are the <strong>Top 10</strong> most common country a flight was over.").'</p>';
 
-$flightover_array = $Stats->countAllFlightOverCountries(true,$airline_icao,$filter_name);
+$flightover_array = $Stats->countAllFlightOverCountries(true, $airline_icao, $filter_name);
 print '<div id="chart" class="chart" width="100%"></div>
       	<script> 
       		google.load("visualization", "1", {packages:["corechart"]});
@@ -36,7 +36,7 @@ 
             var data = google.visualization.arrayToDataTable([
             	["'._("Country").'", "'._("# of times").'"], ';
 $flightover_data = '';
-foreach($flightover_array as $flightover_item)
+foreach ($flightover_array as $flightover_item)
 {
 	$flightover_data .= '[ "'.$flightover_item['flight_country'].' ('.$flightover_item['flight_country_iso2'].')",'.$flightover_item['flight_count'].'],';
 }
@@ -71,7 +71,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($flightover_array as $flightover_item)
+	foreach ($flightover_array as $flightover_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

Braces +7 added lines, -3 removed lines

@@ -5,7 +5,9 @@ 
 $Stats = new Stats();
 $title = _("Statistics").' - '._("Most common Callsign");
 
-if (!isset($filter_name)) $filter_name = '';
+if (!isset($filter_name)) {
+	$filter_name = '';
+}
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 if ($airline_icao == 'all') {
     unset($_COOKIE['stats_airline_icao']);
@@ -14,8 +16,10 @@ 
 } elseif ($airline_icao == '' && isset($_COOKIE['stats_airline_icao'])) {
     $airline_icao = $_COOKIE['stats_airline_icao'];
 } elseif ($airline_icao == '' && isset($globalFilter)) {
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
-}
+    if (isset($globalFilter['airline'])) {
+    	$airline_icao = $globalFilter['airline'][0];
+    }
+    }
 setcookie('stats_airline_icao',$airline_icao);
 
 require_once('header.php');