@@ -16,8 +16,8 @@ discard block  | 
                                                    ||
| 16 | 16 | require_once(dirname(__FILE__).'/../require/class.Common.php');  | 
                                                        
| 17 | 17 | if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');  | 
                                                        
| 18 | 18 |  if (isset($globalMarine) && $globalMarine) { | 
                                                        
| 19 | - require_once(dirname(__FILE__).'/../require/class.AIS.php');  | 
                                                        |
| 20 | - require_once(dirname(__FILE__).'/../require/class.MarineImport.php');  | 
                                                        |
| 19 | + require_once(dirname(__FILE__).'/../require/class.AIS.php');  | 
                                                        |
| 20 | + require_once(dirname(__FILE__).'/../require/class.MarineImport.php');  | 
                                                        |
| 21 | 21 | }  | 
                                                        
| 22 | 22 | |
| 23 | 23 | if (!isset($globalDebug)) $globalDebug = FALSE;  | 
                                                        
@@ -25,42 +25,42 @@ discard block  | 
                                                    ||
| 25 | 25 | // Check if schema is at latest version  | 
                                                        
| 26 | 26 | $Connection = new Connection();  | 
                                                        
| 27 | 27 |  if ($Connection->latest() === false) { | 
                                                        
| 28 | - echo "You MUST update to latest schema. Run install/index.php";  | 
                                                        |
| 29 | - exit();  | 
                                                        |
| 28 | + echo "You MUST update to latest schema. Run install/index.php";  | 
                                                        |
| 29 | + exit();  | 
                                                        |
| 30 | 30 | }  | 
                                                        
| 31 | 31 |  if (PHP_SAPI != 'cli') { | 
                                                        
| 32 | - echo "This script MUST be called from console, not a web browser.";  | 
                                                        |
| 32 | + echo "This script MUST be called from console, not a web browser.";  | 
                                                        |
| 33 | 33 | // exit();  | 
                                                        
| 34 | 34 | }  | 
                                                        
| 35 | 35 | |
| 36 | 36 | // This is to be compatible with old version of settings.php  | 
                                                        
| 37 | 37 |  if (!isset($globalSources)) { | 
                                                        
| 38 | -    if (isset($globalSBS1Hosts)) { | 
                                                        |
| 39 | - //$hosts = $globalSBS1Hosts;  | 
                                                        |
| 40 | -        foreach ($globalSBS1Hosts as $host) { | 
                                                        |
| 41 | -	    $globalSources[] = array('host' => $host); | 
                                                        |
| 42 | - }  | 
                                                        |
| 43 | -    } else { | 
                                                        |
| 44 | -        if (!isset($globalSBS1Host)) { | 
                                                        |
| 45 | - echo '$globalSources MUST be defined !';  | 
                                                        |
| 46 | - die;  | 
                                                        |
| 38 | +	if (isset($globalSBS1Hosts)) { | 
                                                        |
| 39 | + //$hosts = $globalSBS1Hosts;  | 
                                                        |
| 40 | +		foreach ($globalSBS1Hosts as $host) { | 
                                                        |
| 41 | +		$globalSources[] = array('host' => $host); | 
                                                        |
| 42 | + }  | 
                                                        |
| 43 | +	} else { | 
                                                        |
| 44 | +		if (!isset($globalSBS1Host)) { | 
                                                        |
| 45 | + echo '$globalSources MUST be defined !';  | 
                                                        |
| 46 | + die;  | 
                                                        |
| 47 | 47 | }  | 
                                                        
| 48 | 48 | //$hosts = array($globalSBS1Host.':'.$globalSBS1Port);  | 
                                                        
| 49 | 49 |  	$globalSources[] = array('host' => $globalSBS1Host,'port' => $globalSBS1Port); | 
                                                        
| 50 | - }  | 
                                                        |
| 50 | + }  | 
                                                        |
| 51 | 51 | }  | 
                                                        
| 52 | 52 | |
| 53 | 53 |  $options = getopt('s::',array('source::','server','nodaemon','idsource::','aprsserverssid::','aprsserverpass::','aprsserverhost::','aprsserverport::','format::','noaprsserver')); | 
                                                        
| 54 | 54 | //if (isset($options['s'])) $hosts = array($options['s']);  | 
                                                        
| 55 | 55 | //elseif (isset($options['source'])) $hosts = array($options['source']);  | 
                                                        
| 56 | 56 |  if (isset($options['s'])) { | 
                                                        
| 57 | - $globalSources = array();  | 
                                                        |
| 58 | -    if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']); | 
                                                        |
| 59 | -    else $globalSources[] = array('host' => $options['s']); | 
                                                        |
| 57 | + $globalSources = array();  | 
                                                        |
| 58 | +	if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']); | 
                                                        |
| 59 | +	else $globalSources[] = array('host' => $options['s']); | 
                                                        |
| 60 | 60 |  } elseif (isset($options['source'])) { | 
                                                        
| 61 | - $globalSources = array();  | 
                                                        |
| 62 | -    if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']); | 
                                                        |
| 63 | -    else $globalSources[] = array('host' => $options['source']); | 
                                                        |
| 61 | + $globalSources = array();  | 
                                                        |
| 62 | +	if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']); | 
                                                        |
| 63 | +	else $globalSources[] = array('host' => $options['source']); | 
                                                        |
| 64 | 64 | }  | 
                                                        
| 65 | 65 |  if (isset($options['aprsserverhost'])) { | 
                                                        
| 66 | 66 | $globalServerAPRS = TRUE;  | 
                                                        
@@ -75,8 +75,8 @@ discard block  | 
                                                    ||
| 75 | 75 | if (isset($options['idsource'])) $id_source = $options['idsource'];  | 
                                                        
| 76 | 76 | else $id_source = 1;  | 
                                                        
| 77 | 77 |  if (isset($globalServer) && $globalServer) { | 
                                                        
| 78 | - if ($globalDebug) echo "Using Server Mode\n";  | 
                                                        |
| 79 | - $SI=new SpotterServer();  | 
                                                        |
| 78 | + if ($globalDebug) echo "Using Server Mode\n";  | 
                                                        |
| 79 | + $SI=new SpotterServer();  | 
                                                        |
| 80 | 80 | /*  | 
                                                        
| 81 | 81 | require_once(dirname(__FILE__).'/../require/class.APRS.php');  | 
                                                        
| 82 | 82 | $SI = new adsb2aprs();  | 
                                                        
@@ -85,8 +85,8 @@ discard block  | 
                                                    ||
| 85 | 85 | } else $SI=new SpotterImport($Connection->db);  | 
                                                        
| 86 | 86 | if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db);  | 
                                                        
| 87 | 87 |  if (isset($globalMarine) && $globalMarine) { | 
                                                        
| 88 | - $AIS = new AIS();  | 
                                                        |
| 89 | - $MI = new MarineImport($Connection->db);  | 
                                                        |
| 88 | + $AIS = new AIS();  | 
                                                        |
| 89 | + $MI = new MarineImport($Connection->db);  | 
                                                        |
| 90 | 90 | }  | 
                                                        
| 91 | 91 | //$APRS=new APRS($Connection->db);  | 
                                                        
| 92 | 92 | $SBS=new SBS();  | 
                                                        
@@ -97,12 +97,12 @@ discard block  | 
                                                    ||
| 97 | 97 |  //$servertz = system('date +%Z'); | 
                                                        
| 98 | 98 | // signal handler - playing nice with sockets and dump1090  | 
                                                        
| 99 | 99 |  if (function_exists('pcntl_fork')) { | 
                                                        
| 100 | -    pcntl_signal(SIGINT,  function() { | 
                                                        |
| 101 | - global $sockets;  | 
                                                        |
| 102 | - echo "\n\nctrl-c or kill signal received. Tidying up ... ";  | 
                                                        |
| 103 | -        die("Bye!\n"); | 
                                                        |
| 104 | - });  | 
                                                        |
| 105 | - pcntl_signal_dispatch();  | 
                                                        |
| 100 | +	pcntl_signal(SIGINT,  function() { | 
                                                        |
| 101 | + global $sockets;  | 
                                                        |
| 102 | + echo "\n\nctrl-c or kill signal received. Tidying up ... ";  | 
                                                        |
| 103 | +		die("Bye!\n"); | 
                                                        |
| 104 | + });  | 
                                                        |
| 105 | + pcntl_signal_dispatch();  | 
                                                        |
| 106 | 106 | }  | 
                                                        
| 107 | 107 | |
| 108 | 108 | // let's try and connect  | 
                                                        
@@ -112,36 +112,36 @@ discard block  | 
                                                    ||
| 112 | 112 | $reset = 0;  | 
                                                        
| 113 | 113 | |
| 114 | 114 |  function connect_all($hosts) { | 
                                                        
| 115 | - //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;  | 
                                                        |
| 116 | - global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;  | 
                                                        |
| 117 | - $reset++;  | 
                                                        |
| 118 | - if ($globalDebug) echo 'Connect to all...'."\n";  | 
                                                        |
| 119 | -    foreach ($hosts as $id => $value) { | 
                                                        |
| 115 | + //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;  | 
                                                        |
| 116 | + global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;  | 
                                                        |
| 117 | + $reset++;  | 
                                                        |
| 118 | + if ($globalDebug) echo 'Connect to all...'."\n";  | 
                                                        |
| 119 | +	foreach ($hosts as $id => $value) { | 
                                                        |
| 120 | 120 | $host = $value['host'];  | 
                                                        
| 121 | 121 | $globalSources[$id]['last_exec'] = 0;  | 
                                                        
| 122 | 122 | // Here we check type of source(s)  | 
                                                        
| 123 | 123 |  	if (filter_var($host,FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) { | 
                                                        
| 124 | -            if (preg_match('/deltadb.txt$/i',$host)) { | 
                                                        |
| 125 | - //$formats[$id] = 'deltadbtxt';  | 
                                                        |
| 126 | - $globalSources[$id]['format'] = 'deltadbtxt';  | 
                                                        |
| 127 | - //$last_exec['deltadbtxt'] = 0;  | 
                                                        |
| 128 | -        	if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n"; | 
                                                        |
| 129 | -            } else if (preg_match('/vatsim-data.txt$/i',$host)) { | 
                                                        |
| 130 | - //$formats[$id] = 'vatsimtxt';  | 
                                                        |
| 131 | - $globalSources[$id]['format'] = 'vatsimtxt';  | 
                                                        |
| 132 | - //$last_exec['vatsimtxt'] = 0;  | 
                                                        |
| 133 | -        	if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n"; | 
                                                        |
| 134 | -    	    } else if (preg_match('/aircraftlist.json$/i',$host)) { | 
                                                        |
| 135 | - //$formats[$id] = 'aircraftlistjson';  | 
                                                        |
| 136 | - $globalSources[$id]['format'] = 'aircraftlistjson';  | 
                                                        |
| 137 | - //$last_exec['aircraftlistjson'] = 0;  | 
                                                        |
| 138 | -        	if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n"; | 
                                                        |
| 139 | -    	    } else if (preg_match('/opensky/i',$host)) { | 
                                                        |
| 140 | - //$formats[$id] = 'aircraftlistjson';  | 
                                                        |
| 141 | - $globalSources[$id]['format'] = 'opensky';  | 
                                                        |
| 142 | - //$last_exec['aircraftlistjson'] = 0;  | 
                                                        |
| 143 | -        	if ($globalDebug) echo "Connect to opensky source (".$host.")...\n"; | 
                                                        |
| 144 | - /*  | 
                                                        |
| 124 | +			if (preg_match('/deltadb.txt$/i',$host)) { | 
                                                        |
| 125 | + //$formats[$id] = 'deltadbtxt';  | 
                                                        |
| 126 | + $globalSources[$id]['format'] = 'deltadbtxt';  | 
                                                        |
| 127 | + //$last_exec['deltadbtxt'] = 0;  | 
                                                        |
| 128 | +			if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n"; | 
                                                        |
| 129 | +			} else if (preg_match('/vatsim-data.txt$/i',$host)) { | 
                                                        |
| 130 | + //$formats[$id] = 'vatsimtxt';  | 
                                                        |
| 131 | + $globalSources[$id]['format'] = 'vatsimtxt';  | 
                                                        |
| 132 | + //$last_exec['vatsimtxt'] = 0;  | 
                                                        |
| 133 | +			if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n"; | 
                                                        |
| 134 | +			} else if (preg_match('/aircraftlist.json$/i',$host)) { | 
                                                        |
| 135 | + //$formats[$id] = 'aircraftlistjson';  | 
                                                        |
| 136 | + $globalSources[$id]['format'] = 'aircraftlistjson';  | 
                                                        |
| 137 | + //$last_exec['aircraftlistjson'] = 0;  | 
                                                        |
| 138 | +			if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n"; | 
                                                        |
| 139 | +			} else if (preg_match('/opensky/i',$host)) { | 
                                                        |
| 140 | + //$formats[$id] = 'aircraftlistjson';  | 
                                                        |
| 141 | + $globalSources[$id]['format'] = 'opensky';  | 
                                                        |
| 142 | + //$last_exec['aircraftlistjson'] = 0;  | 
                                                        |
| 143 | +			if ($globalDebug) echo "Connect to opensky source (".$host.")...\n"; | 
                                                        |
| 144 | + /*  | 
                                                        |
| 145 | 145 | // Disabled for now, site change source format  | 
                                                        
| 146 | 146 |      	    } else if (preg_match('/radarvirtuel.com\/list_aircrafts$/i',$host)) { | 
                                                        
| 147 | 147 | //$formats[$id] = 'radarvirtueljson';  | 
                                                        
@@ -153,118 +153,118 @@ discard block  | 
                                                    ||
| 153 | 153 | exit(0);  | 
                                                        
| 154 | 154 | }  | 
                                                        
| 155 | 155 | */  | 
                                                        
| 156 | -    	    } else if (preg_match('/planeUpdateFAA.php$/i',$host)) { | 
                                                        |
| 157 | - //$formats[$id] = 'planeupdatefaa';  | 
                                                        |
| 158 | - $globalSources[$id]['format'] = 'planeupdatefaa';  | 
                                                        |
| 159 | - //$last_exec['planeupdatefaa'] = 0;  | 
                                                        |
| 160 | -        	if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n"; | 
                                                        |
| 161 | -        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { | 
                                                        |
| 162 | - echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";  | 
                                                        |
| 163 | - exit(0);  | 
                                                        |
| 164 | - }  | 
                                                        |
| 165 | -            } else if (preg_match('/\/action.php\/acars\/data$/i',$host)) { | 
                                                        |
| 166 | - //$formats[$id] = 'phpvmacars';  | 
                                                        |
| 167 | - $globalSources[$id]['format'] = 'phpvmacars';  | 
                                                        |
| 168 | - //$last_exec['phpvmacars'] = 0;  | 
                                                        |
| 169 | -        	if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n"; | 
                                                        |
| 170 | -            } else if (preg_match('/VAM-json.php$/i',$host)) { | 
                                                        |
| 171 | - //$formats[$id] = 'phpvmacars';  | 
                                                        |
| 172 | - $globalSources[$id]['format'] = 'vam';  | 
                                                        |
| 173 | -        	if ($globalDebug) echo "Connect to Vam source (".$host.")...\n"; | 
                                                        |
| 174 | -            } else if (preg_match('/whazzup/i',$host)) { | 
                                                        |
| 175 | - //$formats[$id] = 'whazzup';  | 
                                                        |
| 176 | - $globalSources[$id]['format'] = 'whazzup';  | 
                                                        |
| 177 | - //$last_exec['whazzup'] = 0;  | 
                                                        |
| 178 | -        	if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n"; | 
                                                        |
| 179 | -            } else if (preg_match('/airwhere/i',$host)) { | 
                                                        |
| 180 | - $globalSources[$id]['format'] = 'airwhere';  | 
                                                        |
| 181 | -        	if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n"; | 
                                                        |
| 182 | -            } else if (preg_match('/recentpireps/i',$host)) { | 
                                                        |
| 183 | - //$formats[$id] = 'pirepsjson';  | 
                                                        |
| 184 | - $globalSources[$id]['format'] = 'pirepsjson';  | 
                                                        |
| 185 | - //$last_exec['pirepsjson'] = 0;  | 
                                                        |
| 186 | -        	if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n"; | 
                                                        |
| 187 | -            } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) { | 
                                                        |
| 188 | - //$formats[$id] = 'fr24json';  | 
                                                        |
| 189 | - $globalSources[$id]['format'] = 'fr24json';  | 
                                                        |
| 190 | - //$last_exec['fr24json'] = 0;  | 
                                                        |
| 191 | -        	if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n"; | 
                                                        |
| 192 | -        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { | 
                                                        |
| 193 | - echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";  | 
                                                        |
| 194 | - exit(0);  | 
                                                        |
| 195 | - }  | 
                                                        |
| 196 | -            } else if (preg_match(':myshiptracking.com/:i',$host)) { | 
                                                        |
| 197 | - //$formats[$id] = 'fr24json';  | 
                                                        |
| 198 | - $globalSources[$id]['format'] = 'myshiptracking';  | 
                                                        |
| 199 | - //$last_exec['fr24json'] = 0;  | 
                                                        |
| 200 | -        	if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n"; | 
                                                        |
| 201 | -        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { | 
                                                        |
| 202 | - echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";  | 
                                                        |
| 203 | - exit(0);  | 
                                                        |
| 204 | - }  | 
                                                        |
| 205 | -            //} else if (preg_match('/10001/',$host)) { | 
                                                        |
| 206 | -            } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) { | 
                                                        |
| 207 | - //$formats[$id] = 'tsv';  | 
                                                        |
| 208 | - $globalSources[$id]['format'] = 'tsv';  | 
                                                        |
| 209 | -        	if ($globalDebug) echo "Connect to tsv source (".$host.")...\n"; | 
                                                        |
| 210 | - }  | 
                                                        |
| 211 | -        } elseif (filter_var($host,FILTER_VALIDATE_URL)) { | 
                                                        |
| 212 | -    		if ($globalSources[$id]['format'] == 'aisnmeahttp') { | 
                                                        |
| 213 | - $idf = fopen($globalSources[$id]['host'],'r',false,$context);  | 
                                                        |
| 214 | -    		    if ($idf !== false) { | 
                                                        |
| 215 | - $httpfeeds[$id] = $idf;  | 
                                                        |
| 216 | -        		if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n"; | 
                                                        |
| 217 | - }  | 
                                                        |
| 218 | - elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";  | 
                                                        |
| 219 | -    		} elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n"; | 
                                                        |
| 220 | -        } elseif (!filter_var($host,FILTER_VALIDATE_URL)) { | 
                                                        |
| 221 | -	    $hostport = explode(':',$host); | 
                                                        |
| 222 | -	    if (isset($hostport[1])) { | 
                                                        |
| 156 | +			} else if (preg_match('/planeUpdateFAA.php$/i',$host)) { | 
                                                        |
| 157 | + //$formats[$id] = 'planeupdatefaa';  | 
                                                        |
| 158 | + $globalSources[$id]['format'] = 'planeupdatefaa';  | 
                                                        |
| 159 | + //$last_exec['planeupdatefaa'] = 0;  | 
                                                        |
| 160 | +			if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n"; | 
                                                        |
| 161 | +			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { | 
                                                        |
| 162 | + echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";  | 
                                                        |
| 163 | + exit(0);  | 
                                                        |
| 164 | + }  | 
                                                        |
| 165 | +			} else if (preg_match('/\/action.php\/acars\/data$/i',$host)) { | 
                                                        |
| 166 | + //$formats[$id] = 'phpvmacars';  | 
                                                        |
| 167 | + $globalSources[$id]['format'] = 'phpvmacars';  | 
                                                        |
| 168 | + //$last_exec['phpvmacars'] = 0;  | 
                                                        |
| 169 | +			if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n"; | 
                                                        |
| 170 | +			} else if (preg_match('/VAM-json.php$/i',$host)) { | 
                                                        |
| 171 | + //$formats[$id] = 'phpvmacars';  | 
                                                        |
| 172 | + $globalSources[$id]['format'] = 'vam';  | 
                                                        |
| 173 | +			if ($globalDebug) echo "Connect to Vam source (".$host.")...\n"; | 
                                                        |
| 174 | +			} else if (preg_match('/whazzup/i',$host)) { | 
                                                        |
| 175 | + //$formats[$id] = 'whazzup';  | 
                                                        |
| 176 | + $globalSources[$id]['format'] = 'whazzup';  | 
                                                        |
| 177 | + //$last_exec['whazzup'] = 0;  | 
                                                        |
| 178 | +			if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n"; | 
                                                        |
| 179 | +			} else if (preg_match('/airwhere/i',$host)) { | 
                                                        |
| 180 | + $globalSources[$id]['format'] = 'airwhere';  | 
                                                        |
| 181 | +			if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n"; | 
                                                        |
| 182 | +			} else if (preg_match('/recentpireps/i',$host)) { | 
                                                        |
| 183 | + //$formats[$id] = 'pirepsjson';  | 
                                                        |
| 184 | + $globalSources[$id]['format'] = 'pirepsjson';  | 
                                                        |
| 185 | + //$last_exec['pirepsjson'] = 0;  | 
                                                        |
| 186 | +			if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n"; | 
                                                        |
| 187 | +			} else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) { | 
                                                        |
| 188 | + //$formats[$id] = 'fr24json';  | 
                                                        |
| 189 | + $globalSources[$id]['format'] = 'fr24json';  | 
                                                        |
| 190 | + //$last_exec['fr24json'] = 0;  | 
                                                        |
| 191 | +			if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n"; | 
                                                        |
| 192 | +			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { | 
                                                        |
| 193 | + echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";  | 
                                                        |
| 194 | + exit(0);  | 
                                                        |
| 195 | + }  | 
                                                        |
| 196 | +			} else if (preg_match(':myshiptracking.com/:i',$host)) { | 
                                                        |
| 197 | + //$formats[$id] = 'fr24json';  | 
                                                        |
| 198 | + $globalSources[$id]['format'] = 'myshiptracking';  | 
                                                        |
| 199 | + //$last_exec['fr24json'] = 0;  | 
                                                        |
| 200 | +			if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n"; | 
                                                        |
| 201 | +			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { | 
                                                        |
| 202 | + echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";  | 
                                                        |
| 203 | + exit(0);  | 
                                                        |
| 204 | + }  | 
                                                        |
| 205 | +			//} else if (preg_match('/10001/',$host)) { | 
                                                        |
| 206 | +			} else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) { | 
                                                        |
| 207 | + //$formats[$id] = 'tsv';  | 
                                                        |
| 208 | + $globalSources[$id]['format'] = 'tsv';  | 
                                                        |
| 209 | +			if ($globalDebug) echo "Connect to tsv source (".$host.")...\n"; | 
                                                        |
| 210 | + }  | 
                                                        |
| 211 | +		} elseif (filter_var($host,FILTER_VALIDATE_URL)) { | 
                                                        |
| 212 | +			if ($globalSources[$id]['format'] == 'aisnmeahttp') { | 
                                                        |
| 213 | + $idf = fopen($globalSources[$id]['host'],'r',false,$context);  | 
                                                        |
| 214 | +				if ($idf !== false) { | 
                                                        |
| 215 | + $httpfeeds[$id] = $idf;  | 
                                                        |
| 216 | +				if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n"; | 
                                                        |
| 217 | + }  | 
                                                        |
| 218 | + elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";  | 
                                                        |
| 219 | +			} elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n"; | 
                                                        |
| 220 | +		} elseif (!filter_var($host,FILTER_VALIDATE_URL)) { | 
                                                        |
| 221 | +		$hostport = explode(':',$host); | 
                                                        |
| 222 | +		if (isset($hostport[1])) { | 
                                                        |
| 223 | 223 | $port = $hostport[1];  | 
                                                        
| 224 | 224 | $hostn = $hostport[0];  | 
                                                        
| 225 | -	    } else { | 
                                                        |
| 225 | +		} else { | 
                                                        |
| 226 | 226 | $port = $globalSources[$id]['port'];  | 
                                                        
| 227 | 227 | $hostn = $globalSources[$id]['host'];  | 
                                                        
| 228 | - }  | 
                                                        |
| 229 | - $Common = new Common();  | 
                                                        |
| 230 | -	    if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) { | 
                                                        |
| 231 | - $s = $Common->create_socket($hostn,$port, $errno, $errstr);  | 
                                                        |
| 232 | -    	    } else { | 
                                                        |
| 233 | - $s = $Common->create_socket_udp($hostn,$port, $errno, $errstr);  | 
                                                        |
| 234 | - }  | 
                                                        |
| 235 | -	    if ($s) { | 
                                                        |
| 236 | - $sockets[$id] = $s;  | 
                                                        |
| 237 | -    	        if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') { | 
                                                        |
| 238 | -		    if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') { | 
                                                        |
| 228 | + }  | 
                                                        |
| 229 | + $Common = new Common();  | 
                                                        |
| 230 | +		if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) { | 
                                                        |
| 231 | + $s = $Common->create_socket($hostn,$port, $errno, $errstr);  | 
                                                        |
| 232 | +			} else { | 
                                                        |
| 233 | + $s = $Common->create_socket_udp($hostn,$port, $errno, $errstr);  | 
                                                        |
| 234 | + }  | 
                                                        |
| 235 | +		if ($s) { | 
                                                        |
| 236 | + $sockets[$id] = $s;  | 
                                                        |
| 237 | +				if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') { | 
                                                        |
| 238 | +			if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') { | 
                                                        |
| 239 | 239 | //$formats[$id] = 'aprs';  | 
                                                        
| 240 | 240 | $globalSources[$id]['format'] = 'aprs';  | 
                                                        
| 241 | 241 | //$aprs_connect = 0;  | 
                                                        
| 242 | 242 | //$use_aprs = true;  | 
                                                        
| 243 | -		    } elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') { | 
                                                        |
| 243 | +			} elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') { | 
                                                        |
| 244 | 244 | $globalSources[$id]['format'] = 'vrstcp';  | 
                                                        
| 245 | -    		    } elseif ($port == '10001') { | 
                                                        |
| 246 | - //$formats[$id] = 'tsv';  | 
                                                        |
| 247 | - $globalSources[$id]['format'] = 'tsv';  | 
                                                        |
| 248 | -		    } elseif ($port == '30002') { | 
                                                        |
| 249 | - //$formats[$id] = 'raw';  | 
                                                        |
| 250 | - $globalSources[$id]['format'] = 'raw';  | 
                                                        |
| 251 | -		    } elseif ($port == '5001') { | 
                                                        |
| 252 | - //$formats[$id] = 'raw';  | 
                                                        |
| 253 | - $globalSources[$id]['format'] = 'flightgearmp';  | 
                                                        |
| 254 | -		    } elseif ($port == '30005') { | 
                                                        |
| 245 | +				} elseif ($port == '10001') { | 
                                                        |
| 246 | + //$formats[$id] = 'tsv';  | 
                                                        |
| 247 | + $globalSources[$id]['format'] = 'tsv';  | 
                                                        |
| 248 | +			} elseif ($port == '30002') { | 
                                                        |
| 249 | + //$formats[$id] = 'raw';  | 
                                                        |
| 250 | + $globalSources[$id]['format'] = 'raw';  | 
                                                        |
| 251 | +			} elseif ($port == '5001') { | 
                                                        |
| 252 | + //$formats[$id] = 'raw';  | 
                                                        |
| 253 | + $globalSources[$id]['format'] = 'flightgearmp';  | 
                                                        |
| 254 | +			} elseif ($port == '30005') { | 
                                                        |
| 255 | 255 | // Not yet supported  | 
                                                        
| 256 | - //$formats[$id] = 'beast';  | 
                                                        |
| 257 | - $globalSources[$id]['format'] = 'beast';  | 
                                                        |
| 258 | - //} else $formats[$id] = 'sbs';  | 
                                                        |
| 259 | - } else $globalSources[$id]['format'] = 'sbs';  | 
                                                        |
| 260 | -		    //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n"; | 
                                                        |
| 256 | + //$formats[$id] = 'beast';  | 
                                                        |
| 257 | + $globalSources[$id]['format'] = 'beast';  | 
                                                        |
| 258 | + //} else $formats[$id] = 'sbs';  | 
                                                        |
| 259 | + } else $globalSources[$id]['format'] = 'sbs';  | 
                                                        |
| 260 | +			//if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n"; | 
                                                        |
| 261 | 261 | }  | 
                                                        
| 262 | 262 |  		if ($globalDebug) echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n"; | 
                                                        
| 263 | -            } else { | 
                                                        |
| 263 | +			} else { | 
                                                        |
| 264 | 264 | if ($globalDebug) echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";  | 
                                                        
| 265 | - }  | 
                                                        |
| 266 | - }  | 
                                                        |
| 267 | - }  | 
                                                        |
| 265 | + }  | 
                                                        |
| 266 | + }  | 
                                                        |
| 267 | + }  | 
                                                        |
| 268 | 268 | }  | 
                                                        
| 269 | 269 | if (!isset($globalMinFetch)) $globalMinFetch = 15;  | 
                                                        
| 270 | 270 | |
@@ -287,9 +287,9 @@ discard block  | 
                                                    ||
| 287 | 287 | //connect_all($globalSources);  | 
                                                        
| 288 | 288 | |
| 289 | 289 |  if (isset($globalProxy) && $globalProxy) { | 
                                                        
| 290 | -    $context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true))); | 
                                                        |
| 290 | +	$context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true))); | 
                                                        |
| 291 | 291 |  } else { | 
                                                        
| 292 | -    $context = stream_context_create(array('http' => array('timeout' => $timeout))); | 
                                                        |
| 292 | +	$context = stream_context_create(array('http' => array('timeout' => $timeout))); | 
                                                        |
| 293 | 293 | }  | 
                                                        
| 294 | 294 | |
| 295 | 295 | // APRS Configuration  | 
                                                        
@@ -298,21 +298,21 @@ discard block  | 
                                                    ||
| 298 | 298 | die;  | 
                                                        
| 299 | 299 | }  | 
                                                        
| 300 | 300 |  foreach ($globalSources as $key => $source) { | 
                                                        
| 301 | -    if (!isset($source['format'])) { | 
                                                        |
| 302 | - $globalSources[$key]['format'] = 'auto';  | 
                                                        |
| 303 | - }  | 
                                                        |
| 304 | -    if (isset($source['callback']) && $source['callback'] === TRUE) { | 
                                                        |
| 305 | - unset($globalSources[$key]);  | 
                                                        |
| 306 | - }  | 
                                                        |
| 301 | +	if (!isset($source['format'])) { | 
                                                        |
| 302 | + $globalSources[$key]['format'] = 'auto';  | 
                                                        |
| 303 | + }  | 
                                                        |
| 304 | +	if (isset($source['callback']) && $source['callback'] === TRUE) { | 
                                                        |
| 305 | + unset($globalSources[$key]);  | 
                                                        |
| 306 | + }  | 
                                                        |
| 307 | 307 | }  | 
                                                        
| 308 | 308 | connect_all($globalSources);  | 
                                                        
| 309 | 309 |  foreach ($globalSources as $key => $source) { | 
                                                        
| 310 | -    if (isset($source['format']) && $source['format'] == 'aprs') { | 
                                                        |
| 310 | +	if (isset($source['format']) && $source['format'] == 'aprs') { | 
                                                        |
| 311 | 311 | $aprs_connect = 0;  | 
                                                        
| 312 | 312 | $use_aprs = true;  | 
                                                        
| 313 | 313 | if (isset($source['port']) && $source['port'] == '10152') $aprs_full = true;  | 
                                                        
| 314 | 314 | break;  | 
                                                        
| 315 | - }  | 
                                                        |
| 315 | + }  | 
                                                        |
| 316 | 316 | }  | 
                                                        
| 317 | 317 | |
| 318 | 318 |  if ($use_aprs) { | 
                                                        
@@ -353,115 +353,115 @@ discard block  | 
                                                    ||
| 353 | 353 | |
| 354 | 354 | // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time.  | 
                                                        
| 355 | 355 |  while ($i > 0) { | 
                                                        
| 356 | - if (!$globalDaemon) $i = $endtime-time();  | 
                                                        |
| 357 | - // Delete old ATC  | 
                                                        |
| 358 | -    if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) { | 
                                                        |
| 356 | + if (!$globalDaemon) $i = $endtime-time();  | 
                                                        |
| 357 | + // Delete old ATC  | 
                                                        |
| 358 | +	if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) { | 
                                                        |
| 359 | 359 | if ($globalDebug) echo 'Delete old ATC...'."\n";  | 
                                                        
| 360 | - $ATC->deleteOldATC();  | 
                                                        |
| 361 | - }  | 
                                                        |
| 360 | + $ATC->deleteOldATC();  | 
                                                        |
| 361 | + }  | 
                                                        |
| 362 | 362 | |
| 363 | -    if (count($last_exec) == count($globalSources)) { | 
                                                        |
| 363 | +	if (count($last_exec) == count($globalSources)) { | 
                                                        |
| 364 | 364 | $max = $globalMinFetch;  | 
                                                        
| 365 | 365 |  	foreach ($last_exec as $last) { | 
                                                        
| 366 | - if ((time() - $last['last']) < $max) $max = time() - $last['last'];  | 
                                                        |
| 366 | + if ((time() - $last['last']) < $max) $max = time() - $last['last'];  | 
                                                        |
| 367 | 367 | }  | 
                                                        
| 368 | 368 |  	if ($max != $globalMinFetch) { | 
                                                        
| 369 | - if ($globalDebug) echo 'Sleeping...'."\n";  | 
                                                        |
| 370 | - sleep($globalMinFetch-$max+2);  | 
                                                        |
| 369 | + if ($globalDebug) echo 'Sleeping...'."\n";  | 
                                                        |
| 370 | + sleep($globalMinFetch-$max+2);  | 
                                                        |
| 371 | + }  | 
                                                        |
| 371 | 372 | }  | 
                                                        
| 372 | - }  | 
                                                        |
| 373 | 373 | |
| 374 | 374 | |
| 375 | -    //foreach ($formats as $id => $value) { | 
                                                        |
| 376 | -    foreach ($globalSources as $id => $value) { | 
                                                        |
| 375 | +	//foreach ($formats as $id => $value) { | 
                                                        |
| 376 | +	foreach ($globalSources as $id => $value) { | 
                                                        |
| 377 | 377 |  	date_default_timezone_set('UTC'); | 
                                                        
| 378 | 378 | if (!isset($last_exec[$id]['last'])) $last_exec[$id]['last'] = 0;  | 
                                                        
| 379 | 379 |  	if ($value['format'] == 'deltadbtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { | 
                                                        
| 380 | - //$buffer = $Common->getData($hosts[$id]);  | 
                                                        |
| 381 | - $buffer = $Common->getData($value['host']);  | 
                                                        |
| 382 | - if ($buffer != '') $reset = 0;  | 
                                                        |
| 383 | -    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); | 
                                                        |
| 384 | -	    $buffer = explode('\n',$buffer); | 
                                                        |
| 385 | -	    foreach ($buffer as $line) { | 
                                                        |
| 386 | -    		if ($line != '' && count($line) > 7) { | 
                                                        |
| 387 | -    		    $line = explode(',', $line); | 
                                                        |
| 388 | - $data = array();  | 
                                                        |
| 389 | - $data['hex'] = $line[1]; // hex  | 
                                                        |
| 390 | - $data['ident'] = $line[2]; // ident  | 
                                                        |
| 391 | - if (isset($line[3])) $data['altitude'] = $line[3]; // altitude  | 
                                                        |
| 392 | - if (isset($line[4])) $data['speed'] = $line[4]; // speed  | 
                                                        |
| 393 | - if (isset($line[5])) $data['heading'] = $line[5]; // heading  | 
                                                        |
| 394 | - if (isset($line[6])) $data['latitude'] = $line[6]; // lat  | 
                                                        |
| 395 | - if (isset($line[7])) $data['longitude'] = $line[7]; // long  | 
                                                        |
| 396 | - $data['verticalrate'] = ''; // vertical rate  | 
                                                        |
| 397 | - //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk  | 
                                                        |
| 398 | - $data['emergency'] = ''; // emergency  | 
                                                        |
| 399 | -		    $data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        |
| 400 | - $data['format_source'] = 'deltadbtxt';  | 
                                                        |
| 401 | - $data['id_source'] = $id_source;  | 
                                                        |
| 402 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];  | 
                                                        |
| 403 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 404 | - if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];  | 
                                                        |
| 405 | - $SI->add($data);  | 
                                                        |
| 406 | - unset($data);  | 
                                                        |
| 407 | - }  | 
                                                        |
| 408 | - }  | 
                                                        |
| 409 | - $last_exec[$id]['last'] = time();  | 
                                                        |
| 380 | + //$buffer = $Common->getData($hosts[$id]);  | 
                                                        |
| 381 | + $buffer = $Common->getData($value['host']);  | 
                                                        |
| 382 | + if ($buffer != '') $reset = 0;  | 
                                                        |
| 383 | +			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); | 
                                                        |
| 384 | +		$buffer = explode('\n',$buffer); | 
                                                        |
| 385 | +		foreach ($buffer as $line) { | 
                                                        |
| 386 | +			if ($line != '' && count($line) > 7) { | 
                                                        |
| 387 | +				$line = explode(',', $line); | 
                                                        |
| 388 | + $data = array();  | 
                                                        |
| 389 | + $data['hex'] = $line[1]; // hex  | 
                                                        |
| 390 | + $data['ident'] = $line[2]; // ident  | 
                                                        |
| 391 | + if (isset($line[3])) $data['altitude'] = $line[3]; // altitude  | 
                                                        |
| 392 | + if (isset($line[4])) $data['speed'] = $line[4]; // speed  | 
                                                        |
| 393 | + if (isset($line[5])) $data['heading'] = $line[5]; // heading  | 
                                                        |
| 394 | + if (isset($line[6])) $data['latitude'] = $line[6]; // lat  | 
                                                        |
| 395 | + if (isset($line[7])) $data['longitude'] = $line[7]; // long  | 
                                                        |
| 396 | + $data['verticalrate'] = ''; // vertical rate  | 
                                                        |
| 397 | + //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk  | 
                                                        |
| 398 | + $data['emergency'] = ''; // emergency  | 
                                                        |
| 399 | +			$data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        |
| 400 | + $data['format_source'] = 'deltadbtxt';  | 
                                                        |
| 401 | + $data['id_source'] = $id_source;  | 
                                                        |
| 402 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];  | 
                                                        |
| 403 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 404 | + if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];  | 
                                                        |
| 405 | + $SI->add($data);  | 
                                                        |
| 406 | + unset($data);  | 
                                                        |
| 407 | + }  | 
                                                        |
| 408 | + }  | 
                                                        |
| 409 | + $last_exec[$id]['last'] = time();  | 
                                                        |
| 410 | 410 |  	} elseif ($value['format'] == 'aisnmeatxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) { | 
                                                        
| 411 | -	    date_default_timezone_set('CET'); | 
                                                        |
| 412 | -	    $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host'])); | 
                                                        |
| 413 | -	    date_default_timezone_set('UTC'); | 
                                                        |
| 414 | - if ($buffer != '') $reset = 0;  | 
                                                        |
| 415 | -    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); | 
                                                        |
| 416 | -	    $buffer = explode('\n',$buffer); | 
                                                        |
| 417 | -	    foreach ($buffer as $line) { | 
                                                        |
| 411 | +		date_default_timezone_set('CET'); | 
                                                        |
| 412 | +		$buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host'])); | 
                                                        |
| 413 | +		date_default_timezone_set('UTC'); | 
                                                        |
| 414 | + if ($buffer != '') $reset = 0;  | 
                                                        |
| 415 | +			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); | 
                                                        |
| 416 | +		$buffer = explode('\n',$buffer); | 
                                                        |
| 417 | +		foreach ($buffer as $line) { | 
                                                        |
| 418 | 418 |  		if ($line != '') { | 
                                                        
| 419 | - //echo "'".$line."'\n";  | 
                                                        |
| 420 | - $add = false;  | 
                                                        |
| 421 | - $ais_data = $AIS->parse_line(trim($line));  | 
                                                        |
| 422 | - $data = array();  | 
                                                        |
| 423 | - if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];  | 
                                                        |
| 424 | - if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];  | 
                                                        |
| 425 | - if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];  | 
                                                        |
| 426 | - if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];  | 
                                                        |
| 427 | - if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];  | 
                                                        |
| 428 | - if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];  | 
                                                        |
| 429 | - if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];  | 
                                                        |
| 430 | - if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];  | 
                                                        |
| 431 | - if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];  | 
                                                        |
| 432 | - if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];  | 
                                                        |
| 433 | -		    if (isset($ais_data['timestamp'])) { | 
                                                        |
| 419 | + //echo "'".$line."'\n";  | 
                                                        |
| 420 | + $add = false;  | 
                                                        |
| 421 | + $ais_data = $AIS->parse_line(trim($line));  | 
                                                        |
| 422 | + $data = array();  | 
                                                        |
| 423 | + if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];  | 
                                                        |
| 424 | + if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];  | 
                                                        |
| 425 | + if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];  | 
                                                        |
| 426 | + if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];  | 
                                                        |
| 427 | + if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];  | 
                                                        |
| 428 | + if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];  | 
                                                        |
| 429 | + if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];  | 
                                                        |
| 430 | + if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];  | 
                                                        |
| 431 | + if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];  | 
                                                        |
| 432 | + if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];  | 
                                                        |
| 433 | +			if (isset($ais_data['timestamp'])) { | 
                                                        |
| 434 | 434 |  			$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); | 
                                                        
| 435 | 435 |  			if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) { | 
                                                        
| 436 | - $last_exec[$id]['timestamp'] = $ais_data['timestamp'];  | 
                                                        |
| 437 | - $add = true;  | 
                                                        |
| 436 | + $last_exec[$id]['timestamp'] = $ais_data['timestamp'];  | 
                                                        |
| 437 | + $add = true;  | 
                                                        |
| 438 | 438 | }  | 
                                                        
| 439 | -		    } else { | 
                                                        |
| 439 | +			} else { | 
                                                        |
| 440 | 440 |  			$data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        
| 441 | 441 | $add = true;  | 
                                                        
| 442 | - }  | 
                                                        |
| 443 | - $data['format_source'] = 'aisnmeatxt';  | 
                                                        |
| 444 | - $data['id_source'] = $id_source;  | 
                                                        |
| 445 | - //print_r($data);  | 
                                                        |
| 446 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 447 | - if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);  | 
                                                        |
| 448 | - unset($data);  | 
                                                        |
| 442 | + }  | 
                                                        |
| 443 | + $data['format_source'] = 'aisnmeatxt';  | 
                                                        |
| 444 | + $data['id_source'] = $id_source;  | 
                                                        |
| 445 | + //print_r($data);  | 
                                                        |
| 446 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 447 | + if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);  | 
                                                        |
| 448 | + unset($data);  | 
                                                        |
| 449 | 449 | }  | 
                                                        
| 450 | - }  | 
                                                        |
| 451 | - $last_exec[$id]['last'] = time();  | 
                                                        |
| 450 | + }  | 
                                                        |
| 451 | + $last_exec[$id]['last'] = time();  | 
                                                        |
| 452 | 452 |  	} elseif ($value['format'] == 'aisnmeahttp') { | 
                                                        
| 453 | - $arr = $httpfeeds;  | 
                                                        |
| 454 | - $w = $e = null;  | 
                                                        |
| 453 | + $arr = $httpfeeds;  | 
                                                        |
| 454 | + $w = $e = null;  | 
                                                        |
| 455 | 455 | |
| 456 | -	    if (isset($arr[$id])) { | 
                                                        |
| 456 | +		if (isset($arr[$id])) { | 
                                                        |
| 457 | 457 | $nn = stream_select($arr,$w,$e,$timeout);  | 
                                                        
| 458 | 458 |  		if ($nn > 0) { | 
                                                        
| 459 | -		    foreach ($httpfeeds as $feed) { | 
                                                        |
| 459 | +			foreach ($httpfeeds as $feed) { | 
                                                        |
| 460 | 460 | $buffer = stream_get_line($feed,2000,"\n");  | 
                                                        
| 461 | 461 |  			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); | 
                                                        
| 462 | 462 |  			$buffer = explode('\n',$buffer); | 
                                                        
| 463 | 463 |  			foreach ($buffer as $line) { | 
                                                        
| 464 | -			    if ($line != '') { | 
                                                        |
| 464 | +				if ($line != '') { | 
                                                        |
| 465 | 465 | $ais_data = $AIS->parse_line(trim($line));  | 
                                                        
| 466 | 466 | $data = array();  | 
                                                        
| 467 | 467 | if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];  | 
                                                        
@@ -479,96 +479,96 @@ discard block  | 
                                                    ||
| 479 | 479 | if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];  | 
                                                        
| 480 | 480 |  				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); | 
                                                        
| 481 | 481 |  				if (isset($ais_data['timestamp'])) { | 
                                                        
| 482 | -				    $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); | 
                                                        |
| 482 | +					$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); | 
                                                        |
| 483 | 483 |  				} else { | 
                                                        
| 484 | -				    $data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        |
| 484 | +					$data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        |
| 485 | 485 | }  | 
                                                        
| 486 | 486 | $data['format_source'] = 'aisnmeahttp';  | 
                                                        
| 487 | 487 | $data['id_source'] = $id_source;  | 
                                                        
| 488 | 488 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        
| 489 | 489 | if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);  | 
                                                        
| 490 | 490 | unset($data);  | 
                                                        
| 491 | - }  | 
                                                        |
| 491 | + }  | 
                                                        |
| 492 | + }  | 
                                                        |
| 492 | 493 | }  | 
                                                        
| 493 | - }  | 
                                                        |
| 494 | 494 |  		} else { | 
                                                        
| 495 | - $format = $value['format'];  | 
                                                        |
| 496 | - if (isset($tt[$format])) $tt[$format]++;  | 
                                                        |
| 497 | - else $tt[$format] = 0;  | 
                                                        |
| 498 | -		    if ($tt[$format] > 30) { | 
                                                        |
| 495 | + $format = $value['format'];  | 
                                                        |
| 496 | + if (isset($tt[$format])) $tt[$format]++;  | 
                                                        |
| 497 | + else $tt[$format] = 0;  | 
                                                        |
| 498 | +			if ($tt[$format] > 30) { | 
                                                        |
| 499 | 499 | if ($globalDebug) echo 'Reconnect...'."\n";  | 
                                                        
| 500 | 500 | sleep(2);  | 
                                                        
| 501 | 501 | $sourceeen[] = $value;  | 
                                                        
| 502 | 502 | connect_all($sourceeen);  | 
                                                        
| 503 | 503 | $sourceeen = array();  | 
                                                        
| 504 | - }  | 
                                                        |
| 504 | + }  | 
                                                        |
| 505 | + }  | 
                                                        |
| 505 | 506 | }  | 
                                                        
| 506 | - }  | 
                                                        |
| 507 | 507 |  	} elseif ($value['format'] == 'myshiptracking' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) { | 
                                                        
| 508 | - $buffer = $Common->getData($value['host'],'get','','','','','20');  | 
                                                        |
| 509 | -	    if ($buffer != '') { | 
                                                        |
| 508 | + $buffer = $Common->getData($value['host'],'get','','','','','20');  | 
                                                        |
| 509 | +		if ($buffer != '') { | 
                                                        |
| 510 | 510 | //echo $buffer;  | 
                                                        
| 511 | 511 | $all_data = json_decode($buffer,true);  | 
                                                        
| 512 | 512 | //print_r($all_data);  | 
                                                        
| 513 | 513 |  		if (isset($all_data[0]['DATA'])) { | 
                                                        
| 514 | -		    foreach ($all_data[0]['DATA'] as $line) { | 
                                                        |
| 514 | +			foreach ($all_data[0]['DATA'] as $line) { | 
                                                        |
| 515 | 515 |  			if ($line != '') { | 
                                                        
| 516 | - $data = array();  | 
                                                        |
| 517 | - $data['ident'] = $line['NAME'];  | 
                                                        |
| 518 | - $data['mmsi'] = $line['MMSI'];  | 
                                                        |
| 519 | - $data['speed'] = $line['SOG'];  | 
                                                        |
| 520 | - $data['heading'] = $line['COG'];  | 
                                                        |
| 521 | - $data['latitude'] = $line['LAT'];  | 
                                                        |
| 522 | - $data['longitude'] = $line['LNG'];  | 
                                                        |
| 523 | - // if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];  | 
                                                        |
| 524 | - $data['imo'] = $line['IMO'];  | 
                                                        |
| 525 | - //$data['arrival_code'] = $ais_data['destination'];  | 
                                                        |
| 526 | -			    $data['datetime'] = date('Y-m-d H:i:s',$line['T']); | 
                                                        |
| 527 | - $data['format_source'] = 'myshiptracking';  | 
                                                        |
| 528 | - $data['id_source'] = $id_source;  | 
                                                        |
| 529 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 530 | - $MI->add($data);  | 
                                                        |
| 531 | - unset($data);  | 
                                                        |
| 516 | + $data = array();  | 
                                                        |
| 517 | + $data['ident'] = $line['NAME'];  | 
                                                        |
| 518 | + $data['mmsi'] = $line['MMSI'];  | 
                                                        |
| 519 | + $data['speed'] = $line['SOG'];  | 
                                                        |
| 520 | + $data['heading'] = $line['COG'];  | 
                                                        |
| 521 | + $data['latitude'] = $line['LAT'];  | 
                                                        |
| 522 | + $data['longitude'] = $line['LNG'];  | 
                                                        |
| 523 | + // if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];  | 
                                                        |
| 524 | + $data['imo'] = $line['IMO'];  | 
                                                        |
| 525 | + //$data['arrival_code'] = $ais_data['destination'];  | 
                                                        |
| 526 | +				$data['datetime'] = date('Y-m-d H:i:s',$line['T']); | 
                                                        |
| 527 | + $data['format_source'] = 'myshiptracking';  | 
                                                        |
| 528 | + $data['id_source'] = $id_source;  | 
                                                        |
| 529 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 530 | + $MI->add($data);  | 
                                                        |
| 531 | + unset($data);  | 
                                                        |
| 532 | + }  | 
                                                        |
| 532 | 533 | }  | 
                                                        
| 533 | - }  | 
                                                        |
| 534 | 534 | }  | 
                                                        
| 535 | - }  | 
                                                        |
| 536 | - $last_exec[$id]['last'] = time();  | 
                                                        |
| 535 | + }  | 
                                                        |
| 536 | + $last_exec[$id]['last'] = time();  | 
                                                        |
| 537 | 537 |  	} elseif ($value['format'] == 'boatbeaconapp' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) { | 
                                                        
| 538 | -	    $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host'])); | 
                                                        |
| 539 | -	    if ($buffer != '') { | 
                                                        |
| 538 | +		$buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host'])); | 
                                                        |
| 539 | +		if ($buffer != '') { | 
                                                        |
| 540 | 540 | $all_data = json_decode($buffer,true);  | 
                                                        
| 541 | 541 |  		if (isset($all_data[0]['mmsi'])) { | 
                                                        
| 542 | -		    foreach ($all_data as $line) { | 
                                                        |
| 542 | +			foreach ($all_data as $line) { | 
                                                        |
| 543 | 543 |  			if ($line != '') { | 
                                                        
| 544 | - $data = array();  | 
                                                        |
| 545 | - $data['ident'] = $line['shipname'];  | 
                                                        |
| 546 | - $data['callsign'] = $line['callsign'];  | 
                                                        |
| 547 | - $data['mmsi'] = $line['mmsi'];  | 
                                                        |
| 548 | - $data['speed'] = $line['sog'];  | 
                                                        |
| 549 | - if ($line['heading'] != '511') $data['heading'] = $line['heading'];  | 
                                                        |
| 550 | - $data['latitude'] = $line['latitude'];  | 
                                                        |
| 551 | - $data['longitude'] = $line['longitude'];  | 
                                                        |
| 552 | - $data['type_id'] = $line['shiptype'];  | 
                                                        |
| 553 | - $data['arrival_code'] = $line['destination'];  | 
                                                        |
| 554 | - $data['datetime'] = $line['time'];  | 
                                                        |
| 555 | - $data['format_source'] = 'boatbeaconapp';  | 
                                                        |
| 556 | - $data['id_source'] = $id_source;  | 
                                                        |
| 557 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 558 | - $MI->add($data);  | 
                                                        |
| 559 | - unset($data);  | 
                                                        |
| 544 | + $data = array();  | 
                                                        |
| 545 | + $data['ident'] = $line['shipname'];  | 
                                                        |
| 546 | + $data['callsign'] = $line['callsign'];  | 
                                                        |
| 547 | + $data['mmsi'] = $line['mmsi'];  | 
                                                        |
| 548 | + $data['speed'] = $line['sog'];  | 
                                                        |
| 549 | + if ($line['heading'] != '511') $data['heading'] = $line['heading'];  | 
                                                        |
| 550 | + $data['latitude'] = $line['latitude'];  | 
                                                        |
| 551 | + $data['longitude'] = $line['longitude'];  | 
                                                        |
| 552 | + $data['type_id'] = $line['shiptype'];  | 
                                                        |
| 553 | + $data['arrival_code'] = $line['destination'];  | 
                                                        |
| 554 | + $data['datetime'] = $line['time'];  | 
                                                        |
| 555 | + $data['format_source'] = 'boatbeaconapp';  | 
                                                        |
| 556 | + $data['id_source'] = $id_source;  | 
                                                        |
| 557 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 558 | + $MI->add($data);  | 
                                                        |
| 559 | + unset($data);  | 
                                                        |
| 560 | + }  | 
                                                        |
| 560 | 561 | }  | 
                                                        
| 561 | - }  | 
                                                        |
| 562 | 562 | }  | 
                                                        
| 563 | 563 | |
| 564 | - }  | 
                                                        |
| 565 | - $last_exec[$id]['last'] = time();  | 
                                                        |
| 564 | + }  | 
                                                        |
| 565 | + $last_exec[$id]['last'] = time();  | 
                                                        |
| 566 | 566 |  	} elseif ($value['format'] == 'boatnerd' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) { | 
                                                        
| 567 | - $buffer = $Common->getData($value['host']);  | 
                                                        |
| 568 | -	    if ($buffer != '') { | 
                                                        |
| 567 | + $buffer = $Common->getData($value['host']);  | 
                                                        |
| 568 | +		if ($buffer != '') { | 
                                                        |
| 569 | 569 | $all_data = json_decode($buffer,true);  | 
                                                        
| 570 | 570 |  		if (isset($all_data['features'][0]['id'])) { | 
                                                        
| 571 | -		    foreach ($all_data['features'] as $line) { | 
                                                        |
| 571 | +			foreach ($all_data['features'] as $line) { | 
                                                        |
| 572 | 572 | $data = array();  | 
                                                        
| 573 | 573 | if (isset($line['properties']['name'])) $data['ident'] = $line['properties']['name'];  | 
                                                        
| 574 | 574 | if (isset($line['properties']['callsign'])) $data['callsign'] = $line['properties']['callsign'];  | 
                                                        
@@ -587,59 +587,59 @@ discard block  | 
                                                    ||
| 587 | 587 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        
| 588 | 588 | if ($line['properties']['vesselType'] != 'Navigation Aid') $MI->add($data);  | 
                                                        
| 589 | 589 | unset($data);  | 
                                                        
| 590 | - }  | 
                                                        |
| 590 | + }  | 
                                                        |
| 591 | 591 | }  | 
                                                        
| 592 | 592 | |
| 593 | - }  | 
                                                        |
| 594 | - $last_exec[$id]['last'] = time();  | 
                                                        |
| 593 | + }  | 
                                                        |
| 594 | + $last_exec[$id]['last'] = time();  | 
                                                        |
| 595 | 595 |  	} elseif ($value['format'] == 'shipplotter' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) { | 
                                                        
| 596 | - echo 'download...';  | 
                                                        |
| 597 | - $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');  | 
                                                        |
| 598 | - echo 'done !'."\n";  | 
                                                        |
| 599 | - if ($buffer != '') $reset = 0;  | 
                                                        |
| 600 | -    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); | 
                                                        |
| 601 | -	    $buffer = explode('\n',$buffer); | 
                                                        |
| 602 | -	    foreach ($buffer as $line) { | 
                                                        |
| 596 | + echo 'download...';  | 
                                                        |
| 597 | + $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');  | 
                                                        |
| 598 | + echo 'done !'."\n";  | 
                                                        |
| 599 | + if ($buffer != '') $reset = 0;  | 
                                                        |
| 600 | +			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); | 
                                                        |
| 601 | +		$buffer = explode('\n',$buffer); | 
                                                        |
| 602 | +		foreach ($buffer as $line) { | 
                                                        |
| 603 | 603 |  		if ($line != '') { | 
                                                        
| 604 | - $data = array();  | 
                                                        |
| 605 | - $data['mmsi'] = (int)substr($line,0,9);  | 
                                                        |
| 606 | -		    $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10)); | 
                                                        |
| 607 | - //$data['status'] = substr($line,21,2);  | 
                                                        |
| 608 | - //$data['type'] = substr($line,24,3);  | 
                                                        |
| 609 | - $data['latitude'] = substr($line,29,9);  | 
                                                        |
| 610 | - $data['longitude'] = substr($line,41,9);  | 
                                                        |
| 611 | - $data['speed'] = round(substr($line,51,5));  | 
                                                        |
| 612 | - //$data['course'] = substr($line,57,5);  | 
                                                        |
| 613 | - $data['heading'] = round(substr($line,63,3));  | 
                                                        |
| 614 | - //$data['draft'] = substr($line,67,4);  | 
                                                        |
| 615 | - //$data['length'] = substr($line,72,3);  | 
                                                        |
| 616 | - //$data['beam'] = substr($line,76,2);  | 
                                                        |
| 617 | - $data['ident'] = trim(utf8_encode(substr($line,79,20)));  | 
                                                        |
| 618 | - //$data['callsign'] = trim(substr($line,100,7);  | 
                                                        |
| 619 | - //$data['dest'] = substr($line,108,20);  | 
                                                        |
| 620 | - //$data['etaDate'] = substr($line,129,5);  | 
                                                        |
| 621 | - //$data['etaTime'] = substr($line,135,5);  | 
                                                        |
| 622 | - $data['format_source'] = 'shipplotter';  | 
                                                        |
| 623 | - $data['id_source'] = $id_source;  | 
                                                        |
| 624 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 625 | - //print_r($data);  | 
                                                        |
| 626 | - echo 'Add...'."\n";  | 
                                                        |
| 627 | - $MI->add($data);  | 
                                                        |
| 628 | - unset($data);  | 
                                                        |
| 604 | + $data = array();  | 
                                                        |
| 605 | + $data['mmsi'] = (int)substr($line,0,9);  | 
                                                        |
| 606 | +			$data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10)); | 
                                                        |
| 607 | + //$data['status'] = substr($line,21,2);  | 
                                                        |
| 608 | + //$data['type'] = substr($line,24,3);  | 
                                                        |
| 609 | + $data['latitude'] = substr($line,29,9);  | 
                                                        |
| 610 | + $data['longitude'] = substr($line,41,9);  | 
                                                        |
| 611 | + $data['speed'] = round(substr($line,51,5));  | 
                                                        |
| 612 | + //$data['course'] = substr($line,57,5);  | 
                                                        |
| 613 | + $data['heading'] = round(substr($line,63,3));  | 
                                                        |
| 614 | + //$data['draft'] = substr($line,67,4);  | 
                                                        |
| 615 | + //$data['length'] = substr($line,72,3);  | 
                                                        |
| 616 | + //$data['beam'] = substr($line,76,2);  | 
                                                        |
| 617 | + $data['ident'] = trim(utf8_encode(substr($line,79,20)));  | 
                                                        |
| 618 | + //$data['callsign'] = trim(substr($line,100,7);  | 
                                                        |
| 619 | + //$data['dest'] = substr($line,108,20);  | 
                                                        |
| 620 | + //$data['etaDate'] = substr($line,129,5);  | 
                                                        |
| 621 | + //$data['etaTime'] = substr($line,135,5);  | 
                                                        |
| 622 | + $data['format_source'] = 'shipplotter';  | 
                                                        |
| 623 | + $data['id_source'] = $id_source;  | 
                                                        |
| 624 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 625 | + //print_r($data);  | 
                                                        |
| 626 | + echo 'Add...'."\n";  | 
                                                        |
| 627 | + $MI->add($data);  | 
                                                        |
| 628 | + unset($data);  | 
                                                        |
| 629 | 629 | }  | 
                                                        
| 630 | - }  | 
                                                        |
| 631 | - $last_exec[$id]['last'] = time();  | 
                                                        |
| 630 | + }  | 
                                                        |
| 631 | + $last_exec[$id]['last'] = time();  | 
                                                        |
| 632 | 632 |  	//} elseif (($value == 'whazzup' && (time() - $last_exec['whazzup'] > $globalMinFetch)) || ($value == 'vatsimtxt' && (time() - $last_exec['vatsimtxt'] > $globalMinFetch))) { | 
                                                        
| 633 | 633 |  	} elseif (($value['format'] == 'whazzup' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) || ($value['format'] == 'vatsimtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch))) { | 
                                                        
| 634 | - //$buffer = $Common->getData($hosts[$id]);  | 
                                                        |
| 635 | - $buffer = $Common->getData($value['host']);  | 
                                                        |
| 636 | -    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); | 
                                                        |
| 637 | -	    $buffer = explode('\n',$buffer); | 
                                                        |
| 638 | - $reset = 0;  | 
                                                        |
| 639 | -	    foreach ($buffer as $line) { | 
                                                        |
| 640 | -    		if ($line != '') { | 
                                                        |
| 641 | -    		    $line = explode(':', $line); | 
                                                        |
| 642 | -    		    if (count($line) > 30 && $line[0] != 'callsign') { | 
                                                        |
| 634 | + //$buffer = $Common->getData($hosts[$id]);  | 
                                                        |
| 635 | + $buffer = $Common->getData($value['host']);  | 
                                                        |
| 636 | +			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); | 
                                                        |
| 637 | +		$buffer = explode('\n',$buffer); | 
                                                        |
| 638 | + $reset = 0;  | 
                                                        |
| 639 | +		foreach ($buffer as $line) { | 
                                                        |
| 640 | +			if ($line != '') { | 
                                                        |
| 641 | +				$line = explode(':', $line); | 
                                                        |
| 642 | +				if (count($line) > 30 && $line[0] != 'callsign') { | 
                                                        |
| 643 | 643 | $data = array();  | 
                                                        
| 644 | 644 | if (isset($line[37]) && $line[37] != '') $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37];  | 
                                                        
| 645 | 645 | else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];  | 
                                                        
@@ -652,37 +652,37 @@ discard block  | 
                                                    ||
| 652 | 652 | if (isset($line[45])) $data['heading'] = $line[45]; // heading  | 
                                                        
| 653 | 653 | elseif (isset($line[38])) $data['heading'] = $line[38]; // heading  | 
                                                        
| 654 | 654 | $data['latitude'] = $line[5]; // lat  | 
                                                        
| 655 | - $data['longitude'] = $line[6]; // long  | 
                                                        |
| 656 | - $data['verticalrate'] = ''; // vertical rate  | 
                                                        |
| 657 | - $data['squawk'] = ''; // squawk  | 
                                                        |
| 658 | - $data['emergency'] = ''; // emergency  | 
                                                        |
| 659 | - $data['waypoints'] = $line[30];  | 
                                                        |
| 655 | + $data['longitude'] = $line[6]; // long  | 
                                                        |
| 656 | + $data['verticalrate'] = ''; // vertical rate  | 
                                                        |
| 657 | + $data['squawk'] = ''; // squawk  | 
                                                        |
| 658 | + $data['emergency'] = ''; // emergency  | 
                                                        |
| 659 | + $data['waypoints'] = $line[30];  | 
                                                        |
| 660 | 660 |  			$data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        
| 661 | 661 |  			//$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37])); | 
                                                        
| 662 | 662 | //if (isset($line[37])) $data['last_update'] = $line[37];  | 
                                                        
| 663 | - $data['departure_airport_icao'] = $line[11];  | 
                                                        |
| 664 | - $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');  | 
                                                        |
| 665 | - $data['arrival_airport_icao'] = $line[13];  | 
                                                        |
| 663 | + $data['departure_airport_icao'] = $line[11];  | 
                                                        |
| 664 | + $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');  | 
                                                        |
| 665 | + $data['arrival_airport_icao'] = $line[13];  | 
                                                        |
| 666 | 666 | $data['frequency'] = $line[4];  | 
                                                        
| 667 | 667 | $data['type'] = $line[18];  | 
                                                        
| 668 | 668 | $data['range'] = $line[19];  | 
                                                        
| 669 | 669 | if (isset($line[35])) $data['info'] = $line[35];  | 
                                                        
| 670 | - $data['id_source'] = $id_source;  | 
                                                        |
| 671 | - //$data['arrival_airport_time'] = ;  | 
                                                        |
| 672 | -	    		if ($line[9] != '') { | 
                                                        |
| 673 | -	    		    $aircraft_data = explode('/',$line[9]); | 
                                                        |
| 674 | -	    		    if (isset($aircraft_data[1])) { | 
                                                        |
| 675 | - $data['aircraft_icao'] = $aircraft_data[1];  | 
                                                        |
| 676 | - }  | 
                                                        |
| 677 | - }  | 
                                                        |
| 678 | - /*  | 
                                                        |
| 670 | + $data['id_source'] = $id_source;  | 
                                                        |
| 671 | + //$data['arrival_airport_time'] = ;  | 
                                                        |
| 672 | +				if ($line[9] != '') { | 
                                                        |
| 673 | +					$aircraft_data = explode('/',$line[9]); | 
                                                        |
| 674 | +					if (isset($aircraft_data[1])) { | 
                                                        |
| 675 | + $data['aircraft_icao'] = $aircraft_data[1];  | 
                                                        |
| 676 | + }  | 
                                                        |
| 677 | + }  | 
                                                        |
| 678 | + /*  | 
                                                        |
| 679 | 679 | if ($value == 'whazzup') $data['format_source'] = 'whazzup';  | 
                                                        
| 680 | 680 | elseif ($value == 'vatsimtxt') $data['format_source'] = 'vatsimtxt';  | 
                                                        
| 681 | 681 | */  | 
                                                        
| 682 | - $data['format_source'] = $value['format'];  | 
                                                        |
| 682 | + $data['format_source'] = $value['format'];  | 
                                                        |
| 683 | 683 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        
| 684 | 684 | if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];  | 
                                                        
| 685 | - if ($line[3] == 'PILOT') $SI->add($data);  | 
                                                        |
| 685 | + if ($line[3] == 'PILOT') $SI->add($data);  | 
                                                        |
| 686 | 686 |  			elseif ($line[3] == 'ATC') { | 
                                                        
| 687 | 687 | //print_r($data);  | 
                                                        
| 688 | 688 |  				$data['info'] = str_replace('^§','<br />',$data['info']); | 
                                                        
@@ -703,16 +703,16 @@ discard block  | 
                                                    ||
| 703 | 703 | else echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);  | 
                                                        
| 704 | 704 | }  | 
                                                        
| 705 | 705 | }  | 
                                                        
| 706 | - unset($data);  | 
                                                        |
| 707 | - }  | 
                                                        |
| 708 | - }  | 
                                                        |
| 709 | - }  | 
                                                        |
| 710 | - //if ($value == 'whazzup') $last_exec['whazzup'] = time();  | 
                                                        |
| 711 | - //elseif ($value == 'vatsimtxt') $last_exec['vatsimtxt'] = time();  | 
                                                        |
| 712 | - $last_exec[$id]['last'] = time();  | 
                                                        |
| 713 | -    	} elseif ($value['format'] == 'airwhere' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { | 
                                                        |
| 714 | -	    $buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php','get','','','','','20'); | 
                                                        |
| 715 | -	    if ($buffer != '') { | 
                                                        |
| 706 | + unset($data);  | 
                                                        |
| 707 | + }  | 
                                                        |
| 708 | + }  | 
                                                        |
| 709 | + }  | 
                                                        |
| 710 | + //if ($value == 'whazzup') $last_exec['whazzup'] = time();  | 
                                                        |
| 711 | + //elseif ($value == 'vatsimtxt') $last_exec['vatsimtxt'] = time();  | 
                                                        |
| 712 | + $last_exec[$id]['last'] = time();  | 
                                                        |
| 713 | +		} elseif ($value['format'] == 'airwhere' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { | 
                                                        |
| 714 | +		$buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php','get','','','','','20'); | 
                                                        |
| 715 | +		if ($buffer != '') { | 
                                                        |
| 716 | 716 | $all_data = simplexml_load_string($buffer);  | 
                                                        
| 717 | 717 |  		foreach($all_data->children() as $childdata) { | 
                                                        
| 718 | 718 | $data = array();  | 
                                                        
@@ -734,10 +734,10 @@ discard block  | 
                                                    ||
| 734 | 734 | $SI->add($data);  | 
                                                        
| 735 | 735 | unset($data);  | 
                                                        
| 736 | 736 | }  | 
                                                        
| 737 | - }  | 
                                                        |
| 738 | -	    $Source->deleteOldLocationByType('gs'); | 
                                                        |
| 739 | -	    $buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php','get','','','','','20'); | 
                                                        |
| 740 | -	    if ($buffer != '') { | 
                                                        |
| 737 | + }  | 
                                                        |
| 738 | +		$Source->deleteOldLocationByType('gs'); | 
                                                        |
| 739 | +		$buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php','get','','','','','20'); | 
                                                        |
| 740 | +		if ($buffer != '') { | 
                                                        |
| 741 | 741 | $all_data = simplexml_load_string($buffer);  | 
                                                        
| 742 | 742 |  		foreach($all_data->children() as $childdata) { | 
                                                        
| 743 | 743 | $data = array();  | 
                                                        
@@ -755,249 +755,249 @@ discard block  | 
                                                    ||
| 755 | 755 | }  | 
                                                        
| 756 | 756 | unset($data);  | 
                                                        
| 757 | 757 | }  | 
                                                        
| 758 | - }  | 
                                                        |
| 759 | - $last_exec[$id]['last'] = time();  | 
                                                        |
| 758 | + }  | 
                                                        |
| 759 | + $last_exec[$id]['last'] = time();  | 
                                                        |
| 760 | 760 |  	} elseif ($value['format'] == 'aircraftlistjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { | 
                                                        
| 761 | - $buffer = $Common->getData($value['host'],'get','','','','','20');  | 
                                                        |
| 762 | -	    if ($buffer != '') { | 
                                                        |
| 763 | - $all_data = json_decode($buffer,true);  | 
                                                        |
| 764 | -	    if (isset($all_data['acList'])) { | 
                                                        |
| 761 | + $buffer = $Common->getData($value['host'],'get','','','','','20');  | 
                                                        |
| 762 | +		if ($buffer != '') { | 
                                                        |
| 763 | + $all_data = json_decode($buffer,true);  | 
                                                        |
| 764 | +		if (isset($all_data['acList'])) { | 
                                                        |
| 765 | 765 | $reset = 0;  | 
                                                        
| 766 | 766 |  		foreach ($all_data['acList'] as $line) { | 
                                                        
| 767 | - $data = array();  | 
                                                        |
| 768 | - $data['hex'] = $line['Icao']; // hex  | 
                                                        |
| 769 | - if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident  | 
                                                        |
| 770 | - if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude  | 
                                                        |
| 771 | - if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed  | 
                                                        |
| 772 | - if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading  | 
                                                        |
| 773 | - if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat  | 
                                                        |
| 774 | - if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long  | 
                                                        |
| 775 | - //$data['verticalrate'] = $line['']; // verticale rate  | 
                                                        |
| 776 | - if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk  | 
                                                        |
| 777 | - $data['emergency'] = ''; // emergency  | 
                                                        |
| 778 | - if (isset($line['Reg'])) $data['registration'] = $line['Reg'];  | 
                                                        |
| 767 | + $data = array();  | 
                                                        |
| 768 | + $data['hex'] = $line['Icao']; // hex  | 
                                                        |
| 769 | + if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident  | 
                                                        |
| 770 | + if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude  | 
                                                        |
| 771 | + if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed  | 
                                                        |
| 772 | + if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading  | 
                                                        |
| 773 | + if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat  | 
                                                        |
| 774 | + if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long  | 
                                                        |
| 775 | + //$data['verticalrate'] = $line['']; // verticale rate  | 
                                                        |
| 776 | + if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk  | 
                                                        |
| 777 | + $data['emergency'] = ''; // emergency  | 
                                                        |
| 778 | + if (isset($line['Reg'])) $data['registration'] = $line['Reg'];  | 
                                                        |
| 779 | 779 | |
| 780 | -		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); | 
                                                        |
| 781 | -		    else $data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        |
| 780 | +			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); | 
                                                        |
| 781 | +			else $data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        |
| 782 | 782 | |
| 783 | -		    //$data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        |
| 784 | - if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];  | 
                                                        |
| 785 | - $data['format_source'] = 'aircraftlistjson';  | 
                                                        |
| 786 | - $data['id_source'] = $id_source;  | 
                                                        |
| 787 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];  | 
                                                        |
| 788 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 789 | - if (isset($data['latitude'])) $SI->add($data);  | 
                                                        |
| 790 | - unset($data);  | 
                                                        |
| 783 | +			//$data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        |
| 784 | + if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];  | 
                                                        |
| 785 | + $data['format_source'] = 'aircraftlistjson';  | 
                                                        |
| 786 | + $data['id_source'] = $id_source;  | 
                                                        |
| 787 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];  | 
                                                        |
| 788 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 789 | + if (isset($data['latitude'])) $SI->add($data);  | 
                                                        |
| 790 | + unset($data);  | 
                                                        |
| 791 | 791 | }  | 
                                                        
| 792 | -	    } elseif (is_array($all_data)) { | 
                                                        |
| 792 | +		} elseif (is_array($all_data)) { | 
                                                        |
| 793 | 793 | $reset = 0;  | 
                                                        
| 794 | 794 |  		foreach ($all_data as $line) { | 
                                                        
| 795 | - $data = array();  | 
                                                        |
| 796 | - $data['hex'] = $line['hex']; // hex  | 
                                                        |
| 797 | - $data['ident'] = $line['flight']; // ident  | 
                                                        |
| 798 | - $data['altitude'] = $line['altitude']; // altitude  | 
                                                        |
| 799 | - $data['speed'] = $line['speed']; // speed  | 
                                                        |
| 800 | - $data['heading'] = $line['track']; // heading  | 
                                                        |
| 801 | - $data['latitude'] = $line['lat']; // lat  | 
                                                        |
| 802 | - $data['longitude'] = $line['lon']; // long  | 
                                                        |
| 803 | - $data['verticalrate'] = $line['vrt']; // verticale rate  | 
                                                        |
| 804 | - $data['squawk'] = $line['squawk']; // squawk  | 
                                                        |
| 805 | - $data['emergency'] = ''; // emergency  | 
                                                        |
| 806 | -		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); | 
                                                        |
| 807 | -		    else $data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        |
| 808 | - $data['format_source'] = 'aircraftlistjson';  | 
                                                        |
| 809 | - $data['id_source'] = $id_source;  | 
                                                        |
| 810 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 811 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];  | 
                                                        |
| 812 | - $SI->add($data);  | 
                                                        |
| 813 | - unset($data);  | 
                                                        |
| 795 | + $data = array();  | 
                                                        |
| 796 | + $data['hex'] = $line['hex']; // hex  | 
                                                        |
| 797 | + $data['ident'] = $line['flight']; // ident  | 
                                                        |
| 798 | + $data['altitude'] = $line['altitude']; // altitude  | 
                                                        |
| 799 | + $data['speed'] = $line['speed']; // speed  | 
                                                        |
| 800 | + $data['heading'] = $line['track']; // heading  | 
                                                        |
| 801 | + $data['latitude'] = $line['lat']; // lat  | 
                                                        |
| 802 | + $data['longitude'] = $line['lon']; // long  | 
                                                        |
| 803 | + $data['verticalrate'] = $line['vrt']; // verticale rate  | 
                                                        |
| 804 | + $data['squawk'] = $line['squawk']; // squawk  | 
                                                        |
| 805 | + $data['emergency'] = ''; // emergency  | 
                                                        |
| 806 | +			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); | 
                                                        |
| 807 | +			else $data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        |
| 808 | + $data['format_source'] = 'aircraftlistjson';  | 
                                                        |
| 809 | + $data['id_source'] = $id_source;  | 
                                                        |
| 810 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 811 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];  | 
                                                        |
| 812 | + $SI->add($data);  | 
                                                        |
| 813 | + unset($data);  | 
                                                        |
| 814 | + }  | 
                                                        |
| 814 | 815 | }  | 
                                                        
| 815 | - }  | 
                                                        |
| 816 | - }  | 
                                                        |
| 817 | - //$last_exec['aircraftlistjson'] = time();  | 
                                                        |
| 818 | - $last_exec[$id]['last'] = time();  | 
                                                        |
| 819 | -    	//} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) { | 
                                                        |
| 820 | -    	} elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { | 
                                                        |
| 821 | - $buffer = $Common->getData($value['host']);  | 
                                                        |
| 822 | - $all_data = json_decode($buffer,true);  | 
                                                        |
| 823 | -	    if (isset($all_data['planes'])) { | 
                                                        |
| 816 | + }  | 
                                                        |
| 817 | + //$last_exec['aircraftlistjson'] = time();  | 
                                                        |
| 818 | + $last_exec[$id]['last'] = time();  | 
                                                        |
| 819 | +		//} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) { | 
                                                        |
| 820 | +		} elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { | 
                                                        |
| 821 | + $buffer = $Common->getData($value['host']);  | 
                                                        |
| 822 | + $all_data = json_decode($buffer,true);  | 
                                                        |
| 823 | +		if (isset($all_data['planes'])) { | 
                                                        |
| 824 | 824 | $reset = 0;  | 
                                                        
| 825 | 825 |  		foreach ($all_data['planes'] as $key => $line) { | 
                                                        
| 826 | - $data = array();  | 
                                                        |
| 827 | - $data['hex'] = $key; // hex  | 
                                                        |
| 828 | - $data['ident'] = $line[3]; // ident  | 
                                                        |
| 829 | - $data['altitude'] = $line[6]; // altitude  | 
                                                        |
| 830 | - $data['speed'] = $line[8]; // speed  | 
                                                        |
| 831 | - $data['heading'] = $line[7]; // heading  | 
                                                        |
| 832 | - $data['latitude'] = $line[4]; // lat  | 
                                                        |
| 833 | - $data['longitude'] = $line[5]; // long  | 
                                                        |
| 834 | - //$data['verticalrate'] = $line[]; // verticale rate  | 
                                                        |
| 835 | - $data['squawk'] = $line[10]; // squawk  | 
                                                        |
| 836 | - $data['emergency'] = ''; // emergency  | 
                                                        |
| 837 | - $data['registration'] = $line[2];  | 
                                                        |
| 838 | - $data['aircraft_icao'] = $line[0];  | 
                                                        |
| 839 | -		    $deparr = explode('-',$line[1]); | 
                                                        |
| 840 | -		    if (count($deparr) == 2) { | 
                                                        |
| 826 | + $data = array();  | 
                                                        |
| 827 | + $data['hex'] = $key; // hex  | 
                                                        |
| 828 | + $data['ident'] = $line[3]; // ident  | 
                                                        |
| 829 | + $data['altitude'] = $line[6]; // altitude  | 
                                                        |
| 830 | + $data['speed'] = $line[8]; // speed  | 
                                                        |
| 831 | + $data['heading'] = $line[7]; // heading  | 
                                                        |
| 832 | + $data['latitude'] = $line[4]; // lat  | 
                                                        |
| 833 | + $data['longitude'] = $line[5]; // long  | 
                                                        |
| 834 | + //$data['verticalrate'] = $line[]; // verticale rate  | 
                                                        |
| 835 | + $data['squawk'] = $line[10]; // squawk  | 
                                                        |
| 836 | + $data['emergency'] = ''; // emergency  | 
                                                        |
| 837 | + $data['registration'] = $line[2];  | 
                                                        |
| 838 | + $data['aircraft_icao'] = $line[0];  | 
                                                        |
| 839 | +			$deparr = explode('-',$line[1]); | 
                                                        |
| 840 | +			if (count($deparr) == 2) { | 
                                                        |
| 841 | 841 | $data['departure_airport_icao'] = $deparr[0];  | 
                                                        
| 842 | 842 | $data['arrival_airport_icao'] = $deparr[1];  | 
                                                        
| 843 | - }  | 
                                                        |
| 844 | -		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]); | 
                                                        |
| 845 | - $data['format_source'] = 'planeupdatefaa';  | 
                                                        |
| 846 | - $data['id_source'] = $id_source;  | 
                                                        |
| 847 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 848 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];  | 
                                                        |
| 849 | - $SI->add($data);  | 
                                                        |
| 850 | - unset($data);  | 
                                                        |
| 843 | + }  | 
                                                        |
| 844 | +			$data['datetime'] = date('Y-m-d H:i:s',$line[9]); | 
                                                        |
| 845 | + $data['format_source'] = 'planeupdatefaa';  | 
                                                        |
| 846 | + $data['id_source'] = $id_source;  | 
                                                        |
| 847 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 848 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];  | 
                                                        |
| 849 | + $SI->add($data);  | 
                                                        |
| 850 | + unset($data);  | 
                                                        |
| 851 | 851 | }  | 
                                                        
| 852 | - }  | 
                                                        |
| 853 | - //$last_exec['planeupdatefaa'] = time();  | 
                                                        |
| 854 | - $last_exec[$id]['last'] = time();  | 
                                                        |
| 855 | -    	} elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { | 
                                                        |
| 856 | - $buffer = $Common->getData($value['host']);  | 
                                                        |
| 857 | - $all_data = json_decode($buffer,true);  | 
                                                        |
| 858 | -	    if (isset($all_data['states'])) { | 
                                                        |
| 852 | + }  | 
                                                        |
| 853 | + //$last_exec['planeupdatefaa'] = time();  | 
                                                        |
| 854 | + $last_exec[$id]['last'] = time();  | 
                                                        |
| 855 | +		} elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { | 
                                                        |
| 856 | + $buffer = $Common->getData($value['host']);  | 
                                                        |
| 857 | + $all_data = json_decode($buffer,true);  | 
                                                        |
| 858 | +		if (isset($all_data['states'])) { | 
                                                        |
| 859 | 859 | $reset = 0;  | 
                                                        
| 860 | 860 |  		foreach ($all_data['states'] as $key => $line) { | 
                                                        
| 861 | - $data = array();  | 
                                                        |
| 862 | - $data['hex'] = $line[0]; // hex  | 
                                                        |
| 863 | - $data['ident'] = trim($line[1]); // ident  | 
                                                        |
| 864 | - $data['altitude'] = round($line[7]*3.28084); // altitude  | 
                                                        |
| 865 | - $data['speed'] = round($line[9]*1.94384); // speed  | 
                                                        |
| 866 | - $data['heading'] = round($line[10]); // heading  | 
                                                        |
| 867 | - $data['latitude'] = $line[6]; // lat  | 
                                                        |
| 868 | - $data['longitude'] = $line[5]; // long  | 
                                                        |
| 869 | - $data['verticalrate'] = $line[11]; // verticale rate  | 
                                                        |
| 870 | - //$data['squawk'] = $line[10]; // squawk  | 
                                                        |
| 871 | - //$data['emergency'] = ''; // emergency  | 
                                                        |
| 872 | - //$data['registration'] = $line[2];  | 
                                                        |
| 873 | - //$data['aircraft_icao'] = $line[0];  | 
                                                        |
| 874 | -		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]); | 
                                                        |
| 875 | - $data['format_source'] = 'opensky';  | 
                                                        |
| 876 | - $data['id_source'] = $id_source;  | 
                                                        |
| 877 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 878 | - $SI->add($data);  | 
                                                        |
| 879 | - unset($data);  | 
                                                        |
| 861 | + $data = array();  | 
                                                        |
| 862 | + $data['hex'] = $line[0]; // hex  | 
                                                        |
| 863 | + $data['ident'] = trim($line[1]); // ident  | 
                                                        |
| 864 | + $data['altitude'] = round($line[7]*3.28084); // altitude  | 
                                                        |
| 865 | + $data['speed'] = round($line[9]*1.94384); // speed  | 
                                                        |
| 866 | + $data['heading'] = round($line[10]); // heading  | 
                                                        |
| 867 | + $data['latitude'] = $line[6]; // lat  | 
                                                        |
| 868 | + $data['longitude'] = $line[5]; // long  | 
                                                        |
| 869 | + $data['verticalrate'] = $line[11]; // verticale rate  | 
                                                        |
| 870 | + //$data['squawk'] = $line[10]; // squawk  | 
                                                        |
| 871 | + //$data['emergency'] = ''; // emergency  | 
                                                        |
| 872 | + //$data['registration'] = $line[2];  | 
                                                        |
| 873 | + //$data['aircraft_icao'] = $line[0];  | 
                                                        |
| 874 | +			$data['datetime'] = date('Y-m-d H:i:s',$line[3]); | 
                                                        |
| 875 | + $data['format_source'] = 'opensky';  | 
                                                        |
| 876 | + $data['id_source'] = $id_source;  | 
                                                        |
| 877 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 878 | + $SI->add($data);  | 
                                                        |
| 879 | + unset($data);  | 
                                                        |
| 880 | + }  | 
                                                        |
| 880 | 881 | }  | 
                                                        
| 881 | - }  | 
                                                        |
| 882 | - //$last_exec['planeupdatefaa'] = time();  | 
                                                        |
| 883 | - $last_exec[$id]['last'] = time();  | 
                                                        |
| 884 | -    	//} elseif ($value == 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) { | 
                                                        |
| 885 | -    	} elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { | 
                                                        |
| 886 | - //$buffer = $Common->getData($hosts[$id]);  | 
                                                        |
| 887 | - $buffer = $Common->getData($value['host']);  | 
                                                        |
| 888 | - $all_data = json_decode($buffer,true);  | 
                                                        |
| 889 | - if (!empty($all_data)) $reset = 0;  | 
                                                        |
| 890 | -	    foreach ($all_data as $key => $line) { | 
                                                        |
| 882 | + //$last_exec['planeupdatefaa'] = time();  | 
                                                        |
| 883 | + $last_exec[$id]['last'] = time();  | 
                                                        |
| 884 | +		//} elseif ($value == 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) { | 
                                                        |
| 885 | +		} elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { | 
                                                        |
| 886 | + //$buffer = $Common->getData($hosts[$id]);  | 
                                                        |
| 887 | + $buffer = $Common->getData($value['host']);  | 
                                                        |
| 888 | + $all_data = json_decode($buffer,true);  | 
                                                        |
| 889 | + if (!empty($all_data)) $reset = 0;  | 
                                                        |
| 890 | +		foreach ($all_data as $key => $line) { | 
                                                        |
| 891 | 891 |  		if ($key != 'full_count' && $key != 'version' && $key != 'stats') { | 
                                                        
| 892 | - $data = array();  | 
                                                        |
| 893 | - $data['hex'] = $line[0];  | 
                                                        |
| 894 | - $data['ident'] = $line[16]; //$line[13]  | 
                                                        |
| 895 | - $data['altitude'] = $line[4]; // altitude  | 
                                                        |
| 896 | - $data['speed'] = $line[5]; // speed  | 
                                                        |
| 897 | - $data['heading'] = $line[3]; // heading  | 
                                                        |
| 898 | - $data['latitude'] = $line[1]; // lat  | 
                                                        |
| 899 | - $data['longitude'] = $line[2]; // long  | 
                                                        |
| 900 | - $data['verticalrate'] = $line[15]; // verticale rate  | 
                                                        |
| 901 | - $data['squawk'] = $line[6]; // squawk  | 
                                                        |
| 902 | - $data['aircraft_icao'] = $line[8];  | 
                                                        |
| 903 | - $data['registration'] = $line[9];  | 
                                                        |
| 904 | - $data['departure_airport_iata'] = $line[11];  | 
                                                        |
| 905 | - $data['arrival_airport_iata'] = $line[12];  | 
                                                        |
| 906 | - $data['emergency'] = ''; // emergency  | 
                                                        |
| 907 | -		    $data['datetime'] = date('Y-m-d H:i:s'); //$line[10] | 
                                                        |
| 908 | - $data['format_source'] = 'fr24json';  | 
                                                        |
| 909 | - $data['id_source'] = $id_source;  | 
                                                        |
| 910 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 911 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];  | 
                                                        |
| 912 | - $SI->add($data);  | 
                                                        |
| 913 | - unset($data);  | 
                                                        |
| 892 | + $data = array();  | 
                                                        |
| 893 | + $data['hex'] = $line[0];  | 
                                                        |
| 894 | + $data['ident'] = $line[16]; //$line[13]  | 
                                                        |
| 895 | + $data['altitude'] = $line[4]; // altitude  | 
                                                        |
| 896 | + $data['speed'] = $line[5]; // speed  | 
                                                        |
| 897 | + $data['heading'] = $line[3]; // heading  | 
                                                        |
| 898 | + $data['latitude'] = $line[1]; // lat  | 
                                                        |
| 899 | + $data['longitude'] = $line[2]; // long  | 
                                                        |
| 900 | + $data['verticalrate'] = $line[15]; // verticale rate  | 
                                                        |
| 901 | + $data['squawk'] = $line[6]; // squawk  | 
                                                        |
| 902 | + $data['aircraft_icao'] = $line[8];  | 
                                                        |
| 903 | + $data['registration'] = $line[9];  | 
                                                        |
| 904 | + $data['departure_airport_iata'] = $line[11];  | 
                                                        |
| 905 | + $data['arrival_airport_iata'] = $line[12];  | 
                                                        |
| 906 | + $data['emergency'] = ''; // emergency  | 
                                                        |
| 907 | +			$data['datetime'] = date('Y-m-d H:i:s'); //$line[10] | 
                                                        |
| 908 | + $data['format_source'] = 'fr24json';  | 
                                                        |
| 909 | + $data['id_source'] = $id_source;  | 
                                                        |
| 910 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 911 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];  | 
                                                        |
| 912 | + $SI->add($data);  | 
                                                        |
| 913 | + unset($data);  | 
                                                        |
| 914 | 914 | }  | 
                                                        
| 915 | - }  | 
                                                        |
| 916 | - //$last_exec['fr24json'] = time();  | 
                                                        |
| 917 | - $last_exec[$id]['last'] = time();  | 
                                                        |
| 918 | -    	//} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) { | 
                                                        |
| 919 | -    	} elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { | 
                                                        |
| 920 | - //$buffer = $Common->getData($hosts[$id],'get','','','','','150');  | 
                                                        |
| 921 | - $buffer = $Common->getData($value['host'],'get','','','','','150');  | 
                                                        |
| 922 | - //echo $buffer;  | 
                                                        |
| 923 | -	    $buffer = str_replace(array("\n","\r"),"",$buffer); | 
                                                        |
| 924 | -	    $buffer = preg_replace('/,"num":(.+)/','}',$buffer); | 
                                                        |
| 925 | - $all_data = json_decode($buffer,true);  | 
                                                        |
| 926 | -	    if (json_last_error() != JSON_ERROR_NONE) { | 
                                                        |
| 915 | + }  | 
                                                        |
| 916 | + //$last_exec['fr24json'] = time();  | 
                                                        |
| 917 | + $last_exec[$id]['last'] = time();  | 
                                                        |
| 918 | +		//} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) { | 
                                                        |
| 919 | +		} elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { | 
                                                        |
| 920 | + //$buffer = $Common->getData($hosts[$id],'get','','','','','150');  | 
                                                        |
| 921 | + $buffer = $Common->getData($value['host'],'get','','','','','150');  | 
                                                        |
| 922 | + //echo $buffer;  | 
                                                        |
| 923 | +		$buffer = str_replace(array("\n","\r"),"",$buffer); | 
                                                        |
| 924 | +		$buffer = preg_replace('/,"num":(.+)/','}',$buffer); | 
                                                        |
| 925 | + $all_data = json_decode($buffer,true);  | 
                                                        |
| 926 | +		if (json_last_error() != JSON_ERROR_NONE) { | 
                                                        |
| 927 | 927 | die(json_last_error_msg());  | 
                                                        
| 928 | - }  | 
                                                        |
| 929 | -	    if (isset($all_data['mrkrs'])) { | 
                                                        |
| 928 | + }  | 
                                                        |
| 929 | +		if (isset($all_data['mrkrs'])) { | 
                                                        |
| 930 | 930 | $reset = 0;  | 
                                                        
| 931 | 931 |  		foreach ($all_data['mrkrs'] as $key => $line) { | 
                                                        
| 932 | -		    if (isset($line['inf'])) { | 
                                                        |
| 932 | +			if (isset($line['inf'])) { | 
                                                        |
| 933 | 933 | $data = array();  | 
                                                        
| 934 | 934 | $data['hex'] = $line['inf']['ia'];  | 
                                                        
| 935 | 935 | if (isset($line['inf']['cs'])) $data['ident'] = $line['inf']['cs']; //$line[13]  | 
                                                        
| 936 | - $data['altitude'] = round($line['inf']['al']*3.28084); // altitude  | 
                                                        |
| 937 | - if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed  | 
                                                        |
| 938 | - if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading  | 
                                                        |
| 939 | - $data['latitude'] = $line['pt'][0]; // lat  | 
                                                        |
| 940 | - $data['longitude'] = $line['pt'][1]; // long  | 
                                                        |
| 941 | - //if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate  | 
                                                        |
| 942 | - if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk  | 
                                                        |
| 943 | - //$data['aircraft_icao'] = $line[8];  | 
                                                        |
| 944 | - if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];  | 
                                                        |
| 936 | + $data['altitude'] = round($line['inf']['al']*3.28084); // altitude  | 
                                                        |
| 937 | + if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed  | 
                                                        |
| 938 | + if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading  | 
                                                        |
| 939 | + $data['latitude'] = $line['pt'][0]; // lat  | 
                                                        |
| 940 | + $data['longitude'] = $line['pt'][1]; // long  | 
                                                        |
| 941 | + //if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate  | 
                                                        |
| 942 | + if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk  | 
                                                        |
| 943 | + //$data['aircraft_icao'] = $line[8];  | 
                                                        |
| 944 | + if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];  | 
                                                        |
| 945 | 945 | //$data['departure_airport_iata'] = $line[11];  | 
                                                        
| 946 | 946 | //$data['arrival_airport_iata'] = $line[12];  | 
                                                        
| 947 | - //$data['emergency'] = ''; // emergency  | 
                                                        |
| 947 | + //$data['emergency'] = ''; // emergency  | 
                                                        |
| 948 | 948 |  			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10] | 
                                                        
| 949 | - $data['format_source'] = 'radarvirtueljson';  | 
                                                        |
| 950 | - $data['id_source'] = $id_source;  | 
                                                        |
| 949 | + $data['format_source'] = 'radarvirtueljson';  | 
                                                        |
| 950 | + $data['id_source'] = $id_source;  | 
                                                        |
| 951 | 951 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        
| 952 | 952 | if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];  | 
                                                        
| 953 | 953 | $SI->add($data);  | 
                                                        
| 954 | 954 | unset($data);  | 
                                                        
| 955 | - }  | 
                                                        |
| 955 | + }  | 
                                                        |
| 956 | + }  | 
                                                        |
| 956 | 957 | }  | 
                                                        
| 957 | - }  | 
                                                        |
| 958 | - //$last_exec['radarvirtueljson'] = time();  | 
                                                        |
| 959 | - $last_exec[$id]['last'] = time();  | 
                                                        |
| 960 | -    	//} elseif ($value == 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) { | 
                                                        |
| 961 | -    	} elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { | 
                                                        |
| 962 | - //$buffer = $Common->getData($hosts[$id]);  | 
                                                        |
| 963 | - $buffer = $Common->getData($value['host'].'?'.time());  | 
                                                        |
| 964 | - $all_data = json_decode(utf8_encode($buffer),true);  | 
                                                        |
| 958 | + //$last_exec['radarvirtueljson'] = time();  | 
                                                        |
| 959 | + $last_exec[$id]['last'] = time();  | 
                                                        |
| 960 | +		//} elseif ($value == 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) { | 
                                                        |
| 961 | +		} elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { | 
                                                        |
| 962 | + //$buffer = $Common->getData($hosts[$id]);  | 
                                                        |
| 963 | + $buffer = $Common->getData($value['host'].'?'.time());  | 
                                                        |
| 964 | + $all_data = json_decode(utf8_encode($buffer),true);  | 
                                                        |
| 965 | 965 | |
| 966 | -	    if (isset($all_data['pireps'])) { | 
                                                        |
| 966 | +		if (isset($all_data['pireps'])) { | 
                                                        |
| 967 | 967 | $reset = 0;  | 
                                                        
| 968 | -	        foreach ($all_data['pireps'] as $line) { | 
                                                        |
| 969 | - $data = array();  | 
                                                        |
| 970 | - $data['id'] = $line['id'];  | 
                                                        |
| 971 | - $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);  | 
                                                        |
| 972 | - $data['ident'] = $line['callsign']; // ident  | 
                                                        |
| 973 | - if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id  | 
                                                        |
| 974 | - if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name  | 
                                                        |
| 975 | - if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude  | 
                                                        |
| 976 | - if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed  | 
                                                        |
| 977 | - if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading  | 
                                                        |
| 978 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; // route  | 
                                                        |
| 979 | - $data['latitude'] = $line['lat']; // lat  | 
                                                        |
| 980 | - $data['longitude'] = $line['lon']; // long  | 
                                                        |
| 981 | - //$data['verticalrate'] = $line['vrt']; // verticale rate  | 
                                                        |
| 982 | - //$data['squawk'] = $line['squawk']; // squawk  | 
                                                        |
| 983 | - //$data['emergency'] = ''; // emergency  | 
                                                        |
| 984 | - if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];  | 
                                                        |
| 985 | - if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];  | 
                                                        |
| 986 | - if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];  | 
                                                        |
| 987 | - //$data['arrival_airport_time'] = $line['arrtime'];  | 
                                                        |
| 988 | - if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];  | 
                                                        |
| 989 | - if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];  | 
                                                        |
| 990 | - if (isset($line['atis'])) $data['info'] = $line['atis'];  | 
                                                        |
| 991 | - else $data['info'] = '';  | 
                                                        |
| 992 | - $data['format_source'] = 'pireps';  | 
                                                        |
| 993 | - $data['id_source'] = $id_source;  | 
                                                        |
| 994 | -		    $data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        |
| 995 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 996 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];  | 
                                                        |
| 997 | -		    if ($line['icon'] == 'plane') { | 
                                                        |
| 968 | +			foreach ($all_data['pireps'] as $line) { | 
                                                        |
| 969 | + $data = array();  | 
                                                        |
| 970 | + $data['id'] = $line['id'];  | 
                                                        |
| 971 | + $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);  | 
                                                        |
| 972 | + $data['ident'] = $line['callsign']; // ident  | 
                                                        |
| 973 | + if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id  | 
                                                        |
| 974 | + if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name  | 
                                                        |
| 975 | + if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude  | 
                                                        |
| 976 | + if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed  | 
                                                        |
| 977 | + if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading  | 
                                                        |
| 978 | + if (isset($line['route'])) $data['waypoints'] = $line['route']; // route  | 
                                                        |
| 979 | + $data['latitude'] = $line['lat']; // lat  | 
                                                        |
| 980 | + $data['longitude'] = $line['lon']; // long  | 
                                                        |
| 981 | + //$data['verticalrate'] = $line['vrt']; // verticale rate  | 
                                                        |
| 982 | + //$data['squawk'] = $line['squawk']; // squawk  | 
                                                        |
| 983 | + //$data['emergency'] = ''; // emergency  | 
                                                        |
| 984 | + if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];  | 
                                                        |
| 985 | + if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];  | 
                                                        |
| 986 | + if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];  | 
                                                        |
| 987 | + //$data['arrival_airport_time'] = $line['arrtime'];  | 
                                                        |
| 988 | + if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];  | 
                                                        |
| 989 | + if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];  | 
                                                        |
| 990 | + if (isset($line['atis'])) $data['info'] = $line['atis'];  | 
                                                        |
| 991 | + else $data['info'] = '';  | 
                                                        |
| 992 | + $data['format_source'] = 'pireps';  | 
                                                        |
| 993 | + $data['id_source'] = $id_source;  | 
                                                        |
| 994 | +			$data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        |
| 995 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 996 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];  | 
                                                        |
| 997 | +			if ($line['icon'] == 'plane') { | 
                                                        |
| 998 | 998 | $SI->add($data);  | 
                                                        
| 999 | - // print_r($data);  | 
                                                        |
| 1000 | -    		    } elseif ($line['icon'] == 'ct') { | 
                                                        |
| 999 | + // print_r($data);  | 
                                                        |
| 1000 | +				} elseif ($line['icon'] == 'ct') { | 
                                                        |
| 1001 | 1001 |  			$data['info'] = str_replace('^§','<br />',$data['info']); | 
                                                        
| 1002 | 1002 |  			$data['info'] = str_replace('&sect;','',$data['info']); | 
                                                        
| 1003 | 1003 | $typec = substr($data['ident'],-3);  | 
                                                        
@@ -1012,203 +1012,203 @@ discard block  | 
                                                    ||
| 1012 | 1012 | elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';  | 
                                                        
| 1013 | 1013 | else $data['type'] = 'Observer';  | 
                                                        
| 1014 | 1014 | if (isset($ATC)) echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']);  | 
                                                        
| 1015 | - }  | 
                                                        |
| 1016 | - unset($data);  | 
                                                        |
| 1015 | + }  | 
                                                        |
| 1016 | + unset($data);  | 
                                                        |
| 1017 | + }  | 
                                                        |
| 1017 | 1018 | }  | 
                                                        
| 1018 | - }  | 
                                                        |
| 1019 | - //$last_exec['pirepsjson'] = time();  | 
                                                        |
| 1020 | - $last_exec[$id]['last'] = time();  | 
                                                        |
| 1021 | -    	//} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) { | 
                                                        |
| 1022 | -    	} elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { | 
                                                        |
| 1023 | - //$buffer = $Common->getData($hosts[$id]);  | 
                                                        |
| 1024 | - if ($globalDebug) echo 'Get Data...'."\n";  | 
                                                        |
| 1025 | - $buffer = $Common->getData($value['host']);  | 
                                                        |
| 1026 | - $all_data = json_decode($buffer,true);  | 
                                                        |
| 1027 | -	    if ($buffer != '' && is_array($all_data)) { | 
                                                        |
| 1019 | + //$last_exec['pirepsjson'] = time();  | 
                                                        |
| 1020 | + $last_exec[$id]['last'] = time();  | 
                                                        |
| 1021 | +		//} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) { | 
                                                        |
| 1022 | +		} elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { | 
                                                        |
| 1023 | + //$buffer = $Common->getData($hosts[$id]);  | 
                                                        |
| 1024 | + if ($globalDebug) echo 'Get Data...'."\n";  | 
                                                        |
| 1025 | + $buffer = $Common->getData($value['host']);  | 
                                                        |
| 1026 | + $all_data = json_decode($buffer,true);  | 
                                                        |
| 1027 | +		if ($buffer != '' && is_array($all_data)) { | 
                                                        |
| 1028 | 1028 | $reset = 0;  | 
                                                        
| 1029 | 1029 |  		foreach ($all_data as $line) { | 
                                                        
| 1030 | - $data = array();  | 
                                                        |
| 1031 | - //$data['id'] = $line['id']; // id not usable  | 
                                                        |
| 1032 | - if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];  | 
                                                        |
| 1033 | - $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex  | 
                                                        |
| 1034 | - if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];  | 
                                                        |
| 1035 | - if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];  | 
                                                        |
| 1036 | - $data['ident'] = $line['flightnum']; // ident  | 
                                                        |
| 1037 | - $data['altitude'] = $line['alt']; // altitude  | 
                                                        |
| 1038 | - $data['speed'] = $line['gs']; // speed  | 
                                                        |
| 1039 | - $data['heading'] = $line['heading']; // heading  | 
                                                        |
| 1040 | - $data['latitude'] = $line['lat']; // lat  | 
                                                        |
| 1041 | - $data['longitude'] = $line['lng']; // long  | 
                                                        |
| 1042 | - $data['verticalrate'] = ''; // verticale rate  | 
                                                        |
| 1043 | - $data['squawk'] = ''; // squawk  | 
                                                        |
| 1044 | - $data['emergency'] = ''; // emergency  | 
                                                        |
| 1045 | - //$data['datetime'] = $line['lastupdate'];  | 
                                                        |
| 1046 | - //$data['last_update'] = $line['lastupdate'];  | 
                                                        |
| 1047 | -	    	    if (isset($value['timezone'])) { | 
                                                        |
| 1048 | - $datetime = new DateTime($line['lastupdate'],new DateTimeZone($value['timezone']));  | 
                                                        |
| 1049 | -	    		$datetime->setTimeZone(new DateTimeZone('UTC')); | 
                                                        |
| 1050 | -	    		$data['datetime'] = $datetime->format('Y-m-d H:i:s'); | 
                                                        |
| 1051 | -	    	    } else $data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        |
| 1052 | - $data['departure_airport_icao'] = $line['depicao'];  | 
                                                        |
| 1053 | - $data['departure_airport_time'] = $line['deptime'];  | 
                                                        |
| 1054 | - $data['arrival_airport_icao'] = $line['arricao'];  | 
                                                        |
| 1055 | - $data['arrival_airport_time'] = $line['arrtime'];  | 
                                                        |
| 1056 | - $data['registration'] = $line['aircraft'];  | 
                                                        |
| 1057 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 1058 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; // route  | 
                                                        |
| 1059 | -		    if (isset($line['aircraftname'])) { | 
                                                        |
| 1030 | + $data = array();  | 
                                                        |
| 1031 | + //$data['id'] = $line['id']; // id not usable  | 
                                                        |
| 1032 | + if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];  | 
                                                        |
| 1033 | + $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex  | 
                                                        |
| 1034 | + if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];  | 
                                                        |
| 1035 | + if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];  | 
                                                        |
| 1036 | + $data['ident'] = $line['flightnum']; // ident  | 
                                                        |
| 1037 | + $data['altitude'] = $line['alt']; // altitude  | 
                                                        |
| 1038 | + $data['speed'] = $line['gs']; // speed  | 
                                                        |
| 1039 | + $data['heading'] = $line['heading']; // heading  | 
                                                        |
| 1040 | + $data['latitude'] = $line['lat']; // lat  | 
                                                        |
| 1041 | + $data['longitude'] = $line['lng']; // long  | 
                                                        |
| 1042 | + $data['verticalrate'] = ''; // verticale rate  | 
                                                        |
| 1043 | + $data['squawk'] = ''; // squawk  | 
                                                        |
| 1044 | + $data['emergency'] = ''; // emergency  | 
                                                        |
| 1045 | + //$data['datetime'] = $line['lastupdate'];  | 
                                                        |
| 1046 | + //$data['last_update'] = $line['lastupdate'];  | 
                                                        |
| 1047 | +				if (isset($value['timezone'])) { | 
                                                        |
| 1048 | + $datetime = new DateTime($line['lastupdate'],new DateTimeZone($value['timezone']));  | 
                                                        |
| 1049 | +				$datetime->setTimeZone(new DateTimeZone('UTC')); | 
                                                        |
| 1050 | +				$data['datetime'] = $datetime->format('Y-m-d H:i:s'); | 
                                                        |
| 1051 | +				} else $data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        |
| 1052 | + $data['departure_airport_icao'] = $line['depicao'];  | 
                                                        |
| 1053 | + $data['departure_airport_time'] = $line['deptime'];  | 
                                                        |
| 1054 | + $data['arrival_airport_icao'] = $line['arricao'];  | 
                                                        |
| 1055 | + $data['arrival_airport_time'] = $line['arrtime'];  | 
                                                        |
| 1056 | + $data['registration'] = $line['aircraft'];  | 
                                                        |
| 1057 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 1058 | + if (isset($line['route'])) $data['waypoints'] = $line['route']; // route  | 
                                                        |
| 1059 | +			if (isset($line['aircraftname'])) { | 
                                                        |
| 1060 | 1060 | $line['aircraftname'] = strtoupper($line['aircraftname']);  | 
                                                        
| 1061 | 1061 |  			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']); | 
                                                        
| 1062 | -	    		$aircraft_data = explode('-',$line['aircraftname']); | 
                                                        |
| 1063 | - if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];  | 
                                                        |
| 1064 | - elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];  | 
                                                        |
| 1065 | -	    		else { | 
                                                        |
| 1066 | -	    		    $aircraft_data = explode(' ',$line['aircraftname']); | 
                                                        |
| 1067 | -	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]); | 
                                                        |
| 1068 | -	    		    else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']); | 
                                                        |
| 1069 | - }  | 
                                                        |
| 1070 | - }  | 
                                                        |
| 1071 | - if (isset($line['route'])) $data['waypoints'] = $line['route'];  | 
                                                        |
| 1072 | - $data['id_source'] = $id_source;  | 
                                                        |
| 1073 | - $data['format_source'] = 'phpvmacars';  | 
                                                        |
| 1074 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];  | 
                                                        |
| 1075 | - $SI->add($data);  | 
                                                        |
| 1076 | - unset($data);  | 
                                                        |
| 1062 | +				$aircraft_data = explode('-',$line['aircraftname']); | 
                                                        |
| 1063 | + if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];  | 
                                                        |
| 1064 | + elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];  | 
                                                        |
| 1065 | +				else { | 
                                                        |
| 1066 | +					$aircraft_data = explode(' ',$line['aircraftname']); | 
                                                        |
| 1067 | +					if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]); | 
                                                        |
| 1068 | +					else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']); | 
                                                        |
| 1069 | + }  | 
                                                        |
| 1070 | + }  | 
                                                        |
| 1071 | + if (isset($line['route'])) $data['waypoints'] = $line['route'];  | 
                                                        |
| 1072 | + $data['id_source'] = $id_source;  | 
                                                        |
| 1073 | + $data['format_source'] = 'phpvmacars';  | 
                                                        |
| 1074 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];  | 
                                                        |
| 1075 | + $SI->add($data);  | 
                                                        |
| 1076 | + unset($data);  | 
                                                        |
| 1077 | 1077 | }  | 
                                                        
| 1078 | 1078 | if ($globalDebug) echo 'No more data...'."\n";  | 
                                                        
| 1079 | 1079 | unset($buffer);  | 
                                                        
| 1080 | 1080 | unset($all_data);  | 
                                                        
| 1081 | - }  | 
                                                        |
| 1082 | - //$last_exec['phpvmacars'] = time();  | 
                                                        |
| 1083 | - $last_exec[$id]['last'] = time();  | 
                                                        |
| 1084 | -    	} elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { | 
                                                        |
| 1085 | - //$buffer = $Common->getData($hosts[$id]);  | 
                                                        |
| 1086 | - if ($globalDebug) echo 'Get Data...'."\n";  | 
                                                        |
| 1087 | - $buffer = $Common->getData($value['host']);  | 
                                                        |
| 1088 | - $all_data = json_decode($buffer,true);  | 
                                                        |
| 1089 | -	    if ($buffer != '' && is_array($all_data)) { | 
                                                        |
| 1081 | + }  | 
                                                        |
| 1082 | + //$last_exec['phpvmacars'] = time();  | 
                                                        |
| 1083 | + $last_exec[$id]['last'] = time();  | 
                                                        |
| 1084 | +		} elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { | 
                                                        |
| 1085 | + //$buffer = $Common->getData($hosts[$id]);  | 
                                                        |
| 1086 | + if ($globalDebug) echo 'Get Data...'."\n";  | 
                                                        |
| 1087 | + $buffer = $Common->getData($value['host']);  | 
                                                        |
| 1088 | + $all_data = json_decode($buffer,true);  | 
                                                        |
| 1089 | +		if ($buffer != '' && is_array($all_data)) { | 
                                                        |
| 1090 | 1090 | $reset = 0;  | 
                                                        
| 1091 | 1091 |  		foreach ($all_data as $line) { | 
                                                        
| 1092 | - $data = array();  | 
                                                        |
| 1093 | - //$data['id'] = $line['id']; // id not usable  | 
                                                        |
| 1094 | - $data['id'] = trim($line['flight_id']);  | 
                                                        |
| 1095 | - $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex  | 
                                                        |
| 1096 | - $data['pilot_name'] = $line['pilot_name'];  | 
                                                        |
| 1097 | - $data['pilot_id'] = $line['pilot_id'];  | 
                                                        |
| 1098 | - $data['ident'] = trim($line['callsign']); // ident  | 
                                                        |
| 1099 | - $data['altitude'] = $line['altitude']; // altitude  | 
                                                        |
| 1100 | - $data['speed'] = $line['gs']; // speed  | 
                                                        |
| 1101 | - $data['heading'] = $line['heading']; // heading  | 
                                                        |
| 1102 | - $data['latitude'] = $line['latitude']; // lat  | 
                                                        |
| 1103 | - $data['longitude'] = $line['longitude']; // long  | 
                                                        |
| 1104 | - $data['verticalrate'] = ''; // verticale rate  | 
                                                        |
| 1105 | - $data['squawk'] = ''; // squawk  | 
                                                        |
| 1106 | - $data['emergency'] = ''; // emergency  | 
                                                        |
| 1107 | - //$data['datetime'] = $line['lastupdate'];  | 
                                                        |
| 1108 | - $data['last_update'] = $line['last_update'];  | 
                                                        |
| 1109 | -		    $data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        |
| 1110 | - $data['departure_airport_icao'] = $line['departure'];  | 
                                                        |
| 1111 | - //$data['departure_airport_time'] = $line['departure_time'];  | 
                                                        |
| 1112 | - $data['arrival_airport_icao'] = $line['arrival'];  | 
                                                        |
| 1113 | - //$data['arrival_airport_time'] = $line['arrival_time'];  | 
                                                        |
| 1114 | - //$data['registration'] = $line['aircraft'];  | 
                                                        |
| 1115 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; // route  | 
                                                        |
| 1116 | - $data['aircraft_icao'] = $line['plane_type'];  | 
                                                        |
| 1117 | - $data['id_source'] = $id_source;  | 
                                                        |
| 1118 | - $data['format_source'] = 'vam';  | 
                                                        |
| 1119 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 1120 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];  | 
                                                        |
| 1121 | - $SI->add($data);  | 
                                                        |
| 1122 | - unset($data);  | 
                                                        |
| 1092 | + $data = array();  | 
                                                        |
| 1093 | + //$data['id'] = $line['id']; // id not usable  | 
                                                        |
| 1094 | + $data['id'] = trim($line['flight_id']);  | 
                                                        |
| 1095 | + $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex  | 
                                                        |
| 1096 | + $data['pilot_name'] = $line['pilot_name'];  | 
                                                        |
| 1097 | + $data['pilot_id'] = $line['pilot_id'];  | 
                                                        |
| 1098 | + $data['ident'] = trim($line['callsign']); // ident  | 
                                                        |
| 1099 | + $data['altitude'] = $line['altitude']; // altitude  | 
                                                        |
| 1100 | + $data['speed'] = $line['gs']; // speed  | 
                                                        |
| 1101 | + $data['heading'] = $line['heading']; // heading  | 
                                                        |
| 1102 | + $data['latitude'] = $line['latitude']; // lat  | 
                                                        |
| 1103 | + $data['longitude'] = $line['longitude']; // long  | 
                                                        |
| 1104 | + $data['verticalrate'] = ''; // verticale rate  | 
                                                        |
| 1105 | + $data['squawk'] = ''; // squawk  | 
                                                        |
| 1106 | + $data['emergency'] = ''; // emergency  | 
                                                        |
| 1107 | + //$data['datetime'] = $line['lastupdate'];  | 
                                                        |
| 1108 | + $data['last_update'] = $line['last_update'];  | 
                                                        |
| 1109 | +			$data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        |
| 1110 | + $data['departure_airport_icao'] = $line['departure'];  | 
                                                        |
| 1111 | + //$data['departure_airport_time'] = $line['departure_time'];  | 
                                                        |
| 1112 | + $data['arrival_airport_icao'] = $line['arrival'];  | 
                                                        |
| 1113 | + //$data['arrival_airport_time'] = $line['arrival_time'];  | 
                                                        |
| 1114 | + //$data['registration'] = $line['aircraft'];  | 
                                                        |
| 1115 | + if (isset($line['route'])) $data['waypoints'] = $line['route']; // route  | 
                                                        |
| 1116 | + $data['aircraft_icao'] = $line['plane_type'];  | 
                                                        |
| 1117 | + $data['id_source'] = $id_source;  | 
                                                        |
| 1118 | + $data['format_source'] = 'vam';  | 
                                                        |
| 1119 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 1120 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];  | 
                                                        |
| 1121 | + $SI->add($data);  | 
                                                        |
| 1122 | + unset($data);  | 
                                                        |
| 1123 | 1123 | }  | 
                                                        
| 1124 | 1124 | if ($globalDebug) echo 'No more data...'."\n";  | 
                                                        
| 1125 | 1125 | unset($buffer);  | 
                                                        
| 1126 | 1126 | unset($all_data);  | 
                                                        
| 1127 | - }  | 
                                                        |
| 1128 | - //$last_exec['phpvmacars'] = time();  | 
                                                        |
| 1129 | - $last_exec[$id]['last'] = time();  | 
                                                        |
| 1127 | + }  | 
                                                        |
| 1128 | + //$last_exec['phpvmacars'] = time();  | 
                                                        |
| 1129 | + $last_exec[$id]['last'] = time();  | 
                                                        |
| 1130 | 1130 |  	//} elseif ($value == 'sbs' || $value == 'tsv' || $value == 'raw' || $value == 'aprs' || $value == 'beast') { | 
                                                        
| 1131 | 1131 |  	} elseif ($value['format'] == 'sbs' || $value['format'] == 'tsv' || $value['format'] == 'raw' || $value['format'] == 'aprs' || $value['format'] == 'famaprs' || $value['format'] == 'beast' || $value['format'] == 'flightgearmp' || $value['format'] == 'flightgearsp' || $value['format'] == 'acars' || $value['format'] == 'acarssbs3' || $value['format'] == 'ais' || $value['format'] == 'vrstcp') { | 
                                                        
| 1132 | -	    if (function_exists('pcntl_fork')) pcntl_signal_dispatch(); | 
                                                        |
| 1133 | - //$last_exec[$id]['last'] = time();  | 
                                                        |
| 1132 | +		if (function_exists('pcntl_fork')) pcntl_signal_dispatch(); | 
                                                        |
| 1133 | + //$last_exec[$id]['last'] = time();  | 
                                                        |
| 1134 | 1134 | |
| 1135 | - //$read = array( $sockets[$id] );  | 
                                                        |
| 1136 | - $read = $sockets;  | 
                                                        |
| 1137 | - $write = NULL;  | 
                                                        |
| 1138 | - $e = NULL;  | 
                                                        |
| 1139 | - $n = socket_select($read, $write, $e, $timeout);  | 
                                                        |
| 1140 | - if ($e != NULL) var_dump($e);  | 
                                                        |
| 1141 | -	    if ($n > 0) { | 
                                                        |
| 1135 | + //$read = array( $sockets[$id] );  | 
                                                        |
| 1136 | + $read = $sockets;  | 
                                                        |
| 1137 | + $write = NULL;  | 
                                                        |
| 1138 | + $e = NULL;  | 
                                                        |
| 1139 | + $n = socket_select($read, $write, $e, $timeout);  | 
                                                        |
| 1140 | + if ($e != NULL) var_dump($e);  | 
                                                        |
| 1141 | +		if ($n > 0) { | 
                                                        |
| 1142 | 1142 | $reset = 0;  | 
                                                        
| 1143 | 1143 |  		foreach ($read as $nb => $r) { | 
                                                        
| 1144 | - //$value = $formats[$nb];  | 
                                                        |
| 1145 | - $format = $globalSources[$nb]['format'];  | 
                                                        |
| 1146 | -		    if ($format == 'sbs' || $format == 'aprs' || $format == 'famaprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') { | 
                                                        |
| 1144 | + //$value = $formats[$nb];  | 
                                                        |
| 1145 | + $format = $globalSources[$nb]['format'];  | 
                                                        |
| 1146 | +			if ($format == 'sbs' || $format == 'aprs' || $format == 'famaprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') { | 
                                                        |
| 1147 | 1147 | $buffer = @socket_read($r, 6000,PHP_NORMAL_READ);  | 
                                                        
| 1148 | -		    } elseif ($format == 'vrstcp') { | 
                                                        |
| 1148 | +			} elseif ($format == 'vrstcp') { | 
                                                        |
| 1149 | 1149 | $buffer = @socket_read($r, 6000);  | 
                                                        
| 1150 | -		    } else { | 
                                                        |
| 1150 | +			} else { | 
                                                        |
| 1151 | 1151 | $az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port);  | 
                                                        
| 1152 | - }  | 
                                                        |
| 1153 | - //$buffer = socket_read($r, 60000,PHP_NORMAL_READ);  | 
                                                        |
| 1154 | - //echo $buffer."\n";  | 
                                                        |
| 1155 | - // lets play nice and handle signals such as ctrl-c/kill properly  | 
                                                        |
| 1156 | -		    //if (function_exists('pcntl_fork')) pcntl_signal_dispatch(); | 
                                                        |
| 1157 | - $error = false;  | 
                                                        |
| 1158 | - //$SI::del();  | 
                                                        |
| 1159 | -		    if ($format == 'vrstcp') { | 
                                                        |
| 1152 | + }  | 
                                                        |
| 1153 | + //$buffer = socket_read($r, 60000,PHP_NORMAL_READ);  | 
                                                        |
| 1154 | + //echo $buffer."\n";  | 
                                                        |
| 1155 | + // lets play nice and handle signals such as ctrl-c/kill properly  | 
                                                        |
| 1156 | +			//if (function_exists('pcntl_fork')) pcntl_signal_dispatch(); | 
                                                        |
| 1157 | + $error = false;  | 
                                                        |
| 1158 | + //$SI::del();  | 
                                                        |
| 1159 | +			if ($format == 'vrstcp') { | 
                                                        |
| 1160 | 1160 |  			$buffer = explode('},{',$buffer); | 
                                                        
| 1161 | -		    } else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer)); | 
                                                        |
| 1162 | - // SBS format is CSV format  | 
                                                        |
| 1163 | -		    if ($buffer !== FALSE && $buffer != '') { | 
                                                        |
| 1161 | +			} else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer)); | 
                                                        |
| 1162 | + // SBS format is CSV format  | 
                                                        |
| 1163 | +			if ($buffer !== FALSE && $buffer != '') { | 
                                                        |
| 1164 | 1164 | $tt[$format] = 0;  | 
                                                        
| 1165 | 1165 |  			if ($format == 'acarssbs3') { | 
                                                        
| 1166 | - if ($globalDebug) echo 'ACARS : '.$buffer."\n";  | 
                                                        |
| 1167 | - $ACARS->add(trim($buffer));  | 
                                                        |
| 1168 | - $ACARS->deleteLiveAcarsData();  | 
                                                        |
| 1166 | + if ($globalDebug) echo 'ACARS : '.$buffer."\n";  | 
                                                        |
| 1167 | + $ACARS->add(trim($buffer));  | 
                                                        |
| 1168 | + $ACARS->deleteLiveAcarsData();  | 
                                                        |
| 1169 | 1169 |  			} elseif ($format == 'raw') { | 
                                                        
| 1170 | - // AVR format  | 
                                                        |
| 1171 | - $data = $SBS->parse($buffer);  | 
                                                        |
| 1172 | -			    if (is_array($data)) { | 
                                                        |
| 1170 | + // AVR format  | 
                                                        |
| 1171 | + $data = $SBS->parse($buffer);  | 
                                                        |
| 1172 | +				if (is_array($data)) { | 
                                                        |
| 1173 | 1173 |  				$data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        
| 1174 | 1174 | $data['format_source'] = 'raw';  | 
                                                        
| 1175 | 1175 | if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];  | 
                                                        
| 1176 | 1176 | if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];  | 
                                                        
| 1177 | 1177 | if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        
| 1178 | 1178 | if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);  | 
                                                        
| 1179 | - }  | 
                                                        |
| 1179 | + }  | 
                                                        |
| 1180 | 1180 |  			} elseif ($format == 'ais') { | 
                                                        
| 1181 | - $ais_data = $AIS->parse_line(trim($buffer));  | 
                                                        |
| 1182 | - $data = array();  | 
                                                        |
| 1183 | - if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];  | 
                                                        |
| 1184 | - if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];  | 
                                                        |
| 1185 | - if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];  | 
                                                        |
| 1186 | - if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];  | 
                                                        |
| 1187 | - if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];  | 
                                                        |
| 1188 | - if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];  | 
                                                        |
| 1189 | - if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];  | 
                                                        |
| 1190 | - if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];  | 
                                                        |
| 1191 | - if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];  | 
                                                        |
| 1192 | - if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];  | 
                                                        |
| 1193 | - if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];  | 
                                                        |
| 1194 | - if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];  | 
                                                        |
| 1195 | -			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); | 
                                                        |
| 1196 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 1197 | - if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];  | 
                                                        |
| 1198 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];  | 
                                                        |
| 1181 | + $ais_data = $AIS->parse_line(trim($buffer));  | 
                                                        |
| 1182 | + $data = array();  | 
                                                        |
| 1183 | + if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];  | 
                                                        |
| 1184 | + if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];  | 
                                                        |
| 1185 | + if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];  | 
                                                        |
| 1186 | + if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];  | 
                                                        |
| 1187 | + if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];  | 
                                                        |
| 1188 | + if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];  | 
                                                        |
| 1189 | + if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];  | 
                                                        |
| 1190 | + if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];  | 
                                                        |
| 1191 | + if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];  | 
                                                        |
| 1192 | + if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];  | 
                                                        |
| 1193 | + if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];  | 
                                                        |
| 1194 | + if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];  | 
                                                        |
| 1195 | +				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); | 
                                                        |
| 1196 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 1197 | + if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];  | 
                                                        |
| 1198 | + if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];  | 
                                                        |
| 1199 | 1199 | |
| 1200 | -			    if (isset($ais_data['timestamp'])) { | 
                                                        |
| 1200 | +				if (isset($ais_data['timestamp'])) { | 
                                                        |
| 1201 | 1201 |  				$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); | 
                                                        
| 1202 | -			    } else { | 
                                                        |
| 1202 | +				} else { | 
                                                        |
| 1203 | 1203 |  				$data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        
| 1204 | - }  | 
                                                        |
| 1205 | - $data['format_source'] = 'aisnmea';  | 
                                                        |
| 1206 | - $data['id_source'] = $id_source;  | 
                                                        |
| 1207 | - if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);  | 
                                                        |
| 1208 | - unset($data);  | 
                                                        |
| 1209 | -                        } elseif ($format == 'flightgearsp') { | 
                                                        |
| 1210 | - //echo $buffer."\n";  | 
                                                        |
| 1211 | -                    	    if (strlen($buffer) > 5) { | 
                                                        |
| 1204 | + }  | 
                                                        |
| 1205 | + $data['format_source'] = 'aisnmea';  | 
                                                        |
| 1206 | + $data['id_source'] = $id_source;  | 
                                                        |
| 1207 | + if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);  | 
                                                        |
| 1208 | + unset($data);  | 
                                                        |
| 1209 | +						} elseif ($format == 'flightgearsp') { | 
                                                        |
| 1210 | + //echo $buffer."\n";  | 
                                                        |
| 1211 | +							if (strlen($buffer) > 5) { | 
                                                        |
| 1212 | 1212 |  				$line = explode(',',$buffer); | 
                                                        
| 1213 | 1213 | $data = array();  | 
                                                        
| 1214 | 1214 | //XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p  | 
                                                        
@@ -1225,38 +1225,38 @@ discard block  | 
                                                    ||
| 1225 | 1225 | if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        
| 1226 | 1226 | if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);  | 
                                                        
| 1227 | 1227 | //$send = @ socket_send( $r , $data_aprs , strlen($data_aprs) , 0 );  | 
                                                        
| 1228 | - }  | 
                                                        |
| 1229 | -                        } elseif ($format == 'acars') { | 
                                                        |
| 1230 | - if ($globalDebug) echo 'ACARS : '.$buffer."\n";  | 
                                                        |
| 1231 | - $ACARS->add(trim($buffer));  | 
                                                        |
| 1232 | - socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);  | 
                                                        |
| 1233 | - $ACARS->deleteLiveAcarsData();  | 
                                                        |
| 1228 | + }  | 
                                                        |
| 1229 | +						} elseif ($format == 'acars') { | 
                                                        |
| 1230 | + if ($globalDebug) echo 'ACARS : '.$buffer."\n";  | 
                                                        |
| 1231 | + $ACARS->add(trim($buffer));  | 
                                                        |
| 1232 | + socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);  | 
                                                        |
| 1233 | + $ACARS->deleteLiveAcarsData();  | 
                                                        |
| 1234 | 1234 |  			} elseif ($format == 'flightgearmp') { | 
                                                        
| 1235 | -			    if (substr($buffer,0,1) != '#') { | 
                                                        |
| 1235 | +				if (substr($buffer,0,1) != '#') { | 
                                                        |
| 1236 | 1236 | $data = array();  | 
                                                        
| 1237 | 1237 | //echo $buffer."\n";  | 
                                                        
| 1238 | 1238 |  				$line = explode(' ',$buffer); | 
                                                        
| 1239 | 1239 |  				if (count($line) == 11) { | 
                                                        
| 1240 | -				    $userserver = explode('@',$line[0]); | 
                                                        |
| 1241 | - $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex  | 
                                                        |
| 1242 | - $data['ident'] = $userserver[0];  | 
                                                        |
| 1243 | - $data['registration'] = $userserver[0];  | 
                                                        |
| 1244 | - $data['latitude'] = $line[4];  | 
                                                        |
| 1245 | - $data['longitude'] = $line[5];  | 
                                                        |
| 1246 | - $data['altitude'] = $line[6];  | 
                                                        |
| 1247 | -				    $data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        |
| 1248 | - $aircraft_type = $line[10];  | 
                                                        |
| 1249 | -				    $aircraft_type = preg_split(':/:',$aircraft_type); | 
                                                        |
| 1250 | - $data['aircraft_name'] = substr(end($aircraft_type),0,-4);  | 
                                                        |
| 1251 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 1252 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);  | 
                                                        |
| 1240 | +					$userserver = explode('@',$line[0]); | 
                                                        |
| 1241 | + $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex  | 
                                                        |
| 1242 | + $data['ident'] = $userserver[0];  | 
                                                        |
| 1243 | + $data['registration'] = $userserver[0];  | 
                                                        |
| 1244 | + $data['latitude'] = $line[4];  | 
                                                        |
| 1245 | + $data['longitude'] = $line[5];  | 
                                                        |
| 1246 | + $data['altitude'] = $line[6];  | 
                                                        |
| 1247 | +					$data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        |
| 1248 | + $aircraft_type = $line[10];  | 
                                                        |
| 1249 | +					$aircraft_type = preg_split(':/:',$aircraft_type); | 
                                                        |
| 1250 | + $data['aircraft_name'] = substr(end($aircraft_type),0,-4);  | 
                                                        |
| 1251 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 1252 | + if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);  | 
                                                        |
| 1253 | + }  | 
                                                        |
| 1253 | 1254 | }  | 
                                                        
| 1254 | - }  | 
                                                        |
| 1255 | 1255 |  			} elseif ($format == 'beast') { | 
                                                        
| 1256 | - echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";  | 
                                                        |
| 1257 | - die;  | 
                                                        |
| 1256 | + echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";  | 
                                                        |
| 1257 | + die;  | 
                                                        |
| 1258 | 1258 |  			} elseif ($format == 'vrstcp') { | 
                                                        
| 1259 | -			    foreach($buffer as $all_data) { | 
                                                        |
| 1259 | +				foreach($buffer as $all_data) { | 
                                                        |
| 1260 | 1260 |  				$line = json_decode('{'.$all_data.'}',true); | 
                                                        
| 1261 | 1261 | $data = array();  | 
                                                        
| 1262 | 1262 | if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex  | 
                                                        
@@ -1276,148 +1276,148 @@ discard block  | 
                                                    ||
| 1276 | 1276 | */  | 
                                                        
| 1277 | 1277 |  				$data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        
| 1278 | 1278 | if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];  | 
                                                        
| 1279 | - $data['format_source'] = 'vrstcp';  | 
                                                        |
| 1279 | + $data['format_source'] = 'vrstcp';  | 
                                                        |
| 1280 | 1280 | $data['id_source'] = $id_source;  | 
                                                        
| 1281 | 1281 | if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        
| 1282 | 1282 | if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];  | 
                                                        
| 1283 | 1283 | if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data);  | 
                                                        
| 1284 | 1284 | unset($data);  | 
                                                        
| 1285 | - }  | 
                                                        |
| 1285 | + }  | 
                                                        |
| 1286 | 1286 |  			} elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') { | 
                                                        
| 1287 | -			    $line = explode("\t", $buffer); | 
                                                        |
| 1288 | -			    for($k = 0; $k < count($line); $k=$k+2) { | 
                                                        |
| 1287 | +				$line = explode("\t", $buffer); | 
                                                        |
| 1288 | +				for($k = 0; $k < count($line); $k=$k+2) { | 
                                                        |
| 1289 | 1289 | $key = $line[$k];  | 
                                                        
| 1290 | - $lined[$key] = $line[$k+1];  | 
                                                        |
| 1291 | - }  | 
                                                        |
| 1292 | -    			    if (count($lined) > 3) { | 
                                                        |
| 1293 | - $data['hex'] = $lined['hexid'];  | 
                                                        |
| 1294 | -    				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));; | 
                                                        |
| 1295 | -    				$data['datetime'] = date('Y-m-d H:i:s');; | 
                                                        |
| 1296 | - if (isset($lined['ident'])) $data['ident'] = $lined['ident'];  | 
                                                        |
| 1297 | - if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];  | 
                                                        |
| 1298 | - if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];  | 
                                                        |
| 1299 | - if (isset($lined['speed'])) $data['speed'] = $lined['speed'];  | 
                                                        |
| 1300 | - if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];  | 
                                                        |
| 1301 | - if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];  | 
                                                        |
| 1302 | - if (isset($lined['heading'])) $data['heading'] = $lined['heading'];  | 
                                                        |
| 1303 | - $data['id_source'] = $id_source;  | 
                                                        |
| 1304 | - $data['format_source'] = 'tsv';  | 
                                                        |
| 1305 | - if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];  | 
                                                        |
| 1306 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];  | 
                                                        |
| 1290 | + $lined[$key] = $line[$k+1];  | 
                                                        |
| 1291 | + }  | 
                                                        |
| 1292 | +					if (count($lined) > 3) { | 
                                                        |
| 1293 | + $data['hex'] = $lined['hexid'];  | 
                                                        |
| 1294 | +					//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));; | 
                                                        |
| 1295 | +					$data['datetime'] = date('Y-m-d H:i:s');; | 
                                                        |
| 1296 | + if (isset($lined['ident'])) $data['ident'] = $lined['ident'];  | 
                                                        |
| 1297 | + if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];  | 
                                                        |
| 1298 | + if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];  | 
                                                        |
| 1299 | + if (isset($lined['speed'])) $data['speed'] = $lined['speed'];  | 
                                                        |
| 1300 | + if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];  | 
                                                        |
| 1301 | + if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];  | 
                                                        |
| 1302 | + if (isset($lined['heading'])) $data['heading'] = $lined['heading'];  | 
                                                        |
| 1303 | + $data['id_source'] = $id_source;  | 
                                                        |
| 1304 | + $data['format_source'] = 'tsv';  | 
                                                        |
| 1305 | + if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];  | 
                                                        |
| 1306 | + if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];  | 
                                                        |
| 1307 | 1307 | if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        
| 1308 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);  | 
                                                        |
| 1309 | - unset($lined);  | 
                                                        |
| 1310 | - unset($data);  | 
                                                        |
| 1311 | - } else $error = true;  | 
                                                        |
| 1308 | + if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);  | 
                                                        |
| 1309 | + unset($lined);  | 
                                                        |
| 1310 | + unset($data);  | 
                                                        |
| 1311 | + } else $error = true;  | 
                                                        |
| 1312 | 1312 |  			} elseif ($format == 'aprs' && $use_aprs) { | 
                                                        
| 1313 | -			    if ($aprs_connect == 0) { | 
                                                        |
| 1313 | +				if ($aprs_connect == 0) { | 
                                                        |
| 1314 | 1314 | $send = @ socket_send( $r , $aprs_login , strlen($aprs_login) , 0 );  | 
                                                        
| 1315 | 1315 | $aprs_connect = 1;  | 
                                                        
| 1316 | - }  | 
                                                        |
| 1316 | + }  | 
                                                        |
| 1317 | 1317 | |
| 1318 | -			    if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) { | 
                                                        |
| 1318 | +				if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) { | 
                                                        |
| 1319 | 1319 | $aprs_last_tx = time();  | 
                                                        
| 1320 | 1320 | $data_aprs = "# Keep alive";  | 
                                                        
| 1321 | 1321 | $send = @ socket_send( $r , $data_aprs , strlen($data_aprs) , 0 );  | 
                                                        
| 1322 | - }  | 
                                                        |
| 1322 | + }  | 
                                                        |
| 1323 | 1323 | |
| 1324 | - //echo 'Connect : '.$aprs_connect.' '.$buffer."\n";  | 
                                                        |
| 1325 | - //echo 'APRS data : '.$buffer."\n";  | 
                                                        |
| 1326 | -			    $buffer = str_replace('APRS <- ','',$buffer); | 
                                                        |
| 1327 | -			    $buffer = str_replace('APRS -> ','',$buffer); | 
                                                        |
| 1328 | - //echo $buffer."\n";  | 
                                                        |
| 1329 | -			    if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') { | 
                                                        |
| 1324 | + //echo 'Connect : '.$aprs_connect.' '.$buffer."\n";  | 
                                                        |
| 1325 | + //echo 'APRS data : '.$buffer."\n";  | 
                                                        |
| 1326 | +				$buffer = str_replace('APRS <- ','',$buffer); | 
                                                        |
| 1327 | +				$buffer = str_replace('APRS -> ','',$buffer); | 
                                                        |
| 1328 | + //echo $buffer."\n";  | 
                                                        |
| 1329 | +				if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') { | 
                                                        |
| 1330 | 1330 | $line = $APRS->parse($buffer);  | 
                                                        
| 1331 | 1331 |  				//if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) { | 
                                                        
| 1332 | 1332 |  				if (is_array($line) && isset($line['latitude']) && isset($line['longitude']) && (isset($line['ident']) || isset($line['address']) || isset($line['mmsi']))) { | 
                                                        
| 1333 | - $aprs_last_tx = time();  | 
                                                        |
| 1334 | - $data = array();  | 
                                                        |
| 1335 | - //print_r($line);  | 
                                                        |
| 1336 | - if (isset($line['address'])) $data['hex'] = $line['address'];  | 
                                                        |
| 1337 | - if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi'];  | 
                                                        |
| 1338 | - if (isset($line['imo'])) $data['imo'] = $line['imo'];  | 
                                                        |
| 1339 | - if (isset($line['squawk'])) $data['squawk'] = $line['squawk'];  | 
                                                        |
| 1340 | - if (isset($line['arrival_code'])) $data['arrical_code'] = $line['arrival_code'];  | 
                                                        |
| 1341 | - if (isset($line['arrival_date'])) $data['arrical_date'] = $line['arrival_date'];  | 
                                                        |
| 1342 | - if (isset($line['type_id'])) $data['type_id'] = $line['typeid'];  | 
                                                        |
| 1343 | - if (isset($line['status_id'])) $data['status_id'] = $line['statusid'];  | 
                                                        |
| 1344 | -				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']); | 
                                                        |
| 1345 | -				    else $data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        |
| 1346 | -				    //$data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        |
| 1347 | - if (isset($line['ident'])) $data['ident'] = $line['ident'];  | 
                                                        |
| 1348 | - $data['latitude'] = $line['latitude'];  | 
                                                        |
| 1349 | - $data['longitude'] = $line['longitude'];  | 
                                                        |
| 1350 | - //$data['verticalrate'] = $line[16];  | 
                                                        |
| 1351 | - if (isset($line['speed'])) $data['speed'] = $line['speed'];  | 
                                                        |
| 1352 | - //else $data['speed'] = 0;  | 
                                                        |
| 1353 | - if (isset($line['altitude'])) $data['altitude'] = $line['altitude'];  | 
                                                        |
| 1354 | - if (isset($line['comment'])) $data['comment'] = $line['comment'];  | 
                                                        |
| 1355 | - if (isset($line['symbol'])) $data['type'] = $line['symbol'];  | 
                                                        |
| 1356 | - if (isset($line['heading'])) $data['heading'] = $line['heading'];  | 
                                                        |
| 1357 | - //else $data['heading'] = 0;  | 
                                                        |
| 1358 | - if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth'];  | 
                                                        |
| 1359 | - //if (!isset($line['source_type']) && (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE))) $data['noarchive'] = true;  | 
                                                        |
| 1360 | - if (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE) $data['noarchive'] = true;  | 
                                                        |
| 1361 | - elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) $data['noarchive'] = false;  | 
                                                        |
| 1362 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 1363 | - elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) $data['noarchive'] = false;  | 
                                                        |
| 1364 | - $data['id_source'] = $id_source;  | 
                                                        |
| 1365 | - if (isset($line['format_source'])) $data['format_source'] = $line['format_source'];  | 
                                                        |
| 1366 | - else $data['format_source'] = 'aprs';  | 
                                                        |
| 1367 | - $data['source_name'] = $line['source'];  | 
                                                        |
| 1368 | - if (isset($line['source_type'])) $data['source_type'] = $line['source_type'];  | 
                                                        |
| 1369 | - else $data['source_type'] = 'flarm';  | 
                                                        |
| 1370 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];  | 
                                                        |
| 1371 | -				    $currentdate = date('Y-m-d H:i:s'); | 
                                                        |
| 1372 | - $aprsdate = strtotime($data['datetime']);  | 
                                                        |
| 1373 | - if ($data['source_type'] != 'modes' && $data['source_type'] != 'ais') $data['altitude_relative'] = 'AMSL';  | 
                                                        |
| 1374 | - // Accept data if time <= system time + 20s  | 
                                                        |
| 1375 | -				    //if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) { | 
                                                        |
| 1376 | -				    if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) { | 
                                                        |
| 1333 | + $aprs_last_tx = time();  | 
                                                        |
| 1334 | + $data = array();  | 
                                                        |
| 1335 | + //print_r($line);  | 
                                                        |
| 1336 | + if (isset($line['address'])) $data['hex'] = $line['address'];  | 
                                                        |
| 1337 | + if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi'];  | 
                                                        |
| 1338 | + if (isset($line['imo'])) $data['imo'] = $line['imo'];  | 
                                                        |
| 1339 | + if (isset($line['squawk'])) $data['squawk'] = $line['squawk'];  | 
                                                        |
| 1340 | + if (isset($line['arrival_code'])) $data['arrical_code'] = $line['arrival_code'];  | 
                                                        |
| 1341 | + if (isset($line['arrival_date'])) $data['arrical_date'] = $line['arrival_date'];  | 
                                                        |
| 1342 | + if (isset($line['type_id'])) $data['type_id'] = $line['typeid'];  | 
                                                        |
| 1343 | + if (isset($line['status_id'])) $data['status_id'] = $line['statusid'];  | 
                                                        |
| 1344 | +					if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']); | 
                                                        |
| 1345 | +					else $data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        |
| 1346 | +					//$data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        |
| 1347 | + if (isset($line['ident'])) $data['ident'] = $line['ident'];  | 
                                                        |
| 1348 | + $data['latitude'] = $line['latitude'];  | 
                                                        |
| 1349 | + $data['longitude'] = $line['longitude'];  | 
                                                        |
| 1350 | + //$data['verticalrate'] = $line[16];  | 
                                                        |
| 1351 | + if (isset($line['speed'])) $data['speed'] = $line['speed'];  | 
                                                        |
| 1352 | + //else $data['speed'] = 0;  | 
                                                        |
| 1353 | + if (isset($line['altitude'])) $data['altitude'] = $line['altitude'];  | 
                                                        |
| 1354 | + if (isset($line['comment'])) $data['comment'] = $line['comment'];  | 
                                                        |
| 1355 | + if (isset($line['symbol'])) $data['type'] = $line['symbol'];  | 
                                                        |
| 1356 | + if (isset($line['heading'])) $data['heading'] = $line['heading'];  | 
                                                        |
| 1357 | + //else $data['heading'] = 0;  | 
                                                        |
| 1358 | + if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth'];  | 
                                                        |
| 1359 | + //if (!isset($line['source_type']) && (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE))) $data['noarchive'] = true;  | 
                                                        |
| 1360 | + if (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE) $data['noarchive'] = true;  | 
                                                        |
| 1361 | + elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) $data['noarchive'] = false;  | 
                                                        |
| 1362 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 1363 | + elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) $data['noarchive'] = false;  | 
                                                        |
| 1364 | + $data['id_source'] = $id_source;  | 
                                                        |
| 1365 | + if (isset($line['format_source'])) $data['format_source'] = $line['format_source'];  | 
                                                        |
| 1366 | + else $data['format_source'] = 'aprs';  | 
                                                        |
| 1367 | + $data['source_name'] = $line['source'];  | 
                                                        |
| 1368 | + if (isset($line['source_type'])) $data['source_type'] = $line['source_type'];  | 
                                                        |
| 1369 | + else $data['source_type'] = 'flarm';  | 
                                                        |
| 1370 | + if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];  | 
                                                        |
| 1371 | +					$currentdate = date('Y-m-d H:i:s'); | 
                                                        |
| 1372 | + $aprsdate = strtotime($data['datetime']);  | 
                                                        |
| 1373 | + if ($data['source_type'] != 'modes' && $data['source_type'] != 'ais') $data['altitude_relative'] = 'AMSL';  | 
                                                        |
| 1374 | + // Accept data if time <= system time + 20s  | 
                                                        |
| 1375 | +					//if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) { | 
                                                        |
| 1376 | +					if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) { | 
                                                        |
| 1377 | 1377 | $send = $SI->add($data);  | 
                                                        
| 1378 | -				    } elseif ($data['source_type'] == 'ais') { | 
                                                        |
| 1378 | +					} elseif ($data['source_type'] == 'ais') { | 
                                                        |
| 1379 | 1379 | if (isset($globalMarine) && $globalMarine) $send = $MI->add($data);  | 
                                                        
| 1380 | -				    } elseif (isset($line['stealth'])) { | 
                                                        |
| 1380 | +					} elseif (isset($line['stealth'])) { | 
                                                        |
| 1381 | 1381 | if ($line['stealth'] != 0) echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";  | 
                                                        
| 1382 | 1382 | else echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n";  | 
                                                        
| 1383 | - } elseif (isset($globalAircraft) && $globalAircraft && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (  | 
                                                        |
| 1384 | - //$line['symbol'] == 'Balloon' ||  | 
                                                        |
| 1385 | - $line['symbol'] == 'Glider' ||  | 
                                                        |
| 1386 | -					    $line['symbol'] == 'Aircraft (small)' || $line['symbol'] == 'Helicopter')) { | 
                                                        |
| 1387 | - if ($line['symbol'] == 'Ballon') $data['aircraft_icao'] = 'BALL';  | 
                                                        |
| 1388 | - if ($line['symbol'] == 'Glider') $data['aircraft_icao'] = 'PARAGLIDER';  | 
                                                        |
| 1389 | - $send = $SI->add($data);  | 
                                                        |
| 1390 | - } elseif (isset($globalMarine) && $globalMarine && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (  | 
                                                        |
| 1391 | - $line['symbol'] == 'Yacht (Sail)' ||  | 
                                                        |
| 1392 | -					    $line['symbol'] == 'Ship (Power Boat)')) { | 
                                                        |
| 1393 | - $send = $MI->add($data);  | 
                                                        |
| 1394 | - } elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (  | 
                                                        |
| 1395 | - $line['symbol'] == 'Car' ||  | 
                                                        |
| 1396 | - $line['symbol'] == 'Ambulance' ||  | 
                                                        |
| 1397 | - $line['symbol'] == 'Van' ||  | 
                                                        |
| 1398 | - $line['symbol'] == 'Truck' || $line['symbol'] == 'Truck (18 Wheeler)' ||  | 
                                                        |
| 1399 | - $line['symbol'] == 'Motorcycle' ||  | 
                                                        |
| 1400 | - $line['symbol'] == 'Tractor' ||  | 
                                                        |
| 1401 | - $line['symbol'] == 'Police' ||  | 
                                                        |
| 1402 | - $line['symbol'] == 'Bike' ||  | 
                                                        |
| 1403 | - $line['symbol'] == 'Jogger' ||  | 
                                                        |
| 1404 | - $line['symbol'] == 'Horse' ||  | 
                                                        |
| 1405 | - $line['symbol'] == 'Bus' ||  | 
                                                        |
| 1406 | - $line['symbol'] == 'Jeep' ||  | 
                                                        |
| 1407 | - $line['symbol'] == 'Recreational Vehicle' ||  | 
                                                        |
| 1408 | - $line['symbol'] == 'Yacht (Sail)' ||  | 
                                                        |
| 1409 | - $line['symbol'] == 'Ship (Power Boat)' ||  | 
                                                        |
| 1410 | - $line['symbol'] == 'Firetruck' ||  | 
                                                        |
| 1411 | - $line['symbol'] == 'Balloon' || $line['symbol'] == 'Glider' ||  | 
                                                        |
| 1412 | - $line['symbol'] == 'Aircraft (small)' || $line['symbol'] == 'Helicopter' ||  | 
                                                        |
| 1413 | - $line['symbol'] == 'SUV' ||  | 
                                                        |
| 1414 | - $line['symbol'] == 'Snowmobile' ||  | 
                                                        |
| 1415 | -					    $line['symbol'] == 'Mobile Satellite Station')) { | 
                                                        |
| 1416 | -				    //} elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && isset($line['speed']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') { | 
                                                        |
| 1383 | + } elseif (isset($globalAircraft) && $globalAircraft && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (  | 
                                                        |
| 1384 | + //$line['symbol'] == 'Balloon' ||  | 
                                                        |
| 1385 | + $line['symbol'] == 'Glider' ||  | 
                                                        |
| 1386 | +						$line['symbol'] == 'Aircraft (small)' || $line['symbol'] == 'Helicopter')) { | 
                                                        |
| 1387 | + if ($line['symbol'] == 'Ballon') $data['aircraft_icao'] = 'BALL';  | 
                                                        |
| 1388 | + if ($line['symbol'] == 'Glider') $data['aircraft_icao'] = 'PARAGLIDER';  | 
                                                        |
| 1389 | + $send = $SI->add($data);  | 
                                                        |
| 1390 | + } elseif (isset($globalMarine) && $globalMarine && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (  | 
                                                        |
| 1391 | + $line['symbol'] == 'Yacht (Sail)' ||  | 
                                                        |
| 1392 | +						$line['symbol'] == 'Ship (Power Boat)')) { | 
                                                        |
| 1393 | + $send = $MI->add($data);  | 
                                                        |
| 1394 | + } elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (  | 
                                                        |
| 1395 | + $line['symbol'] == 'Car' ||  | 
                                                        |
| 1396 | + $line['symbol'] == 'Ambulance' ||  | 
                                                        |
| 1397 | + $line['symbol'] == 'Van' ||  | 
                                                        |
| 1398 | + $line['symbol'] == 'Truck' || $line['symbol'] == 'Truck (18 Wheeler)' ||  | 
                                                        |
| 1399 | + $line['symbol'] == 'Motorcycle' ||  | 
                                                        |
| 1400 | + $line['symbol'] == 'Tractor' ||  | 
                                                        |
| 1401 | + $line['symbol'] == 'Police' ||  | 
                                                        |
| 1402 | + $line['symbol'] == 'Bike' ||  | 
                                                        |
| 1403 | + $line['symbol'] == 'Jogger' ||  | 
                                                        |
| 1404 | + $line['symbol'] == 'Horse' ||  | 
                                                        |
| 1405 | + $line['symbol'] == 'Bus' ||  | 
                                                        |
| 1406 | + $line['symbol'] == 'Jeep' ||  | 
                                                        |
| 1407 | + $line['symbol'] == 'Recreational Vehicle' ||  | 
                                                        |
| 1408 | + $line['symbol'] == 'Yacht (Sail)' ||  | 
                                                        |
| 1409 | + $line['symbol'] == 'Ship (Power Boat)' ||  | 
                                                        |
| 1410 | + $line['symbol'] == 'Firetruck' ||  | 
                                                        |
| 1411 | + $line['symbol'] == 'Balloon' || $line['symbol'] == 'Glider' ||  | 
                                                        |
| 1412 | + $line['symbol'] == 'Aircraft (small)' || $line['symbol'] == 'Helicopter' ||  | 
                                                        |
| 1413 | + $line['symbol'] == 'SUV' ||  | 
                                                        |
| 1414 | + $line['symbol'] == 'Snowmobile' ||  | 
                                                        |
| 1415 | +						$line['symbol'] == 'Mobile Satellite Station')) { | 
                                                        |
| 1416 | +					//} elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && isset($line['speed']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') { | 
                                                        |
| 1417 | 1417 |  				//    } elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') { | 
                                                        
| 1418 | 1418 | //echo '!!!!!!!!!!!!!!!! SEND !!!!!!!!!!!!!!!!!!!!'."\n";  | 
                                                        
| 1419 | 1419 | if (isset($globalTracker) && $globalTracker) $send = $TI->add($data);  | 
                                                        
| 1420 | -				    } elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident']) && isset($data['altitude'])) { | 
                                                        |
| 1420 | +					} elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident']) && isset($data['altitude'])) { | 
                                                        |
| 1421 | 1421 | if (!isset($data['altitude'])) $data['altitude'] = 0;  | 
                                                        
| 1422 | 1422 |  					$Source->deleteOldLocationByType('gs'); | 
                                                        
| 1423 | 1423 |  					if (count($Source->getLocationInfoByName($data['ident'])) > 0) { | 
                                                        
@@ -1425,11 +1425,11 @@ discard block  | 
                                                    ||
| 1425 | 1425 |  					} else { | 
                                                        
| 1426 | 1426 | $Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']);  | 
                                                        
| 1427 | 1427 | }  | 
                                                        
| 1428 | -				    } else { | 
                                                        |
| 1429 | - echo '/!\ Not added: '.$buffer."\n";  | 
                                                        |
| 1430 | - print_r($line);  | 
                                                        |
| 1431 | - }  | 
                                                        |
| 1432 | - unset($data);  | 
                                                        |
| 1428 | +					} else { | 
                                                        |
| 1429 | + echo '/!\ Not added: '.$buffer."\n";  | 
                                                        |
| 1430 | + print_r($line);  | 
                                                        |
| 1431 | + }  | 
                                                        |
| 1432 | + unset($data);  | 
                                                        |
| 1433 | 1433 | }  | 
                                                        
| 1434 | 1434 |  				elseif (is_array($line) && $globalDebug && isset($line['symbol']) && $line['symbol'] == 'Weather Station') { | 
                                                        
| 1435 | 1435 | echo '!! Weather Station not yet supported'."\n";  | 
                                                        
@@ -1445,12 +1445,12 @@ discard block  | 
                                                    ||
| 1445 | 1445 | */  | 
                                                        
| 1446 | 1446 |  				//elseif ($line == false && $globalDebug) echo 'Ignored ('.$buffer.")\n"; | 
                                                        
| 1447 | 1447 | elseif ($line == true && $globalDebug) echo '!! Failed : '.$buffer."!!\n";  | 
                                                        
| 1448 | - }  | 
                                                        |
| 1448 | + }  | 
                                                        |
| 1449 | 1449 |  			} else { | 
                                                        
| 1450 | -			    $line = explode(',', $buffer); | 
                                                        |
| 1451 | -    			    if (count($line) > 20) { | 
                                                        |
| 1452 | - $data['hex'] = $line[4];  | 
                                                        |
| 1453 | - /*  | 
                                                        |
| 1450 | +				$line = explode(',', $buffer); | 
                                                        |
| 1451 | +					if (count($line) > 20) { | 
                                                        |
| 1452 | + $data['hex'] = $line[4];  | 
                                                        |
| 1453 | + /*  | 
                                                        |
| 1454 | 1454 | $data['datetime'] = $line[6].' '.$line[7];  | 
                                                        
| 1455 | 1455 | date_default_timezone_set($globalTimezone);  | 
                                                        
| 1456 | 1456 | $datetime = new DateTime($data['datetime']);  | 
                                                        
@@ -1458,30 +1458,30 @@ discard block  | 
                                                    ||
| 1458 | 1458 |      					$data['datetime'] = $datetime->format('Y-m-d H:i:s'); | 
                                                        
| 1459 | 1459 |      					date_default_timezone_set('UTC'); | 
                                                        
| 1460 | 1460 | */  | 
                                                        
| 1461 | - // Force datetime to current UTC datetime  | 
                                                        |
| 1462 | -    				date_default_timezone_set('UTC'); | 
                                                        |
| 1463 | -    				$data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        |
| 1464 | - $data['ident'] = trim($line[10]);  | 
                                                        |
| 1465 | - $data['latitude'] = $line[14];  | 
                                                        |
| 1466 | - $data['longitude'] = $line[15];  | 
                                                        |
| 1467 | - $data['verticalrate'] = $line[16];  | 
                                                        |
| 1468 | - $data['emergency'] = $line[20];  | 
                                                        |
| 1469 | - $data['speed'] = $line[12];  | 
                                                        |
| 1470 | - $data['squawk'] = $line[17];  | 
                                                        |
| 1471 | - $data['altitude'] = $line[11];  | 
                                                        |
| 1472 | - $data['heading'] = $line[13];  | 
                                                        |
| 1473 | - $data['ground'] = $line[21];  | 
                                                        |
| 1474 | - $data['emergency'] = $line[19];  | 
                                                        |
| 1475 | - $data['format_source'] = 'sbs';  | 
                                                        |
| 1461 | + // Force datetime to current UTC datetime  | 
                                                        |
| 1462 | +					date_default_timezone_set('UTC'); | 
                                                        |
| 1463 | +					$data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        |
| 1464 | + $data['ident'] = trim($line[10]);  | 
                                                        |
| 1465 | + $data['latitude'] = $line[14];  | 
                                                        |
| 1466 | + $data['longitude'] = $line[15];  | 
                                                        |
| 1467 | + $data['verticalrate'] = $line[16];  | 
                                                        |
| 1468 | + $data['emergency'] = $line[20];  | 
                                                        |
| 1469 | + $data['speed'] = $line[12];  | 
                                                        |
| 1470 | + $data['squawk'] = $line[17];  | 
                                                        |
| 1471 | + $data['altitude'] = $line[11];  | 
                                                        |
| 1472 | + $data['heading'] = $line[13];  | 
                                                        |
| 1473 | + $data['ground'] = $line[21];  | 
                                                        |
| 1474 | + $data['emergency'] = $line[19];  | 
                                                        |
| 1475 | + $data['format_source'] = 'sbs';  | 
                                                        |
| 1476 | 1476 | if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];  | 
                                                        
| 1477 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];  | 
                                                        |
| 1477 | + if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];  | 
                                                        |
| 1478 | 1478 | if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        
| 1479 | - $data['id_source'] = $id_source;  | 
                                                        |
| 1480 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);  | 
                                                        |
| 1481 | - else $error = true;  | 
                                                        |
| 1482 | - unset($data);  | 
                                                        |
| 1483 | - } else $error = true;  | 
                                                        |
| 1484 | -			    if ($error) { | 
                                                        |
| 1479 | + $data['id_source'] = $id_source;  | 
                                                        |
| 1480 | + if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);  | 
                                                        |
| 1481 | + else $error = true;  | 
                                                        |
| 1482 | + unset($data);  | 
                                                        |
| 1483 | + } else $error = true;  | 
                                                        |
| 1484 | +				if ($error) { | 
                                                        |
| 1485 | 1485 |  				if (count($line) > 1 && ($line[0] == 'STA' || $line[0] == 'AIR' || $line[0] == 'SEL' || $line[0] == 'ID' || $line[0] == 'CLK')) {  | 
                                                        
| 1486 | 1486 | if ($globalDebug) echo "Not a message. Ignoring... \n";  | 
                                                        
| 1487 | 1487 |  				} else { | 
                                                        
@@ -1497,13 +1497,13 @@ discard block  | 
                                                    ||
| 1497 | 1497 | connect_all($sourceer);  | 
                                                        
| 1498 | 1498 | $sourceer = array();  | 
                                                        
| 1499 | 1499 | }  | 
                                                        
| 1500 | - }  | 
                                                        |
| 1500 | + }  | 
                                                        |
| 1501 | 1501 | }  | 
                                                        
| 1502 | 1502 | // Sleep for xxx microseconds  | 
                                                        
| 1503 | 1503 | if (isset($globalSBSSleep)) usleep($globalSBSSleep);  | 
                                                        
| 1504 | -		    } else { | 
                                                        |
| 1504 | +			} else { | 
                                                        |
| 1505 | 1505 |  			if ($format == 'flightgearmp') { | 
                                                        
| 1506 | - if ($globalDebug) echo "Reconnect FlightGear MP...";  | 
                                                        |
| 1506 | + if ($globalDebug) echo "Reconnect FlightGear MP...";  | 
                                                        |
| 1507 | 1507 | //@socket_close($r);  | 
                                                        
| 1508 | 1508 | sleep($globalMinFetch);  | 
                                                        
| 1509 | 1509 | $sourcefg[$nb] = $globalSources[$nb];  | 
                                                        
@@ -1512,9 +1512,9 @@ discard block  | 
                                                    ||
| 1512 | 1512 | break;  | 
                                                        
| 1513 | 1513 | |
| 1514 | 1514 |  			} elseif ($format != 'acars' && $format != 'flightgearsp') { | 
                                                        
| 1515 | - if (isset($tt[$format])) $tt[$format]++;  | 
                                                        |
| 1516 | - else $tt[$format] = 0;  | 
                                                        |
| 1517 | -			    if ($tt[$format] > 30) { | 
                                                        |
| 1515 | + if (isset($tt[$format])) $tt[$format]++;  | 
                                                        |
| 1516 | + else $tt[$format] = 0;  | 
                                                        |
| 1517 | +				if ($tt[$format] > 30) { | 
                                                        |
| 1518 | 1518 | if ($globalDebug) echo "ERROR : Reconnect ".$format."...";  | 
                                                        
| 1519 | 1519 | //@socket_close($r);  | 
                                                        
| 1520 | 1520 | sleep(2);  | 
                                                        
@@ -1525,23 +1525,23 @@ discard block  | 
                                                    ||
| 1525 | 1525 | //connect_all($globalSources);  | 
                                                        
| 1526 | 1526 | $tt[$format]=0;  | 
                                                        
| 1527 | 1527 | break;  | 
                                                        
| 1528 | - }  | 
                                                        |
| 1528 | + }  | 
                                                        |
| 1529 | + }  | 
                                                        |
| 1529 | 1530 | }  | 
                                                        
| 1530 | - }  | 
                                                        |
| 1531 | 1531 | }  | 
                                                        
| 1532 | -	    } else { | 
                                                        |
| 1532 | +		} else { | 
                                                        |
| 1533 | 1533 | $error = socket_strerror(socket_last_error());  | 
                                                        
| 1534 | 1534 |  		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) { | 
                                                        
| 1535 | 1535 | if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";  | 
                                                        
| 1536 | 1536 | if (isset($globalDebug)) echo "Restarting...\n";  | 
                                                        
| 1537 | 1537 | // Restart the script if possible  | 
                                                        
| 1538 | 1538 |  			if (is_array($sockets)) { | 
                                                        
| 1539 | - if ($globalDebug) echo "Shutdown all sockets...";  | 
                                                        |
| 1539 | + if ($globalDebug) echo "Shutdown all sockets...";  | 
                                                        |
| 1540 | 1540 | |
| 1541 | -			    foreach ($sockets as $sock) { | 
                                                        |
| 1541 | +				foreach ($sockets as $sock) { | 
                                                        |
| 1542 | 1542 | @socket_shutdown($sock,2);  | 
                                                        
| 1543 | 1543 | @socket_close($sock);  | 
                                                        
| 1544 | - }  | 
                                                        |
| 1544 | + }  | 
                                                        |
| 1545 | 1545 | |
| 1546 | 1546 | }  | 
                                                        
| 1547 | 1547 | if ($globalDebug) echo "Waiting...";  | 
                                                        
@@ -1556,15 +1556,15 @@ discard block  | 
                                                    ||
| 1556 | 1556 | if ($globalDebug) echo "Restart all connections...";  | 
                                                        
| 1557 | 1557 | connect_all($globalSources);  | 
                                                        
| 1558 | 1558 | }  | 
                                                        
| 1559 | - }  | 
                                                        |
| 1559 | + }  | 
                                                        |
| 1560 | 1560 | }  | 
                                                        
| 1561 | 1561 |  	if ($globalDaemon === false) { | 
                                                        
| 1562 | - if ($globalDebug) echo 'Check all...'."\n";  | 
                                                        |
| 1563 | - if (isset($SI)) $SI->checkAll();  | 
                                                        |
| 1564 | - if (isset($TI)) $TI->checkAll();  | 
                                                        |
| 1565 | - if (isset($MI)) $MI->checkAll();  | 
                                                        |
| 1562 | + if ($globalDebug) echo 'Check all...'."\n";  | 
                                                        |
| 1563 | + if (isset($SI)) $SI->checkAll();  | 
                                                        |
| 1564 | + if (isset($TI)) $TI->checkAll();  | 
                                                        |
| 1565 | + if (isset($MI)) $MI->checkAll();  | 
                                                        |
| 1566 | + }  | 
                                                        |
| 1566 | 1567 | }  | 
                                                        
| 1567 | - }  | 
                                                        |
| 1568 | 1568 | }  | 
                                                        
| 1569 | 1569 | |
| 1570 | 1570 | ?>  | 
                                                        
@@ -14,13 +14,17 @@ discard block  | 
                                                    ||
| 14 | 14 | require_once(dirname(__FILE__).'/../require/class.Source.php');  | 
                                                        
| 15 | 15 | require_once(dirname(__FILE__).'/../require/class.Connection.php');  | 
                                                        
| 16 | 16 | require_once(dirname(__FILE__).'/../require/class.Common.php');  | 
                                                        
| 17 | -if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');  | 
                                                        |
| 17 | +if (isset($globalTracker) && $globalTracker) { | 
                                                        |
| 18 | + require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');  | 
                                                        |
| 19 | +}  | 
                                                        |
| 18 | 20 |  if (isset($globalMarine) && $globalMarine) { | 
                                                        
| 19 | 21 | require_once(dirname(__FILE__).'/../require/class.AIS.php');  | 
                                                        
| 20 | 22 | require_once(dirname(__FILE__).'/../require/class.MarineImport.php');  | 
                                                        
| 21 | 23 | }  | 
                                                        
| 22 | 24 | |
| 23 | -if (!isset($globalDebug)) $globalDebug = FALSE;  | 
                                                        |
| 25 | +if (!isset($globalDebug)) { | 
                                                        |
| 26 | + $globalDebug = FALSE;  | 
                                                        |
| 27 | +}  | 
                                                        |
| 24 | 28 | |
| 25 | 29 | // Check if schema is at latest version  | 
                                                        
| 26 | 30 | $Connection = new Connection();  | 
                                                        
@@ -55,35 +59,62 @@ discard block  | 
                                                    ||
| 55 | 59 | //elseif (isset($options['source'])) $hosts = array($options['source']);  | 
                                                        
| 56 | 60 |  if (isset($options['s'])) { | 
                                                        
| 57 | 61 | $globalSources = array();  | 
                                                        
| 58 | -    if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']); | 
                                                        |
| 59 | -    else $globalSources[] = array('host' => $options['s']); | 
                                                        |
| 60 | -} elseif (isset($options['source'])) { | 
                                                        |
| 62 | +    if (isset($options['format'])) { | 
                                                        |
| 63 | +    	$globalSources[] = array('host' => $options['s'],'format' => $options['format']); | 
                                                        |
| 64 | +    } else { | 
                                                        |
| 65 | +    	$globalSources[] = array('host' => $options['s']); | 
                                                        |
| 66 | + }  | 
                                                        |
| 67 | +    } elseif (isset($options['source'])) { | 
                                                        |
| 61 | 68 | $globalSources = array();  | 
                                                        
| 62 | -    if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']); | 
                                                        |
| 63 | -    else $globalSources[] = array('host' => $options['source']); | 
                                                        |
| 64 | -}  | 
                                                        |
| 69 | +    if (isset($options['format'])) { | 
                                                        |
| 70 | +    	$globalSources[] = array('host' => $options['source'],'format' => $options['format']); | 
                                                        |
| 71 | +    } else { | 
                                                        |
| 72 | +    	$globalSources[] = array('host' => $options['source']); | 
                                                        |
| 73 | + }  | 
                                                        |
| 74 | + }  | 
                                                        |
| 65 | 75 |  if (isset($options['aprsserverhost'])) { | 
                                                        
| 66 | 76 | $globalServerAPRS = TRUE;  | 
                                                        
| 67 | 77 | $globalServerAPRShost = $options['aprsserverhost'];  | 
                                                        
| 68 | 78 | }  | 
                                                        
| 69 | -if (isset($options['aprsserverport'])) $globalServerAPRSport = $options['aprsserverport'];  | 
                                                        |
| 70 | -if (isset($options['aprsserverssid'])) $globalServerAPRSssid = $options['aprsserverssid'];  | 
                                                        |
| 71 | -if (isset($options['aprsserverpass'])) $globalServerAPRSpass = $options['aprsserverpass'];  | 
                                                        |
| 72 | -if (isset($options['noaprsserver'])) $globalServerAPRS = FALSE;  | 
                                                        |
| 73 | -if (isset($options['nodaemon'])) $globalDaemon = FALSE;  | 
                                                        |
| 74 | -if (isset($options['server'])) $globalServer = TRUE;  | 
                                                        |
| 75 | -if (isset($options['idsource'])) $id_source = $options['idsource'];  | 
                                                        |
| 76 | -else $id_source = 1;  | 
                                                        |
| 79 | +if (isset($options['aprsserverport'])) { | 
                                                        |
| 80 | + $globalServerAPRSport = $options['aprsserverport'];  | 
                                                        |
| 81 | +}  | 
                                                        |
| 82 | +if (isset($options['aprsserverssid'])) { | 
                                                        |
| 83 | + $globalServerAPRSssid = $options['aprsserverssid'];  | 
                                                        |
| 84 | +}  | 
                                                        |
| 85 | +if (isset($options['aprsserverpass'])) { | 
                                                        |
| 86 | + $globalServerAPRSpass = $options['aprsserverpass'];  | 
                                                        |
| 87 | +}  | 
                                                        |
| 88 | +if (isset($options['noaprsserver'])) { | 
                                                        |
| 89 | + $globalServerAPRS = FALSE;  | 
                                                        |
| 90 | +}  | 
                                                        |
| 91 | +if (isset($options['nodaemon'])) { | 
                                                        |
| 92 | + $globalDaemon = FALSE;  | 
                                                        |
| 93 | +}  | 
                                                        |
| 94 | +if (isset($options['server'])) { | 
                                                        |
| 95 | + $globalServer = TRUE;  | 
                                                        |
| 96 | +}  | 
                                                        |
| 97 | +if (isset($options['idsource'])) { | 
                                                        |
| 98 | + $id_source = $options['idsource'];  | 
                                                        |
| 99 | +} else { | 
                                                        |
| 100 | + $id_source = 1;  | 
                                                        |
| 101 | +}  | 
                                                        |
| 77 | 102 |  if (isset($globalServer) && $globalServer) { | 
                                                        
| 78 | - if ($globalDebug) echo "Using Server Mode\n";  | 
                                                        |
| 103 | +    if ($globalDebug) { | 
                                                        |
| 104 | + echo "Using Server Mode\n";  | 
                                                        |
| 105 | + }  | 
                                                        |
| 79 | 106 | $SI=new SpotterServer();  | 
                                                        
| 80 | 107 | /*  | 
                                                        
| 81 | 108 | require_once(dirname(__FILE__).'/../require/class.APRS.php');  | 
                                                        
| 82 | 109 | $SI = new adsb2aprs();  | 
                                                        
| 83 | 110 | $SI->connect();  | 
                                                        
| 84 | 111 | */  | 
                                                        
| 85 | -} else $SI=new SpotterImport($Connection->db);  | 
                                                        |
| 86 | -if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db);  | 
                                                        |
| 112 | +} else { | 
                                                        |
| 113 | + $SI=new SpotterImport($Connection->db);  | 
                                                        |
| 114 | +}  | 
                                                        |
| 115 | +if (isset($globalTracker) && $globalTracker) { | 
                                                        |
| 116 | + $TI = new TrackerImport($Connection->db);  | 
                                                        |
| 117 | +}  | 
                                                        |
| 87 | 118 |  if (isset($globalMarine) && $globalMarine) { | 
                                                        
| 88 | 119 | $AIS = new AIS();  | 
                                                        
| 89 | 120 | $MI = new MarineImport($Connection->db);  | 
                                                        
@@ -106,7 +137,9 @@ discard block  | 
                                                    ||
| 106 | 137 | }  | 
                                                        
| 107 | 138 | |
| 108 | 139 | // let's try and connect  | 
                                                        
| 109 | -if ($globalDebug) echo "Connecting...\n";  | 
                                                        |
| 140 | +if ($globalDebug) { | 
                                                        |
| 141 | + echo "Connecting...\n";  | 
                                                        |
| 142 | +}  | 
                                                        |
| 110 | 143 | $use_aprs = false;  | 
                                                        
| 111 | 144 | $aprs_full = false;  | 
                                                        
| 112 | 145 | $reset = 0;  | 
                                                        
@@ -115,7 +148,9 @@ discard block  | 
                                                    ||
| 115 | 148 | //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;  | 
                                                        
| 116 | 149 | global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;  | 
                                                        
| 117 | 150 | $reset++;  | 
                                                        
| 118 | - if ($globalDebug) echo 'Connect to all...'."\n";  | 
                                                        |
| 151 | +    if ($globalDebug) { | 
                                                        |
| 152 | + echo 'Connect to all...'."\n";  | 
                                                        |
| 153 | + }  | 
                                                        |
| 119 | 154 |      foreach ($hosts as $id => $value) { | 
                                                        
| 120 | 155 | $host = $value['host'];  | 
                                                        
| 121 | 156 | $globalSources[$id]['last_exec'] = 0;  | 
                                                        
@@ -125,22 +160,30 @@ discard block  | 
                                                    ||
| 125 | 160 | //$formats[$id] = 'deltadbtxt';  | 
                                                        
| 126 | 161 | $globalSources[$id]['format'] = 'deltadbtxt';  | 
                                                        
| 127 | 162 | //$last_exec['deltadbtxt'] = 0;  | 
                                                        
| 128 | -        	if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n"; | 
                                                        |
| 163 | +        	if ($globalDebug) { | 
                                                        |
| 164 | +        		echo "Connect to deltadb source (".$host.")...\n"; | 
                                                        |
| 165 | + }  | 
                                                        |
| 129 | 166 |              } else if (preg_match('/vatsim-data.txt$/i',$host)) { | 
                                                        
| 130 | 167 | //$formats[$id] = 'vatsimtxt';  | 
                                                        
| 131 | 168 | $globalSources[$id]['format'] = 'vatsimtxt';  | 
                                                        
| 132 | 169 | //$last_exec['vatsimtxt'] = 0;  | 
                                                        
| 133 | -        	if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n"; | 
                                                        |
| 170 | +        	if ($globalDebug) { | 
                                                        |
| 171 | +        		echo "Connect to vatsim source (".$host.")...\n"; | 
                                                        |
| 172 | + }  | 
                                                        |
| 134 | 173 |      	    } else if (preg_match('/aircraftlist.json$/i',$host)) { | 
                                                        
| 135 | 174 | //$formats[$id] = 'aircraftlistjson';  | 
                                                        
| 136 | 175 | $globalSources[$id]['format'] = 'aircraftlistjson';  | 
                                                        
| 137 | 176 | //$last_exec['aircraftlistjson'] = 0;  | 
                                                        
| 138 | -        	if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n"; | 
                                                        |
| 177 | +        	if ($globalDebug) { | 
                                                        |
| 178 | +        		echo "Connect to aircraftlist.json source (".$host.")...\n"; | 
                                                        |
| 179 | + }  | 
                                                        |
| 139 | 180 |      	    } else if (preg_match('/opensky/i',$host)) { | 
                                                        
| 140 | 181 | //$formats[$id] = 'aircraftlistjson';  | 
                                                        
| 141 | 182 | $globalSources[$id]['format'] = 'opensky';  | 
                                                        
| 142 | 183 | //$last_exec['aircraftlistjson'] = 0;  | 
                                                        
| 143 | -        	if ($globalDebug) echo "Connect to opensky source (".$host.")...\n"; | 
                                                        |
| 184 | +        	if ($globalDebug) { | 
                                                        |
| 185 | +        		echo "Connect to opensky source (".$host.")...\n"; | 
                                                        |
| 186 | + }  | 
                                                        |
| 144 | 187 | /*  | 
                                                        
| 145 | 188 | // Disabled for now, site change source format  | 
                                                        
| 146 | 189 |      	    } else if (preg_match('/radarvirtuel.com\/list_aircrafts$/i',$host)) { | 
                                                        
@@ -157,7 +200,9 @@ discard block  | 
                                                    ||
| 157 | 200 | //$formats[$id] = 'planeupdatefaa';  | 
                                                        
| 158 | 201 | $globalSources[$id]['format'] = 'planeupdatefaa';  | 
                                                        
| 159 | 202 | //$last_exec['planeupdatefaa'] = 0;  | 
                                                        
| 160 | -        	if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n"; | 
                                                        |
| 203 | +        	if ($globalDebug) { | 
                                                        |
| 204 | +        		echo "Connect to planeUpdateFAA.php source (".$host.")...\n"; | 
                                                        |
| 205 | + }  | 
                                                        |
| 161 | 206 |          	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { | 
                                                        
| 162 | 207 | echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";  | 
                                                        
| 163 | 208 | exit(0);  | 
                                                        
@@ -166,29 +211,41 @@ discard block  | 
                                                    ||
| 166 | 211 | //$formats[$id] = 'phpvmacars';  | 
                                                        
| 167 | 212 | $globalSources[$id]['format'] = 'phpvmacars';  | 
                                                        
| 168 | 213 | //$last_exec['phpvmacars'] = 0;  | 
                                                        
| 169 | -        	if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n"; | 
                                                        |
| 214 | +        	if ($globalDebug) { | 
                                                        |
| 215 | +        		echo "Connect to phpvmacars source (".$host.")...\n"; | 
                                                        |
| 216 | + }  | 
                                                        |
| 170 | 217 |              } else if (preg_match('/VAM-json.php$/i',$host)) { | 
                                                        
| 171 | 218 | //$formats[$id] = 'phpvmacars';  | 
                                                        
| 172 | 219 | $globalSources[$id]['format'] = 'vam';  | 
                                                        
| 173 | -        	if ($globalDebug) echo "Connect to Vam source (".$host.")...\n"; | 
                                                        |
| 220 | +        	if ($globalDebug) { | 
                                                        |
| 221 | +        		echo "Connect to Vam source (".$host.")...\n"; | 
                                                        |
| 222 | + }  | 
                                                        |
| 174 | 223 |              } else if (preg_match('/whazzup/i',$host)) { | 
                                                        
| 175 | 224 | //$formats[$id] = 'whazzup';  | 
                                                        
| 176 | 225 | $globalSources[$id]['format'] = 'whazzup';  | 
                                                        
| 177 | 226 | //$last_exec['whazzup'] = 0;  | 
                                                        
| 178 | -        	if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n"; | 
                                                        |
| 227 | +        	if ($globalDebug) { | 
                                                        |
| 228 | +        		echo "Connect to whazzup source (".$host.")...\n"; | 
                                                        |
| 229 | + }  | 
                                                        |
| 179 | 230 |              } else if (preg_match('/airwhere/i',$host)) { | 
                                                        
| 180 | 231 | $globalSources[$id]['format'] = 'airwhere';  | 
                                                        
| 181 | -        	if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n"; | 
                                                        |
| 232 | +        	if ($globalDebug) { | 
                                                        |
| 233 | +        		echo "Connect to airwhere source (".$host.")...\n"; | 
                                                        |
| 234 | + }  | 
                                                        |
| 182 | 235 |              } else if (preg_match('/recentpireps/i',$host)) { | 
                                                        
| 183 | 236 | //$formats[$id] = 'pirepsjson';  | 
                                                        
| 184 | 237 | $globalSources[$id]['format'] = 'pirepsjson';  | 
                                                        
| 185 | 238 | //$last_exec['pirepsjson'] = 0;  | 
                                                        
| 186 | -        	if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n"; | 
                                                        |
| 239 | +        	if ($globalDebug) { | 
                                                        |
| 240 | +        		echo "Connect to pirepsjson source (".$host.")...\n"; | 
                                                        |
| 241 | + }  | 
                                                        |
| 187 | 242 |              } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) { | 
                                                        
| 188 | 243 | //$formats[$id] = 'fr24json';  | 
                                                        
| 189 | 244 | $globalSources[$id]['format'] = 'fr24json';  | 
                                                        
| 190 | 245 | //$last_exec['fr24json'] = 0;  | 
                                                        
| 191 | -        	if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n"; | 
                                                        |
| 246 | +        	if ($globalDebug) { | 
                                                        |
| 247 | +        		echo "Connect to fr24 source (".$host.")...\n"; | 
                                                        |
| 248 | + }  | 
                                                        |
| 192 | 249 |          	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { | 
                                                        
| 193 | 250 | echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";  | 
                                                        
| 194 | 251 | exit(0);  | 
                                                        
@@ -197,7 +254,9 @@ discard block  | 
                                                    ||
| 197 | 254 | //$formats[$id] = 'fr24json';  | 
                                                        
| 198 | 255 | $globalSources[$id]['format'] = 'myshiptracking';  | 
                                                        
| 199 | 256 | //$last_exec['fr24json'] = 0;  | 
                                                        
| 200 | -        	if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n"; | 
                                                        |
| 257 | +        	if ($globalDebug) { | 
                                                        |
| 258 | +        		echo "Connect to myshiptracking source (".$host.")...\n"; | 
                                                        |
| 259 | + }  | 
                                                        |
| 201 | 260 |          	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { | 
                                                        
| 202 | 261 | echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";  | 
                                                        
| 203 | 262 | exit(0);  | 
                                                        
@@ -206,17 +265,24 @@ discard block  | 
                                                    ||
| 206 | 265 |              } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) { | 
                                                        
| 207 | 266 | //$formats[$id] = 'tsv';  | 
                                                        
| 208 | 267 | $globalSources[$id]['format'] = 'tsv';  | 
                                                        
| 209 | -        	if ($globalDebug) echo "Connect to tsv source (".$host.")...\n"; | 
                                                        |
| 268 | +        	if ($globalDebug) { | 
                                                        |
| 269 | +        		echo "Connect to tsv source (".$host.")...\n"; | 
                                                        |
| 270 | + }  | 
                                                        |
| 210 | 271 | }  | 
                                                        
| 211 | 272 |          } elseif (filter_var($host,FILTER_VALIDATE_URL)) { | 
                                                        
| 212 | 273 |      		if ($globalSources[$id]['format'] == 'aisnmeahttp') { | 
                                                        
| 213 | 274 | $idf = fopen($globalSources[$id]['host'],'r',false,$context);  | 
                                                        
| 214 | 275 |      		    if ($idf !== false) { | 
                                                        
| 215 | 276 | $httpfeeds[$id] = $idf;  | 
                                                        
| 216 | -        		if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n"; | 
                                                        |
| 277 | +        		if ($globalDebug) { | 
                                                        |
| 278 | +        			echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n"; | 
                                                        |
| 279 | + }  | 
                                                        |
| 280 | +    		    } elseif ($globalDebug) { | 
                                                        |
| 281 | + echo "Can't connect to ".$globalSources[$id]['host']."\n";  | 
                                                        |
| 217 | 282 | }  | 
                                                        
| 218 | - elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";  | 
                                                        |
| 219 | -    		} elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n"; | 
                                                        |
| 283 | +    		} elseif ($globalDebug) { | 
                                                        |
| 284 | +    			echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n"; | 
                                                        |
| 285 | + }  | 
                                                        |
| 220 | 286 |          } elseif (!filter_var($host,FILTER_VALIDATE_URL)) { | 
                                                        
| 221 | 287 |  	    $hostport = explode(':',$host); | 
                                                        
| 222 | 288 |  	    if (isset($hostport[1])) { | 
                                                        
@@ -256,17 +322,25 @@ discard block  | 
                                                    ||
| 256 | 322 | //$formats[$id] = 'beast';  | 
                                                        
| 257 | 323 | $globalSources[$id]['format'] = 'beast';  | 
                                                        
| 258 | 324 | //} else $formats[$id] = 'sbs';  | 
                                                        
| 259 | - } else $globalSources[$id]['format'] = 'sbs';  | 
                                                        |
| 325 | +		    } else { | 
                                                        |
| 326 | + $globalSources[$id]['format'] = 'sbs';  | 
                                                        |
| 327 | + }  | 
                                                        |
| 260 | 328 |  		    //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n"; | 
                                                        
| 261 | 329 | }  | 
                                                        
| 262 | -		if ($globalDebug) echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n"; | 
                                                        |
| 330 | +		if ($globalDebug) { | 
                                                        |
| 331 | +			echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n"; | 
                                                        |
| 332 | + }  | 
                                                        |
| 263 | 333 |              } else { | 
                                                        
| 264 | - if ($globalDebug) echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";  | 
                                                        |
| 334 | +		if ($globalDebug) { | 
                                                        |
| 335 | + echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";  | 
                                                        |
| 336 | + }  | 
                                                        |
| 265 | 337 | }  | 
                                                        
| 266 | 338 | }  | 
                                                        
| 267 | 339 | }  | 
                                                        
| 268 | 340 | }  | 
                                                        
| 269 | -if (!isset($globalMinFetch)) $globalMinFetch = 15;  | 
                                                        |
| 341 | +if (!isset($globalMinFetch)) { | 
                                                        |
| 342 | + $globalMinFetch = 15;  | 
                                                        |
| 343 | +}  | 
                                                        |
| 270 | 344 | |
| 271 | 345 | // Initialize all  | 
                                                        
| 272 | 346 | $status = array();  | 
                                                        
@@ -275,13 +349,19 @@ discard block  | 
                                                    ||
| 275 | 349 | $formats = array();  | 
                                                        
| 276 | 350 | $last_exec = array();  | 
                                                        
| 277 | 351 | $time = time();  | 
                                                        
| 278 | -if (isset($globalSourcesTimeout)) $timeout = $globalSourcesTimeOut;  | 
                                                        |
| 279 | -else if (isset($globalSBS1TimeOut)) $timeout = $globalSBS1TimeOut;  | 
                                                        |
| 280 | -else $timeout = 20;  | 
                                                        |
| 352 | +if (isset($globalSourcesTimeout)) { | 
                                                        |
| 353 | + $timeout = $globalSourcesTimeOut;  | 
                                                        |
| 354 | +} else if (isset($globalSBS1TimeOut)) { | 
                                                        |
| 355 | + $timeout = $globalSBS1TimeOut;  | 
                                                        |
| 356 | +} else { | 
                                                        |
| 357 | + $timeout = 20;  | 
                                                        |
| 358 | +}  | 
                                                        |
| 281 | 359 | $errno = '';  | 
                                                        
| 282 | 360 | $errstr='';  | 
                                                        
| 283 | 361 | |
| 284 | -if (!isset($globalDaemon)) $globalDaemon = TRUE;  | 
                                                        |
| 362 | +if (!isset($globalDaemon)) { | 
                                                        |
| 363 | + $globalDaemon = TRUE;  | 
                                                        |
| 364 | +}  | 
                                                        |
| 285 | 365 | /* Initiate connections to all the hosts simultaneously */  | 
                                                        
| 286 | 366 | //connect_all($hosts);  | 
                                                        
| 287 | 367 | //connect_all($globalSources);  | 
                                                        
@@ -310,7 +390,9 @@ discard block  | 
                                                    ||
| 310 | 390 |      if (isset($source['format']) && $source['format'] == 'aprs') { | 
                                                        
| 311 | 391 | $aprs_connect = 0;  | 
                                                        
| 312 | 392 | $use_aprs = true;  | 
                                                        
| 313 | - if (isset($source['port']) && $source['port'] == '10152') $aprs_full = true;  | 
                                                        |
| 393 | +	if (isset($source['port']) && $source['port'] == '10152') { | 
                                                        |
| 394 | + $aprs_full = true;  | 
                                                        |
| 395 | + }  | 
                                                        |
| 314 | 396 | break;  | 
                                                        
| 315 | 397 | }  | 
                                                        
| 316 | 398 | }  | 
                                                        
@@ -321,25 +403,48 @@ discard block  | 
                                                    ||
| 321 | 403 | $aprs_connect = 0;  | 
                                                        
| 322 | 404 | $aprs_keep = 120;  | 
                                                        
| 323 | 405 | $aprs_last_tx = time();  | 
                                                        
| 324 | - if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;  | 
                                                        |
| 325 | -	else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName); | 
                                                        |
| 326 | - if (isset($globalAPRSssid)) $aprs_ssid = $globalAPRSssid;  | 
                                                        |
| 327 | -	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8); | 
                                                        |
| 328 | - if (isset($globalAPRSfilter)) $aprs_filter = $globalAPRSfilter;  | 
                                                        |
| 329 | - else $aprs_filter = 'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';  | 
                                                        |
| 330 | - if ($aprs_full) $aprs_filter = '';  | 
                                                        |
| 331 | - if (isset($globalAPRSpass)) $aprs_pass = $globalAPRSpass;  | 
                                                        |
| 332 | - else $aprs_pass = '-1';  | 
                                                        |
| 406 | +	if (isset($globalAPRSversion)) { | 
                                                        |
| 407 | + $aprs_version = $globalAPRSversion;  | 
                                                        |
| 408 | +	} else { | 
                                                        |
| 409 | +		$aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName); | 
                                                        |
| 410 | + }  | 
                                                        |
| 411 | +	if (isset($globalAPRSssid)) { | 
                                                        |
| 412 | + $aprs_ssid = $globalAPRSssid;  | 
                                                        |
| 413 | +	} else { | 
                                                        |
| 414 | +		$aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8); | 
                                                        |
| 415 | + }  | 
                                                        |
| 416 | +	if (isset($globalAPRSfilter)) { | 
                                                        |
| 417 | + $aprs_filter = $globalAPRSfilter;  | 
                                                        |
| 418 | +	} else { | 
                                                        |
| 419 | + $aprs_filter = 'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';  | 
                                                        |
| 420 | + }  | 
                                                        |
| 421 | +	if ($aprs_full) { | 
                                                        |
| 422 | + $aprs_filter = '';  | 
                                                        |
| 423 | + }  | 
                                                        |
| 424 | +	if (isset($globalAPRSpass)) { | 
                                                        |
| 425 | + $aprs_pass = $globalAPRSpass;  | 
                                                        |
| 426 | +	} else { | 
                                                        |
| 427 | + $aprs_pass = '-1';  | 
                                                        |
| 428 | + }  | 
                                                        |
| 333 | 429 | |
| 334 | -	if ($aprs_filter != '') $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version} filter {$aprs_filter}\n"; | 
                                                        |
| 335 | -	else $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n"; | 
                                                        |
| 336 | -}  | 
                                                        |
| 430 | +	if ($aprs_filter != '') { | 
                                                        |
| 431 | +		$aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version} filter {$aprs_filter}\n"; | 
                                                        |
| 432 | +	} else { | 
                                                        |
| 433 | +		$aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n"; | 
                                                        |
| 434 | + }  | 
                                                        |
| 435 | + }  | 
                                                        |
| 337 | 436 | |
| 338 | 437 | // connected - lets do some work  | 
                                                        
| 339 | -if ($globalDebug) echo "Connected!\n";  | 
                                                        |
| 438 | +if ($globalDebug) { | 
                                                        |
| 439 | + echo "Connected!\n";  | 
                                                        |
| 440 | +}  | 
                                                        |
| 340 | 441 | sleep(1);  | 
                                                        
| 341 | -if ($globalDebug) echo "SCAN MODE \n\n";  | 
                                                        |
| 342 | -if (!isset($globalCronEnd)) $globalCronEnd = 60;  | 
                                                        |
| 442 | +if ($globalDebug) { | 
                                                        |
| 443 | + echo "SCAN MODE \n\n";  | 
                                                        |
| 444 | +}  | 
                                                        |
| 445 | +if (!isset($globalCronEnd)) { | 
                                                        |
| 446 | + $globalCronEnd = 60;  | 
                                                        |
| 447 | +}  | 
                                                        |
| 343 | 448 | $endtime = time()+$globalCronEnd;  | 
                                                        
| 344 | 449 | $i = 1;  | 
                                                        
| 345 | 450 | $tt = array();  | 
                                                        
@@ -353,20 +458,28 @@ discard block  | 
                                                    ||
| 353 | 458 | |
| 354 | 459 | // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time.  | 
                                                        
| 355 | 460 |  while ($i > 0) { | 
                                                        
| 356 | - if (!$globalDaemon) $i = $endtime-time();  | 
                                                        |
| 461 | +    if (!$globalDaemon) { | 
                                                        |
| 462 | + $i = $endtime-time();  | 
                                                        |
| 463 | + }  | 
                                                        |
| 357 | 464 | // Delete old ATC  | 
                                                        
| 358 | 465 |      if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) { | 
                                                        
| 359 | - if ($globalDebug) echo 'Delete old ATC...'."\n";  | 
                                                        |
| 466 | +	if ($globalDebug) { | 
                                                        |
| 467 | + echo 'Delete old ATC...'."\n";  | 
                                                        |
| 468 | + }  | 
                                                        |
| 360 | 469 | $ATC->deleteOldATC();  | 
                                                        
| 361 | 470 | }  | 
                                                        
| 362 | 471 | |
| 363 | 472 |      if (count($last_exec) == count($globalSources)) { | 
                                                        
| 364 | 473 | $max = $globalMinFetch;  | 
                                                        
| 365 | 474 |  	foreach ($last_exec as $last) { | 
                                                        
| 366 | - if ((time() - $last['last']) < $max) $max = time() - $last['last'];  | 
                                                        |
| 475 | +	    if ((time() - $last['last']) < $max) { | 
                                                        |
| 476 | + $max = time() - $last['last'];  | 
                                                        |
| 477 | + }  | 
                                                        |
| 367 | 478 | }  | 
                                                        
| 368 | 479 |  	if ($max != $globalMinFetch) { | 
                                                        
| 369 | - if ($globalDebug) echo 'Sleeping...'."\n";  | 
                                                        |
| 480 | +	    if ($globalDebug) { | 
                                                        |
| 481 | + echo 'Sleeping...'."\n";  | 
                                                        |
| 482 | + }  | 
                                                        |
| 370 | 483 | sleep($globalMinFetch-$max+2);  | 
                                                        
| 371 | 484 | }  | 
                                                        
| 372 | 485 | }  | 
                                                        
@@ -375,11 +488,15 @@ discard block  | 
                                                    ||
| 375 | 488 |      //foreach ($formats as $id => $value) { | 
                                                        
| 376 | 489 |      foreach ($globalSources as $id => $value) { | 
                                                        
| 377 | 490 |  	date_default_timezone_set('UTC'); | 
                                                        
| 378 | - if (!isset($last_exec[$id]['last'])) $last_exec[$id]['last'] = 0;  | 
                                                        |
| 491 | +	if (!isset($last_exec[$id]['last'])) { | 
                                                        |
| 492 | + $last_exec[$id]['last'] = 0;  | 
                                                        |
| 493 | + }  | 
                                                        |
| 379 | 494 |  	if ($value['format'] == 'deltadbtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { | 
                                                        
| 380 | 495 | //$buffer = $Common->getData($hosts[$id]);  | 
                                                        
| 381 | 496 | $buffer = $Common->getData($value['host']);  | 
                                                        
| 382 | - if ($buffer != '') $reset = 0;  | 
                                                        |
| 497 | +	    if ($buffer != '') { | 
                                                        |
| 498 | + $reset = 0;  | 
                                                        |
| 499 | + }  | 
                                                        |
| 383 | 500 |      	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); | 
                                                        
| 384 | 501 |  	    $buffer = explode('\n',$buffer); | 
                                                        
| 385 | 502 |  	    foreach ($buffer as $line) { | 
                                                        
@@ -388,20 +505,41 @@ discard block  | 
                                                    ||
| 388 | 505 | $data = array();  | 
                                                        
| 389 | 506 | $data['hex'] = $line[1]; // hex  | 
                                                        
| 390 | 507 | $data['ident'] = $line[2]; // ident  | 
                                                        
| 391 | - if (isset($line[3])) $data['altitude'] = $line[3]; // altitude  | 
                                                        |
| 392 | - if (isset($line[4])) $data['speed'] = $line[4]; // speed  | 
                                                        |
| 393 | - if (isset($line[5])) $data['heading'] = $line[5]; // heading  | 
                                                        |
| 394 | - if (isset($line[6])) $data['latitude'] = $line[6]; // lat  | 
                                                        |
| 395 | - if (isset($line[7])) $data['longitude'] = $line[7]; // long  | 
                                                        |
| 508 | +	            if (isset($line[3])) { | 
                                                        |
| 509 | + $data['altitude'] = $line[3];  | 
                                                        |
| 510 | + }  | 
                                                        |
| 511 | + // altitude  | 
                                                        |
| 512 | +	            if (isset($line[4])) { | 
                                                        |
| 513 | + $data['speed'] = $line[4];  | 
                                                        |
| 514 | + }  | 
                                                        |
| 515 | + // speed  | 
                                                        |
| 516 | +	            if (isset($line[5])) { | 
                                                        |
| 517 | + $data['heading'] = $line[5];  | 
                                                        |
| 518 | + }  | 
                                                        |
| 519 | + // heading  | 
                                                        |
| 520 | +	            if (isset($line[6])) { | 
                                                        |
| 521 | + $data['latitude'] = $line[6];  | 
                                                        |
| 522 | + }  | 
                                                        |
| 523 | + // lat  | 
                                                        |
| 524 | +	            if (isset($line[7])) { | 
                                                        |
| 525 | + $data['longitude'] = $line[7];  | 
                                                        |
| 526 | + }  | 
                                                        |
| 527 | + // long  | 
                                                        |
| 396 | 528 | $data['verticalrate'] = ''; // vertical rate  | 
                                                        
| 397 | 529 | //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk  | 
                                                        
| 398 | 530 | $data['emergency'] = ''; // emergency  | 
                                                        
| 399 | 531 |  		    $data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        
| 400 | 532 | $data['format_source'] = 'deltadbtxt';  | 
                                                        
| 401 | 533 | $data['id_source'] = $id_source;  | 
                                                        
| 402 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];  | 
                                                        |
| 403 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 404 | - if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];  | 
                                                        |
| 534 | +		    if (isset($value['name']) && $value['name'] != '') { | 
                                                        |
| 535 | + $data['source_name'] = $value['name'];  | 
                                                        |
| 536 | + }  | 
                                                        |
| 537 | +		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { | 
                                                        |
| 538 | + $data['noarchive'] = true;  | 
                                                        |
| 539 | + }  | 
                                                        |
| 540 | +		    if (isset($value['sourcestats'])) { | 
                                                        |
| 541 | + $data['sourcestats'] = $value['sourcestats'];  | 
                                                        |
| 542 | + }  | 
                                                        |
| 405 | 543 | $SI->add($data);  | 
                                                        
| 406 | 544 | unset($data);  | 
                                                        
| 407 | 545 | }  | 
                                                        
@@ -411,7 +549,9 @@ discard block  | 
                                                    ||
| 411 | 549 |  	    date_default_timezone_set('CET'); | 
                                                        
| 412 | 550 |  	    $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host'])); | 
                                                        
| 413 | 551 |  	    date_default_timezone_set('UTC'); | 
                                                        
| 414 | - if ($buffer != '') $reset = 0;  | 
                                                        |
| 552 | +	    if ($buffer != '') { | 
                                                        |
| 553 | + $reset = 0;  | 
                                                        |
| 554 | + }  | 
                                                        |
| 415 | 555 |      	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); | 
                                                        
| 416 | 556 |  	    $buffer = explode('\n',$buffer); | 
                                                        
| 417 | 557 |  	    foreach ($buffer as $line) { | 
                                                        
@@ -420,16 +560,36 @@ discard block  | 
                                                    ||
| 420 | 560 | $add = false;  | 
                                                        
| 421 | 561 | $ais_data = $AIS->parse_line(trim($line));  | 
                                                        
| 422 | 562 | $data = array();  | 
                                                        
| 423 | - if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];  | 
                                                        |
| 424 | - if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];  | 
                                                        |
| 425 | - if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];  | 
                                                        |
| 426 | - if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];  | 
                                                        |
| 427 | - if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];  | 
                                                        |
| 428 | - if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];  | 
                                                        |
| 429 | - if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];  | 
                                                        |
| 430 | - if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];  | 
                                                        |
| 431 | - if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];  | 
                                                        |
| 432 | - if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];  | 
                                                        |
| 563 | +		    if (isset($ais_data['ident'])) { | 
                                                        |
| 564 | + $data['ident'] = $ais_data['ident'];  | 
                                                        |
| 565 | + }  | 
                                                        |
| 566 | +		    if (isset($ais_data['mmsi'])) { | 
                                                        |
| 567 | + $data['mmsi'] = $ais_data['mmsi'];  | 
                                                        |
| 568 | + }  | 
                                                        |
| 569 | +		    if (isset($ais_data['speed'])) { | 
                                                        |
| 570 | + $data['speed'] = $ais_data['speed'];  | 
                                                        |
| 571 | + }  | 
                                                        |
| 572 | +		    if (isset($ais_data['heading'])) { | 
                                                        |
| 573 | + $data['heading'] = $ais_data['heading'];  | 
                                                        |
| 574 | + }  | 
                                                        |
| 575 | +		    if (isset($ais_data['latitude'])) { | 
                                                        |
| 576 | + $data['latitude'] = $ais_data['latitude'];  | 
                                                        |
| 577 | + }  | 
                                                        |
| 578 | +		    if (isset($ais_data['longitude'])) { | 
                                                        |
| 579 | + $data['longitude'] = $ais_data['longitude'];  | 
                                                        |
| 580 | + }  | 
                                                        |
| 581 | +		    if (isset($ais_data['status'])) { | 
                                                        |
| 582 | + $data['status'] = $ais_data['status'];  | 
                                                        |
| 583 | + }  | 
                                                        |
| 584 | +		    if (isset($ais_data['type'])) { | 
                                                        |
| 585 | + $data['type'] = $ais_data['type'];  | 
                                                        |
| 586 | + }  | 
                                                        |
| 587 | +		    if (isset($ais_data['imo'])) { | 
                                                        |
| 588 | + $data['imo'] = $ais_data['imo'];  | 
                                                        |
| 589 | + }  | 
                                                        |
| 590 | +		    if (isset($ais_data['callsign'])) { | 
                                                        |
| 591 | + $data['callsign'] = $ais_data['callsign'];  | 
                                                        |
| 592 | + }  | 
                                                        |
| 433 | 593 |  		    if (isset($ais_data['timestamp'])) { | 
                                                        
| 434 | 594 |  			$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); | 
                                                        
| 435 | 595 |  			if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) { | 
                                                        
@@ -443,8 +603,12 @@ discard block  | 
                                                    ||
| 443 | 603 | $data['format_source'] = 'aisnmeatxt';  | 
                                                        
| 444 | 604 | $data['id_source'] = $id_source;  | 
                                                        
| 445 | 605 | //print_r($data);  | 
                                                        
| 446 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 447 | - if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);  | 
                                                        |
| 606 | +		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { | 
                                                        |
| 607 | + $data['noarchive'] = true;  | 
                                                        |
| 608 | + }  | 
                                                        |
| 609 | +		    if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') { | 
                                                        |
| 610 | + $MI->add($data);  | 
                                                        |
| 611 | + }  | 
                                                        |
| 448 | 612 | unset($data);  | 
                                                        
| 449 | 613 | }  | 
                                                        
| 450 | 614 | }  | 
                                                        
@@ -464,20 +628,48 @@ discard block  | 
                                                    ||
| 464 | 628 |  			    if ($line != '') { | 
                                                        
| 465 | 629 | $ais_data = $AIS->parse_line(trim($line));  | 
                                                        
| 466 | 630 | $data = array();  | 
                                                        
| 467 | - if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];  | 
                                                        |
| 468 | - if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];  | 
                                                        |
| 469 | - if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];  | 
                                                        |
| 470 | - if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];  | 
                                                        |
| 471 | - if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];  | 
                                                        |
| 472 | - if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];  | 
                                                        |
| 473 | - if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];  | 
                                                        |
| 474 | - if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];  | 
                                                        |
| 475 | - if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];  | 
                                                        |
| 476 | - if (isset($ais_data['typeid'])) $data['type_id'] = $ais_data['typeid'];  | 
                                                        |
| 477 | - if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];  | 
                                                        |
| 478 | - if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];  | 
                                                        |
| 479 | - if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];  | 
                                                        |
| 480 | -				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); | 
                                                        |
| 631 | +				if (isset($ais_data['ident'])) { | 
                                                        |
| 632 | + $data['ident'] = $ais_data['ident'];  | 
                                                        |
| 633 | + }  | 
                                                        |
| 634 | +				if (isset($ais_data['mmsi'])) { | 
                                                        |
| 635 | + $data['mmsi'] = $ais_data['mmsi'];  | 
                                                        |
| 636 | + }  | 
                                                        |
| 637 | +				if (isset($ais_data['speed'])) { | 
                                                        |
| 638 | + $data['speed'] = $ais_data['speed'];  | 
                                                        |
| 639 | + }  | 
                                                        |
| 640 | +				if (isset($ais_data['heading'])) { | 
                                                        |
| 641 | + $data['heading'] = $ais_data['heading'];  | 
                                                        |
| 642 | + }  | 
                                                        |
| 643 | +				if (isset($ais_data['latitude'])) { | 
                                                        |
| 644 | + $data['latitude'] = $ais_data['latitude'];  | 
                                                        |
| 645 | + }  | 
                                                        |
| 646 | +				if (isset($ais_data['longitude'])) { | 
                                                        |
| 647 | + $data['longitude'] = $ais_data['longitude'];  | 
                                                        |
| 648 | + }  | 
                                                        |
| 649 | +				if (isset($ais_data['status'])) { | 
                                                        |
| 650 | + $data['status'] = $ais_data['status'];  | 
                                                        |
| 651 | + }  | 
                                                        |
| 652 | +				if (isset($ais_data['statusid'])) { | 
                                                        |
| 653 | + $data['status_id'] = $ais_data['statusid'];  | 
                                                        |
| 654 | + }  | 
                                                        |
| 655 | +				if (isset($ais_data['type'])) { | 
                                                        |
| 656 | + $data['type'] = $ais_data['type'];  | 
                                                        |
| 657 | + }  | 
                                                        |
| 658 | +				if (isset($ais_data['typeid'])) { | 
                                                        |
| 659 | + $data['type_id'] = $ais_data['typeid'];  | 
                                                        |
| 660 | + }  | 
                                                        |
| 661 | +				if (isset($ais_data['imo'])) { | 
                                                        |
| 662 | + $data['imo'] = $ais_data['imo'];  | 
                                                        |
| 663 | + }  | 
                                                        |
| 664 | +				if (isset($ais_data['callsign'])) { | 
                                                        |
| 665 | + $data['callsign'] = $ais_data['callsign'];  | 
                                                        |
| 666 | + }  | 
                                                        |
| 667 | +				if (isset($ais_data['destination'])) { | 
                                                        |
| 668 | + $data['arrival_code'] = $ais_data['destination'];  | 
                                                        |
| 669 | + }  | 
                                                        |
| 670 | +				if (isset($ais_data['eta_ts'])) { | 
                                                        |
| 671 | +					$data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); | 
                                                        |
| 672 | + }  | 
                                                        |
| 481 | 673 |  				if (isset($ais_data['timestamp'])) { | 
                                                        
| 482 | 674 |  				    $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); | 
                                                        
| 483 | 675 |  				} else { | 
                                                        
@@ -485,18 +677,27 @@ discard block  | 
                                                    ||
| 485 | 677 | }  | 
                                                        
| 486 | 678 | $data['format_source'] = 'aisnmeahttp';  | 
                                                        
| 487 | 679 | $data['id_source'] = $id_source;  | 
                                                        
| 488 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 489 | - if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);  | 
                                                        |
| 680 | +				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { | 
                                                        |
| 681 | + $data['noarchive'] = true;  | 
                                                        |
| 682 | + }  | 
                                                        |
| 683 | +				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') { | 
                                                        |
| 684 | + $MI->add($data);  | 
                                                        |
| 685 | + }  | 
                                                        |
| 490 | 686 | unset($data);  | 
                                                        
| 491 | 687 | }  | 
                                                        
| 492 | 688 | }  | 
                                                        
| 493 | 689 | }  | 
                                                        
| 494 | 690 |  		} else { | 
                                                        
| 495 | 691 | $format = $value['format'];  | 
                                                        
| 496 | - if (isset($tt[$format])) $tt[$format]++;  | 
                                                        |
| 497 | - else $tt[$format] = 0;  | 
                                                        |
| 692 | +		    if (isset($tt[$format])) { | 
                                                        |
| 693 | + $tt[$format]++;  | 
                                                        |
| 694 | +		    } else { | 
                                                        |
| 695 | + $tt[$format] = 0;  | 
                                                        |
| 696 | + }  | 
                                                        |
| 498 | 697 |  		    if ($tt[$format] > 30) { | 
                                                        
| 499 | - if ($globalDebug) echo 'Reconnect...'."\n";  | 
                                                        |
| 698 | +			if ($globalDebug) { | 
                                                        |
| 699 | + echo 'Reconnect...'."\n";  | 
                                                        |
| 700 | + }  | 
                                                        |
| 500 | 701 | sleep(2);  | 
                                                        
| 501 | 702 | $sourceeen[] = $value;  | 
                                                        
| 502 | 703 | connect_all($sourceeen);  | 
                                                        
@@ -526,7 +727,9 @@ discard block  | 
                                                    ||
| 526 | 727 |  			    $data['datetime'] = date('Y-m-d H:i:s',$line['T']); | 
                                                        
| 527 | 728 | $data['format_source'] = 'myshiptracking';  | 
                                                        
| 528 | 729 | $data['id_source'] = $id_source;  | 
                                                        
| 529 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 730 | +			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { | 
                                                        |
| 731 | + $data['noarchive'] = true;  | 
                                                        |
| 732 | + }  | 
                                                        |
| 530 | 733 | $MI->add($data);  | 
                                                        
| 531 | 734 | unset($data);  | 
                                                        
| 532 | 735 | }  | 
                                                        
@@ -546,7 +749,9 @@ discard block  | 
                                                    ||
| 546 | 749 | $data['callsign'] = $line['callsign'];  | 
                                                        
| 547 | 750 | $data['mmsi'] = $line['mmsi'];  | 
                                                        
| 548 | 751 | $data['speed'] = $line['sog'];  | 
                                                        
| 549 | - if ($line['heading'] != '511') $data['heading'] = $line['heading'];  | 
                                                        |
| 752 | +			    if ($line['heading'] != '511') { | 
                                                        |
| 753 | + $data['heading'] = $line['heading'];  | 
                                                        |
| 754 | + }  | 
                                                        |
| 550 | 755 | $data['latitude'] = $line['latitude'];  | 
                                                        
| 551 | 756 | $data['longitude'] = $line['longitude'];  | 
                                                        
| 552 | 757 | $data['type_id'] = $line['shiptype'];  | 
                                                        
@@ -554,7 +759,9 @@ discard block  | 
                                                    ||
| 554 | 759 | $data['datetime'] = $line['time'];  | 
                                                        
| 555 | 760 | $data['format_source'] = 'boatbeaconapp';  | 
                                                        
| 556 | 761 | $data['id_source'] = $id_source;  | 
                                                        
| 557 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 762 | +			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { | 
                                                        |
| 763 | + $data['noarchive'] = true;  | 
                                                        |
| 764 | + }  | 
                                                        |
| 558 | 765 | $MI->add($data);  | 
                                                        
| 559 | 766 | unset($data);  | 
                                                        
| 560 | 767 | }  | 
                                                        
@@ -570,22 +777,44 @@ discard block  | 
                                                    ||
| 570 | 777 |  		if (isset($all_data['features'][0]['id'])) { | 
                                                        
| 571 | 778 |  		    foreach ($all_data['features'] as $line) { | 
                                                        
| 572 | 779 | $data = array();  | 
                                                        
| 573 | - if (isset($line['properties']['name'])) $data['ident'] = $line['properties']['name'];  | 
                                                        |
| 574 | - if (isset($line['properties']['callsign'])) $data['callsign'] = $line['properties']['callsign'];  | 
                                                        |
| 575 | - if (isset($line['properties']['mmsi'])) $data['mmsi'] = $line['properties']['mmsi'];  | 
                                                        |
| 576 | - if (isset($line['properties']['imo'])) $data['mmsi'] = $line['properties']['imo'];  | 
                                                        |
| 577 | - if (isset($line['properties']['speed'])) $data['speed'] = $line['properties']['speed'];  | 
                                                        |
| 578 | - if (isset($line['properties']['heading'])) $data['heading'] = $line['properties']['heading'];  | 
                                                        |
| 780 | +			if (isset($line['properties']['name'])) { | 
                                                        |
| 781 | + $data['ident'] = $line['properties']['name'];  | 
                                                        |
| 782 | + }  | 
                                                        |
| 783 | +			if (isset($line['properties']['callsign'])) { | 
                                                        |
| 784 | + $data['callsign'] = $line['properties']['callsign'];  | 
                                                        |
| 785 | + }  | 
                                                        |
| 786 | +			if (isset($line['properties']['mmsi'])) { | 
                                                        |
| 787 | + $data['mmsi'] = $line['properties']['mmsi'];  | 
                                                        |
| 788 | + }  | 
                                                        |
| 789 | +			if (isset($line['properties']['imo'])) { | 
                                                        |
| 790 | + $data['mmsi'] = $line['properties']['imo'];  | 
                                                        |
| 791 | + }  | 
                                                        |
| 792 | +			if (isset($line['properties']['speed'])) { | 
                                                        |
| 793 | + $data['speed'] = $line['properties']['speed'];  | 
                                                        |
| 794 | + }  | 
                                                        |
| 795 | +			if (isset($line['properties']['heading'])) { | 
                                                        |
| 796 | + $data['heading'] = $line['properties']['heading'];  | 
                                                        |
| 797 | + }  | 
                                                        |
| 579 | 798 | $data['latitude'] = $line['geometry']['coordinates'][1];  | 
                                                        
| 580 | 799 | $data['longitude'] = $line['geometry']['coordinates'][0];  | 
                                                        
| 581 | - if (isset($line['properties']['vesselType'])) $data['type'] = $line['properties']['vesselType'];  | 
                                                        |
| 582 | - if (isset($line['properties']['destination'])) $data['arrival_code'] = $line['properties']['destination'];  | 
                                                        |
| 583 | - if (isset($line['properties']['eta']) && $line['properties']['eta'] != '') $data['arrival_date'] = $line['properties']['eta'];  | 
                                                        |
| 800 | +			if (isset($line['properties']['vesselType'])) { | 
                                                        |
| 801 | + $data['type'] = $line['properties']['vesselType'];  | 
                                                        |
| 802 | + }  | 
                                                        |
| 803 | +			if (isset($line['properties']['destination'])) { | 
                                                        |
| 804 | + $data['arrival_code'] = $line['properties']['destination'];  | 
                                                        |
| 805 | + }  | 
                                                        |
| 806 | +			if (isset($line['properties']['eta']) && $line['properties']['eta'] != '') { | 
                                                        |
| 807 | + $data['arrival_date'] = $line['properties']['eta'];  | 
                                                        |
| 808 | + }  | 
                                                        |
| 584 | 809 | $data['format_source'] = 'boatnerd';  | 
                                                        
| 585 | 810 | $data['id_source'] = $id_source;  | 
                                                        
| 586 | 811 |  			$data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        
| 587 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 588 | - if ($line['properties']['vesselType'] != 'Navigation Aid') $MI->add($data);  | 
                                                        |
| 812 | +			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { | 
                                                        |
| 813 | + $data['noarchive'] = true;  | 
                                                        |
| 814 | + }  | 
                                                        |
| 815 | +			if ($line['properties']['vesselType'] != 'Navigation Aid') { | 
                                                        |
| 816 | + $MI->add($data);  | 
                                                        |
| 817 | + }  | 
                                                        |
| 589 | 818 | unset($data);  | 
                                                        
| 590 | 819 | }  | 
                                                        
| 591 | 820 | }  | 
                                                        
@@ -596,7 +825,9 @@ discard block  | 
                                                    ||
| 596 | 825 | echo 'download...';  | 
                                                        
| 597 | 826 | $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');  | 
                                                        
| 598 | 827 | echo 'done !'."\n";  | 
                                                        
| 599 | - if ($buffer != '') $reset = 0;  | 
                                                        |
| 828 | +	    if ($buffer != '') { | 
                                                        |
| 829 | + $reset = 0;  | 
                                                        |
| 830 | + }  | 
                                                        |
| 600 | 831 |      	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); | 
                                                        
| 601 | 832 |  	    $buffer = explode('\n',$buffer); | 
                                                        
| 602 | 833 |  	    foreach ($buffer as $line) { | 
                                                        
@@ -621,7 +852,9 @@ discard block  | 
                                                    ||
| 621 | 852 | //$data['etaTime'] = substr($line,135,5);  | 
                                                        
| 622 | 853 | $data['format_source'] = 'shipplotter';  | 
                                                        
| 623 | 854 | $data['id_source'] = $id_source;  | 
                                                        
| 624 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 855 | +		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { | 
                                                        |
| 856 | + $data['noarchive'] = true;  | 
                                                        |
| 857 | + }  | 
                                                        |
| 625 | 858 | //print_r($data);  | 
                                                        
| 626 | 859 | echo 'Add...'."\n";  | 
                                                        
| 627 | 860 | $MI->add($data);  | 
                                                        
@@ -641,16 +874,28 @@ discard block  | 
                                                    ||
| 641 | 874 |      		    $line = explode(':', $line); | 
                                                        
| 642 | 875 |      		    if (count($line) > 30 && $line[0] != 'callsign') { | 
                                                        
| 643 | 876 | $data = array();  | 
                                                        
| 644 | - if (isset($line[37]) && $line[37] != '') $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37];  | 
                                                        |
| 645 | - else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];  | 
                                                        |
| 877 | +			if (isset($line[37]) && $line[37] != '') { | 
                                                        |
| 878 | + $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37];  | 
                                                        |
| 879 | +			} else { | 
                                                        |
| 880 | + $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];  | 
                                                        |
| 881 | + }  | 
                                                        |
| 646 | 882 | $data['pilot_id'] = $line[1];  | 
                                                        
| 647 | 883 | $data['pilot_name'] = $line[2];  | 
                                                        
| 648 | 884 | $data['hex'] = str_pad(dechex($Common->str2int($line[1])),6,'000000',STR_PAD_LEFT);  | 
                                                        
| 649 | 885 | $data['ident'] = $line[0]; // ident  | 
                                                        
| 650 | - if ($line[7] != '' && $line[7] != 0) $data['altitude'] = $line[7]; // altitude  | 
                                                        |
| 886 | +			if ($line[7] != '' && $line[7] != 0) { | 
                                                        |
| 887 | + $data['altitude'] = $line[7];  | 
                                                        |
| 888 | + }  | 
                                                        |
| 889 | + // altitude  | 
                                                        |
| 651 | 890 | $data['speed'] = $line[8]; // speed  | 
                                                        
| 652 | - if (isset($line[45])) $data['heading'] = $line[45]; // heading  | 
                                                        |
| 653 | - elseif (isset($line[38])) $data['heading'] = $line[38]; // heading  | 
                                                        |
| 891 | +			if (isset($line[45])) { | 
                                                        |
| 892 | + $data['heading'] = $line[45];  | 
                                                        |
| 893 | + }  | 
                                                        |
| 894 | + // heading  | 
                                                        |
| 895 | +			elseif (isset($line[38])) { | 
                                                        |
| 896 | + $data['heading'] = $line[38];  | 
                                                        |
| 897 | + }  | 
                                                        |
| 898 | + // heading  | 
                                                        |
| 654 | 899 | $data['latitude'] = $line[5]; // lat  | 
                                                        
| 655 | 900 | $data['longitude'] = $line[6]; // long  | 
                                                        
| 656 | 901 | $data['verticalrate'] = ''; // vertical rate  | 
                                                        
@@ -666,7 +911,9 @@ discard block  | 
                                                    ||
| 666 | 911 | $data['frequency'] = $line[4];  | 
                                                        
| 667 | 912 | $data['type'] = $line[18];  | 
                                                        
| 668 | 913 | $data['range'] = $line[19];  | 
                                                        
| 669 | - if (isset($line[35])) $data['info'] = $line[35];  | 
                                                        |
| 914 | +			if (isset($line[35])) { | 
                                                        |
| 915 | + $data['info'] = $line[35];  | 
                                                        |
| 916 | + }  | 
                                                        |
| 670 | 917 | $data['id_source'] = $id_source;  | 
                                                        
| 671 | 918 | //$data['arrival_airport_time'] = ;  | 
                                                        
| 672 | 919 |  	    		if ($line[9] != '') { | 
                                                        
@@ -680,27 +927,47 @@ discard block  | 
                                                    ||
| 680 | 927 | elseif ($value == 'vatsimtxt') $data['format_source'] = 'vatsimtxt';  | 
                                                        
| 681 | 928 | */  | 
                                                        
| 682 | 929 | $data['format_source'] = $value['format'];  | 
                                                        
| 683 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 684 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];  | 
                                                        |
| 685 | - if ($line[3] == 'PILOT') $SI->add($data);  | 
                                                        |
| 686 | -			elseif ($line[3] == 'ATC') { | 
                                                        |
| 930 | +			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { | 
                                                        |
| 931 | + $data['noarchive'] = true;  | 
                                                        |
| 932 | + }  | 
                                                        |
| 933 | +			if (isset($value['name']) && $value['name'] != '') { | 
                                                        |
| 934 | + $data['source_name'] = $value['name'];  | 
                                                        |
| 935 | + }  | 
                                                        |
| 936 | +    			if ($line[3] == 'PILOT') { | 
                                                        |
| 937 | + $SI->add($data);  | 
                                                        |
| 938 | +    			} elseif ($line[3] == 'ATC') { | 
                                                        |
| 687 | 939 | //print_r($data);  | 
                                                        
| 688 | 940 |  				$data['info'] = str_replace('^§','<br />',$data['info']); | 
                                                        
| 689 | 941 |  				$data['info'] = str_replace('&sect;','',$data['info']); | 
                                                        
| 690 | 942 | $typec = substr($data['ident'],-3);  | 
                                                        
| 691 | - if ($typec == 'APP') $data['type'] = 'Approach';  | 
                                                        |
| 692 | - elseif ($typec == 'TWR') $data['type'] = 'Tower';  | 
                                                        |
| 693 | - elseif ($typec == 'OBS') $data['type'] = 'Observer';  | 
                                                        |
| 694 | - elseif ($typec == 'GND') $data['type'] = 'Ground';  | 
                                                        |
| 695 | - elseif ($typec == 'DEL') $data['type'] = 'Delivery';  | 
                                                        |
| 696 | - elseif ($typec == 'DEP') $data['type'] = 'Departure';  | 
                                                        |
| 697 | - elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station';  | 
                                                        |
| 698 | - elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';  | 
                                                        |
| 699 | - elseif ($data['type'] == '') $data['type'] = 'Observer';  | 
                                                        |
| 700 | - if (!isset($data['source_name'])) $data['source_name'] = '';  | 
                                                        |
| 943 | +				if ($typec == 'APP') { | 
                                                        |
| 944 | + $data['type'] = 'Approach';  | 
                                                        |
| 945 | +				} elseif ($typec == 'TWR') { | 
                                                        |
| 946 | + $data['type'] = 'Tower';  | 
                                                        |
| 947 | +				} elseif ($typec == 'OBS') { | 
                                                        |
| 948 | + $data['type'] = 'Observer';  | 
                                                        |
| 949 | +				} elseif ($typec == 'GND') { | 
                                                        |
| 950 | + $data['type'] = 'Ground';  | 
                                                        |
| 951 | +				} elseif ($typec == 'DEL') { | 
                                                        |
| 952 | + $data['type'] = 'Delivery';  | 
                                                        |
| 953 | +				} elseif ($typec == 'DEP') { | 
                                                        |
| 954 | + $data['type'] = 'Departure';  | 
                                                        |
| 955 | +				} elseif ($typec == 'FSS') { | 
                                                        |
| 956 | + $data['type'] = 'Flight Service Station';  | 
                                                        |
| 957 | +				} elseif ($typec == 'CTR') { | 
                                                        |
| 958 | + $data['type'] = 'Control Radar or Centre';  | 
                                                        |
| 959 | +				} elseif ($data['type'] == '') { | 
                                                        |
| 960 | + $data['type'] = 'Observer';  | 
                                                        |
| 961 | + }  | 
                                                        |
| 962 | +				if (!isset($data['source_name'])) { | 
                                                        |
| 963 | + $data['source_name'] = '';  | 
                                                        |
| 964 | + }  | 
                                                        |
| 701 | 965 |  				if (isset($ATC)) { | 
                                                        
| 702 | - if (count($ATC->getByIdent($data['ident'],$data['format_source'])) > 0) echo $ATC->update($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);  | 
                                                        |
| 703 | - else echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);  | 
                                                        |
| 966 | +					if (count($ATC->getByIdent($data['ident'],$data['format_source'])) > 0) { | 
                                                        |
| 967 | + echo $ATC->update($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);  | 
                                                        |
| 968 | +					} else { | 
                                                        |
| 969 | + echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);  | 
                                                        |
| 970 | + }  | 
                                                        |
| 704 | 971 | }  | 
                                                        
| 705 | 972 | }  | 
                                                        
| 706 | 973 | unset($data);  | 
                                                        
@@ -722,14 +989,20 @@ discard block  | 
                                                    ||
| 722 | 989 |  			$data['datetime'] = date('Y-m-d H:i:s',strtotime((string)$line['entryTime'].' BST')); | 
                                                        
| 723 | 990 | $data['latitude'] = (float)$line['pktLatitude'];  | 
                                                        
| 724 | 991 | $data['longitude'] = (float)$line['pktLongitude'];  | 
                                                        
| 725 | - if ((float)$line['pktTrack'] != 0) $data['heading'] = (float)$line['pktTrack'];  | 
                                                        |
| 726 | - if ((int)$line['pktSpeed'] != 0) $data['speed'] = (int)$line['pktSpeed'];  | 
                                                        |
| 992 | +			if ((float)$line['pktTrack'] != 0) { | 
                                                        |
| 993 | + $data['heading'] = (float)$line['pktTrack'];  | 
                                                        |
| 994 | + }  | 
                                                        |
| 995 | +			if ((int)$line['pktSpeed'] != 0) { | 
                                                        |
| 996 | + $data['speed'] = (int)$line['pktSpeed'];  | 
                                                        |
| 997 | + }  | 
                                                        |
| 727 | 998 | $data['altitude'] = round((int)$line['pktAltitude']*3.28084);  | 
                                                        
| 728 | 999 | $data['altitude_relative'] = 'AMSL';  | 
                                                        
| 729 | 1000 | $data['pilot_id'] = (int)$line['pktPilotID'];  | 
                                                        
| 730 | 1001 | $data['aircraft_icao'] = 'PARAGLIDER';  | 
                                                        
| 731 | 1002 |  			$pilot_data = explode(',',$Common->getData('http://www.airwhere.co.uk/pilotdetails.php?pilot='.$data['pilot_id'])); | 
                                                        
| 732 | - if (isset($pilot_data[4])) $data['pilot_name'] = $pilot_data[4];  | 
                                                        |
| 1003 | +			if (isset($pilot_data[4])) { | 
                                                        |
| 1004 | + $data['pilot_name'] = $pilot_data[4];  | 
                                                        |
| 1005 | + }  | 
                                                        |
| 733 | 1006 | $data['format_source'] = $value['format'];  | 
                                                        
| 734 | 1007 | $SI->add($data);  | 
                                                        
| 735 | 1008 | unset($data);  | 
                                                        
@@ -766,27 +1039,61 @@ discard block  | 
                                                    ||
| 766 | 1039 |  		foreach ($all_data['acList'] as $line) { | 
                                                        
| 767 | 1040 | $data = array();  | 
                                                        
| 768 | 1041 | $data['hex'] = $line['Icao']; // hex  | 
                                                        
| 769 | - if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident  | 
                                                        |
| 770 | - if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude  | 
                                                        |
| 771 | - if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed  | 
                                                        |
| 772 | - if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading  | 
                                                        |
| 773 | - if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat  | 
                                                        |
| 774 | - if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long  | 
                                                        |
| 1042 | +		    if (isset($line['Call'])) { | 
                                                        |
| 1043 | + $data['ident'] = $line['Call'];  | 
                                                        |
| 1044 | + }  | 
                                                        |
| 1045 | + // ident  | 
                                                        |
| 1046 | +		    if (isset($line['Alt'])) { | 
                                                        |
| 1047 | + $data['altitude'] = $line['Alt'];  | 
                                                        |
| 1048 | + }  | 
                                                        |
| 1049 | + // altitude  | 
                                                        |
| 1050 | +		    if (isset($line['Spd'])) { | 
                                                        |
| 1051 | + $data['speed'] = $line['Spd'];  | 
                                                        |
| 1052 | + }  | 
                                                        |
| 1053 | + // speed  | 
                                                        |
| 1054 | +		    if (isset($line['Trak'])) { | 
                                                        |
| 1055 | + $data['heading'] = $line['Trak'];  | 
                                                        |
| 1056 | + }  | 
                                                        |
| 1057 | + // heading  | 
                                                        |
| 1058 | +		    if (isset($line['Lat'])) { | 
                                                        |
| 1059 | + $data['latitude'] = $line['Lat'];  | 
                                                        |
| 1060 | + }  | 
                                                        |
| 1061 | + // lat  | 
                                                        |
| 1062 | +		    if (isset($line['Long'])) { | 
                                                        |
| 1063 | + $data['longitude'] = $line['Long'];  | 
                                                        |
| 1064 | + }  | 
                                                        |
| 1065 | + // long  | 
                                                        |
| 775 | 1066 | //$data['verticalrate'] = $line['']; // verticale rate  | 
                                                        
| 776 | - if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk  | 
                                                        |
| 1067 | +		    if (isset($line['Sqk'])) { | 
                                                        |
| 1068 | + $data['squawk'] = $line['Sqk'];  | 
                                                        |
| 1069 | + }  | 
                                                        |
| 1070 | + // squawk  | 
                                                        |
| 777 | 1071 | $data['emergency'] = ''; // emergency  | 
                                                        
| 778 | - if (isset($line['Reg'])) $data['registration'] = $line['Reg'];  | 
                                                        |
| 1072 | +		    if (isset($line['Reg'])) { | 
                                                        |
| 1073 | + $data['registration'] = $line['Reg'];  | 
                                                        |
| 1074 | + }  | 
                                                        |
| 779 | 1075 | |
| 780 | -		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); | 
                                                        |
| 781 | -		    else $data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        |
| 1076 | +		    if (isset($line['PosTime'])) { | 
                                                        |
| 1077 | +		    	$data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); | 
                                                        |
| 1078 | +		    } else { | 
                                                        |
| 1079 | +		    	$data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        |
| 1080 | + }  | 
                                                        |
| 782 | 1081 | |
| 783 | 1082 |  		    //$data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        
| 784 | - if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];  | 
                                                        |
| 1083 | +		    if (isset($line['Type'])) { | 
                                                        |
| 1084 | + $data['aircraft_icao'] = $line['Type'];  | 
                                                        |
| 1085 | + }  | 
                                                        |
| 785 | 1086 | $data['format_source'] = 'aircraftlistjson';  | 
                                                        
| 786 | 1087 | $data['id_source'] = $id_source;  | 
                                                        
| 787 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];  | 
                                                        |
| 788 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 789 | - if (isset($data['latitude'])) $SI->add($data);  | 
                                                        |
| 1088 | +		    if (isset($value['name']) && $value['name'] != '') { | 
                                                        |
| 1089 | + $data['source_name'] = $value['name'];  | 
                                                        |
| 1090 | + }  | 
                                                        |
| 1091 | +		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { | 
                                                        |
| 1092 | + $data['noarchive'] = true;  | 
                                                        |
| 1093 | + }  | 
                                                        |
| 1094 | +		    if (isset($data['latitude'])) { | 
                                                        |
| 1095 | + $SI->add($data);  | 
                                                        |
| 1096 | + }  | 
                                                        |
| 790 | 1097 | unset($data);  | 
                                                        
| 791 | 1098 | }  | 
                                                        
| 792 | 1099 |  	    } elseif (is_array($all_data)) { | 
                                                        
@@ -803,12 +1110,19 @@ discard block  | 
                                                    ||
| 803 | 1110 | $data['verticalrate'] = $line['vrt']; // verticale rate  | 
                                                        
| 804 | 1111 | $data['squawk'] = $line['squawk']; // squawk  | 
                                                        
| 805 | 1112 | $data['emergency'] = ''; // emergency  | 
                                                        
| 806 | -		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); | 
                                                        |
| 807 | -		    else $data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        |
| 1113 | +		    if (isset($line['PosTime'])) { | 
                                                        |
| 1114 | +		    	$data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); | 
                                                        |
| 1115 | +		    } else { | 
                                                        |
| 1116 | +		    	$data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        |
| 1117 | + }  | 
                                                        |
| 808 | 1118 | $data['format_source'] = 'aircraftlistjson';  | 
                                                        
| 809 | 1119 | $data['id_source'] = $id_source;  | 
                                                        
| 810 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 811 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];  | 
                                                        |
| 1120 | +		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { | 
                                                        |
| 1121 | + $data['noarchive'] = true;  | 
                                                        |
| 1122 | + }  | 
                                                        |
| 1123 | +		    if (isset($value['name']) && $value['name'] != '') { | 
                                                        |
| 1124 | + $data['source_name'] = $value['name'];  | 
                                                        |
| 1125 | + }  | 
                                                        |
| 812 | 1126 | $SI->add($data);  | 
                                                        
| 813 | 1127 | unset($data);  | 
                                                        
| 814 | 1128 | }  | 
                                                        
@@ -844,8 +1158,12 @@ discard block  | 
                                                    ||
| 844 | 1158 |  		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]); | 
                                                        
| 845 | 1159 | $data['format_source'] = 'planeupdatefaa';  | 
                                                        
| 846 | 1160 | $data['id_source'] = $id_source;  | 
                                                        
| 847 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 848 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];  | 
                                                        |
| 1161 | +		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { | 
                                                        |
| 1162 | + $data['noarchive'] = true;  | 
                                                        |
| 1163 | + }  | 
                                                        |
| 1164 | +		    if (isset($value['name']) && $value['name'] != '') { | 
                                                        |
| 1165 | + $data['source_name'] = $value['name'];  | 
                                                        |
| 1166 | + }  | 
                                                        |
| 849 | 1167 | $SI->add($data);  | 
                                                        
| 850 | 1168 | unset($data);  | 
                                                        
| 851 | 1169 | }  | 
                                                        
@@ -874,7 +1192,9 @@ discard block  | 
                                                    ||
| 874 | 1192 |  		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]); | 
                                                        
| 875 | 1193 | $data['format_source'] = 'opensky';  | 
                                                        
| 876 | 1194 | $data['id_source'] = $id_source;  | 
                                                        
| 877 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 1195 | +		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { | 
                                                        |
| 1196 | + $data['noarchive'] = true;  | 
                                                        |
| 1197 | + }  | 
                                                        |
| 878 | 1198 | $SI->add($data);  | 
                                                        
| 879 | 1199 | unset($data);  | 
                                                        
| 880 | 1200 | }  | 
                                                        
@@ -886,7 +1206,9 @@ discard block  | 
                                                    ||
| 886 | 1206 | //$buffer = $Common->getData($hosts[$id]);  | 
                                                        
| 887 | 1207 | $buffer = $Common->getData($value['host']);  | 
                                                        
| 888 | 1208 | $all_data = json_decode($buffer,true);  | 
                                                        
| 889 | - if (!empty($all_data)) $reset = 0;  | 
                                                        |
| 1209 | +	    if (!empty($all_data)) { | 
                                                        |
| 1210 | + $reset = 0;  | 
                                                        |
| 1211 | + }  | 
                                                        |
| 890 | 1212 |  	    foreach ($all_data as $key => $line) { | 
                                                        
| 891 | 1213 |  		if ($key != 'full_count' && $key != 'version' && $key != 'stats') { | 
                                                        
| 892 | 1214 | $data = array();  | 
                                                        
@@ -907,8 +1229,12 @@ discard block  | 
                                                    ||
| 907 | 1229 |  		    $data['datetime'] = date('Y-m-d H:i:s'); //$line[10] | 
                                                        
| 908 | 1230 | $data['format_source'] = 'fr24json';  | 
                                                        
| 909 | 1231 | $data['id_source'] = $id_source;  | 
                                                        
| 910 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 911 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];  | 
                                                        |
| 1232 | +		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { | 
                                                        |
| 1233 | + $data['noarchive'] = true;  | 
                                                        |
| 1234 | + }  | 
                                                        |
| 1235 | +		    if (isset($value['name']) && $value['name'] != '') { | 
                                                        |
| 1236 | + $data['source_name'] = $value['name'];  | 
                                                        |
| 1237 | + }  | 
                                                        |
| 912 | 1238 | $SI->add($data);  | 
                                                        
| 913 | 1239 | unset($data);  | 
                                                        
| 914 | 1240 | }  | 
                                                        
@@ -932,24 +1258,42 @@ discard block  | 
                                                    ||
| 932 | 1258 |  		    if (isset($line['inf'])) { | 
                                                        
| 933 | 1259 | $data = array();  | 
                                                        
| 934 | 1260 | $data['hex'] = $line['inf']['ia'];  | 
                                                        
| 935 | - if (isset($line['inf']['cs'])) $data['ident'] = $line['inf']['cs']; //$line[13]  | 
                                                        |
| 1261 | +			if (isset($line['inf']['cs'])) { | 
                                                        |
| 1262 | + $data['ident'] = $line['inf']['cs'];  | 
                                                        |
| 1263 | + }  | 
                                                        |
| 1264 | + //$line[13]  | 
                                                        |
| 936 | 1265 | $data['altitude'] = round($line['inf']['al']*3.28084); // altitude  | 
                                                        
| 937 | - if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed  | 
                                                        |
| 938 | - if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading  | 
                                                        |
| 1266 | +	    		if (isset($line['inf']['gs'])) { | 
                                                        |
| 1267 | + $data['speed'] = round($line['inf']['gs']*0.539957);  | 
                                                        |
| 1268 | + }  | 
                                                        |
| 1269 | + // speed  | 
                                                        |
| 1270 | +	    		if (isset($line['inf']['tr'])) { | 
                                                        |
| 1271 | + $data['heading'] = $line['inf']['tr'];  | 
                                                        |
| 1272 | + }  | 
                                                        |
| 1273 | + // heading  | 
                                                        |
| 939 | 1274 | $data['latitude'] = $line['pt'][0]; // lat  | 
                                                        
| 940 | 1275 | $data['longitude'] = $line['pt'][1]; // long  | 
                                                        
| 941 | 1276 | //if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate  | 
                                                        
| 942 | - if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk  | 
                                                        |
| 1277 | +	    		if (isset($line['inf']['sq'])) { | 
                                                        |
| 1278 | + $data['squawk'] = $line['inf']['sq'];  | 
                                                        |
| 1279 | + }  | 
                                                        |
| 1280 | + // squawk  | 
                                                        |
| 943 | 1281 | //$data['aircraft_icao'] = $line[8];  | 
                                                        
| 944 | - if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];  | 
                                                        |
| 1282 | +	    		if (isset($line['inf']['rc'])) { | 
                                                        |
| 1283 | + $data['registration'] = $line['inf']['rc'];  | 
                                                        |
| 1284 | + }  | 
                                                        |
| 945 | 1285 | //$data['departure_airport_iata'] = $line[11];  | 
                                                        
| 946 | 1286 | //$data['arrival_airport_iata'] = $line[12];  | 
                                                        
| 947 | 1287 | //$data['emergency'] = ''; // emergency  | 
                                                        
| 948 | 1288 |  			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10] | 
                                                        
| 949 | 1289 | $data['format_source'] = 'radarvirtueljson';  | 
                                                        
| 950 | 1290 | $data['id_source'] = $id_source;  | 
                                                        
| 951 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 952 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];  | 
                                                        |
| 1291 | +			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { | 
                                                        |
| 1292 | + $data['noarchive'] = true;  | 
                                                        |
| 1293 | + }  | 
                                                        |
| 1294 | +			if (isset($value['name']) && $value['name'] != '') { | 
                                                        |
| 1295 | + $data['source_name'] = $value['name'];  | 
                                                        |
| 1296 | + }  | 
                                                        |
| 953 | 1297 | $SI->add($data);  | 
                                                        
| 954 | 1298 | unset($data);  | 
                                                        
| 955 | 1299 | }  | 
                                                        
@@ -970,30 +1314,65 @@ discard block  | 
                                                    ||
| 970 | 1314 | $data['id'] = $line['id'];  | 
                                                        
| 971 | 1315 | $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);  | 
                                                        
| 972 | 1316 | $data['ident'] = $line['callsign']; // ident  | 
                                                        
| 973 | - if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id  | 
                                                        |
| 974 | - if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name  | 
                                                        |
| 975 | - if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude  | 
                                                        |
| 976 | - if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed  | 
                                                        |
| 977 | - if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading  | 
                                                        |
| 978 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; // route  | 
                                                        |
| 1317 | +		    if (isset($line['pilotid'])) { | 
                                                        |
| 1318 | + $data['pilot_id'] = $line['pilotid'];  | 
                                                        |
| 1319 | + }  | 
                                                        |
| 1320 | + // pilot id  | 
                                                        |
| 1321 | +		    if (isset($line['name'])) { | 
                                                        |
| 1322 | + $data['pilot_name'] = $line['name'];  | 
                                                        |
| 1323 | + }  | 
                                                        |
| 1324 | + // pilot name  | 
                                                        |
| 1325 | +		    if (isset($line['alt'])) { | 
                                                        |
| 1326 | + $data['altitude'] = $line['alt'];  | 
                                                        |
| 1327 | + }  | 
                                                        |
| 1328 | + // altitude  | 
                                                        |
| 1329 | +		    if (isset($line['gs'])) { | 
                                                        |
| 1330 | + $data['speed'] = $line['gs'];  | 
                                                        |
| 1331 | + }  | 
                                                        |
| 1332 | + // speed  | 
                                                        |
| 1333 | +		    if (isset($line['heading'])) { | 
                                                        |
| 1334 | + $data['heading'] = $line['heading'];  | 
                                                        |
| 1335 | + }  | 
                                                        |
| 1336 | + // heading  | 
                                                        |
| 1337 | +		    if (isset($line['route'])) { | 
                                                        |
| 1338 | + $data['waypoints'] = $line['route'];  | 
                                                        |
| 1339 | + }  | 
                                                        |
| 1340 | + // route  | 
                                                        |
| 979 | 1341 | $data['latitude'] = $line['lat']; // lat  | 
                                                        
| 980 | 1342 | $data['longitude'] = $line['lon']; // long  | 
                                                        
| 981 | 1343 | //$data['verticalrate'] = $line['vrt']; // verticale rate  | 
                                                        
| 982 | 1344 | //$data['squawk'] = $line['squawk']; // squawk  | 
                                                        
| 983 | 1345 | //$data['emergency'] = ''; // emergency  | 
                                                        
| 984 | - if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];  | 
                                                        |
| 985 | - if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];  | 
                                                        |
| 986 | - if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];  | 
                                                        |
| 1346 | +		    if (isset($line['depicao'])) { | 
                                                        |
| 1347 | + $data['departure_airport_icao'] = $line['depicao'];  | 
                                                        |
| 1348 | + }  | 
                                                        |
| 1349 | +		    if (isset($line['deptime'])) { | 
                                                        |
| 1350 | + $data['departure_airport_time'] = $line['deptime'];  | 
                                                        |
| 1351 | + }  | 
                                                        |
| 1352 | +		    if (isset($line['arricao'])) { | 
                                                        |
| 1353 | + $data['arrival_airport_icao'] = $line['arricao'];  | 
                                                        |
| 1354 | + }  | 
                                                        |
| 987 | 1355 | //$data['arrival_airport_time'] = $line['arrtime'];  | 
                                                        
| 988 | - if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];  | 
                                                        |
| 989 | - if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];  | 
                                                        |
| 990 | - if (isset($line['atis'])) $data['info'] = $line['atis'];  | 
                                                        |
| 991 | - else $data['info'] = '';  | 
                                                        |
| 1356 | +		    if (isset($line['aircraft'])) { | 
                                                        |
| 1357 | + $data['aircraft_icao'] = $line['aircraft'];  | 
                                                        |
| 1358 | + }  | 
                                                        |
| 1359 | +		    if (isset($line['transponder'])) { | 
                                                        |
| 1360 | + $data['squawk'] = $line['transponder'];  | 
                                                        |
| 1361 | + }  | 
                                                        |
| 1362 | +		    if (isset($line['atis'])) { | 
                                                        |
| 1363 | + $data['info'] = $line['atis'];  | 
                                                        |
| 1364 | +		    } else { | 
                                                        |
| 1365 | + $data['info'] = '';  | 
                                                        |
| 1366 | + }  | 
                                                        |
| 992 | 1367 | $data['format_source'] = 'pireps';  | 
                                                        
| 993 | 1368 | $data['id_source'] = $id_source;  | 
                                                        
| 994 | 1369 |  		    $data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        
| 995 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 996 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];  | 
                                                        |
| 1370 | +		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { | 
                                                        |
| 1371 | + $data['noarchive'] = true;  | 
                                                        |
| 1372 | + }  | 
                                                        |
| 1373 | +		    if (isset($value['name']) && $value['name'] != '') { | 
                                                        |
| 1374 | + $data['source_name'] = $value['name'];  | 
                                                        |
| 1375 | + }  | 
                                                        |
| 997 | 1376 |  		    if ($line['icon'] == 'plane') { | 
                                                        
| 998 | 1377 | $SI->add($data);  | 
                                                        
| 999 | 1378 | // print_r($data);  | 
                                                        
@@ -1002,16 +1381,28 @@ discard block  | 
                                                    ||
| 1002 | 1381 |  			$data['info'] = str_replace('&sect;','',$data['info']); | 
                                                        
| 1003 | 1382 | $typec = substr($data['ident'],-3);  | 
                                                        
| 1004 | 1383 | $data['type'] = '';  | 
                                                        
| 1005 | - if ($typec == 'APP') $data['type'] = 'Approach';  | 
                                                        |
| 1006 | - elseif ($typec == 'TWR') $data['type'] = 'Tower';  | 
                                                        |
| 1007 | - elseif ($typec == 'OBS') $data['type'] = 'Observer';  | 
                                                        |
| 1008 | - elseif ($typec == 'GND') $data['type'] = 'Ground';  | 
                                                        |
| 1009 | - elseif ($typec == 'DEL') $data['type'] = 'Delivery';  | 
                                                        |
| 1010 | - elseif ($typec == 'DEP') $data['type'] = 'Departure';  | 
                                                        |
| 1011 | - elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station';  | 
                                                        |
| 1012 | - elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';  | 
                                                        |
| 1013 | - else $data['type'] = 'Observer';  | 
                                                        |
| 1014 | - if (isset($ATC)) echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']);  | 
                                                        |
| 1384 | +			if ($typec == 'APP') { | 
                                                        |
| 1385 | + $data['type'] = 'Approach';  | 
                                                        |
| 1386 | +			} elseif ($typec == 'TWR') { | 
                                                        |
| 1387 | + $data['type'] = 'Tower';  | 
                                                        |
| 1388 | +			} elseif ($typec == 'OBS') { | 
                                                        |
| 1389 | + $data['type'] = 'Observer';  | 
                                                        |
| 1390 | +			} elseif ($typec == 'GND') { | 
                                                        |
| 1391 | + $data['type'] = 'Ground';  | 
                                                        |
| 1392 | +			} elseif ($typec == 'DEL') { | 
                                                        |
| 1393 | + $data['type'] = 'Delivery';  | 
                                                        |
| 1394 | +			} elseif ($typec == 'DEP') { | 
                                                        |
| 1395 | + $data['type'] = 'Departure';  | 
                                                        |
| 1396 | +			} elseif ($typec == 'FSS') { | 
                                                        |
| 1397 | + $data['type'] = 'Flight Service Station';  | 
                                                        |
| 1398 | +			} elseif ($typec == 'CTR') { | 
                                                        |
| 1399 | + $data['type'] = 'Control Radar or Centre';  | 
                                                        |
| 1400 | +			} else { | 
                                                        |
| 1401 | + $data['type'] = 'Observer';  | 
                                                        |
| 1402 | + }  | 
                                                        |
| 1403 | +			if (isset($ATC)) { | 
                                                        |
| 1404 | + echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']);  | 
                                                        |
| 1405 | + }  | 
                                                        |
| 1015 | 1406 | }  | 
                                                        
| 1016 | 1407 | unset($data);  | 
                                                        
| 1017 | 1408 | }  | 
                                                        
@@ -1021,7 +1412,9 @@ discard block  | 
                                                    ||
| 1021 | 1412 |      	//} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) { | 
                                                        
| 1022 | 1413 |      	} elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { | 
                                                        
| 1023 | 1414 | //$buffer = $Common->getData($hosts[$id]);  | 
                                                        
| 1024 | - if ($globalDebug) echo 'Get Data...'."\n";  | 
                                                        |
| 1415 | +	    if ($globalDebug) { | 
                                                        |
| 1416 | + echo 'Get Data...'."\n";  | 
                                                        |
| 1417 | + }  | 
                                                        |
| 1025 | 1418 | $buffer = $Common->getData($value['host']);  | 
                                                        
| 1026 | 1419 | $all_data = json_decode($buffer,true);  | 
                                                        
| 1027 | 1420 |  	    if ($buffer != '' && is_array($all_data)) { | 
                                                        
@@ -1029,10 +1422,16 @@ discard block  | 
                                                    ||
| 1029 | 1422 |  		foreach ($all_data as $line) { | 
                                                        
| 1030 | 1423 | $data = array();  | 
                                                        
| 1031 | 1424 | //$data['id'] = $line['id']; // id not usable  | 
                                                        
| 1032 | - if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];  | 
                                                        |
| 1425 | +	    	    if (isset($line['pilotid'])) { | 
                                                        |
| 1426 | + $data['id'] = $line['pilotid'].$line['flightnum'];  | 
                                                        |
| 1427 | + }  | 
                                                        |
| 1033 | 1428 | $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex  | 
                                                        
| 1034 | - if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];  | 
                                                        |
| 1035 | - if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];  | 
                                                        |
| 1429 | +	    	    if (isset($line['pilotname'])) { | 
                                                        |
| 1430 | + $data['pilot_name'] = $line['pilotname'];  | 
                                                        |
| 1431 | + }  | 
                                                        |
| 1432 | +	    	    if (isset($line['pilotid'])) { | 
                                                        |
| 1433 | + $data['pilot_id'] = $line['pilotid'];  | 
                                                        |
| 1434 | + }  | 
                                                        |
| 1036 | 1435 | $data['ident'] = $line['flightnum']; // ident  | 
                                                        
| 1037 | 1436 | $data['altitude'] = $line['alt']; // altitude  | 
                                                        
| 1038 | 1437 | $data['speed'] = $line['gs']; // speed  | 
                                                        
@@ -1048,34 +1447,52 @@ discard block  | 
                                                    ||
| 1048 | 1447 | $datetime = new DateTime($line['lastupdate'],new DateTimeZone($value['timezone']));  | 
                                                        
| 1049 | 1448 |  	    		$datetime->setTimeZone(new DateTimeZone('UTC')); | 
                                                        
| 1050 | 1449 |  	    		$data['datetime'] = $datetime->format('Y-m-d H:i:s'); | 
                                                        
| 1051 | -	    	    } else $data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        |
| 1450 | +	    	    } else { | 
                                                        |
| 1451 | +	    	    	$data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        |
| 1452 | + }  | 
                                                        |
| 1052 | 1453 | $data['departure_airport_icao'] = $line['depicao'];  | 
                                                        
| 1053 | 1454 | $data['departure_airport_time'] = $line['deptime'];  | 
                                                        
| 1054 | 1455 | $data['arrival_airport_icao'] = $line['arricao'];  | 
                                                        
| 1055 | 1456 | $data['arrival_airport_time'] = $line['arrtime'];  | 
                                                        
| 1056 | 1457 | $data['registration'] = $line['aircraft'];  | 
                                                        
| 1057 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 1058 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; // route  | 
                                                        |
| 1458 | +		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { | 
                                                        |
| 1459 | + $data['noarchive'] = true;  | 
                                                        |
| 1460 | + }  | 
                                                        |
| 1461 | +		    if (isset($line['route'])) { | 
                                                        |
| 1462 | + $data['waypoints'] = $line['route'];  | 
                                                        |
| 1463 | + }  | 
                                                        |
| 1464 | + // route  | 
                                                        |
| 1059 | 1465 |  		    if (isset($line['aircraftname'])) { | 
                                                        
| 1060 | 1466 | $line['aircraftname'] = strtoupper($line['aircraftname']);  | 
                                                        
| 1061 | 1467 |  			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']); | 
                                                        
| 1062 | 1468 |  	    		$aircraft_data = explode('-',$line['aircraftname']); | 
                                                        
| 1063 | - if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];  | 
                                                        |
| 1064 | - elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];  | 
                                                        |
| 1065 | -	    		else { | 
                                                        |
| 1469 | +	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) { | 
                                                        |
| 1470 | + $data['aircraft_icao'] = $aircraft_data[0];  | 
                                                        |
| 1471 | +	    		} elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) { | 
                                                        |
| 1472 | + $data['aircraft_icao'] = $aircraft_data[1];  | 
                                                        |
| 1473 | +	    		} else { | 
                                                        |
| 1066 | 1474 |  	    		    $aircraft_data = explode(' ',$line['aircraftname']); | 
                                                        
| 1067 | -	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]); | 
                                                        |
| 1068 | -	    		    else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']); | 
                                                        |
| 1475 | +	    		    if (isset($aircraft_data[1])) { | 
                                                        |
| 1476 | +	    		    	$data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]); | 
                                                        |
| 1477 | +	    		    } else { | 
                                                        |
| 1478 | +	    		    	$data['aircraft_icao'] = str_replace('-','',$line['aircraftname']); | 
                                                        |
| 1479 | + }  | 
                                                        |
| 1069 | 1480 | }  | 
                                                        
| 1070 | 1481 | }  | 
                                                        
| 1071 | - if (isset($line['route'])) $data['waypoints'] = $line['route'];  | 
                                                        |
| 1482 | +    		    if (isset($line['route'])) { | 
                                                        |
| 1483 | + $data['waypoints'] = $line['route'];  | 
                                                        |
| 1484 | + }  | 
                                                        |
| 1072 | 1485 | $data['id_source'] = $id_source;  | 
                                                        
| 1073 | 1486 | $data['format_source'] = 'phpvmacars';  | 
                                                        
| 1074 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];  | 
                                                        |
| 1487 | +		    if (isset($value['name']) && $value['name'] != '') { | 
                                                        |
| 1488 | + $data['source_name'] = $value['name'];  | 
                                                        |
| 1489 | + }  | 
                                                        |
| 1075 | 1490 | $SI->add($data);  | 
                                                        
| 1076 | 1491 | unset($data);  | 
                                                        
| 1077 | 1492 | }  | 
                                                        
| 1078 | - if ($globalDebug) echo 'No more data...'."\n";  | 
                                                        |
| 1493 | +		if ($globalDebug) { | 
                                                        |
| 1494 | + echo 'No more data...'."\n";  | 
                                                        |
| 1495 | + }  | 
                                                        |
| 1079 | 1496 | unset($buffer);  | 
                                                        
| 1080 | 1497 | unset($all_data);  | 
                                                        
| 1081 | 1498 | }  | 
                                                        
@@ -1083,7 +1500,9 @@ discard block  | 
                                                    ||
| 1083 | 1500 | $last_exec[$id]['last'] = time();  | 
                                                        
| 1084 | 1501 |      	} elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { | 
                                                        
| 1085 | 1502 | //$buffer = $Common->getData($hosts[$id]);  | 
                                                        
| 1086 | - if ($globalDebug) echo 'Get Data...'."\n";  | 
                                                        |
| 1503 | +	    if ($globalDebug) { | 
                                                        |
| 1504 | + echo 'Get Data...'."\n";  | 
                                                        |
| 1505 | + }  | 
                                                        |
| 1087 | 1506 | $buffer = $Common->getData($value['host']);  | 
                                                        
| 1088 | 1507 | $all_data = json_decode($buffer,true);  | 
                                                        
| 1089 | 1508 |  	    if ($buffer != '' && is_array($all_data)) { | 
                                                        
@@ -1112,16 +1531,25 @@ discard block  | 
                                                    ||
| 1112 | 1531 | $data['arrival_airport_icao'] = $line['arrival'];  | 
                                                        
| 1113 | 1532 | //$data['arrival_airport_time'] = $line['arrival_time'];  | 
                                                        
| 1114 | 1533 | //$data['registration'] = $line['aircraft'];  | 
                                                        
| 1115 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; // route  | 
                                                        |
| 1534 | +		    if (isset($line['route'])) { | 
                                                        |
| 1535 | + $data['waypoints'] = $line['route'];  | 
                                                        |
| 1536 | + }  | 
                                                        |
| 1537 | + // route  | 
                                                        |
| 1116 | 1538 | $data['aircraft_icao'] = $line['plane_type'];  | 
                                                        
| 1117 | 1539 | $data['id_source'] = $id_source;  | 
                                                        
| 1118 | 1540 | $data['format_source'] = 'vam';  | 
                                                        
| 1119 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 1120 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];  | 
                                                        |
| 1541 | +		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { | 
                                                        |
| 1542 | + $data['noarchive'] = true;  | 
                                                        |
| 1543 | + }  | 
                                                        |
| 1544 | +		    if (isset($value['name']) && $value['name'] != '') { | 
                                                        |
| 1545 | + $data['source_name'] = $value['name'];  | 
                                                        |
| 1546 | + }  | 
                                                        |
| 1121 | 1547 | $SI->add($data);  | 
                                                        
| 1122 | 1548 | unset($data);  | 
                                                        
| 1123 | 1549 | }  | 
                                                        
| 1124 | - if ($globalDebug) echo 'No more data...'."\n";  | 
                                                        |
| 1550 | +		if ($globalDebug) { | 
                                                        |
| 1551 | + echo 'No more data...'."\n";  | 
                                                        |
| 1552 | + }  | 
                                                        |
| 1125 | 1553 | unset($buffer);  | 
                                                        
| 1126 | 1554 | unset($all_data);  | 
                                                        
| 1127 | 1555 | }  | 
                                                        
@@ -1129,7 +1557,9 @@ discard block  | 
                                                    ||
| 1129 | 1557 | $last_exec[$id]['last'] = time();  | 
                                                        
| 1130 | 1558 |  	//} elseif ($value == 'sbs' || $value == 'tsv' || $value == 'raw' || $value == 'aprs' || $value == 'beast') { | 
                                                        
| 1131 | 1559 |  	} elseif ($value['format'] == 'sbs' || $value['format'] == 'tsv' || $value['format'] == 'raw' || $value['format'] == 'aprs' || $value['format'] == 'famaprs' || $value['format'] == 'beast' || $value['format'] == 'flightgearmp' || $value['format'] == 'flightgearsp' || $value['format'] == 'acars' || $value['format'] == 'acarssbs3' || $value['format'] == 'ais' || $value['format'] == 'vrstcp') { | 
                                                        
| 1132 | -	    if (function_exists('pcntl_fork')) pcntl_signal_dispatch(); | 
                                                        |
| 1560 | +	    if (function_exists('pcntl_fork')) { | 
                                                        |
| 1561 | + pcntl_signal_dispatch();  | 
                                                        |
| 1562 | + }  | 
                                                        |
| 1133 | 1563 | //$last_exec[$id]['last'] = time();  | 
                                                        
| 1134 | 1564 | |
| 1135 | 1565 | //$read = array( $sockets[$id] );  | 
                                                        
@@ -1137,7 +1567,9 @@ discard block  | 
                                                    ||
| 1137 | 1567 | $write = NULL;  | 
                                                        
| 1138 | 1568 | $e = NULL;  | 
                                                        
| 1139 | 1569 | $n = socket_select($read, $write, $e, $timeout);  | 
                                                        
| 1140 | - if ($e != NULL) var_dump($e);  | 
                                                        |
| 1570 | +	    if ($e != NULL) { | 
                                                        |
| 1571 | + var_dump($e);  | 
                                                        |
| 1572 | + }  | 
                                                        |
| 1141 | 1573 |  	    if ($n > 0) { | 
                                                        
| 1142 | 1574 | $reset = 0;  | 
                                                        
| 1143 | 1575 |  		foreach ($read as $nb => $r) { | 
                                                        
@@ -1158,12 +1590,16 @@ discard block  | 
                                                    ||
| 1158 | 1590 | //$SI::del();  | 
                                                        
| 1159 | 1591 |  		    if ($format == 'vrstcp') { | 
                                                        
| 1160 | 1592 |  			$buffer = explode('},{',$buffer); | 
                                                        
| 1161 | -		    } else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer)); | 
                                                        |
| 1593 | +		    } else { | 
                                                        |
| 1594 | +		    	$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer)); | 
                                                        |
| 1595 | + }  | 
                                                        |
| 1162 | 1596 | // SBS format is CSV format  | 
                                                        
| 1163 | 1597 |  		    if ($buffer !== FALSE && $buffer != '') { | 
                                                        
| 1164 | 1598 | $tt[$format] = 0;  | 
                                                        
| 1165 | 1599 |  			if ($format == 'acarssbs3') { | 
                                                        
| 1166 | - if ($globalDebug) echo 'ACARS : '.$buffer."\n";  | 
                                                        |
| 1600 | +			    if ($globalDebug) { | 
                                                        |
| 1601 | + echo 'ACARS : '.$buffer."\n";  | 
                                                        |
| 1602 | + }  | 
                                                        |
| 1167 | 1603 | $ACARS->add(trim($buffer));  | 
                                                        
| 1168 | 1604 | $ACARS->deleteLiveAcarsData();  | 
                                                        
| 1169 | 1605 |  			} elseif ($format == 'raw') { | 
                                                        
@@ -1172,30 +1608,70 @@ discard block  | 
                                                    ||
| 1172 | 1608 |  			    if (is_array($data)) { | 
                                                        
| 1173 | 1609 |  				$data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        
| 1174 | 1610 | $data['format_source'] = 'raw';  | 
                                                        
| 1175 | - if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];  | 
                                                        |
| 1176 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];  | 
                                                        |
| 1177 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 1178 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);  | 
                                                        |
| 1611 | +				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') { | 
                                                        |
| 1612 | + $data['source_name'] = $globalSources[$nb]['name'];  | 
                                                        |
| 1613 | + }  | 
                                                        |
| 1614 | +				if (isset($globalSources[$nb]['sourcestats'])) { | 
                                                        |
| 1615 | + $data['sourcestats'] = $globalSources[$nb]['sourcestats'];  | 
                                                        |
| 1616 | + }  | 
                                                        |
| 1617 | +				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) { | 
                                                        |
| 1618 | + $data['noarchive'] = true;  | 
                                                        |
| 1619 | + }  | 
                                                        |
| 1620 | +				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) { | 
                                                        |
| 1621 | + $SI->add($data);  | 
                                                        |
| 1622 | + }  | 
                                                        |
| 1179 | 1623 | }  | 
                                                        
| 1180 | 1624 |  			} elseif ($format == 'ais') { | 
                                                        
| 1181 | 1625 | $ais_data = $AIS->parse_line(trim($buffer));  | 
                                                        
| 1182 | 1626 | $data = array();  | 
                                                        
| 1183 | - if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];  | 
                                                        |
| 1184 | - if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];  | 
                                                        |
| 1185 | - if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];  | 
                                                        |
| 1186 | - if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];  | 
                                                        |
| 1187 | - if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];  | 
                                                        |
| 1188 | - if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];  | 
                                                        |
| 1189 | - if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];  | 
                                                        |
| 1190 | - if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];  | 
                                                        |
| 1191 | - if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];  | 
                                                        |
| 1192 | - if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];  | 
                                                        |
| 1193 | - if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];  | 
                                                        |
| 1194 | - if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];  | 
                                                        |
| 1195 | -			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); | 
                                                        |
| 1196 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 1197 | - if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];  | 
                                                        |
| 1198 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];  | 
                                                        |
| 1627 | +			    if (isset($ais_data['ident'])) { | 
                                                        |
| 1628 | + $data['ident'] = $ais_data['ident'];  | 
                                                        |
| 1629 | + }  | 
                                                        |
| 1630 | +			    if (isset($ais_data['mmsi'])) { | 
                                                        |
| 1631 | + $data['mmsi'] = $ais_data['mmsi'];  | 
                                                        |
| 1632 | + }  | 
                                                        |
| 1633 | +			    if (isset($ais_data['speed'])) { | 
                                                        |
| 1634 | + $data['speed'] = $ais_data['speed'];  | 
                                                        |
| 1635 | + }  | 
                                                        |
| 1636 | +			    if (isset($ais_data['heading'])) { | 
                                                        |
| 1637 | + $data['heading'] = $ais_data['heading'];  | 
                                                        |
| 1638 | + }  | 
                                                        |
| 1639 | +			    if (isset($ais_data['latitude'])) { | 
                                                        |
| 1640 | + $data['latitude'] = $ais_data['latitude'];  | 
                                                        |
| 1641 | + }  | 
                                                        |
| 1642 | +			    if (isset($ais_data['longitude'])) { | 
                                                        |
| 1643 | + $data['longitude'] = $ais_data['longitude'];  | 
                                                        |
| 1644 | + }  | 
                                                        |
| 1645 | +			    if (isset($ais_data['status'])) { | 
                                                        |
| 1646 | + $data['status'] = $ais_data['status'];  | 
                                                        |
| 1647 | + }  | 
                                                        |
| 1648 | +			    if (isset($ais_data['statusid'])) { | 
                                                        |
| 1649 | + $data['status_id'] = $ais_data['statusid'];  | 
                                                        |
| 1650 | + }  | 
                                                        |
| 1651 | +			    if (isset($ais_data['type'])) { | 
                                                        |
| 1652 | + $data['type'] = $ais_data['type'];  | 
                                                        |
| 1653 | + }  | 
                                                        |
| 1654 | +			    if (isset($ais_data['imo'])) { | 
                                                        |
| 1655 | + $data['imo'] = $ais_data['imo'];  | 
                                                        |
| 1656 | + }  | 
                                                        |
| 1657 | +			    if (isset($ais_data['callsign'])) { | 
                                                        |
| 1658 | + $data['callsign'] = $ais_data['callsign'];  | 
                                                        |
| 1659 | + }  | 
                                                        |
| 1660 | +			    if (isset($ais_data['destination'])) { | 
                                                        |
| 1661 | + $data['arrival_code'] = $ais_data['destination'];  | 
                                                        |
| 1662 | + }  | 
                                                        |
| 1663 | +			    if (isset($ais_data['eta_ts'])) { | 
                                                        |
| 1664 | +			    	$data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); | 
                                                        |
| 1665 | + }  | 
                                                        |
| 1666 | +			    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) { | 
                                                        |
| 1667 | + $data['noarchive'] = true;  | 
                                                        |
| 1668 | + }  | 
                                                        |
| 1669 | +			    if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') { | 
                                                        |
| 1670 | + $data['source_name'] = $globalSources[$nb]['name'];  | 
                                                        |
| 1671 | + }  | 
                                                        |
| 1672 | +			    if (isset($globalSources[$nb]['sourcestats'])) { | 
                                                        |
| 1673 | + $data['sourcestats'] = $globalSources[$nb]['sourcestats'];  | 
                                                        |
| 1674 | + }  | 
                                                        |
| 1199 | 1675 | |
| 1200 | 1676 |  			    if (isset($ais_data['timestamp'])) { | 
                                                        
| 1201 | 1677 |  				$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); | 
                                                        
@@ -1204,7 +1680,9 @@ discard block  | 
                                                    ||
| 1204 | 1680 | }  | 
                                                        
| 1205 | 1681 | $data['format_source'] = 'aisnmea';  | 
                                                        
| 1206 | 1682 | $data['id_source'] = $id_source;  | 
                                                        
| 1207 | - if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);  | 
                                                        |
| 1683 | +			    if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') { | 
                                                        |
| 1684 | + $MI->add($data);  | 
                                                        |
| 1685 | + }  | 
                                                        |
| 1208 | 1686 | unset($data);  | 
                                                        
| 1209 | 1687 |                          } elseif ($format == 'flightgearsp') { | 
                                                        
| 1210 | 1688 | //echo $buffer."\n";  | 
                                                        
@@ -1222,12 +1700,18 @@ discard block  | 
                                                    ||
| 1222 | 1700 | $data['speed'] = round($line[5]*1.94384);  | 
                                                        
| 1223 | 1701 |  				$data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        
| 1224 | 1702 | $data['format_source'] = 'flightgearsp';  | 
                                                        
| 1225 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 1226 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);  | 
                                                        |
| 1703 | +				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) { | 
                                                        |
| 1704 | + $data['noarchive'] = true;  | 
                                                        |
| 1705 | + }  | 
                                                        |
| 1706 | +				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) { | 
                                                        |
| 1707 | + $SI->add($data);  | 
                                                        |
| 1708 | + }  | 
                                                        |
| 1227 | 1709 | //$send = @ socket_send( $r , $data_aprs , strlen($data_aprs) , 0 );  | 
                                                        
| 1228 | 1710 | }  | 
                                                        
| 1229 | 1711 |                          } elseif ($format == 'acars') { | 
                                                        
| 1230 | - if ($globalDebug) echo 'ACARS : '.$buffer."\n";  | 
                                                        |
| 1712 | +                    	    if ($globalDebug) { | 
                                                        |
| 1713 | + echo 'ACARS : '.$buffer."\n";  | 
                                                        |
| 1714 | + }  | 
                                                        |
| 1231 | 1715 | $ACARS->add(trim($buffer));  | 
                                                        
| 1232 | 1716 | socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);  | 
                                                        
| 1233 | 1717 | $ACARS->deleteLiveAcarsData();  | 
                                                        
@@ -1248,8 +1732,12 @@ discard block  | 
                                                    ||
| 1248 | 1732 | $aircraft_type = $line[10];  | 
                                                        
| 1249 | 1733 |  				    $aircraft_type = preg_split(':/:',$aircraft_type); | 
                                                        
| 1250 | 1734 | $data['aircraft_name'] = substr(end($aircraft_type),0,-4);  | 
                                                        
| 1251 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 1252 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);  | 
                                                        |
| 1735 | +				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) { | 
                                                        |
| 1736 | + $data['noarchive'] = true;  | 
                                                        |
| 1737 | + }  | 
                                                        |
| 1738 | +				    if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) { | 
                                                        |
| 1739 | + $SI->add($data);  | 
                                                        |
| 1740 | + }  | 
                                                        |
| 1253 | 1741 | }  | 
                                                        
| 1254 | 1742 | }  | 
                                                        
| 1255 | 1743 |  			} elseif ($format == 'beast') { | 
                                                        
@@ -1259,28 +1747,62 @@ discard block  | 
                                                    ||
| 1259 | 1747 |  			    foreach($buffer as $all_data) { | 
                                                        
| 1260 | 1748 |  				$line = json_decode('{'.$all_data.'}',true); | 
                                                        
| 1261 | 1749 | $data = array();  | 
                                                        
| 1262 | - if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex  | 
                                                        |
| 1263 | - if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident  | 
                                                        |
| 1264 | - if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude  | 
                                                        |
| 1265 | - if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed  | 
                                                        |
| 1266 | - if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading  | 
                                                        |
| 1267 | - if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat  | 
                                                        |
| 1268 | - if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long  | 
                                                        |
| 1750 | +				if (isset($line['Icao'])) { | 
                                                        |
| 1751 | + $data['hex'] = $line['Icao'];  | 
                                                        |
| 1752 | + }  | 
                                                        |
| 1753 | + // hex  | 
                                                        |
| 1754 | +				if (isset($line['Call'])) { | 
                                                        |
| 1755 | + $data['ident'] = $line['Call'];  | 
                                                        |
| 1756 | + }  | 
                                                        |
| 1757 | + // ident  | 
                                                        |
| 1758 | +				if (isset($line['Alt'])) { | 
                                                        |
| 1759 | + $data['altitude'] = $line['Alt'];  | 
                                                        |
| 1760 | + }  | 
                                                        |
| 1761 | + // altitude  | 
                                                        |
| 1762 | +				if (isset($line['Spd'])) { | 
                                                        |
| 1763 | + $data['speed'] = $line['Spd'];  | 
                                                        |
| 1764 | + }  | 
                                                        |
| 1765 | + // speed  | 
                                                        |
| 1766 | +				if (isset($line['Trak'])) { | 
                                                        |
| 1767 | + $data['heading'] = $line['Trak'];  | 
                                                        |
| 1768 | + }  | 
                                                        |
| 1769 | + // heading  | 
                                                        |
| 1770 | +				if (isset($line['Lat'])) { | 
                                                        |
| 1771 | + $data['latitude'] = $line['Lat'];  | 
                                                        |
| 1772 | + }  | 
                                                        |
| 1773 | + // lat  | 
                                                        |
| 1774 | +				if (isset($line['Long'])) { | 
                                                        |
| 1775 | + $data['longitude'] = $line['Long'];  | 
                                                        |
| 1776 | + }  | 
                                                        |
| 1777 | + // long  | 
                                                        |
| 1269 | 1778 | //$data['verticalrate'] = $line['']; // verticale rate  | 
                                                        
| 1270 | - if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk  | 
                                                        |
| 1779 | +				if (isset($line['Sqk'])) { | 
                                                        |
| 1780 | + $data['squawk'] = $line['Sqk'];  | 
                                                        |
| 1781 | + }  | 
                                                        |
| 1782 | + // squawk  | 
                                                        |
| 1271 | 1783 | $data['emergency'] = ''; // emergency  | 
                                                        
| 1272 | - if (isset($line['Reg'])) $data['registration'] = $line['Reg'];  | 
                                                        |
| 1784 | +				if (isset($line['Reg'])) { | 
                                                        |
| 1785 | + $data['registration'] = $line['Reg'];  | 
                                                        |
| 1786 | + }  | 
                                                        |
| 1273 | 1787 | /*  | 
                                                        
| 1274 | 1788 |  				if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',$line['PosTime']/1000); | 
                                                        
| 1275 | 1789 |  				else $data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        
| 1276 | 1790 | */  | 
                                                        
| 1277 | 1791 |  				$data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        
| 1278 | - if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];  | 
                                                        |
| 1792 | +				if (isset($line['Type'])) { | 
                                                        |
| 1793 | + $data['aircraft_icao'] = $line['Type'];  | 
                                                        |
| 1794 | + }  | 
                                                        |
| 1279 | 1795 | $data['format_source'] = 'vrstcp';  | 
                                                        
| 1280 | 1796 | $data['id_source'] = $id_source;  | 
                                                        
| 1281 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 1282 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];  | 
                                                        |
| 1283 | - if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data);  | 
                                                        |
| 1797 | +				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) { | 
                                                        |
| 1798 | + $data['noarchive'] = true;  | 
                                                        |
| 1799 | + }  | 
                                                        |
| 1800 | +				if (isset($value['name']) && $value['name'] != '') { | 
                                                        |
| 1801 | + $data['source_name'] = $value['name'];  | 
                                                        |
| 1802 | + }  | 
                                                        |
| 1803 | +				if (isset($data['latitude']) && isset($data['hex'])) { | 
                                                        |
| 1804 | + $SI->add($data);  | 
                                                        |
| 1805 | + }  | 
                                                        |
| 1284 | 1806 | unset($data);  | 
                                                        
| 1285 | 1807 | }  | 
                                                        
| 1286 | 1808 |  			} elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') { | 
                                                        
@@ -1293,22 +1815,46 @@ discard block  | 
                                                    ||
| 1293 | 1815 | $data['hex'] = $lined['hexid'];  | 
                                                        
| 1294 | 1816 |      				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));; | 
                                                        
| 1295 | 1817 |      				$data['datetime'] = date('Y-m-d H:i:s');; | 
                                                        
| 1296 | - if (isset($lined['ident'])) $data['ident'] = $lined['ident'];  | 
                                                        |
| 1297 | - if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];  | 
                                                        |
| 1298 | - if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];  | 
                                                        |
| 1299 | - if (isset($lined['speed'])) $data['speed'] = $lined['speed'];  | 
                                                        |
| 1300 | - if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];  | 
                                                        |
| 1301 | - if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];  | 
                                                        |
| 1302 | - if (isset($lined['heading'])) $data['heading'] = $lined['heading'];  | 
                                                        |
| 1818 | +    				if (isset($lined['ident'])) { | 
                                                        |
| 1819 | + $data['ident'] = $lined['ident'];  | 
                                                        |
| 1820 | + }  | 
                                                        |
| 1821 | +    				if (isset($lined['lat'])) { | 
                                                        |
| 1822 | + $data['latitude'] = $lined['lat'];  | 
                                                        |
| 1823 | + }  | 
                                                        |
| 1824 | +    				if (isset($lined['lon'])) { | 
                                                        |
| 1825 | + $data['longitude'] = $lined['lon'];  | 
                                                        |
| 1826 | + }  | 
                                                        |
| 1827 | +    				if (isset($lined['speed'])) { | 
                                                        |
| 1828 | + $data['speed'] = $lined['speed'];  | 
                                                        |
| 1829 | + }  | 
                                                        |
| 1830 | +    				if (isset($lined['squawk'])) { | 
                                                        |
| 1831 | + $data['squawk'] = $lined['squawk'];  | 
                                                        |
| 1832 | + }  | 
                                                        |
| 1833 | +    				if (isset($lined['alt'])) { | 
                                                        |
| 1834 | + $data['altitude'] = $lined['alt'];  | 
                                                        |
| 1835 | + }  | 
                                                        |
| 1836 | +    				if (isset($lined['heading'])) { | 
                                                        |
| 1837 | + $data['heading'] = $lined['heading'];  | 
                                                        |
| 1838 | + }  | 
                                                        |
| 1303 | 1839 | $data['id_source'] = $id_source;  | 
                                                        
| 1304 | 1840 | $data['format_source'] = 'tsv';  | 
                                                        
| 1305 | - if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];  | 
                                                        |
| 1306 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];  | 
                                                        |
| 1307 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 1308 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);  | 
                                                        |
| 1841 | +    				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') { | 
                                                        |
| 1842 | + $data['source_name'] = $globalSources[$nb]['name'];  | 
                                                        |
| 1843 | + }  | 
                                                        |
| 1844 | +    				if (isset($globalSources[$nb]['sourcestats'])) { | 
                                                        |
| 1845 | + $data['sourcestats'] = $globalSources[$nb]['sourcestats'];  | 
                                                        |
| 1846 | + }  | 
                                                        |
| 1847 | +				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) { | 
                                                        |
| 1848 | + $data['noarchive'] = true;  | 
                                                        |
| 1849 | + }  | 
                                                        |
| 1850 | +    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) { | 
                                                        |
| 1851 | + $SI->add($data);  | 
                                                        |
| 1852 | + }  | 
                                                        |
| 1309 | 1853 | unset($lined);  | 
                                                        
| 1310 | 1854 | unset($data);  | 
                                                        
| 1311 | - } else $error = true;  | 
                                                        |
| 1855 | +    			    } else { | 
                                                        |
| 1856 | + $error = true;  | 
                                                        |
| 1857 | + }  | 
                                                        |
| 1312 | 1858 |  			} elseif ($format == 'aprs' && $use_aprs) { | 
                                                        
| 1313 | 1859 |  			    if ($aprs_connect == 0) { | 
                                                        
| 1314 | 1860 | $send = @ socket_send( $r , $aprs_login , strlen($aprs_login) , 0 );  | 
                                                        
@@ -1333,59 +1879,117 @@ discard block  | 
                                                    ||
| 1333 | 1879 | $aprs_last_tx = time();  | 
                                                        
| 1334 | 1880 | $data = array();  | 
                                                        
| 1335 | 1881 | //print_r($line);  | 
                                                        
| 1336 | - if (isset($line['address'])) $data['hex'] = $line['address'];  | 
                                                        |
| 1337 | - if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi'];  | 
                                                        |
| 1338 | - if (isset($line['imo'])) $data['imo'] = $line['imo'];  | 
                                                        |
| 1339 | - if (isset($line['squawk'])) $data['squawk'] = $line['squawk'];  | 
                                                        |
| 1340 | - if (isset($line['arrival_code'])) $data['arrical_code'] = $line['arrival_code'];  | 
                                                        |
| 1341 | - if (isset($line['arrival_date'])) $data['arrical_date'] = $line['arrival_date'];  | 
                                                        |
| 1342 | - if (isset($line['type_id'])) $data['type_id'] = $line['typeid'];  | 
                                                        |
| 1343 | - if (isset($line['status_id'])) $data['status_id'] = $line['statusid'];  | 
                                                        |
| 1344 | -				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']); | 
                                                        |
| 1345 | -				    else $data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        |
| 1882 | +				    if (isset($line['address'])) { | 
                                                        |
| 1883 | + $data['hex'] = $line['address'];  | 
                                                        |
| 1884 | + }  | 
                                                        |
| 1885 | +				    if (isset($line['mmsi'])) { | 
                                                        |
| 1886 | + $data['mmsi'] = $line['mmsi'];  | 
                                                        |
| 1887 | + }  | 
                                                        |
| 1888 | +				    if (isset($line['imo'])) { | 
                                                        |
| 1889 | + $data['imo'] = $line['imo'];  | 
                                                        |
| 1890 | + }  | 
                                                        |
| 1891 | +				    if (isset($line['squawk'])) { | 
                                                        |
| 1892 | + $data['squawk'] = $line['squawk'];  | 
                                                        |
| 1893 | + }  | 
                                                        |
| 1894 | +				    if (isset($line['arrival_code'])) { | 
                                                        |
| 1895 | + $data['arrical_code'] = $line['arrival_code'];  | 
                                                        |
| 1896 | + }  | 
                                                        |
| 1897 | +				    if (isset($line['arrival_date'])) { | 
                                                        |
| 1898 | + $data['arrical_date'] = $line['arrival_date'];  | 
                                                        |
| 1899 | + }  | 
                                                        |
| 1900 | +				    if (isset($line['type_id'])) { | 
                                                        |
| 1901 | + $data['type_id'] = $line['typeid'];  | 
                                                        |
| 1902 | + }  | 
                                                        |
| 1903 | +				    if (isset($line['status_id'])) { | 
                                                        |
| 1904 | + $data['status_id'] = $line['statusid'];  | 
                                                        |
| 1905 | + }  | 
                                                        |
| 1906 | +				    if (isset($line['timestamp'])) { | 
                                                        |
| 1907 | +				    	$data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']); | 
                                                        |
| 1908 | +				    } else { | 
                                                        |
| 1909 | +				    	$data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        |
| 1910 | + }  | 
                                                        |
| 1346 | 1911 |  				    //$data['datetime'] = date('Y-m-d H:i:s'); | 
                                                        
| 1347 | - if (isset($line['ident'])) $data['ident'] = $line['ident'];  | 
                                                        |
| 1912 | +				    if (isset($line['ident'])) { | 
                                                        |
| 1913 | + $data['ident'] = $line['ident'];  | 
                                                        |
| 1914 | + }  | 
                                                        |
| 1348 | 1915 | $data['latitude'] = $line['latitude'];  | 
                                                        
| 1349 | 1916 | $data['longitude'] = $line['longitude'];  | 
                                                        
| 1350 | 1917 | //$data['verticalrate'] = $line[16];  | 
                                                        
| 1351 | - if (isset($line['speed'])) $data['speed'] = $line['speed'];  | 
                                                        |
| 1918 | +				    if (isset($line['speed'])) { | 
                                                        |
| 1919 | + $data['speed'] = $line['speed'];  | 
                                                        |
| 1920 | + }  | 
                                                        |
| 1352 | 1921 | //else $data['speed'] = 0;  | 
                                                        
| 1353 | - if (isset($line['altitude'])) $data['altitude'] = $line['altitude'];  | 
                                                        |
| 1354 | - if (isset($line['comment'])) $data['comment'] = $line['comment'];  | 
                                                        |
| 1355 | - if (isset($line['symbol'])) $data['type'] = $line['symbol'];  | 
                                                        |
| 1356 | - if (isset($line['heading'])) $data['heading'] = $line['heading'];  | 
                                                        |
| 1922 | +				    if (isset($line['altitude'])) { | 
                                                        |
| 1923 | + $data['altitude'] = $line['altitude'];  | 
                                                        |
| 1924 | + }  | 
                                                        |
| 1925 | +				    if (isset($line['comment'])) { | 
                                                        |
| 1926 | + $data['comment'] = $line['comment'];  | 
                                                        |
| 1927 | + }  | 
                                                        |
| 1928 | +				    if (isset($line['symbol'])) { | 
                                                        |
| 1929 | + $data['type'] = $line['symbol'];  | 
                                                        |
| 1930 | + }  | 
                                                        |
| 1931 | +				    if (isset($line['heading'])) { | 
                                                        |
| 1932 | + $data['heading'] = $line['heading'];  | 
                                                        |
| 1933 | + }  | 
                                                        |
| 1357 | 1934 | //else $data['heading'] = 0;  | 
                                                        
| 1358 | - if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth'];  | 
                                                        |
| 1935 | +				    if (isset($line['stealth'])) { | 
                                                        |
| 1936 | + $data['aircraft_type'] = $line['stealth'];  | 
                                                        |
| 1937 | + }  | 
                                                        |
| 1359 | 1938 | //if (!isset($line['source_type']) && (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE))) $data['noarchive'] = true;  | 
                                                        
| 1360 | - if (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE) $data['noarchive'] = true;  | 
                                                        |
| 1361 | - elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) $data['noarchive'] = false;  | 
                                                        |
| 1362 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 1363 | - elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) $data['noarchive'] = false;  | 
                                                        |
| 1939 | +				    if (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE) { | 
                                                        |
| 1940 | + $data['noarchive'] = true;  | 
                                                        |
| 1941 | +				    } elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) { | 
                                                        |
| 1942 | + $data['noarchive'] = false;  | 
                                                        |
| 1943 | + }  | 
                                                        |
| 1944 | +				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) { | 
                                                        |
| 1945 | + $data['noarchive'] = true;  | 
                                                        |
| 1946 | +				    } elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) { | 
                                                        |
| 1947 | + $data['noarchive'] = false;  | 
                                                        |
| 1948 | + }  | 
                                                        |
| 1364 | 1949 | $data['id_source'] = $id_source;  | 
                                                        
| 1365 | - if (isset($line['format_source'])) $data['format_source'] = $line['format_source'];  | 
                                                        |
| 1366 | - else $data['format_source'] = 'aprs';  | 
                                                        |
| 1950 | +    				    if (isset($line['format_source'])) { | 
                                                        |
| 1951 | + $data['format_source'] = $line['format_source'];  | 
                                                        |
| 1952 | +    				    } else { | 
                                                        |
| 1953 | + $data['format_source'] = 'aprs';  | 
                                                        |
| 1954 | + }  | 
                                                        |
| 1367 | 1955 | $data['source_name'] = $line['source'];  | 
                                                        
| 1368 | - if (isset($line['source_type'])) $data['source_type'] = $line['source_type'];  | 
                                                        |
| 1369 | - else $data['source_type'] = 'flarm';  | 
                                                        |
| 1370 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];  | 
                                                        |
| 1956 | +				    if (isset($line['source_type'])) { | 
                                                        |
| 1957 | + $data['source_type'] = $line['source_type'];  | 
                                                        |
| 1958 | +				    } else { | 
                                                        |
| 1959 | + $data['source_type'] = 'flarm';  | 
                                                        |
| 1960 | + }  | 
                                                        |
| 1961 | +    				    if (isset($globalSources[$nb]['sourcestats'])) { | 
                                                        |
| 1962 | + $data['sourcestats'] = $globalSources[$nb]['sourcestats'];  | 
                                                        |
| 1963 | + }  | 
                                                        |
| 1371 | 1964 |  				    $currentdate = date('Y-m-d H:i:s'); | 
                                                        
| 1372 | 1965 | $aprsdate = strtotime($data['datetime']);  | 
                                                        
| 1373 | - if ($data['source_type'] != 'modes' && $data['source_type'] != 'ais') $data['altitude_relative'] = 'AMSL';  | 
                                                        |
| 1966 | +				    if ($data['source_type'] != 'modes' && $data['source_type'] != 'ais') { | 
                                                        |
| 1967 | + $data['altitude_relative'] = 'AMSL';  | 
                                                        |
| 1968 | + }  | 
                                                        |
| 1374 | 1969 | // Accept data if time <= system time + 20s  | 
                                                        
| 1375 | 1970 |  				    //if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) { | 
                                                        
| 1376 | 1971 |  				    if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) { | 
                                                        
| 1377 | 1972 | $send = $SI->add($data);  | 
                                                        
| 1378 | 1973 |  				    } elseif ($data['source_type'] == 'ais') { | 
                                                        
| 1379 | - if (isset($globalMarine) && $globalMarine) $send = $MI->add($data);  | 
                                                        |
| 1974 | +					if (isset($globalMarine) && $globalMarine) { | 
                                                        |
| 1975 | + $send = $MI->add($data);  | 
                                                        |
| 1976 | + }  | 
                                                        |
| 1380 | 1977 |  				    } elseif (isset($line['stealth'])) { | 
                                                        
| 1381 | - if ($line['stealth'] != 0) echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";  | 
                                                        |
| 1382 | - else echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n";  | 
                                                        |
| 1978 | +					if ($line['stealth'] != 0) { | 
                                                        |
| 1979 | + echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";  | 
                                                        |
| 1980 | +					} else { | 
                                                        |
| 1981 | + echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n";  | 
                                                        |
| 1982 | + }  | 
                                                        |
| 1383 | 1983 | } elseif (isset($globalAircraft) && $globalAircraft && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (  | 
                                                        
| 1384 | 1984 | //$line['symbol'] == 'Balloon' ||  | 
                                                        
| 1385 | 1985 | $line['symbol'] == 'Glider' ||  | 
                                                        
| 1386 | 1986 |  					    $line['symbol'] == 'Aircraft (small)' || $line['symbol'] == 'Helicopter')) { | 
                                                        
| 1387 | - if ($line['symbol'] == 'Ballon') $data['aircraft_icao'] = 'BALL';  | 
                                                        |
| 1388 | - if ($line['symbol'] == 'Glider') $data['aircraft_icao'] = 'PARAGLIDER';  | 
                                                        |
| 1987 | +					    if ($line['symbol'] == 'Ballon') { | 
                                                        |
| 1988 | + $data['aircraft_icao'] = 'BALL';  | 
                                                        |
| 1989 | + }  | 
                                                        |
| 1990 | +					    if ($line['symbol'] == 'Glider') { | 
                                                        |
| 1991 | + $data['aircraft_icao'] = 'PARAGLIDER';  | 
                                                        |
| 1992 | + }  | 
                                                        |
| 1389 | 1993 | $send = $SI->add($data);  | 
                                                        
| 1390 | 1994 | } elseif (isset($globalMarine) && $globalMarine && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (  | 
                                                        
| 1391 | 1995 | $line['symbol'] == 'Yacht (Sail)' ||  | 
                                                        
@@ -1416,9 +2020,13 @@ discard block  | 
                                                    ||
| 1416 | 2020 |  				    //} elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && isset($line['speed']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') { | 
                                                        
| 1417 | 2021 |  				//    } elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') { | 
                                                        
| 1418 | 2022 | //echo '!!!!!!!!!!!!!!!! SEND !!!!!!!!!!!!!!!!!!!!'."\n";  | 
                                                        
| 1419 | - if (isset($globalTracker) && $globalTracker) $send = $TI->add($data);  | 
                                                        |
| 2023 | +					if (isset($globalTracker) && $globalTracker) { | 
                                                        |
| 2024 | + $send = $TI->add($data);  | 
                                                        |
| 2025 | + }  | 
                                                        |
| 1420 | 2026 |  				    } elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident']) && isset($data['altitude'])) { | 
                                                        
| 1421 | - if (!isset($data['altitude'])) $data['altitude'] = 0;  | 
                                                        |
| 2027 | +					if (!isset($data['altitude'])) { | 
                                                        |
| 2028 | + $data['altitude'] = 0;  | 
                                                        |
| 2029 | + }  | 
                                                        |
| 1422 | 2030 |  					$Source->deleteOldLocationByType('gs'); | 
                                                        
| 1423 | 2031 |  					if (count($Source->getLocationInfoByName($data['ident'])) > 0) { | 
                                                        
| 1424 | 2032 | $Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']);  | 
                                                        
@@ -1430,12 +2038,9 @@ discard block  | 
                                                    ||
| 1430 | 2038 | print_r($line);  | 
                                                        
| 1431 | 2039 | }  | 
                                                        
| 1432 | 2040 | unset($data);  | 
                                                        
| 1433 | - }  | 
                                                        |
| 1434 | -				elseif (is_array($line) && $globalDebug && isset($line['symbol']) && $line['symbol'] == 'Weather Station') { | 
                                                        |
| 2041 | +				} elseif (is_array($line) && $globalDebug && isset($line['symbol']) && $line['symbol'] == 'Weather Station') { | 
                                                        |
| 1435 | 2042 | echo '!! Weather Station not yet supported'."\n";  | 
                                                        
| 1436 | - }  | 
                                                        |
| 1437 | -  | 
                                                        |
| 1438 | -				elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') { | 
                                                        |
| 2043 | +				} elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') { | 
                                                        |
| 1439 | 2044 | $Source->updateLocationDescByName($line['ident'],$line['source'],$id,$line['comment']);  | 
                                                        
| 1440 | 2045 | }  | 
                                                        
| 1441 | 2046 | /*  | 
                                                        
@@ -1444,7 +2049,9 @@ discard block  | 
                                                    ||
| 1444 | 2049 | }  | 
                                                        
| 1445 | 2050 | */  | 
                                                        
| 1446 | 2051 |  				//elseif ($line == false && $globalDebug) echo 'Ignored ('.$buffer.")\n"; | 
                                                        
| 1447 | - elseif ($line == true && $globalDebug) echo '!! Failed : '.$buffer."!!\n";  | 
                                                        |
| 2052 | +				elseif ($line == true && $globalDebug) { | 
                                                        |
| 2053 | + echo '!! Failed : '.$buffer."!!\n";  | 
                                                        |
| 2054 | + }  | 
                                                        |
| 1448 | 2055 | }  | 
                                                        
| 1449 | 2056 |  			} else { | 
                                                        
| 1450 | 2057 |  			    $line = explode(',', $buffer); | 
                                                        
@@ -1473,26 +2080,45 @@ discard block  | 
                                                    ||
| 1473 | 2080 | $data['ground'] = $line[21];  | 
                                                        
| 1474 | 2081 | $data['emergency'] = $line[19];  | 
                                                        
| 1475 | 2082 | $data['format_source'] = 'sbs';  | 
                                                        
| 1476 | - if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];  | 
                                                        |
| 1477 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];  | 
                                                        |
| 1478 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;  | 
                                                        |
| 2083 | +				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') { | 
                                                        |
| 2084 | + $data['source_name'] = $globalSources[$nb]['name'];  | 
                                                        |
| 2085 | + }  | 
                                                        |
| 2086 | +    				if (isset($globalSources[$nb]['sourcestats'])) { | 
                                                        |
| 2087 | + $data['sourcestats'] = $globalSources[$nb]['sourcestats'];  | 
                                                        |
| 2088 | + }  | 
                                                        |
| 2089 | +				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) { | 
                                                        |
| 2090 | + $data['noarchive'] = true;  | 
                                                        |
| 2091 | + }  | 
                                                        |
| 1479 | 2092 | $data['id_source'] = $id_source;  | 
                                                        
| 1480 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);  | 
                                                        |
| 1481 | - else $error = true;  | 
                                                        |
| 2093 | +    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) { | 
                                                        |
| 2094 | + $send = $SI->add($data);  | 
                                                        |
| 2095 | +    				} else { | 
                                                        |
| 2096 | + $error = true;  | 
                                                        |
| 2097 | + }  | 
                                                        |
| 1482 | 2098 | unset($data);  | 
                                                        
| 1483 | - } else $error = true;  | 
                                                        |
| 2099 | +    			    } else { | 
                                                        |
| 2100 | + $error = true;  | 
                                                        |
| 2101 | + }  | 
                                                        |
| 1484 | 2102 |  			    if ($error) { | 
                                                        
| 1485 | 2103 |  				if (count($line) > 1 && ($line[0] == 'STA' || $line[0] == 'AIR' || $line[0] == 'SEL' || $line[0] == 'ID' || $line[0] == 'CLK')) {  | 
                                                        
| 1486 | - if ($globalDebug) echo "Not a message. Ignoring... \n";  | 
                                                        |
| 2104 | +					if ($globalDebug) { | 
                                                        |
| 2105 | + echo "Not a message. Ignoring... \n";  | 
                                                        |
| 2106 | + }  | 
                                                        |
| 1487 | 2107 |  				} else { | 
                                                        
| 1488 | - if ($globalDebug) echo "Wrong line format. Ignoring... \n";  | 
                                                        |
| 2108 | +					if ($globalDebug) { | 
                                                        |
| 2109 | + echo "Wrong line format. Ignoring... \n";  | 
                                                        |
| 2110 | + }  | 
                                                        |
| 1489 | 2111 |  					if ($globalDebug) { | 
                                                        
| 1490 | 2112 | echo $buffer;  | 
                                                        
| 1491 | 2113 | //print_r($line);  | 
                                                        
| 1492 | 2114 | }  | 
                                                        
| 1493 | 2115 | //socket_close($r);  | 
                                                        
| 1494 | - if ($globalDebug) echo "Reconnect after an error...\n";  | 
                                                        |
| 1495 | - if ($format == 'aprs') $aprs_connect = 0;  | 
                                                        |
| 2116 | +					if ($globalDebug) { | 
                                                        |
| 2117 | + echo "Reconnect after an error...\n";  | 
                                                        |
| 2118 | + }  | 
                                                        |
| 2119 | +					if ($format == 'aprs') { | 
                                                        |
| 2120 | + $aprs_connect = 0;  | 
                                                        |
| 2121 | + }  | 
                                                        |
| 1496 | 2122 | $sourceer[$nb] = $globalSources[$nb];  | 
                                                        
| 1497 | 2123 | connect_all($sourceer);  | 
                                                        
| 1498 | 2124 | $sourceer = array();  | 
                                                        
@@ -1500,10 +2126,14 @@ discard block  | 
                                                    ||
| 1500 | 2126 | }  | 
                                                        
| 1501 | 2127 | }  | 
                                                        
| 1502 | 2128 | // Sleep for xxx microseconds  | 
                                                        
| 1503 | - if (isset($globalSBSSleep)) usleep($globalSBSSleep);  | 
                                                        |
| 2129 | +			if (isset($globalSBSSleep)) { | 
                                                        |
| 2130 | + usleep($globalSBSSleep);  | 
                                                        |
| 2131 | + }  | 
                                                        |
| 1504 | 2132 |  		    } else { | 
                                                        
| 1505 | 2133 |  			if ($format == 'flightgearmp') { | 
                                                        
| 1506 | - if ($globalDebug) echo "Reconnect FlightGear MP...";  | 
                                                        |
| 2134 | +			    	if ($globalDebug) { | 
                                                        |
| 2135 | + echo "Reconnect FlightGear MP...";  | 
                                                        |
| 2136 | + }  | 
                                                        |
| 1507 | 2137 | //@socket_close($r);  | 
                                                        
| 1508 | 2138 | sleep($globalMinFetch);  | 
                                                        
| 1509 | 2139 | $sourcefg[$nb] = $globalSources[$nb];  | 
                                                        
@@ -1512,10 +2142,15 @@ discard block  | 
                                                    ||
| 1512 | 2142 | break;  | 
                                                        
| 1513 | 2143 | |
| 1514 | 2144 |  			} elseif ($format != 'acars' && $format != 'flightgearsp') { | 
                                                        
| 1515 | - if (isset($tt[$format])) $tt[$format]++;  | 
                                                        |
| 1516 | - else $tt[$format] = 0;  | 
                                                        |
| 2145 | +			    if (isset($tt[$format])) { | 
                                                        |
| 2146 | + $tt[$format]++;  | 
                                                        |
| 2147 | +			    } else { | 
                                                        |
| 2148 | + $tt[$format] = 0;  | 
                                                        |
| 2149 | + }  | 
                                                        |
| 1517 | 2150 |  			    if ($tt[$format] > 30) { | 
                                                        
| 1518 | - if ($globalDebug) echo "ERROR : Reconnect ".$format."...";  | 
                                                        |
| 2151 | +				if ($globalDebug) { | 
                                                        |
| 2152 | + echo "ERROR : Reconnect ".$format."...";  | 
                                                        |
| 2153 | + }  | 
                                                        |
| 1519 | 2154 | //@socket_close($r);  | 
                                                        
| 1520 | 2155 | sleep(2);  | 
                                                        
| 1521 | 2156 | $aprs_connect = 0;  | 
                                                        
@@ -1532,11 +2167,17 @@ discard block  | 
                                                    ||
| 1532 | 2167 |  	    } else { | 
                                                        
| 1533 | 2168 | $error = socket_strerror(socket_last_error());  | 
                                                        
| 1534 | 2169 |  		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) { | 
                                                        
| 1535 | - if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";  | 
                                                        |
| 1536 | - if (isset($globalDebug)) echo "Restarting...\n";  | 
                                                        |
| 2170 | +			if ($globalDebug) { | 
                                                        |
| 2171 | + echo "ERROR : socket_select give this error ".$error . "\n";  | 
                                                        |
| 2172 | + }  | 
                                                        |
| 2173 | +			if (isset($globalDebug)) { | 
                                                        |
| 2174 | + echo "Restarting...\n";  | 
                                                        |
| 2175 | + }  | 
                                                        |
| 1537 | 2176 | // Restart the script if possible  | 
                                                        
| 1538 | 2177 |  			if (is_array($sockets)) { | 
                                                        
| 1539 | - if ($globalDebug) echo "Shutdown all sockets...";  | 
                                                        |
| 2178 | +			    if ($globalDebug) { | 
                                                        |
| 2179 | + echo "Shutdown all sockets...";  | 
                                                        |
| 2180 | + }  | 
                                                        |
| 1540 | 2181 | |
| 1541 | 2182 |  			    foreach ($sockets as $sock) { | 
                                                        
| 1542 | 2183 | @socket_shutdown($sock,2);  | 
                                                        
@@ -1544,25 +2185,45 @@ discard block  | 
                                                    ||
| 1544 | 2185 | }  | 
                                                        
| 1545 | 2186 | |
| 1546 | 2187 | }  | 
                                                        
| 1547 | - if ($globalDebug) echo "Waiting...";  | 
                                                        |
| 2188 | +			if ($globalDebug) { | 
                                                        |
| 2189 | + echo "Waiting...";  | 
                                                        |
| 2190 | + }  | 
                                                        |
| 1548 | 2191 | sleep(2);  | 
                                                        
| 1549 | 2192 | $time = time();  | 
                                                        
| 1550 | 2193 | //connect_all($hosts);  | 
                                                        
| 1551 | 2194 | $aprs_connect = 0;  | 
                                                        
| 1552 | - if ($reset%5 == 0) sleep(20);  | 
                                                        |
| 1553 | - if ($reset%10 == 0) sleep(100);  | 
                                                        |
| 1554 | - if ($reset%20 == 0) sleep(200);  | 
                                                        |
| 1555 | -			if ($reset > 100) exit('Too many attempts...'); | 
                                                        |
| 1556 | - if ($globalDebug) echo "Restart all connections...";  | 
                                                        |
| 2195 | +			if ($reset%5 == 0) { | 
                                                        |
| 2196 | + sleep(20);  | 
                                                        |
| 2197 | + }  | 
                                                        |
| 2198 | +			if ($reset%10 == 0) { | 
                                                        |
| 2199 | + sleep(100);  | 
                                                        |
| 2200 | + }  | 
                                                        |
| 2201 | +			if ($reset%20 == 0) { | 
                                                        |
| 2202 | + sleep(200);  | 
                                                        |
| 2203 | + }  | 
                                                        |
| 2204 | +			if ($reset > 100) { | 
                                                        |
| 2205 | +				exit('Too many attempts...'); | 
                                                        |
| 2206 | + }  | 
                                                        |
| 2207 | +			if ($globalDebug) { | 
                                                        |
| 2208 | + echo "Restart all connections...";  | 
                                                        |
| 2209 | + }  | 
                                                        |
| 1557 | 2210 | connect_all($globalSources);  | 
                                                        
| 1558 | 2211 | }  | 
                                                        
| 1559 | 2212 | }  | 
                                                        
| 1560 | 2213 | }  | 
                                                        
| 1561 | 2214 |  	if ($globalDaemon === false) { | 
                                                        
| 1562 | - if ($globalDebug) echo 'Check all...'."\n";  | 
                                                        |
| 1563 | - if (isset($SI)) $SI->checkAll();  | 
                                                        |
| 1564 | - if (isset($TI)) $TI->checkAll();  | 
                                                        |
| 1565 | - if (isset($MI)) $MI->checkAll();  | 
                                                        |
| 2215 | +	    if ($globalDebug) { | 
                                                        |
| 2216 | + echo 'Check all...'."\n";  | 
                                                        |
| 2217 | + }  | 
                                                        |
| 2218 | +	    if (isset($SI)) { | 
                                                        |
| 2219 | + $SI->checkAll();  | 
                                                        |
| 2220 | + }  | 
                                                        |
| 2221 | +	    if (isset($TI)) { | 
                                                        |
| 2222 | + $TI->checkAll();  | 
                                                        |
| 2223 | + }  | 
                                                        |
| 2224 | +	    if (isset($MI)) { | 
                                                        |
| 2225 | + $MI->checkAll();  | 
                                                        |
| 2226 | + }  | 
                                                        |
| 1566 | 2227 | }  | 
                                                        
| 1567 | 2228 | }  | 
                                                        
| 1568 | 2229 | }  |