Completed
Push — master ( 362b52...c440c8 )
by Yannick
09:25
created
scripts/daemon-spotter.php 1 patch
Indentation   +940 added lines, -940 removed lines patch added patch discarded remove patch
@@ -16,8 +16,8 @@  discard block
 block discarded – undo
16 16
 require_once(dirname(__FILE__).'/../require/class.Common.php');
17 17
 if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
18 18
 if (isset($globalMarine) && $globalMarine) {
19
-    require_once(dirname(__FILE__).'/../require/class.AIS.php');
20
-    require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
19
+	require_once(dirname(__FILE__).'/../require/class.AIS.php');
20
+	require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
21 21
 }
22 22
 
23 23
 if (!isset($globalDebug)) $globalDebug = FALSE;
@@ -25,42 +25,42 @@  discard block
 block discarded – undo
25 25
 // Check if schema is at latest version
26 26
 $Connection = new Connection();
27 27
 if ($Connection->latest() === false) {
28
-    echo "You MUST update to latest schema. Run install/index.php";
29
-    exit();
28
+	echo "You MUST update to latest schema. Run install/index.php";
29
+	exit();
30 30
 }
31 31
 if (PHP_SAPI != 'cli') {
32
-    echo "This script MUST be called from console, not a web browser.";
32
+	echo "This script MUST be called from console, not a web browser.";
33 33
 //    exit();
34 34
 }
35 35
 
36 36
 // This is to be compatible with old version of settings.php
37 37
 if (!isset($globalSources)) {
38
-    if (isset($globalSBS1Hosts)) {
39
-        //$hosts = $globalSBS1Hosts;
40
-        foreach ($globalSBS1Hosts as $host) {
41
-	    $globalSources[] = array('host' => $host);
42
-    	}
43
-    } else {
44
-        if (!isset($globalSBS1Host)) {
45
-	    echo '$globalSources MUST be defined !';
46
-	    die;
38
+	if (isset($globalSBS1Hosts)) {
39
+		//$hosts = $globalSBS1Hosts;
40
+		foreach ($globalSBS1Hosts as $host) {
41
+		$globalSources[] = array('host' => $host);
42
+		}
43
+	} else {
44
+		if (!isset($globalSBS1Host)) {
45
+		echo '$globalSources MUST be defined !';
46
+		die;
47 47
 	}
48 48
 	//$hosts = array($globalSBS1Host.':'.$globalSBS1Port);
49 49
 	$globalSources[] = array('host' => $globalSBS1Host,'port' => $globalSBS1Port);
50
-    }
50
+	}
51 51
 }
52 52
 
53 53
 $options = getopt('s::',array('source::','server','nodaemon','idsource::','aprsserverssid::','aprsserverpass::','aprsserverhost::','aprsserverport::','format::','noaprsserver'));
54 54
 //if (isset($options['s'])) $hosts = array($options['s']);
55 55
 //elseif (isset($options['source'])) $hosts = array($options['source']);
56 56
 if (isset($options['s'])) {
57
-    $globalSources = array();
58
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']);
59
-    else $globalSources[] = array('host' => $options['s']);
57
+	$globalSources = array();
58
+	if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']);
59
+	else $globalSources[] = array('host' => $options['s']);
60 60
 } elseif (isset($options['source'])) {
61
-    $globalSources = array();
62
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']);
63
-    else $globalSources[] = array('host' => $options['source']);
61
+	$globalSources = array();
62
+	if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']);
63
+	else $globalSources[] = array('host' => $options['source']);
64 64
 }
65 65
 if (isset($options['aprsserverhost'])) {
66 66
 	$globalServerAPRS = TRUE;
@@ -75,8 +75,8 @@  discard block
 block discarded – undo
75 75
 if (isset($options['idsource'])) $id_source = $options['idsource'];
76 76
 else $id_source = 1;
77 77
 if (isset($globalServer) && $globalServer) {
78
-    if ($globalDebug) echo "Using Server Mode\n";
79
-    $SI=new SpotterServer();
78
+	if ($globalDebug) echo "Using Server Mode\n";
79
+	$SI=new SpotterServer();
80 80
 /*
81 81
     require_once(dirname(__FILE__).'/../require/class.APRS.php');
82 82
     $SI = new adsb2aprs();
@@ -85,8 +85,8 @@  discard block
 block discarded – undo
85 85
 } else $SI=new SpotterImport($Connection->db);
86 86
 if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db);
87 87
 if (isset($globalMarine) && $globalMarine) {
88
-    $AIS = new AIS();
89
-    $MI = new MarineImport($Connection->db);
88
+	$AIS = new AIS();
89
+	$MI = new MarineImport($Connection->db);
90 90
 }
91 91
 //$APRS=new APRS($Connection->db);
92 92
 $SBS=new SBS();
@@ -97,12 +97,12 @@  discard block
 block discarded – undo
97 97
 //$servertz = system('date +%Z');
98 98
 // signal handler - playing nice with sockets and dump1090
99 99
 if (function_exists('pcntl_fork')) {
100
-    pcntl_signal(SIGINT,  function() {
101
-        global $sockets;
102
-        echo "\n\nctrl-c or kill signal received. Tidying up ... ";
103
-        die("Bye!\n");
104
-    });
105
-    pcntl_signal_dispatch();
100
+	pcntl_signal(SIGINT,  function() {
101
+		global $sockets;
102
+		echo "\n\nctrl-c or kill signal received. Tidying up ... ";
103
+		die("Bye!\n");
104
+	});
105
+	pcntl_signal_dispatch();
106 106
 }
107 107
 
108 108
 // let's try and connect
@@ -112,36 +112,36 @@  discard block
 block discarded – undo
112 112
 $reset = 0;
113 113
 
114 114
 function connect_all($hosts) {
115
-    //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
116
-    global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;
117
-    $reset++;
118
-    if ($globalDebug) echo 'Connect to all...'."\n";
119
-    foreach ($hosts as $id => $value) {
115
+	//global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
116
+	global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;
117
+	$reset++;
118
+	if ($globalDebug) echo 'Connect to all...'."\n";
119
+	foreach ($hosts as $id => $value) {
120 120
 	$host = $value['host'];
121 121
 	$globalSources[$id]['last_exec'] = 0;
122 122
 	// Here we check type of source(s)
123 123
 	if (filter_var($host,FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) {
124
-            if (preg_match('/deltadb.txt$/i',$host)) {
125
-        	//$formats[$id] = 'deltadbtxt';
126
-        	$globalSources[$id]['format'] = 'deltadbtxt';
127
-        	//$last_exec['deltadbtxt'] = 0;
128
-        	if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
129
-            } else if (preg_match('/vatsim-data.txt$/i',$host)) {
130
-        	//$formats[$id] = 'vatsimtxt';
131
-        	$globalSources[$id]['format'] = 'vatsimtxt';
132
-        	//$last_exec['vatsimtxt'] = 0;
133
-        	if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
134
-    	    } else if (preg_match('/aircraftlist.json$/i',$host)) {
135
-        	//$formats[$id] = 'aircraftlistjson';
136
-        	$globalSources[$id]['format'] = 'aircraftlistjson';
137
-        	//$last_exec['aircraftlistjson'] = 0;
138
-        	if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
139
-    	    } else if (preg_match('/opensky/i',$host)) {
140
-        	//$formats[$id] = 'aircraftlistjson';
141
-        	$globalSources[$id]['format'] = 'opensky';
142
-        	//$last_exec['aircraftlistjson'] = 0;
143
-        	if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
144
-    	    /*
124
+			if (preg_match('/deltadb.txt$/i',$host)) {
125
+			//$formats[$id] = 'deltadbtxt';
126
+			$globalSources[$id]['format'] = 'deltadbtxt';
127
+			//$last_exec['deltadbtxt'] = 0;
128
+			if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
129
+			} else if (preg_match('/vatsim-data.txt$/i',$host)) {
130
+			//$formats[$id] = 'vatsimtxt';
131
+			$globalSources[$id]['format'] = 'vatsimtxt';
132
+			//$last_exec['vatsimtxt'] = 0;
133
+			if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
134
+			} else if (preg_match('/aircraftlist.json$/i',$host)) {
135
+			//$formats[$id] = 'aircraftlistjson';
136
+			$globalSources[$id]['format'] = 'aircraftlistjson';
137
+			//$last_exec['aircraftlistjson'] = 0;
138
+			if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
139
+			} else if (preg_match('/opensky/i',$host)) {
140
+			//$formats[$id] = 'aircraftlistjson';
141
+			$globalSources[$id]['format'] = 'opensky';
142
+			//$last_exec['aircraftlistjson'] = 0;
143
+			if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
144
+			/*
145 145
     	    // Disabled for now, site change source format
146 146
     	    } else if (preg_match('/radarvirtuel.com\/list_aircrafts$/i',$host)) {
147 147
         	//$formats[$id] = 'radarvirtueljson';
@@ -153,118 +153,118 @@  discard block
 block discarded – undo
153 153
         	    exit(0);
154 154
         	}
155 155
     	    */
156
-    	    } else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
157
-        	//$formats[$id] = 'planeupdatefaa';
158
-        	$globalSources[$id]['format'] = 'planeupdatefaa';
159
-        	//$last_exec['planeupdatefaa'] = 0;
160
-        	if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
161
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
162
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
163
-        	    exit(0);
164
-        	}
165
-            } else if (preg_match('/\/action.php\/acars\/data$/i',$host)) {
166
-        	//$formats[$id] = 'phpvmacars';
167
-        	$globalSources[$id]['format'] = 'phpvmacars';
168
-        	//$last_exec['phpvmacars'] = 0;
169
-        	if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
170
-            } else if (preg_match('/VAM-json.php$/i',$host)) {
171
-        	//$formats[$id] = 'phpvmacars';
172
-        	$globalSources[$id]['format'] = 'vam';
173
-        	if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
174
-            } else if (preg_match('/whazzup/i',$host)) {
175
-        	//$formats[$id] = 'whazzup';
176
-        	$globalSources[$id]['format'] = 'whazzup';
177
-        	//$last_exec['whazzup'] = 0;
178
-        	if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
179
-            } else if (preg_match('/airwhere/i',$host)) {
180
-        	$globalSources[$id]['format'] = 'airwhere';
181
-        	if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n";
182
-            } else if (preg_match('/recentpireps/i',$host)) {
183
-        	//$formats[$id] = 'pirepsjson';
184
-        	$globalSources[$id]['format'] = 'pirepsjson';
185
-        	//$last_exec['pirepsjson'] = 0;
186
-        	if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
187
-            } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
188
-        	//$formats[$id] = 'fr24json';
189
-        	$globalSources[$id]['format'] = 'fr24json';
190
-        	//$last_exec['fr24json'] = 0;
191
-        	if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n";
192
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
193
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
194
-        	    exit(0);
195
-        	}
196
-            } else if (preg_match(':myshiptracking.com/:i',$host)) {
197
-        	//$formats[$id] = 'fr24json';
198
-        	$globalSources[$id]['format'] = 'myshiptracking';
199
-        	//$last_exec['fr24json'] = 0;
200
-        	if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n";
201
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
202
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
203
-        	    exit(0);
204
-        	}
205
-            //} else if (preg_match('/10001/',$host)) {
206
-            } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
207
-        	//$formats[$id] = 'tsv';
208
-        	$globalSources[$id]['format'] = 'tsv';
209
-        	if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
210
-            }
211
-        } elseif (filter_var($host,FILTER_VALIDATE_URL)) {
212
-    		if ($globalSources[$id]['format'] == 'aisnmeahttp') {
213
-    		    $idf = fopen($globalSources[$id]['host'],'r',false,$context);
214
-    		    if ($idf !== false) {
215
-    			$httpfeeds[$id] = $idf;
216
-        		if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
217
-    		    }
218
-    		    elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
219
-    		} elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
220
-        } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
221
-	    $hostport = explode(':',$host);
222
-	    if (isset($hostport[1])) {
156
+			} else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
157
+			//$formats[$id] = 'planeupdatefaa';
158
+			$globalSources[$id]['format'] = 'planeupdatefaa';
159
+			//$last_exec['planeupdatefaa'] = 0;
160
+			if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
161
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
162
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
163
+				exit(0);
164
+			}
165
+			} else if (preg_match('/\/action.php\/acars\/data$/i',$host)) {
166
+			//$formats[$id] = 'phpvmacars';
167
+			$globalSources[$id]['format'] = 'phpvmacars';
168
+			//$last_exec['phpvmacars'] = 0;
169
+			if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
170
+			} else if (preg_match('/VAM-json.php$/i',$host)) {
171
+			//$formats[$id] = 'phpvmacars';
172
+			$globalSources[$id]['format'] = 'vam';
173
+			if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
174
+			} else if (preg_match('/whazzup/i',$host)) {
175
+			//$formats[$id] = 'whazzup';
176
+			$globalSources[$id]['format'] = 'whazzup';
177
+			//$last_exec['whazzup'] = 0;
178
+			if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
179
+			} else if (preg_match('/airwhere/i',$host)) {
180
+			$globalSources[$id]['format'] = 'airwhere';
181
+			if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n";
182
+			} else if (preg_match('/recentpireps/i',$host)) {
183
+			//$formats[$id] = 'pirepsjson';
184
+			$globalSources[$id]['format'] = 'pirepsjson';
185
+			//$last_exec['pirepsjson'] = 0;
186
+			if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
187
+			} else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
188
+			//$formats[$id] = 'fr24json';
189
+			$globalSources[$id]['format'] = 'fr24json';
190
+			//$last_exec['fr24json'] = 0;
191
+			if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n";
192
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
193
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
194
+				exit(0);
195
+			}
196
+			} else if (preg_match(':myshiptracking.com/:i',$host)) {
197
+			//$formats[$id] = 'fr24json';
198
+			$globalSources[$id]['format'] = 'myshiptracking';
199
+			//$last_exec['fr24json'] = 0;
200
+			if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n";
201
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
202
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
203
+				exit(0);
204
+			}
205
+			//} else if (preg_match('/10001/',$host)) {
206
+			} else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
207
+			//$formats[$id] = 'tsv';
208
+			$globalSources[$id]['format'] = 'tsv';
209
+			if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
210
+			}
211
+		} elseif (filter_var($host,FILTER_VALIDATE_URL)) {
212
+			if ($globalSources[$id]['format'] == 'aisnmeahttp') {
213
+				$idf = fopen($globalSources[$id]['host'],'r',false,$context);
214
+				if ($idf !== false) {
215
+				$httpfeeds[$id] = $idf;
216
+				if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
217
+				}
218
+				elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
219
+			} elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
220
+		} elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
221
+		$hostport = explode(':',$host);
222
+		if (isset($hostport[1])) {
223 223
 		$port = $hostport[1];
224 224
 		$hostn = $hostport[0];
225
-	    } else {
225
+		} else {
226 226
 		$port = $globalSources[$id]['port'];
227 227
 		$hostn = $globalSources[$id]['host'];
228
-	    }
229
-	    $Common = new Common();
230
-	    if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
231
-        	$s = $Common->create_socket($hostn,$port, $errno, $errstr);
232
-    	    } else {
233
-        	$s = $Common->create_socket_udp($hostn,$port, $errno, $errstr);
234
-	    }
235
-	    if ($s) {
236
-    	        $sockets[$id] = $s;
237
-    	        if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
238
-		    if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') {
228
+		}
229
+		$Common = new Common();
230
+		if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
231
+			$s = $Common->create_socket($hostn,$port, $errno, $errstr);
232
+			} else {
233
+			$s = $Common->create_socket_udp($hostn,$port, $errno, $errstr);
234
+		}
235
+		if ($s) {
236
+				$sockets[$id] = $s;
237
+				if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
238
+			if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') {
239 239
 			//$formats[$id] = 'aprs';
240 240
 			$globalSources[$id]['format'] = 'aprs';
241 241
 			//$aprs_connect = 0;
242 242
 			//$use_aprs = true;
243
-		    } elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
243
+			} elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
244 244
 			$globalSources[$id]['format'] = 'vrstcp';
245
-    		    } elseif ($port == '10001') {
246
-        		//$formats[$id] = 'tsv';
247
-        		$globalSources[$id]['format'] = 'tsv';
248
-		    } elseif ($port == '30002') {
249
-        		//$formats[$id] = 'raw';
250
-        		$globalSources[$id]['format'] = 'raw';
251
-		    } elseif ($port == '5001') {
252
-        		//$formats[$id] = 'raw';
253
-        		$globalSources[$id]['format'] = 'flightgearmp';
254
-		    } elseif ($port == '30005') {
245
+				} elseif ($port == '10001') {
246
+				//$formats[$id] = 'tsv';
247
+				$globalSources[$id]['format'] = 'tsv';
248
+			} elseif ($port == '30002') {
249
+				//$formats[$id] = 'raw';
250
+				$globalSources[$id]['format'] = 'raw';
251
+			} elseif ($port == '5001') {
252
+				//$formats[$id] = 'raw';
253
+				$globalSources[$id]['format'] = 'flightgearmp';
254
+			} elseif ($port == '30005') {
255 255
 			// Not yet supported
256
-        		//$formats[$id] = 'beast';
257
-        		$globalSources[$id]['format'] = 'beast';
258
-		    //} else $formats[$id] = 'sbs';
259
-		    } else $globalSources[$id]['format'] = 'sbs';
260
-		    //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
256
+				//$formats[$id] = 'beast';
257
+				$globalSources[$id]['format'] = 'beast';
258
+			//} else $formats[$id] = 'sbs';
259
+			} else $globalSources[$id]['format'] = 'sbs';
260
+			//if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
261 261
 		}
262 262
 		if ($globalDebug) echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
263
-            } else {
263
+			} else {
264 264
 		if ($globalDebug) echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";
265
-    	    }
266
-        }
267
-    }
265
+			}
266
+		}
267
+	}
268 268
 }
269 269
 if (!isset($globalMinFetch)) $globalMinFetch = 15;
270 270
 
@@ -287,9 +287,9 @@  discard block
 block discarded – undo
287 287
 //connect_all($globalSources);
288 288
 
289 289
 if (isset($globalProxy) && $globalProxy) {
290
-    $context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true)));
290
+	$context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true)));
291 291
 } else {
292
-    $context = stream_context_create(array('http' => array('timeout' => $timeout)));
292
+	$context = stream_context_create(array('http' => array('timeout' => $timeout)));
293 293
 }
294 294
 
295 295
 // APRS Configuration
@@ -298,21 +298,21 @@  discard block
 block discarded – undo
298 298
 	die;
299 299
 }
300 300
 foreach ($globalSources as $key => $source) {
301
-    if (!isset($source['format'])) {
302
-        $globalSources[$key]['format'] = 'auto';
303
-    }
304
-    if (isset($source['callback']) && $source['callback'] === TRUE) {
305
-        unset($globalSources[$key]);
306
-    }
301
+	if (!isset($source['format'])) {
302
+		$globalSources[$key]['format'] = 'auto';
303
+	}
304
+	if (isset($source['callback']) && $source['callback'] === TRUE) {
305
+		unset($globalSources[$key]);
306
+	}
307 307
 }
308 308
 connect_all($globalSources);
309 309
 foreach ($globalSources as $key => $source) {
310
-    if (isset($source['format']) && $source['format'] == 'aprs') {
310
+	if (isset($source['format']) && $source['format'] == 'aprs') {
311 311
 	$aprs_connect = 0;
312 312
 	$use_aprs = true;
313 313
 	if (isset($source['port']) && $source['port'] == '10152') $aprs_full = true;
314 314
 	break;
315
-    }
315
+	}
316 316
 }
317 317
 
318 318
 if ($use_aprs) {
@@ -353,115 +353,115 @@  discard block
 block discarded – undo
353 353
 
354 354
 // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time.
355 355
 while ($i > 0) {
356
-    if (!$globalDaemon) $i = $endtime-time();
357
-    // Delete old ATC
358
-    if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
356
+	if (!$globalDaemon) $i = $endtime-time();
357
+	// Delete old ATC
358
+	if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
359 359
 	if ($globalDebug) echo 'Delete old ATC...'."\n";
360
-        $ATC->deleteOldATC();
361
-    }
360
+		$ATC->deleteOldATC();
361
+	}
362 362
     
363
-    if (count($last_exec) == count($globalSources)) {
363
+	if (count($last_exec) == count($globalSources)) {
364 364
 	$max = $globalMinFetch;
365 365
 	foreach ($last_exec as $last) {
366
-	    if ((time() - $last['last']) < $max) $max = time() - $last['last'];
366
+		if ((time() - $last['last']) < $max) $max = time() - $last['last'];
367 367
 	}
368 368
 	if ($max != $globalMinFetch) {
369
-	    if ($globalDebug) echo 'Sleeping...'."\n";
370
-	    sleep($globalMinFetch-$max+2);
369
+		if ($globalDebug) echo 'Sleeping...'."\n";
370
+		sleep($globalMinFetch-$max+2);
371
+	}
371 372
 	}
372
-    }
373 373
 
374 374
     
375
-    //foreach ($formats as $id => $value) {
376
-    foreach ($globalSources as $id => $value) {
375
+	//foreach ($formats as $id => $value) {
376
+	foreach ($globalSources as $id => $value) {
377 377
 	date_default_timezone_set('UTC');
378 378
 	if (!isset($last_exec[$id]['last'])) $last_exec[$id]['last'] = 0;
379 379
 	if ($value['format'] == 'deltadbtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
380
-	    //$buffer = $Common->getData($hosts[$id]);
381
-	    $buffer = $Common->getData($value['host']);
382
-	    if ($buffer != '') $reset = 0;
383
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
384
-	    $buffer = explode('\n',$buffer);
385
-	    foreach ($buffer as $line) {
386
-    		if ($line != '' && count($line) > 7) {
387
-    		    $line = explode(',', $line);
388
-	            $data = array();
389
-	            $data['hex'] = $line[1]; // hex
390
-	            $data['ident'] = $line[2]; // ident
391
-	            if (isset($line[3])) $data['altitude'] = $line[3]; // altitude
392
-	            if (isset($line[4])) $data['speed'] = $line[4]; // speed
393
-	            if (isset($line[5])) $data['heading'] = $line[5]; // heading
394
-	            if (isset($line[6])) $data['latitude'] = $line[6]; // lat
395
-	            if (isset($line[7])) $data['longitude'] = $line[7]; // long
396
-	            $data['verticalrate'] = ''; // vertical rate
397
-	            //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk
398
-	            $data['emergency'] = ''; // emergency
399
-		    $data['datetime'] = date('Y-m-d H:i:s');
400
-		    $data['format_source'] = 'deltadbtxt';
401
-    		    $data['id_source'] = $id_source;
402
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
403
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
404
-		    if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
405
-    		    $SI->add($data);
406
-		    unset($data);
407
-    		}
408
-    	    }
409
-    	    $last_exec[$id]['last'] = time();
380
+		//$buffer = $Common->getData($hosts[$id]);
381
+		$buffer = $Common->getData($value['host']);
382
+		if ($buffer != '') $reset = 0;
383
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
384
+		$buffer = explode('\n',$buffer);
385
+		foreach ($buffer as $line) {
386
+			if ($line != '' && count($line) > 7) {
387
+				$line = explode(',', $line);
388
+				$data = array();
389
+				$data['hex'] = $line[1]; // hex
390
+				$data['ident'] = $line[2]; // ident
391
+				if (isset($line[3])) $data['altitude'] = $line[3]; // altitude
392
+				if (isset($line[4])) $data['speed'] = $line[4]; // speed
393
+				if (isset($line[5])) $data['heading'] = $line[5]; // heading
394
+				if (isset($line[6])) $data['latitude'] = $line[6]; // lat
395
+				if (isset($line[7])) $data['longitude'] = $line[7]; // long
396
+				$data['verticalrate'] = ''; // vertical rate
397
+				//if (isset($line[9])) $data['squawk'] = $line[9]; // squawk
398
+				$data['emergency'] = ''; // emergency
399
+			$data['datetime'] = date('Y-m-d H:i:s');
400
+			$data['format_source'] = 'deltadbtxt';
401
+				$data['id_source'] = $id_source;
402
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
403
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
404
+			if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
405
+				$SI->add($data);
406
+			unset($data);
407
+			}
408
+			}
409
+			$last_exec[$id]['last'] = time();
410 410
 	} elseif ($value['format'] == 'aisnmeatxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
411
-	    date_default_timezone_set('CET');
412
-	    $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
413
-	    date_default_timezone_set('UTC');
414
-	    if ($buffer != '') $reset = 0;
415
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
416
-	    $buffer = explode('\n',$buffer);
417
-	    foreach ($buffer as $line) {
411
+		date_default_timezone_set('CET');
412
+		$buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
413
+		date_default_timezone_set('UTC');
414
+		if ($buffer != '') $reset = 0;
415
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
416
+		$buffer = explode('\n',$buffer);
417
+		foreach ($buffer as $line) {
418 418
 		if ($line != '') {
419
-		    //echo "'".$line."'\n";
420
-		    $add = false;
421
-		    $ais_data = $AIS->parse_line(trim($line));
422
-		    $data = array();
423
-		    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
424
-		    if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
425
-		    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
426
-		    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
427
-		    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
428
-		    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
429
-		    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
430
-		    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
431
-		    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
432
-		    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
433
-		    if (isset($ais_data['timestamp'])) {
419
+			//echo "'".$line."'\n";
420
+			$add = false;
421
+			$ais_data = $AIS->parse_line(trim($line));
422
+			$data = array();
423
+			if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
424
+			if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
425
+			if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
426
+			if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
427
+			if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
428
+			if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
429
+			if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
430
+			if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
431
+			if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
432
+			if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
433
+			if (isset($ais_data['timestamp'])) {
434 434
 			$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
435 435
 			if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) {
436
-			    $last_exec[$id]['timestamp'] = $ais_data['timestamp'];
437
-			    $add = true;
436
+				$last_exec[$id]['timestamp'] = $ais_data['timestamp'];
437
+				$add = true;
438 438
 			}
439
-		    } else {
439
+			} else {
440 440
 			$data['datetime'] = date('Y-m-d H:i:s');
441 441
 			$add = true;
442
-		    }
443
-		    $data['format_source'] = 'aisnmeatxt';
444
-    		    $data['id_source'] = $id_source;
445
-		    //print_r($data);
446
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
447
-		    if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
448
-		    unset($data);
442
+			}
443
+			$data['format_source'] = 'aisnmeatxt';
444
+				$data['id_source'] = $id_source;
445
+			//print_r($data);
446
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
447
+			if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
448
+			unset($data);
449 449
 		}
450
-    	    }
451
-    	    $last_exec[$id]['last'] = time();
450
+			}
451
+			$last_exec[$id]['last'] = time();
452 452
 	} elseif ($value['format'] == 'aisnmeahttp') {
453
-	    $arr = $httpfeeds;
454
-	    $w = $e = null;
453
+		$arr = $httpfeeds;
454
+		$w = $e = null;
455 455
 	    
456
-	    if (isset($arr[$id])) {
456
+		if (isset($arr[$id])) {
457 457
 		$nn = stream_select($arr,$w,$e,$timeout);
458 458
 		if ($nn > 0) {
459
-		    foreach ($httpfeeds as $feed) {
459
+			foreach ($httpfeeds as $feed) {
460 460
 			$buffer = stream_get_line($feed,2000,"\n");
461 461
 			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
462 462
 			$buffer = explode('\n',$buffer);
463 463
 			foreach ($buffer as $line) {
464
-			    if ($line != '') {
464
+				if ($line != '') {
465 465
 				$ais_data = $AIS->parse_line(trim($line));
466 466
 				$data = array();
467 467
 				if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
@@ -479,96 +479,96 @@  discard block
 block discarded – undo
479 479
 				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
480 480
 				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
481 481
 				if (isset($ais_data['timestamp'])) {
482
-				    $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
482
+					$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
483 483
 				} else {
484
-				    $data['datetime'] = date('Y-m-d H:i:s');
484
+					$data['datetime'] = date('Y-m-d H:i:s');
485 485
 				}
486 486
 				$data['format_source'] = 'aisnmeahttp';
487 487
 				$data['id_source'] = $id_source;
488 488
 				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
489 489
 				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
490 490
 				unset($data);
491
-			    }
491
+				}
492
+			}
492 493
 			}
493
-		    }
494 494
 		} else {
495
-		    $format = $value['format'];
496
-		    if (isset($tt[$format])) $tt[$format]++;
497
-		    else $tt[$format] = 0;
498
-		    if ($tt[$format] > 30) {
495
+			$format = $value['format'];
496
+			if (isset($tt[$format])) $tt[$format]++;
497
+			else $tt[$format] = 0;
498
+			if ($tt[$format] > 30) {
499 499
 			if ($globalDebug) echo 'Reconnect...'."\n";
500 500
 			sleep(2);
501 501
 			$sourceeen[] = $value;
502 502
 			connect_all($sourceeen);
503 503
 			$sourceeen = array();
504
-		    }
504
+			}
505
+		}
505 506
 		}
506
-	    }
507 507
 	} elseif ($value['format'] == 'myshiptracking' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
508
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
509
-	    if ($buffer != '') {
508
+		$buffer = $Common->getData($value['host'],'get','','','','','20');
509
+		if ($buffer != '') {
510 510
 		//echo $buffer;
511 511
 		$all_data = json_decode($buffer,true);
512 512
 		//print_r($all_data);
513 513
 		if (isset($all_data[0]['DATA'])) {
514
-		    foreach ($all_data[0]['DATA'] as $line) {
514
+			foreach ($all_data[0]['DATA'] as $line) {
515 515
 			if ($line != '') {
516
-			    $data = array();
517
-			    $data['ident'] = $line['NAME'];
518
-			    $data['mmsi'] = $line['MMSI'];
519
-			    $data['speed'] = $line['SOG'];
520
-			    $data['heading'] = $line['COG'];
521
-			    $data['latitude'] = $line['LAT'];
522
-			    $data['longitude'] = $line['LNG'];
523
-			    //    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
524
-			    $data['imo'] = $line['IMO'];
525
-			    //$data['arrival_code'] = $ais_data['destination'];
526
-			    $data['datetime'] = date('Y-m-d H:i:s',$line['T']);
527
-			    $data['format_source'] = 'myshiptracking';
528
-			    $data['id_source'] = $id_source;
529
-			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
530
-			    $MI->add($data);
531
-			    unset($data);
516
+				$data = array();
517
+				$data['ident'] = $line['NAME'];
518
+				$data['mmsi'] = $line['MMSI'];
519
+				$data['speed'] = $line['SOG'];
520
+				$data['heading'] = $line['COG'];
521
+				$data['latitude'] = $line['LAT'];
522
+				$data['longitude'] = $line['LNG'];
523
+				//    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
524
+				$data['imo'] = $line['IMO'];
525
+				//$data['arrival_code'] = $ais_data['destination'];
526
+				$data['datetime'] = date('Y-m-d H:i:s',$line['T']);
527
+				$data['format_source'] = 'myshiptracking';
528
+				$data['id_source'] = $id_source;
529
+				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
530
+				$MI->add($data);
531
+				unset($data);
532
+			}
532 533
 			}
533
-		    }
534 534
 		}
535
-	    }
536
-	    $last_exec[$id]['last'] = time();
535
+		}
536
+		$last_exec[$id]['last'] = time();
537 537
 	} elseif ($value['format'] == 'boatbeaconapp' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
538
-	    $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host']));
539
-	    if ($buffer != '') {
538
+		$buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host']));
539
+		if ($buffer != '') {
540 540
 		$all_data = json_decode($buffer,true);
541 541
 		if (isset($all_data[0]['mmsi'])) {
542
-		    foreach ($all_data as $line) {
542
+			foreach ($all_data as $line) {
543 543
 			if ($line != '') {
544
-			    $data = array();
545
-			    $data['ident'] = $line['shipname'];
546
-			    $data['callsign'] = $line['callsign'];
547
-			    $data['mmsi'] = $line['mmsi'];
548
-			    $data['speed'] = $line['sog'];
549
-			    if ($line['heading'] != '511') $data['heading'] = $line['heading'];
550
-			    $data['latitude'] = $line['latitude'];
551
-			    $data['longitude'] = $line['longitude'];
552
-			    $data['type_id'] = $line['shiptype'];
553
-			    $data['arrival_code'] = $line['destination'];
554
-			    $data['datetime'] = $line['time'];
555
-			    $data['format_source'] = 'boatbeaconapp';
556
-			    $data['id_source'] = $id_source;
557
-			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
558
-			    $MI->add($data);
559
-			    unset($data);
544
+				$data = array();
545
+				$data['ident'] = $line['shipname'];
546
+				$data['callsign'] = $line['callsign'];
547
+				$data['mmsi'] = $line['mmsi'];
548
+				$data['speed'] = $line['sog'];
549
+				if ($line['heading'] != '511') $data['heading'] = $line['heading'];
550
+				$data['latitude'] = $line['latitude'];
551
+				$data['longitude'] = $line['longitude'];
552
+				$data['type_id'] = $line['shiptype'];
553
+				$data['arrival_code'] = $line['destination'];
554
+				$data['datetime'] = $line['time'];
555
+				$data['format_source'] = 'boatbeaconapp';
556
+				$data['id_source'] = $id_source;
557
+				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
558
+				$MI->add($data);
559
+				unset($data);
560
+			}
560 561
 			}
561
-		    }
562 562
 		}
563 563
 		
564
-	    }
565
-    	    $last_exec[$id]['last'] = time();
564
+		}
565
+			$last_exec[$id]['last'] = time();
566 566
 	} elseif ($value['format'] == 'boatnerd' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
567
-	    $buffer = $Common->getData($value['host']);
568
-	    if ($buffer != '') {
567
+		$buffer = $Common->getData($value['host']);
568
+		if ($buffer != '') {
569 569
 		$all_data = json_decode($buffer,true);
570 570
 		if (isset($all_data['features'][0]['id'])) {
571
-		    foreach ($all_data['features'] as $line) {
571
+			foreach ($all_data['features'] as $line) {
572 572
 			$data = array();
573 573
 			if (isset($line['properties']['name'])) $data['ident'] = $line['properties']['name'];
574 574
 			if (isset($line['properties']['callsign'])) $data['callsign'] = $line['properties']['callsign'];
@@ -587,59 +587,59 @@  discard block
 block discarded – undo
587 587
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
588 588
 			if ($line['properties']['vesselType'] != 'Navigation Aid') $MI->add($data);
589 589
 			unset($data);
590
-		    }
590
+			}
591 591
 		}
592 592
 		
593
-	    }
594
-    	    $last_exec[$id]['last'] = time();
593
+		}
594
+			$last_exec[$id]['last'] = time();
595 595
 	} elseif ($value['format'] == 'shipplotter' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
596
-	    echo 'download...';
597
-	    $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
598
-	    echo 'done !'."\n";
599
-	    if ($buffer != '') $reset = 0;
600
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
601
-	    $buffer = explode('\n',$buffer);
602
-	    foreach ($buffer as $line) {
596
+		echo 'download...';
597
+		$buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
598
+		echo 'done !'."\n";
599
+		if ($buffer != '') $reset = 0;
600
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
601
+		$buffer = explode('\n',$buffer);
602
+		foreach ($buffer as $line) {
603 603
 		if ($line != '') {
604
-		    $data = array();
605
-		    $data['mmsi'] = (int)substr($line,0,9);
606
-		    $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
607
-		    //$data['status'] = substr($line,21,2);
608
-		    //$data['type'] = substr($line,24,3);
609
-		    $data['latitude'] = substr($line,29,9);
610
-		    $data['longitude'] = substr($line,41,9);
611
-		    $data['speed'] = round(substr($line,51,5));
612
-		    //$data['course'] = substr($line,57,5);
613
-		    $data['heading'] = round(substr($line,63,3));
614
-		    //$data['draft'] = substr($line,67,4);
615
-		    //$data['length'] = substr($line,72,3);
616
-		    //$data['beam'] = substr($line,76,2);
617
-		    $data['ident'] = trim(utf8_encode(substr($line,79,20)));
618
-		    //$data['callsign'] = trim(substr($line,100,7);
619
-		    //$data['dest'] = substr($line,108,20);
620
-		    //$data['etaDate'] = substr($line,129,5);
621
-		    //$data['etaTime'] = substr($line,135,5);
622
-		    $data['format_source'] = 'shipplotter';
623
-    		    $data['id_source'] = $id_source;
624
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
625
-		    //print_r($data);
626
-		    echo 'Add...'."\n";
627
-		    $MI->add($data);
628
-		    unset($data);
604
+			$data = array();
605
+			$data['mmsi'] = (int)substr($line,0,9);
606
+			$data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
607
+			//$data['status'] = substr($line,21,2);
608
+			//$data['type'] = substr($line,24,3);
609
+			$data['latitude'] = substr($line,29,9);
610
+			$data['longitude'] = substr($line,41,9);
611
+			$data['speed'] = round(substr($line,51,5));
612
+			//$data['course'] = substr($line,57,5);
613
+			$data['heading'] = round(substr($line,63,3));
614
+			//$data['draft'] = substr($line,67,4);
615
+			//$data['length'] = substr($line,72,3);
616
+			//$data['beam'] = substr($line,76,2);
617
+			$data['ident'] = trim(utf8_encode(substr($line,79,20)));
618
+			//$data['callsign'] = trim(substr($line,100,7);
619
+			//$data['dest'] = substr($line,108,20);
620
+			//$data['etaDate'] = substr($line,129,5);
621
+			//$data['etaTime'] = substr($line,135,5);
622
+			$data['format_source'] = 'shipplotter';
623
+				$data['id_source'] = $id_source;
624
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
625
+			//print_r($data);
626
+			echo 'Add...'."\n";
627
+			$MI->add($data);
628
+			unset($data);
629 629
 		}
630
-    	    }
631
-    	    $last_exec[$id]['last'] = time();
630
+			}
631
+			$last_exec[$id]['last'] = time();
632 632
 	//} elseif (($value == 'whazzup' && (time() - $last_exec['whazzup'] > $globalMinFetch)) || ($value == 'vatsimtxt' && (time() - $last_exec['vatsimtxt'] > $globalMinFetch))) {
633 633
 	} elseif (($value['format'] == 'whazzup' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) || ($value['format'] == 'vatsimtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch))) {
634
-	    //$buffer = $Common->getData($hosts[$id]);
635
-	    $buffer = $Common->getData($value['host']);
636
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
637
-	    $buffer = explode('\n',$buffer);
638
-	    $reset = 0;
639
-	    foreach ($buffer as $line) {
640
-    		if ($line != '') {
641
-    		    $line = explode(':', $line);
642
-    		    if (count($line) > 30 && $line[0] != 'callsign') {
634
+		//$buffer = $Common->getData($hosts[$id]);
635
+		$buffer = $Common->getData($value['host']);
636
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
637
+		$buffer = explode('\n',$buffer);
638
+		$reset = 0;
639
+		foreach ($buffer as $line) {
640
+			if ($line != '') {
641
+				$line = explode(':', $line);
642
+				if (count($line) > 30 && $line[0] != 'callsign') {
643 643
 			$data = array();
644 644
 			if (isset($line[37]) && $line[37] != '') $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37];
645 645
 			else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
@@ -652,37 +652,37 @@  discard block
 block discarded – undo
652 652
 			if (isset($line[45])) $data['heading'] = $line[45]; // heading
653 653
 			elseif (isset($line[38])) $data['heading'] = $line[38]; // heading
654 654
 			$data['latitude'] = $line[5]; // lat
655
-	        	$data['longitude'] = $line[6]; // long
656
-	        	$data['verticalrate'] = ''; // vertical rate
657
-	        	$data['squawk'] = ''; // squawk
658
-	        	$data['emergency'] = ''; // emergency
659
-	        	$data['waypoints'] = $line[30];
655
+				$data['longitude'] = $line[6]; // long
656
+				$data['verticalrate'] = ''; // vertical rate
657
+				$data['squawk'] = ''; // squawk
658
+				$data['emergency'] = ''; // emergency
659
+				$data['waypoints'] = $line[30];
660 660
 			$data['datetime'] = date('Y-m-d H:i:s');
661 661
 			//$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37]));
662 662
 			//if (isset($line[37])) $data['last_update'] = $line[37];
663
-		        $data['departure_airport_icao'] = $line[11];
664
-		        $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
665
-		        $data['arrival_airport_icao'] = $line[13];
663
+				$data['departure_airport_icao'] = $line[11];
664
+				$data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
665
+				$data['arrival_airport_icao'] = $line[13];
666 666
 			$data['frequency'] = $line[4];
667 667
 			$data['type'] = $line[18];
668 668
 			$data['range'] = $line[19];
669 669
 			if (isset($line[35])) $data['info'] = $line[35];
670
-    			$data['id_source'] = $id_source;
671
-	    		//$data['arrival_airport_time'] = ;
672
-	    		if ($line[9] != '') {
673
-	    		    $aircraft_data = explode('/',$line[9]);
674
-	    		    if (isset($aircraft_data[1])) {
675
-	    			$data['aircraft_icao'] = $aircraft_data[1];
676
-	    		    }
677
-        		}
678
-	    		/*
670
+				$data['id_source'] = $id_source;
671
+				//$data['arrival_airport_time'] = ;
672
+				if ($line[9] != '') {
673
+					$aircraft_data = explode('/',$line[9]);
674
+					if (isset($aircraft_data[1])) {
675
+					$data['aircraft_icao'] = $aircraft_data[1];
676
+					}
677
+				}
678
+				/*
679 679
 	    		if ($value == 'whazzup') $data['format_source'] = 'whazzup';
680 680
 	    		elseif ($value == 'vatsimtxt') $data['format_source'] = 'vatsimtxt';
681 681
 	    		*/
682
-	    		$data['format_source'] = $value['format'];
682
+				$data['format_source'] = $value['format'];
683 683
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
684 684
 			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
685
-    			if ($line[3] == 'PILOT') $SI->add($data);
685
+				if ($line[3] == 'PILOT') $SI->add($data);
686 686
 			elseif ($line[3] == 'ATC') {
687 687
 				//print_r($data);
688 688
 				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
@@ -703,16 +703,16 @@  discard block
 block discarded – undo
703 703
 					else echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
704 704
 				}
705 705
 			}
706
-    			unset($data);
707
-    		    }
708
-    		}
709
-    	    }
710
-    	    //if ($value == 'whazzup') $last_exec['whazzup'] = time();
711
-    	    //elseif ($value == 'vatsimtxt') $last_exec['vatsimtxt'] = time();
712
-    	    $last_exec[$id]['last'] = time();
713
-    	} elseif ($value['format'] == 'airwhere' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
714
-	    $buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php','get','','','','','20');
715
-	    if ($buffer != '') {
706
+				unset($data);
707
+				}
708
+			}
709
+			}
710
+			//if ($value == 'whazzup') $last_exec['whazzup'] = time();
711
+			//elseif ($value == 'vatsimtxt') $last_exec['vatsimtxt'] = time();
712
+			$last_exec[$id]['last'] = time();
713
+		} elseif ($value['format'] == 'airwhere' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
714
+		$buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php','get','','','','','20');
715
+		if ($buffer != '') {
716 716
 		$all_data = simplexml_load_string($buffer);
717 717
 		foreach($all_data->children() as $childdata) {
718 718
 			$data = array();
@@ -734,10 +734,10 @@  discard block
 block discarded – undo
734 734
 			$SI->add($data);
735 735
 			unset($data);
736 736
 		}
737
-	    }
738
-	    $Source->deleteOldLocationByType('gs');
739
-	    $buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php','get','','','','','20');
740
-	    if ($buffer != '') {
737
+		}
738
+		$Source->deleteOldLocationByType('gs');
739
+		$buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php','get','','','','','20');
740
+		if ($buffer != '') {
741 741
 		$all_data = simplexml_load_string($buffer);
742 742
 		foreach($all_data->children() as $childdata) {
743 743
 			$data = array();
@@ -755,249 +755,249 @@  discard block
 block discarded – undo
755 755
 			}
756 756
 			unset($data);
757 757
 		}
758
-	    }
759
-	    $last_exec[$id]['last'] = time();
758
+		}
759
+		$last_exec[$id]['last'] = time();
760 760
 	} elseif ($value['format'] == 'aircraftlistjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
761
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
762
-	    if ($buffer != '') {
763
-	    $all_data = json_decode($buffer,true);
764
-	    if (isset($all_data['acList'])) {
761
+		$buffer = $Common->getData($value['host'],'get','','','','','20');
762
+		if ($buffer != '') {
763
+		$all_data = json_decode($buffer,true);
764
+		if (isset($all_data['acList'])) {
765 765
 		$reset = 0;
766 766
 		foreach ($all_data['acList'] as $line) {
767
-		    $data = array();
768
-		    $data['hex'] = $line['Icao']; // hex
769
-		    if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
770
-		    if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
771
-		    if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
772
-		    if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
773
-		    if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
774
-		    if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
775
-		    //$data['verticalrate'] = $line['']; // verticale rate
776
-		    if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
777
-		    $data['emergency'] = ''; // emergency
778
-		    if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
767
+			$data = array();
768
+			$data['hex'] = $line['Icao']; // hex
769
+			if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
770
+			if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
771
+			if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
772
+			if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
773
+			if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
774
+			if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
775
+			//$data['verticalrate'] = $line['']; // verticale rate
776
+			if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
777
+			$data['emergency'] = ''; // emergency
778
+			if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
779 779
 		    
780
-		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
781
-		    else $data['datetime'] = date('Y-m-d H:i:s');
780
+			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
781
+			else $data['datetime'] = date('Y-m-d H:i:s');
782 782
 		    
783
-		    //$data['datetime'] = date('Y-m-d H:i:s');
784
-		    if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
785
-	    	    $data['format_source'] = 'aircraftlistjson';
786
-		    $data['id_source'] = $id_source;
787
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
788
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
789
-		    if (isset($data['latitude'])) $SI->add($data);
790
-		    unset($data);
783
+			//$data['datetime'] = date('Y-m-d H:i:s');
784
+			if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
785
+				$data['format_source'] = 'aircraftlistjson';
786
+			$data['id_source'] = $id_source;
787
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
788
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
789
+			if (isset($data['latitude'])) $SI->add($data);
790
+			unset($data);
791 791
 		}
792
-	    } elseif (is_array($all_data)) {
792
+		} elseif (is_array($all_data)) {
793 793
 		$reset = 0;
794 794
 		foreach ($all_data as $line) {
795
-		    $data = array();
796
-		    $data['hex'] = $line['hex']; // hex
797
-		    $data['ident'] = $line['flight']; // ident
798
-		    $data['altitude'] = $line['altitude']; // altitude
799
-		    $data['speed'] = $line['speed']; // speed
800
-		    $data['heading'] = $line['track']; // heading
801
-		    $data['latitude'] = $line['lat']; // lat
802
-		    $data['longitude'] = $line['lon']; // long
803
-		    $data['verticalrate'] = $line['vrt']; // verticale rate
804
-		    $data['squawk'] = $line['squawk']; // squawk
805
-		    $data['emergency'] = ''; // emergency
806
-		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
807
-		    else $data['datetime'] = date('Y-m-d H:i:s');
808
-	    	    $data['format_source'] = 'aircraftlistjson';
809
-    		    $data['id_source'] = $id_source;
810
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
811
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
812
-		    $SI->add($data);
813
-		    unset($data);
795
+			$data = array();
796
+			$data['hex'] = $line['hex']; // hex
797
+			$data['ident'] = $line['flight']; // ident
798
+			$data['altitude'] = $line['altitude']; // altitude
799
+			$data['speed'] = $line['speed']; // speed
800
+			$data['heading'] = $line['track']; // heading
801
+			$data['latitude'] = $line['lat']; // lat
802
+			$data['longitude'] = $line['lon']; // long
803
+			$data['verticalrate'] = $line['vrt']; // verticale rate
804
+			$data['squawk'] = $line['squawk']; // squawk
805
+			$data['emergency'] = ''; // emergency
806
+			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
807
+			else $data['datetime'] = date('Y-m-d H:i:s');
808
+				$data['format_source'] = 'aircraftlistjson';
809
+				$data['id_source'] = $id_source;
810
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
811
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
812
+			$SI->add($data);
813
+			unset($data);
814
+		}
814 815
 		}
815
-	    }
816
-	    }
817
-    	    //$last_exec['aircraftlistjson'] = time();
818
-    	    $last_exec[$id]['last'] = time();
819
-    	//} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
820
-    	} elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
821
-	    $buffer = $Common->getData($value['host']);
822
-	    $all_data = json_decode($buffer,true);
823
-	    if (isset($all_data['planes'])) {
816
+		}
817
+			//$last_exec['aircraftlistjson'] = time();
818
+			$last_exec[$id]['last'] = time();
819
+		//} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
820
+		} elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
821
+		$buffer = $Common->getData($value['host']);
822
+		$all_data = json_decode($buffer,true);
823
+		if (isset($all_data['planes'])) {
824 824
 		$reset = 0;
825 825
 		foreach ($all_data['planes'] as $key => $line) {
826
-		    $data = array();
827
-		    $data['hex'] = $key; // hex
828
-		    $data['ident'] = $line[3]; // ident
829
-		    $data['altitude'] = $line[6]; // altitude
830
-		    $data['speed'] = $line[8]; // speed
831
-		    $data['heading'] = $line[7]; // heading
832
-		    $data['latitude'] = $line[4]; // lat
833
-		    $data['longitude'] = $line[5]; // long
834
-		    //$data['verticalrate'] = $line[]; // verticale rate
835
-		    $data['squawk'] = $line[10]; // squawk
836
-		    $data['emergency'] = ''; // emergency
837
-		    $data['registration'] = $line[2];
838
-		    $data['aircraft_icao'] = $line[0];
839
-		    $deparr = explode('-',$line[1]);
840
-		    if (count($deparr) == 2) {
826
+			$data = array();
827
+			$data['hex'] = $key; // hex
828
+			$data['ident'] = $line[3]; // ident
829
+			$data['altitude'] = $line[6]; // altitude
830
+			$data['speed'] = $line[8]; // speed
831
+			$data['heading'] = $line[7]; // heading
832
+			$data['latitude'] = $line[4]; // lat
833
+			$data['longitude'] = $line[5]; // long
834
+			//$data['verticalrate'] = $line[]; // verticale rate
835
+			$data['squawk'] = $line[10]; // squawk
836
+			$data['emergency'] = ''; // emergency
837
+			$data['registration'] = $line[2];
838
+			$data['aircraft_icao'] = $line[0];
839
+			$deparr = explode('-',$line[1]);
840
+			if (count($deparr) == 2) {
841 841
 			$data['departure_airport_icao'] = $deparr[0];
842 842
 			$data['arrival_airport_icao'] = $deparr[1];
843
-		    }
844
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]);
845
-	    	    $data['format_source'] = 'planeupdatefaa';
846
-    		    $data['id_source'] = $id_source;
847
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
848
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
849
-		    $SI->add($data);
850
-		    unset($data);
843
+			}
844
+			$data['datetime'] = date('Y-m-d H:i:s',$line[9]);
845
+				$data['format_source'] = 'planeupdatefaa';
846
+				$data['id_source'] = $id_source;
847
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
848
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
849
+			$SI->add($data);
850
+			unset($data);
851 851
 		}
852
-	    }
853
-    	    //$last_exec['planeupdatefaa'] = time();
854
-    	    $last_exec[$id]['last'] = time();
855
-    	} elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
856
-	    $buffer = $Common->getData($value['host']);
857
-	    $all_data = json_decode($buffer,true);
858
-	    if (isset($all_data['states'])) {
852
+		}
853
+			//$last_exec['planeupdatefaa'] = time();
854
+			$last_exec[$id]['last'] = time();
855
+		} elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
856
+		$buffer = $Common->getData($value['host']);
857
+		$all_data = json_decode($buffer,true);
858
+		if (isset($all_data['states'])) {
859 859
 		$reset = 0;
860 860
 		foreach ($all_data['states'] as $key => $line) {
861
-		    $data = array();
862
-		    $data['hex'] = $line[0]; // hex
863
-		    $data['ident'] = trim($line[1]); // ident
864
-		    $data['altitude'] = round($line[7]*3.28084); // altitude
865
-		    $data['speed'] = round($line[9]*1.94384); // speed
866
-		    $data['heading'] = round($line[10]); // heading
867
-		    $data['latitude'] = $line[6]; // lat
868
-		    $data['longitude'] = $line[5]; // long
869
-		    $data['verticalrate'] = $line[11]; // verticale rate
870
-		    //$data['squawk'] = $line[10]; // squawk
871
-		    //$data['emergency'] = ''; // emergency
872
-		    //$data['registration'] = $line[2];
873
-		    //$data['aircraft_icao'] = $line[0];
874
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]);
875
-	    	    $data['format_source'] = 'opensky';
876
-    		    $data['id_source'] = $id_source;
877
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
878
-		    $SI->add($data);
879
-		    unset($data);
861
+			$data = array();
862
+			$data['hex'] = $line[0]; // hex
863
+			$data['ident'] = trim($line[1]); // ident
864
+			$data['altitude'] = round($line[7]*3.28084); // altitude
865
+			$data['speed'] = round($line[9]*1.94384); // speed
866
+			$data['heading'] = round($line[10]); // heading
867
+			$data['latitude'] = $line[6]; // lat
868
+			$data['longitude'] = $line[5]; // long
869
+			$data['verticalrate'] = $line[11]; // verticale rate
870
+			//$data['squawk'] = $line[10]; // squawk
871
+			//$data['emergency'] = ''; // emergency
872
+			//$data['registration'] = $line[2];
873
+			//$data['aircraft_icao'] = $line[0];
874
+			$data['datetime'] = date('Y-m-d H:i:s',$line[3]);
875
+				$data['format_source'] = 'opensky';
876
+				$data['id_source'] = $id_source;
877
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
878
+			$SI->add($data);
879
+			unset($data);
880
+		}
880 881
 		}
881
-	    }
882
-    	    //$last_exec['planeupdatefaa'] = time();
883
-    	    $last_exec[$id]['last'] = time();
884
-    	//} elseif ($value == 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) {
885
-    	} elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
886
-	    //$buffer = $Common->getData($hosts[$id]);
887
-	    $buffer = $Common->getData($value['host']);
888
-	    $all_data = json_decode($buffer,true);
889
-	    if (!empty($all_data)) $reset = 0;
890
-	    foreach ($all_data as $key => $line) {
882
+			//$last_exec['planeupdatefaa'] = time();
883
+			$last_exec[$id]['last'] = time();
884
+		//} elseif ($value == 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) {
885
+		} elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
886
+		//$buffer = $Common->getData($hosts[$id]);
887
+		$buffer = $Common->getData($value['host']);
888
+		$all_data = json_decode($buffer,true);
889
+		if (!empty($all_data)) $reset = 0;
890
+		foreach ($all_data as $key => $line) {
891 891
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
892
-		    $data = array();
893
-		    $data['hex'] = $line[0];
894
-		    $data['ident'] = $line[16]; //$line[13]
895
-	    	    $data['altitude'] = $line[4]; // altitude
896
-	    	    $data['speed'] = $line[5]; // speed
897
-	    	    $data['heading'] = $line[3]; // heading
898
-	    	    $data['latitude'] = $line[1]; // lat
899
-	    	    $data['longitude'] = $line[2]; // long
900
-	    	    $data['verticalrate'] = $line[15]; // verticale rate
901
-	    	    $data['squawk'] = $line[6]; // squawk
902
-	    	    $data['aircraft_icao'] = $line[8];
903
-	    	    $data['registration'] = $line[9];
904
-		    $data['departure_airport_iata'] = $line[11];
905
-		    $data['arrival_airport_iata'] = $line[12];
906
-	    	    $data['emergency'] = ''; // emergency
907
-		    $data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
908
-	    	    $data['format_source'] = 'fr24json';
909
-    		    $data['id_source'] = $id_source;
910
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
911
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
912
-		    $SI->add($data);
913
-		    unset($data);
892
+			$data = array();
893
+			$data['hex'] = $line[0];
894
+			$data['ident'] = $line[16]; //$line[13]
895
+				$data['altitude'] = $line[4]; // altitude
896
+				$data['speed'] = $line[5]; // speed
897
+				$data['heading'] = $line[3]; // heading
898
+				$data['latitude'] = $line[1]; // lat
899
+				$data['longitude'] = $line[2]; // long
900
+				$data['verticalrate'] = $line[15]; // verticale rate
901
+				$data['squawk'] = $line[6]; // squawk
902
+				$data['aircraft_icao'] = $line[8];
903
+				$data['registration'] = $line[9];
904
+			$data['departure_airport_iata'] = $line[11];
905
+			$data['arrival_airport_iata'] = $line[12];
906
+				$data['emergency'] = ''; // emergency
907
+			$data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
908
+				$data['format_source'] = 'fr24json';
909
+				$data['id_source'] = $id_source;
910
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
911
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
912
+			$SI->add($data);
913
+			unset($data);
914 914
 		}
915
-	    }
916
-    	    //$last_exec['fr24json'] = time();
917
-    	    $last_exec[$id]['last'] = time();
918
-    	//} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) {
919
-    	} elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
920
-	    //$buffer = $Common->getData($hosts[$id],'get','','','','','150');
921
-	    $buffer = $Common->getData($value['host'],'get','','','','','150');
922
-	    //echo $buffer;
923
-	    $buffer = str_replace(array("\n","\r"),"",$buffer);
924
-	    $buffer = preg_replace('/,"num":(.+)/','}',$buffer);
925
-	    $all_data = json_decode($buffer,true);
926
-	    if (json_last_error() != JSON_ERROR_NONE) {
915
+		}
916
+			//$last_exec['fr24json'] = time();
917
+			$last_exec[$id]['last'] = time();
918
+		//} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) {
919
+		} elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
920
+		//$buffer = $Common->getData($hosts[$id],'get','','','','','150');
921
+		$buffer = $Common->getData($value['host'],'get','','','','','150');
922
+		//echo $buffer;
923
+		$buffer = str_replace(array("\n","\r"),"",$buffer);
924
+		$buffer = preg_replace('/,"num":(.+)/','}',$buffer);
925
+		$all_data = json_decode($buffer,true);
926
+		if (json_last_error() != JSON_ERROR_NONE) {
927 927
 		die(json_last_error_msg());
928
-	    }
929
-	    if (isset($all_data['mrkrs'])) {
928
+		}
929
+		if (isset($all_data['mrkrs'])) {
930 930
 		$reset = 0;
931 931
 		foreach ($all_data['mrkrs'] as $key => $line) {
932
-		    if (isset($line['inf'])) {
932
+			if (isset($line['inf'])) {
933 933
 			$data = array();
934 934
 			$data['hex'] = $line['inf']['ia'];
935 935
 			if (isset($line['inf']['cs'])) $data['ident'] = $line['inf']['cs']; //$line[13]
936
-	    		$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
937
-	    		if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
938
-	    		if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
939
-	    		$data['latitude'] = $line['pt'][0]; // lat
940
-	    		$data['longitude'] = $line['pt'][1]; // long
941
-	    		//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
942
-	    		if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
943
-	    		//$data['aircraft_icao'] = $line[8];
944
-	    		if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
936
+				$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
937
+				if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
938
+				if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
939
+				$data['latitude'] = $line['pt'][0]; // lat
940
+				$data['longitude'] = $line['pt'][1]; // long
941
+				//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
942
+				if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
943
+				//$data['aircraft_icao'] = $line[8];
944
+				if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
945 945
 			//$data['departure_airport_iata'] = $line[11];
946 946
 			//$data['arrival_airport_iata'] = $line[12];
947
-	    		//$data['emergency'] = ''; // emergency
947
+				//$data['emergency'] = ''; // emergency
948 948
 			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10]
949
-	    		$data['format_source'] = 'radarvirtueljson';
950
-    			$data['id_source'] = $id_source;
949
+				$data['format_source'] = 'radarvirtueljson';
950
+				$data['id_source'] = $id_source;
951 951
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
952 952
 			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
953 953
 			$SI->add($data);
954 954
 			unset($data);
955
-		    }
955
+			}
956
+		}
956 957
 		}
957
-	    }
958
-    	    //$last_exec['radarvirtueljson'] = time();
959
-    	    $last_exec[$id]['last'] = time();
960
-    	//} elseif ($value == 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) {
961
-    	} elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
962
-	    //$buffer = $Common->getData($hosts[$id]);
963
-	    $buffer = $Common->getData($value['host'].'?'.time());
964
-	    $all_data = json_decode(utf8_encode($buffer),true);
958
+			//$last_exec['radarvirtueljson'] = time();
959
+			$last_exec[$id]['last'] = time();
960
+		//} elseif ($value == 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) {
961
+		} elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
962
+		//$buffer = $Common->getData($hosts[$id]);
963
+		$buffer = $Common->getData($value['host'].'?'.time());
964
+		$all_data = json_decode(utf8_encode($buffer),true);
965 965
 	    
966
-	    if (isset($all_data['pireps'])) {
966
+		if (isset($all_data['pireps'])) {
967 967
 		$reset = 0;
968
-	        foreach ($all_data['pireps'] as $line) {
969
-		    $data = array();
970
-		    $data['id'] = $line['id'];
971
-		    $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
972
-		    $data['ident'] = $line['callsign']; // ident
973
-		    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
974
-		    if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
975
-		    if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
976
-		    if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
977
-		    if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
978
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
979
-		    $data['latitude'] = $line['lat']; // lat
980
-		    $data['longitude'] = $line['lon']; // long
981
-		    //$data['verticalrate'] = $line['vrt']; // verticale rate
982
-		    //$data['squawk'] = $line['squawk']; // squawk
983
-		    //$data['emergency'] = ''; // emergency
984
-		    if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
985
-		    if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
986
-		    if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
987
-		    //$data['arrival_airport_time'] = $line['arrtime'];
988
-		    if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
989
-		    if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
990
-		    if (isset($line['atis'])) $data['info'] = $line['atis'];
991
-		    else $data['info'] = '';
992
-		    $data['format_source'] = 'pireps';
993
-    		    $data['id_source'] = $id_source;
994
-		    $data['datetime'] = date('Y-m-d H:i:s');
995
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
996
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
997
-		    if ($line['icon'] == 'plane') {
968
+			foreach ($all_data['pireps'] as $line) {
969
+			$data = array();
970
+			$data['id'] = $line['id'];
971
+			$data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
972
+			$data['ident'] = $line['callsign']; // ident
973
+			if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
974
+			if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
975
+			if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
976
+			if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
977
+			if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
978
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
979
+			$data['latitude'] = $line['lat']; // lat
980
+			$data['longitude'] = $line['lon']; // long
981
+			//$data['verticalrate'] = $line['vrt']; // verticale rate
982
+			//$data['squawk'] = $line['squawk']; // squawk
983
+			//$data['emergency'] = ''; // emergency
984
+			if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
985
+			if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
986
+			if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
987
+			//$data['arrival_airport_time'] = $line['arrtime'];
988
+			if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
989
+			if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
990
+			if (isset($line['atis'])) $data['info'] = $line['atis'];
991
+			else $data['info'] = '';
992
+			$data['format_source'] = 'pireps';
993
+				$data['id_source'] = $id_source;
994
+			$data['datetime'] = date('Y-m-d H:i:s');
995
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
996
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
997
+			if ($line['icon'] == 'plane') {
998 998
 			$SI->add($data);
999
-		    //    print_r($data);
1000
-    		    } elseif ($line['icon'] == 'ct') {
999
+			//    print_r($data);
1000
+				} elseif ($line['icon'] == 'ct') {
1001 1001
 			$data['info'] = str_replace('^&sect;','<br />',$data['info']);
1002 1002
 			$data['info'] = str_replace('&amp;sect;','',$data['info']);
1003 1003
 			$typec = substr($data['ident'],-3);
@@ -1012,203 +1012,203 @@  discard block
 block discarded – undo
1012 1012
 			elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
1013 1013
 			else $data['type'] = 'Observer';
1014 1014
 			if (isset($ATC)) echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']);
1015
-		    }
1016
-		    unset($data);
1015
+			}
1016
+			unset($data);
1017
+		}
1017 1018
 		}
1018
-	    }
1019
-    	    //$last_exec['pirepsjson'] = time();
1020
-    	    $last_exec[$id]['last'] = time();
1021
-    	//} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) {
1022
-    	} elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
1023
-	    //$buffer = $Common->getData($hosts[$id]);
1024
-	    if ($globalDebug) echo 'Get Data...'."\n";
1025
-	    $buffer = $Common->getData($value['host']);
1026
-	    $all_data = json_decode($buffer,true);
1027
-	    if ($buffer != '' && is_array($all_data)) {
1019
+			//$last_exec['pirepsjson'] = time();
1020
+			$last_exec[$id]['last'] = time();
1021
+		//} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) {
1022
+		} elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
1023
+		//$buffer = $Common->getData($hosts[$id]);
1024
+		if ($globalDebug) echo 'Get Data...'."\n";
1025
+		$buffer = $Common->getData($value['host']);
1026
+		$all_data = json_decode($buffer,true);
1027
+		if ($buffer != '' && is_array($all_data)) {
1028 1028
 		$reset = 0;
1029 1029
 		foreach ($all_data as $line) {
1030
-	    	    $data = array();
1031
-	    	    //$data['id'] = $line['id']; // id not usable
1032
-	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
1033
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
1034
-	    	    if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
1035
-	    	    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
1036
-	    	    $data['ident'] = $line['flightnum']; // ident
1037
-	    	    $data['altitude'] = $line['alt']; // altitude
1038
-	    	    $data['speed'] = $line['gs']; // speed
1039
-	    	    $data['heading'] = $line['heading']; // heading
1040
-	    	    $data['latitude'] = $line['lat']; // lat
1041
-	    	    $data['longitude'] = $line['lng']; // long
1042
-	    	    $data['verticalrate'] = ''; // verticale rate
1043
-	    	    $data['squawk'] = ''; // squawk
1044
-	    	    $data['emergency'] = ''; // emergency
1045
-	    	    //$data['datetime'] = $line['lastupdate'];
1046
-	    	    //$data['last_update'] = $line['lastupdate'];
1047
-	    	    if (isset($value['timezone'])) {
1048
-	    		$datetime = new DateTime($line['lastupdate'],new DateTimeZone($value['timezone']));
1049
-	    		$datetime->setTimeZone(new DateTimeZone('UTC'));
1050
-	    		$data['datetime'] = $datetime->format('Y-m-d H:i:s');
1051
-	    	    } else $data['datetime'] = date('Y-m-d H:i:s');
1052
-	    	    $data['departure_airport_icao'] = $line['depicao'];
1053
-	    	    $data['departure_airport_time'] = $line['deptime'];
1054
-	    	    $data['arrival_airport_icao'] = $line['arricao'];
1055
-    		    $data['arrival_airport_time'] = $line['arrtime'];
1056
-    		    $data['registration'] = $line['aircraft'];
1057
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1058
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1059
-		    if (isset($line['aircraftname'])) {
1030
+				$data = array();
1031
+				//$data['id'] = $line['id']; // id not usable
1032
+				if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
1033
+				$data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
1034
+				if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
1035
+				if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
1036
+				$data['ident'] = $line['flightnum']; // ident
1037
+				$data['altitude'] = $line['alt']; // altitude
1038
+				$data['speed'] = $line['gs']; // speed
1039
+				$data['heading'] = $line['heading']; // heading
1040
+				$data['latitude'] = $line['lat']; // lat
1041
+				$data['longitude'] = $line['lng']; // long
1042
+				$data['verticalrate'] = ''; // verticale rate
1043
+				$data['squawk'] = ''; // squawk
1044
+				$data['emergency'] = ''; // emergency
1045
+				//$data['datetime'] = $line['lastupdate'];
1046
+				//$data['last_update'] = $line['lastupdate'];
1047
+				if (isset($value['timezone'])) {
1048
+				$datetime = new DateTime($line['lastupdate'],new DateTimeZone($value['timezone']));
1049
+				$datetime->setTimeZone(new DateTimeZone('UTC'));
1050
+				$data['datetime'] = $datetime->format('Y-m-d H:i:s');
1051
+				} else $data['datetime'] = date('Y-m-d H:i:s');
1052
+				$data['departure_airport_icao'] = $line['depicao'];
1053
+				$data['departure_airport_time'] = $line['deptime'];
1054
+				$data['arrival_airport_icao'] = $line['arricao'];
1055
+				$data['arrival_airport_time'] = $line['arrtime'];
1056
+				$data['registration'] = $line['aircraft'];
1057
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1058
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1059
+			if (isset($line['aircraftname'])) {
1060 1060
 			$line['aircraftname'] = strtoupper($line['aircraftname']);
1061 1061
 			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']);
1062
-	    		$aircraft_data = explode('-',$line['aircraftname']);
1063
-	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
1064
-	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
1065
-	    		else {
1066
-	    		    $aircraft_data = explode(' ',$line['aircraftname']);
1067
-	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
1068
-	    		    else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
1069
-	    		}
1070
-	    	    }
1071
-    		    if (isset($line['route'])) $data['waypoints'] = $line['route'];
1072
-    		    $data['id_source'] = $id_source;
1073
-	    	    $data['format_source'] = 'phpvmacars';
1074
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1075
-		    $SI->add($data);
1076
-		    unset($data);
1062
+				$aircraft_data = explode('-',$line['aircraftname']);
1063
+				if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
1064
+				elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
1065
+				else {
1066
+					$aircraft_data = explode(' ',$line['aircraftname']);
1067
+					if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
1068
+					else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
1069
+				}
1070
+				}
1071
+				if (isset($line['route'])) $data['waypoints'] = $line['route'];
1072
+				$data['id_source'] = $id_source;
1073
+				$data['format_source'] = 'phpvmacars';
1074
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1075
+			$SI->add($data);
1076
+			unset($data);
1077 1077
 		}
1078 1078
 		if ($globalDebug) echo 'No more data...'."\n";
1079 1079
 		unset($buffer);
1080 1080
 		unset($all_data);
1081
-	    }
1082
-    	    //$last_exec['phpvmacars'] = time();
1083
-    	    $last_exec[$id]['last'] = time();
1084
-    	} elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
1085
-	    //$buffer = $Common->getData($hosts[$id]);
1086
-	    if ($globalDebug) echo 'Get Data...'."\n";
1087
-	    $buffer = $Common->getData($value['host']);
1088
-	    $all_data = json_decode($buffer,true);
1089
-	    if ($buffer != '' && is_array($all_data)) {
1081
+		}
1082
+			//$last_exec['phpvmacars'] = time();
1083
+			$last_exec[$id]['last'] = time();
1084
+		} elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
1085
+		//$buffer = $Common->getData($hosts[$id]);
1086
+		if ($globalDebug) echo 'Get Data...'."\n";
1087
+		$buffer = $Common->getData($value['host']);
1088
+		$all_data = json_decode($buffer,true);
1089
+		if ($buffer != '' && is_array($all_data)) {
1090 1090
 		$reset = 0;
1091 1091
 		foreach ($all_data as $line) {
1092
-	    	    $data = array();
1093
-	    	    //$data['id'] = $line['id']; // id not usable
1094
-	    	    $data['id'] = trim($line['flight_id']);
1095
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
1096
-	    	    $data['pilot_name'] = $line['pilot_name'];
1097
-	    	    $data['pilot_id'] = $line['pilot_id'];
1098
-	    	    $data['ident'] = trim($line['callsign']); // ident
1099
-	    	    $data['altitude'] = $line['altitude']; // altitude
1100
-	    	    $data['speed'] = $line['gs']; // speed
1101
-	    	    $data['heading'] = $line['heading']; // heading
1102
-	    	    $data['latitude'] = $line['latitude']; // lat
1103
-	    	    $data['longitude'] = $line['longitude']; // long
1104
-	    	    $data['verticalrate'] = ''; // verticale rate
1105
-	    	    $data['squawk'] = ''; // squawk
1106
-	    	    $data['emergency'] = ''; // emergency
1107
-	    	    //$data['datetime'] = $line['lastupdate'];
1108
-	    	    $data['last_update'] = $line['last_update'];
1109
-		    $data['datetime'] = date('Y-m-d H:i:s');
1110
-	    	    $data['departure_airport_icao'] = $line['departure'];
1111
-	    	    //$data['departure_airport_time'] = $line['departure_time'];
1112
-	    	    $data['arrival_airport_icao'] = $line['arrival'];
1113
-    		    //$data['arrival_airport_time'] = $line['arrival_time'];
1114
-    		    //$data['registration'] = $line['aircraft'];
1115
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1116
-	    	    $data['aircraft_icao'] = $line['plane_type'];
1117
-    		    $data['id_source'] = $id_source;
1118
-	    	    $data['format_source'] = 'vam';
1119
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1120
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1121
-		    $SI->add($data);
1122
-		    unset($data);
1092
+				$data = array();
1093
+				//$data['id'] = $line['id']; // id not usable
1094
+				$data['id'] = trim($line['flight_id']);
1095
+				$data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
1096
+				$data['pilot_name'] = $line['pilot_name'];
1097
+				$data['pilot_id'] = $line['pilot_id'];
1098
+				$data['ident'] = trim($line['callsign']); // ident
1099
+				$data['altitude'] = $line['altitude']; // altitude
1100
+				$data['speed'] = $line['gs']; // speed
1101
+				$data['heading'] = $line['heading']; // heading
1102
+				$data['latitude'] = $line['latitude']; // lat
1103
+				$data['longitude'] = $line['longitude']; // long
1104
+				$data['verticalrate'] = ''; // verticale rate
1105
+				$data['squawk'] = ''; // squawk
1106
+				$data['emergency'] = ''; // emergency
1107
+				//$data['datetime'] = $line['lastupdate'];
1108
+				$data['last_update'] = $line['last_update'];
1109
+			$data['datetime'] = date('Y-m-d H:i:s');
1110
+				$data['departure_airport_icao'] = $line['departure'];
1111
+				//$data['departure_airport_time'] = $line['departure_time'];
1112
+				$data['arrival_airport_icao'] = $line['arrival'];
1113
+				//$data['arrival_airport_time'] = $line['arrival_time'];
1114
+				//$data['registration'] = $line['aircraft'];
1115
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1116
+				$data['aircraft_icao'] = $line['plane_type'];
1117
+				$data['id_source'] = $id_source;
1118
+				$data['format_source'] = 'vam';
1119
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1120
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1121
+			$SI->add($data);
1122
+			unset($data);
1123 1123
 		}
1124 1124
 		if ($globalDebug) echo 'No more data...'."\n";
1125 1125
 		unset($buffer);
1126 1126
 		unset($all_data);
1127
-	    }
1128
-    	    //$last_exec['phpvmacars'] = time();
1129
-    	    $last_exec[$id]['last'] = time();
1127
+		}
1128
+			//$last_exec['phpvmacars'] = time();
1129
+			$last_exec[$id]['last'] = time();
1130 1130
 	//} elseif ($value == 'sbs' || $value == 'tsv' || $value == 'raw' || $value == 'aprs' || $value == 'beast') {
1131 1131
 	} elseif ($value['format'] == 'sbs' || $value['format'] == 'tsv' || $value['format'] == 'raw' || $value['format'] == 'aprs' || $value['format'] == 'famaprs' || $value['format'] == 'beast' || $value['format'] == 'flightgearmp' || $value['format'] == 'flightgearsp' || $value['format'] == 'acars' || $value['format'] == 'acarssbs3' || $value['format'] == 'ais' || $value['format'] == 'vrstcp') {
1132
-	    if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
1133
-    	    //$last_exec[$id]['last'] = time();
1132
+		if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
1133
+			//$last_exec[$id]['last'] = time();
1134 1134
 
1135
-	    //$read = array( $sockets[$id] );
1136
-	    $read = $sockets;
1137
-	    $write = NULL;
1138
-	    $e = NULL;
1139
-	    $n = socket_select($read, $write, $e, $timeout);
1140
-	    if ($e != NULL) var_dump($e);
1141
-	    if ($n > 0) {
1135
+		//$read = array( $sockets[$id] );
1136
+		$read = $sockets;
1137
+		$write = NULL;
1138
+		$e = NULL;
1139
+		$n = socket_select($read, $write, $e, $timeout);
1140
+		if ($e != NULL) var_dump($e);
1141
+		if ($n > 0) {
1142 1142
 		$reset = 0;
1143 1143
 		foreach ($read as $nb => $r) {
1144
-		    //$value = $formats[$nb];
1145
-		    $format = $globalSources[$nb]['format'];
1146
-		    if ($format == 'sbs' || $format == 'aprs' || $format == 'famaprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') {
1144
+			//$value = $formats[$nb];
1145
+			$format = $globalSources[$nb]['format'];
1146
+			if ($format == 'sbs' || $format == 'aprs' || $format == 'famaprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') {
1147 1147
 			$buffer = @socket_read($r, 6000,PHP_NORMAL_READ);
1148
-		    } elseif ($format == 'vrstcp') {
1148
+			} elseif ($format == 'vrstcp') {
1149 1149
 			$buffer = @socket_read($r, 6000);
1150
-		    } else {
1150
+			} else {
1151 1151
 			$az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port);
1152
-		    }
1153
-		    //$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
1154
-		    //echo $buffer."\n";
1155
-		    // lets play nice and handle signals such as ctrl-c/kill properly
1156
-		    //if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
1157
-		    $error = false;
1158
-		    //$SI::del();
1159
-		    if ($format == 'vrstcp') {
1152
+			}
1153
+			//$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
1154
+			//echo $buffer."\n";
1155
+			// lets play nice and handle signals such as ctrl-c/kill properly
1156
+			//if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
1157
+			$error = false;
1158
+			//$SI::del();
1159
+			if ($format == 'vrstcp') {
1160 1160
 			$buffer = explode('},{',$buffer);
1161
-		    } else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
1162
-		    // SBS format is CSV format
1163
-		    if ($buffer !== FALSE && $buffer != '') {
1161
+			} else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
1162
+			// SBS format is CSV format
1163
+			if ($buffer !== FALSE && $buffer != '') {
1164 1164
 			$tt[$format] = 0;
1165 1165
 			if ($format == 'acarssbs3') {
1166
-			    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1167
-			    $ACARS->add(trim($buffer));
1168
-			    $ACARS->deleteLiveAcarsData();
1166
+				if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1167
+				$ACARS->add(trim($buffer));
1168
+				$ACARS->deleteLiveAcarsData();
1169 1169
 			} elseif ($format == 'raw') {
1170
-			    // AVR format
1171
-			    $data = $SBS->parse($buffer);
1172
-			    if (is_array($data)) {
1170
+				// AVR format
1171
+				$data = $SBS->parse($buffer);
1172
+				if (is_array($data)) {
1173 1173
 				$data['datetime'] = date('Y-m-d H:i:s');
1174 1174
 				$data['format_source'] = 'raw';
1175 1175
 				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1176 1176
 				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1177 1177
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1178 1178
 				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1179
-			    }
1179
+				}
1180 1180
 			} elseif ($format == 'ais') {
1181
-			    $ais_data = $AIS->parse_line(trim($buffer));
1182
-			    $data = array();
1183
-			    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
1184
-			    if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
1185
-			    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
1186
-			    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
1187
-			    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
1188
-			    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
1189
-			    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
1190
-			    if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
1191
-			    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
1192
-			    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
1193
-			    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
1194
-			    if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
1195
-			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
1196
-			    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1197
-			    if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1198
-			    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1181
+				$ais_data = $AIS->parse_line(trim($buffer));
1182
+				$data = array();
1183
+				if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
1184
+				if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
1185
+				if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
1186
+				if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
1187
+				if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
1188
+				if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
1189
+				if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
1190
+				if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
1191
+				if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
1192
+				if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
1193
+				if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
1194
+				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
1195
+				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
1196
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1197
+				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1198
+				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1199 1199
 
1200
-			    if (isset($ais_data['timestamp'])) {
1200
+				if (isset($ais_data['timestamp'])) {
1201 1201
 				$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
1202
-			    } else {
1202
+				} else {
1203 1203
 				$data['datetime'] = date('Y-m-d H:i:s');
1204
-			    }
1205
-			    $data['format_source'] = 'aisnmea';
1206
-    			    $data['id_source'] = $id_source;
1207
-			    if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
1208
-			    unset($data);
1209
-                        } elseif ($format == 'flightgearsp') {
1210
-                    	    //echo $buffer."\n";
1211
-                    	    if (strlen($buffer) > 5) {
1204
+				}
1205
+				$data['format_source'] = 'aisnmea';
1206
+					$data['id_source'] = $id_source;
1207
+				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
1208
+				unset($data);
1209
+						} elseif ($format == 'flightgearsp') {
1210
+							//echo $buffer."\n";
1211
+							if (strlen($buffer) > 5) {
1212 1212
 				$line = explode(',',$buffer);
1213 1213
 				$data = array();
1214 1214
 				//XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p
@@ -1225,38 +1225,38 @@  discard block
 block discarded – undo
1225 1225
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1226 1226
 				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1227 1227
 				//$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
1228
-			    }
1229
-                        } elseif ($format == 'acars') {
1230
-                    	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1231
-			    $ACARS->add(trim($buffer));
1232
-			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
1233
-			    $ACARS->deleteLiveAcarsData();
1228
+				}
1229
+						} elseif ($format == 'acars') {
1230
+							if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1231
+				$ACARS->add(trim($buffer));
1232
+				socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
1233
+				$ACARS->deleteLiveAcarsData();
1234 1234
 			} elseif ($format == 'flightgearmp') {
1235
-			    if (substr($buffer,0,1) != '#') {
1235
+				if (substr($buffer,0,1) != '#') {
1236 1236
 				$data = array();
1237 1237
 				//echo $buffer."\n";
1238 1238
 				$line = explode(' ',$buffer);
1239 1239
 				if (count($line) == 11) {
1240
-				    $userserver = explode('@',$line[0]);
1241
-				    $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
1242
-				    $data['ident'] = $userserver[0];
1243
-				    $data['registration'] = $userserver[0];
1244
-				    $data['latitude'] = $line[4];
1245
-				    $data['longitude'] = $line[5];
1246
-				    $data['altitude'] = $line[6];
1247
-				    $data['datetime'] = date('Y-m-d H:i:s');
1248
-				    $aircraft_type = $line[10];
1249
-				    $aircraft_type = preg_split(':/:',$aircraft_type);
1250
-				    $data['aircraft_name'] = substr(end($aircraft_type),0,-4);
1251
-				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1252
-				    if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1240
+					$userserver = explode('@',$line[0]);
1241
+					$data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
1242
+					$data['ident'] = $userserver[0];
1243
+					$data['registration'] = $userserver[0];
1244
+					$data['latitude'] = $line[4];
1245
+					$data['longitude'] = $line[5];
1246
+					$data['altitude'] = $line[6];
1247
+					$data['datetime'] = date('Y-m-d H:i:s');
1248
+					$aircraft_type = $line[10];
1249
+					$aircraft_type = preg_split(':/:',$aircraft_type);
1250
+					$data['aircraft_name'] = substr(end($aircraft_type),0,-4);
1251
+					if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1252
+					if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1253
+				}
1253 1254
 				}
1254
-			    }
1255 1255
 			} elseif ($format == 'beast') {
1256
-			    echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
1257
-			    die;
1256
+				echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
1257
+				die;
1258 1258
 			} elseif ($format == 'vrstcp') {
1259
-			    foreach($buffer as $all_data) {
1259
+				foreach($buffer as $all_data) {
1260 1260
 				$line = json_decode('{'.$all_data.'}',true);
1261 1261
 				$data = array();
1262 1262
 				if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex
@@ -1276,148 +1276,148 @@  discard block
 block discarded – undo
1276 1276
 				*/
1277 1277
 				$data['datetime'] = date('Y-m-d H:i:s');
1278 1278
 				if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
1279
-		    		$data['format_source'] = 'vrstcp';
1279
+					$data['format_source'] = 'vrstcp';
1280 1280
 				$data['id_source'] = $id_source;
1281 1281
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1282 1282
 				if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1283 1283
 				if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data);
1284 1284
 				unset($data);
1285
-			    }
1285
+				}
1286 1286
 			} elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') {
1287
-			    $line = explode("\t", $buffer);
1288
-			    for($k = 0; $k < count($line); $k=$k+2) {
1287
+				$line = explode("\t", $buffer);
1288
+				for($k = 0; $k < count($line); $k=$k+2) {
1289 1289
 				$key = $line[$k];
1290
-			        $lined[$key] = $line[$k+1];
1291
-			    }
1292
-    			    if (count($lined) > 3) {
1293
-    				$data['hex'] = $lined['hexid'];
1294
-    				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
1295
-    				$data['datetime'] = date('Y-m-d H:i:s');;
1296
-    				if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
1297
-    				if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
1298
-    				if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
1299
-    				if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
1300
-    				if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
1301
-    				if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
1302
-    				if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
1303
-    				$data['id_source'] = $id_source;
1304
-    				$data['format_source'] = 'tsv';
1305
-    				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1306
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1290
+					$lined[$key] = $line[$k+1];
1291
+				}
1292
+					if (count($lined) > 3) {
1293
+					$data['hex'] = $lined['hexid'];
1294
+					//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
1295
+					$data['datetime'] = date('Y-m-d H:i:s');;
1296
+					if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
1297
+					if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
1298
+					if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
1299
+					if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
1300
+					if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
1301
+					if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
1302
+					if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
1303
+					$data['id_source'] = $id_source;
1304
+					$data['format_source'] = 'tsv';
1305
+					if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1306
+					if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1307 1307
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1308
-    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1309
-    				unset($lined);
1310
-    				unset($data);
1311
-    			    } else $error = true;
1308
+					if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1309
+					unset($lined);
1310
+					unset($data);
1311
+					} else $error = true;
1312 1312
 			} elseif ($format == 'aprs' && $use_aprs) {
1313
-			    if ($aprs_connect == 0) {
1313
+				if ($aprs_connect == 0) {
1314 1314
 				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
1315 1315
 				$aprs_connect = 1;
1316
-			    }
1316
+				}
1317 1317
 			    
1318
-			    if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
1318
+				if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
1319 1319
 				$aprs_last_tx = time();
1320 1320
 				$data_aprs = "# Keep alive";
1321 1321
 				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
1322
-			    }
1322
+				}
1323 1323
 			    
1324
-			    //echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
1325
-			    //echo 'APRS data : '.$buffer."\n";
1326
-			    $buffer = str_replace('APRS <- ','',$buffer);
1327
-			    $buffer = str_replace('APRS -> ','',$buffer);
1328
-			    //echo $buffer."\n";
1329
-			    if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
1324
+				//echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
1325
+				//echo 'APRS data : '.$buffer."\n";
1326
+				$buffer = str_replace('APRS <- ','',$buffer);
1327
+				$buffer = str_replace('APRS -> ','',$buffer);
1328
+				//echo $buffer."\n";
1329
+				if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
1330 1330
 				$line = $APRS->parse($buffer);
1331 1331
 				//if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) {
1332 1332
 				if (is_array($line) && isset($line['latitude']) && isset($line['longitude']) && (isset($line['ident']) || isset($line['address']) || isset($line['mmsi']))) {
1333
-				    $aprs_last_tx = time();
1334
-				    $data = array();
1335
-				    //print_r($line);
1336
-				    if (isset($line['address'])) $data['hex'] = $line['address'];
1337
-				    if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi'];
1338
-				    if (isset($line['imo'])) $data['imo'] = $line['imo'];
1339
-				    if (isset($line['squawk'])) $data['squawk'] = $line['squawk'];
1340
-				    if (isset($line['arrival_code'])) $data['arrical_code'] = $line['arrival_code'];
1341
-				    if (isset($line['arrival_date'])) $data['arrical_date'] = $line['arrival_date'];
1342
-				    if (isset($line['type_id'])) $data['type_id'] = $line['typeid'];
1343
-				    if (isset($line['status_id'])) $data['status_id'] = $line['statusid'];
1344
-				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
1345
-				    else $data['datetime'] = date('Y-m-d H:i:s');
1346
-				    //$data['datetime'] = date('Y-m-d H:i:s');
1347
-				    if (isset($line['ident'])) $data['ident'] = $line['ident'];
1348
-				    $data['latitude'] = $line['latitude'];
1349
-				    $data['longitude'] = $line['longitude'];
1350
-				    //$data['verticalrate'] = $line[16];
1351
-				    if (isset($line['speed'])) $data['speed'] = $line['speed'];
1352
-				    //else $data['speed'] = 0;
1353
-				    if (isset($line['altitude'])) $data['altitude'] = $line['altitude'];
1354
-				    if (isset($line['comment'])) $data['comment'] = $line['comment'];
1355
-				    if (isset($line['symbol'])) $data['type'] = $line['symbol'];
1356
-				    if (isset($line['heading'])) $data['heading'] = $line['heading'];
1357
-				    //else $data['heading'] = 0;
1358
-				    if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth'];
1359
-				    //if (!isset($line['source_type']) && (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE))) $data['noarchive'] = true;
1360
-				    if (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE) $data['noarchive'] = true;
1361
-				    elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) $data['noarchive'] = false;
1362
-				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1363
-				    elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) $data['noarchive'] = false;
1364
-    				    $data['id_source'] = $id_source;
1365
-    				    if (isset($line['format_source'])) $data['format_source'] = $line['format_source'];
1366
-				    else $data['format_source'] = 'aprs';
1367
-				    $data['source_name'] = $line['source'];
1368
-				    if (isset($line['source_type'])) $data['source_type'] = $line['source_type'];
1369
-				    else $data['source_type'] = 'flarm';
1370
-    				    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1371
-				    $currentdate = date('Y-m-d H:i:s');
1372
-				    $aprsdate = strtotime($data['datetime']);
1373
-				    if ($data['source_type'] != 'modes' && $data['source_type'] != 'ais') $data['altitude_relative'] = 'AMSL';
1374
-				    // Accept data if time <= system time + 20s
1375
-				    //if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
1376
-				    if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
1333
+					$aprs_last_tx = time();
1334
+					$data = array();
1335
+					//print_r($line);
1336
+					if (isset($line['address'])) $data['hex'] = $line['address'];
1337
+					if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi'];
1338
+					if (isset($line['imo'])) $data['imo'] = $line['imo'];
1339
+					if (isset($line['squawk'])) $data['squawk'] = $line['squawk'];
1340
+					if (isset($line['arrival_code'])) $data['arrical_code'] = $line['arrival_code'];
1341
+					if (isset($line['arrival_date'])) $data['arrical_date'] = $line['arrival_date'];
1342
+					if (isset($line['type_id'])) $data['type_id'] = $line['typeid'];
1343
+					if (isset($line['status_id'])) $data['status_id'] = $line['statusid'];
1344
+					if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
1345
+					else $data['datetime'] = date('Y-m-d H:i:s');
1346
+					//$data['datetime'] = date('Y-m-d H:i:s');
1347
+					if (isset($line['ident'])) $data['ident'] = $line['ident'];
1348
+					$data['latitude'] = $line['latitude'];
1349
+					$data['longitude'] = $line['longitude'];
1350
+					//$data['verticalrate'] = $line[16];
1351
+					if (isset($line['speed'])) $data['speed'] = $line['speed'];
1352
+					//else $data['speed'] = 0;
1353
+					if (isset($line['altitude'])) $data['altitude'] = $line['altitude'];
1354
+					if (isset($line['comment'])) $data['comment'] = $line['comment'];
1355
+					if (isset($line['symbol'])) $data['type'] = $line['symbol'];
1356
+					if (isset($line['heading'])) $data['heading'] = $line['heading'];
1357
+					//else $data['heading'] = 0;
1358
+					if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth'];
1359
+					//if (!isset($line['source_type']) && (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE))) $data['noarchive'] = true;
1360
+					if (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE) $data['noarchive'] = true;
1361
+					elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) $data['noarchive'] = false;
1362
+					if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1363
+					elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) $data['noarchive'] = false;
1364
+						$data['id_source'] = $id_source;
1365
+						if (isset($line['format_source'])) $data['format_source'] = $line['format_source'];
1366
+					else $data['format_source'] = 'aprs';
1367
+					$data['source_name'] = $line['source'];
1368
+					if (isset($line['source_type'])) $data['source_type'] = $line['source_type'];
1369
+					else $data['source_type'] = 'flarm';
1370
+						if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1371
+					$currentdate = date('Y-m-d H:i:s');
1372
+					$aprsdate = strtotime($data['datetime']);
1373
+					if ($data['source_type'] != 'modes' && $data['source_type'] != 'ais') $data['altitude_relative'] = 'AMSL';
1374
+					// Accept data if time <= system time + 20s
1375
+					//if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
1376
+					if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
1377 1377
 					$send = $SI->add($data);
1378
-				    } elseif ($data['source_type'] == 'ais') {
1378
+					} elseif ($data['source_type'] == 'ais') {
1379 1379
 					if (isset($globalMarine) && $globalMarine) $send = $MI->add($data);
1380
-				    } elseif (isset($line['stealth'])) {
1380
+					} elseif (isset($line['stealth'])) {
1381 1381
 					if ($line['stealth'] != 0) echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
1382 1382
 					else echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n";
1383
-				    } elseif (isset($globalAircraft) && $globalAircraft && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
1384
-					    //$line['symbol'] == 'Balloon' ||
1385
-					    $line['symbol'] == 'Glider' || 
1386
-					    $line['symbol'] == 'Aircraft (small)' || $line['symbol'] == 'Helicopter')) {
1387
-					    if ($line['symbol'] == 'Ballon') $data['aircraft_icao'] = 'BALL';
1388
-					    if ($line['symbol'] == 'Glider') $data['aircraft_icao'] = 'PARAGLIDER';
1389
-					    $send = $SI->add($data);
1390
-				    } elseif (isset($globalMarine) && $globalMarine && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
1391
-					    $line['symbol'] == 'Yacht (Sail)' || 
1392
-					    $line['symbol'] == 'Ship (Power Boat)')) {
1393
-					    $send = $MI->add($data);
1394
-				    } elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
1395
-					    $line['symbol'] == 'Car' || 
1396
-					    $line['symbol'] == 'Ambulance' || 
1397
-					    $line['symbol'] == 'Van' || 
1398
-					    $line['symbol'] == 'Truck' || $line['symbol'] == 'Truck (18 Wheeler)' || 
1399
-					    $line['symbol'] == 'Motorcycle' || 
1400
-					    $line['symbol'] == 'Tractor' || 
1401
-					    $line['symbol'] == 'Police' || 
1402
-					    $line['symbol'] == 'Bike' || 
1403
-					    $line['symbol'] == 'Jogger' || 
1404
-					    $line['symbol'] == 'Horse' || 
1405
-					    $line['symbol'] == 'Bus' || 
1406
-					    $line['symbol'] == 'Jeep' || 
1407
-					    $line['symbol'] == 'Recreational Vehicle' || 
1408
-					    $line['symbol'] == 'Yacht (Sail)' || 
1409
-					    $line['symbol'] == 'Ship (Power Boat)' || 
1410
-					    $line['symbol'] == 'Firetruck' || 
1411
-					    $line['symbol'] == 'Balloon' || $line['symbol'] == 'Glider' || 
1412
-					    $line['symbol'] == 'Aircraft (small)' || $line['symbol'] == 'Helicopter' || 
1413
-					    $line['symbol'] == 'SUV' ||
1414
-					    $line['symbol'] == 'Snowmobile' ||
1415
-					    $line['symbol'] == 'Mobile Satellite Station')) {
1416
-				    //} elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && isset($line['speed']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') {
1383
+					} elseif (isset($globalAircraft) && $globalAircraft && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
1384
+						//$line['symbol'] == 'Balloon' ||
1385
+						$line['symbol'] == 'Glider' || 
1386
+						$line['symbol'] == 'Aircraft (small)' || $line['symbol'] == 'Helicopter')) {
1387
+						if ($line['symbol'] == 'Ballon') $data['aircraft_icao'] = 'BALL';
1388
+						if ($line['symbol'] == 'Glider') $data['aircraft_icao'] = 'PARAGLIDER';
1389
+						$send = $SI->add($data);
1390
+					} elseif (isset($globalMarine) && $globalMarine && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
1391
+						$line['symbol'] == 'Yacht (Sail)' || 
1392
+						$line['symbol'] == 'Ship (Power Boat)')) {
1393
+						$send = $MI->add($data);
1394
+					} elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
1395
+						$line['symbol'] == 'Car' || 
1396
+						$line['symbol'] == 'Ambulance' || 
1397
+						$line['symbol'] == 'Van' || 
1398
+						$line['symbol'] == 'Truck' || $line['symbol'] == 'Truck (18 Wheeler)' || 
1399
+						$line['symbol'] == 'Motorcycle' || 
1400
+						$line['symbol'] == 'Tractor' || 
1401
+						$line['symbol'] == 'Police' || 
1402
+						$line['symbol'] == 'Bike' || 
1403
+						$line['symbol'] == 'Jogger' || 
1404
+						$line['symbol'] == 'Horse' || 
1405
+						$line['symbol'] == 'Bus' || 
1406
+						$line['symbol'] == 'Jeep' || 
1407
+						$line['symbol'] == 'Recreational Vehicle' || 
1408
+						$line['symbol'] == 'Yacht (Sail)' || 
1409
+						$line['symbol'] == 'Ship (Power Boat)' || 
1410
+						$line['symbol'] == 'Firetruck' || 
1411
+						$line['symbol'] == 'Balloon' || $line['symbol'] == 'Glider' || 
1412
+						$line['symbol'] == 'Aircraft (small)' || $line['symbol'] == 'Helicopter' || 
1413
+						$line['symbol'] == 'SUV' ||
1414
+						$line['symbol'] == 'Snowmobile' ||
1415
+						$line['symbol'] == 'Mobile Satellite Station')) {
1416
+					//} elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && isset($line['speed']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') {
1417 1417
 				//    } elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') {
1418 1418
 					//echo '!!!!!!!!!!!!!!!! SEND !!!!!!!!!!!!!!!!!!!!'."\n";
1419 1419
 					if (isset($globalTracker) && $globalTracker) $send = $TI->add($data);
1420
-				    } elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident']) && isset($data['altitude'])) {
1420
+					} elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident']) && isset($data['altitude'])) {
1421 1421
 					if (!isset($data['altitude'])) $data['altitude'] = 0;
1422 1422
 					$Source->deleteOldLocationByType('gs');
1423 1423
 					if (count($Source->getLocationInfoByNameType($data['ident'],'gs')) > 0) {
@@ -1425,7 +1425,7 @@  discard block
 block discarded – undo
1425 1425
 					} else {
1426 1426
 						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']);
1427 1427
 					}
1428
-				    } elseif (isset($line['symbol']) && $line['symbol'] == 'Weather Station') {
1428
+					} elseif (isset($line['symbol']) && $line['symbol'] == 'Weather Station') {
1429 1429
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
1430 1430
 					//if ($globalDebug) echo '# Weather Station added'."\n";
1431 1431
 					$Source->deleteOldLocationByType('wx');
@@ -1437,10 +1437,10 @@  discard block
 block discarded – undo
1437 1437
 					}
1438 1438
 					unset($data);
1439 1439
 				    
1440
-				    } elseif ($globalDebug) {
1441
-				    	echo '/!\ Not added: '.$buffer."\n";
1442
-				    	print_r($line);
1443
-				    }
1440
+					} elseif ($globalDebug) {
1441
+						echo '/!\ Not added: '.$buffer."\n";
1442
+						print_r($line);
1443
+					}
1444 1444
 				}
1445 1445
 				elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') {
1446 1446
 					$Source->updateLocationDescByName($line['ident'],$line['source'],$id,$line['comment']);
@@ -1452,12 +1452,12 @@  discard block
 block discarded – undo
1452 1452
 				*/
1453 1453
 				//elseif ($line == false && $globalDebug) echo 'Ignored ('.$buffer.")\n";
1454 1454
 				elseif ($line == true && $globalDebug) echo '!! Failed : '.$buffer."!!\n";
1455
-			    }
1455
+				}
1456 1456
 			} else {
1457
-			    $line = explode(',', $buffer);
1458
-    			    if (count($line) > 20) {
1459
-    			    	$data['hex'] = $line[4];
1460
-    				/*
1457
+				$line = explode(',', $buffer);
1458
+					if (count($line) > 20) {
1459
+						$data['hex'] = $line[4];
1460
+					/*
1461 1461
     				$data['datetime'] = $line[6].' '.$line[7];
1462 1462
     					date_default_timezone_set($globalTimezone);
1463 1463
     					$datetime = new DateTime($data['datetime']);
@@ -1465,30 +1465,30 @@  discard block
 block discarded – undo
1465 1465
     					$data['datetime'] = $datetime->format('Y-m-d H:i:s');
1466 1466
     					date_default_timezone_set('UTC');
1467 1467
     				*/
1468
-    				// Force datetime to current UTC datetime
1469
-    				date_default_timezone_set('UTC');
1470
-    				$data['datetime'] = date('Y-m-d H:i:s');
1471
-    				$data['ident'] = trim($line[10]);
1472
-    				$data['latitude'] = $line[14];
1473
-    				$data['longitude'] = $line[15];
1474
-    				$data['verticalrate'] = $line[16];
1475
-    				$data['emergency'] = $line[20];
1476
-    				$data['speed'] = $line[12];
1477
-    				$data['squawk'] = $line[17];
1478
-    				$data['altitude'] = $line[11];
1479
-    				$data['heading'] = $line[13];
1480
-    				$data['ground'] = $line[21];
1481
-    				$data['emergency'] = $line[19];
1482
-    				$data['format_source'] = 'sbs';
1468
+					// Force datetime to current UTC datetime
1469
+					date_default_timezone_set('UTC');
1470
+					$data['datetime'] = date('Y-m-d H:i:s');
1471
+					$data['ident'] = trim($line[10]);
1472
+					$data['latitude'] = $line[14];
1473
+					$data['longitude'] = $line[15];
1474
+					$data['verticalrate'] = $line[16];
1475
+					$data['emergency'] = $line[20];
1476
+					$data['speed'] = $line[12];
1477
+					$data['squawk'] = $line[17];
1478
+					$data['altitude'] = $line[11];
1479
+					$data['heading'] = $line[13];
1480
+					$data['ground'] = $line[21];
1481
+					$data['emergency'] = $line[19];
1482
+					$data['format_source'] = 'sbs';
1483 1483
 				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1484
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1484
+					if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1485 1485
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1486
-    				$data['id_source'] = $id_source;
1487
-    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
1488
-    				else $error = true;
1489
-    				unset($data);
1490
-    			    } else $error = true;
1491
-			    if ($error) {
1486
+					$data['id_source'] = $id_source;
1487
+					if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
1488
+					else $error = true;
1489
+					unset($data);
1490
+					} else $error = true;
1491
+				if ($error) {
1492 1492
 				if (count($line) > 1 && ($line[0] == 'STA' || $line[0] == 'AIR' || $line[0] == 'SEL' || $line[0] == 'ID' || $line[0] == 'CLK')) { 
1493 1493
 					if ($globalDebug) echo "Not a message. Ignoring... \n";
1494 1494
 				} else {
@@ -1504,13 +1504,13 @@  discard block
 block discarded – undo
1504 1504
 					connect_all($sourceer);
1505 1505
 					$sourceer = array();
1506 1506
 				}
1507
-			    }
1507
+				}
1508 1508
 			}
1509 1509
 			// Sleep for xxx microseconds
1510 1510
 			if (isset($globalSBSSleep)) usleep($globalSBSSleep);
1511
-		    } else {
1511
+			} else {
1512 1512
 			if ($format == 'flightgearmp') {
1513
-			    	if ($globalDebug) echo "Reconnect FlightGear MP...";
1513
+					if ($globalDebug) echo "Reconnect FlightGear MP...";
1514 1514
 				//@socket_close($r);
1515 1515
 				sleep($globalMinFetch);
1516 1516
 				$sourcefg[$nb] = $globalSources[$nb];
@@ -1519,9 +1519,9 @@  discard block
 block discarded – undo
1519 1519
 				break;
1520 1520
 				
1521 1521
 			} elseif ($format != 'acars' && $format != 'flightgearsp') {
1522
-			    if (isset($tt[$format])) $tt[$format]++;
1523
-			    else $tt[$format] = 0;
1524
-			    if ($tt[$format] > 30) {
1522
+				if (isset($tt[$format])) $tt[$format]++;
1523
+				else $tt[$format] = 0;
1524
+				if ($tt[$format] > 30) {
1525 1525
 				if ($globalDebug) echo "ERROR : Reconnect ".$format."...";
1526 1526
 				//@socket_close($r);
1527 1527
 				sleep(2);
@@ -1532,23 +1532,23 @@  discard block
 block discarded – undo
1532 1532
 				//connect_all($globalSources);
1533 1533
 				$tt[$format]=0;
1534 1534
 				break;
1535
-			    }
1535
+				}
1536
+			}
1536 1537
 			}
1537
-		    }
1538 1538
 		}
1539
-	    } else {
1539
+		} else {
1540 1540
 		$error = socket_strerror(socket_last_error());
1541 1541
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) {
1542 1542
 			if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
1543 1543
 			if (isset($globalDebug)) echo "Restarting...\n";
1544 1544
 			// Restart the script if possible
1545 1545
 			if (is_array($sockets)) {
1546
-			    if ($globalDebug) echo "Shutdown all sockets...";
1546
+				if ($globalDebug) echo "Shutdown all sockets...";
1547 1547
 			    
1548
-			    foreach ($sockets as $sock) {
1548
+				foreach ($sockets as $sock) {
1549 1549
 				@socket_shutdown($sock,2);
1550 1550
 				@socket_close($sock);
1551
-			    }
1551
+				}
1552 1552
 			    
1553 1553
 			}
1554 1554
 			if ($globalDebug) echo "Waiting...";
@@ -1563,15 +1563,15 @@  discard block
 block discarded – undo
1563 1563
 			if ($globalDebug) echo "Restart all connections...";
1564 1564
 			connect_all($globalSources);
1565 1565
 		}
1566
-	    }
1566
+		}
1567 1567
 	}
1568 1568
 	if ($globalDaemon === false) {
1569
-	    if ($globalDebug) echo 'Check all...'."\n";
1570
-	    if (isset($SI)) $SI->checkAll();
1571
-	    if (isset($TI)) $TI->checkAll();
1572
-	    if (isset($MI)) $MI->checkAll();
1569
+		if ($globalDebug) echo 'Check all...'."\n";
1570
+		if (isset($SI)) $SI->checkAll();
1571
+		if (isset($TI)) $TI->checkAll();
1572
+		if (isset($MI)) $MI->checkAll();
1573
+	}
1573 1574
 	}
1574
-    }
1575 1575
 }
1576 1576
 
1577 1577
 ?>
Please login to merge, or discard this patch.
location-geojson.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -15,14 +15,14 @@  discard block
 block discarded – undo
15 15
 		$coords = explode(',',$_GET['coord']);
16 16
 //		$spotter_array = Source::getAllLocationInfobyCoord($coords);
17 17
 		if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') 
18
-		    || (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) {
18
+			|| (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) {
19 19
 			$spotter_array = $Source->getAllLocationInfo();
20 20
 		} else {
21 21
 			$spotter_array = $Source->getLocationInfoByType('');
22 22
 		}
23 23
 	} else {
24 24
 		if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') 
25
-		    || (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) {
25
+			|| (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) {
26 26
 			$spotter_array = $Source->getAllLocationInfo();
27 27
 		} else {
28 28
 			$spotter_array = $Source->getLocationInfoByType('');
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 		date_default_timezone_set('UTC');
39 39
 		//waypoint plotting
40 40
 		$output .= '{"type": "Feature",';
41
-		    $output .= '"properties": {';
41
+			$output .= '"properties": {';
42 42
 			$output .= '"id": "'.$spotter_item['id'].'",';
43 43
 			$output .= '"location_id": "'.$spotter_item['location_id'].'",';
44 44
 			$output .= '"name": "'.$spotter_item['name'].'",';
@@ -56,13 +56,13 @@  discard block
 block discarded – undo
56 56
 				if (isset($weather['temp'])) $output.= '"temp": "'.$weather['temp'].'",';
57 57
 			}
58 58
 			$output .= '"image_thumb": "'.$spotter_item['image_thumb'].'"';
59
-		    $output .= '},';
60
-		    $output .= '"geometry": {';
59
+			$output .= '},';
60
+			$output .= '"geometry": {';
61 61
 			$output .= '"type": "Point",';
62 62
 			$output .= '"coordinates": [';
63
-			    $output .= $spotter_item['longitude'].', '.$spotter_item['latitude'];
63
+				$output .= $spotter_item['longitude'].', '.$spotter_item['latitude'];
64 64
 			$output .= ']';
65
-		    $output .= '}';
65
+			$output .= '}';
66 66
 		$output .= '},';
67 67
 	}
68 68
 	$output  = substr($output, 0, -1);
Please login to merge, or discard this patch.
index.php 1 patch
Indentation   +89 added lines, -89 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
     <?php }; if (isset($globalTracker) && $globalTracker) { ?><td><div id="ibxtracker"><h4><?php echo _("Trackers Detected"); ?></h4><br /><i class="fa fa-spinner fa-pulse fa-fw"></i></div></td><?php } ?>
46 46
 </tr></table></div>
47 47
 <?php
48
-    if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) {
48
+	if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) {
49 49
 
50 50
 ?>
51 51
 <script src="<?php echo $globalURL; ?>/js/map.3d.js.php"></script>
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 <script src="<?php echo $globalURL; ?>/js/map-marine.3d.js.php"></script>
66 66
 <?php
67 67
 	}
68
-    }
68
+	}
69 69
 ?>
70 70
 
71 71
 <div id="sidebar" class="sidebar collapsed">
@@ -76,34 +76,34 @@  discard block
 block discarded – undo
76 76
 	<li><a href="#" onclick="getUserLocation(); return false;" title="<?php echo _("Plot your Location"); ?>"><i class="fa fa-map-marker"></i></a></li>
77 77
 	<li><a href="#" onclick="getCompassDirection(); return false;" title="<?php echo _("Compass Mode"); ?>"><i class="fa fa-compass"></i></a></li>
78 78
 <?php
79
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
79
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
80 80
 	if (isset($globalArchive) && $globalArchive == TRUE) {
81 81
 ?>
82 82
 	<li><a href="#archive" role="tab" title="<?php echo _("Archive"); ?>"><i class="fa fa-archive"></i></a></li>
83 83
 <?php
84 84
 	}
85
-    }
85
+	}
86 86
 ?>
87 87
 	<li><a href="#home" role="tab" title="<?php echo _("Layers"); ?>"><i class="fa fa-map"></i></a></li>
88 88
 	<li><a href="#filters" role="tab" title="<?php echo _("Filters"); ?>"><i class="fa fa-filter"></i></a></li>
89 89
 	<li><a href="#settings" role="tab" title="<?php echo _("Settings"); ?>"><i class="fa fa-gears"></i></a></li>
90 90
 <?php
91
-    if (isset($globalMap3D) && $globalMap3D) {
91
+	if (isset($globalMap3D) && $globalMap3D) {
92 92
 	if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
93 93
 ?>
94 94
 	<li><a href="#" onclick="show3D(); return false;" role="tab" title="3D"><b>3D</b></a></li>
95 95
 <?php
96
-        } else {
97
-    	    if (isset($globalMapSatellites) && $globalMapSatellites) {
96
+		} else {
97
+			if (isset($globalMapSatellites) && $globalMapSatellites) {
98 98
 ?>
99 99
 	<li><a href="#satellites" role="tab" title="<?php echo _("Satellites"); ?>"><i class="satellite"></i></a></li>
100 100
 <?php
101
-	    }
101
+		}
102 102
 ?>
103 103
 	<li><a href="#" onclick="show2D(); return false;" role="tab" title="2D"><b>2D</b></a></li>
104 104
 <?php
105 105
 	}
106
-    }
106
+	}
107 107
 ?>
108 108
     </ul>
109 109
 
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 ?>
179 179
         </div>
180 180
 <?php
181
-    if (isset($globalArchive) && $globalArchive == TRUE) {
181
+	if (isset($globalArchive) && $globalArchive == TRUE) {
182 182
 ?>
183 183
         <div class="sidebar-pane" id="archive">
184 184
 	    <h1 class="sidebar-header"><?php echo _("Playback"); ?> <i>Bêta</i><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
 	    </form>
239 239
 	</div>
240 240
 <?php
241
-    }
241
+	}
242 242
 ?>
243 243
         <div class="sidebar-pane" id="settings">
244 244
 	    <h1 class="sidebar-header"><?php echo _("Settings"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
@@ -249,56 +249,56 @@  discard block
 block discarded – undo
249 249
 			    <?php
250 250
 				if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider;
251 251
 				else $MapType = $_COOKIE['MapType'];
252
-			    ?>
252
+				?>
253 253
 			    <?php
254 254
 				if (isset($globalBingMapKey) && $globalBingMapKey != '') {
255
-			    ?>
255
+				?>
256 256
 			    <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option>
257 257
 			    <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option>
258 258
 			    <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option>
259 259
 			    <?php
260 260
 				}
261
-			    ?>
261
+				?>
262 262
 			    <?php
263
-			        if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
264
-			    ?>
263
+					if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
264
+				?>
265 265
 			    <?php
266
-				    if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
267
-			    ?>
266
+					if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
267
+				?>
268 268
 			    <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option>
269 269
 			    <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option>
270 270
 			    <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option>
271 271
 			    <?php
272
-				    }
273
-			    ?>
272
+					}
273
+				?>
274 274
 			    <?php
275
-				    if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') {
276
-			    ?>
275
+					if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') {
276
+				?>
277 277
 			    <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option>
278 278
 			    <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option>
279 279
 			    <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option>
280 280
 			    <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option>
281 281
 			    <?php
282
-				    }
283
-			    ?>
282
+					}
283
+				?>
284 284
 			    <?php
285
-				    if (isset($globalMapQuestKey) && $globalMapQuestKey != '') {
286
-			    ?>
285
+					if (isset($globalMapQuestKey) && $globalMapQuestKey != '') {
286
+				?>
287 287
 			    <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option>
288 288
 			    <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option>
289 289
 			    <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option>
290 290
 			    <?php
291
-				    }
292
-			    ?>
291
+					}
292
+				?>
293 293
 			    <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option>
294 294
 			    <?php
295 295
 				}
296
-			    ?>
296
+				?>
297 297
 			    <?php
298
-				    if (isset($globalMapboxToken) && $globalMapboxToken != '') {
298
+					if (isset($globalMapboxToken) && $globalMapboxToken != '') {
299 299
 					if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default';
300 300
 					else $MapBoxId = $_COOKIE['MapTypeId'];
301
-			    ?>
301
+				?>
302 302
 			    <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option>
303 303
 			    <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option>
304 304
 			    <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option>
@@ -312,13 +312,13 @@  discard block
 block discarded – undo
312 312
 			    <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option>
313 313
 			    <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option>
314 314
 			    <?php
315
-				    }
316
-			    ?>
315
+					}
316
+				?>
317 317
 			    <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option>
318 318
 			</select>
319 319
 		    </li>
320 320
 <?php
321
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
321
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
322 322
 ?>
323 323
 		    <li><?php echo _("Type of Terrain:"); ?>
324 324
 			<select  class="selectpicker" onchange="terrainType(this);">
@@ -329,10 +329,10 @@  discard block
 block discarded – undo
329 329
 			</select>
330 330
 		    </li>
331 331
 <?php
332
-    }
332
+	}
333 333
 ?>
334 334
 <?php
335
-    if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
335
+	if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
336 336
 ?>
337 337
 		    
338 338
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') print 'checked'; ?> ><?php echo _("Display flight info as popup"); ?></label></div></li>
@@ -341,76 +341,76 @@  discard block
 block discarded – undo
341 341
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightremainingroute" value="1" onclick="clickFlightRemainingRoute(this)" <?php if ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == 'true') || !isset($_COOKIE['MapRemainingRoute']) || (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)) print 'checked'; ?> ><?php echo _("Display flight remaining route on click"); ?></label></div></li>
342 342
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightestimation" value="1" onclick="clickFlightEstimation(this)" <?php if ((isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'true') || (!isset($_COOKIE['flightestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Planes animate between updates"); ?></label></div></li>
343 343
 <?php
344
-    }
344
+	}
345 345
 ?>
346 346
 		    <li><div class="checkbox"><label><input type="checkbox" name="displayairports" value="1" onclick="clickDisplayAirports(this)" <?php if (isset($_COOKIE['displayairports']) && $_COOKIE['displayairports'] == 'true' || !isset($_COOKIE['displayairports'])) print 'checked'; ?> ><?php echo _("Display airports on map"); ?></label></div></li>
347 347
 		    <li><div class="checkbox"><label><input type="checkbox" name="displaygroundstation" value="1" onclick="clickDisplayGroundStation(this)" <?php if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') || (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) print 'checked'; ?> ><?php echo _("Display ground station on map"); ?></label></div></li>
348 348
 <?php
349
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
349
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
350 350
 ?>
351 351
 		    <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) print 'checked'; ?> ><?php echo _("Show mini-map"); ?></label></div></li>
352 352
 <?php
353
-    }
354
-    if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
353
+	}
354
+	if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
355 355
 ?>
356 356
 		    <li><div class="checkbox"><label><input type="checkbox" name="displaysanta" value="1" onclick="clickSanta(this)"><i class="fa fa-snowflake-o" aria-hidden="true"></i> <?php echo _("Show Santa Claus now"); ?> <i class="fa fa-snowflake-o" aria-hidden="true"></i></label></div></li>
357 357
 <?php
358
-    }
358
+	}
359 359
 ?>
360 360
 
361 361
 		    <?php
362 362
 			if (function_exists('array_column')) {
363
-			    if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
364
-		    ?>
363
+				if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
364
+			?>
365 365
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li>
366 366
 		    <?php
367
-			    }
367
+				}
368 368
 			} elseif (isset($globalSources)) {
369
-			    $dispolar = false;
370
-			    foreach ($globalSources as $testsource) {
371
-			        if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true;
372
-			    }
373
-			    if ($dispolar) {
374
-		    ?>
369
+				$dispolar = false;
370
+				foreach ($globalSources as $testsource) {
371
+					if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true;
372
+				}
373
+				if ($dispolar) {
374
+			?>
375 375
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li>
376 376
 		    <?php
377
-			    }
378
-		        }
379
-		    ?>
377
+				}
378
+				}
379
+			?>
380 380
 <?php
381
-    if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
381
+	if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
382 382
 ?>
383 383
 
384 384
 		    <?php
385 385
 			if (!isset($globalAircraft) || $globalAircraft === TRUE) {
386
-		    	    if (extension_loaded('gd') && function_exists('gd_info')) {
387
-		    ?>
386
+					if (extension_loaded('gd') && function_exists('gd_info')) {
387
+			?>
388 388
 		    <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') print 'checked'; ?> ><?php echo _("Aircraft icon color based on altitude"); ?></li>
389 389
 		    <?php 
390 390
 				if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') {
391
-		    ?>
391
+			?>
392 392
 		    <li><?php echo _("Aircraft icon color:"); ?>
393 393
 			<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print '1a3151'; ?>">
394 394
 		    </li>
395 395
 		    <?php
396 396
 				}
397
-			    }
398
-		        }
399
-		    ?>
397
+				}
398
+				}
399
+			?>
400 400
 		    <?php
401 401
 			if (isset($globalMarine) && $globalMarine === TRUE) {
402
-			    if (extension_loaded('gd') && function_exists('gd_info')) {
403
-		    ?>
402
+				if (extension_loaded('gd') && function_exists('gd_info')) {
403
+			?>
404 404
 		    <li><?php echo _("Marine icon color:"); ?>
405 405
 			<input type="color" name="marinecolor" id="html5colorpicker" onchange="iconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) print $_COOKIE['MarineIconColor']; elseif (isset($globalMarineIconColor)) print $globalMarineIconColor; else print '1a3151'; ?>">
406 406
 		    </li>
407 407
 		    <?php
408
-			    }
409
-		        }
410
-		    ?>
408
+				}
409
+				}
410
+			?>
411 411
 		    <?php
412 412
 			if (!isset($globalAircraft) || $globalAircraft === TRUE) {
413
-		    ?>
413
+			?>
414 414
 		    <li><?php echo _("Show airport icon at zoom level:"); ?>
415 415
 			<div class="range">
416 416
 			    <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?>">
@@ -419,9 +419,9 @@  discard block
 block discarded – undo
419 419
 		    </li>
420 420
 		    <?php
421 421
 			}
422
-		    ?>
422
+			?>
423 423
 <?php
424
-    } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') {
424
+	} elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') {
425 425
 ?>
426 426
 <?php
427 427
 	if (!isset($globalAircraft) || $globalAircraft === TRUE) {
@@ -442,7 +442,7 @@  discard block
 block discarded – undo
442 442
 		    </li>
443 443
 <?php
444 444
 	}
445
-    }
445
+	}
446 446
 ?>
447 447
 		    <li><?php echo _("Distance unit:"); ?>
448 448
 			<select class="selectpicker" onchange="unitdistance(this);">
@@ -475,19 +475,19 @@  discard block
 block discarded – undo
475 475
 		    <ul>
476 476
 		    <?php
477 477
 			if (!isset($globalAircraft) || $globalAircraft) {
478
-		    ?>
478
+			?>
479 479
 		    <?php
480 480
 			if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) {
481
-		    ?>
481
+			?>
482 482
 			<?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) print 'checked'; ?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?>
483 483
 			<?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) print 'checked'; ?> ><?php echo _("Display IVAO data"); ?></li><?php } ?>
484 484
 			<?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') || !isset($_COOKIE['ShowVMS'])) print 'checked'; ?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?>
485 485
 		    <?php
486 486
 			}
487
-		    ?>
487
+			?>
488 488
 		    <?php
489 489
 			if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) {
490
-		    ?>
490
+			?>
491 491
 			<?php if (isset($globalSBS1) && $globalSBS1) { ?>
492 492
 			    <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) print 'checked'; ?> ><?php echo _("Display ADS-B data"); ?></label></div></li>
493 493
 			<?php } ?>
@@ -496,7 +496,7 @@  discard block
 block discarded – undo
496 496
 			<?php } ?>
497 497
 		    <?php
498 498
 			}
499
-		    ?>
499
+			?>
500 500
 		    <li><?php echo _("Display airlines:"); ?>
501 501
 		    <br/>
502 502
 			<select class="selectpicker" multiple onchange="airlines(this);" id="display_airlines">
@@ -516,14 +516,14 @@  discard block
 block discarded – undo
516 516
 						echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>';
517 517
 					}
518 518
 				}
519
-			    ?>
519
+				?>
520 520
 			</select>
521 521
 		    </li>
522 522
 		    <?php
523 523
 			$Spotter = new Spotter();
524 524
 			$allalliancenames = $Spotter->getAllAllianceNames();
525 525
 			if (!empty($allalliancenames)) {
526
-		    ?>
526
+			?>
527 527
 		    <li><?php echo _("Display alliance:"); ?>
528 528
 		    <br/>
529 529
 			<select class="selectpicker" onchange="alliance(this);" id="display_alliance">
@@ -537,18 +537,18 @@  discard block
 block discarded – undo
537 537
 						echo '<option value="'.$alliance_name.'">'.$alliance_name.'</option>';
538 538
 					}
539 539
 				}
540
-			    ?>
540
+				?>
541 541
 			</select>
542 542
 		    </li>
543 543
 		    <?php
544 544
 			}
545
-		    ?>
545
+			?>
546 546
 		    <?php
547 547
 			}
548
-		    ?>
548
+			?>
549 549
 		    <?php
550 550
 			if (isset($globalAPRS) && $globalAPRS) {
551
-		    ?>
551
+			?>
552 552
 		    <li><?php echo _("Display APRS sources name:"); ?>
553 553
 			<select class="selectpicker" multiple onchange="sources(this);">
554 554
 			    <?php
@@ -560,18 +560,18 @@  discard block
 block discarded – undo
560 560
 						echo '<option value="'.$source['source_name'].'">'.$source['source_name'].'</option>';
561 561
 					}
562 562
 				}
563
-			    ?>
563
+				?>
564 564
 			</select>
565 565
 		    </li>
566 566
 		    <?php
567 567
 			}
568
-		    ?>
568
+			?>
569 569
 		    <?php
570 570
 			if (!isset($globalAircraft) && $globalAircraft) {
571
-		    ?>
571
+			?>
572 572
 		    <?php
573 573
 			if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) {
574
-		    ?>
574
+			?>
575 575
 		    <li><?php echo _("Display airlines of type:"); ?><br/>
576 576
 			<select class="selectpicker" onchange="airlinestype(this);">
577 577
 			    <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option>
@@ -582,14 +582,14 @@  discard block
 block discarded – undo
582 582
 		    </li>
583 583
 		    <?php
584 584
 			}
585
-		    ?>
585
+			?>
586 586
 		    <li>
587 587
 			<?php echo _("Display flight with ident:"); ?>
588 588
 			<input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" />
589 589
 		    </li>
590 590
 		    <?php
591 591
 			}
592
-		    ?>
592
+			?>
593 593
 		</ul>
594 594
 	    </form>
595 595
 	    <form method="post">
@@ -598,7 +598,7 @@  discard block
 block discarded – undo
598 598
 	    </form>
599 599
     	</div>
600 600
 <?php
601
-    if (isset($globalMapSatellites) && $globalMapSatellites && isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
601
+	if (isset($globalMapSatellites) && $globalMapSatellites && isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
602 602
 ?>
603 603
         <div class="sidebar-pane" id="satellites">
604 604
 	    <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
@@ -638,14 +638,14 @@  discard block
 block discarded – undo
638 638
 						print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>';
639 639
 					}
640 640
 				}
641
-			    ?>
641
+				?>
642 642
 			</select>
643 643
 		    </li>
644 644
 		</ul>
645 645
 	    </form>
646 646
 	</div>
647 647
 <?php
648
-    }
648
+	}
649 649
 ?>
650 650
     </div>
651 651
 </div>
Please login to merge, or discard this patch.
require/class.APRS.php 1 patch
Indentation   +165 added lines, -165 removed lines patch added patch discarded remove patch
@@ -2,10 +2,10 @@  discard block
 block discarded – undo
2 2
 require_once(dirname(__FILE__).'/settings.php');
3 3
 require_once(dirname(__FILE__).'/class.Common.php');
4 4
 class aprs {
5
-    private $socket;
6
-    private $connected = false;
5
+	private $socket;
6
+	private $connected = false;
7 7
 
8
-    protected $symbols = array('/!' => 'Police',
8
+	protected $symbols = array('/!' => 'Police',
9 9
 	'/#' => 'DIGI',
10 10
 	'/$' => 'Phone',
11 11
 	'/%' => 'DX Cluster',
@@ -165,13 +165,13 @@  discard block
 block discarded – undo
165 165
 	'\~' => 'TNC Stream SW');
166 166
 	
167 167
 
168
-    private function urshift($n, $s) {
168
+	private function urshift($n, $s) {
169 169
 	return ($n >= 0) ? ($n >> $s) :
170
-	    (($n & 0x7fffffff) >> $s) | 
170
+		(($n & 0x7fffffff) >> $s) | 
171 171
 		(0x40000000 >> ($s - 1));
172
-    }
172
+	}
173 173
 
174
-    public function parse($input) {
174
+	public function parse($input) {
175 175
 	global $globalDebug;
176 176
 	$debug = false;
177 177
 	$result = array();
@@ -183,8 +183,8 @@  discard block
 block discarded – undo
183 183
 	
184 184
 	/* Check that end was found and body has at least one byte. */
185 185
 	if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) {
186
-	    if ($globalDebug) echo '!!! APRS invalid : '.$input."\n";
187
-	    return false;
186
+		if ($globalDebug) echo '!!! APRS invalid : '.$input."\n";
187
+		return false;
188 188
 	}
189 189
 	
190 190
 	if ($debug) echo 'input : '.$input."\n";
@@ -198,34 +198,34 @@  discard block
 block discarded – undo
198 198
 	/* Parse source, target and path. */
199 199
 	//FLRDF0A52>APRS,qAS,LSTB
200 200
 	if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/',$header,$matches)) {
201
-	    $ident = $matches[1];
202
-	    $all_elements = $matches[2];
203
-	    if ($ident == 'AIRCRAFT') {
201
+		$ident = $matches[1];
202
+		$all_elements = $matches[2];
203
+		if ($ident == 'AIRCRAFT') {
204 204
 		$result['format_source'] = 'famaprs';
205 205
 		$result['source_type'] = 'modes';
206
-	    } elseif ($ident == 'MARINE') {
206
+		} elseif ($ident == 'MARINE') {
207 207
 		$result['format_source'] = 'famaprs';
208 208
 		$result['source_type'] = 'ais';
209
-	    } else {
209
+		} else {
210 210
 		if ($debug) echo 'ident : '.$ident."\n";
211 211
 		$result['ident'] = $ident;
212
-	    }
212
+		}
213 213
 	} else {
214
-	    if ($debug) 'No ident'."\n";
215
-	    return false;
214
+		if ($debug) 'No ident'."\n";
215
+		return false;
216 216
 	}
217 217
 	$elements = explode(',',$all_elements);
218 218
 	$source = end($elements);
219 219
 	$result['source'] = $source;
220 220
 	foreach ($elements as $element) {
221
-	    if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) {
222
-	        //echo "ok";
223
-	        //if ($element == 'TCPIP*') return false;
224
-	    } elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) {
221
+		if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) {
222
+			//echo "ok";
223
+			//if ($element == 'TCPIP*') return false;
224
+		} elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) {
225 225
 		if ($debug) echo 'element : '.$element."\n";
226 226
 		return false;
227
-	    }
228
-	    /*
227
+		}
228
+		/*
229 229
 	    } elseif (preg_match('/^([0-9A-F]{32})$/',$element)) {
230 230
 		//echo "ok";
231 231
 	    } else {
@@ -252,48 +252,48 @@  discard block
 block discarded – undo
252 252
 	$body_parse = substr($body,1);
253 253
 	//echo 'Body : '.$body."\n";
254 254
 	if (preg_match('/^;(.){9}\*/',$body,$matches)) {
255
-	    $body_parse = substr($body_parse,10);
256
-	    $find = true;
257
-	    //echo $body_parse."\n";
255
+		$body_parse = substr($body_parse,10);
256
+		$find = true;
257
+		//echo $body_parse."\n";
258 258
 	}
259 259
 	if (preg_match('/^`(.*)\//',$body,$matches)) {
260
-	    $body_parse = substr($body_parse,strlen($matches[1])-1);
261
-	    $find = true;
262
-	    //echo $body_parse."\n";
260
+		$body_parse = substr($body_parse,strlen($matches[1])-1);
261
+		$find = true;
262
+		//echo $body_parse."\n";
263 263
 	}
264 264
 	if (preg_match("/^'(.*)\//",$body,$matches)) {
265
-	    $body_parse = substr($body_parse,strlen($matches[1])-1);
266
-	    $find = true;
267
-	    //echo $body_parse."\n";
265
+		$body_parse = substr($body_parse,strlen($matches[1])-1);
266
+		$find = true;
267
+		//echo $body_parse."\n";
268 268
 	}
269 269
 	if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/',$body_parse,$matches)) {
270
-	    $find = true;
271
-	    //print_r($matches);
272
-	    $timestamp = $matches[0];
273
-	    if ($matches[4] == 'h') {
270
+		$find = true;
271
+		//print_r($matches);
272
+		$timestamp = $matches[0];
273
+		if ($matches[4] == 'h') {
274 274
 		$timestamp = strtotime(date('Ymd').' '.$matches[1].':'.$matches[2].':'.$matches[3]);
275 275
 		//echo 'timestamp : '.$timestamp.' - now : '.time()."\n";
276 276
 		/*
277 277
 		if (time() + 3900 < $timestamp) $timestamp -= 86400;
278 278
 		elseif (time() - 82500 > $timestamp) $timestamp += 86400;
279 279
 		*/
280
-	    } elseif ($matches[4] == 'z' || $matches[4] == '/') {
280
+		} elseif ($matches[4] == 'z' || $matches[4] == '/') {
281 281
 		// This work or not ?
282 282
 		$timestamp = strtotime(date('Ym').$matches[1].' '.$matches[2].':'.$matches[3]);
283
-	    }
284
-	    $body_parse = substr($body_parse,7);
285
-	    $result['timestamp'] = $timestamp;
286
-	    //echo date('Ymd H:i:s',$timestamp);
283
+		}
284
+		$body_parse = substr($body_parse,7);
285
+		$result['timestamp'] = $timestamp;
286
+		//echo date('Ymd H:i:s',$timestamp);
287 287
 	}
288 288
 	if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/',$body_parse,$matches)) {
289
-	    $find = true;
290
-	    $timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]);
291
-	    $body_parse = substr($body_parse,8);
292
-	    $result['timestamp'] = $timestamp;
293
-	    //echo date('Ymd H:i:s',$timestamp);
289
+		$find = true;
290
+		$timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]);
291
+		$body_parse = substr($body_parse,8);
292
+		$result['timestamp'] = $timestamp;
293
+		//echo date('Ymd H:i:s',$timestamp);
294 294
 	}
295 295
 	//if (strlen($body_parse) > 19) {
296
-	    if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) {
296
+		if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) {
297 297
 		$find = true;
298 298
 		// 4658.70N/00707.78Ez
299 299
 		//print_r(str_split($body_parse));
@@ -312,7 +312,7 @@  discard block
 block discarded – undo
312 312
 		$lon = intval($lon_deg);
313 313
 		if ($lat > 89 || $lon > 179) return false;
314 314
 	    
315
-	    /*
315
+		/*
316 316
 	    $tmp_5b = str_replace('.','',$lat_min);
317 317
 	    if (preg_match('/^([0-9]{0,4})( {0,4})$/',$tmp_5b,$matches)) {
318 318
 	        print_r($matches);
@@ -326,9 +326,9 @@  discard block
 block discarded – undo
326 326
 		$result['longitude'] = $longitude;
327 327
 		$body_parse = substr($body_parse,18);
328 328
 		$body_parse_len = strlen($body_parse);
329
-	    }
330
-	    $body_parse_len = strlen($body_parse);
331
-	    if ($body_parse_len > 0) {
329
+		}
330
+		$body_parse_len = strlen($body_parse);
331
+		if ($body_parse_len > 0) {
332 332
 		/*
333 333
 		if (!isset($result['timestamp']) && !isset($result['latitude'])) {
334 334
 			$body_split = str_split($body);
@@ -362,95 +362,95 @@  discard block
 block discarded – undo
362 362
 			if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code];
363 363
 			if ($symbol_code != '_') {
364 364
 			}
365
-		    //$body_parse = substr($body_parse,1);
366
-		    //$body_parse = trim($body_parse);
367
-		    //$body_parse_len = strlen($body_parse);
368
-		    if ($body_parse_len >= 7) {
365
+			//$body_parse = substr($body_parse,1);
366
+			//$body_parse = trim($body_parse);
367
+			//$body_parse_len = strlen($body_parse);
368
+			if ($body_parse_len >= 7) {
369 369
 			
370
-		        if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
371
-		    	    $course = substr($body_parse,0,3);
372
-		    	    $tmp_s = intval($course);
373
-		    	    if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course);
374
-		    	    $speed = substr($body_parse,4,3);
375
-		    	    if ($speed != '...') {
376
-		    		//$result['speed'] = round($speed*1.852);
377
-		    		$result['speed'] = intval($speed);
378
-		    	    }
379
-		    	    $body_parse = substr($body_parse,7);
380
-		        }
381
-		        // Check PHGR, PHG, RNG
382
-		    } 
383
-		    /*
370
+				if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
371
+					$course = substr($body_parse,0,3);
372
+					$tmp_s = intval($course);
373
+					if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course);
374
+					$speed = substr($body_parse,4,3);
375
+					if ($speed != '...') {
376
+					//$result['speed'] = round($speed*1.852);
377
+					$result['speed'] = intval($speed);
378
+					}
379
+					$body_parse = substr($body_parse,7);
380
+				}
381
+				// Check PHGR, PHG, RNG
382
+			} 
383
+			/*
384 384
 		    else if ($body_parse_len > 0) {
385 385
 			$rest = $body_parse;
386 386
 		    }
387 387
 		    */
388
-		    if (strlen($body_parse) > 0) {
389
-		        if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) {
390
-		            $altitude = intval($matches[1]);
391
-		            //$result['altitude'] = round($altitude*0.3048);
392
-		            $result['altitude'] = $altitude;
393
-		            //$body_parse = trim(substr($body_parse,strlen($matches[0])));
394
-		            $body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/','',$body_parse));
395
-		        }
396
-		    }
388
+			if (strlen($body_parse) > 0) {
389
+				if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) {
390
+					$altitude = intval($matches[1]);
391
+					//$result['altitude'] = round($altitude*0.3048);
392
+					$result['altitude'] = $altitude;
393
+					//$body_parse = trim(substr($body_parse,strlen($matches[0])));
394
+					$body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/','',$body_parse));
395
+				}
396
+			}
397 397
 		    
398
-		    // Telemetry
399
-		    /*
398
+			// Telemetry
399
+			/*
400 400
 		    if (preg_match('/^([0-9]+),(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,([01]{0,8})/',$body_parse,$matches)) {
401 401
 		        // Nothing yet...
402 402
 		    }
403 403
 		    */
404
-		    // DAO
404
+			// DAO
405 405
 		    
406
-		    if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) {
406
+			if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) {
407 407
 			    
408
-			    $dao = $matches[1];
409
-			    if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) {
408
+				$dao = $matches[1];
409
+				if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) {
410 410
 				$dao_split = str_split($dao);
411
-			        $lat_off = (($dao_split[1])-48.0)*0.001/60.0;
412
-			        $lon_off = (($dao_split[2])-48.0)*0.001/60.0;
411
+					$lat_off = (($dao_split[1])-48.0)*0.001/60.0;
412
+					$lon_off = (($dao_split[2])-48.0)*0.001/60.0;
413 413
 			    
414 414
 				if ($result['latitude'] < 0) $result['latitude'] -= $lat_off;
415 415
 				else $result['latitude'] += $lat_off;
416 416
 				if ($result['longitude'] < 0) $result['longitude'] -= $lon_off;
417 417
 				else $result['longitude'] += $lon_off;
418
-			    }
418
+				}
419 419
 			    
420
-		            $body_parse = substr($body_parse,6);
421
-		    }
420
+					$body_parse = substr($body_parse,6);
421
+			}
422 422
 		    
423
-		    if (preg_match('/CS=([0-9A-Z_]*)/',$body_parse,$matches)) {
423
+			if (preg_match('/CS=([0-9A-Z_]*)/',$body_parse,$matches)) {
424 424
 			$result['ident'] = str_replace('_',' ',$matches[1]);
425
-		    }
426
-		    if (preg_match('/SQ=([0-9]{4})/',$body_parse,$matches)) {
425
+			}
426
+			if (preg_match('/SQ=([0-9]{4})/',$body_parse,$matches)) {
427 427
 			$result['squawk'] = $matches[1];
428
-		    }
429
-		    if (preg_match('/AI=([0-9A-Z]{4})/',$body_parse,$matches)) {
428
+			}
429
+			if (preg_match('/AI=([0-9A-Z]{4})/',$body_parse,$matches)) {
430 430
 			$result['aircraft_icao'] = $matches[1];
431
-		    }
432
-		    if (preg_match('/VR=([0-9]*)/',$body_parse,$matches)) {
431
+			}
432
+			if (preg_match('/VR=([0-9]*)/',$body_parse,$matches)) {
433 433
 			$result['verticalrate'] = $matches[1];
434
-		    }
435
-		    if (preg_match('/TI=([0-9]*)/',$body_parse,$matches)) {
434
+			}
435
+			if (preg_match('/TI=([0-9]*)/',$body_parse,$matches)) {
436 436
 			$result['typeid'] = $matches[1];
437
-		    }
438
-		    if (preg_match('/SI=([0-9]*)/',$body_parse,$matches)) {
437
+			}
438
+			if (preg_match('/SI=([0-9]*)/',$body_parse,$matches)) {
439 439
 			$result['statusid'] = $matches[1];
440
-		    }
441
-		    if (preg_match('/IMO=([0-9]{7})/',$body_parse,$matches)) {
440
+			}
441
+			if (preg_match('/IMO=([0-9]{7})/',$body_parse,$matches)) {
442 442
 			$result['imo'] = $matches[1];
443
-		    }
444
-		    if (preg_match('/AD=([0-9]*)/',$body_parse,$matches)) {
443
+			}
444
+			if (preg_match('/AD=([0-9]*)/',$body_parse,$matches)) {
445 445
 			$result['arrival_date'] = $matches[1];
446
-		    }
447
-		    if (preg_match('/AC=([0-9A-Z_]*)/',$body_parse,$matches)) {
446
+			}
447
+			if (preg_match('/AC=([0-9A-Z_]*)/',$body_parse,$matches)) {
448 448
 			$result['arrival_code'] = str_replace('_',' ',$matches[1]);
449
-		    }
450
-		    // OGN comment
449
+			}
450
+			// OGN comment
451 451
 		   // echo "Before OGN : ".$body_parse."\n";
452
-		    //if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) {
453
-		    if (preg_match('/^id([0-9A-F]{8})/',$body_parse,$matches)) {
452
+			//if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) {
453
+			if (preg_match('/^id([0-9A-F]{8})/',$body_parse,$matches)) {
454 454
 			$id = $matches[1];
455 455
 			//$mode = substr($id,0,2);
456 456
 			$address = substr($id,2);
@@ -480,42 +480,42 @@  discard block
 block discarded – undo
480 480
 			$stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0;
481 481
 			$result['stealth'] = $stealth;
482 482
 			$result['address'] = $address;
483
-		    }
483
+			}
484 484
 		    
485
-		    //Comment
486
-		    $result['comment'] = trim($body_parse);
485
+			//Comment
486
+			$result['comment'] = trim($body_parse);
487 487
 		//} else {
488
-		    // parse weather
489
-		    //$body_parse = substr($body_parse,1);
490
-		    //$body_parse_len = strlen($body_parse);
491
-		    //echo 'weather'."\n";
492
-		    if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
493
-			    $result['wind_dir'] = intval($matches[1]);
494
-			    $result['wind_speed'] = round(intval($matches[2])*1.60934,1);
495
-			    $result['wind_gust'] = round(intval($matches[3])*1.60934,1);
496
-			    $result['temp'] = round(5/9*((intval($matches[4]))-32),1);
497
-		    	    $body_parse = substr($body_parse,strlen($matches[0])+1);
498
-		    } elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
488
+			// parse weather
489
+			//$body_parse = substr($body_parse,1);
490
+			//$body_parse_len = strlen($body_parse);
491
+			//echo 'weather'."\n";
492
+			if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
493
+				$result['wind_dir'] = intval($matches[1]);
494
+				$result['wind_speed'] = round(intval($matches[2])*1.60934,1);
495
+				$result['wind_gust'] = round(intval($matches[3])*1.60934,1);
496
+				$result['temp'] = round(5/9*((intval($matches[4]))-32),1);
497
+					$body_parse = substr($body_parse,strlen($matches[0])+1);
498
+			} elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
499 499
 			$result['wind_dir'] = intval($matches[1]);
500 500
 			$result['wind_speed'] = round($matches[2]*1.60934,1);
501 501
 			$result['wind_gust'] = round($matches[3]*1.60934,1);
502 502
 			$result['temp'] = round(5/9*(($matches[4])-32),1);
503
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
504
-		    } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
503
+				$body_parse = substr($body_parse,strlen($matches[0])+1);
504
+			} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
505 505
 			$result['wind_dir'] = intval($matches[1]);
506 506
 			$result['wind_speed'] = round($matches[2]*1.60934,1);
507 507
 			$result['wind_gust'] = round($matches[3]*1.60934,1);
508
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
509
-		    } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) {
508
+				$body_parse = substr($body_parse,strlen($matches[0])+1);
509
+			} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) {
510 510
 			$result['wind_dir'] = intval($matches[1]);
511 511
 			$result['wind_speed'] = round($matches[2]*1.60934,1);
512 512
 			$result['wind_gust'] = round($matches[3]*1.60934,1);
513
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
514
-		    }
515
-		    //if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) {
516
-		    //g012t088r000p000P000h38b10110
517
-		    //g011t086r000p000P000h29b10198
518
-		    if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) {
513
+				$body_parse = substr($body_parse,strlen($matches[0])+1);
514
+			}
515
+			//if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) {
516
+			//g012t088r000p000P000h38b10110
517
+			//g011t086r000p000P000h29b10198
518
+			if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) {
519 519
 			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
520 520
 			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
521 521
 			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
@@ -523,8 +523,8 @@  discard block
 block discarded – undo
523 523
 			if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
524 524
 			if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
525 525
 			if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1);
526
-		        $body_parse = substr($body_parse,strlen($matches[0]));
527
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})P([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) {
526
+				$body_parse = substr($body_parse,strlen($matches[0]));
527
+			} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})P([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) {
528 528
 			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
529 529
 			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
530 530
 			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
@@ -532,8 +532,8 @@  discard block
 block discarded – undo
532 532
 			if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
533 533
 			if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
534 534
 			if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1);
535
-		        $body_parse = substr($body_parse,strlen($matches[0]));
536
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
535
+				$body_parse = substr($body_parse,strlen($matches[0]));
536
+			} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
537 537
 			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
538 538
 			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
539 539
 			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
@@ -541,58 +541,58 @@  discard block
 block discarded – undo
541 541
 			if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
542 542
 			if ($matches[7] != '...') $result['humidity'] = intval($matches[7]);
543 543
 			if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1);
544
-		        $body_parse = substr($body_parse,strlen($matches[0]));
545
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
544
+				$body_parse = substr($body_parse,strlen($matches[0]));
545
+			} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
546 546
 			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
547 547
 			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
548 548
 			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
549 549
 			if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
550 550
 			if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
551 551
 			if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
552
-		        $body_parse = substr($body_parse,strlen($matches[0]));
553
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
552
+				$body_parse = substr($body_parse,strlen($matches[0]));
553
+			} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
554 554
 			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
555 555
 			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
556 556
 			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
557 557
 			if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
558 558
 			if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
559 559
 			if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
560
-		        $body_parse = substr($body_parse,strlen($matches[0]));
561
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
560
+				$body_parse = substr($body_parse,strlen($matches[0]));
561
+			} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
562 562
 			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
563 563
 			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
564 564
 			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
565 565
 			if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
566 566
 			if ($matches[5] != '...') $result['humidity'] = intval($matches[5]);
567 567
 			if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1);
568
-		        $body_parse = substr($body_parse,strlen($matches[0]));
569
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
568
+				$body_parse = substr($body_parse,strlen($matches[0]));
569
+			} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
570 570
 			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
571 571
 			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
572 572
 			if ($matches[2] != '...') $result['humidity'] = intval($matches[3]);
573 573
 			if ($matches[4] != '...') $result['pressure'] = round((intval($matches[4])/10),1);
574
-		        $body_parse = substr($body_parse,strlen($matches[0]));
575
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{2,3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
574
+				$body_parse = substr($body_parse,strlen($matches[0]));
575
+			} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{2,3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
576 576
 			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
577 577
 			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
578 578
 			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
579 579
 			if ($matches[4] != '...') $result['humidity'] = intval($matches[4]);
580 580
 			if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
581
-		        $body_parse = substr($body_parse,strlen($matches[0]));
582
-		    }
583
-		    $result['comment'] = trim($body_parse);
581
+				$body_parse = substr($body_parse,strlen($matches[0]));
582
+			}
583
+			$result['comment'] = trim($body_parse);
584 584
 		}
585 585
 		} else $result['comment'] = trim($body_parse);
586 586
 
587
-	    }
587
+		}
588 588
 	//}
589 589
 	if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4);
590 590
 	if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4);
591 591
 	if ($debug) print_r($result);
592 592
 	return $result;
593
-    }
593
+	}
594 594
     
595
-    public function connect() {
595
+	public function connect() {
596 596
 	global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass,$globalName, $globalServerAPRShost, $globalServerAPRSport;
597 597
 	$aprs_connect = 0;
598 598
 	$aprs_keep = 120;
@@ -616,24 +616,24 @@  discard block
 block discarded – undo
616 616
 		socket_set_option($this->socket,SOL_SOCKET,SO_KEEPALIVE,1);
617 617
 		while ($msgin = socket_read($this->socket, 1000,PHP_NORMAL_READ)) {
618 618
 			if (strpos($msgin, "$aprs_ssid verified") !== FALSE) {
619
-			    echo 'APRS user verified !'."\n";
620
-			    $this->connected = true;
621
-			    return true;
622
-			    break;
619
+				echo 'APRS user verified !'."\n";
620
+				$this->connected = true;
621
+				return true;
622
+				break;
623 623
 			}
624 624
 			if (time()-$authstart > 5) {
625
-			    echo 'APRS timeout'."\n";
626
-			    break;
625
+				echo 'APRS timeout'."\n";
626
+				break;
627 627
 			}
628 628
 		}
629 629
 	}
630
-    }
630
+	}
631 631
 
632
-    public function disconnect() {
632
+	public function disconnect() {
633 633
 	socket_close($this->socket);
634
-    }
634
+	}
635 635
     
636
-    public function send($data) {
636
+	public function send($data) {
637 637
 	global $globalDebug;
638 638
 	if ($this->connected === false) $this->connect();
639 639
 	$send = socket_send( $this->socket  , $data , strlen($data),0);
@@ -642,7 +642,7 @@  discard block
 block discarded – undo
642 642
 		socket_close($this->socket);
643 643
 		$this->connect();
644 644
 	}
645
-    }
645
+	}
646 646
 }
647 647
 
648 648
 class APRSSpotter extends APRS {
Please login to merge, or discard this patch.