Completed
Push — master ( 93b000...39cbd8 )
by Yannick
06:42
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,117 +342,117 @@  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['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
394
-		    if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
395
-    		    $SI->add($data);
396
-		    unset($data);
397
-    		}
398
-    	    }
399
-    	    $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['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
394
+			if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
395
+				$SI->add($data);
396
+			unset($data);
397
+			}
398
+			}
399
+			$last_exec[$id]['last'] = time();
400 400
 	} elseif ($value['format'] == 'aisnmeatxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
401
-	    date_default_timezone_set('CET');
402
-	    $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
403
-	    date_default_timezone_set('UTC');
404
-	    if ($buffer != '') $reset = 0;
405
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
406
-	    $buffer = explode('\n',$buffer);
407
-	    foreach ($buffer as $line) {
401
+		date_default_timezone_set('CET');
402
+		$buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
403
+		date_default_timezone_set('UTC');
404
+		if ($buffer != '') $reset = 0;
405
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
406
+		$buffer = explode('\n',$buffer);
407
+		foreach ($buffer as $line) {
408 408
 		if ($line != '') {
409
-		    echo "'".$line."'\n";
410
-		    $add = false;
411
-		    $ais_data = $AIS->parse_line(trim($line));
412
-		    $data = array();
413
-		    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
414
-		    if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
415
-		    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
416
-		    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
417
-		    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
418
-		    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
419
-		    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
420
-		    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
421
-		    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
422
-		    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
423
-		    if (isset($ais_data['timestamp'])) {
409
+			echo "'".$line."'\n";
410
+			$add = false;
411
+			$ais_data = $AIS->parse_line(trim($line));
412
+			$data = array();
413
+			if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
414
+			if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
415
+			if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
416
+			if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
417
+			if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
418
+			if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
419
+			if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
420
+			if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
421
+			if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
422
+			if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
423
+			if (isset($ais_data['timestamp'])) {
424 424
 			$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
425 425
 			if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) {
426
-			    $last_exec[$id]['timestamp'] = $ais_data['timestamp'];
427
-			    $add = true;
426
+				$last_exec[$id]['timestamp'] = $ais_data['timestamp'];
427
+				$add = true;
428 428
 			}
429
-		    } else {
429
+			} else {
430 430
 			$data['datetime'] = date('Y-m-d H:i:s');
431 431
 			$add = true;
432
-		    }
433
-		    $data['format_source'] = 'aisnmeatxt';
434
-    		    $data['id_source'] = $id_source;
435
-		    //print_r($data);
436
-		    echo 'Add...'."\n";
437
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
438
-		    if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
439
-		    unset($data);
432
+			}
433
+			$data['format_source'] = 'aisnmeatxt';
434
+				$data['id_source'] = $id_source;
435
+			//print_r($data);
436
+			echo 'Add...'."\n";
437
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
438
+			if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
439
+			unset($data);
440 440
 		}
441
-    	    }
442
-    	    $last_exec[$id]['last'] = time();
441
+			}
442
+			$last_exec[$id]['last'] = time();
443 443
 	} elseif ($value['format'] == 'aisnmeahttp') {
444
-	    $arr = $httpfeeds;
445
-	    $w = $e = null;
444
+		$arr = $httpfeeds;
445
+		$w = $e = null;
446 446
 	    
447
-	    if (isset($arr[$id])) {
447
+		if (isset($arr[$id])) {
448 448
 		$nn = stream_select($arr,$w,$e,$timeout);
449 449
 		if ($nn > 0) {
450
-		    foreach ($httpfeeds as $feed) {
450
+			foreach ($httpfeeds as $feed) {
451 451
 			$buffer = stream_get_line($feed,2000,"\n");
452 452
 			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
453 453
 			$buffer = explode('\n',$buffer);
454 454
 			foreach ($buffer as $line) {
455
-			    if ($line != '') {
455
+				if ($line != '') {
456 456
 				$ais_data = $AIS->parse_line(trim($line));
457 457
 				$data = array();
458 458
 				if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
@@ -468,39 +468,39 @@  discard block
 block discarded – undo
468 468
 				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
469 469
 				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
470 470
 				if (isset($ais_data['timestamp'])) {
471
-				    $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
471
+					$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
472 472
 				} else {
473
-				    $data['datetime'] = date('Y-m-d H:i:s');
473
+					$data['datetime'] = date('Y-m-d H:i:s');
474 474
 				}
475 475
 				$data['format_source'] = 'aisnmeahttp';
476 476
 				$data['id_source'] = $id_source;
477 477
 				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
478 478
 				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
479 479
 				unset($data);
480
-			    }
480
+				}
481
+			}
481 482
 			}
482
-		    }
483 483
 		} else {
484
-		    $format = $value['format'];
485
-		    if (isset($tt[$format])) $tt[$format]++;
486
-		    else $tt[$format] = 0;
487
-		    if ($tt[$format] > 30) {
484
+			$format = $value['format'];
485
+			if (isset($tt[$format])) $tt[$format]++;
486
+			else $tt[$format] = 0;
487
+			if ($tt[$format] > 30) {
488 488
 			sleep(2);
489 489
 			$sourceeen[] = $value;
490 490
 			connect_all($sourceeen);
491 491
 			$sourceeen = array();
492
-		    }
492
+			}
493
+		}
493 494
 		}
494
-	    }
495 495
 	} elseif ($value['format'] == 'myshiptracking' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
496
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
497
-	    if ($buffer != '') {
496
+		$buffer = $Common->getData($value['host'],'get','','','','','20');
497
+		if ($buffer != '') {
498 498
 		//echo $buffer;
499 499
 		$all_data = json_decode($buffer,true);
500 500
 		//print_r($all_data);
501 501
 		if (isset($all_data[0]['DATA'])) {
502 502
 		foreach ($all_data[0]['DATA'] as $line) {
503
-		    if ($line != '') {
503
+			if ($line != '') {
504 504
 			$data = array();
505 505
 			$data['ident'] = $line['NAME'];
506 506
 			$data['mmsi'] = $line['MMSI'];
@@ -517,89 +517,89 @@  discard block
 block discarded – undo
517 517
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
518 518
 			$MI->add($data);
519 519
 			unset($data);
520
-		    }
520
+			}
521 521
 		}
522 522
 		}
523 523
 		
524
-	    }
525
-    	    $last_exec[$id]['last'] = time();
524
+		}
525
+			$last_exec[$id]['last'] = time();
526 526
 	} elseif ($value['format'] == 'boatbeaconapp' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
527
-	    $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host']));
528
-	    if ($buffer != '') {
527
+		$buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host']));
528
+		if ($buffer != '') {
529 529
 		$all_data = json_decode($buffer,true);
530 530
 		if (isset($all_data[0]['mmsi'])) {
531
-		    foreach ($all_data as $line) {
531
+			foreach ($all_data as $line) {
532 532
 			if ($line != '') {
533
-			    $data = array();
534
-			    $data['ident'] = $line['shipname'];
535
-			    $data['callsign'] = $line['callsign'];
536
-			    $data['mmsi'] = $line['mmsi'];
537
-			    $data['speed'] = $line['sog'];
538
-			    if ($line['heading'] != '511') $data['heading'] = $line['heading'];
539
-			    $data['latitude'] = $line['latitude'];
540
-			    $data['longitude'] = $line['longitude'];
541
-			    $data['type_id'] = $line['shiptype'];
542
-			    $data['arrival_code'] = $line['destination'];
543
-			    $data['datetime'] = $line['time'];
544
-			    $data['format_source'] = 'boatbeaconapp';
545
-			    $data['id_source'] = $id_source;
546
-			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
547
-			    $MI->add($data);
548
-			    unset($data);
533
+				$data = array();
534
+				$data['ident'] = $line['shipname'];
535
+				$data['callsign'] = $line['callsign'];
536
+				$data['mmsi'] = $line['mmsi'];
537
+				$data['speed'] = $line['sog'];
538
+				if ($line['heading'] != '511') $data['heading'] = $line['heading'];
539
+				$data['latitude'] = $line['latitude'];
540
+				$data['longitude'] = $line['longitude'];
541
+				$data['type_id'] = $line['shiptype'];
542
+				$data['arrival_code'] = $line['destination'];
543
+				$data['datetime'] = $line['time'];
544
+				$data['format_source'] = 'boatbeaconapp';
545
+				$data['id_source'] = $id_source;
546
+				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
547
+				$MI->add($data);
548
+				unset($data);
549
+			}
549 550
 			}
550
-		    }
551 551
 		}
552 552
 		
553
-	    }
554
-    	    $last_exec[$id]['last'] = time();
553
+		}
554
+			$last_exec[$id]['last'] = time();
555 555
 	} elseif ($value['format'] == 'shipplotter' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
556
-	    echo 'download...';
557
-	    $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
558
-	    echo 'done !'."\n";
559
-	    if ($buffer != '') $reset = 0;
560
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
561
-	    $buffer = explode('\n',$buffer);
562
-	    foreach ($buffer as $line) {
556
+		echo 'download...';
557
+		$buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
558
+		echo 'done !'."\n";
559
+		if ($buffer != '') $reset = 0;
560
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
561
+		$buffer = explode('\n',$buffer);
562
+		foreach ($buffer as $line) {
563 563
 		if ($line != '') {
564
-		    $data = array();
565
-		    $data['mmsi'] = (int)substr($line,0,9);
566
-		    $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
567
-		    //$data['status'] = substr($line,21,2);
568
-		    //$data['type'] = substr($line,24,3);
569
-		    $data['latitude'] = substr($line,29,9);
570
-		    $data['longitude'] = substr($line,41,9);
571
-		    $data['speed'] = round(substr($line,51,5));
572
-		    //$data['course'] = substr($line,57,5);
573
-		    $data['heading'] = round(substr($line,63,3));
574
-		    //$data['draft'] = substr($line,67,4);
575
-		    //$data['length'] = substr($line,72,3);
576
-		    //$data['beam'] = substr($line,76,2);
577
-		    $data['ident'] = trim(utf8_encode(substr($line,79,20)));
578
-		    //$data['callsign'] = trim(substr($line,100,7);
579
-		    //$data['dest'] = substr($line,108,20);
580
-		    //$data['etaDate'] = substr($line,129,5);
581
-		    //$data['etaTime'] = substr($line,135,5);
582
-		    $data['format_source'] = 'shipplotter';
583
-    		    $data['id_source'] = $id_source;
584
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
585
-		    //print_r($data);
586
-		    echo 'Add...'."\n";
587
-		    $MI->add($data);
588
-		    unset($data);
564
+			$data = array();
565
+			$data['mmsi'] = (int)substr($line,0,9);
566
+			$data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
567
+			//$data['status'] = substr($line,21,2);
568
+			//$data['type'] = substr($line,24,3);
569
+			$data['latitude'] = substr($line,29,9);
570
+			$data['longitude'] = substr($line,41,9);
571
+			$data['speed'] = round(substr($line,51,5));
572
+			//$data['course'] = substr($line,57,5);
573
+			$data['heading'] = round(substr($line,63,3));
574
+			//$data['draft'] = substr($line,67,4);
575
+			//$data['length'] = substr($line,72,3);
576
+			//$data['beam'] = substr($line,76,2);
577
+			$data['ident'] = trim(utf8_encode(substr($line,79,20)));
578
+			//$data['callsign'] = trim(substr($line,100,7);
579
+			//$data['dest'] = substr($line,108,20);
580
+			//$data['etaDate'] = substr($line,129,5);
581
+			//$data['etaTime'] = substr($line,135,5);
582
+			$data['format_source'] = 'shipplotter';
583
+				$data['id_source'] = $id_source;
584
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
585
+			//print_r($data);
586
+			echo 'Add...'."\n";
587
+			$MI->add($data);
588
+			unset($data);
589 589
 		}
590
-    	    }
591
-    	    $last_exec[$id]['last'] = time();
590
+			}
591
+			$last_exec[$id]['last'] = time();
592 592
 	//} elseif (($value == 'whazzup' && (time() - $last_exec['whazzup'] > $globalMinFetch)) || ($value == 'vatsimtxt' && (time() - $last_exec['vatsimtxt'] > $globalMinFetch))) {
593 593
 	} elseif (($value['format'] == 'whazzup' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) || ($value['format'] == 'vatsimtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch))) {
594
-	    //$buffer = $Common->getData($hosts[$id]);
595
-	    $buffer = $Common->getData($value['host']);
596
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
597
-	    $buffer = explode('\n',$buffer);
598
-	    $reset = 0;
599
-	    foreach ($buffer as $line) {
600
-    		if ($line != '') {
601
-    		    $line = explode(':', $line);
602
-    		    if (count($line) > 30 && $line[0] != 'callsign') {
594
+		//$buffer = $Common->getData($hosts[$id]);
595
+		$buffer = $Common->getData($value['host']);
596
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
597
+		$buffer = explode('\n',$buffer);
598
+		$reset = 0;
599
+		foreach ($buffer as $line) {
600
+			if ($line != '') {
601
+				$line = explode(':', $line);
602
+				if (count($line) > 30 && $line[0] != 'callsign') {
603 603
 			$data = array();
604 604
 			if (isset($line[37]) && $line[37] != '') $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37];
605 605
 			else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
@@ -612,37 +612,37 @@  discard block
 block discarded – undo
612 612
 			if (isset($line[45])) $data['heading'] = $line[45]; // heading
613 613
 			elseif (isset($line[38])) $data['heading'] = $line[38]; // heading
614 614
 			$data['latitude'] = $line[5]; // lat
615
-	        	$data['longitude'] = $line[6]; // long
616
-	        	$data['verticalrate'] = ''; // vertical rate
617
-	        	$data['squawk'] = ''; // squawk
618
-	        	$data['emergency'] = ''; // emergency
619
-	        	$data['waypoints'] = $line[30];
615
+				$data['longitude'] = $line[6]; // long
616
+				$data['verticalrate'] = ''; // vertical rate
617
+				$data['squawk'] = ''; // squawk
618
+				$data['emergency'] = ''; // emergency
619
+				$data['waypoints'] = $line[30];
620 620
 			$data['datetime'] = date('Y-m-d H:i:s');
621 621
 			//$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37]));
622 622
 			//if (isset($line[37])) $data['last_update'] = $line[37];
623
-		        $data['departure_airport_icao'] = $line[11];
624
-		        $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
625
-		        $data['arrival_airport_icao'] = $line[13];
623
+				$data['departure_airport_icao'] = $line[11];
624
+				$data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
625
+				$data['arrival_airport_icao'] = $line[13];
626 626
 			$data['frequency'] = $line[4];
627 627
 			$data['type'] = $line[18];
628 628
 			$data['range'] = $line[19];
629 629
 			if (isset($line[35])) $data['info'] = $line[35];
630
-    			$data['id_source'] = $id_source;
631
-	    		//$data['arrival_airport_time'] = ;
632
-	    		if ($line[9] != '') {
633
-	    		    $aircraft_data = explode('/',$line[9]);
634
-	    		    if (isset($aircraft_data[1])) {
635
-	    			$data['aircraft_icao'] = $aircraft_data[1];
636
-	    		    }
637
-        		}
638
-	    		/*
630
+				$data['id_source'] = $id_source;
631
+				//$data['arrival_airport_time'] = ;
632
+				if ($line[9] != '') {
633
+					$aircraft_data = explode('/',$line[9]);
634
+					if (isset($aircraft_data[1])) {
635
+					$data['aircraft_icao'] = $aircraft_data[1];
636
+					}
637
+				}
638
+				/*
639 639
 	    		if ($value == 'whazzup') $data['format_source'] = 'whazzup';
640 640
 	    		elseif ($value == 'vatsimtxt') $data['format_source'] = 'vatsimtxt';
641 641
 	    		*/
642
-	    		$data['format_source'] = $value['format'];
642
+				$data['format_source'] = $value['format'];
643 643
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
644 644
 			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
645
-    			if ($line[3] == 'PILOT') $SI->add($data);
645
+				if ($line[3] == 'PILOT') $SI->add($data);
646 646
 			elseif ($line[3] == 'ATC') {
647 647
 				//print_r($data);
648 648
 				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
@@ -660,255 +660,255 @@  discard block
 block discarded – undo
660 660
 				if (!isset($data['source_name'])) $data['source_name'] = '';
661 661
 				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']);
662 662
 			}
663
-    			unset($data);
664
-    		    }
665
-    		}
666
-    	    }
667
-    	    //if ($value == 'whazzup') $last_exec['whazzup'] = time();
668
-    	    //elseif ($value == 'vatsimtxt') $last_exec['vatsimtxt'] = time();
669
-    	    $last_exec[$id]['last'] = time();
670
-    	//} elseif ($value == 'aircraftlistjson' && (time() - $last_exec['aircraftlistjson'] > $globalMinFetch)) {
671
-    	} elseif ($value['format'] == 'aircraftlistjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
672
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
673
-	    if ($buffer != '') {
674
-	    $all_data = json_decode($buffer,true);
675
-	    if (isset($all_data['acList'])) {
663
+				unset($data);
664
+				}
665
+			}
666
+			}
667
+			//if ($value == 'whazzup') $last_exec['whazzup'] = time();
668
+			//elseif ($value == 'vatsimtxt') $last_exec['vatsimtxt'] = time();
669
+			$last_exec[$id]['last'] = time();
670
+		//} elseif ($value == 'aircraftlistjson' && (time() - $last_exec['aircraftlistjson'] > $globalMinFetch)) {
671
+		} elseif ($value['format'] == 'aircraftlistjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
672
+		$buffer = $Common->getData($value['host'],'get','','','','','20');
673
+		if ($buffer != '') {
674
+		$all_data = json_decode($buffer,true);
675
+		if (isset($all_data['acList'])) {
676 676
 		$reset = 0;
677 677
 		foreach ($all_data['acList'] as $line) {
678
-		    $data = array();
679
-		    $data['hex'] = $line['Icao']; // hex
680
-		    if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
681
-		    if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
682
-		    if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
683
-		    if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
684
-		    if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
685
-		    if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
686
-		    //$data['verticalrate'] = $line['']; // verticale rate
687
-		    if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
688
-		    $data['emergency'] = ''; // emergency
689
-		    if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
678
+			$data = array();
679
+			$data['hex'] = $line['Icao']; // hex
680
+			if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
681
+			if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
682
+			if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
683
+			if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
684
+			if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
685
+			if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
686
+			//$data['verticalrate'] = $line['']; // verticale rate
687
+			if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
688
+			$data['emergency'] = ''; // emergency
689
+			if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
690 690
 		    
691
-		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
692
-		    else $data['datetime'] = date('Y-m-d H:i:s');
691
+			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
692
+			else $data['datetime'] = date('Y-m-d H:i:s');
693 693
 		    
694
-		    //$data['datetime'] = date('Y-m-d H:i:s');
695
-		    if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
696
-	    	    $data['format_source'] = 'aircraftlistjson';
697
-		    $data['id_source'] = $id_source;
698
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
699
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
700
-		    if (isset($data['latitude'])) $SI->add($data);
701
-		    unset($data);
694
+			//$data['datetime'] = date('Y-m-d H:i:s');
695
+			if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
696
+				$data['format_source'] = 'aircraftlistjson';
697
+			$data['id_source'] = $id_source;
698
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
699
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
700
+			if (isset($data['latitude'])) $SI->add($data);
701
+			unset($data);
702 702
 		}
703
-	    } elseif (is_array($all_data)) {
703
+		} elseif (is_array($all_data)) {
704 704
 		$reset = 0;
705 705
 		foreach ($all_data as $line) {
706
-		    $data = array();
707
-		    $data['hex'] = $line['hex']; // hex
708
-		    $data['ident'] = $line['flight']; // ident
709
-		    $data['altitude'] = $line['altitude']; // altitude
710
-		    $data['speed'] = $line['speed']; // speed
711
-		    $data['heading'] = $line['track']; // heading
712
-		    $data['latitude'] = $line['lat']; // lat
713
-		    $data['longitude'] = $line['lon']; // long
714
-		    $data['verticalrate'] = $line['vrt']; // verticale rate
715
-		    $data['squawk'] = $line['squawk']; // squawk
716
-		    $data['emergency'] = ''; // emergency
717
-		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
718
-		    else $data['datetime'] = date('Y-m-d H:i:s');
719
-	    	    $data['format_source'] = 'aircraftlistjson';
720
-    		    $data['id_source'] = $id_source;
721
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
722
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
723
-		    $SI->add($data);
724
-		    unset($data);
706
+			$data = array();
707
+			$data['hex'] = $line['hex']; // hex
708
+			$data['ident'] = $line['flight']; // ident
709
+			$data['altitude'] = $line['altitude']; // altitude
710
+			$data['speed'] = $line['speed']; // speed
711
+			$data['heading'] = $line['track']; // heading
712
+			$data['latitude'] = $line['lat']; // lat
713
+			$data['longitude'] = $line['lon']; // long
714
+			$data['verticalrate'] = $line['vrt']; // verticale rate
715
+			$data['squawk'] = $line['squawk']; // squawk
716
+			$data['emergency'] = ''; // emergency
717
+			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
718
+			else $data['datetime'] = date('Y-m-d H:i:s');
719
+				$data['format_source'] = 'aircraftlistjson';
720
+				$data['id_source'] = $id_source;
721
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
722
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
723
+			$SI->add($data);
724
+			unset($data);
725
+		}
725 726
 		}
726
-	    }
727
-	    }
728
-    	    //$last_exec['aircraftlistjson'] = time();
729
-    	    $last_exec[$id]['last'] = time();
730
-    	//} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
731
-    	} elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
732
-	    $buffer = $Common->getData($value['host']);
733
-	    $all_data = json_decode($buffer,true);
734
-	    if (isset($all_data['planes'])) {
727
+		}
728
+			//$last_exec['aircraftlistjson'] = time();
729
+			$last_exec[$id]['last'] = time();
730
+		//} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
731
+		} elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
732
+		$buffer = $Common->getData($value['host']);
733
+		$all_data = json_decode($buffer,true);
734
+		if (isset($all_data['planes'])) {
735 735
 		$reset = 0;
736 736
 		foreach ($all_data['planes'] as $key => $line) {
737
-		    $data = array();
738
-		    $data['hex'] = $key; // hex
739
-		    $data['ident'] = $line[3]; // ident
740
-		    $data['altitude'] = $line[6]; // altitude
741
-		    $data['speed'] = $line[8]; // speed
742
-		    $data['heading'] = $line[7]; // heading
743
-		    $data['latitude'] = $line[4]; // lat
744
-		    $data['longitude'] = $line[5]; // long
745
-		    //$data['verticalrate'] = $line[]; // verticale rate
746
-		    $data['squawk'] = $line[10]; // squawk
747
-		    $data['emergency'] = ''; // emergency
748
-		    $data['registration'] = $line[2];
749
-		    $data['aircraft_icao'] = $line[0];
750
-		    $deparr = explode('-',$line[1]);
751
-		    if (count($deparr) == 2) {
737
+			$data = array();
738
+			$data['hex'] = $key; // hex
739
+			$data['ident'] = $line[3]; // ident
740
+			$data['altitude'] = $line[6]; // altitude
741
+			$data['speed'] = $line[8]; // speed
742
+			$data['heading'] = $line[7]; // heading
743
+			$data['latitude'] = $line[4]; // lat
744
+			$data['longitude'] = $line[5]; // long
745
+			//$data['verticalrate'] = $line[]; // verticale rate
746
+			$data['squawk'] = $line[10]; // squawk
747
+			$data['emergency'] = ''; // emergency
748
+			$data['registration'] = $line[2];
749
+			$data['aircraft_icao'] = $line[0];
750
+			$deparr = explode('-',$line[1]);
751
+			if (count($deparr) == 2) {
752 752
 			$data['departure_airport_icao'] = $deparr[0];
753 753
 			$data['arrival_airport_icao'] = $deparr[1];
754
-		    }
755
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]);
756
-	    	    $data['format_source'] = 'planeupdatefaa';
757
-    		    $data['id_source'] = $id_source;
758
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
759
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
760
-		    $SI->add($data);
761
-		    unset($data);
754
+			}
755
+			$data['datetime'] = date('Y-m-d H:i:s',$line[9]);
756
+				$data['format_source'] = 'planeupdatefaa';
757
+				$data['id_source'] = $id_source;
758
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
759
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
760
+			$SI->add($data);
761
+			unset($data);
762
+		}
762 763
 		}
763
-	    }
764
-    	    //$last_exec['planeupdatefaa'] = time();
765
-    	    $last_exec[$id]['last'] = time();
766
-    	} elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
767
-	    $buffer = $Common->getData($value['host']);
768
-	    $all_data = json_decode($buffer,true);
769
-	    if (isset($all_data['states'])) {
764
+			//$last_exec['planeupdatefaa'] = time();
765
+			$last_exec[$id]['last'] = time();
766
+		} elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
767
+		$buffer = $Common->getData($value['host']);
768
+		$all_data = json_decode($buffer,true);
769
+		if (isset($all_data['states'])) {
770 770
 		$reset = 0;
771 771
 		foreach ($all_data['states'] as $key => $line) {
772
-		    $data = array();
773
-		    $data['hex'] = $line[0]; // hex
774
-		    $data['ident'] = trim($line[1]); // ident
775
-		    $data['altitude'] = round($line[7]*3.28084); // altitude
776
-		    $data['speed'] = round($line[9]*1.94384); // speed
777
-		    $data['heading'] = round($line[10]); // heading
778
-		    $data['latitude'] = $line[5]; // lat
779
-		    $data['longitude'] = $line[6]; // long
780
-		    $data['verticalrate'] = $line[11]; // verticale rate
781
-		    //$data['squawk'] = $line[10]; // squawk
782
-		    //$data['emergency'] = ''; // emergency
783
-		    //$data['registration'] = $line[2];
784
-		    //$data['aircraft_icao'] = $line[0];
785
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]);
786
-	    	    $data['format_source'] = 'opensky';
787
-    		    $data['id_source'] = $id_source;
788
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
789
-		    $SI->add($data);
790
-		    unset($data);
772
+			$data = array();
773
+			$data['hex'] = $line[0]; // hex
774
+			$data['ident'] = trim($line[1]); // ident
775
+			$data['altitude'] = round($line[7]*3.28084); // altitude
776
+			$data['speed'] = round($line[9]*1.94384); // speed
777
+			$data['heading'] = round($line[10]); // heading
778
+			$data['latitude'] = $line[5]; // lat
779
+			$data['longitude'] = $line[6]; // long
780
+			$data['verticalrate'] = $line[11]; // verticale rate
781
+			//$data['squawk'] = $line[10]; // squawk
782
+			//$data['emergency'] = ''; // emergency
783
+			//$data['registration'] = $line[2];
784
+			//$data['aircraft_icao'] = $line[0];
785
+			$data['datetime'] = date('Y-m-d H:i:s',$line[3]);
786
+				$data['format_source'] = 'opensky';
787
+				$data['id_source'] = $id_source;
788
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
789
+			$SI->add($data);
790
+			unset($data);
791
+		}
791 792
 		}
792
-	    }
793
-    	    //$last_exec['planeupdatefaa'] = time();
794
-    	    $last_exec[$id]['last'] = time();
795
-    	//} elseif ($value == 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) {
796
-    	} elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
797
-	    //$buffer = $Common->getData($hosts[$id]);
798
-	    $buffer = $Common->getData($value['host']);
799
-	    $all_data = json_decode($buffer,true);
800
-	    if (!empty($all_data)) $reset = 0;
801
-	    foreach ($all_data as $key => $line) {
793
+			//$last_exec['planeupdatefaa'] = time();
794
+			$last_exec[$id]['last'] = time();
795
+		//} elseif ($value == 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) {
796
+		} elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
797
+		//$buffer = $Common->getData($hosts[$id]);
798
+		$buffer = $Common->getData($value['host']);
799
+		$all_data = json_decode($buffer,true);
800
+		if (!empty($all_data)) $reset = 0;
801
+		foreach ($all_data as $key => $line) {
802 802
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
803
-		    $data = array();
804
-		    $data['hex'] = $line[0];
805
-		    $data['ident'] = $line[16]; //$line[13]
806
-	    	    $data['altitude'] = $line[4]; // altitude
807
-	    	    $data['speed'] = $line[5]; // speed
808
-	    	    $data['heading'] = $line[3]; // heading
809
-	    	    $data['latitude'] = $line[1]; // lat
810
-	    	    $data['longitude'] = $line[2]; // long
811
-	    	    $data['verticalrate'] = $line[15]; // verticale rate
812
-	    	    $data['squawk'] = $line[6]; // squawk
813
-	    	    $data['aircraft_icao'] = $line[8];
814
-	    	    $data['registration'] = $line[9];
815
-		    $data['departure_airport_iata'] = $line[11];
816
-		    $data['arrival_airport_iata'] = $line[12];
817
-	    	    $data['emergency'] = ''; // emergency
818
-		    $data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
819
-	    	    $data['format_source'] = 'fr24json';
820
-    		    $data['id_source'] = $id_source;
821
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
822
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
823
-		    $SI->add($data);
824
-		    unset($data);
803
+			$data = array();
804
+			$data['hex'] = $line[0];
805
+			$data['ident'] = $line[16]; //$line[13]
806
+				$data['altitude'] = $line[4]; // altitude
807
+				$data['speed'] = $line[5]; // speed
808
+				$data['heading'] = $line[3]; // heading
809
+				$data['latitude'] = $line[1]; // lat
810
+				$data['longitude'] = $line[2]; // long
811
+				$data['verticalrate'] = $line[15]; // verticale rate
812
+				$data['squawk'] = $line[6]; // squawk
813
+				$data['aircraft_icao'] = $line[8];
814
+				$data['registration'] = $line[9];
815
+			$data['departure_airport_iata'] = $line[11];
816
+			$data['arrival_airport_iata'] = $line[12];
817
+				$data['emergency'] = ''; // emergency
818
+			$data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
819
+				$data['format_source'] = 'fr24json';
820
+				$data['id_source'] = $id_source;
821
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
822
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
823
+			$SI->add($data);
824
+			unset($data);
825
+		}
825 826
 		}
826
-	    }
827
-    	    //$last_exec['fr24json'] = time();
828
-    	    $last_exec[$id]['last'] = time();
829
-    	//} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) {
830
-    	} elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
831
-	    //$buffer = $Common->getData($hosts[$id],'get','','','','','150');
832
-	    $buffer = $Common->getData($value['host'],'get','','','','','150');
833
-	    //echo $buffer;
834
-	    $buffer = str_replace(array("\n","\r"),"",$buffer);
835
-	    $buffer = preg_replace('/,"num":(.+)/','}',$buffer);
836
-	    $all_data = json_decode($buffer,true);
837
-	    if (json_last_error() != JSON_ERROR_NONE) {
827
+			//$last_exec['fr24json'] = time();
828
+			$last_exec[$id]['last'] = time();
829
+		//} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) {
830
+		} elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
831
+		//$buffer = $Common->getData($hosts[$id],'get','','','','','150');
832
+		$buffer = $Common->getData($value['host'],'get','','','','','150');
833
+		//echo $buffer;
834
+		$buffer = str_replace(array("\n","\r"),"",$buffer);
835
+		$buffer = preg_replace('/,"num":(.+)/','}',$buffer);
836
+		$all_data = json_decode($buffer,true);
837
+		if (json_last_error() != JSON_ERROR_NONE) {
838 838
 		die(json_last_error_msg());
839
-	    }
840
-	    if (isset($all_data['mrkrs'])) {
839
+		}
840
+		if (isset($all_data['mrkrs'])) {
841 841
 		$reset = 0;
842 842
 		foreach ($all_data['mrkrs'] as $key => $line) {
843
-		    if (isset($line['inf'])) {
843
+			if (isset($line['inf'])) {
844 844
 			$data = array();
845 845
 			$data['hex'] = $line['inf']['ia'];
846 846
 			if (isset($line['inf']['cs'])) $data['ident'] = $line['inf']['cs']; //$line[13]
847
-	    		$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
848
-	    		if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
849
-	    		if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
850
-	    		$data['latitude'] = $line['pt'][0]; // lat
851
-	    		$data['longitude'] = $line['pt'][1]; // long
852
-	    		//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
853
-	    		if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
854
-	    		//$data['aircraft_icao'] = $line[8];
855
-	    		if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
847
+				$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
848
+				if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
849
+				if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
850
+				$data['latitude'] = $line['pt'][0]; // lat
851
+				$data['longitude'] = $line['pt'][1]; // long
852
+				//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
853
+				if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
854
+				//$data['aircraft_icao'] = $line[8];
855
+				if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
856 856
 			//$data['departure_airport_iata'] = $line[11];
857 857
 			//$data['arrival_airport_iata'] = $line[12];
858
-	    		//$data['emergency'] = ''; // emergency
858
+				//$data['emergency'] = ''; // emergency
859 859
 			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10]
860
-	    		$data['format_source'] = 'radarvirtueljson';
861
-    			$data['id_source'] = $id_source;
860
+				$data['format_source'] = 'radarvirtueljson';
861
+				$data['id_source'] = $id_source;
862 862
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
863 863
 			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
864 864
 			$SI->add($data);
865 865
 			unset($data);
866
-		    }
866
+			}
867
+		}
867 868
 		}
868
-	    }
869
-    	    //$last_exec['radarvirtueljson'] = time();
870
-    	    $last_exec[$id]['last'] = time();
871
-    	//} elseif ($value == 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) {
872
-    	} elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
873
-	    //$buffer = $Common->getData($hosts[$id]);
874
-	    $buffer = $Common->getData($value['host'].'?'.time());
875
-	    $all_data = json_decode(utf8_encode($buffer),true);
869
+			//$last_exec['radarvirtueljson'] = time();
870
+			$last_exec[$id]['last'] = time();
871
+		//} elseif ($value == 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) {
872
+		} elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
873
+		//$buffer = $Common->getData($hosts[$id]);
874
+		$buffer = $Common->getData($value['host'].'?'.time());
875
+		$all_data = json_decode(utf8_encode($buffer),true);
876 876
 	    
877
-	    if (isset($all_data['pireps'])) {
877
+		if (isset($all_data['pireps'])) {
878 878
 		$reset = 0;
879
-	        foreach ($all_data['pireps'] as $line) {
880
-		    $data = array();
881
-		    $data['id'] = $line['id'];
882
-		    $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
883
-		    $data['ident'] = $line['callsign']; // ident
884
-		    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
885
-		    if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
886
-		    if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
887
-		    if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
888
-		    if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
889
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
890
-		    $data['latitude'] = $line['lat']; // lat
891
-		    $data['longitude'] = $line['lon']; // long
892
-		    //$data['verticalrate'] = $line['vrt']; // verticale rate
893
-		    //$data['squawk'] = $line['squawk']; // squawk
894
-		    //$data['emergency'] = ''; // emergency
895
-		    if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
896
-		    if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
897
-		    if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
898
-		    //$data['arrival_airport_time'] = $line['arrtime'];
899
-		    if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
900
-		    if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
901
-		    if (isset($line['atis'])) $data['info'] = $line['atis'];
902
-		    else $data['info'] = '';
903
-		    $data['format_source'] = 'pireps';
904
-    		    $data['id_source'] = $id_source;
905
-		    $data['datetime'] = date('Y-m-d H:i:s');
906
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
907
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
908
-		    if ($line['icon'] == 'plane') {
879
+			foreach ($all_data['pireps'] as $line) {
880
+			$data = array();
881
+			$data['id'] = $line['id'];
882
+			$data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
883
+			$data['ident'] = $line['callsign']; // ident
884
+			if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
885
+			if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
886
+			if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
887
+			if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
888
+			if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
889
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
890
+			$data['latitude'] = $line['lat']; // lat
891
+			$data['longitude'] = $line['lon']; // long
892
+			//$data['verticalrate'] = $line['vrt']; // verticale rate
893
+			//$data['squawk'] = $line['squawk']; // squawk
894
+			//$data['emergency'] = ''; // emergency
895
+			if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
896
+			if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
897
+			if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
898
+			//$data['arrival_airport_time'] = $line['arrtime'];
899
+			if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
900
+			if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
901
+			if (isset($line['atis'])) $data['info'] = $line['atis'];
902
+			else $data['info'] = '';
903
+			$data['format_source'] = 'pireps';
904
+				$data['id_source'] = $id_source;
905
+			$data['datetime'] = date('Y-m-d H:i:s');
906
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
907
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
908
+			if ($line['icon'] == 'plane') {
909 909
 			$SI->add($data);
910
-		    //    print_r($data);
911
-    		    } elseif ($line['icon'] == 'ct') {
910
+			//    print_r($data);
911
+				} elseif ($line['icon'] == 'ct') {
912 912
 			$data['info'] = str_replace('^&sect;','<br />',$data['info']);
913 913
 			$data['info'] = str_replace('&amp;sect;','',$data['info']);
914 914
 			$typec = substr($data['ident'],-3);
@@ -923,196 +923,196 @@  discard block
 block discarded – undo
923 923
 			elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
924 924
 			else $data['type'] = 'Observer';
925 925
 			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']);
926
-		    }
927
-		    unset($data);
926
+			}
927
+			unset($data);
928 928
 		}
929
-	    }
930
-    	    //$last_exec['pirepsjson'] = time();
931
-    	    $last_exec[$id]['last'] = time();
932
-    	//} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) {
933
-    	} elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
934
-	    //$buffer = $Common->getData($hosts[$id]);
935
-	    if ($globalDebug) echo 'Get Data...'."\n";
936
-	    $buffer = $Common->getData($value['host']);
937
-	    $all_data = json_decode($buffer,true);
938
-	    if ($buffer != '' && is_array($all_data)) {
929
+		}
930
+			//$last_exec['pirepsjson'] = time();
931
+			$last_exec[$id]['last'] = time();
932
+		//} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) {
933
+		} elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
934
+		//$buffer = $Common->getData($hosts[$id]);
935
+		if ($globalDebug) echo 'Get Data...'."\n";
936
+		$buffer = $Common->getData($value['host']);
937
+		$all_data = json_decode($buffer,true);
938
+		if ($buffer != '' && is_array($all_data)) {
939 939
 		$reset = 0;
940 940
 		foreach ($all_data as $line) {
941
-	    	    $data = array();
942
-	    	    //$data['id'] = $line['id']; // id not usable
943
-	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
944
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
945
-	    	    if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
946
-	    	    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
947
-	    	    $data['ident'] = $line['flightnum']; // ident
948
-	    	    $data['altitude'] = $line['alt']; // altitude
949
-	    	    $data['speed'] = $line['gs']; // speed
950
-	    	    $data['heading'] = $line['heading']; // heading
951
-	    	    $data['latitude'] = $line['lat']; // lat
952
-	    	    $data['longitude'] = $line['lng']; // long
953
-	    	    $data['verticalrate'] = ''; // verticale rate
954
-	    	    $data['squawk'] = ''; // squawk
955
-	    	    $data['emergency'] = ''; // emergency
956
-	    	    //$data['datetime'] = $line['lastupdate'];
957
-	    	    $data['last_update'] = $line['lastupdate'];
958
-		    $data['datetime'] = date('Y-m-d H:i:s');
959
-	    	    $data['departure_airport_icao'] = $line['depicao'];
960
-	    	    $data['departure_airport_time'] = $line['deptime'];
961
-	    	    $data['arrival_airport_icao'] = $line['arricao'];
962
-    		    $data['arrival_airport_time'] = $line['arrtime'];
963
-    		    $data['registration'] = $line['aircraft'];
964
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
965
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
966
-		    if (isset($line['aircraftname'])) {
941
+				$data = array();
942
+				//$data['id'] = $line['id']; // id not usable
943
+				if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
944
+				$data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
945
+				if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
946
+				if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
947
+				$data['ident'] = $line['flightnum']; // ident
948
+				$data['altitude'] = $line['alt']; // altitude
949
+				$data['speed'] = $line['gs']; // speed
950
+				$data['heading'] = $line['heading']; // heading
951
+				$data['latitude'] = $line['lat']; // lat
952
+				$data['longitude'] = $line['lng']; // long
953
+				$data['verticalrate'] = ''; // verticale rate
954
+				$data['squawk'] = ''; // squawk
955
+				$data['emergency'] = ''; // emergency
956
+				//$data['datetime'] = $line['lastupdate'];
957
+				$data['last_update'] = $line['lastupdate'];
958
+			$data['datetime'] = date('Y-m-d H:i:s');
959
+				$data['departure_airport_icao'] = $line['depicao'];
960
+				$data['departure_airport_time'] = $line['deptime'];
961
+				$data['arrival_airport_icao'] = $line['arricao'];
962
+				$data['arrival_airport_time'] = $line['arrtime'];
963
+				$data['registration'] = $line['aircraft'];
964
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
965
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
966
+			if (isset($line['aircraftname'])) {
967 967
 			$line['aircraftname'] = strtoupper($line['aircraftname']);
968 968
 			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']);
969
-	    		$aircraft_data = explode('-',$line['aircraftname']);
970
-	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
971
-	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
972
-	    		else {
973
-	    		    $aircraft_data = explode(' ',$line['aircraftname']);
974
-	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
975
-	    		    else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
976
-	    		}
977
-	    	    }
978
-    		    if (isset($line['route'])) $data['waypoints'] = $line['route'];
979
-    		    $data['id_source'] = $id_source;
980
-	    	    $data['format_source'] = 'phpvmacars';
981
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
982
-		    $SI->add($data);
983
-		    unset($data);
969
+				$aircraft_data = explode('-',$line['aircraftname']);
970
+				if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
971
+				elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
972
+				else {
973
+					$aircraft_data = explode(' ',$line['aircraftname']);
974
+					if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
975
+					else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
976
+				}
977
+				}
978
+				if (isset($line['route'])) $data['waypoints'] = $line['route'];
979
+				$data['id_source'] = $id_source;
980
+				$data['format_source'] = 'phpvmacars';
981
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
982
+			$SI->add($data);
983
+			unset($data);
984 984
 		}
985 985
 		if ($globalDebug) echo 'No more data...'."\n";
986 986
 		unset($buffer);
987 987
 		unset($all_data);
988
-	    }
989
-    	    //$last_exec['phpvmacars'] = time();
990
-    	    $last_exec[$id]['last'] = time();
991
-    	} elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
992
-	    //$buffer = $Common->getData($hosts[$id]);
993
-	    if ($globalDebug) echo 'Get Data...'."\n";
994
-	    $buffer = $Common->getData($value['host']);
995
-	    $all_data = json_decode($buffer,true);
996
-	    if ($buffer != '' && is_array($all_data)) {
988
+		}
989
+			//$last_exec['phpvmacars'] = time();
990
+			$last_exec[$id]['last'] = time();
991
+		} elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
992
+		//$buffer = $Common->getData($hosts[$id]);
993
+		if ($globalDebug) echo 'Get Data...'."\n";
994
+		$buffer = $Common->getData($value['host']);
995
+		$all_data = json_decode($buffer,true);
996
+		if ($buffer != '' && is_array($all_data)) {
997 997
 		$reset = 0;
998 998
 		foreach ($all_data as $line) {
999
-	    	    $data = array();
1000
-	    	    //$data['id'] = $line['id']; // id not usable
1001
-	    	    $data['id'] = trim($line['flight_id']);
1002
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
1003
-	    	    $data['pilot_name'] = $line['pilot_name'];
1004
-	    	    $data['pilot_id'] = $line['pilot_id'];
1005
-	    	    $data['ident'] = trim($line['callsign']); // ident
1006
-	    	    $data['altitude'] = $line['altitude']; // altitude
1007
-	    	    $data['speed'] = $line['gs']; // speed
1008
-	    	    $data['heading'] = $line['heading']; // heading
1009
-	    	    $data['latitude'] = $line['latitude']; // lat
1010
-	    	    $data['longitude'] = $line['longitude']; // long
1011
-	    	    $data['verticalrate'] = ''; // verticale rate
1012
-	    	    $data['squawk'] = ''; // squawk
1013
-	    	    $data['emergency'] = ''; // emergency
1014
-	    	    //$data['datetime'] = $line['lastupdate'];
1015
-	    	    $data['last_update'] = $line['last_update'];
1016
-		    $data['datetime'] = date('Y-m-d H:i:s');
1017
-	    	    $data['departure_airport_icao'] = $line['departure'];
1018
-	    	    //$data['departure_airport_time'] = $line['departure_time'];
1019
-	    	    $data['arrival_airport_icao'] = $line['arrival'];
1020
-    		    //$data['arrival_airport_time'] = $line['arrival_time'];
1021
-    		    //$data['registration'] = $line['aircraft'];
1022
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1023
-	    	    $data['aircraft_icao'] = $line['plane_type'];
1024
-    		    $data['id_source'] = $id_source;
1025
-	    	    $data['format_source'] = 'vam';
1026
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1027
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1028
-		    $SI->add($data);
1029
-		    unset($data);
999
+				$data = array();
1000
+				//$data['id'] = $line['id']; // id not usable
1001
+				$data['id'] = trim($line['flight_id']);
1002
+				$data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
1003
+				$data['pilot_name'] = $line['pilot_name'];
1004
+				$data['pilot_id'] = $line['pilot_id'];
1005
+				$data['ident'] = trim($line['callsign']); // ident
1006
+				$data['altitude'] = $line['altitude']; // altitude
1007
+				$data['speed'] = $line['gs']; // speed
1008
+				$data['heading'] = $line['heading']; // heading
1009
+				$data['latitude'] = $line['latitude']; // lat
1010
+				$data['longitude'] = $line['longitude']; // long
1011
+				$data['verticalrate'] = ''; // verticale rate
1012
+				$data['squawk'] = ''; // squawk
1013
+				$data['emergency'] = ''; // emergency
1014
+				//$data['datetime'] = $line['lastupdate'];
1015
+				$data['last_update'] = $line['last_update'];
1016
+			$data['datetime'] = date('Y-m-d H:i:s');
1017
+				$data['departure_airport_icao'] = $line['departure'];
1018
+				//$data['departure_airport_time'] = $line['departure_time'];
1019
+				$data['arrival_airport_icao'] = $line['arrival'];
1020
+				//$data['arrival_airport_time'] = $line['arrival_time'];
1021
+				//$data['registration'] = $line['aircraft'];
1022
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1023
+				$data['aircraft_icao'] = $line['plane_type'];
1024
+				$data['id_source'] = $id_source;
1025
+				$data['format_source'] = 'vam';
1026
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1027
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1028
+			$SI->add($data);
1029
+			unset($data);
1030 1030
 		}
1031 1031
 		if ($globalDebug) echo 'No more data...'."\n";
1032 1032
 		unset($buffer);
1033 1033
 		unset($all_data);
1034
-	    }
1035
-    	    //$last_exec['phpvmacars'] = time();
1036
-    	    $last_exec[$id]['last'] = time();
1034
+		}
1035
+			//$last_exec['phpvmacars'] = time();
1036
+			$last_exec[$id]['last'] = time();
1037 1037
 	//} elseif ($value == 'sbs' || $value == 'tsv' || $value == 'raw' || $value == 'aprs' || $value == 'beast') {
1038 1038
 	} 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') {
1039
-	    if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
1040
-    	    //$last_exec[$id]['last'] = time();
1039
+		if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
1040
+			//$last_exec[$id]['last'] = time();
1041 1041
 
1042
-	    //$read = array( $sockets[$id] );
1043
-	    $read = $sockets;
1044
-	    $write = NULL;
1045
-	    $e = NULL;
1046
-	    $n = socket_select($read, $write, $e, $timeout);
1047
-	    if ($e != NULL) var_dump($e);
1048
-	    if ($n > 0) {
1042
+		//$read = array( $sockets[$id] );
1043
+		$read = $sockets;
1044
+		$write = NULL;
1045
+		$e = NULL;
1046
+		$n = socket_select($read, $write, $e, $timeout);
1047
+		if ($e != NULL) var_dump($e);
1048
+		if ($n > 0) {
1049 1049
 		$reset = 0;
1050 1050
 		foreach ($read as $nb => $r) {
1051
-		    //$value = $formats[$nb];
1052
-		    $format = $globalSources[$nb]['format'];
1053
-		    if ($format == 'sbs' || $format == 'aprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') {
1051
+			//$value = $formats[$nb];
1052
+			$format = $globalSources[$nb]['format'];
1053
+			if ($format == 'sbs' || $format == 'aprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') {
1054 1054
 			$buffer = @socket_read($r, 6000,PHP_NORMAL_READ);
1055
-		    } elseif ($format == 'vrstcp') {
1055
+			} elseif ($format == 'vrstcp') {
1056 1056
 			$buffer = @socket_read($r, 6000);
1057
-		    } else {
1057
+			} else {
1058 1058
 			$az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port);
1059
-		    }
1060
-		    //$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
1061
-		    //echo $buffer."\n";
1062
-		    // lets play nice and handle signals such as ctrl-c/kill properly
1063
-		    //if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
1064
-		    $error = false;
1065
-		    //$SI::del();
1066
-		    if ($format == 'vrstcp') {
1059
+			}
1060
+			//$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
1061
+			//echo $buffer."\n";
1062
+			// lets play nice and handle signals such as ctrl-c/kill properly
1063
+			//if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
1064
+			$error = false;
1065
+			//$SI::del();
1066
+			if ($format == 'vrstcp') {
1067 1067
 			$buffer = explode('},{',$buffer);
1068
-		    } else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
1069
-		    // SBS format is CSV format
1070
-		    if ($buffer !== FALSE && $buffer != '') {
1068
+			} else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
1069
+			// SBS format is CSV format
1070
+			if ($buffer !== FALSE && $buffer != '') {
1071 1071
 			$tt[$format] = 0;
1072 1072
 			if ($format == 'acarssbs3') {
1073
-			    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1074
-			    $ACARS->add(trim($buffer));
1075
-			    $ACARS->deleteLiveAcarsData();
1073
+				if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1074
+				$ACARS->add(trim($buffer));
1075
+				$ACARS->deleteLiveAcarsData();
1076 1076
 			} elseif ($format == 'raw') {
1077
-			    // AVR format
1078
-			    $data = $SBS->parse($buffer);
1079
-			    if (is_array($data)) {
1077
+				// AVR format
1078
+				$data = $SBS->parse($buffer);
1079
+				if (is_array($data)) {
1080 1080
 				$data['datetime'] = date('Y-m-d H:i:s');
1081 1081
 				$data['format_source'] = 'raw';
1082 1082
 				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1083 1083
 				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1084 1084
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1085 1085
 				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1086
-			    }
1086
+				}
1087 1087
 			} elseif ($format == 'ais') {
1088
-			    $ais_data = $AIS->parse_line(trim($buffer));
1089
-			    $data = array();
1090
-			    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
1091
-			    if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
1092
-			    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
1093
-			    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
1094
-			    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
1095
-			    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
1096
-			    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
1097
-			    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
1098
-			    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
1099
-			    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
1100
-			    if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
1101
-			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
1102
-			    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1088
+				$ais_data = $AIS->parse_line(trim($buffer));
1089
+				$data = array();
1090
+				if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
1091
+				if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
1092
+				if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
1093
+				if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
1094
+				if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
1095
+				if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
1096
+				if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
1097
+				if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
1098
+				if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
1099
+				if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
1100
+				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
1101
+				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
1102
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1103 1103
 
1104
-			    if (isset($ais_data['timestamp'])) {
1104
+				if (isset($ais_data['timestamp'])) {
1105 1105
 				$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
1106
-			    } else {
1106
+				} else {
1107 1107
 				$data['datetime'] = date('Y-m-d H:i:s');
1108
-			    }
1109
-			    $data['format_source'] = 'aisnmea';
1110
-    			    $data['id_source'] = $id_source;
1111
-			    if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
1112
-			    unset($data);
1113
-                        } elseif ($format == 'flightgearsp') {
1114
-                    	    //echo $buffer."\n";
1115
-                    	    if (strlen($buffer) > 5) {
1108
+				}
1109
+				$data['format_source'] = 'aisnmea';
1110
+					$data['id_source'] = $id_source;
1111
+				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
1112
+				unset($data);
1113
+						} elseif ($format == 'flightgearsp') {
1114
+							//echo $buffer."\n";
1115
+							if (strlen($buffer) > 5) {
1116 1116
 				$line = explode(',',$buffer);
1117 1117
 				$data = array();
1118 1118
 				//XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p
@@ -1129,38 +1129,38 @@  discard block
 block discarded – undo
1129 1129
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1130 1130
 				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1131 1131
 				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
1132
-			    }
1133
-                        } elseif ($format == 'acars') {
1134
-                    	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1135
-			    $ACARS->add(trim($buffer));
1136
-			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
1137
-			    $ACARS->deleteLiveAcarsData();
1132
+				}
1133
+						} elseif ($format == 'acars') {
1134
+							if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1135
+				$ACARS->add(trim($buffer));
1136
+				socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
1137
+				$ACARS->deleteLiveAcarsData();
1138 1138
 			} elseif ($format == 'flightgearmp') {
1139
-			    if (substr($buffer,0,1) != '#') {
1139
+				if (substr($buffer,0,1) != '#') {
1140 1140
 				$data = array();
1141 1141
 				//echo $buffer."\n";
1142 1142
 				$line = explode(' ',$buffer);
1143 1143
 				if (count($line) == 11) {
1144
-				    $userserver = explode('@',$line[0]);
1145
-				    $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
1146
-				    $data['ident'] = $userserver[0];
1147
-				    $data['registration'] = $userserver[0];
1148
-				    $data['latitude'] = $line[4];
1149
-				    $data['longitude'] = $line[5];
1150
-				    $data['altitude'] = $line[6];
1151
-				    $data['datetime'] = date('Y-m-d H:i:s');
1152
-				    $aircraft_type = $line[10];
1153
-				    $aircraft_type = preg_split(':/:',$aircraft_type);
1154
-				    $data['aircraft_name'] = substr(end($aircraft_type),0,-4);
1155
-				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1156
-				    if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1144
+					$userserver = explode('@',$line[0]);
1145
+					$data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
1146
+					$data['ident'] = $userserver[0];
1147
+					$data['registration'] = $userserver[0];
1148
+					$data['latitude'] = $line[4];
1149
+					$data['longitude'] = $line[5];
1150
+					$data['altitude'] = $line[6];
1151
+					$data['datetime'] = date('Y-m-d H:i:s');
1152
+					$aircraft_type = $line[10];
1153
+					$aircraft_type = preg_split(':/:',$aircraft_type);
1154
+					$data['aircraft_name'] = substr(end($aircraft_type),0,-4);
1155
+					if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1156
+					if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1157
+				}
1157 1158
 				}
1158
-			    }
1159 1159
 			} elseif ($format == 'beast') {
1160
-			    echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
1161
-			    die;
1160
+				echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
1161
+				die;
1162 1162
 			} elseif ($format == 'vrstcp') {
1163
-			    foreach($buffer as $all_data) {
1163
+				foreach($buffer as $all_data) {
1164 1164
 				$line = json_decode('{'.$all_data.'}',true);
1165 1165
 				$data = array();
1166 1166
 				if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex
@@ -1180,106 +1180,106 @@  discard block
 block discarded – undo
1180 1180
 				*/
1181 1181
 				$data['datetime'] = date('Y-m-d H:i:s');
1182 1182
 				if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
1183
-		    		$data['format_source'] = 'vrstcp';
1183
+					$data['format_source'] = 'vrstcp';
1184 1184
 				$data['id_source'] = $id_source;
1185 1185
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1186 1186
 				if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1187 1187
 				if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data);
1188 1188
 				unset($data);
1189
-			    }
1189
+				}
1190 1190
 			} elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') {
1191
-			    $line = explode("\t", $buffer);
1192
-			    for($k = 0; $k < count($line); $k=$k+2) {
1191
+				$line = explode("\t", $buffer);
1192
+				for($k = 0; $k < count($line); $k=$k+2) {
1193 1193
 				$key = $line[$k];
1194
-			        $lined[$key] = $line[$k+1];
1195
-			    }
1196
-    			    if (count($lined) > 3) {
1197
-    				$data['hex'] = $lined['hexid'];
1198
-    				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
1199
-    				$data['datetime'] = date('Y-m-d H:i:s');;
1200
-    				if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
1201
-    				if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
1202
-    				if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
1203
-    				if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
1204
-    				if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
1205
-    				if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
1206
-    				if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
1207
-    				$data['id_source'] = $id_source;
1208
-    				$data['format_source'] = 'tsv';
1209
-    				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1210
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1194
+					$lined[$key] = $line[$k+1];
1195
+				}
1196
+					if (count($lined) > 3) {
1197
+					$data['hex'] = $lined['hexid'];
1198
+					//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
1199
+					$data['datetime'] = date('Y-m-d H:i:s');;
1200
+					if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
1201
+					if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
1202
+					if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
1203
+					if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
1204
+					if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
1205
+					if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
1206
+					if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
1207
+					$data['id_source'] = $id_source;
1208
+					$data['format_source'] = 'tsv';
1209
+					if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1210
+					if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1211 1211
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1212
-    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1213
-    				unset($lined);
1214
-    				unset($data);
1215
-    			    } else $error = true;
1212
+					if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1213
+					unset($lined);
1214
+					unset($data);
1215
+					} else $error = true;
1216 1216
 			} elseif ($format == 'aprs' && $use_aprs) {
1217
-			    if ($aprs_connect == 0) {
1217
+				if ($aprs_connect == 0) {
1218 1218
 				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
1219 1219
 				$aprs_connect = 1;
1220
-			    }
1220
+				}
1221 1221
 			    
1222
-			    if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
1222
+				if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
1223 1223
 				$aprs_last_tx = time();
1224 1224
 				$data_aprs = "# Keep alive";
1225 1225
 				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
1226
-			    }
1226
+				}
1227 1227
 			    
1228
-			    //echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
1229
-			    //echo 'APRS data : '.$buffer."\n";
1230
-			    $buffer = str_replace('APRS <- ','',$buffer);
1231
-			    $buffer = str_replace('APRS -> ','',$buffer);
1232
-			    //echo $buffer."\n";
1233
-			    if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
1228
+				//echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
1229
+				//echo 'APRS data : '.$buffer."\n";
1230
+				$buffer = str_replace('APRS <- ','',$buffer);
1231
+				$buffer = str_replace('APRS -> ','',$buffer);
1232
+				//echo $buffer."\n";
1233
+				if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
1234 1234
 				$line = $APRS->parse($buffer);
1235 1235
 				//if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) {
1236 1236
 				if (is_array($line) && isset($line['latitude']) && isset($line['longitude']) && (isset($line['ident']) || isset($line['address']) || isset($line['mmsi']))) {
1237
-				    $aprs_last_tx = time();
1238
-				    $data = array();
1239
-				    //print_r($line);
1240
-				    if (isset($line['address'])) $data['hex'] = $line['address'];
1241
-				    if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi'];
1242
-				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
1243
-				    else $data['datetime'] = date('Y-m-d H:i:s');
1244
-				    //$data['datetime'] = date('Y-m-d H:i:s');
1245
-				    if (isset($line['ident'])) $data['ident'] = $line['ident'];
1246
-				    $data['latitude'] = $line['latitude'];
1247
-				    $data['longitude'] = $line['longitude'];
1248
-				    //$data['verticalrate'] = $line[16];
1249
-				    if (isset($line['speed'])) $data['speed'] = $line['speed'];
1250
-				    else $data['speed'] = 0;
1251
-				    if (isset($line['altitude'])) $data['altitude'] = $line['altitude'];
1252
-				    if (isset($line['comment'])) $data['comment'] = $line['comment'];
1253
-				    if (isset($line['symbol'])) $data['type'] = $line['symbol'];
1254
-				    if (isset($line['heading'])) $data['heading'] = $line['heading'];
1255
-				    //else $data['heading'] = 0;
1256
-				    if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth'];
1257
-				    if (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE)) $data['noarchive'] = true;
1258
-				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1259
-    				    $data['id_source'] = $id_source;
1260
-    				    if (isset($line['format_source'])) $data['format_source'] = $line['format_source'];
1261
-				    else $data['format_source'] = 'aprs';
1262
-				    $data['source_name'] = $line['source'];
1263
-				    if (isset($line['source_type'])) $data['source_type'] = $line['source_type'];
1264
-				    else $data['source_type'] = 'flarm';
1265
-    				    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1266
-				    $currentdate = date('Y-m-d H:i:s');
1267
-				    $aprsdate = strtotime($data['datetime']);
1268
-				    // Accept data if time <= system time + 20s
1269
-				    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'])))) {
1237
+					$aprs_last_tx = time();
1238
+					$data = array();
1239
+					//print_r($line);
1240
+					if (isset($line['address'])) $data['hex'] = $line['address'];
1241
+					if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi'];
1242
+					if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
1243
+					else $data['datetime'] = date('Y-m-d H:i:s');
1244
+					//$data['datetime'] = date('Y-m-d H:i:s');
1245
+					if (isset($line['ident'])) $data['ident'] = $line['ident'];
1246
+					$data['latitude'] = $line['latitude'];
1247
+					$data['longitude'] = $line['longitude'];
1248
+					//$data['verticalrate'] = $line[16];
1249
+					if (isset($line['speed'])) $data['speed'] = $line['speed'];
1250
+					else $data['speed'] = 0;
1251
+					if (isset($line['altitude'])) $data['altitude'] = $line['altitude'];
1252
+					if (isset($line['comment'])) $data['comment'] = $line['comment'];
1253
+					if (isset($line['symbol'])) $data['type'] = $line['symbol'];
1254
+					if (isset($line['heading'])) $data['heading'] = $line['heading'];
1255
+					//else $data['heading'] = 0;
1256
+					if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth'];
1257
+					if (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE)) $data['noarchive'] = true;
1258
+					if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1259
+						$data['id_source'] = $id_source;
1260
+						if (isset($line['format_source'])) $data['format_source'] = $line['format_source'];
1261
+					else $data['format_source'] = 'aprs';
1262
+					$data['source_name'] = $line['source'];
1263
+					if (isset($line['source_type'])) $data['source_type'] = $line['source_type'];
1264
+					else $data['source_type'] = 'flarm';
1265
+						if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1266
+					$currentdate = date('Y-m-d H:i:s');
1267
+					$aprsdate = strtotime($data['datetime']);
1268
+					// Accept data if time <= system time + 20s
1269
+					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'])))) {
1270 1270
 					$send = $SI->add($data);
1271
-				    } elseif ($data['source_type'] == 'ais') {
1271
+					} elseif ($data['source_type'] == 'ais') {
1272 1272
 					echo 'add...'."\n";
1273 1273
 					$send = $MI->add($data);
1274
-				    } elseif (isset($line['stealth'])) {
1274
+					} elseif (isset($line['stealth'])) {
1275 1275
 					if ($line['stealth'] != 0) echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
1276 1276
 					else echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n";
1277
-				    //} 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')) {
1278
-				    } 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') {
1277
+					//} 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')) {
1278
+					} 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') {
1279 1279
 					//echo '!!!!!!!!!!!!!!!! SEND !!!!!!!!!!!!!!!!!!!!'."\n";
1280 1280
 					if (isset($globalTracker) && $globalTracker) $send = $TI->add($data);
1281
-				    }
1282
-				    unset($data);
1281
+					}
1282
+					unset($data);
1283 1283
 				} 
1284 1284
 				elseif (is_array($line) && $globalDebug && isset($line['symbol']) && $line['symbol'] == 'Weather Station') {
1285 1285
 					echo '!! Weather Station not yet supported'."\n";
@@ -1289,12 +1289,12 @@  discard block
 block discarded – undo
1289 1289
 				}
1290 1290
 				//elseif ($line == false && $globalDebug) echo 'Ignored ('.$buffer.")\n";
1291 1291
 				//elseif ($line == true && $globalDebug) echo '!! Failed : '.$buffer."!!\n";
1292
-			    }
1292
+				}
1293 1293
 			} else {
1294
-			    $line = explode(',', $buffer);
1295
-    			    if (count($line) > 20) {
1296
-    			    	$data['hex'] = $line[4];
1297
-    				/*
1294
+				$line = explode(',', $buffer);
1295
+					if (count($line) > 20) {
1296
+						$data['hex'] = $line[4];
1297
+					/*
1298 1298
     				$data['datetime'] = $line[6].' '.$line[7];
1299 1299
     					date_default_timezone_set($globalTimezone);
1300 1300
     					$datetime = new DateTime($data['datetime']);
@@ -1302,30 +1302,30 @@  discard block
 block discarded – undo
1302 1302
     					$data['datetime'] = $datetime->format('Y-m-d H:i:s');
1303 1303
     					date_default_timezone_set('UTC');
1304 1304
     				*/
1305
-    				// Force datetime to current UTC datetime
1306
-    				date_default_timezone_set('UTC');
1307
-    				$data['datetime'] = date('Y-m-d H:i:s');
1308
-    				$data['ident'] = trim($line[10]);
1309
-    				$data['latitude'] = $line[14];
1310
-    				$data['longitude'] = $line[15];
1311
-    				$data['verticalrate'] = $line[16];
1312
-    				$data['emergency'] = $line[20];
1313
-    				$data['speed'] = $line[12];
1314
-    				$data['squawk'] = $line[17];
1315
-    				$data['altitude'] = $line[11];
1316
-    				$data['heading'] = $line[13];
1317
-    				$data['ground'] = $line[21];
1318
-    				$data['emergency'] = $line[19];
1319
-    				$data['format_source'] = 'sbs';
1305
+					// Force datetime to current UTC datetime
1306
+					date_default_timezone_set('UTC');
1307
+					$data['datetime'] = date('Y-m-d H:i:s');
1308
+					$data['ident'] = trim($line[10]);
1309
+					$data['latitude'] = $line[14];
1310
+					$data['longitude'] = $line[15];
1311
+					$data['verticalrate'] = $line[16];
1312
+					$data['emergency'] = $line[20];
1313
+					$data['speed'] = $line[12];
1314
+					$data['squawk'] = $line[17];
1315
+					$data['altitude'] = $line[11];
1316
+					$data['heading'] = $line[13];
1317
+					$data['ground'] = $line[21];
1318
+					$data['emergency'] = $line[19];
1319
+					$data['format_source'] = 'sbs';
1320 1320
 				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1321
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1321
+					if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1322 1322
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1323
-    				$data['id_source'] = $id_source;
1324
-    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
1325
-    				else $error = true;
1326
-    				unset($data);
1327
-    			    } else $error = true;
1328
-			    if ($error) {
1323
+					$data['id_source'] = $id_source;
1324
+					if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
1325
+					else $error = true;
1326
+					unset($data);
1327
+					} else $error = true;
1328
+				if ($error) {
1329 1329
 				if (count($line) > 1 && ($line[0] == 'STA' || $line[0] == 'AIR' || $line[0] == 'SEL' || $line[0] == 'ID' || $line[0] == 'CLK')) { 
1330 1330
 					if ($globalDebug) echo "Not a message. Ignoring... \n";
1331 1331
 				} else {
@@ -1341,13 +1341,13 @@  discard block
 block discarded – undo
1341 1341
 					connect_all($sourceer);
1342 1342
 					$sourceer = array();
1343 1343
 				}
1344
-			    }
1344
+				}
1345 1345
 			}
1346 1346
 			// Sleep for xxx microseconds
1347 1347
 			if (isset($globalSBSSleep)) usleep($globalSBSSleep);
1348
-		    } else {
1348
+			} else {
1349 1349
 			if ($format == 'flightgearmp') {
1350
-			    	if ($globalDebug) echo "Reconnect FlightGear MP...";
1350
+					if ($globalDebug) echo "Reconnect FlightGear MP...";
1351 1351
 				//@socket_close($r);
1352 1352
 				sleep($globalMinFetch);
1353 1353
 				$sourcefg[$nb] = $globalSources[$nb];
@@ -1356,9 +1356,9 @@  discard block
 block discarded – undo
1356 1356
 				break;
1357 1357
 				
1358 1358
 			} elseif ($format != 'acars' && $format != 'flightgearsp') {
1359
-			    if (isset($tt[$format])) $tt[$format]++;
1360
-			    else $tt[$format] = 0;
1361
-			    if ($tt[$format] > 30) {
1359
+				if (isset($tt[$format])) $tt[$format]++;
1360
+				else $tt[$format] = 0;
1361
+				if ($tt[$format] > 30) {
1362 1362
 				if ($globalDebug) echo "ERROR : Reconnect ".$format."...";
1363 1363
 				//@socket_close($r);
1364 1364
 				sleep(2);
@@ -1369,23 +1369,23 @@  discard block
 block discarded – undo
1369 1369
 				//connect_all($globalSources);
1370 1370
 				$tt[$format]=0;
1371 1371
 				break;
1372
-			    }
1372
+				}
1373
+			}
1373 1374
 			}
1374
-		    }
1375 1375
 		}
1376
-	    } else {
1376
+		} else {
1377 1377
 		$error = socket_strerror(socket_last_error());
1378 1378
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) {
1379 1379
 			if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
1380 1380
 			if (isset($globalDebug)) echo "Restarting...\n";
1381 1381
 			// Restart the script if possible
1382 1382
 			if (is_array($sockets)) {
1383
-			    if ($globalDebug) echo "Shutdown all sockets...";
1383
+				if ($globalDebug) echo "Shutdown all sockets...";
1384 1384
 			    
1385
-			    foreach ($sockets as $sock) {
1385
+				foreach ($sockets as $sock) {
1386 1386
 				@socket_shutdown($sock,2);
1387 1387
 				@socket_close($sock);
1388
-			    }
1388
+				}
1389 1389
 			    
1390 1390
 			}
1391 1391
 			if ($globalDebug) echo "Restart all connections...";
@@ -1399,13 +1399,13 @@  discard block
 block discarded – undo
1399 1399
 			if ($reset > 100) exit('Too many attempts...');
1400 1400
 			connect_all($globalSources);
1401 1401
 		}
1402
-	    }
1402
+		}
1403 1403
 	}
1404 1404
 	if ($globalDaemon === false) {
1405
-	    if ($globalDebug) echo 'Check all...'."\n";
1406
-	    $SI->checkAll();
1405
+		if ($globalDebug) echo 'Check all...'."\n";
1406
+		$SI->checkAll();
1407
+	}
1407 1408
 	}
1408
-    }
1409 1409
 }
1410 1410
 
1411 1411
 ?>
Please login to merge, or discard this patch.
Spacing   +142 added lines, -142 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);
@@ -399,11 +399,11 @@  discard block
 block discarded – undo
399 399
     	    $last_exec[$id]['last'] = time();
400 400
 	} elseif ($value['format'] == 'aisnmeatxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
401 401
 	    date_default_timezone_set('CET');
402
-	    $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
402
+	    $buffer = $Common->getData(str_replace('{date}', date('Ymd'), $value['host']));
403 403
 	    date_default_timezone_set('UTC');
404 404
 	    if ($buffer != '') $reset = 0;
405
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
406
-	    $buffer = explode('\n',$buffer);
405
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
406
+	    $buffer = explode('\n', $buffer);
407 407
 	    foreach ($buffer as $line) {
408 408
 		if ($line != '') {
409 409
 		    echo "'".$line."'\n";
@@ -421,7 +421,7 @@  discard block
 block discarded – undo
421 421
 		    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
422 422
 		    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
423 423
 		    if (isset($ais_data['timestamp'])) {
424
-			$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
424
+			$data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']);
425 425
 			if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) {
426 426
 			    $last_exec[$id]['timestamp'] = $ais_data['timestamp'];
427 427
 			    $add = true;
@@ -445,12 +445,12 @@  discard block
 block discarded – undo
445 445
 	    $w = $e = null;
446 446
 	    
447 447
 	    if (isset($arr[$id])) {
448
-		$nn = stream_select($arr,$w,$e,$timeout);
448
+		$nn = stream_select($arr, $w, $e, $timeout);
449 449
 		if ($nn > 0) {
450 450
 		    foreach ($httpfeeds as $feed) {
451
-			$buffer = stream_get_line($feed,2000,"\n");
452
-			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
453
-			$buffer = explode('\n',$buffer);
451
+			$buffer = stream_get_line($feed, 2000, "\n");
452
+			$buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
453
+			$buffer = explode('\n', $buffer);
454 454
 			foreach ($buffer as $line) {
455 455
 			    if ($line != '') {
456 456
 				$ais_data = $AIS->parse_line(trim($line));
@@ -466,9 +466,9 @@  discard block
 block discarded – undo
466 466
 				if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
467 467
 				if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
468 468
 				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
469
-				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
469
+				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s', $ais_data['eta_ts']);
470 470
 				if (isset($ais_data['timestamp'])) {
471
-				    $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
471
+				    $data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']);
472 472
 				} else {
473 473
 				    $data['datetime'] = date('Y-m-d H:i:s');
474 474
 				}
@@ -493,10 +493,10 @@  discard block
 block discarded – undo
493 493
 		}
494 494
 	    }
495 495
 	} elseif ($value['format'] == 'myshiptracking' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
496
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
496
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20');
497 497
 	    if ($buffer != '') {
498 498
 		//echo $buffer;
499
-		$all_data = json_decode($buffer,true);
499
+		$all_data = json_decode($buffer, true);
500 500
 		//print_r($all_data);
501 501
 		if (isset($all_data[0]['DATA'])) {
502 502
 		foreach ($all_data[0]['DATA'] as $line) {
@@ -511,7 +511,7 @@  discard block
 block discarded – undo
511 511
 			//    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
512 512
 			$data['imo'] = $line['IMO'];
513 513
 			//$data['arrival_code'] = $ais_data['destination'];
514
-			$data['datetime'] = date('Y-m-d H:i:s',$line['T']);
514
+			$data['datetime'] = date('Y-m-d H:i:s', $line['T']);
515 515
 			$data['format_source'] = 'myshiptracking';
516 516
 			$data['id_source'] = $id_source;
517 517
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -524,9 +524,9 @@  discard block
 block discarded – undo
524 524
 	    }
525 525
     	    $last_exec[$id]['last'] = time();
526 526
 	} elseif ($value['format'] == 'boatbeaconapp' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
527
-	    $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host']));
527
+	    $buffer = $Common->getData(str_replace('{timestamp}', time(), $value['host']));
528 528
 	    if ($buffer != '') {
529
-		$all_data = json_decode($buffer,true);
529
+		$all_data = json_decode($buffer, true);
530 530
 		if (isset($all_data[0]['mmsi'])) {
531 531
 		    foreach ($all_data as $line) {
532 532
 			if ($line != '') {
@@ -554,27 +554,27 @@  discard block
 block discarded – undo
554 554
     	    $last_exec[$id]['last'] = time();
555 555
 	} elseif ($value['format'] == 'shipplotter' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
556 556
 	    echo 'download...';
557
-	    $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
557
+	    $buffer = $Common->getData($value['host'], 'post', $value['post'], '', '', '', '', 'ShipPlotter');
558 558
 	    echo 'done !'."\n";
559 559
 	    if ($buffer != '') $reset = 0;
560
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
561
-	    $buffer = explode('\n',$buffer);
560
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
561
+	    $buffer = explode('\n', $buffer);
562 562
 	    foreach ($buffer as $line) {
563 563
 		if ($line != '') {
564 564
 		    $data = array();
565
-		    $data['mmsi'] = (int)substr($line,0,9);
566
-		    $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
565
+		    $data['mmsi'] = (int) substr($line, 0, 9);
566
+		    $data['datetime'] = date('Y-m-d H:i:s', substr($line, 10, 10));
567 567
 		    //$data['status'] = substr($line,21,2);
568 568
 		    //$data['type'] = substr($line,24,3);
569
-		    $data['latitude'] = substr($line,29,9);
570
-		    $data['longitude'] = substr($line,41,9);
571
-		    $data['speed'] = round(substr($line,51,5));
569
+		    $data['latitude'] = substr($line, 29, 9);
570
+		    $data['longitude'] = substr($line, 41, 9);
571
+		    $data['speed'] = round(substr($line, 51, 5));
572 572
 		    //$data['course'] = substr($line,57,5);
573
-		    $data['heading'] = round(substr($line,63,3));
573
+		    $data['heading'] = round(substr($line, 63, 3));
574 574
 		    //$data['draft'] = substr($line,67,4);
575 575
 		    //$data['length'] = substr($line,72,3);
576 576
 		    //$data['beam'] = substr($line,76,2);
577
-		    $data['ident'] = trim(utf8_encode(substr($line,79,20)));
577
+		    $data['ident'] = trim(utf8_encode(substr($line, 79, 20)));
578 578
 		    //$data['callsign'] = trim(substr($line,100,7);
579 579
 		    //$data['dest'] = substr($line,108,20);
580 580
 		    //$data['etaDate'] = substr($line,129,5);
@@ -593,8 +593,8 @@  discard block
 block discarded – undo
593 593
 	} elseif (($value['format'] == 'whazzup' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) || ($value['format'] == 'vatsimtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch))) {
594 594
 	    //$buffer = $Common->getData($hosts[$id]);
595 595
 	    $buffer = $Common->getData($value['host']);
596
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
597
-	    $buffer = explode('\n',$buffer);
596
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
597
+	    $buffer = explode('\n', $buffer);
598 598
 	    $reset = 0;
599 599
 	    foreach ($buffer as $line) {
600 600
     		if ($line != '') {
@@ -605,7 +605,7 @@  discard block
 block discarded – undo
605 605
 			else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
606 606
 			$data['pilot_id'] = $line[1];
607 607
 			$data['pilot_name'] = $line[2];
608
-			$data['hex'] = str_pad(dechex($Common->str2int($line[1])),6,'000000',STR_PAD_LEFT);
608
+			$data['hex'] = str_pad(dechex($Common->str2int($line[1])), 6, '000000', STR_PAD_LEFT);
609 609
 			$data['ident'] = $line[0]; // ident
610 610
 			if ($line[7] != '' && $line[7] != 0) $data['altitude'] = $line[7]; // altitude
611 611
 			$data['speed'] = $line[8]; // speed
@@ -621,7 +621,7 @@  discard block
 block discarded – undo
621 621
 			//$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37]));
622 622
 			//if (isset($line[37])) $data['last_update'] = $line[37];
623 623
 		        $data['departure_airport_icao'] = $line[11];
624
-		        $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
624
+		        $data['departure_airport_time'] = rtrim(chunk_split($line[22], 2, ':'), ':');
625 625
 		        $data['arrival_airport_icao'] = $line[13];
626 626
 			$data['frequency'] = $line[4];
627 627
 			$data['type'] = $line[18];
@@ -630,7 +630,7 @@  discard block
 block discarded – undo
630 630
     			$data['id_source'] = $id_source;
631 631
 	    		//$data['arrival_airport_time'] = ;
632 632
 	    		if ($line[9] != '') {
633
-	    		    $aircraft_data = explode('/',$line[9]);
633
+	    		    $aircraft_data = explode('/', $line[9]);
634 634
 	    		    if (isset($aircraft_data[1])) {
635 635
 	    			$data['aircraft_icao'] = $aircraft_data[1];
636 636
 	    		    }
@@ -645,9 +645,9 @@  discard block
 block discarded – undo
645 645
     			if ($line[3] == 'PILOT') $SI->add($data);
646 646
 			elseif ($line[3] == 'ATC') {
647 647
 				//print_r($data);
648
-				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
649
-				$data['info'] = str_replace('&amp;sect;','',$data['info']);
650
-				$typec = substr($data['ident'],-3);
648
+				$data['info'] = str_replace('^&sect;', '<br />', $data['info']);
649
+				$data['info'] = str_replace('&amp;sect;', '', $data['info']);
650
+				$typec = substr($data['ident'], -3);
651 651
 				if ($typec == 'APP') $data['type'] = 'Approach';
652 652
 				elseif ($typec == 'TWR') $data['type'] = 'Tower';
653 653
 				elseif ($typec == 'OBS') $data['type'] = 'Observer';
@@ -658,7 +658,7 @@  discard block
 block discarded – undo
658 658
 				elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
659 659
 				elseif ($data['type'] == '') $data['type'] = 'Observer';
660 660
 				if (!isset($data['source_name'])) $data['source_name'] = '';
661
-				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']);
661
+				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']);
662 662
 			}
663 663
     			unset($data);
664 664
     		    }
@@ -669,9 +669,9 @@  discard block
 block discarded – undo
669 669
     	    $last_exec[$id]['last'] = time();
670 670
     	//} elseif ($value == 'aircraftlistjson' && (time() - $last_exec['aircraftlistjson'] > $globalMinFetch)) {
671 671
     	} elseif ($value['format'] == 'aircraftlistjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
672
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
672
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20');
673 673
 	    if ($buffer != '') {
674
-	    $all_data = json_decode($buffer,true);
674
+	    $all_data = json_decode($buffer, true);
675 675
 	    if (isset($all_data['acList'])) {
676 676
 		$reset = 0;
677 677
 		foreach ($all_data['acList'] as $line) {
@@ -688,7 +688,7 @@  discard block
 block discarded – undo
688 688
 		    $data['emergency'] = ''; // emergency
689 689
 		    if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
690 690
 		    
691
-		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
691
+		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s', round($line['PosTime']/1000));
692 692
 		    else $data['datetime'] = date('Y-m-d H:i:s');
693 693
 		    
694 694
 		    //$data['datetime'] = date('Y-m-d H:i:s');
@@ -714,7 +714,7 @@  discard block
 block discarded – undo
714 714
 		    $data['verticalrate'] = $line['vrt']; // verticale rate
715 715
 		    $data['squawk'] = $line['squawk']; // squawk
716 716
 		    $data['emergency'] = ''; // emergency
717
-		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
717
+		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s', round($line['PosTime']/1000));
718 718
 		    else $data['datetime'] = date('Y-m-d H:i:s');
719 719
 	    	    $data['format_source'] = 'aircraftlistjson';
720 720
     		    $data['id_source'] = $id_source;
@@ -730,7 +730,7 @@  discard block
 block discarded – undo
730 730
     	//} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
731 731
     	} elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
732 732
 	    $buffer = $Common->getData($value['host']);
733
-	    $all_data = json_decode($buffer,true);
733
+	    $all_data = json_decode($buffer, true);
734 734
 	    if (isset($all_data['planes'])) {
735 735
 		$reset = 0;
736 736
 		foreach ($all_data['planes'] as $key => $line) {
@@ -747,12 +747,12 @@  discard block
 block discarded – undo
747 747
 		    $data['emergency'] = ''; // emergency
748 748
 		    $data['registration'] = $line[2];
749 749
 		    $data['aircraft_icao'] = $line[0];
750
-		    $deparr = explode('-',$line[1]);
750
+		    $deparr = explode('-', $line[1]);
751 751
 		    if (count($deparr) == 2) {
752 752
 			$data['departure_airport_icao'] = $deparr[0];
753 753
 			$data['arrival_airport_icao'] = $deparr[1];
754 754
 		    }
755
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]);
755
+		    $data['datetime'] = date('Y-m-d H:i:s', $line[9]);
756 756
 	    	    $data['format_source'] = 'planeupdatefaa';
757 757
     		    $data['id_source'] = $id_source;
758 758
 		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -765,7 +765,7 @@  discard block
 block discarded – undo
765 765
     	    $last_exec[$id]['last'] = time();
766 766
     	} elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
767 767
 	    $buffer = $Common->getData($value['host']);
768
-	    $all_data = json_decode($buffer,true);
768
+	    $all_data = json_decode($buffer, true);
769 769
 	    if (isset($all_data['states'])) {
770 770
 		$reset = 0;
771 771
 		foreach ($all_data['states'] as $key => $line) {
@@ -782,7 +782,7 @@  discard block
 block discarded – undo
782 782
 		    //$data['emergency'] = ''; // emergency
783 783
 		    //$data['registration'] = $line[2];
784 784
 		    //$data['aircraft_icao'] = $line[0];
785
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]);
785
+		    $data['datetime'] = date('Y-m-d H:i:s', $line[3]);
786 786
 	    	    $data['format_source'] = 'opensky';
787 787
     		    $data['id_source'] = $id_source;
788 788
 		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -796,7 +796,7 @@  discard block
 block discarded – undo
796 796
     	} elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
797 797
 	    //$buffer = $Common->getData($hosts[$id]);
798 798
 	    $buffer = $Common->getData($value['host']);
799
-	    $all_data = json_decode($buffer,true);
799
+	    $all_data = json_decode($buffer, true);
800 800
 	    if (!empty($all_data)) $reset = 0;
801 801
 	    foreach ($all_data as $key => $line) {
802 802
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
@@ -829,11 +829,11 @@  discard block
 block discarded – undo
829 829
     	//} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) {
830 830
     	} elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
831 831
 	    //$buffer = $Common->getData($hosts[$id],'get','','','','','150');
832
-	    $buffer = $Common->getData($value['host'],'get','','','','','150');
832
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '150');
833 833
 	    //echo $buffer;
834
-	    $buffer = str_replace(array("\n","\r"),"",$buffer);
835
-	    $buffer = preg_replace('/,"num":(.+)/','}',$buffer);
836
-	    $all_data = json_decode($buffer,true);
834
+	    $buffer = str_replace(array("\n", "\r"), "", $buffer);
835
+	    $buffer = preg_replace('/,"num":(.+)/', '}', $buffer);
836
+	    $all_data = json_decode($buffer, true);
837 837
 	    if (json_last_error() != JSON_ERROR_NONE) {
838 838
 		die(json_last_error_msg());
839 839
 	    }
@@ -856,7 +856,7 @@  discard block
 block discarded – undo
856 856
 			//$data['departure_airport_iata'] = $line[11];
857 857
 			//$data['arrival_airport_iata'] = $line[12];
858 858
 	    		//$data['emergency'] = ''; // emergency
859
-			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10]
859
+			$data['datetime'] = date('Y-m-d H:i:s', $line['inf']['dt']); //$line[10]
860 860
 	    		$data['format_source'] = 'radarvirtueljson';
861 861
     			$data['id_source'] = $id_source;
862 862
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -872,14 +872,14 @@  discard block
 block discarded – undo
872 872
     	} elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
873 873
 	    //$buffer = $Common->getData($hosts[$id]);
874 874
 	    $buffer = $Common->getData($value['host'].'?'.time());
875
-	    $all_data = json_decode(utf8_encode($buffer),true);
875
+	    $all_data = json_decode(utf8_encode($buffer), true);
876 876
 	    
877 877
 	    if (isset($all_data['pireps'])) {
878 878
 		$reset = 0;
879 879
 	        foreach ($all_data['pireps'] as $line) {
880 880
 		    $data = array();
881 881
 		    $data['id'] = $line['id'];
882
-		    $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
882
+		    $data['hex'] = substr(str_pad(dechex($line['id']), 6, '000000', STR_PAD_LEFT), 0, 6);
883 883
 		    $data['ident'] = $line['callsign']; // ident
884 884
 		    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
885 885
 		    if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
@@ -909,9 +909,9 @@  discard block
 block discarded – undo
909 909
 			$SI->add($data);
910 910
 		    //    print_r($data);
911 911
     		    } elseif ($line['icon'] == 'ct') {
912
-			$data['info'] = str_replace('^&sect;','<br />',$data['info']);
913
-			$data['info'] = str_replace('&amp;sect;','',$data['info']);
914
-			$typec = substr($data['ident'],-3);
912
+			$data['info'] = str_replace('^&sect;', '<br />', $data['info']);
913
+			$data['info'] = str_replace('&amp;sect;', '', $data['info']);
914
+			$typec = substr($data['ident'], -3);
915 915
 			$data['type'] = '';
916 916
 			if ($typec == 'APP') $data['type'] = 'Approach';
917 917
 			elseif ($typec == 'TWR') $data['type'] = 'Tower';
@@ -922,7 +922,7 @@  discard block
 block discarded – undo
922 922
 			elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station';
923 923
 			elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
924 924
 			else $data['type'] = 'Observer';
925
-			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']);
925
+			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']);
926 926
 		    }
927 927
 		    unset($data);
928 928
 		}
@@ -934,14 +934,14 @@  discard block
 block discarded – undo
934 934
 	    //$buffer = $Common->getData($hosts[$id]);
935 935
 	    if ($globalDebug) echo 'Get Data...'."\n";
936 936
 	    $buffer = $Common->getData($value['host']);
937
-	    $all_data = json_decode($buffer,true);
937
+	    $all_data = json_decode($buffer, true);
938 938
 	    if ($buffer != '' && is_array($all_data)) {
939 939
 		$reset = 0;
940 940
 		foreach ($all_data as $line) {
941 941
 	    	    $data = array();
942 942
 	    	    //$data['id'] = $line['id']; // id not usable
943 943
 	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
944
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
944
+	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']), 6, '000000', STR_PAD_LEFT), -6); // hex
945 945
 	    	    if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
946 946
 	    	    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
947 947
 	    	    $data['ident'] = $line['flightnum']; // ident
@@ -965,14 +965,14 @@  discard block
 block discarded – undo
965 965
 		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
966 966
 		    if (isset($line['aircraftname'])) {
967 967
 			$line['aircraftname'] = strtoupper($line['aircraftname']);
968
-			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']);
969
-	    		$aircraft_data = explode('-',$line['aircraftname']);
968
+			$line['aircraftname'] = str_replace('BOEING ', 'B', $line['aircraftname']);
969
+	    		$aircraft_data = explode('-', $line['aircraftname']);
970 970
 	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
971 971
 	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
972 972
 	    		else {
973
-	    		    $aircraft_data = explode(' ',$line['aircraftname']);
974
-	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
975
-	    		    else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
973
+	    		    $aircraft_data = explode(' ', $line['aircraftname']);
974
+	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-', '', $aircraft_data[1]);
975
+	    		    else $data['aircraft_icao'] = str_replace('-', '', $line['aircraftname']);
976 976
 	    		}
977 977
 	    	    }
978 978
     		    if (isset($line['route'])) $data['waypoints'] = $line['route'];
@@ -992,14 +992,14 @@  discard block
 block discarded – undo
992 992
 	    //$buffer = $Common->getData($hosts[$id]);
993 993
 	    if ($globalDebug) echo 'Get Data...'."\n";
994 994
 	    $buffer = $Common->getData($value['host']);
995
-	    $all_data = json_decode($buffer,true);
995
+	    $all_data = json_decode($buffer, true);
996 996
 	    if ($buffer != '' && is_array($all_data)) {
997 997
 		$reset = 0;
998 998
 		foreach ($all_data as $line) {
999 999
 	    	    $data = array();
1000 1000
 	    	    //$data['id'] = $line['id']; // id not usable
1001 1001
 	    	    $data['id'] = trim($line['flight_id']);
1002
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
1002
+	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']), 6, '000000', STR_PAD_LEFT), -6); // hex
1003 1003
 	    	    $data['pilot_name'] = $line['pilot_name'];
1004 1004
 	    	    $data['pilot_id'] = $line['pilot_id'];
1005 1005
 	    	    $data['ident'] = trim($line['callsign']); // ident
@@ -1051,11 +1051,11 @@  discard block
 block discarded – undo
1051 1051
 		    //$value = $formats[$nb];
1052 1052
 		    $format = $globalSources[$nb]['format'];
1053 1053
 		    if ($format == 'sbs' || $format == 'aprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') {
1054
-			$buffer = @socket_read($r, 6000,PHP_NORMAL_READ);
1054
+			$buffer = @socket_read($r, 6000, PHP_NORMAL_READ);
1055 1055
 		    } elseif ($format == 'vrstcp') {
1056 1056
 			$buffer = @socket_read($r, 6000);
1057 1057
 		    } else {
1058
-			$az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port);
1058
+			$az = socket_recvfrom($r, $buffer, 6000, 0, $remote_ip, $remote_port);
1059 1059
 		    }
1060 1060
 		    //$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
1061 1061
 		    //echo $buffer."\n";
@@ -1064,8 +1064,8 @@  discard block
 block discarded – undo
1064 1064
 		    $error = false;
1065 1065
 		    //$SI::del();
1066 1066
 		    if ($format == 'vrstcp') {
1067
-			$buffer = explode('},{',$buffer);
1068
-		    } else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
1067
+			$buffer = explode('},{', $buffer);
1068
+		    } else $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '', $buffer));
1069 1069
 		    // SBS format is CSV format
1070 1070
 		    if ($buffer !== FALSE && $buffer != '') {
1071 1071
 			$tt[$format] = 0;
@@ -1098,11 +1098,11 @@  discard block
 block discarded – undo
1098 1098
 			    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
1099 1099
 			    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
1100 1100
 			    if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
1101
-			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
1101
+			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s', $ais_data['eta_ts']);
1102 1102
 			    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1103 1103
 
1104 1104
 			    if (isset($ais_data['timestamp'])) {
1105
-				$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
1105
+				$data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']);
1106 1106
 			    } else {
1107 1107
 				$data['datetime'] = date('Y-m-d H:i:s');
1108 1108
 			    }
@@ -1113,10 +1113,10 @@  discard block
 block discarded – undo
1113 1113
                         } elseif ($format == 'flightgearsp') {
1114 1114
                     	    //echo $buffer."\n";
1115 1115
                     	    if (strlen($buffer) > 5) {
1116
-				$line = explode(',',$buffer);
1116
+				$line = explode(',', $buffer);
1117 1117
 				$data = array();
1118 1118
 				//XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p
1119
-				$data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]),6,'000000',STR_PAD_LEFT),0,6);
1119
+				$data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]), 6, '000000', STR_PAD_LEFT), 0, 6);
1120 1120
 				$data['ident'] = $line[6];
1121 1121
 				$data['aircraft_name'] = $line[7];
1122 1122
 				$data['longitude'] = $line[1];
@@ -1128,21 +1128,21 @@  discard block
 block discarded – undo
1128 1128
 				$data['format_source'] = 'flightgearsp';
1129 1129
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1130 1130
 				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1131
-				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
1131
+				$send = @ socket_send($r, $data_aprs, strlen($data_aprs), 0);
1132 1132
 			    }
1133 1133
                         } elseif ($format == 'acars') {
1134 1134
                     	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1135 1135
 			    $ACARS->add(trim($buffer));
1136
-			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
1136
+			    socket_sendto($r, "OK ".$buffer, 100, 0, $remote_ip, $remote_port);
1137 1137
 			    $ACARS->deleteLiveAcarsData();
1138 1138
 			} elseif ($format == 'flightgearmp') {
1139
-			    if (substr($buffer,0,1) != '#') {
1139
+			    if (substr($buffer, 0, 1) != '#') {
1140 1140
 				$data = array();
1141 1141
 				//echo $buffer."\n";
1142
-				$line = explode(' ',$buffer);
1142
+				$line = explode(' ', $buffer);
1143 1143
 				if (count($line) == 11) {
1144
-				    $userserver = explode('@',$line[0]);
1145
-				    $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
1144
+				    $userserver = explode('@', $line[0]);
1145
+				    $data['hex'] = substr(str_pad(bin2hex($line[0]), 6, '000000', STR_PAD_LEFT), 0, 6); // hex
1146 1146
 				    $data['ident'] = $userserver[0];
1147 1147
 				    $data['registration'] = $userserver[0];
1148 1148
 				    $data['latitude'] = $line[4];
@@ -1150,8 +1150,8 @@  discard block
 block discarded – undo
1150 1150
 				    $data['altitude'] = $line[6];
1151 1151
 				    $data['datetime'] = date('Y-m-d H:i:s');
1152 1152
 				    $aircraft_type = $line[10];
1153
-				    $aircraft_type = preg_split(':/:',$aircraft_type);
1154
-				    $data['aircraft_name'] = substr(end($aircraft_type),0,-4);
1153
+				    $aircraft_type = preg_split(':/:', $aircraft_type);
1154
+				    $data['aircraft_name'] = substr(end($aircraft_type), 0, -4);
1155 1155
 				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1156 1156
 				    if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1157 1157
 				}
@@ -1160,8 +1160,8 @@  discard block
 block discarded – undo
1160 1160
 			    echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
1161 1161
 			    die;
1162 1162
 			} elseif ($format == 'vrstcp') {
1163
-			    foreach($buffer as $all_data) {
1164
-				$line = json_decode('{'.$all_data.'}',true);
1163
+			    foreach ($buffer as $all_data) {
1164
+				$line = json_decode('{'.$all_data.'}', true);
1165 1165
 				$data = array();
1166 1166
 				if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex
1167 1167
 				if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
@@ -1187,16 +1187,16 @@  discard block
 block discarded – undo
1187 1187
 				if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data);
1188 1188
 				unset($data);
1189 1189
 			    }
1190
-			} elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') {
1190
+			} elseif ($format == 'tsv' || substr($buffer, 0, 4) == 'clock') {
1191 1191
 			    $line = explode("\t", $buffer);
1192
-			    for($k = 0; $k < count($line); $k=$k+2) {
1192
+			    for ($k = 0; $k < count($line); $k = $k + 2) {
1193 1193
 				$key = $line[$k];
1194
-			        $lined[$key] = $line[$k+1];
1194
+			        $lined[$key] = $line[$k + 1];
1195 1195
 			    }
1196 1196
     			    if (count($lined) > 3) {
1197 1197
     				$data['hex'] = $lined['hexid'];
1198 1198
     				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
1199
-    				$data['datetime'] = date('Y-m-d H:i:s');;
1199
+    				$data['datetime'] = date('Y-m-d H:i:s'); ;
1200 1200
     				if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
1201 1201
     				if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
1202 1202
     				if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
@@ -1215,22 +1215,22 @@  discard block
 block discarded – undo
1215 1215
     			    } else $error = true;
1216 1216
 			} elseif ($format == 'aprs' && $use_aprs) {
1217 1217
 			    if ($aprs_connect == 0) {
1218
-				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
1218
+				$send = @ socket_send($r, $aprs_login, strlen($aprs_login), 0);
1219 1219
 				$aprs_connect = 1;
1220 1220
 			    }
1221 1221
 			    
1222
-			    if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
1222
+			    if ($aprs_keep > 60 && time() - $aprs_last_tx > $aprs_keep) {
1223 1223
 				$aprs_last_tx = time();
1224 1224
 				$data_aprs = "# Keep alive";
1225
-				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
1225
+				$send = @ socket_send($r, $data_aprs, strlen($data_aprs), 0);
1226 1226
 			    }
1227 1227
 			    
1228 1228
 			    //echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
1229 1229
 			    //echo 'APRS data : '.$buffer."\n";
1230
-			    $buffer = str_replace('APRS <- ','',$buffer);
1231
-			    $buffer = str_replace('APRS -> ','',$buffer);
1230
+			    $buffer = str_replace('APRS <- ', '', $buffer);
1231
+			    $buffer = str_replace('APRS -> ', '', $buffer);
1232 1232
 			    //echo $buffer."\n";
1233
-			    if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
1233
+			    if (substr($buffer, 0, 1) != '#' && substr($buffer, 0, 1) != '@' && substr($buffer, 0, 5) != 'APRS ') {
1234 1234
 				$line = $APRS->parse($buffer);
1235 1235
 				//if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) {
1236 1236
 				if (is_array($line) && isset($line['latitude']) && isset($line['longitude']) && (isset($line['ident']) || isset($line['address']) || isset($line['mmsi']))) {
@@ -1239,7 +1239,7 @@  discard block
 block discarded – undo
1239 1239
 				    //print_r($line);
1240 1240
 				    if (isset($line['address'])) $data['hex'] = $line['address'];
1241 1241
 				    if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi'];
1242
-				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
1242
+				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s', $line['timestamp']);
1243 1243
 				    else $data['datetime'] = date('Y-m-d H:i:s');
1244 1244
 				    //$data['datetime'] = date('Y-m-d H:i:s');
1245 1245
 				    if (isset($line['ident'])) $data['ident'] = $line['ident'];
@@ -1266,7 +1266,7 @@  discard block
 block discarded – undo
1266 1266
 				    $currentdate = date('Y-m-d H:i:s');
1267 1267
 				    $aprsdate = strtotime($data['datetime']);
1268 1268
 				    // Accept data if time <= system time + 20s
1269
-				    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'])))) {
1269
+				    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'])))) {
1270 1270
 					$send = $SI->add($data);
1271 1271
 				    } elseif ($data['source_type'] == 'ais') {
1272 1272
 					echo 'add...'."\n";
@@ -1367,7 +1367,7 @@  discard block
 block discarded – undo
1367 1367
 				connect_all($sourceee);
1368 1368
 				$sourceee = array();
1369 1369
 				//connect_all($globalSources);
1370
-				$tt[$format]=0;
1370
+				$tt[$format] = 0;
1371 1371
 				break;
1372 1372
 			    }
1373 1373
 			}
@@ -1376,14 +1376,14 @@  discard block
 block discarded – undo
1376 1376
 	    } else {
1377 1377
 		$error = socket_strerror(socket_last_error());
1378 1378
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) {
1379
-			if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
1379
+			if ($globalDebug) echo "ERROR : socket_select give this error ".$error."\n";
1380 1380
 			if (isset($globalDebug)) echo "Restarting...\n";
1381 1381
 			// Restart the script if possible
1382 1382
 			if (is_array($sockets)) {
1383 1383
 			    if ($globalDebug) echo "Shutdown all sockets...";
1384 1384
 			    
1385 1385
 			    foreach ($sockets as $sock) {
1386
-				@socket_shutdown($sock,2);
1386
+				@socket_shutdown($sock, 2);
1387 1387
 				@socket_close($sock);
1388 1388
 			    }
1389 1389
 			    
Please login to merge, or discard this patch.
Braces   +893 added lines, -307 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,20 +495,41 @@  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['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
394
-		    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['noarchive']) && $value['noarchive'] === TRUE) {
528
+		    	$data['noarchive'] = true;
529
+		    }
530
+		    if (isset($value['sourcestats'])) {
531
+		    	$data['sourcestats'] = $value['sourcestats'];
532
+		    }
395 533
     		    $SI->add($data);
396 534
 		    unset($data);
397 535
     		}
@@ -401,7 +539,9 @@  discard block
 block discarded – undo
401 539
 	    date_default_timezone_set('CET');
402 540
 	    $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
403 541
 	    date_default_timezone_set('UTC');
404
-	    if ($buffer != '') $reset = 0;
542
+	    if ($buffer != '') {
543
+	    	$reset = 0;
544
+	    }
405 545
     	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
406 546
 	    $buffer = explode('\n',$buffer);
407 547
 	    foreach ($buffer as $line) {
@@ -410,16 +550,36 @@  discard block
 block discarded – undo
410 550
 		    $add = false;
411 551
 		    $ais_data = $AIS->parse_line(trim($line));
412 552
 		    $data = array();
413
-		    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
414
-		    if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
415
-		    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
416
-		    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
417
-		    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
418
-		    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
419
-		    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
420
-		    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
421
-		    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
422
-		    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
553
+		    if (isset($ais_data['ident'])) {
554
+		    	$data['ident'] = $ais_data['ident'];
555
+		    }
556
+		    if (isset($ais_data['mmsi'])) {
557
+		    	$data['mmsi'] = $ais_data['mmsi'];
558
+		    }
559
+		    if (isset($ais_data['speed'])) {
560
+		    	$data['speed'] = $ais_data['speed'];
561
+		    }
562
+		    if (isset($ais_data['heading'])) {
563
+		    	$data['heading'] = $ais_data['heading'];
564
+		    }
565
+		    if (isset($ais_data['latitude'])) {
566
+		    	$data['latitude'] = $ais_data['latitude'];
567
+		    }
568
+		    if (isset($ais_data['longitude'])) {
569
+		    	$data['longitude'] = $ais_data['longitude'];
570
+		    }
571
+		    if (isset($ais_data['status'])) {
572
+		    	$data['status'] = $ais_data['status'];
573
+		    }
574
+		    if (isset($ais_data['type'])) {
575
+		    	$data['type'] = $ais_data['type'];
576
+		    }
577
+		    if (isset($ais_data['imo'])) {
578
+		    	$data['imo'] = $ais_data['imo'];
579
+		    }
580
+		    if (isset($ais_data['callsign'])) {
581
+		    	$data['callsign'] = $ais_data['callsign'];
582
+		    }
423 583
 		    if (isset($ais_data['timestamp'])) {
424 584
 			$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
425 585
 			if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) {
@@ -434,8 +594,12 @@  discard block
 block discarded – undo
434 594
     		    $data['id_source'] = $id_source;
435 595
 		    //print_r($data);
436 596
 		    echo 'Add...'."\n";
437
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
438
-		    if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
597
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
598
+		    	$data['noarchive'] = true;
599
+		    }
600
+		    if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') {
601
+		    	$MI->add($data);
602
+		    }
439 603
 		    unset($data);
440 604
 		}
441 605
     	    }
@@ -455,18 +619,42 @@  discard block
 block discarded – undo
455 619
 			    if ($line != '') {
456 620
 				$ais_data = $AIS->parse_line(trim($line));
457 621
 				$data = array();
458
-				if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
459
-				if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
460
-				if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
461
-				if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
462
-				if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
463
-				if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
464
-				if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
465
-				if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
466
-				if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
467
-				if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
468
-				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
469
-				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
622
+				if (isset($ais_data['ident'])) {
623
+					$data['ident'] = $ais_data['ident'];
624
+				}
625
+				if (isset($ais_data['mmsi'])) {
626
+					$data['mmsi'] = $ais_data['mmsi'];
627
+				}
628
+				if (isset($ais_data['speed'])) {
629
+					$data['speed'] = $ais_data['speed'];
630
+				}
631
+				if (isset($ais_data['heading'])) {
632
+					$data['heading'] = $ais_data['heading'];
633
+				}
634
+				if (isset($ais_data['latitude'])) {
635
+					$data['latitude'] = $ais_data['latitude'];
636
+				}
637
+				if (isset($ais_data['longitude'])) {
638
+					$data['longitude'] = $ais_data['longitude'];
639
+				}
640
+				if (isset($ais_data['status'])) {
641
+					$data['status'] = $ais_data['status'];
642
+				}
643
+				if (isset($ais_data['type'])) {
644
+					$data['type'] = $ais_data['type'];
645
+				}
646
+				if (isset($ais_data['imo'])) {
647
+					$data['imo'] = $ais_data['imo'];
648
+				}
649
+				if (isset($ais_data['callsign'])) {
650
+					$data['callsign'] = $ais_data['callsign'];
651
+				}
652
+				if (isset($ais_data['destination'])) {
653
+					$data['arrival_code'] = $ais_data['destination'];
654
+				}
655
+				if (isset($ais_data['eta_ts'])) {
656
+					$data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
657
+				}
470 658
 				if (isset($ais_data['timestamp'])) {
471 659
 				    $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
472 660
 				} else {
@@ -474,16 +662,23 @@  discard block
 block discarded – undo
474 662
 				}
475 663
 				$data['format_source'] = 'aisnmeahttp';
476 664
 				$data['id_source'] = $id_source;
477
-				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
478
-				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
665
+				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
666
+					$data['noarchive'] = true;
667
+				}
668
+				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') {
669
+					$MI->add($data);
670
+				}
479 671
 				unset($data);
480 672
 			    }
481 673
 			}
482 674
 		    }
483 675
 		} else {
484 676
 		    $format = $value['format'];
485
-		    if (isset($tt[$format])) $tt[$format]++;
486
-		    else $tt[$format] = 0;
677
+		    if (isset($tt[$format])) {
678
+		    	$tt[$format]++;
679
+		    } else {
680
+		    	$tt[$format] = 0;
681
+		    }
487 682
 		    if ($tt[$format] > 30) {
488 683
 			sleep(2);
489 684
 			$sourceeen[] = $value;
@@ -514,7 +709,9 @@  discard block
 block discarded – undo
514 709
 			$data['datetime'] = date('Y-m-d H:i:s',$line['T']);
515 710
 			$data['format_source'] = 'myshiptracking';
516 711
 			$data['id_source'] = $id_source;
517
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
712
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
713
+				$data['noarchive'] = true;
714
+			}
518 715
 			$MI->add($data);
519 716
 			unset($data);
520 717
 		    }
@@ -535,7 +732,9 @@  discard block
 block discarded – undo
535 732
 			    $data['callsign'] = $line['callsign'];
536 733
 			    $data['mmsi'] = $line['mmsi'];
537 734
 			    $data['speed'] = $line['sog'];
538
-			    if ($line['heading'] != '511') $data['heading'] = $line['heading'];
735
+			    if ($line['heading'] != '511') {
736
+			    	$data['heading'] = $line['heading'];
737
+			    }
539 738
 			    $data['latitude'] = $line['latitude'];
540 739
 			    $data['longitude'] = $line['longitude'];
541 740
 			    $data['type_id'] = $line['shiptype'];
@@ -543,7 +742,9 @@  discard block
 block discarded – undo
543 742
 			    $data['datetime'] = $line['time'];
544 743
 			    $data['format_source'] = 'boatbeaconapp';
545 744
 			    $data['id_source'] = $id_source;
546
-			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
745
+			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
746
+			    	$data['noarchive'] = true;
747
+			    }
547 748
 			    $MI->add($data);
548 749
 			    unset($data);
549 750
 			}
@@ -556,7 +757,9 @@  discard block
 block discarded – undo
556 757
 	    echo 'download...';
557 758
 	    $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
558 759
 	    echo 'done !'."\n";
559
-	    if ($buffer != '') $reset = 0;
760
+	    if ($buffer != '') {
761
+	    	$reset = 0;
762
+	    }
560 763
     	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
561 764
 	    $buffer = explode('\n',$buffer);
562 765
 	    foreach ($buffer as $line) {
@@ -581,7 +784,9 @@  discard block
 block discarded – undo
581 784
 		    //$data['etaTime'] = substr($line,135,5);
582 785
 		    $data['format_source'] = 'shipplotter';
583 786
     		    $data['id_source'] = $id_source;
584
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
787
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
788
+		    	$data['noarchive'] = true;
789
+		    }
585 790
 		    //print_r($data);
586 791
 		    echo 'Add...'."\n";
587 792
 		    $MI->add($data);
@@ -601,16 +806,28 @@  discard block
 block discarded – undo
601 806
     		    $line = explode(':', $line);
602 807
     		    if (count($line) > 30 && $line[0] != 'callsign') {
603 808
 			$data = array();
604
-			if (isset($line[37]) && $line[37] != '') $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37];
605
-			else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
809
+			if (isset($line[37]) && $line[37] != '') {
810
+				$data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37];
811
+			} else {
812
+				$data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
813
+			}
606 814
 			$data['pilot_id'] = $line[1];
607 815
 			$data['pilot_name'] = $line[2];
608 816
 			$data['hex'] = str_pad(dechex($Common->str2int($line[1])),6,'000000',STR_PAD_LEFT);
609 817
 			$data['ident'] = $line[0]; // ident
610
-			if ($line[7] != '' && $line[7] != 0) $data['altitude'] = $line[7]; // altitude
818
+			if ($line[7] != '' && $line[7] != 0) {
819
+				$data['altitude'] = $line[7];
820
+			}
821
+			// altitude
611 822
 			$data['speed'] = $line[8]; // speed
612
-			if (isset($line[45])) $data['heading'] = $line[45]; // heading
613
-			elseif (isset($line[38])) $data['heading'] = $line[38]; // heading
823
+			if (isset($line[45])) {
824
+				$data['heading'] = $line[45];
825
+			}
826
+			// heading
827
+			elseif (isset($line[38])) {
828
+				$data['heading'] = $line[38];
829
+			}
830
+			// heading
614 831
 			$data['latitude'] = $line[5]; // lat
615 832
 	        	$data['longitude'] = $line[6]; // long
616 833
 	        	$data['verticalrate'] = ''; // vertical rate
@@ -626,7 +843,9 @@  discard block
 block discarded – undo
626 843
 			$data['frequency'] = $line[4];
627 844
 			$data['type'] = $line[18];
628 845
 			$data['range'] = $line[19];
629
-			if (isset($line[35])) $data['info'] = $line[35];
846
+			if (isset($line[35])) {
847
+				$data['info'] = $line[35];
848
+			}
630 849
     			$data['id_source'] = $id_source;
631 850
 	    		//$data['arrival_airport_time'] = ;
632 851
 	    		if ($line[9] != '') {
@@ -640,25 +859,44 @@  discard block
 block discarded – undo
640 859
 	    		elseif ($value == 'vatsimtxt') $data['format_source'] = 'vatsimtxt';
641 860
 	    		*/
642 861
 	    		$data['format_source'] = $value['format'];
643
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
644
-			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
645
-    			if ($line[3] == 'PILOT') $SI->add($data);
646
-			elseif ($line[3] == 'ATC') {
862
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
863
+				$data['noarchive'] = true;
864
+			}
865
+			if (isset($value['name']) && $value['name'] != '') {
866
+				$data['source_name'] = $value['name'];
867
+			}
868
+    			if ($line[3] == 'PILOT') {
869
+    				$SI->add($data);
870
+    			} elseif ($line[3] == 'ATC') {
647 871
 				//print_r($data);
648 872
 				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
649 873
 				$data['info'] = str_replace('&amp;sect;','',$data['info']);
650 874
 				$typec = substr($data['ident'],-3);
651
-				if ($typec == 'APP') $data['type'] = 'Approach';
652
-				elseif ($typec == 'TWR') $data['type'] = 'Tower';
653
-				elseif ($typec == 'OBS') $data['type'] = 'Observer';
654
-				elseif ($typec == 'GND') $data['type'] = 'Ground';
655
-				elseif ($typec == 'DEL') $data['type'] = 'Delivery';
656
-				elseif ($typec == 'DEP') $data['type'] = 'Departure';
657
-				elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station';
658
-				elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
659
-				elseif ($data['type'] == '') $data['type'] = 'Observer';
660
-				if (!isset($data['source_name'])) $data['source_name'] = '';
661
-				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']);
875
+				if ($typec == 'APP') {
876
+					$data['type'] = 'Approach';
877
+				} elseif ($typec == 'TWR') {
878
+					$data['type'] = 'Tower';
879
+				} elseif ($typec == 'OBS') {
880
+					$data['type'] = 'Observer';
881
+				} elseif ($typec == 'GND') {
882
+					$data['type'] = 'Ground';
883
+				} elseif ($typec == 'DEL') {
884
+					$data['type'] = 'Delivery';
885
+				} elseif ($typec == 'DEP') {
886
+					$data['type'] = 'Departure';
887
+				} elseif ($typec == 'FSS') {
888
+					$data['type'] = 'Flight Service Station';
889
+				} elseif ($typec == 'CTR') {
890
+					$data['type'] = 'Control Radar or Centre';
891
+				} elseif ($data['type'] == '') {
892
+					$data['type'] = 'Observer';
893
+				}
894
+				if (!isset($data['source_name'])) {
895
+					$data['source_name'] = '';
896
+				}
897
+				if (isset($ATC)) {
898
+					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']);
899
+				}
662 900
 			}
663 901
     			unset($data);
664 902
     		    }
@@ -677,27 +915,61 @@  discard block
 block discarded – undo
677 915
 		foreach ($all_data['acList'] as $line) {
678 916
 		    $data = array();
679 917
 		    $data['hex'] = $line['Icao']; // hex
680
-		    if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
681
-		    if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
682
-		    if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
683
-		    if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
684
-		    if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
685
-		    if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
918
+		    if (isset($line['Call'])) {
919
+		    	$data['ident'] = $line['Call'];
920
+		    }
921
+		    // ident
922
+		    if (isset($line['Alt'])) {
923
+		    	$data['altitude'] = $line['Alt'];
924
+		    }
925
+		    // altitude
926
+		    if (isset($line['Spd'])) {
927
+		    	$data['speed'] = $line['Spd'];
928
+		    }
929
+		    // speed
930
+		    if (isset($line['Trak'])) {
931
+		    	$data['heading'] = $line['Trak'];
932
+		    }
933
+		    // heading
934
+		    if (isset($line['Lat'])) {
935
+		    	$data['latitude'] = $line['Lat'];
936
+		    }
937
+		    // lat
938
+		    if (isset($line['Long'])) {
939
+		    	$data['longitude'] = $line['Long'];
940
+		    }
941
+		    // long
686 942
 		    //$data['verticalrate'] = $line['']; // verticale rate
687
-		    if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
943
+		    if (isset($line['Sqk'])) {
944
+		    	$data['squawk'] = $line['Sqk'];
945
+		    }
946
+		    // squawk
688 947
 		    $data['emergency'] = ''; // emergency
689
-		    if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
948
+		    if (isset($line['Reg'])) {
949
+		    	$data['registration'] = $line['Reg'];
950
+		    }
690 951
 		    
691
-		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
692
-		    else $data['datetime'] = date('Y-m-d H:i:s');
952
+		    if (isset($line['PosTime'])) {
953
+		    	$data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
954
+		    } else {
955
+		    	$data['datetime'] = date('Y-m-d H:i:s');
956
+		    }
693 957
 		    
694 958
 		    //$data['datetime'] = date('Y-m-d H:i:s');
695
-		    if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
959
+		    if (isset($line['Type'])) {
960
+		    	$data['aircraft_icao'] = $line['Type'];
961
+		    }
696 962
 	    	    $data['format_source'] = 'aircraftlistjson';
697 963
 		    $data['id_source'] = $id_source;
698
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
699
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
700
-		    if (isset($data['latitude'])) $SI->add($data);
964
+		    if (isset($value['name']) && $value['name'] != '') {
965
+		    	$data['source_name'] = $value['name'];
966
+		    }
967
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
968
+		    	$data['noarchive'] = true;
969
+		    }
970
+		    if (isset($data['latitude'])) {
971
+		    	$SI->add($data);
972
+		    }
701 973
 		    unset($data);
702 974
 		}
703 975
 	    } elseif (is_array($all_data)) {
@@ -714,12 +986,19 @@  discard block
 block discarded – undo
714 986
 		    $data['verticalrate'] = $line['vrt']; // verticale rate
715 987
 		    $data['squawk'] = $line['squawk']; // squawk
716 988
 		    $data['emergency'] = ''; // emergency
717
-		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
718
-		    else $data['datetime'] = date('Y-m-d H:i:s');
989
+		    if (isset($line['PosTime'])) {
990
+		    	$data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
991
+		    } else {
992
+		    	$data['datetime'] = date('Y-m-d H:i:s');
993
+		    }
719 994
 	    	    $data['format_source'] = 'aircraftlistjson';
720 995
     		    $data['id_source'] = $id_source;
721
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
722
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
996
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
997
+		    	$data['noarchive'] = true;
998
+		    }
999
+		    if (isset($value['name']) && $value['name'] != '') {
1000
+		    	$data['source_name'] = $value['name'];
1001
+		    }
723 1002
 		    $SI->add($data);
724 1003
 		    unset($data);
725 1004
 		}
@@ -755,8 +1034,12 @@  discard block
 block discarded – undo
755 1034
 		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]);
756 1035
 	    	    $data['format_source'] = 'planeupdatefaa';
757 1036
     		    $data['id_source'] = $id_source;
758
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
759
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1037
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1038
+		    	$data['noarchive'] = true;
1039
+		    }
1040
+		    if (isset($value['name']) && $value['name'] != '') {
1041
+		    	$data['source_name'] = $value['name'];
1042
+		    }
760 1043
 		    $SI->add($data);
761 1044
 		    unset($data);
762 1045
 		}
@@ -785,7 +1068,9 @@  discard block
 block discarded – undo
785 1068
 		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]);
786 1069
 	    	    $data['format_source'] = 'opensky';
787 1070
     		    $data['id_source'] = $id_source;
788
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1071
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1072
+		    	$data['noarchive'] = true;
1073
+		    }
789 1074
 		    $SI->add($data);
790 1075
 		    unset($data);
791 1076
 		}
@@ -797,7 +1082,9 @@  discard block
 block discarded – undo
797 1082
 	    //$buffer = $Common->getData($hosts[$id]);
798 1083
 	    $buffer = $Common->getData($value['host']);
799 1084
 	    $all_data = json_decode($buffer,true);
800
-	    if (!empty($all_data)) $reset = 0;
1085
+	    if (!empty($all_data)) {
1086
+	    	$reset = 0;
1087
+	    }
801 1088
 	    foreach ($all_data as $key => $line) {
802 1089
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
803 1090
 		    $data = array();
@@ -818,8 +1105,12 @@  discard block
 block discarded – undo
818 1105
 		    $data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
819 1106
 	    	    $data['format_source'] = 'fr24json';
820 1107
     		    $data['id_source'] = $id_source;
821
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
822
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1108
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1109
+		    	$data['noarchive'] = true;
1110
+		    }
1111
+		    if (isset($value['name']) && $value['name'] != '') {
1112
+		    	$data['source_name'] = $value['name'];
1113
+		    }
823 1114
 		    $SI->add($data);
824 1115
 		    unset($data);
825 1116
 		}
@@ -843,24 +1134,42 @@  discard block
 block discarded – undo
843 1134
 		    if (isset($line['inf'])) {
844 1135
 			$data = array();
845 1136
 			$data['hex'] = $line['inf']['ia'];
846
-			if (isset($line['inf']['cs'])) $data['ident'] = $line['inf']['cs']; //$line[13]
1137
+			if (isset($line['inf']['cs'])) {
1138
+				$data['ident'] = $line['inf']['cs'];
1139
+			}
1140
+			//$line[13]
847 1141
 	    		$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
848
-	    		if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
849
-	    		if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
1142
+	    		if (isset($line['inf']['gs'])) {
1143
+	    			$data['speed'] = round($line['inf']['gs']*0.539957);
1144
+	    		}
1145
+	    		// speed
1146
+	    		if (isset($line['inf']['tr'])) {
1147
+	    			$data['heading'] = $line['inf']['tr'];
1148
+	    		}
1149
+	    		// heading
850 1150
 	    		$data['latitude'] = $line['pt'][0]; // lat
851 1151
 	    		$data['longitude'] = $line['pt'][1]; // long
852 1152
 	    		//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
853
-	    		if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
1153
+	    		if (isset($line['inf']['sq'])) {
1154
+	    			$data['squawk'] = $line['inf']['sq'];
1155
+	    		}
1156
+	    		// squawk
854 1157
 	    		//$data['aircraft_icao'] = $line[8];
855
-	    		if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
1158
+	    		if (isset($line['inf']['rc'])) {
1159
+	    			$data['registration'] = $line['inf']['rc'];
1160
+	    		}
856 1161
 			//$data['departure_airport_iata'] = $line[11];
857 1162
 			//$data['arrival_airport_iata'] = $line[12];
858 1163
 	    		//$data['emergency'] = ''; // emergency
859 1164
 			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10]
860 1165
 	    		$data['format_source'] = 'radarvirtueljson';
861 1166
     			$data['id_source'] = $id_source;
862
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
863
-			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1167
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1168
+				$data['noarchive'] = true;
1169
+			}
1170
+			if (isset($value['name']) && $value['name'] != '') {
1171
+				$data['source_name'] = $value['name'];
1172
+			}
864 1173
 			$SI->add($data);
865 1174
 			unset($data);
866 1175
 		    }
@@ -881,30 +1190,65 @@  discard block
 block discarded – undo
881 1190
 		    $data['id'] = $line['id'];
882 1191
 		    $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
883 1192
 		    $data['ident'] = $line['callsign']; // ident
884
-		    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
885
-		    if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
886
-		    if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
887
-		    if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
888
-		    if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
889
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1193
+		    if (isset($line['pilotid'])) {
1194
+		    	$data['pilot_id'] = $line['pilotid'];
1195
+		    }
1196
+		    // pilot id
1197
+		    if (isset($line['name'])) {
1198
+		    	$data['pilot_name'] = $line['name'];
1199
+		    }
1200
+		    // pilot name
1201
+		    if (isset($line['alt'])) {
1202
+		    	$data['altitude'] = $line['alt'];
1203
+		    }
1204
+		    // altitude
1205
+		    if (isset($line['gs'])) {
1206
+		    	$data['speed'] = $line['gs'];
1207
+		    }
1208
+		    // speed
1209
+		    if (isset($line['heading'])) {
1210
+		    	$data['heading'] = $line['heading'];
1211
+		    }
1212
+		    // heading
1213
+		    if (isset($line['route'])) {
1214
+		    	$data['waypoints'] = $line['route'];
1215
+		    }
1216
+		    // route
890 1217
 		    $data['latitude'] = $line['lat']; // lat
891 1218
 		    $data['longitude'] = $line['lon']; // long
892 1219
 		    //$data['verticalrate'] = $line['vrt']; // verticale rate
893 1220
 		    //$data['squawk'] = $line['squawk']; // squawk
894 1221
 		    //$data['emergency'] = ''; // emergency
895
-		    if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
896
-		    if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
897
-		    if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
1222
+		    if (isset($line['depicao'])) {
1223
+		    	$data['departure_airport_icao'] = $line['depicao'];
1224
+		    }
1225
+		    if (isset($line['deptime'])) {
1226
+		    	$data['departure_airport_time'] = $line['deptime'];
1227
+		    }
1228
+		    if (isset($line['arricao'])) {
1229
+		    	$data['arrival_airport_icao'] = $line['arricao'];
1230
+		    }
898 1231
 		    //$data['arrival_airport_time'] = $line['arrtime'];
899
-		    if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
900
-		    if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
901
-		    if (isset($line['atis'])) $data['info'] = $line['atis'];
902
-		    else $data['info'] = '';
1232
+		    if (isset($line['aircraft'])) {
1233
+		    	$data['aircraft_icao'] = $line['aircraft'];
1234
+		    }
1235
+		    if (isset($line['transponder'])) {
1236
+		    	$data['squawk'] = $line['transponder'];
1237
+		    }
1238
+		    if (isset($line['atis'])) {
1239
+		    	$data['info'] = $line['atis'];
1240
+		    } else {
1241
+		    	$data['info'] = '';
1242
+		    }
903 1243
 		    $data['format_source'] = 'pireps';
904 1244
     		    $data['id_source'] = $id_source;
905 1245
 		    $data['datetime'] = date('Y-m-d H:i:s');
906
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
907
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1246
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1247
+		    	$data['noarchive'] = true;
1248
+		    }
1249
+		    if (isset($value['name']) && $value['name'] != '') {
1250
+		    	$data['source_name'] = $value['name'];
1251
+		    }
908 1252
 		    if ($line['icon'] == 'plane') {
909 1253
 			$SI->add($data);
910 1254
 		    //    print_r($data);
@@ -913,16 +1257,28 @@  discard block
 block discarded – undo
913 1257
 			$data['info'] = str_replace('&amp;sect;','',$data['info']);
914 1258
 			$typec = substr($data['ident'],-3);
915 1259
 			$data['type'] = '';
916
-			if ($typec == 'APP') $data['type'] = 'Approach';
917
-			elseif ($typec == 'TWR') $data['type'] = 'Tower';
918
-			elseif ($typec == 'OBS') $data['type'] = 'Observer';
919
-			elseif ($typec == 'GND') $data['type'] = 'Ground';
920
-			elseif ($typec == 'DEL') $data['type'] = 'Delivery';
921
-			elseif ($typec == 'DEP') $data['type'] = 'Departure';
922
-			elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station';
923
-			elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
924
-			else $data['type'] = 'Observer';
925
-			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']);
1260
+			if ($typec == 'APP') {
1261
+				$data['type'] = 'Approach';
1262
+			} elseif ($typec == 'TWR') {
1263
+				$data['type'] = 'Tower';
1264
+			} elseif ($typec == 'OBS') {
1265
+				$data['type'] = 'Observer';
1266
+			} elseif ($typec == 'GND') {
1267
+				$data['type'] = 'Ground';
1268
+			} elseif ($typec == 'DEL') {
1269
+				$data['type'] = 'Delivery';
1270
+			} elseif ($typec == 'DEP') {
1271
+				$data['type'] = 'Departure';
1272
+			} elseif ($typec == 'FSS') {
1273
+				$data['type'] = 'Flight Service Station';
1274
+			} elseif ($typec == 'CTR') {
1275
+				$data['type'] = 'Control Radar or Centre';
1276
+			} else {
1277
+				$data['type'] = 'Observer';
1278
+			}
1279
+			if (isset($ATC)) {
1280
+				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']);
1281
+			}
926 1282
 		    }
927 1283
 		    unset($data);
928 1284
 		}
@@ -932,7 +1288,9 @@  discard block
 block discarded – undo
932 1288
     	//} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) {
933 1289
     	} elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
934 1290
 	    //$buffer = $Common->getData($hosts[$id]);
935
-	    if ($globalDebug) echo 'Get Data...'."\n";
1291
+	    if ($globalDebug) {
1292
+	    	echo 'Get Data...'."\n";
1293
+	    }
936 1294
 	    $buffer = $Common->getData($value['host']);
937 1295
 	    $all_data = json_decode($buffer,true);
938 1296
 	    if ($buffer != '' && is_array($all_data)) {
@@ -940,10 +1298,16 @@  discard block
 block discarded – undo
940 1298
 		foreach ($all_data as $line) {
941 1299
 	    	    $data = array();
942 1300
 	    	    //$data['id'] = $line['id']; // id not usable
943
-	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
1301
+	    	    if (isset($line['pilotid'])) {
1302
+	    	    	$data['id'] = $line['pilotid'].$line['flightnum'];
1303
+	    	    }
944 1304
 	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
945
-	    	    if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
946
-	    	    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
1305
+	    	    if (isset($line['pilotname'])) {
1306
+	    	    	$data['pilot_name'] = $line['pilotname'];
1307
+	    	    }
1308
+	    	    if (isset($line['pilotid'])) {
1309
+	    	    	$data['pilot_id'] = $line['pilotid'];
1310
+	    	    }
947 1311
 	    	    $data['ident'] = $line['flightnum']; // ident
948 1312
 	    	    $data['altitude'] = $line['alt']; // altitude
949 1313
 	    	    $data['speed'] = $line['gs']; // speed
@@ -961,28 +1325,44 @@  discard block
 block discarded – undo
961 1325
 	    	    $data['arrival_airport_icao'] = $line['arricao'];
962 1326
     		    $data['arrival_airport_time'] = $line['arrtime'];
963 1327
     		    $data['registration'] = $line['aircraft'];
964
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
965
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1328
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1329
+		    	$data['noarchive'] = true;
1330
+		    }
1331
+		    if (isset($line['route'])) {
1332
+		    	$data['waypoints'] = $line['route'];
1333
+		    }
1334
+		    // route
966 1335
 		    if (isset($line['aircraftname'])) {
967 1336
 			$line['aircraftname'] = strtoupper($line['aircraftname']);
968 1337
 			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']);
969 1338
 	    		$aircraft_data = explode('-',$line['aircraftname']);
970
-	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
971
-	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
972
-	    		else {
1339
+	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) {
1340
+	    			$data['aircraft_icao'] = $aircraft_data[0];
1341
+	    		} elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) {
1342
+	    			$data['aircraft_icao'] = $aircraft_data[1];
1343
+	    		} else {
973 1344
 	    		    $aircraft_data = explode(' ',$line['aircraftname']);
974
-	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
975
-	    		    else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
1345
+	    		    if (isset($aircraft_data[1])) {
1346
+	    		    	$data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
1347
+	    		    } else {
1348
+	    		    	$data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
1349
+	    		    }
976 1350
 	    		}
977 1351
 	    	    }
978
-    		    if (isset($line['route'])) $data['waypoints'] = $line['route'];
1352
+    		    if (isset($line['route'])) {
1353
+    		    	$data['waypoints'] = $line['route'];
1354
+    		    }
979 1355
     		    $data['id_source'] = $id_source;
980 1356
 	    	    $data['format_source'] = 'phpvmacars';
981
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1357
+		    if (isset($value['name']) && $value['name'] != '') {
1358
+		    	$data['source_name'] = $value['name'];
1359
+		    }
982 1360
 		    $SI->add($data);
983 1361
 		    unset($data);
984 1362
 		}
985
-		if ($globalDebug) echo 'No more data...'."\n";
1363
+		if ($globalDebug) {
1364
+			echo 'No more data...'."\n";
1365
+		}
986 1366
 		unset($buffer);
987 1367
 		unset($all_data);
988 1368
 	    }
@@ -990,7 +1370,9 @@  discard block
 block discarded – undo
990 1370
     	    $last_exec[$id]['last'] = time();
991 1371
     	} elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
992 1372
 	    //$buffer = $Common->getData($hosts[$id]);
993
-	    if ($globalDebug) echo 'Get Data...'."\n";
1373
+	    if ($globalDebug) {
1374
+	    	echo 'Get Data...'."\n";
1375
+	    }
994 1376
 	    $buffer = $Common->getData($value['host']);
995 1377
 	    $all_data = json_decode($buffer,true);
996 1378
 	    if ($buffer != '' && is_array($all_data)) {
@@ -1019,16 +1401,25 @@  discard block
 block discarded – undo
1019 1401
 	    	    $data['arrival_airport_icao'] = $line['arrival'];
1020 1402
     		    //$data['arrival_airport_time'] = $line['arrival_time'];
1021 1403
     		    //$data['registration'] = $line['aircraft'];
1022
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1404
+		    if (isset($line['route'])) {
1405
+		    	$data['waypoints'] = $line['route'];
1406
+		    }
1407
+		    // route
1023 1408
 	    	    $data['aircraft_icao'] = $line['plane_type'];
1024 1409
     		    $data['id_source'] = $id_source;
1025 1410
 	    	    $data['format_source'] = 'vam';
1026
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1027
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1411
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1412
+		    	$data['noarchive'] = true;
1413
+		    }
1414
+		    if (isset($value['name']) && $value['name'] != '') {
1415
+		    	$data['source_name'] = $value['name'];
1416
+		    }
1028 1417
 		    $SI->add($data);
1029 1418
 		    unset($data);
1030 1419
 		}
1031
-		if ($globalDebug) echo 'No more data...'."\n";
1420
+		if ($globalDebug) {
1421
+			echo 'No more data...'."\n";
1422
+		}
1032 1423
 		unset($buffer);
1033 1424
 		unset($all_data);
1034 1425
 	    }
@@ -1036,7 +1427,9 @@  discard block
 block discarded – undo
1036 1427
     	    $last_exec[$id]['last'] = time();
1037 1428
 	//} elseif ($value == 'sbs' || $value == 'tsv' || $value == 'raw' || $value == 'aprs' || $value == 'beast') {
1038 1429
 	} 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') {
1039
-	    if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
1430
+	    if (function_exists('pcntl_fork')) {
1431
+	    	pcntl_signal_dispatch();
1432
+	    }
1040 1433
     	    //$last_exec[$id]['last'] = time();
1041 1434
 
1042 1435
 	    //$read = array( $sockets[$id] );
@@ -1044,7 +1437,9 @@  discard block
 block discarded – undo
1044 1437
 	    $write = NULL;
1045 1438
 	    $e = NULL;
1046 1439
 	    $n = socket_select($read, $write, $e, $timeout);
1047
-	    if ($e != NULL) var_dump($e);
1440
+	    if ($e != NULL) {
1441
+	    	var_dump($e);
1442
+	    }
1048 1443
 	    if ($n > 0) {
1049 1444
 		$reset = 0;
1050 1445
 		foreach ($read as $nb => $r) {
@@ -1065,12 +1460,16 @@  discard block
 block discarded – undo
1065 1460
 		    //$SI::del();
1066 1461
 		    if ($format == 'vrstcp') {
1067 1462
 			$buffer = explode('},{',$buffer);
1068
-		    } else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
1463
+		    } else {
1464
+		    	$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
1465
+		    }
1069 1466
 		    // SBS format is CSV format
1070 1467
 		    if ($buffer !== FALSE && $buffer != '') {
1071 1468
 			$tt[$format] = 0;
1072 1469
 			if ($format == 'acarssbs3') {
1073
-			    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1470
+			    if ($globalDebug) {
1471
+			    	echo 'ACARS : '.$buffer."\n";
1472
+			    }
1074 1473
 			    $ACARS->add(trim($buffer));
1075 1474
 			    $ACARS->deleteLiveAcarsData();
1076 1475
 			} elseif ($format == 'raw') {
@@ -1079,27 +1478,61 @@  discard block
 block discarded – undo
1079 1478
 			    if (is_array($data)) {
1080 1479
 				$data['datetime'] = date('Y-m-d H:i:s');
1081 1480
 				$data['format_source'] = 'raw';
1082
-				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1083
-				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1084
-				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1085
-				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1481
+				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') {
1482
+					$data['source_name'] = $globalSources[$nb]['name'];
1483
+				}
1484
+				if (isset($globalSources[$nb]['sourcestats'])) {
1485
+					$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1486
+				}
1487
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
1488
+					$data['noarchive'] = true;
1489
+				}
1490
+				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
1491
+					$SI->add($data);
1492
+				}
1086 1493
 			    }
1087 1494
 			} elseif ($format == 'ais') {
1088 1495
 			    $ais_data = $AIS->parse_line(trim($buffer));
1089 1496
 			    $data = array();
1090
-			    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
1091
-			    if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
1092
-			    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
1093
-			    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
1094
-			    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
1095
-			    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
1096
-			    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
1097
-			    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
1098
-			    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
1099
-			    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
1100
-			    if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
1101
-			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
1102
-			    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1497
+			    if (isset($ais_data['ident'])) {
1498
+			    	$data['ident'] = $ais_data['ident'];
1499
+			    }
1500
+			    if (isset($ais_data['mmsi'])) {
1501
+			    	$data['mmsi'] = $ais_data['mmsi'];
1502
+			    }
1503
+			    if (isset($ais_data['speed'])) {
1504
+			    	$data['speed'] = $ais_data['speed'];
1505
+			    }
1506
+			    if (isset($ais_data['heading'])) {
1507
+			    	$data['heading'] = $ais_data['heading'];
1508
+			    }
1509
+			    if (isset($ais_data['latitude'])) {
1510
+			    	$data['latitude'] = $ais_data['latitude'];
1511
+			    }
1512
+			    if (isset($ais_data['longitude'])) {
1513
+			    	$data['longitude'] = $ais_data['longitude'];
1514
+			    }
1515
+			    if (isset($ais_data['status'])) {
1516
+			    	$data['status'] = $ais_data['status'];
1517
+			    }
1518
+			    if (isset($ais_data['type'])) {
1519
+			    	$data['type'] = $ais_data['type'];
1520
+			    }
1521
+			    if (isset($ais_data['imo'])) {
1522
+			    	$data['imo'] = $ais_data['imo'];
1523
+			    }
1524
+			    if (isset($ais_data['callsign'])) {
1525
+			    	$data['callsign'] = $ais_data['callsign'];
1526
+			    }
1527
+			    if (isset($ais_data['destination'])) {
1528
+			    	$data['arrival_code'] = $ais_data['destination'];
1529
+			    }
1530
+			    if (isset($ais_data['eta_ts'])) {
1531
+			    	$data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
1532
+			    }
1533
+			    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
1534
+			    	$data['noarchive'] = true;
1535
+			    }
1103 1536
 
1104 1537
 			    if (isset($ais_data['timestamp'])) {
1105 1538
 				$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
@@ -1108,7 +1541,9 @@  discard block
 block discarded – undo
1108 1541
 			    }
1109 1542
 			    $data['format_source'] = 'aisnmea';
1110 1543
     			    $data['id_source'] = $id_source;
1111
-			    if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
1544
+			    if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') {
1545
+			    	$MI->add($data);
1546
+			    }
1112 1547
 			    unset($data);
1113 1548
                         } elseif ($format == 'flightgearsp') {
1114 1549
                     	    //echo $buffer."\n";
@@ -1126,12 +1561,18 @@  discard block
 block discarded – undo
1126 1561
 				$data['speed'] = round($line[5]*1.94384);
1127 1562
 				$data['datetime'] = date('Y-m-d H:i:s');
1128 1563
 				$data['format_source'] = 'flightgearsp';
1129
-				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1130
-				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1564
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
1565
+					$data['noarchive'] = true;
1566
+				}
1567
+				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
1568
+					$SI->add($data);
1569
+				}
1131 1570
 				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
1132 1571
 			    }
1133 1572
                         } elseif ($format == 'acars') {
1134
-                    	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1573
+                    	    if ($globalDebug) {
1574
+                    	    	echo 'ACARS : '.$buffer."\n";
1575
+                    	    }
1135 1576
 			    $ACARS->add(trim($buffer));
1136 1577
 			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
1137 1578
 			    $ACARS->deleteLiveAcarsData();
@@ -1152,8 +1593,12 @@  discard block
 block discarded – undo
1152 1593
 				    $aircraft_type = $line[10];
1153 1594
 				    $aircraft_type = preg_split(':/:',$aircraft_type);
1154 1595
 				    $data['aircraft_name'] = substr(end($aircraft_type),0,-4);
1155
-				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1156
-				    if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1596
+				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
1597
+				    	$data['noarchive'] = true;
1598
+				    }
1599
+				    if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
1600
+				    	$SI->add($data);
1601
+				    }
1157 1602
 				}
1158 1603
 			    }
1159 1604
 			} elseif ($format == 'beast') {
@@ -1163,28 +1608,62 @@  discard block
 block discarded – undo
1163 1608
 			    foreach($buffer as $all_data) {
1164 1609
 				$line = json_decode('{'.$all_data.'}',true);
1165 1610
 				$data = array();
1166
-				if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex
1167
-				if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
1168
-				if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
1169
-				if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
1170
-				if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
1171
-				if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
1172
-				if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
1611
+				if (isset($line['Icao'])) {
1612
+					$data['hex'] = $line['Icao'];
1613
+				}
1614
+				// hex
1615
+				if (isset($line['Call'])) {
1616
+					$data['ident'] = $line['Call'];
1617
+				}
1618
+				// ident
1619
+				if (isset($line['Alt'])) {
1620
+					$data['altitude'] = $line['Alt'];
1621
+				}
1622
+				// altitude
1623
+				if (isset($line['Spd'])) {
1624
+					$data['speed'] = $line['Spd'];
1625
+				}
1626
+				// speed
1627
+				if (isset($line['Trak'])) {
1628
+					$data['heading'] = $line['Trak'];
1629
+				}
1630
+				// heading
1631
+				if (isset($line['Lat'])) {
1632
+					$data['latitude'] = $line['Lat'];
1633
+				}
1634
+				// lat
1635
+				if (isset($line['Long'])) {
1636
+					$data['longitude'] = $line['Long'];
1637
+				}
1638
+				// long
1173 1639
 				//$data['verticalrate'] = $line['']; // verticale rate
1174
-				if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
1640
+				if (isset($line['Sqk'])) {
1641
+					$data['squawk'] = $line['Sqk'];
1642
+				}
1643
+				// squawk
1175 1644
 				$data['emergency'] = ''; // emergency
1176
-				if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
1645
+				if (isset($line['Reg'])) {
1646
+					$data['registration'] = $line['Reg'];
1647
+				}
1177 1648
 				/*
1178 1649
 				if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',$line['PosTime']/1000);
1179 1650
 				else $data['datetime'] = date('Y-m-d H:i:s');
1180 1651
 				*/
1181 1652
 				$data['datetime'] = date('Y-m-d H:i:s');
1182
-				if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
1653
+				if (isset($line['Type'])) {
1654
+					$data['aircraft_icao'] = $line['Type'];
1655
+				}
1183 1656
 		    		$data['format_source'] = 'vrstcp';
1184 1657
 				$data['id_source'] = $id_source;
1185
-				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1186
-				if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1187
-				if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data);
1658
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
1659
+					$data['noarchive'] = true;
1660
+				}
1661
+				if (isset($value['name']) && $value['name'] != '') {
1662
+					$data['source_name'] = $value['name'];
1663
+				}
1664
+				if (isset($data['latitude']) && isset($data['hex'])) {
1665
+					$SI->add($data);
1666
+				}
1188 1667
 				unset($data);
1189 1668
 			    }
1190 1669
 			} elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') {
@@ -1197,22 +1676,46 @@  discard block
 block discarded – undo
1197 1676
     				$data['hex'] = $lined['hexid'];
1198 1677
     				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
1199 1678
     				$data['datetime'] = date('Y-m-d H:i:s');;
1200
-    				if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
1201
-    				if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
1202
-    				if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
1203
-    				if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
1204
-    				if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
1205
-    				if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
1206
-    				if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
1679
+    				if (isset($lined['ident'])) {
1680
+    					$data['ident'] = $lined['ident'];
1681
+    				}
1682
+    				if (isset($lined['lat'])) {
1683
+    					$data['latitude'] = $lined['lat'];
1684
+    				}
1685
+    				if (isset($lined['lon'])) {
1686
+    					$data['longitude'] = $lined['lon'];
1687
+    				}
1688
+    				if (isset($lined['speed'])) {
1689
+    					$data['speed'] = $lined['speed'];
1690
+    				}
1691
+    				if (isset($lined['squawk'])) {
1692
+    					$data['squawk'] = $lined['squawk'];
1693
+    				}
1694
+    				if (isset($lined['alt'])) {
1695
+    					$data['altitude'] = $lined['alt'];
1696
+    				}
1697
+    				if (isset($lined['heading'])) {
1698
+    					$data['heading'] = $lined['heading'];
1699
+    				}
1207 1700
     				$data['id_source'] = $id_source;
1208 1701
     				$data['format_source'] = 'tsv';
1209
-    				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1210
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1211
-				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1212
-    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1702
+    				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') {
1703
+    					$data['source_name'] = $globalSources[$nb]['name'];
1704
+    				}
1705
+    				if (isset($globalSources[$nb]['sourcestats'])) {
1706
+    					$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1707
+    				}
1708
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
1709
+					$data['noarchive'] = true;
1710
+				}
1711
+    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
1712
+    					$SI->add($data);
1713
+    				}
1213 1714
     				unset($lined);
1214 1715
     				unset($data);
1215
-    			    } else $error = true;
1716
+    			    } else {
1717
+    			    	$error = true;
1718
+    			    }
1216 1719
 			} elseif ($format == 'aprs' && $use_aprs) {
1217 1720
 			    if ($aprs_connect == 0) {
1218 1721
 				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
@@ -1237,32 +1740,66 @@  discard block
 block discarded – undo
1237 1740
 				    $aprs_last_tx = time();
1238 1741
 				    $data = array();
1239 1742
 				    //print_r($line);
1240
-				    if (isset($line['address'])) $data['hex'] = $line['address'];
1241
-				    if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi'];
1242
-				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
1243
-				    else $data['datetime'] = date('Y-m-d H:i:s');
1743
+				    if (isset($line['address'])) {
1744
+				    	$data['hex'] = $line['address'];
1745
+				    }
1746
+				    if (isset($line['mmsi'])) {
1747
+				    	$data['mmsi'] = $line['mmsi'];
1748
+				    }
1749
+				    if (isset($line['timestamp'])) {
1750
+				    	$data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
1751
+				    } else {
1752
+				    	$data['datetime'] = date('Y-m-d H:i:s');
1753
+				    }
1244 1754
 				    //$data['datetime'] = date('Y-m-d H:i:s');
1245
-				    if (isset($line['ident'])) $data['ident'] = $line['ident'];
1755
+				    if (isset($line['ident'])) {
1756
+				    	$data['ident'] = $line['ident'];
1757
+				    }
1246 1758
 				    $data['latitude'] = $line['latitude'];
1247 1759
 				    $data['longitude'] = $line['longitude'];
1248 1760
 				    //$data['verticalrate'] = $line[16];
1249
-				    if (isset($line['speed'])) $data['speed'] = $line['speed'];
1250
-				    else $data['speed'] = 0;
1251
-				    if (isset($line['altitude'])) $data['altitude'] = $line['altitude'];
1252
-				    if (isset($line['comment'])) $data['comment'] = $line['comment'];
1253
-				    if (isset($line['symbol'])) $data['type'] = $line['symbol'];
1254
-				    if (isset($line['heading'])) $data['heading'] = $line['heading'];
1761
+				    if (isset($line['speed'])) {
1762
+				    	$data['speed'] = $line['speed'];
1763
+				    } else {
1764
+				    	$data['speed'] = 0;
1765
+				    }
1766
+				    if (isset($line['altitude'])) {
1767
+				    	$data['altitude'] = $line['altitude'];
1768
+				    }
1769
+				    if (isset($line['comment'])) {
1770
+				    	$data['comment'] = $line['comment'];
1771
+				    }
1772
+				    if (isset($line['symbol'])) {
1773
+				    	$data['type'] = $line['symbol'];
1774
+				    }
1775
+				    if (isset($line['heading'])) {
1776
+				    	$data['heading'] = $line['heading'];
1777
+				    }
1255 1778
 				    //else $data['heading'] = 0;
1256
-				    if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth'];
1257
-				    if (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE)) $data['noarchive'] = true;
1258
-				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1779
+				    if (isset($line['stealth'])) {
1780
+				    	$data['aircraft_type'] = $line['stealth'];
1781
+				    }
1782
+				    if (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE)) {
1783
+				    	$data['noarchive'] = true;
1784
+				    }
1785
+				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
1786
+				    	$data['noarchive'] = true;
1787
+				    }
1259 1788
     				    $data['id_source'] = $id_source;
1260
-    				    if (isset($line['format_source'])) $data['format_source'] = $line['format_source'];
1261
-				    else $data['format_source'] = 'aprs';
1789
+    				    if (isset($line['format_source'])) {
1790
+    				    	$data['format_source'] = $line['format_source'];
1791
+    				    } else {
1792
+				    	$data['format_source'] = 'aprs';
1793
+				    }
1262 1794
 				    $data['source_name'] = $line['source'];
1263
-				    if (isset($line['source_type'])) $data['source_type'] = $line['source_type'];
1264
-				    else $data['source_type'] = 'flarm';
1265
-    				    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1795
+				    if (isset($line['source_type'])) {
1796
+				    	$data['source_type'] = $line['source_type'];
1797
+				    } else {
1798
+				    	$data['source_type'] = 'flarm';
1799
+				    }
1800
+    				    if (isset($globalSources[$nb]['sourcestats'])) {
1801
+    				    	$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1802
+    				    }
1266 1803
 				    $currentdate = date('Y-m-d H:i:s');
1267 1804
 				    $aprsdate = strtotime($data['datetime']);
1268 1805
 				    // Accept data if time <= system time + 20s
@@ -1272,19 +1809,22 @@  discard block
 block discarded – undo
1272 1809
 					echo 'add...'."\n";
1273 1810
 					$send = $MI->add($data);
1274 1811
 				    } elseif (isset($line['stealth'])) {
1275
-					if ($line['stealth'] != 0) echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
1276
-					else echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n";
1812
+					if ($line['stealth'] != 0) {
1813
+						echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
1814
+					} else {
1815
+						echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n";
1816
+					}
1277 1817
 				    //} 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')) {
1278 1818
 				    } 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') {
1279 1819
 					//echo '!!!!!!!!!!!!!!!! SEND !!!!!!!!!!!!!!!!!!!!'."\n";
1280
-					if (isset($globalTracker) && $globalTracker) $send = $TI->add($data);
1820
+					if (isset($globalTracker) && $globalTracker) {
1821
+						$send = $TI->add($data);
1822
+					}
1281 1823
 				    }
1282 1824
 				    unset($data);
1283
-				} 
1284
-				elseif (is_array($line) && $globalDebug && isset($line['symbol']) && $line['symbol'] == 'Weather Station') {
1825
+				} elseif (is_array($line) && $globalDebug && isset($line['symbol']) && $line['symbol'] == 'Weather Station') {
1285 1826
 					echo '!! Weather Station not yet supported'."\n";
1286
-				}
1287
-				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')) {
1827
+				} 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')) {
1288 1828
 					echo '!! Car & Trucks not yet supported'."\n";
1289 1829
 				}
1290 1830
 				//elseif ($line == false && $globalDebug) echo 'Ignored ('.$buffer.")\n";
@@ -1317,26 +1857,45 @@  discard block
 block discarded – undo
1317 1857
     				$data['ground'] = $line[21];
1318 1858
     				$data['emergency'] = $line[19];
1319 1859
     				$data['format_source'] = 'sbs';
1320
-				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1321
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1322
-				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1860
+				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') {
1861
+					$data['source_name'] = $globalSources[$nb]['name'];
1862
+				}
1863
+    				if (isset($globalSources[$nb]['sourcestats'])) {
1864
+    					$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1865
+    				}
1866
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
1867
+					$data['noarchive'] = true;
1868
+				}
1323 1869
     				$data['id_source'] = $id_source;
1324
-    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
1325
-    				else $error = true;
1870
+    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
1871
+    					$send = $SI->add($data);
1872
+    				} else {
1873
+    					$error = true;
1874
+    				}
1326 1875
     				unset($data);
1327
-    			    } else $error = true;
1876
+    			    } else {
1877
+    			    	$error = true;
1878
+    			    }
1328 1879
 			    if ($error) {
1329 1880
 				if (count($line) > 1 && ($line[0] == 'STA' || $line[0] == 'AIR' || $line[0] == 'SEL' || $line[0] == 'ID' || $line[0] == 'CLK')) { 
1330
-					if ($globalDebug) echo "Not a message. Ignoring... \n";
1881
+					if ($globalDebug) {
1882
+						echo "Not a message. Ignoring... \n";
1883
+					}
1331 1884
 				} else {
1332
-					if ($globalDebug) echo "Wrong line format. Ignoring... \n";
1885
+					if ($globalDebug) {
1886
+						echo "Wrong line format. Ignoring... \n";
1887
+					}
1333 1888
 					if ($globalDebug) {
1334 1889
 						echo $buffer;
1335 1890
 						//print_r($line);
1336 1891
 					}
1337 1892
 					//socket_close($r);
1338
-					if ($globalDebug) echo "Reconnect after an error...\n";
1339
-					if ($format == 'aprs') $aprs_connect = 0;
1893
+					if ($globalDebug) {
1894
+						echo "Reconnect after an error...\n";
1895
+					}
1896
+					if ($format == 'aprs') {
1897
+						$aprs_connect = 0;
1898
+					}
1340 1899
 					$sourceer[$nb] = $globalSources[$nb];
1341 1900
 					connect_all($sourceer);
1342 1901
 					$sourceer = array();
@@ -1344,10 +1903,14 @@  discard block
 block discarded – undo
1344 1903
 			    }
1345 1904
 			}
1346 1905
 			// Sleep for xxx microseconds
1347
-			if (isset($globalSBSSleep)) usleep($globalSBSSleep);
1906
+			if (isset($globalSBSSleep)) {
1907
+				usleep($globalSBSSleep);
1908
+			}
1348 1909
 		    } else {
1349 1910
 			if ($format == 'flightgearmp') {
1350
-			    	if ($globalDebug) echo "Reconnect FlightGear MP...";
1911
+			    	if ($globalDebug) {
1912
+			    		echo "Reconnect FlightGear MP...";
1913
+			    	}
1351 1914
 				//@socket_close($r);
1352 1915
 				sleep($globalMinFetch);
1353 1916
 				$sourcefg[$nb] = $globalSources[$nb];
@@ -1356,10 +1919,15 @@  discard block
 block discarded – undo
1356 1919
 				break;
1357 1920
 				
1358 1921
 			} elseif ($format != 'acars' && $format != 'flightgearsp') {
1359
-			    if (isset($tt[$format])) $tt[$format]++;
1360
-			    else $tt[$format] = 0;
1922
+			    if (isset($tt[$format])) {
1923
+			    	$tt[$format]++;
1924
+			    } else {
1925
+			    	$tt[$format] = 0;
1926
+			    }
1361 1927
 			    if ($tt[$format] > 30) {
1362
-				if ($globalDebug) echo "ERROR : Reconnect ".$format."...";
1928
+				if ($globalDebug) {
1929
+					echo "ERROR : Reconnect ".$format."...";
1930
+				}
1363 1931
 				//@socket_close($r);
1364 1932
 				sleep(2);
1365 1933
 				$aprs_connect = 0;
@@ -1376,11 +1944,17 @@  discard block
 block discarded – undo
1376 1944
 	    } else {
1377 1945
 		$error = socket_strerror(socket_last_error());
1378 1946
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) {
1379
-			if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
1380
-			if (isset($globalDebug)) echo "Restarting...\n";
1947
+			if ($globalDebug) {
1948
+				echo "ERROR : socket_select give this error ".$error . "\n";
1949
+			}
1950
+			if (isset($globalDebug)) {
1951
+				echo "Restarting...\n";
1952
+			}
1381 1953
 			// Restart the script if possible
1382 1954
 			if (is_array($sockets)) {
1383
-			    if ($globalDebug) echo "Shutdown all sockets...";
1955
+			    if ($globalDebug) {
1956
+			    	echo "Shutdown all sockets...";
1957
+			    }
1384 1958
 			    
1385 1959
 			    foreach ($sockets as $sock) {
1386 1960
 				@socket_shutdown($sock,2);
@@ -1388,21 +1962,33 @@  discard block
 block discarded – undo
1388 1962
 			    }
1389 1963
 			    
1390 1964
 			}
1391
-			if ($globalDebug) echo "Restart all connections...";
1965
+			if ($globalDebug) {
1966
+				echo "Restart all connections...";
1967
+			}
1392 1968
 			sleep(2);
1393 1969
 			$time = time();
1394 1970
 			//connect_all($hosts);
1395 1971
 			$aprs_connect = 0;
1396
-			if ($reset%5 == 0) sleep(20);
1397
-			if ($reset%10 == 0) sleep(100);
1398
-			if ($reset%20 == 0) sleep(200);
1399
-			if ($reset > 100) exit('Too many attempts...');
1972
+			if ($reset%5 == 0) {
1973
+				sleep(20);
1974
+			}
1975
+			if ($reset%10 == 0) {
1976
+				sleep(100);
1977
+			}
1978
+			if ($reset%20 == 0) {
1979
+				sleep(200);
1980
+			}
1981
+			if ($reset > 100) {
1982
+				exit('Too many attempts...');
1983
+			}
1400 1984
 			connect_all($globalSources);
1401 1985
 		}
1402 1986
 	    }
1403 1987
 	}
1404 1988
 	if ($globalDaemon === false) {
1405
-	    if ($globalDebug) echo 'Check all...'."\n";
1989
+	    if ($globalDebug) {
1990
+	    	echo 'Check all...'."\n";
1991
+	    }
1406 1992
 	    $SI->checkAll();
1407 1993
 	}
1408 1994
     }
Please login to merge, or discard this patch.