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