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