Completed
Push — master ( 04cc20...60bf6d )
by Yannick
08:30
created
scripts/daemon-spotter.php 1 patch
Indentation   +859 added lines, -859 removed lines patch added patch discarded remove patch
@@ -15,8 +15,8 @@  discard block
 block discarded – undo
15 15
 require_once(dirname(__FILE__).'/../require/class.Common.php');
16 16
 if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
17 17
 if (isset($globalMarine) && $globalMarine) {
18
-    require_once(dirname(__FILE__).'/../require/class.AIS.php');
19
-    require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
18
+	require_once(dirname(__FILE__).'/../require/class.AIS.php');
19
+	require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
20 20
 }
21 21
 
22 22
 if (!isset($globalDebug)) $globalDebug = FALSE;
@@ -24,48 +24,48 @@  discard block
 block discarded – undo
24 24
 // Check if schema is at latest version
25 25
 $Connection = new Connection();
26 26
 if ($Connection->latest() === false) {
27
-    echo "You MUST update to latest schema. Run install/index.php";
28
-    exit();
27
+	echo "You MUST update to latest schema. Run install/index.php";
28
+	exit();
29 29
 }
30 30
 if (PHP_SAPI != 'cli') {
31
-    echo "This script MUST be called from console, not a web browser.";
31
+	echo "This script MUST be called from console, not a web browser.";
32 32
 //    exit();
33 33
 }
34 34
 
35 35
 // This is to be compatible with old version of settings.php
36 36
 if (!isset($globalSources)) {
37
-    if (isset($globalSBS1Hosts)) {
38
-        //$hosts = $globalSBS1Hosts;
39
-        foreach ($globalSBS1Hosts as $host) {
40
-	    $globalSources[] = array('host' => $host);
41
-    	}
42
-    } else {
43
-        if (!isset($globalSBS1Host)) {
44
-	    echo '$globalSources MUST be defined !';
45
-	    die;
37
+	if (isset($globalSBS1Hosts)) {
38
+		//$hosts = $globalSBS1Hosts;
39
+		foreach ($globalSBS1Hosts as $host) {
40
+		$globalSources[] = array('host' => $host);
41
+		}
42
+	} else {
43
+		if (!isset($globalSBS1Host)) {
44
+		echo '$globalSources MUST be defined !';
45
+		die;
46 46
 	}
47 47
 	//$hosts = array($globalSBS1Host.':'.$globalSBS1Port);
48 48
 	$globalSources[] = array('host' => $globalSBS1Host,'port' => $globalSBS1Port);
49
-    }
49
+	}
50 50
 }
51 51
 
52 52
 $options = getopt('s::',array('source::','server','nodaemon','idsource::'));
53 53
 //if (isset($options['s'])) $hosts = array($options['s']);
54 54
 //elseif (isset($options['source'])) $hosts = array($options['source']);
55 55
 if (isset($options['s'])) {
56
-    $globalSources = array();
57
-    $globalSources[] = array('host' => $options['s']);
56
+	$globalSources = array();
57
+	$globalSources[] = array('host' => $options['s']);
58 58
 } elseif (isset($options['source'])) {
59
-    $globalSources = array();
60
-    $globalSources[] = array('host' => $options['source']);
59
+	$globalSources = array();
60
+	$globalSources[] = array('host' => $options['source']);
61 61
 }
62 62
 if (isset($options['nodaemon'])) $globalDaemon = FALSE;
63 63
 if (isset($options['server'])) $globalServer = TRUE;
64 64
 if (isset($options['idsource'])) $id_source = $options['idsource'];
65 65
 else $id_source = 1;
66 66
 if (isset($globalServer) && $globalServer) {
67
-    if ($globalDebug) echo "Using Server Mode\n";
68
-    $SI=new SpotterServer();
67
+	if ($globalDebug) echo "Using Server Mode\n";
68
+	$SI=new SpotterServer();
69 69
 /*
70 70
     require_once(dirname(__FILE__).'/../require/class.APRS.php');
71 71
     $SI = new adsb2aprs();
@@ -74,8 +74,8 @@  discard block
 block discarded – undo
74 74
 } else $SI=new SpotterImport($Connection->db);
75 75
 if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db);
76 76
 if (isset($globalMarine) && $globalMarine) {
77
-    $AIS = new AIS();
78
-    $MI = new MarineImport($Connection->db);
77
+	$AIS = new AIS();
78
+	$MI = new MarineImport($Connection->db);
79 79
 }
80 80
 //$APRS=new APRS($Connection->db);
81 81
 $SBS=new SBS();
@@ -85,12 +85,12 @@  discard block
 block discarded – undo
85 85
 //$servertz = system('date +%Z');
86 86
 // signal handler - playing nice with sockets and dump1090
87 87
 if (function_exists('pcntl_fork')) {
88
-    pcntl_signal(SIGINT,  function() {
89
-        global $sockets;
90
-        echo "\n\nctrl-c or kill signal received. Tidying up ... ";
91
-        die("Bye!\n");
92
-    });
93
-    pcntl_signal_dispatch();
88
+	pcntl_signal(SIGINT,  function() {
89
+		global $sockets;
90
+		echo "\n\nctrl-c or kill signal received. Tidying up ... ";
91
+		die("Bye!\n");
92
+	});
93
+	pcntl_signal_dispatch();
94 94
 }
95 95
 
96 96
 // let's try and connect
@@ -100,153 +100,153 @@  discard block
 block discarded – undo
100 100
 $reset = 0;
101 101
 
102 102
 function connect_all($hosts) {
103
-    //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
104
-    global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;
105
-    $reset++;
106
-    if ($globalDebug) echo 'Connect to all...'."\n";
107
-    foreach ($hosts as $id => $value) {
103
+	//global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
104
+	global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;
105
+	$reset++;
106
+	if ($globalDebug) echo 'Connect to all...'."\n";
107
+	foreach ($hosts as $id => $value) {
108 108
 	$host = $value['host'];
109 109
 	$globalSources[$id]['last_exec'] = 0;
110 110
 	// Here we check type of source(s)
111 111
 	if (filter_var($host,FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) {
112
-            if (preg_match('/deltadb.txt$/i',$host)) {
113
-        	//$formats[$id] = 'deltadbtxt';
114
-        	$globalSources[$id]['format'] = 'deltadbtxt';
115
-        	//$last_exec['deltadbtxt'] = 0;
116
-        	if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
117
-            } else if (preg_match('/vatsim-data.txt$/i',$host)) {
118
-        	//$formats[$id] = 'vatsimtxt';
119
-        	$globalSources[$id]['format'] = 'vatsimtxt';
120
-        	//$last_exec['vatsimtxt'] = 0;
121
-        	if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
122
-    	    } else if (preg_match('/aircraftlist.json$/i',$host)) {
123
-        	//$formats[$id] = 'aircraftlistjson';
124
-        	$globalSources[$id]['format'] = 'aircraftlistjson';
125
-        	//$last_exec['aircraftlistjson'] = 0;
126
-        	if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
127
-    	    } else if (preg_match('/opensky/i',$host)) {
128
-        	//$formats[$id] = 'aircraftlistjson';
129
-        	$globalSources[$id]['format'] = 'opensky';
130
-        	//$last_exec['aircraftlistjson'] = 0;
131
-        	if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
132
-    	    } else if (preg_match('/radarvirtuel.com\/file.json$/i',$host)) {
133
-        	//$formats[$id] = 'radarvirtueljson';
134
-        	$globalSources[$id]['format'] = 'radarvirtueljson';
135
-        	//$last_exec['radarvirtueljson'] = 0;
136
-        	if ($globalDebug) echo "Connect to radarvirtuel.com/file.json source (".$host.")...\n";
137
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
138
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
139
-        	    exit(0);
140
-        	}
141
-    	    } else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
142
-        	//$formats[$id] = 'planeupdatefaa';
143
-        	$globalSources[$id]['format'] = 'planeupdatefaa';
144
-        	//$last_exec['planeupdatefaa'] = 0;
145
-        	if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
146
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
147
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
148
-        	    exit(0);
149
-        	}
150
-            } else if (preg_match('/\/action.php\/acars\/data$/i',$host)) {
151
-        	//$formats[$id] = 'phpvmacars';
152
-        	$globalSources[$id]['format'] = 'phpvmacars';
153
-        	//$last_exec['phpvmacars'] = 0;
154
-        	if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
155
-            } else if (preg_match('/VAM-json.php$/i',$host)) {
156
-        	//$formats[$id] = 'phpvmacars';
157
-        	$globalSources[$id]['format'] = 'vam';
158
-        	if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
159
-            } else if (preg_match('/whazzup/i',$host)) {
160
-        	//$formats[$id] = 'whazzup';
161
-        	$globalSources[$id]['format'] = 'whazzup';
162
-        	//$last_exec['whazzup'] = 0;
163
-        	if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
164
-            } else if (preg_match('/recentpireps/i',$host)) {
165
-        	//$formats[$id] = 'pirepsjson';
166
-        	$globalSources[$id]['format'] = 'pirepsjson';
167
-        	//$last_exec['pirepsjson'] = 0;
168
-        	if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
169
-            } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
170
-        	//$formats[$id] = 'fr24json';
171
-        	$globalSources[$id]['format'] = 'fr24json';
172
-        	//$last_exec['fr24json'] = 0;
173
-        	if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n";
174
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
175
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
176
-        	    exit(0);
177
-        	}
178
-            } else if (preg_match(':myshiptracking.com/:i',$host)) {
179
-        	//$formats[$id] = 'fr24json';
180
-        	$globalSources[$id]['format'] = 'myshiptracking';
181
-        	//$last_exec['fr24json'] = 0;
182
-        	if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n";
183
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
184
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
185
-        	    exit(0);
186
-        	}
187
-            //} else if (preg_match('/10001/',$host)) {
188
-            } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
189
-        	//$formats[$id] = 'tsv';
190
-        	$globalSources[$id]['format'] = 'tsv';
191
-        	if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
192
-            }
193
-        } elseif (filter_var($host,FILTER_VALIDATE_URL)) {
194
-    		if ($globalSources[$id]['format'] == 'aisnmeahttp') {
195
-    		    $idf = fopen($globalSources[$id]['host'],'r',false,$context);
196
-    		    if ($idf !== false) {
197
-    			$httpfeeds[$id] = $idf;
198
-        		if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
199
-    		    }
200
-    		    elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
201
-    		} elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
202
-        } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
203
-	    $hostport = explode(':',$host);
204
-	    if (isset($hostport[1])) {
112
+			if (preg_match('/deltadb.txt$/i',$host)) {
113
+			//$formats[$id] = 'deltadbtxt';
114
+			$globalSources[$id]['format'] = 'deltadbtxt';
115
+			//$last_exec['deltadbtxt'] = 0;
116
+			if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
117
+			} else if (preg_match('/vatsim-data.txt$/i',$host)) {
118
+			//$formats[$id] = 'vatsimtxt';
119
+			$globalSources[$id]['format'] = 'vatsimtxt';
120
+			//$last_exec['vatsimtxt'] = 0;
121
+			if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
122
+			} else if (preg_match('/aircraftlist.json$/i',$host)) {
123
+			//$formats[$id] = 'aircraftlistjson';
124
+			$globalSources[$id]['format'] = 'aircraftlistjson';
125
+			//$last_exec['aircraftlistjson'] = 0;
126
+			if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
127
+			} else if (preg_match('/opensky/i',$host)) {
128
+			//$formats[$id] = 'aircraftlistjson';
129
+			$globalSources[$id]['format'] = 'opensky';
130
+			//$last_exec['aircraftlistjson'] = 0;
131
+			if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
132
+			} else if (preg_match('/radarvirtuel.com\/file.json$/i',$host)) {
133
+			//$formats[$id] = 'radarvirtueljson';
134
+			$globalSources[$id]['format'] = 'radarvirtueljson';
135
+			//$last_exec['radarvirtueljson'] = 0;
136
+			if ($globalDebug) echo "Connect to radarvirtuel.com/file.json source (".$host.")...\n";
137
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
138
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
139
+				exit(0);
140
+			}
141
+			} else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
142
+			//$formats[$id] = 'planeupdatefaa';
143
+			$globalSources[$id]['format'] = 'planeupdatefaa';
144
+			//$last_exec['planeupdatefaa'] = 0;
145
+			if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
146
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
147
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
148
+				exit(0);
149
+			}
150
+			} else if (preg_match('/\/action.php\/acars\/data$/i',$host)) {
151
+			//$formats[$id] = 'phpvmacars';
152
+			$globalSources[$id]['format'] = 'phpvmacars';
153
+			//$last_exec['phpvmacars'] = 0;
154
+			if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
155
+			} else if (preg_match('/VAM-json.php$/i',$host)) {
156
+			//$formats[$id] = 'phpvmacars';
157
+			$globalSources[$id]['format'] = 'vam';
158
+			if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
159
+			} else if (preg_match('/whazzup/i',$host)) {
160
+			//$formats[$id] = 'whazzup';
161
+			$globalSources[$id]['format'] = 'whazzup';
162
+			//$last_exec['whazzup'] = 0;
163
+			if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
164
+			} else if (preg_match('/recentpireps/i',$host)) {
165
+			//$formats[$id] = 'pirepsjson';
166
+			$globalSources[$id]['format'] = 'pirepsjson';
167
+			//$last_exec['pirepsjson'] = 0;
168
+			if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
169
+			} else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
170
+			//$formats[$id] = 'fr24json';
171
+			$globalSources[$id]['format'] = 'fr24json';
172
+			//$last_exec['fr24json'] = 0;
173
+			if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n";
174
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
175
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
176
+				exit(0);
177
+			}
178
+			} else if (preg_match(':myshiptracking.com/:i',$host)) {
179
+			//$formats[$id] = 'fr24json';
180
+			$globalSources[$id]['format'] = 'myshiptracking';
181
+			//$last_exec['fr24json'] = 0;
182
+			if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n";
183
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
184
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
185
+				exit(0);
186
+			}
187
+			//} else if (preg_match('/10001/',$host)) {
188
+			} else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
189
+			//$formats[$id] = 'tsv';
190
+			$globalSources[$id]['format'] = 'tsv';
191
+			if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
192
+			}
193
+		} elseif (filter_var($host,FILTER_VALIDATE_URL)) {
194
+			if ($globalSources[$id]['format'] == 'aisnmeahttp') {
195
+				$idf = fopen($globalSources[$id]['host'],'r',false,$context);
196
+				if ($idf !== false) {
197
+				$httpfeeds[$id] = $idf;
198
+				if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
199
+				}
200
+				elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
201
+			} elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
202
+		} elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
203
+		$hostport = explode(':',$host);
204
+		if (isset($hostport[1])) {
205 205
 		$port = $hostport[1];
206 206
 		$hostn = $hostport[0];
207
-	    } else {
207
+		} else {
208 208
 		$port = $globalSources[$id]['port'];
209 209
 		$hostn = $globalSources[$id]['host'];
210
-	    }
211
-	    $Common = new Common();
212
-	    if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
213
-        	$s = $Common->create_socket($hostn,$port, $errno, $errstr);
214
-    	    } else {
215
-        	$s = $Common->create_socket_udp($hostn,$port, $errno, $errstr);
216
-	    }
217
-	    if ($s) {
218
-    	        $sockets[$id] = $s;
219
-    	        if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
220
-		    if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') {
210
+		}
211
+		$Common = new Common();
212
+		if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
213
+			$s = $Common->create_socket($hostn,$port, $errno, $errstr);
214
+			} else {
215
+			$s = $Common->create_socket_udp($hostn,$port, $errno, $errstr);
216
+		}
217
+		if ($s) {
218
+				$sockets[$id] = $s;
219
+				if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
220
+			if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') {
221 221
 			//$formats[$id] = 'aprs';
222 222
 			$globalSources[$id]['format'] = 'aprs';
223 223
 			//$aprs_connect = 0;
224 224
 			//$use_aprs = true;
225
-		    } elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
225
+			} elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
226 226
 			$globalSources[$id]['format'] = 'vrstcp';
227
-    		    } elseif ($port == '10001') {
228
-        		//$formats[$id] = 'tsv';
229
-        		$globalSources[$id]['format'] = 'tsv';
230
-		    } elseif ($port == '30002') {
231
-        		//$formats[$id] = 'raw';
232
-        		$globalSources[$id]['format'] = 'raw';
233
-		    } elseif ($port == '5001') {
234
-        		//$formats[$id] = 'raw';
235
-        		$globalSources[$id]['format'] = 'flightgearmp';
236
-		    } elseif ($port == '30005') {
227
+				} elseif ($port == '10001') {
228
+				//$formats[$id] = 'tsv';
229
+				$globalSources[$id]['format'] = 'tsv';
230
+			} elseif ($port == '30002') {
231
+				//$formats[$id] = 'raw';
232
+				$globalSources[$id]['format'] = 'raw';
233
+			} elseif ($port == '5001') {
234
+				//$formats[$id] = 'raw';
235
+				$globalSources[$id]['format'] = 'flightgearmp';
236
+			} elseif ($port == '30005') {
237 237
 			// Not yet supported
238
-        		//$formats[$id] = 'beast';
239
-        		$globalSources[$id]['format'] = 'beast';
240
-		    //} else $formats[$id] = 'sbs';
241
-		    } else $globalSources[$id]['format'] = 'sbs';
242
-		    //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
238
+				//$formats[$id] = 'beast';
239
+				$globalSources[$id]['format'] = 'beast';
240
+			//} else $formats[$id] = 'sbs';
241
+			} else $globalSources[$id]['format'] = 'sbs';
242
+			//if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
243 243
 		}
244 244
 		if ($globalDebug) echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
245
-            } else {
245
+			} else {
246 246
 		if ($globalDebug) echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";
247
-    	    }
248
-        }
249
-    }
247
+			}
248
+		}
249
+	}
250 250
 }
251 251
 if (!isset($globalMinFetch)) $globalMinFetch = 15;
252 252
 
@@ -269,9 +269,9 @@  discard block
 block discarded – undo
269 269
 //connect_all($globalSources);
270 270
 
271 271
 if (isset($globalProxy) && $globalProxy) {
272
-    $context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true)));
272
+	$context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true)));
273 273
 } else {
274
-    $context = stream_context_create(array('http' => array('timeout' => $timeout)));
274
+	$context = stream_context_create(array('http' => array('timeout' => $timeout)));
275 275
 }
276 276
 
277 277
 // APRS Configuration
@@ -280,18 +280,18 @@  discard block
 block discarded – undo
280 280
 	die;
281 281
 }
282 282
 foreach ($globalSources as $key => $source) {
283
-    if (!isset($source['format'])) {
284
-        $globalSources[$key]['format'] = 'auto';
285
-    }
283
+	if (!isset($source['format'])) {
284
+		$globalSources[$key]['format'] = 'auto';
285
+	}
286 286
 }
287 287
 connect_all($globalSources);
288 288
 foreach ($globalSources as $key => $source) {
289
-    if (isset($source['format']) && $source['format'] == 'aprs') {
289
+	if (isset($source['format']) && $source['format'] == 'aprs') {
290 290
 	$aprs_connect = 0;
291 291
 	$use_aprs = true;
292 292
 	if (isset($source['port']) && $source['port'] == '10152') $aprs_full = true;
293 293
 	break;
294
-    }
294
+	}
295 295
 }
296 296
 
297 297
 if ($use_aprs) {
@@ -333,152 +333,152 @@  discard block
 block discarded – undo
333 333
 
334 334
 // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time.
335 335
 while ($i > 0) {
336
-    if (!$globalDaemon) $i = $endtime-time();
337
-    // Delete old ATC
338
-    if ($globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
336
+	if (!$globalDaemon) $i = $endtime-time();
337
+	// Delete old ATC
338
+	if ($globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
339 339
 	if ($globalDebug) echo 'Delete old ATC...'."\n";
340
-        $ATC->deleteOldATC();
341
-    }
340
+		$ATC->deleteOldATC();
341
+	}
342 342
     
343
-    //if (count($last_exec) > 0) {
344
-    if (count($last_exec) == count($globalSources)) {
343
+	//if (count($last_exec) > 0) {
344
+	if (count($last_exec) == count($globalSources)) {
345 345
 	$max = $globalMinFetch;
346 346
 	foreach ($last_exec as $last) {
347
-	    if ((time() - $last['last']) < $max) $max = time() - $last['last'];
347
+		if ((time() - $last['last']) < $max) $max = time() - $last['last'];
348 348
 	}
349 349
 	if ($max != $globalMinFetch) {
350
-	    if ($globalDebug) echo 'Sleeping...'."\n";
351
-	    sleep($globalMinFetch-$max+2);
350
+		if ($globalDebug) echo 'Sleeping...'."\n";
351
+		sleep($globalMinFetch-$max+2);
352
+	}
352 353
 	}
353
-    }
354 354
 
355 355
     
356
-    //foreach ($formats as $id => $value) {
357
-    foreach ($globalSources as $id => $value) {
356
+	//foreach ($formats as $id => $value) {
357
+	foreach ($globalSources as $id => $value) {
358 358
 	date_default_timezone_set('UTC');
359 359
 	if (!isset($last_exec[$id]['last'])) $last_exec[$id]['last'] = 0;
360 360
 	if ($value['format'] == 'deltadbtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
361
-	    //$buffer = $Common->getData($hosts[$id]);
362
-	    $buffer = $Common->getData($value['host']);
363
-	    if ($buffer != '') $reset = 0;
364
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
365
-	    $buffer = explode('\n',$buffer);
366
-	    foreach ($buffer as $line) {
367
-    		if ($line != '' && count($line) > 7) {
368
-    		    $line = explode(',', $line);
369
-	            $data = array();
370
-	            $data['hex'] = $line[1]; // hex
371
-	            $data['ident'] = $line[2]; // ident
372
-	            if (isset($line[3])) $data['altitude'] = $line[3]; // altitude
373
-	            if (isset($line[4])) $data['speed'] = $line[4]; // speed
374
-	            if (isset($line[5])) $data['heading'] = $line[5]; // heading
375
-	            if (isset($line[6])) $data['latitude'] = $line[6]; // lat
376
-	            if (isset($line[7])) $data['longitude'] = $line[7]; // long
377
-	            $data['verticalrate'] = ''; // vertical rate
378
-	            //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk
379
-	            $data['emergency'] = ''; // emergency
380
-		    $data['datetime'] = date('Y-m-d H:i:s');
381
-		    $data['format_source'] = 'deltadbtxt';
382
-    		    $data['id_source'] = $id_source;
383
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
384
-		    if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
385
-    		    $SI->add($data);
386
-		    unset($data);
387
-    		}
388
-    	    }
389
-    	    $last_exec[$id]['last'] = time();
361
+		//$buffer = $Common->getData($hosts[$id]);
362
+		$buffer = $Common->getData($value['host']);
363
+		if ($buffer != '') $reset = 0;
364
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
365
+		$buffer = explode('\n',$buffer);
366
+		foreach ($buffer as $line) {
367
+			if ($line != '' && count($line) > 7) {
368
+				$line = explode(',', $line);
369
+				$data = array();
370
+				$data['hex'] = $line[1]; // hex
371
+				$data['ident'] = $line[2]; // ident
372
+				if (isset($line[3])) $data['altitude'] = $line[3]; // altitude
373
+				if (isset($line[4])) $data['speed'] = $line[4]; // speed
374
+				if (isset($line[5])) $data['heading'] = $line[5]; // heading
375
+				if (isset($line[6])) $data['latitude'] = $line[6]; // lat
376
+				if (isset($line[7])) $data['longitude'] = $line[7]; // long
377
+				$data['verticalrate'] = ''; // vertical rate
378
+				//if (isset($line[9])) $data['squawk'] = $line[9]; // squawk
379
+				$data['emergency'] = ''; // emergency
380
+			$data['datetime'] = date('Y-m-d H:i:s');
381
+			$data['format_source'] = 'deltadbtxt';
382
+				$data['id_source'] = $id_source;
383
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
384
+			if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
385
+				$SI->add($data);
386
+			unset($data);
387
+			}
388
+			}
389
+			$last_exec[$id]['last'] = time();
390 390
 	} elseif ($value['format'] == 'aisnmeatxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
391
-	    date_default_timezone_set('CET');
392
-	    $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
393
-	    date_default_timezone_set('UTC');
394
-	    if ($buffer != '') $reset = 0;
395
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
396
-	    $buffer = explode('\n',$buffer);
397
-	    foreach ($buffer as $line) {
391
+		date_default_timezone_set('CET');
392
+		$buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
393
+		date_default_timezone_set('UTC');
394
+		if ($buffer != '') $reset = 0;
395
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
396
+		$buffer = explode('\n',$buffer);
397
+		foreach ($buffer as $line) {
398 398
 		if ($line != '') {
399
-		    echo "'".$line."'\n";
400
-		    $add = false;
401
-		    $ais_data = $AIS->parse_line(trim($line));
402
-		    $data = array();
403
-		    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
404
-		    if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
405
-		    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
406
-		    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
407
-		    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
408
-		    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
409
-		    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
410
-		    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
411
-		    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
412
-		    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
413
-		    if (isset($ais_data['timestamp'])) {
399
+			echo "'".$line."'\n";
400
+			$add = false;
401
+			$ais_data = $AIS->parse_line(trim($line));
402
+			$data = array();
403
+			if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
404
+			if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
405
+			if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
406
+			if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
407
+			if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
408
+			if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
409
+			if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
410
+			if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
411
+			if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
412
+			if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
413
+			if (isset($ais_data['timestamp'])) {
414 414
 			$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
415 415
 			if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) {
416
-			    $last_exec[$id]['timestamp'] = $ais_data['timestamp'];
417
-			    $add = true;
416
+				$last_exec[$id]['timestamp'] = $ais_data['timestamp'];
417
+				$add = true;
418 418
 			}
419
-		    } else {
419
+			} else {
420 420
 			$data['datetime'] = date('Y-m-d H:i:s');
421 421
 			$add = true;
422
-		    }
423
-		    $data['format_source'] = 'aisnmeatxt';
424
-    		    $data['id_source'] = $id_source;
425
-		    print_r($data);
426
-		    echo 'Add...'."\n";
427
-		    if ($add && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
428
-		    unset($data);
422
+			}
423
+			$data['format_source'] = 'aisnmeatxt';
424
+				$data['id_source'] = $id_source;
425
+			print_r($data);
426
+			echo 'Add...'."\n";
427
+			if ($add && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
428
+			unset($data);
429 429
 		}
430
-    	    }
431
-    	    $last_exec[$id]['last'] = time();
430
+			}
431
+			$last_exec[$id]['last'] = time();
432 432
 	} elseif ($value['format'] == 'aisnmeahttp') {
433
-	    $arr = $httpfeeds;
434
-	    $w = $e = null;
433
+		$arr = $httpfeeds;
434
+		$w = $e = null;
435 435
 	    
436
-	    if (isset($arr[$id])) {
437
-	    $nn = stream_select($arr,$w,$e,$timeout);
438
-	    if ($nn > 0) {
436
+		if (isset($arr[$id])) {
437
+		$nn = stream_select($arr,$w,$e,$timeout);
438
+		if ($nn > 0) {
439 439
 		foreach ($httpfeeds as $feed) {
440
-		    $buffer = stream_get_line($feed,2000,"\n");
441
-		    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
442
-		    $buffer = explode('\n',$buffer);
443
-		    foreach ($buffer as $line) {
440
+			$buffer = stream_get_line($feed,2000,"\n");
441
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
442
+			$buffer = explode('\n',$buffer);
443
+			foreach ($buffer as $line) {
444 444
 			if ($line != '') {
445
-			    $ais_data = $AIS->parse_line(trim($line));
446
-			    $data = array();
447
-			    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
448
-			    if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
449
-			    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
450
-			    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
451
-			    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
452
-			    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
453
-			    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
454
-			    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
455
-			    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
456
-			    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
457
-			    if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
458
-			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
459
-			    if (isset($ais_data['timestamp'])) {
445
+				$ais_data = $AIS->parse_line(trim($line));
446
+				$data = array();
447
+				if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
448
+				if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
449
+				if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
450
+				if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
451
+				if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
452
+				if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
453
+				if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
454
+				if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
455
+				if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
456
+				if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
457
+				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
458
+				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
459
+				if (isset($ais_data['timestamp'])) {
460 460
 				$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
461
-			    } else {
461
+				} else {
462 462
 				$data['datetime'] = date('Y-m-d H:i:s');
463
-			    }
464
-			    $data['format_source'] = 'aisnmeahttp';
465
-			    $data['id_source'] = $id_source;
466
-			    if ($ais_data['mmsi_type'] == 'Ship') $MI->add($data);
467
-			    unset($data);
463
+				}
464
+				$data['format_source'] = 'aisnmeahttp';
465
+				$data['id_source'] = $id_source;
466
+				if ($ais_data['mmsi_type'] == 'Ship') $MI->add($data);
467
+				unset($data);
468 468
 			}
469
-		    }
469
+			}
470
+		}
470 471
 		}
471 472
 		}
472
-	    }
473 473
 	} elseif ($value['format'] == 'myshiptracking' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
474
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
475
-	    if ($buffer != '') {
474
+		$buffer = $Common->getData($value['host'],'get','','','','','20');
475
+		if ($buffer != '') {
476 476
 		//echo $buffer;
477 477
 		$all_data = json_decode($buffer,true);
478 478
 		//print_r($all_data);
479 479
 		if (isset($all_data[0]['DATA'])) {
480 480
 		foreach ($all_data[0]['DATA'] as $line) {
481
-		    if ($line != '') {
481
+			if ($line != '') {
482 482
 			$data = array();
483 483
 			$data['ident'] = $line['NAME'];
484 484
 			$data['mmsi'] = $line['MMSI'];
@@ -494,87 +494,87 @@  discard block
 block discarded – undo
494 494
 			$data['id_source'] = $id_source;
495 495
 			$MI->add($data);
496 496
 			unset($data);
497
-		    }
497
+			}
498 498
 		}
499 499
 		}
500 500
 		
501
-	    }
502
-    	    $last_exec[$id]['last'] = time();
501
+		}
502
+			$last_exec[$id]['last'] = time();
503 503
 	} elseif ($value['format'] == 'boatbeaconapp' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
504
-	    $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host']));
505
-	    if ($buffer != '') {
504
+		$buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host']));
505
+		if ($buffer != '') {
506 506
 		$all_data = json_decode($buffer,true);
507 507
 		if (isset($all_data[0]['mmsi'])) {
508
-		    foreach ($all_data as $line) {
508
+			foreach ($all_data as $line) {
509 509
 			if ($line != '') {
510
-			    $data = array();
511
-			    $data['ident'] = $line['shipname'];
512
-			    $data['callsign'] = $line['callsign'];
513
-			    $data['mmsi'] = $line['mmsi'];
514
-			    $data['speed'] = $line['sog'];
515
-			    if ($line['heading'] != '511') $data['heading'] = $line['heading'];
516
-			    $data['latitude'] = $line['latitude'];
517
-			    $data['longitude'] = $line['longitude'];
518
-			    $data['type_id'] = $line['shiptype'];
519
-			    $data['arrival_code'] = $line['destination'];
520
-			    $data['datetime'] = $line['time'];
521
-			    $data['format_source'] = 'boatbeaconapp';
522
-			    $data['id_source'] = $id_source;
523
-			    $MI->add($data);
524
-			    unset($data);
510
+				$data = array();
511
+				$data['ident'] = $line['shipname'];
512
+				$data['callsign'] = $line['callsign'];
513
+				$data['mmsi'] = $line['mmsi'];
514
+				$data['speed'] = $line['sog'];
515
+				if ($line['heading'] != '511') $data['heading'] = $line['heading'];
516
+				$data['latitude'] = $line['latitude'];
517
+				$data['longitude'] = $line['longitude'];
518
+				$data['type_id'] = $line['shiptype'];
519
+				$data['arrival_code'] = $line['destination'];
520
+				$data['datetime'] = $line['time'];
521
+				$data['format_source'] = 'boatbeaconapp';
522
+				$data['id_source'] = $id_source;
523
+				$MI->add($data);
524
+				unset($data);
525
+			}
525 526
 			}
526
-		    }
527 527
 		}
528 528
 		
529
-	    }
530
-    	    $last_exec[$id]['last'] = time();
529
+		}
530
+			$last_exec[$id]['last'] = time();
531 531
 	} elseif ($value['format'] == 'shipplotter' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
532
-	    echo 'download...';
533
-	    $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
534
-	    echo 'done !'."\n";
535
-	    if ($buffer != '') $reset = 0;
536
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
537
-	    $buffer = explode('\n',$buffer);
538
-	    foreach ($buffer as $line) {
532
+		echo 'download...';
533
+		$buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
534
+		echo 'done !'."\n";
535
+		if ($buffer != '') $reset = 0;
536
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
537
+		$buffer = explode('\n',$buffer);
538
+		foreach ($buffer as $line) {
539 539
 		if ($line != '') {
540
-		    $data = array();
541
-		    $data['mmsi'] = (int)substr($line,0,9);
542
-		    $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
543
-		    //$data['status'] = substr($line,21,2);
544
-		    //$data['type'] = substr($line,24,3);
545
-		    $data['latitude'] = substr($line,29,9);
546
-		    $data['longitude'] = substr($line,41,9);
547
-		    $data['speed'] = round(substr($line,51,5));
548
-		    //$data['course'] = substr($line,57,5);
549
-		    $data['heading'] = round(substr($line,63,3));
550
-		    //$data['draft'] = substr($line,67,4);
551
-		    //$data['length'] = substr($line,72,3);
552
-		    //$data['beam'] = substr($line,76,2);
553
-		    $data['ident'] = trim(utf8_encode(substr($line,79,20)));
554
-		    //$data['callsign'] = trim(substr($line,100,7);
555
-		    //$data['dest'] = substr($line,108,20);
556
-		    //$data['etaDate'] = substr($line,129,5);
557
-		    //$data['etaTime'] = substr($line,135,5);
558
-		    $data['format_source'] = 'shipplotter';
559
-    		    $data['id_source'] = $id_source;
560
-		    print_r($data);
561
-		    echo 'Add...'."\n";
562
-		    $MI->add($data);
563
-		    unset($data);
540
+			$data = array();
541
+			$data['mmsi'] = (int)substr($line,0,9);
542
+			$data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
543
+			//$data['status'] = substr($line,21,2);
544
+			//$data['type'] = substr($line,24,3);
545
+			$data['latitude'] = substr($line,29,9);
546
+			$data['longitude'] = substr($line,41,9);
547
+			$data['speed'] = round(substr($line,51,5));
548
+			//$data['course'] = substr($line,57,5);
549
+			$data['heading'] = round(substr($line,63,3));
550
+			//$data['draft'] = substr($line,67,4);
551
+			//$data['length'] = substr($line,72,3);
552
+			//$data['beam'] = substr($line,76,2);
553
+			$data['ident'] = trim(utf8_encode(substr($line,79,20)));
554
+			//$data['callsign'] = trim(substr($line,100,7);
555
+			//$data['dest'] = substr($line,108,20);
556
+			//$data['etaDate'] = substr($line,129,5);
557
+			//$data['etaTime'] = substr($line,135,5);
558
+			$data['format_source'] = 'shipplotter';
559
+				$data['id_source'] = $id_source;
560
+			print_r($data);
561
+			echo 'Add...'."\n";
562
+			$MI->add($data);
563
+			unset($data);
564 564
 		}
565
-    	    }
566
-    	    $last_exec[$id]['last'] = time();
565
+			}
566
+			$last_exec[$id]['last'] = time();
567 567
 	//} elseif (($value == 'whazzup' && (time() - $last_exec['whazzup'] > $globalMinFetch)) || ($value == 'vatsimtxt' && (time() - $last_exec['vatsimtxt'] > $globalMinFetch))) {
568 568
 	} elseif (($value['format'] == 'whazzup' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) || ($value['format'] == 'vatsimtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch))) {
569
-	    //$buffer = $Common->getData($hosts[$id]);
570
-	    $buffer = $Common->getData($value['host']);
571
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
572
-	    $buffer = explode('\n',$buffer);
573
-	    $reset = 0;
574
-	    foreach ($buffer as $line) {
575
-    		if ($line != '') {
576
-    		    $line = explode(':', $line);
577
-    		    if (count($line) > 30 && $line[0] != 'callsign') {
569
+		//$buffer = $Common->getData($hosts[$id]);
570
+		$buffer = $Common->getData($value['host']);
571
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
572
+		$buffer = explode('\n',$buffer);
573
+		$reset = 0;
574
+		foreach ($buffer as $line) {
575
+			if ($line != '') {
576
+				$line = explode(':', $line);
577
+				if (count($line) > 30 && $line[0] != 'callsign') {
578 578
 			$data = array();
579 579
 			if (isset($line[37]) && $line[37] != '') $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37];
580 580
 			else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
@@ -587,36 +587,36 @@  discard block
 block discarded – undo
587 587
 			if (isset($line[45])) $data['heading'] = $line[45]; // heading
588 588
 			elseif (isset($line[38])) $data['heading'] = $line[38]; // heading
589 589
 			$data['latitude'] = $line[5]; // lat
590
-	        	$data['longitude'] = $line[6]; // long
591
-	        	$data['verticalrate'] = ''; // vertical rate
592
-	        	$data['squawk'] = ''; // squawk
593
-	        	$data['emergency'] = ''; // emergency
594
-	        	$data['waypoints'] = $line[30];
590
+				$data['longitude'] = $line[6]; // long
591
+				$data['verticalrate'] = ''; // vertical rate
592
+				$data['squawk'] = ''; // squawk
593
+				$data['emergency'] = ''; // emergency
594
+				$data['waypoints'] = $line[30];
595 595
 			$data['datetime'] = date('Y-m-d H:i:s');
596 596
 			//$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37]));
597 597
 			//if (isset($line[37])) $data['last_update'] = $line[37];
598
-		        $data['departure_airport_icao'] = $line[11];
599
-		        $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
600
-		        $data['arrival_airport_icao'] = $line[13];
598
+				$data['departure_airport_icao'] = $line[11];
599
+				$data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
600
+				$data['arrival_airport_icao'] = $line[13];
601 601
 			$data['frequency'] = $line[4];
602 602
 			$data['type'] = $line[18];
603 603
 			$data['range'] = $line[19];
604 604
 			if (isset($line[35])) $data['info'] = $line[35];
605
-    			$data['id_source'] = $id_source;
606
-	    		//$data['arrival_airport_time'] = ;
607
-	    		if ($line[9] != '') {
608
-	    		    $aircraft_data = explode('/',$line[9]);
609
-	    		    if (isset($aircraft_data[1])) {
610
-	    			$data['aircraft_icao'] = $aircraft_data[1];
611
-	    		    }
612
-        		}
613
-	    		/*
605
+				$data['id_source'] = $id_source;
606
+				//$data['arrival_airport_time'] = ;
607
+				if ($line[9] != '') {
608
+					$aircraft_data = explode('/',$line[9]);
609
+					if (isset($aircraft_data[1])) {
610
+					$data['aircraft_icao'] = $aircraft_data[1];
611
+					}
612
+				}
613
+				/*
614 614
 	    		if ($value == 'whazzup') $data['format_source'] = 'whazzup';
615 615
 	    		elseif ($value == 'vatsimtxt') $data['format_source'] = 'vatsimtxt';
616 616
 	    		*/
617
-	    		$data['format_source'] = $value['format'];
617
+				$data['format_source'] = $value['format'];
618 618
 			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
619
-    			if ($line[3] == 'PILOT') $SI->add($data);
619
+				if ($line[3] == 'PILOT') $SI->add($data);
620 620
 			elseif ($line[3] == 'ATC') {
621 621
 				//print_r($data);
622 622
 				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
@@ -634,247 +634,247 @@  discard block
 block discarded – undo
634 634
 				if (!isset($data['source_name'])) $data['source_name'] = '';
635 635
 				if (isset($ATC)) echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
636 636
 			}
637
-    			unset($data);
638
-    		    }
639
-    		}
640
-    	    }
641
-    	    //if ($value == 'whazzup') $last_exec['whazzup'] = time();
642
-    	    //elseif ($value == 'vatsimtxt') $last_exec['vatsimtxt'] = time();
643
-    	    $last_exec[$id]['last'] = time();
644
-    	//} elseif ($value == 'aircraftlistjson' && (time() - $last_exec['aircraftlistjson'] > $globalMinFetch)) {
645
-    	} elseif ($value['format'] == 'aircraftlistjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
646
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
647
-	    if ($buffer != '') {
648
-	    $all_data = json_decode($buffer,true);
649
-	    if (isset($all_data['acList'])) {
637
+				unset($data);
638
+				}
639
+			}
640
+			}
641
+			//if ($value == 'whazzup') $last_exec['whazzup'] = time();
642
+			//elseif ($value == 'vatsimtxt') $last_exec['vatsimtxt'] = time();
643
+			$last_exec[$id]['last'] = time();
644
+		//} elseif ($value == 'aircraftlistjson' && (time() - $last_exec['aircraftlistjson'] > $globalMinFetch)) {
645
+		} elseif ($value['format'] == 'aircraftlistjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
646
+		$buffer = $Common->getData($value['host'],'get','','','','','20');
647
+		if ($buffer != '') {
648
+		$all_data = json_decode($buffer,true);
649
+		if (isset($all_data['acList'])) {
650 650
 		$reset = 0;
651 651
 		foreach ($all_data['acList'] as $line) {
652
-		    $data = array();
653
-		    $data['hex'] = $line['Icao']; // hex
654
-		    if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
655
-		    if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
656
-		    if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
657
-		    if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
658
-		    if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
659
-		    if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
660
-		    //$data['verticalrate'] = $line['']; // verticale rate
661
-		    if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
662
-		    $data['emergency'] = ''; // emergency
663
-		    if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
664
-		    /*
652
+			$data = array();
653
+			$data['hex'] = $line['Icao']; // hex
654
+			if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
655
+			if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
656
+			if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
657
+			if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
658
+			if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
659
+			if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
660
+			//$data['verticalrate'] = $line['']; // verticale rate
661
+			if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
662
+			$data['emergency'] = ''; // emergency
663
+			if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
664
+			/*
665 665
 		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',$line['PosTime']/1000);
666 666
 		    else $data['datetime'] = date('Y-m-d H:i:s');
667 667
 		    */
668
-		    $data['datetime'] = date('Y-m-d H:i:s');
669
-		    if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
670
-	    	    $data['format_source'] = 'aircraftlistjson';
671
-		    $data['id_source'] = $id_source;
672
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
673
-		    if (isset($data['latitude'])) $SI->add($data);
674
-		    unset($data);
668
+			$data['datetime'] = date('Y-m-d H:i:s');
669
+			if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
670
+				$data['format_source'] = 'aircraftlistjson';
671
+			$data['id_source'] = $id_source;
672
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
673
+			if (isset($data['latitude'])) $SI->add($data);
674
+			unset($data);
675 675
 		}
676
-	    } elseif (is_array($all_data)) {
676
+		} elseif (is_array($all_data)) {
677 677
 		$reset = 0;
678 678
 		foreach ($all_data as $line) {
679
-		    $data = array();
680
-		    $data['hex'] = $line['hex']; // hex
681
-		    $data['ident'] = $line['flight']; // ident
682
-		    $data['altitude'] = $line['altitude']; // altitude
683
-		    $data['speed'] = $line['speed']; // speed
684
-		    $data['heading'] = $line['track']; // heading
685
-		    $data['latitude'] = $line['lat']; // lat
686
-		    $data['longitude'] = $line['lon']; // long
687
-		    $data['verticalrate'] = $line['vrt']; // verticale rate
688
-		    $data['squawk'] = $line['squawk']; // squawk
689
-		    $data['emergency'] = ''; // emergency
690
-		    $data['datetime'] = date('Y-m-d H:i:s');
691
-	    	    $data['format_source'] = 'aircraftlistjson';
692
-    		    $data['id_source'] = $id_source;
693
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
694
-		    $SI->add($data);
695
-		    unset($data);
679
+			$data = array();
680
+			$data['hex'] = $line['hex']; // hex
681
+			$data['ident'] = $line['flight']; // ident
682
+			$data['altitude'] = $line['altitude']; // altitude
683
+			$data['speed'] = $line['speed']; // speed
684
+			$data['heading'] = $line['track']; // heading
685
+			$data['latitude'] = $line['lat']; // lat
686
+			$data['longitude'] = $line['lon']; // long
687
+			$data['verticalrate'] = $line['vrt']; // verticale rate
688
+			$data['squawk'] = $line['squawk']; // squawk
689
+			$data['emergency'] = ''; // emergency
690
+			$data['datetime'] = date('Y-m-d H:i:s');
691
+				$data['format_source'] = 'aircraftlistjson';
692
+				$data['id_source'] = $id_source;
693
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
694
+			$SI->add($data);
695
+			unset($data);
696
+		}
696 697
 		}
697
-	    }
698
-	    }
699
-    	    //$last_exec['aircraftlistjson'] = time();
700
-    	    $last_exec[$id]['last'] = time();
701
-    	//} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
702
-    	} elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
703
-	    $buffer = $Common->getData($value['host']);
704
-	    $all_data = json_decode($buffer,true);
705
-	    if (isset($all_data['planes'])) {
698
+		}
699
+			//$last_exec['aircraftlistjson'] = time();
700
+			$last_exec[$id]['last'] = time();
701
+		//} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
702
+		} elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
703
+		$buffer = $Common->getData($value['host']);
704
+		$all_data = json_decode($buffer,true);
705
+		if (isset($all_data['planes'])) {
706 706
 		$reset = 0;
707 707
 		foreach ($all_data['planes'] as $key => $line) {
708
-		    $data = array();
709
-		    $data['hex'] = $key; // hex
710
-		    $data['ident'] = $line[3]; // ident
711
-		    $data['altitude'] = $line[6]; // altitude
712
-		    $data['speed'] = $line[8]; // speed
713
-		    $data['heading'] = $line[7]; // heading
714
-		    $data['latitude'] = $line[4]; // lat
715
-		    $data['longitude'] = $line[5]; // long
716
-		    //$data['verticalrate'] = $line[]; // verticale rate
717
-		    $data['squawk'] = $line[10]; // squawk
718
-		    $data['emergency'] = ''; // emergency
719
-		    $data['registration'] = $line[2];
720
-		    $data['aircraft_icao'] = $line[0];
721
-		    $deparr = explode('-',$line[1]);
722
-		    if (count($deparr) == 2) {
708
+			$data = array();
709
+			$data['hex'] = $key; // hex
710
+			$data['ident'] = $line[3]; // ident
711
+			$data['altitude'] = $line[6]; // altitude
712
+			$data['speed'] = $line[8]; // speed
713
+			$data['heading'] = $line[7]; // heading
714
+			$data['latitude'] = $line[4]; // lat
715
+			$data['longitude'] = $line[5]; // long
716
+			//$data['verticalrate'] = $line[]; // verticale rate
717
+			$data['squawk'] = $line[10]; // squawk
718
+			$data['emergency'] = ''; // emergency
719
+			$data['registration'] = $line[2];
720
+			$data['aircraft_icao'] = $line[0];
721
+			$deparr = explode('-',$line[1]);
722
+			if (count($deparr) == 2) {
723 723
 			$data['departure_airport_icao'] = $deparr[0];
724 724
 			$data['arrival_airport_icao'] = $deparr[1];
725
-		    }
726
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]);
727
-	    	    $data['format_source'] = 'planeupdatefaa';
728
-    		    $data['id_source'] = $id_source;
729
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
730
-		    $SI->add($data);
731
-		    unset($data);
725
+			}
726
+			$data['datetime'] = date('Y-m-d H:i:s',$line[9]);
727
+				$data['format_source'] = 'planeupdatefaa';
728
+				$data['id_source'] = $id_source;
729
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
730
+			$SI->add($data);
731
+			unset($data);
732
+		}
732 733
 		}
733
-	    }
734
-    	    //$last_exec['planeupdatefaa'] = time();
735
-    	    $last_exec[$id]['last'] = time();
736
-    	} elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
737
-	    $buffer = $Common->getData($value['host']);
738
-	    $all_data = json_decode($buffer,true);
739
-	    if (isset($all_data['states'])) {
734
+			//$last_exec['planeupdatefaa'] = time();
735
+			$last_exec[$id]['last'] = time();
736
+		} elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
737
+		$buffer = $Common->getData($value['host']);
738
+		$all_data = json_decode($buffer,true);
739
+		if (isset($all_data['states'])) {
740 740
 		$reset = 0;
741 741
 		foreach ($all_data['states'] as $key => $line) {
742
-		    $data = array();
743
-		    $data['hex'] = $line[0]; // hex
744
-		    $data['ident'] = trim($line[1]); // ident
745
-		    $data['altitude'] = round($line[7]*3.28084); // altitude
746
-		    $data['speed'] = round($line[9]*1.94384); // speed
747
-		    $data['heading'] = round($line[10]); // heading
748
-		    $data['latitude'] = $line[5]; // lat
749
-		    $data['longitude'] = $line[6]; // long
750
-		    $data['verticalrate'] = $line[11]; // verticale rate
751
-		    //$data['squawk'] = $line[10]; // squawk
752
-		    //$data['emergency'] = ''; // emergency
753
-		    //$data['registration'] = $line[2];
754
-		    //$data['aircraft_icao'] = $line[0];
755
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]);
756
-	    	    $data['format_source'] = 'opensky';
757
-    		    $data['id_source'] = $id_source;
758
-		    $SI->add($data);
759
-		    unset($data);
742
+			$data = array();
743
+			$data['hex'] = $line[0]; // hex
744
+			$data['ident'] = trim($line[1]); // ident
745
+			$data['altitude'] = round($line[7]*3.28084); // altitude
746
+			$data['speed'] = round($line[9]*1.94384); // speed
747
+			$data['heading'] = round($line[10]); // heading
748
+			$data['latitude'] = $line[5]; // lat
749
+			$data['longitude'] = $line[6]; // long
750
+			$data['verticalrate'] = $line[11]; // verticale rate
751
+			//$data['squawk'] = $line[10]; // squawk
752
+			//$data['emergency'] = ''; // emergency
753
+			//$data['registration'] = $line[2];
754
+			//$data['aircraft_icao'] = $line[0];
755
+			$data['datetime'] = date('Y-m-d H:i:s',$line[3]);
756
+				$data['format_source'] = 'opensky';
757
+				$data['id_source'] = $id_source;
758
+			$SI->add($data);
759
+			unset($data);
760
+		}
760 761
 		}
761
-	    }
762
-    	    //$last_exec['planeupdatefaa'] = time();
763
-    	    $last_exec[$id]['last'] = time();
764
-    	//} elseif ($value == 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) {
765
-    	} elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
766
-	    //$buffer = $Common->getData($hosts[$id]);
767
-	    $buffer = $Common->getData($value['host']);
768
-	    $all_data = json_decode($buffer,true);
769
-	    if (!empty($all_data)) $reset = 0;
770
-	    foreach ($all_data as $key => $line) {
762
+			//$last_exec['planeupdatefaa'] = time();
763
+			$last_exec[$id]['last'] = time();
764
+		//} elseif ($value == 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) {
765
+		} elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
766
+		//$buffer = $Common->getData($hosts[$id]);
767
+		$buffer = $Common->getData($value['host']);
768
+		$all_data = json_decode($buffer,true);
769
+		if (!empty($all_data)) $reset = 0;
770
+		foreach ($all_data as $key => $line) {
771 771
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
772
-		    $data = array();
773
-		    $data['hex'] = $line[0];
774
-		    $data['ident'] = $line[16]; //$line[13]
775
-	    	    $data['altitude'] = $line[4]; // altitude
776
-	    	    $data['speed'] = $line[5]; // speed
777
-	    	    $data['heading'] = $line[3]; // heading
778
-	    	    $data['latitude'] = $line[1]; // lat
779
-	    	    $data['longitude'] = $line[2]; // long
780
-	    	    $data['verticalrate'] = $line[15]; // verticale rate
781
-	    	    $data['squawk'] = $line[6]; // squawk
782
-	    	    $data['aircraft_icao'] = $line[8];
783
-	    	    $data['registration'] = $line[9];
784
-		    $data['departure_airport_iata'] = $line[11];
785
-		    $data['arrival_airport_iata'] = $line[12];
786
-	    	    $data['emergency'] = ''; // emergency
787
-		    $data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
788
-	    	    $data['format_source'] = 'fr24json';
789
-    		    $data['id_source'] = $id_source;
790
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
791
-		    $SI->add($data);
792
-		    unset($data);
772
+			$data = array();
773
+			$data['hex'] = $line[0];
774
+			$data['ident'] = $line[16]; //$line[13]
775
+				$data['altitude'] = $line[4]; // altitude
776
+				$data['speed'] = $line[5]; // speed
777
+				$data['heading'] = $line[3]; // heading
778
+				$data['latitude'] = $line[1]; // lat
779
+				$data['longitude'] = $line[2]; // long
780
+				$data['verticalrate'] = $line[15]; // verticale rate
781
+				$data['squawk'] = $line[6]; // squawk
782
+				$data['aircraft_icao'] = $line[8];
783
+				$data['registration'] = $line[9];
784
+			$data['departure_airport_iata'] = $line[11];
785
+			$data['arrival_airport_iata'] = $line[12];
786
+				$data['emergency'] = ''; // emergency
787
+			$data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
788
+				$data['format_source'] = 'fr24json';
789
+				$data['id_source'] = $id_source;
790
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
791
+			$SI->add($data);
792
+			unset($data);
793
+		}
793 794
 		}
794
-	    }
795
-    	    //$last_exec['fr24json'] = time();
796
-    	    $last_exec[$id]['last'] = time();
797
-    	//} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) {
798
-    	} elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
799
-	    //$buffer = $Common->getData($hosts[$id],'get','','','','','150');
800
-	    $buffer = $Common->getData($value['host'],'get','','','','','150');
801
-	    //echo $buffer;
802
-	    $buffer = str_replace(array("\n","\r"),"",$buffer);
803
-	    $buffer = preg_replace('/,"num":(.+)/','}',$buffer);
804
-	    $all_data = json_decode($buffer,true);
805
-	    if (json_last_error() != JSON_ERROR_NONE) {
795
+			//$last_exec['fr24json'] = time();
796
+			$last_exec[$id]['last'] = time();
797
+		//} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) {
798
+		} elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
799
+		//$buffer = $Common->getData($hosts[$id],'get','','','','','150');
800
+		$buffer = $Common->getData($value['host'],'get','','','','','150');
801
+		//echo $buffer;
802
+		$buffer = str_replace(array("\n","\r"),"",$buffer);
803
+		$buffer = preg_replace('/,"num":(.+)/','}',$buffer);
804
+		$all_data = json_decode($buffer,true);
805
+		if (json_last_error() != JSON_ERROR_NONE) {
806 806
 		die(json_last_error_msg());
807
-	    }
808
-	    if (isset($all_data['mrkrs'])) {
807
+		}
808
+		if (isset($all_data['mrkrs'])) {
809 809
 		$reset = 0;
810 810
 		foreach ($all_data['mrkrs'] as $key => $line) {
811
-		    if (isset($line['inf'])) {
811
+			if (isset($line['inf'])) {
812 812
 			$data = array();
813 813
 			$data['hex'] = $line['inf']['ia'];
814 814
 			if (isset($line['inf']['cs'])) $data['ident'] = $line['inf']['cs']; //$line[13]
815
-	    		$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
816
-	    		if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
817
-	    		if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
818
-	    		$data['latitude'] = $line['pt'][0]; // lat
819
-	    		$data['longitude'] = $line['pt'][1]; // long
820
-	    		//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
821
-	    		if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
822
-	    		//$data['aircraft_icao'] = $line[8];
823
-	    		if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
815
+				$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
816
+				if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
817
+				if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
818
+				$data['latitude'] = $line['pt'][0]; // lat
819
+				$data['longitude'] = $line['pt'][1]; // long
820
+				//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
821
+				if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
822
+				//$data['aircraft_icao'] = $line[8];
823
+				if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
824 824
 			//$data['departure_airport_iata'] = $line[11];
825 825
 			//$data['arrival_airport_iata'] = $line[12];
826
-	    		//$data['emergency'] = ''; // emergency
826
+				//$data['emergency'] = ''; // emergency
827 827
 			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10]
828
-	    		$data['format_source'] = 'radarvirtueljson';
829
-    			$data['id_source'] = $id_source;
828
+				$data['format_source'] = 'radarvirtueljson';
829
+				$data['id_source'] = $id_source;
830 830
 			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
831 831
 			$SI->add($data);
832 832
 			unset($data);
833
-		    }
833
+			}
834 834
 		}
835
-	    }
836
-    	    //$last_exec['radarvirtueljson'] = time();
837
-    	    $last_exec[$id]['last'] = time();
838
-    	//} elseif ($value == 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) {
839
-    	} elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
840
-	    //$buffer = $Common->getData($hosts[$id]);
841
-	    $buffer = $Common->getData($value['host'].'?'.time());
842
-	    $all_data = json_decode(utf8_encode($buffer),true);
835
+		}
836
+			//$last_exec['radarvirtueljson'] = time();
837
+			$last_exec[$id]['last'] = time();
838
+		//} elseif ($value == 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) {
839
+		} elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
840
+		//$buffer = $Common->getData($hosts[$id]);
841
+		$buffer = $Common->getData($value['host'].'?'.time());
842
+		$all_data = json_decode(utf8_encode($buffer),true);
843 843
 	    
844
-	    if (isset($all_data['pireps'])) {
844
+		if (isset($all_data['pireps'])) {
845 845
 		$reset = 0;
846
-	        foreach ($all_data['pireps'] as $line) {
847
-		    $data = array();
848
-		    $data['id'] = $line['id'];
849
-		    $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
850
-		    $data['ident'] = $line['callsign']; // ident
851
-		    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
852
-		    if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
853
-		    if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
854
-		    if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
855
-		    if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
856
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
857
-		    $data['latitude'] = $line['lat']; // lat
858
-		    $data['longitude'] = $line['lon']; // long
859
-		    //$data['verticalrate'] = $line['vrt']; // verticale rate
860
-		    //$data['squawk'] = $line['squawk']; // squawk
861
-		    //$data['emergency'] = ''; // emergency
862
-		    if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
863
-		    if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
864
-		    if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
865
-		    //$data['arrival_airport_time'] = $line['arrtime'];
866
-		    if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
867
-		    if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
868
-		    if (isset($line['atis'])) $data['info'] = $line['atis'];
869
-		    else $data['info'] = '';
870
-		    $data['format_source'] = 'pireps';
871
-    		    $data['id_source'] = $id_source;
872
-		    $data['datetime'] = date('Y-m-d H:i:s');
873
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
874
-		    if ($line['icon'] == 'plane') {
846
+			foreach ($all_data['pireps'] as $line) {
847
+			$data = array();
848
+			$data['id'] = $line['id'];
849
+			$data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
850
+			$data['ident'] = $line['callsign']; // ident
851
+			if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
852
+			if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
853
+			if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
854
+			if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
855
+			if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
856
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
857
+			$data['latitude'] = $line['lat']; // lat
858
+			$data['longitude'] = $line['lon']; // long
859
+			//$data['verticalrate'] = $line['vrt']; // verticale rate
860
+			//$data['squawk'] = $line['squawk']; // squawk
861
+			//$data['emergency'] = ''; // emergency
862
+			if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
863
+			if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
864
+			if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
865
+			//$data['arrival_airport_time'] = $line['arrtime'];
866
+			if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
867
+			if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
868
+			if (isset($line['atis'])) $data['info'] = $line['atis'];
869
+			else $data['info'] = '';
870
+			$data['format_source'] = 'pireps';
871
+				$data['id_source'] = $id_source;
872
+			$data['datetime'] = date('Y-m-d H:i:s');
873
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
874
+			if ($line['icon'] == 'plane') {
875 875
 			$SI->add($data);
876
-		    //    print_r($data);
877
-    		    } elseif ($line['icon'] == 'ct') {
876
+			//    print_r($data);
877
+				} elseif ($line['icon'] == 'ct') {
878 878
 			$data['info'] = str_replace('^&sect;','<br />',$data['info']);
879 879
 			$data['info'] = str_replace('&amp;sect;','',$data['info']);
880 880
 			$typec = substr($data['ident'],-3);
@@ -889,190 +889,190 @@  discard block
 block discarded – undo
889 889
 			elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
890 890
 			else $data['type'] = 'Observer';
891 891
 			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']);
892
-		    }
893
-		    unset($data);
892
+			}
893
+			unset($data);
894 894
 		}
895
-	    }
896
-    	    //$last_exec['pirepsjson'] = time();
897
-    	    $last_exec[$id]['last'] = time();
898
-    	//} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) {
899
-    	} elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
900
-	    //$buffer = $Common->getData($hosts[$id]);
901
-	    if ($globalDebug) echo 'Get Data...'."\n";
902
-	    $buffer = $Common->getData($value['host']);
903
-	    $all_data = json_decode($buffer,true);
904
-	    if ($buffer != '' && is_array($all_data)) {
895
+		}
896
+			//$last_exec['pirepsjson'] = time();
897
+			$last_exec[$id]['last'] = time();
898
+		//} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) {
899
+		} elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
900
+		//$buffer = $Common->getData($hosts[$id]);
901
+		if ($globalDebug) echo 'Get Data...'."\n";
902
+		$buffer = $Common->getData($value['host']);
903
+		$all_data = json_decode($buffer,true);
904
+		if ($buffer != '' && is_array($all_data)) {
905 905
 		$reset = 0;
906 906
 		foreach ($all_data as $line) {
907
-	    	    $data = array();
908
-	    	    //$data['id'] = $line['id']; // id not usable
909
-	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
910
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
911
-	    	    if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
912
-	    	    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
913
-	    	    $data['ident'] = $line['flightnum']; // ident
914
-	    	    $data['altitude'] = $line['alt']; // altitude
915
-	    	    $data['speed'] = $line['gs']; // speed
916
-	    	    $data['heading'] = $line['heading']; // heading
917
-	    	    $data['latitude'] = $line['lat']; // lat
918
-	    	    $data['longitude'] = $line['lng']; // long
919
-	    	    $data['verticalrate'] = ''; // verticale rate
920
-	    	    $data['squawk'] = ''; // squawk
921
-	    	    $data['emergency'] = ''; // emergency
922
-	    	    //$data['datetime'] = $line['lastupdate'];
923
-	    	    $data['last_update'] = $line['lastupdate'];
924
-		    $data['datetime'] = date('Y-m-d H:i:s');
925
-	    	    $data['departure_airport_icao'] = $line['depicao'];
926
-	    	    $data['departure_airport_time'] = $line['deptime'];
927
-	    	    $data['arrival_airport_icao'] = $line['arricao'];
928
-    		    $data['arrival_airport_time'] = $line['arrtime'];
929
-    		    $data['registration'] = $line['aircraft'];
930
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
931
-		    if (isset($line['aircraftname'])) {
907
+				$data = array();
908
+				//$data['id'] = $line['id']; // id not usable
909
+				if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
910
+				$data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
911
+				if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
912
+				if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
913
+				$data['ident'] = $line['flightnum']; // ident
914
+				$data['altitude'] = $line['alt']; // altitude
915
+				$data['speed'] = $line['gs']; // speed
916
+				$data['heading'] = $line['heading']; // heading
917
+				$data['latitude'] = $line['lat']; // lat
918
+				$data['longitude'] = $line['lng']; // long
919
+				$data['verticalrate'] = ''; // verticale rate
920
+				$data['squawk'] = ''; // squawk
921
+				$data['emergency'] = ''; // emergency
922
+				//$data['datetime'] = $line['lastupdate'];
923
+				$data['last_update'] = $line['lastupdate'];
924
+			$data['datetime'] = date('Y-m-d H:i:s');
925
+				$data['departure_airport_icao'] = $line['depicao'];
926
+				$data['departure_airport_time'] = $line['deptime'];
927
+				$data['arrival_airport_icao'] = $line['arricao'];
928
+				$data['arrival_airport_time'] = $line['arrtime'];
929
+				$data['registration'] = $line['aircraft'];
930
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
931
+			if (isset($line['aircraftname'])) {
932 932
 			$line['aircraftname'] = strtoupper($line['aircraftname']);
933 933
 			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']);
934
-	    		$aircraft_data = explode('-',$line['aircraftname']);
935
-	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) < 5) $data['aircraft_icao'] = $aircraft_data[0];
936
-	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) < 5) $data['aircraft_icao'] = $aircraft_data[1];
937
-	    		else {
938
-	    		    $aircraft_data = explode(' ',$line['aircraftname']);
939
-	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = $aircraft_data[1];
940
-	    		    else $data['aircraft_icao'] = $line['aircraftname'];
941
-	    		}
942
-	    	    }
943
-    		    if (isset($line['route'])) $data['waypoints'] = $line['route'];
944
-    		    $data['id_source'] = $id_source;
945
-	    	    $data['format_source'] = 'phpvmacars';
946
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
947
-		    $SI->add($data);
948
-		    unset($data);
934
+				$aircraft_data = explode('-',$line['aircraftname']);
935
+				if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) < 5) $data['aircraft_icao'] = $aircraft_data[0];
936
+				elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) < 5) $data['aircraft_icao'] = $aircraft_data[1];
937
+				else {
938
+					$aircraft_data = explode(' ',$line['aircraftname']);
939
+					if (isset($aircraft_data[1])) $data['aircraft_icao'] = $aircraft_data[1];
940
+					else $data['aircraft_icao'] = $line['aircraftname'];
941
+				}
942
+				}
943
+				if (isset($line['route'])) $data['waypoints'] = $line['route'];
944
+				$data['id_source'] = $id_source;
945
+				$data['format_source'] = 'phpvmacars';
946
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
947
+			$SI->add($data);
948
+			unset($data);
949 949
 		}
950 950
 		if ($globalDebug) echo 'No more data...'."\n";
951 951
 		unset($buffer);
952 952
 		unset($all_data);
953
-	    }
954
-    	    //$last_exec['phpvmacars'] = time();
955
-    	    $last_exec[$id]['last'] = time();
956
-    	} elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
957
-	    //$buffer = $Common->getData($hosts[$id]);
958
-	    if ($globalDebug) echo 'Get Data...'."\n";
959
-	    $buffer = $Common->getData($value['host']);
960
-	    $all_data = json_decode($buffer,true);
961
-	    if ($buffer != '' && is_array($all_data)) {
953
+		}
954
+			//$last_exec['phpvmacars'] = time();
955
+			$last_exec[$id]['last'] = time();
956
+		} elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
957
+		//$buffer = $Common->getData($hosts[$id]);
958
+		if ($globalDebug) echo 'Get Data...'."\n";
959
+		$buffer = $Common->getData($value['host']);
960
+		$all_data = json_decode($buffer,true);
961
+		if ($buffer != '' && is_array($all_data)) {
962 962
 		$reset = 0;
963 963
 		foreach ($all_data as $line) {
964
-	    	    $data = array();
965
-	    	    //$data['id'] = $line['id']; // id not usable
966
-	    	    $data['id'] = trim($line['flight_id']);
967
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
968
-	    	    $data['pilot_name'] = $line['pilot_name'];
969
-	    	    $data['pilot_id'] = $line['pilot_id'];
970
-	    	    $data['ident'] = trim($line['callsign']); // ident
971
-	    	    $data['altitude'] = $line['altitude']; // altitude
972
-	    	    $data['speed'] = $line['gs']; // speed
973
-	    	    $data['heading'] = $line['heading']; // heading
974
-	    	    $data['latitude'] = $line['latitude']; // lat
975
-	    	    $data['longitude'] = $line['longitude']; // long
976
-	    	    $data['verticalrate'] = ''; // verticale rate
977
-	    	    $data['squawk'] = ''; // squawk
978
-	    	    $data['emergency'] = ''; // emergency
979
-	    	    //$data['datetime'] = $line['lastupdate'];
980
-	    	    $data['last_update'] = $line['last_update'];
981
-		    $data['datetime'] = date('Y-m-d H:i:s');
982
-	    	    $data['departure_airport_icao'] = $line['departure'];
983
-	    	    //$data['departure_airport_time'] = $line['departure_time'];
984
-	    	    $data['arrival_airport_icao'] = $line['arrival'];
985
-    		    //$data['arrival_airport_time'] = $line['arrival_time'];
986
-    		    //$data['registration'] = $line['aircraft'];
987
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
988
-	    	    $data['aircraft_icao'] = $line['plane_type'];
989
-    		    $data['id_source'] = $id_source;
990
-	    	    $data['format_source'] = 'vam';
991
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
992
-		    $SI->add($data);
993
-		    unset($data);
964
+				$data = array();
965
+				//$data['id'] = $line['id']; // id not usable
966
+				$data['id'] = trim($line['flight_id']);
967
+				$data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
968
+				$data['pilot_name'] = $line['pilot_name'];
969
+				$data['pilot_id'] = $line['pilot_id'];
970
+				$data['ident'] = trim($line['callsign']); // ident
971
+				$data['altitude'] = $line['altitude']; // altitude
972
+				$data['speed'] = $line['gs']; // speed
973
+				$data['heading'] = $line['heading']; // heading
974
+				$data['latitude'] = $line['latitude']; // lat
975
+				$data['longitude'] = $line['longitude']; // long
976
+				$data['verticalrate'] = ''; // verticale rate
977
+				$data['squawk'] = ''; // squawk
978
+				$data['emergency'] = ''; // emergency
979
+				//$data['datetime'] = $line['lastupdate'];
980
+				$data['last_update'] = $line['last_update'];
981
+			$data['datetime'] = date('Y-m-d H:i:s');
982
+				$data['departure_airport_icao'] = $line['departure'];
983
+				//$data['departure_airport_time'] = $line['departure_time'];
984
+				$data['arrival_airport_icao'] = $line['arrival'];
985
+				//$data['arrival_airport_time'] = $line['arrival_time'];
986
+				//$data['registration'] = $line['aircraft'];
987
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
988
+				$data['aircraft_icao'] = $line['plane_type'];
989
+				$data['id_source'] = $id_source;
990
+				$data['format_source'] = 'vam';
991
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
992
+			$SI->add($data);
993
+			unset($data);
994 994
 		}
995 995
 		if ($globalDebug) echo 'No more data...'."\n";
996 996
 		unset($buffer);
997 997
 		unset($all_data);
998
-	    }
999
-    	    //$last_exec['phpvmacars'] = time();
1000
-    	    $last_exec[$id]['last'] = time();
998
+		}
999
+			//$last_exec['phpvmacars'] = time();
1000
+			$last_exec[$id]['last'] = time();
1001 1001
 	//} elseif ($value == 'sbs' || $value == 'tsv' || $value == 'raw' || $value == 'aprs' || $value == 'beast') {
1002 1002
 	} elseif ($value['format'] == 'sbs' || $value['format'] == 'tsv' || $value['format'] == 'raw' || $value['format'] == 'aprs' || $value['format'] == 'beast' || $value['format'] == 'flightgearmp' || $value['format'] == 'flightgearsp' || $value['format'] == 'acars' || $value['format'] == 'acarssbs3' || $value['format'] == 'ais' || $value['format'] == 'vrstcp') {
1003
-	    if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
1004
-    	    //$last_exec[$id]['last'] = time();
1003
+		if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
1004
+			//$last_exec[$id]['last'] = time();
1005 1005
 
1006
-	    //$read = array( $sockets[$id] );
1007
-	    $read = $sockets;
1008
-	    $write = NULL;
1009
-	    $e = NULL;
1010
-	    $n = socket_select($read, $write, $e, $timeout);
1011
-	    if ($e != NULL) var_dump($e);
1012
-	    if ($n > 0) {
1006
+		//$read = array( $sockets[$id] );
1007
+		$read = $sockets;
1008
+		$write = NULL;
1009
+		$e = NULL;
1010
+		$n = socket_select($read, $write, $e, $timeout);
1011
+		if ($e != NULL) var_dump($e);
1012
+		if ($n > 0) {
1013 1013
 		$reset = 0;
1014 1014
 		foreach ($read as $nb => $r) {
1015
-		    //$value = $formats[$nb];
1016
-		    $format = $globalSources[$nb]['format'];
1017
-        	    if ($format == 'sbs' || $format == 'aprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3' || $format == 'vrstcp') {
1018
-        		$buffer = socket_read($r, 6000,PHP_NORMAL_READ);
1019
-        	    } else {
1020
-	    	        $az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port);
1021
-	    	    }
1022
-        	    //$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
1023
-        	    //echo $buffer."\n";
1024
-		    // lets play nice and handle signals such as ctrl-c/kill properly
1025
-		    //if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
1026
-		    $error = false;
1027
-		    //$SI::del();
1028
-		    if ($format == 'vrstcp') {
1015
+			//$value = $formats[$nb];
1016
+			$format = $globalSources[$nb]['format'];
1017
+				if ($format == 'sbs' || $format == 'aprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3' || $format == 'vrstcp') {
1018
+				$buffer = socket_read($r, 6000,PHP_NORMAL_READ);
1019
+				} else {
1020
+					$az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port);
1021
+				}
1022
+				//$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
1023
+				//echo $buffer."\n";
1024
+			// lets play nice and handle signals such as ctrl-c/kill properly
1025
+			//if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
1026
+			$error = false;
1027
+			//$SI::del();
1028
+			if ($format == 'vrstcp') {
1029 1029
 			$buffer = explode('},{',$buffer);
1030
-		    } else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
1031
-		    // SBS format is CSV format
1032
-		    if ($buffer != '') {
1030
+			} else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
1031
+			// SBS format is CSV format
1032
+			if ($buffer != '') {
1033 1033
 			$tt[$format] = 0;
1034 1034
 			if ($format == 'acarssbs3') {
1035
-                    	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1036
-			    $ACARS->add(trim($buffer));
1037
-			    $ACARS->deleteLiveAcarsData();
1035
+							if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1036
+				$ACARS->add(trim($buffer));
1037
+				$ACARS->deleteLiveAcarsData();
1038 1038
 			} elseif ($format == 'raw') {
1039
-			    // AVR format
1040
-			    $data = $SBS->parse($buffer);
1041
-			    if (is_array($data)) {
1039
+				// AVR format
1040
+				$data = $SBS->parse($buffer);
1041
+				if (is_array($data)) {
1042 1042
 				$data['datetime'] = date('Y-m-d H:i:s');
1043 1043
 				$data['format_source'] = 'raw';
1044 1044
 				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1045
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1046
-                                if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1047
-                            }
1048
-                        } elseif ($format == 'ais') {
1049
-			    $ais_data = $AIS->parse_line(trim($buffer));
1050
-			    $data = array();
1051
-			    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
1052
-			    if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
1053
-			    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
1054
-			    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
1055
-			    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
1056
-			    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
1057
-			    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
1058
-			    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
1059
-			    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
1060
-			    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
1061
-			    if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
1062
-			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
1045
+					if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1046
+								if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1047
+							}
1048
+						} elseif ($format == 'ais') {
1049
+				$ais_data = $AIS->parse_line(trim($buffer));
1050
+				$data = array();
1051
+				if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
1052
+				if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
1053
+				if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
1054
+				if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
1055
+				if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
1056
+				if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
1057
+				if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
1058
+				if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
1059
+				if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
1060
+				if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
1061
+				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
1062
+				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
1063 1063
 
1064
-			    if (isset($ais_data['timestamp'])) {
1064
+				if (isset($ais_data['timestamp'])) {
1065 1065
 				$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
1066
-			    } else {
1066
+				} else {
1067 1067
 				$data['datetime'] = date('Y-m-d H:i:s');
1068
-			    }
1069
-			    $data['format_source'] = 'aisnmea';
1070
-    			    $data['id_source'] = $id_source;
1071
-			    if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
1072
-			    unset($data);
1073
-                        } elseif ($format == 'flightgearsp') {
1074
-                    	    //echo $buffer."\n";
1075
-                    	    if (strlen($buffer) > 5) {
1068
+				}
1069
+				$data['format_source'] = 'aisnmea';
1070
+					$data['id_source'] = $id_source;
1071
+				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
1072
+				unset($data);
1073
+						} elseif ($format == 'flightgearsp') {
1074
+							//echo $buffer."\n";
1075
+							if (strlen($buffer) > 5) {
1076 1076
 				$line = explode(',',$buffer);
1077 1077
 				$data = array();
1078 1078
 				//XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p
@@ -1088,37 +1088,37 @@  discard block
 block discarded – undo
1088 1088
 				$data['format_source'] = 'flightgearsp';
1089 1089
 				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1090 1090
 				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
1091
-			    }
1092
-                        } elseif ($format == 'acars') {
1093
-                    	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1094
-			    $ACARS->add(trim($buffer));
1095
-			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
1096
-			    $ACARS->deleteLiveAcarsData();
1091
+				}
1092
+						} elseif ($format == 'acars') {
1093
+							if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1094
+				$ACARS->add(trim($buffer));
1095
+				socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
1096
+				$ACARS->deleteLiveAcarsData();
1097 1097
 			} elseif ($format == 'flightgearmp') {
1098
-			    if (substr($buffer,0,1) != '#') {
1098
+				if (substr($buffer,0,1) != '#') {
1099 1099
 				$data = array();
1100 1100
 				//echo $buffer."\n";
1101 1101
 				$line = explode(' ',$buffer);
1102 1102
 				if (count($line) == 11) {
1103
-				    $userserver = explode('@',$line[0]);
1104
-				    $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
1105
-				    $data['ident'] = $userserver[0];
1106
-				    $data['registration'] = $userserver[0];
1107
-				    $data['latitude'] = $line[4];
1108
-				    $data['longitude'] = $line[5];
1109
-				    $data['altitude'] = $line[6];
1110
-				    $data['datetime'] = date('Y-m-d H:i:s');
1111
-				    $aircraft_type = $line[10];
1112
-				    $aircraft_type = preg_split(':/:',$aircraft_type);
1113
-				    $data['aircraft_name'] = substr(end($aircraft_type),0,-4);
1114
-				    if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1103
+					$userserver = explode('@',$line[0]);
1104
+					$data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
1105
+					$data['ident'] = $userserver[0];
1106
+					$data['registration'] = $userserver[0];
1107
+					$data['latitude'] = $line[4];
1108
+					$data['longitude'] = $line[5];
1109
+					$data['altitude'] = $line[6];
1110
+					$data['datetime'] = date('Y-m-d H:i:s');
1111
+					$aircraft_type = $line[10];
1112
+					$aircraft_type = preg_split(':/:',$aircraft_type);
1113
+					$data['aircraft_name'] = substr(end($aircraft_type),0,-4);
1114
+					if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1115
+				}
1115 1116
 				}
1116
-			    }
1117 1117
 			} elseif ($format == 'beast') {
1118
-			    echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
1119
-			    die;
1118
+				echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
1119
+				die;
1120 1120
 			} elseif ($format == 'vrstcp') {
1121
-			    foreach($buffer as $all_data) {
1121
+				foreach($buffer as $all_data) {
1122 1122
 				$line = json_decode('{'.$all_data.'}',true);
1123 1123
 				$data = array();
1124 1124
 				if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex
@@ -1138,100 +1138,100 @@  discard block
 block discarded – undo
1138 1138
 				*/
1139 1139
 				$data['datetime'] = date('Y-m-d H:i:s');
1140 1140
 				if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
1141
-		    		$data['format_source'] = 'vrstcp';
1141
+					$data['format_source'] = 'vrstcp';
1142 1142
 				$data['id_source'] = $id_source;
1143 1143
 				if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1144 1144
 				if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data);
1145 1145
 				unset($data);
1146
-			    }
1146
+				}
1147 1147
 			} elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') {
1148
-			    $line = explode("\t", $buffer);
1149
-			    for($k = 0; $k < count($line); $k=$k+2) {
1148
+				$line = explode("\t", $buffer);
1149
+				for($k = 0; $k < count($line); $k=$k+2) {
1150 1150
 				$key = $line[$k];
1151
-			        $lined[$key] = $line[$k+1];
1152
-			    }
1153
-    			    if (count($lined) > 3) {
1154
-    				$data['hex'] = $lined['hexid'];
1155
-    				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
1156
-    				$data['datetime'] = date('Y-m-d H:i:s');;
1157
-    				if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
1158
-    				if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
1159
-    				if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
1160
-    				if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
1161
-    				if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
1162
-    				if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
1163
-    				if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
1164
-    				$data['id_source'] = $id_source;
1165
-    				$data['format_source'] = 'tsv';
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 (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1169
-    				unset($lined);
1170
-    				unset($data);
1171
-    			    } else $error = true;
1151
+					$lined[$key] = $line[$k+1];
1152
+				}
1153
+					if (count($lined) > 3) {
1154
+					$data['hex'] = $lined['hexid'];
1155
+					//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
1156
+					$data['datetime'] = date('Y-m-d H:i:s');;
1157
+					if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
1158
+					if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
1159
+					if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
1160
+					if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
1161
+					if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
1162
+					if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
1163
+					if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
1164
+					$data['id_source'] = $id_source;
1165
+					$data['format_source'] = 'tsv';
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 (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1169
+					unset($lined);
1170
+					unset($data);
1171
+					} else $error = true;
1172 1172
 			} elseif ($format == 'aprs' && $use_aprs) {
1173
-			    if ($aprs_connect == 0) {
1173
+				if ($aprs_connect == 0) {
1174 1174
 				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
1175 1175
 				$aprs_connect = 1;
1176
-			    }
1176
+				}
1177 1177
 			    
1178
-			    if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
1178
+				if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
1179 1179
 				$aprs_last_tx = time();
1180 1180
 				$data_aprs = "# Keep alive";
1181 1181
 				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
1182
-			    }
1182
+				}
1183 1183
 			    
1184
-			    //echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
1185
-			    //echo 'APRS data : '.$buffer."\n";
1186
-			    $buffer = str_replace('APRS <- ','',$buffer);
1187
-			    $buffer = str_replace('APRS -> ','',$buffer);
1188
-			    echo $buffer."\n";
1189
-			    if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
1184
+				//echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
1185
+				//echo 'APRS data : '.$buffer."\n";
1186
+				$buffer = str_replace('APRS <- ','',$buffer);
1187
+				$buffer = str_replace('APRS -> ','',$buffer);
1188
+				echo $buffer."\n";
1189
+				if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
1190 1190
 				$line = $APRS->parse($buffer);
1191 1191
 				//print_r($line);
1192 1192
 				//if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) {
1193 1193
 				if (is_array($line) && isset($line['latitude']) && isset($line['longitude']) && (isset($line['ident']) || isset($line['address']))) {
1194
-				    $aprs_last_tx = time();
1195
-				    $data = array();
1196
-				    //print_r($line);
1197
-				    if (isset($line['address'])) $data['hex'] = $line['address'];
1198
-				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
1199
-				    else $data['datetime'] = date('Y-m-d H:i:s');
1200
-				    //$data['datetime'] = date('Y-m-d H:i:s');
1201
-				    if (isset($line['ident'])) $data['ident'] = $line['ident'];
1202
-				    $data['latitude'] = $line['latitude'];
1203
-				    $data['longitude'] = $line['longitude'];
1204
-				    //$data['verticalrate'] = $line[16];
1205
-				    if (isset($line['speed'])) $data['speed'] = $line['speed'];
1206
-				    else $data['speed'] = 0;
1207
-				    if (isset($line['altitude'])) $data['altitude'] = $line['altitude'];
1208
-				    if (isset($line['comment'])) $data['comment'] = $line['comment'];
1209
-				    if (isset($line['symbol'])) $data['type'] = $line['symbol'];
1210
-				    if (isset($line['heading'])) $data['heading'] = $line['heading'];
1211
-				    //else $data['heading'] = 0;
1212
-				    if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth'];
1213
-				    if (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive == FALSE)) $data['noarchive'] = true;
1214
-    				    $data['id_source'] = $id_source;
1215
-    				    if (isset($line['format_source'])) $data['format_source'] = $line['format_source'];
1216
-				    else $data['format_source'] = 'aprs';
1217
-				    $data['source_name'] = $line['source'];
1218
-				    if (isset($line['source_type'])) $data['source_type'] = $line['source_type'];
1219
-				    else $data['source_type'] = 'flarm';
1220
-    				    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1221
-				    $currentdate = date('Y-m-d H:i:s');
1222
-				    $aprsdate = strtotime($data['datetime']);
1223
-				    // Accept data if time <= system time + 20s
1224
-				    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'])))) {
1194
+					$aprs_last_tx = time();
1195
+					$data = array();
1196
+					//print_r($line);
1197
+					if (isset($line['address'])) $data['hex'] = $line['address'];
1198
+					if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
1199
+					else $data['datetime'] = date('Y-m-d H:i:s');
1200
+					//$data['datetime'] = date('Y-m-d H:i:s');
1201
+					if (isset($line['ident'])) $data['ident'] = $line['ident'];
1202
+					$data['latitude'] = $line['latitude'];
1203
+					$data['longitude'] = $line['longitude'];
1204
+					//$data['verticalrate'] = $line[16];
1205
+					if (isset($line['speed'])) $data['speed'] = $line['speed'];
1206
+					else $data['speed'] = 0;
1207
+					if (isset($line['altitude'])) $data['altitude'] = $line['altitude'];
1208
+					if (isset($line['comment'])) $data['comment'] = $line['comment'];
1209
+					if (isset($line['symbol'])) $data['type'] = $line['symbol'];
1210
+					if (isset($line['heading'])) $data['heading'] = $line['heading'];
1211
+					//else $data['heading'] = 0;
1212
+					if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth'];
1213
+					if (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive == FALSE)) $data['noarchive'] = true;
1214
+						$data['id_source'] = $id_source;
1215
+						if (isset($line['format_source'])) $data['format_source'] = $line['format_source'];
1216
+					else $data['format_source'] = 'aprs';
1217
+					$data['source_name'] = $line['source'];
1218
+					if (isset($line['source_type'])) $data['source_type'] = $line['source_type'];
1219
+					else $data['source_type'] = 'flarm';
1220
+						if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1221
+					$currentdate = date('Y-m-d H:i:s');
1222
+					$aprsdate = strtotime($data['datetime']);
1223
+					// Accept data if time <= system time + 20s
1224
+					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'])))) {
1225 1225
 					$send = $SI->add($data);
1226
-				    } elseif (isset($line['stealth'])) {
1226
+					} elseif (isset($line['stealth'])) {
1227 1227
 					if ($line['stealth'] != 0) echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
1228 1228
 					else echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n";
1229
-				    //} 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')) {
1230
-				    } 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') {
1229
+					//} 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')) {
1230
+					} 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') {
1231 1231
 					//echo '!!!!!!!!!!!!!!!! SEND !!!!!!!!!!!!!!!!!!!!'."\n";
1232 1232
 					if (isset($globalTracker) && $globalTracker) $send = $TI->add($data);
1233
-				    }
1234
-				    unset($data);
1233
+					}
1234
+					unset($data);
1235 1235
 				} 
1236 1236
 				elseif (is_array($line) && $globalDebug && isset($line['symbol']) && $line['symbol'] == 'Weather Station') {
1237 1237
 					echo '!! Weather Station not yet supported'."\n";
@@ -1241,12 +1241,12 @@  discard block
 block discarded – undo
1241 1241
 				}
1242 1242
 				//elseif ($line == false && $globalDebug) echo 'Ignored ('.$buffer.")\n";
1243 1243
 				//elseif ($line == true && $globalDebug) echo '!! Failed : '.$buffer."!!\n";
1244
-			    }
1244
+				}
1245 1245
 			} else {
1246
-			    $line = explode(',', $buffer);
1247
-    			    if (count($line) > 20) {
1248
-    			    	$data['hex'] = $line[4];
1249
-    				/*
1246
+				$line = explode(',', $buffer);
1247
+					if (count($line) > 20) {
1248
+						$data['hex'] = $line[4];
1249
+					/*
1250 1250
     				$data['datetime'] = $line[6].' '.$line[7];
1251 1251
     					date_default_timezone_set($globalTimezone);
1252 1252
     					$datetime = new DateTime($data['datetime']);
@@ -1254,29 +1254,29 @@  discard block
 block discarded – undo
1254 1254
     					$data['datetime'] = $datetime->format('Y-m-d H:i:s');
1255 1255
     					date_default_timezone_set('UTC');
1256 1256
     				*/
1257
-    				// Force datetime to current UTC datetime
1258
-    				date_default_timezone_set('UTC');
1259
-    				$data['datetime'] = date('Y-m-d H:i:s');
1260
-    				$data['ident'] = trim($line[10]);
1261
-    				$data['latitude'] = $line[14];
1262
-    				$data['longitude'] = $line[15];
1263
-    				$data['verticalrate'] = $line[16];
1264
-    				$data['emergency'] = $line[20];
1265
-    				$data['speed'] = $line[12];
1266
-    				$data['squawk'] = $line[17];
1267
-    				$data['altitude'] = $line[11];
1268
-    				$data['heading'] = $line[13];
1269
-    				$data['ground'] = $line[21];
1270
-    				$data['emergency'] = $line[19];
1271
-    				$data['format_source'] = 'sbs';
1257
+					// Force datetime to current UTC datetime
1258
+					date_default_timezone_set('UTC');
1259
+					$data['datetime'] = date('Y-m-d H:i:s');
1260
+					$data['ident'] = trim($line[10]);
1261
+					$data['latitude'] = $line[14];
1262
+					$data['longitude'] = $line[15];
1263
+					$data['verticalrate'] = $line[16];
1264
+					$data['emergency'] = $line[20];
1265
+					$data['speed'] = $line[12];
1266
+					$data['squawk'] = $line[17];
1267
+					$data['altitude'] = $line[11];
1268
+					$data['heading'] = $line[13];
1269
+					$data['ground'] = $line[21];
1270
+					$data['emergency'] = $line[19];
1271
+					$data['format_source'] = 'sbs';
1272 1272
 				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1273
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1274
-    				$data['id_source'] = $id_source;
1275
-    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
1276
-    				else $error = true;
1277
-    				unset($data);
1278
-    			    } else $error = true;
1279
-			    if ($error) {
1273
+					if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1274
+					$data['id_source'] = $id_source;
1275
+					if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
1276
+					else $error = true;
1277
+					unset($data);
1278
+					} else $error = true;
1279
+				if ($error) {
1280 1280
 				if (count($line) > 1 && ($line[0] == 'STA' || $line[0] == 'AIR' || $line[0] == 'SEL' || $line[0] == 'ID' || $line[0] == 'CLK')) { 
1281 1281
 					if ($globalDebug) echo "Not a message. Ignoring... \n";
1282 1282
 				} else {
@@ -1292,13 +1292,13 @@  discard block
 block discarded – undo
1292 1292
 					connect_all($sourceer);
1293 1293
 					$sourceer = array();
1294 1294
 				}
1295
-			    }
1295
+				}
1296 1296
 			}
1297 1297
 			// Sleep for xxx microseconds
1298 1298
 			if (isset($globalSBSSleep)) usleep($globalSBSSleep);
1299
-		    } else {
1299
+			} else {
1300 1300
 			if ($format == 'flightgearmp') {
1301
-			    	if ($globalDebug) echo "Reconnect FlightGear MP...";
1301
+					if ($globalDebug) echo "Reconnect FlightGear MP...";
1302 1302
 				//@socket_close($r);
1303 1303
 				sleep($globalMinFetch);
1304 1304
 				$sourcefg[$nb] = $globalSources[$nb];
@@ -1307,9 +1307,9 @@  discard block
 block discarded – undo
1307 1307
 				break;
1308 1308
 				
1309 1309
 			} elseif ($format != 'acars' && $format != 'flightgearsp') {
1310
-			    if (isset($tt[$format])) $tt[$format]++;
1311
-			    else $tt[$format] = 0;
1312
-			    if ($tt[$format] > 30) {
1310
+				if (isset($tt[$format])) $tt[$format]++;
1311
+				else $tt[$format] = 0;
1312
+				if ($tt[$format] > 30) {
1313 1313
 				if ($globalDebug) echo "ERROR : Reconnect ".$format."...";
1314 1314
 				//@socket_close($r);
1315 1315
 				sleep(2);
@@ -1320,23 +1320,23 @@  discard block
 block discarded – undo
1320 1320
 				//connect_all($globalSources);
1321 1321
 				$tt[$format]=0;
1322 1322
 				break;
1323
-			    }
1323
+				}
1324
+			}
1324 1325
 			}
1325
-		    }
1326 1326
 		}
1327
-	    } else {
1327
+		} else {
1328 1328
 		$error = socket_strerror(socket_last_error());
1329 1329
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) {
1330 1330
 			if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
1331 1331
 			if (isset($globalDebug)) echo "Restarting...\n";
1332 1332
 			// Restart the script if possible
1333 1333
 			if (is_array($sockets)) {
1334
-			    if ($globalDebug) echo "Shutdown all sockets...";
1334
+				if ($globalDebug) echo "Shutdown all sockets...";
1335 1335
 			    
1336
-			    foreach ($sockets as $sock) {
1336
+				foreach ($sockets as $sock) {
1337 1337
 				@socket_shutdown($sock,2);
1338 1338
 				@socket_close($sock);
1339
-			    }
1339
+				}
1340 1340
 			    
1341 1341
 			}
1342 1342
 			if ($globalDebug) echo "Restart all connections...";
@@ -1347,13 +1347,13 @@  discard block
 block discarded – undo
1347 1347
 			if ($reset > 40) exit('Too many attempts...');
1348 1348
 			connect_all($globalSources);
1349 1349
 		}
1350
-	    }
1350
+		}
1351 1351
 	}
1352 1352
 	if ($globalDaemon === false) {
1353
-	    if ($globalDebug) echo 'Check all...'."\n";
1354
-	    $SI->checkAll();
1353
+		if ($globalDebug) echo 'Check all...'."\n";
1354
+		$SI->checkAll();
1355
+	}
1355 1356
 	}
1356
-    }
1357 1357
 }
1358 1358
 
1359 1359
 ?>
Please login to merge, or discard this patch.
require/class.SpotterImport.php 1 patch
Indentation   +358 added lines, -358 removed lines patch added patch discarded remove patch
@@ -10,16 +10,16 @@  discard block
 block discarded – undo
10 10
 require_once(dirname(__FILE__).'/class.Source.php');
11 11
 
12 12
 class SpotterImport {
13
-    private $all_flights = array();
14
-    private $last_delete_hourly = 0;
15
-    private $last_delete = 0;
16
-    private $stats = array();
17
-    private $tmd = 0;
18
-    private $source_location = array();
19
-    public $db = null;
20
-    public $nb = 0;
21
-
22
-    public function __construct($dbc = null) {
13
+	private $all_flights = array();
14
+	private $last_delete_hourly = 0;
15
+	private $last_delete = 0;
16
+	private $stats = array();
17
+	private $tmd = 0;
18
+	private $source_location = array();
19
+	public $db = null;
20
+	public $nb = 0;
21
+
22
+	public function __construct($dbc = null) {
23 23
 	global $globalBeta, $globalServerAPRS, $APRSSpotter;
24 24
 	$Connection = new Connection($dbc);
25 25
 	$this->db = $Connection->db();
@@ -30,23 +30,23 @@  discard block
 block discarded – undo
30 30
 	$currentdate = date('Y-m-d');
31 31
 	$sourcestat = $Stats->getStatsSource($currentdate);
32 32
 	if (!empty($sourcestat)) {
33
-	    foreach($sourcestat as $srcst) {
34
-	    	$type = $srcst['stats_type'];
33
+		foreach($sourcestat as $srcst) {
34
+			$type = $srcst['stats_type'];
35 35
 		if ($type == 'polar' || $type == 'hist') {
36
-		    $source = $srcst['source_name'];
37
-		    $data = $srcst['source_data'];
38
-		    $this->stats[$currentdate][$source][$type] = json_decode($data,true);
39
-	        }
40
-	    }
36
+			$source = $srcst['source_name'];
37
+			$data = $srcst['source_data'];
38
+			$this->stats[$currentdate][$source][$type] = json_decode($data,true);
39
+			}
40
+		}
41 41
 	}
42 42
 	if (isset($globalServerAPRS) && $globalServerAPRS) {
43 43
 		$APRSSpotter = new APRSSpotter();
44 44
 		//$APRSSpotter->connect();
45 45
 	}
46 46
 
47
-    }
47
+	}
48 48
 
49
-    public function get_Schedule($id,$ident) {
49
+	public function get_Schedule($id,$ident) {
50 50
 	global $globalDebug, $globalFork, $globalSchedulesFetch;
51 51
 	// Get schedule here, so it's done only one time
52 52
 	
@@ -66,42 +66,42 @@  discard block
 block discarded – undo
66 66
 	$operator = $Spotter->getOperator($ident);
67 67
 	$scheduleexist = false;
68 68
 	if ($Schedule->checkSchedule($operator) == 0) {
69
-	    $operator = $Translation->checkTranslation($ident);
70
-	    if ($Schedule->checkSchedule($operator) == 0) {
69
+		$operator = $Translation->checkTranslation($ident);
70
+		if ($Schedule->checkSchedule($operator) == 0) {
71 71
 		$schedule = $Schedule->fetchSchedule($operator);
72 72
 		if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) {
73
-		    if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
74
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
75
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
76
-		    // Should also check if route schedule = route from DB
77
-		    if ($schedule['DepartureAirportIATA'] != '') {
73
+			if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
74
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
75
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
76
+			// Should also check if route schedule = route from DB
77
+			if ($schedule['DepartureAirportIATA'] != '') {
78 78
 			if ($this->all_flights[$id]['departure_airport'] != $Spotter->getAirportIcao($schedule['DepartureAirportIATA'])) {
79
-			    $airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']);
80
-			    if (trim($airport_icao) != '') {
79
+				$airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']);
80
+				if (trim($airport_icao) != '') {
81 81
 				$this->all_flights[$id]['departure_airport'] = $airport_icao;
82 82
 				if ($globalDebug) echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n";
83
-			    }
83
+				}
84
+			}
84 85
 			}
85
-		    }
86
-		    if ($schedule['ArrivalAirportIATA'] != '') {
86
+			if ($schedule['ArrivalAirportIATA'] != '') {
87 87
 			if ($this->all_flights[$id]['arrival_airport'] != $Spotter->getAirportIcao($schedule['ArrivalAirportIATA'])) {
88
-			    $airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']);
89
-			    if (trim($airport_icao) != '') {
88
+				$airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']);
89
+				if (trim($airport_icao) != '') {
90 90
 				$this->all_flights[$id]['arrival_airport'] = $airport_icao;
91 91
 				if ($globalDebug) echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n";
92
-			    }
92
+				}
93
+			}
93 94
 			}
94
-		    }
95
-		    $Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']);
95
+			$Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']);
96 96
 		}
97
-	    } else $scheduleexist = true;
97
+		} else $scheduleexist = true;
98 98
 	} else $scheduleexist = true;
99 99
 	// close connection, at least one way will work ?
100
-       if ($scheduleexist) {
100
+	   if ($scheduleexist) {
101 101
 		if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n";
102
-    		$sch = $Schedule->getSchedule($operator);
102
+			$sch = $Schedule->getSchedule($operator);
103 103
 		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport' => $sch['arrival_airport_icao'],'departure_airport' => $sch['departure_airport_icao'],'departure_airport_time' => $sch['departure_airport_time'],'arrival_airport_time' => $sch['arrival_airport_time']));
104
-       }
104
+	   }
105 105
 	$Spotter->db = null;
106 106
 	$Schedule->db = null;
107 107
 	$Translation->db = null;
@@ -116,96 +116,96 @@  discard block
 block discarded – undo
116 116
 	}
117 117
 	  */
118 118
 	}
119
-    }
119
+	}
120 120
 
121
-    public function checkAll() {
121
+	public function checkAll() {
122 122
 	global $globalDebug, $globalNoImport;
123 123
 	if ($globalDebug) echo "Update last seen flights data...\n";
124 124
 	if (!isset($globalNoImport) || $globalNoImport === FALSE) {
125
-	    foreach ($this->all_flights as $key => $flight) {
125
+		foreach ($this->all_flights as $key => $flight) {
126 126
 		if (isset($this->all_flights[$key]['id'])) {
127
-		    //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
128
-    		    $Spotter = new Spotter($this->db);
129
-        	    $real_arrival = $this->arrival($key);
130
-        	    $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
131
-        	}
132
-	    }
127
+			//echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
128
+				$Spotter = new Spotter($this->db);
129
+				$real_arrival = $this->arrival($key);
130
+				$Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
131
+			}
132
+		}
133
+	}
133 134
 	}
134
-    }
135 135
 
136
-    public function arrival($key) {
136
+	public function arrival($key) {
137 137
 	global $globalClosestMinDist, $globalDebug;
138 138
 	if ($globalDebug) echo 'Update arrival...'."\n";
139 139
 	$Spotter = new Spotter($this->db);
140
-        $airport_icao = '';
141
-        $airport_time = '';
142
-        if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
140
+		$airport_icao = '';
141
+		$airport_time = '';
142
+		if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
143 143
 	if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
144
-	    $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
145
-    	    if (isset($closestAirports[0])) {
146
-        	if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
147
-        	    $airport_icao = $closestAirports[0]['icao'];
148
-        	    $airport_time = $this->all_flights[$key]['datetime'];
149
-        	    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
150
-        	} elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') {
151
-        	    foreach ($closestAirports as $airport) {
152
-        		if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) {
153
-        		    $airport_icao = $airport['icao'];
154
-        		    $airport_time = $this->all_flights[$key]['datetime'];
155
-        		    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
156
-        		    break;
157
-        		}
158
-        	    }
159
-        	} elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) {
160
-        		$airport_icao = $closestAirports[0]['icao'];
161
-        		$airport_time = $this->all_flights[$key]['datetime'];
162
-        	} else {
163
-        		if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
164
-        	}
165
-    	    } else {
166
-    		    if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
167
-    	    }
168
-
169
-        } else {
170
-        	if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
171
-        }
172
-        return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
173
-    }
174
-
175
-
176
-
177
-    public function del() {
144
+		$closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
145
+			if (isset($closestAirports[0])) {
146
+			if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
147
+				$airport_icao = $closestAirports[0]['icao'];
148
+				$airport_time = $this->all_flights[$key]['datetime'];
149
+				if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
150
+			} elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') {
151
+				foreach ($closestAirports as $airport) {
152
+				if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) {
153
+					$airport_icao = $airport['icao'];
154
+					$airport_time = $this->all_flights[$key]['datetime'];
155
+					if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
156
+					break;
157
+				}
158
+				}
159
+			} elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) {
160
+				$airport_icao = $closestAirports[0]['icao'];
161
+				$airport_time = $this->all_flights[$key]['datetime'];
162
+			} else {
163
+				if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
164
+			}
165
+			} else {
166
+				if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
167
+			}
168
+
169
+		} else {
170
+			if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
171
+		}
172
+		return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
173
+	}
174
+
175
+
176
+
177
+	public function del() {
178 178
 	global $globalDebug, $globalNoImport;
179 179
 	// Delete old infos
180 180
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
181 181
 	foreach ($this->all_flights as $key => $flight) {
182
-    	    if (isset($flight['lastupdate'])) {
183
-        	if ($flight['lastupdate'] < (time()-3000)) {
184
-            	    if (isset($this->all_flights[$key]['id'])) {
185
-            		if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n";
182
+			if (isset($flight['lastupdate'])) {
183
+			if ($flight['lastupdate'] < (time()-3000)) {
184
+					if (isset($this->all_flights[$key]['id'])) {
185
+					if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n";
186 186
 			/*
187 187
 			$SpotterLive = new SpotterLive();
188 188
             		$SpotterLive->deleteLiveSpotterDataById($this->all_flights[$key]['id']);
189 189
 			$SpotterLive->db = null;
190 190
 			*/
191 191
 			if (!isset($globalNoImport) || $globalNoImport === FALSE) {
192
-            		    $real_arrival = $this->arrival($key);
193
-            		    $Spotter = new Spotter($this->db);
194
-            	    	    if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
192
+						$real_arrival = $this->arrival($key);
193
+						$Spotter = new Spotter($this->db);
194
+							if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
195 195
 				$result = $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
196 196
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
197
-			    }
197
+				}
198 198
 			// Put in archive
199 199
 //				$Spotter->db = null;
200 200
 			}
201
-            	    }
202
-            	    unset($this->all_flights[$key]);
203
-    	        }
204
-	    }
205
-        }
206
-    }
201
+					}
202
+					unset($this->all_flights[$key]);
203
+				}
204
+		}
205
+		}
206
+	}
207 207
 
208
-    public function add($line) {
208
+	public function add($line) {
209 209
 	global $globalPilotIdAccept, $globalAirportAccept, $globalAirlineAccept, $globalAirlineIgnore, $globalAirportIgnore, $globalFork, $globalDistanceIgnore, $globalDaemon, $globalSBS1update, $globalDebug, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAirlinesSource, $globalVAM, $globalAllFlights, $globalServerAPRS, $APRSSpotter, $globalNoImport;
210 210
 	//if (!isset($globalDebugTimeElapsed) || $globalDebugTimeElapsed == '') $globalDebugTimeElapsed = FALSE;
211 211
 	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02';
@@ -230,18 +230,18 @@  discard block
 block discarded – undo
230 230
 	
231 231
 	// SBS format is CSV format
232 232
 	if(is_array($line) && (isset($line['hex']) || isset($line['id']))) {
233
-	    //print_r($line);
234
-  	    if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) {
233
+		//print_r($line);
234
+  		if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) {
235 235
 
236 236
 		// Increment message number
237 237
 		if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) {
238
-		    $current_date = date('Y-m-d');
239
-		    $source = $line['source_name'];
240
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
241
-		    if (!isset($this->stats[$current_date][$source]['msg'])) {
242
-		    	$this->stats[$current_date][$source]['msg']['date'] = time();
243
-		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
244
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
238
+			$current_date = date('Y-m-d');
239
+			$source = $line['source_name'];
240
+			if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
241
+			if (!isset($this->stats[$current_date][$source]['msg'])) {
242
+				$this->stats[$current_date][$source]['msg']['date'] = time();
243
+				$this->stats[$current_date][$source]['msg']['nb'] = 1;
244
+			} else $this->stats[$current_date][$source]['msg']['nb'] += 1;
245 245
 		}
246 246
 		
247 247
 		/*
@@ -257,34 +257,34 @@  discard block
 block discarded – undo
257 257
 		//$this->db = $dbc;
258 258
 
259 259
 		//$hex = trim($line['hex']);
260
-	        if (!isset($line['id'])) $id = trim($line['hex']);
261
-	        else $id = trim($line['id']);
260
+			if (!isset($line['id'])) $id = trim($line['hex']);
261
+			else $id = trim($line['id']);
262 262
 		
263 263
 		if (!isset($this->all_flights[$id])) {
264
-		    $this->all_flights[$id] = array();
265
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
266
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => ''));
267
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
268
-		    if (!isset($line['id'])) {
264
+			$this->all_flights[$id] = array();
265
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
266
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => ''));
267
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
268
+			if (!isset($line['id'])) {
269 269
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
270 270
 //			if (isset($line['format_source']) && ($line['format_source'] == 'sbs' || $line['format_source'] == 'tsv' || $line['format_source'] == 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'].'-'.date('YmdGi')));
271 271
 //			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
272 272
 			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
273
-		        //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
274
-		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
275
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
273
+				//else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
274
+			 } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
275
+			if ($globalAllFlights !== FALSE) $dataFound = true;
276 276
 		}
277 277
 		if (isset($line['source_type']) && $line['source_type'] != '') {
278
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type']));
278
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type']));
279 279
 		}
280 280
 		
281 281
 		//print_r($this->all_flights);
282 282
 		if (isset($line['hex']) && !isset($this->all_flights[$id]['hex']) && ctype_xdigit($line['hex'])) {
283
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex'])));
284
-		    //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
283
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex'])));
284
+			//if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
285 285
 			//$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
286
-		    //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
287
-		    if (!isset($line['aircraft_name']) && (!isset($line['aircraft_icao']) || $line['aircraft_icao'] == '????') && $line['format_source'] != 'whazzup' && $line['format_source'] != 'vatsimtxt' && $line['format_source'] != 'pireps' && $line['format_source'] != 'phpvmacars' && $line['format_source'] != 'vam' && $line['format_source'] != 'flightgearsp' && $line['format_source'] != 'flightgearmp') {
286
+			//} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
287
+			if (!isset($line['aircraft_name']) && (!isset($line['aircraft_icao']) || $line['aircraft_icao'] == '????') && $line['format_source'] != 'whazzup' && $line['format_source'] != 'vatsimtxt' && $line['format_source'] != 'pireps' && $line['format_source'] != 'phpvmacars' && $line['format_source'] != 'vam' && $line['format_source'] != 'flightgearsp' && $line['format_source'] != 'flightgearmp') {
288 288
 			$timeelapsed = microtime(true);
289 289
 			$Spotter = new Spotter($this->db);
290 290
 			if (isset($this->all_flights[$id]['source_type'])) {
@@ -295,9 +295,9 @@  discard block
 block discarded – undo
295 295
 			$Spotter->db = null;
296 296
 			if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
297 297
 			if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
298
-		    }
299
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
300
-		    if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
298
+			}
299
+			if ($globalAllFlights !== FALSE) $dataFound = true;
300
+			if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
301 301
 		}
302 302
 		if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') {
303 303
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $line['aircraft_icao']));
@@ -321,9 +321,9 @@  discard block
 block discarded – undo
321 321
 		}
322 322
 		//if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
323 323
 		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60) {
324
-		    if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
324
+			if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
325 325
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
326
-		    } else {
326
+			} else {
327 327
 				if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
328 328
 				elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
329 329
 				/*
@@ -332,41 +332,41 @@  discard block
 block discarded – undo
332 332
 				print_r($line);
333 333
 				*/
334 334
 				return '';
335
-		    }
335
+			}
336 336
 		} else {
337 337
 			date_default_timezone_set('UTC');
338 338
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
339 339
 		}
340 340
 
341 341
 		if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG') {
342
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration']));
342
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration']));
343 343
 		}
344 344
 		if (isset($line['waypoints']) && $line['waypoints'] != '') {
345
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints']));
345
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints']));
346 346
 		}
347 347
 		if (isset($line['pilot_id']) && $line['pilot_id'] != '') {
348
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => $line['pilot_id']));
348
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => $line['pilot_id']));
349 349
 		}
350 350
 		if (isset($line['pilot_name']) && $line['pilot_name'] != '') {
351
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => $line['pilot_name']));
351
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => $line['pilot_name']));
352 352
 		}
353 353
  
354 354
 		if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_flights[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9]+$/', $line['ident'])) {
355
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
356
-		    if ($this->all_flights[$id]['addedSpotter'] == 1) {
355
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
356
+			if ($this->all_flights[$id]['addedSpotter'] == 1) {
357 357
 			$timeelapsed = microtime(true);
358
-            		$Spotter = new Spotter($this->db);
359
-            		$fromsource = NULL;
360
-            		if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
361
-            		elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
358
+					$Spotter = new Spotter($this->db);
359
+					$fromsource = NULL;
360
+					if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
361
+					elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
362 362
 			elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao';
363 363
 			elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
364 364
 			elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
365
-            		$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
365
+					$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
366 366
 			if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
367 367
 			$Spotter->db = null;
368 368
 			if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
369
-		    }
369
+			}
370 370
 
371 371
 /*
372 372
 		    if (!isset($line['id'])) {
@@ -376,26 +376,26 @@  discard block
 block discarded – undo
376 376
 		        else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
377 377
 		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
378 378
   */
379
-		    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
379
+			if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
380 380
 
381
-		    //$putinarchive = true;
382
-		    if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
381
+			//$putinarchive = true;
382
+			if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
383 383
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time']));
384
-		    }
385
-		    if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) {
384
+			}
385
+			if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) {
386 386
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time']));
387
-		    }
388
-		    if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) {
389
-		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
390
-		    } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
387
+			}
388
+			if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) {
389
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
390
+			} elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
391 391
 				$timeelapsed = microtime(true);
392 392
 				$Spotter = new Spotter($this->db);
393 393
 				$line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']);
394 394
 				$line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']);
395
-		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
395
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
396 396
 				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
397 397
 
398
-		    } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
398
+			} elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
399 399
 			$timeelapsed = microtime(true);
400 400
 			$Spotter = new Spotter($this->db);
401 401
 			$route = $Spotter->getRouteInfo(trim($line['ident']));
@@ -409,67 +409,67 @@  discard block
 block discarded – undo
409 409
 			if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
410 410
 
411 411
 			if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) {
412
-			    //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
413
-			    if ($route['fromairport_icao'] != $route['toairport_icao']) {
412
+				//if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
413
+				if ($route['fromairport_icao'] != $route['toairport_icao']) {
414 414
 				//    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['FromAirport_ICAO'],'arrival_airport' => $route['ToAirport_ICAO'],'route_stop' => $route['RouteStop']));
415
-		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['fromairport_icao'],'arrival_airport' => $route['toairport_icao'],'route_stop' => $route['routestop']));
416
-		    	    }
415
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['fromairport_icao'],'arrival_airport' => $route['toairport_icao'],'route_stop' => $route['routestop']));
416
+					}
417 417
 			}
418 418
 			if (!isset($globalFork)) $globalFork = TRUE;
419 419
 			if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) {
420 420
 				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident']));
421 421
 			}
422
-		    }
422
+			}
423 423
 		}
424 424
 
425 425
 		if (isset($line['speed']) && $line['speed'] != '') {
426 426
 		//    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12]));
427
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed'])));
428
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true));
429
-		    //$dataFound = true;
427
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed'])));
428
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true));
429
+			//$dataFound = true;
430 430
 		} else if (!isset($this->all_flights[$id]['speed_fromsrc']) && isset($this->all_flights[$id]['time_last_coord']) && $this->all_flights[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) {
431
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m');
432
-		    if ($distance > 1000 && $distance < 10000) {
433
-		    // use datetime
431
+			$distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m');
432
+			if ($distance > 1000 && $distance < 10000) {
433
+			// use datetime
434 434
 			$speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']);
435 435
 			$speed = $speed*3.6;
436 436
 			if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed)));
437 437
   			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".$speed." - distance : ".$distance."\n";
438
-		    }
438
+			}
439 439
 		}
440 440
 
441 441
 
442 442
 
443
-	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
444
-	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
445
-	    	    else unset($timediff);
446
-	    	    if ($this->tmd > 5 || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) {
443
+			if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
444
+				if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
445
+				else unset($timediff);
446
+				if ($this->tmd > 5 || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) {
447 447
 			if (isset($this->all_flights[$id]['archive_latitude']) && isset($this->all_flights[$id]['archive_longitude']) && isset($this->all_flights[$id]['livedb_latitude']) && isset($this->all_flights[$id]['livedb_longitude'])) {
448
-			    if (!$Common->checkLine($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
448
+				if (!$Common->checkLine($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
449 449
 				$this->all_flights[$id]['archive_latitude'] = $line['latitude'];
450 450
 				$this->all_flights[$id]['archive_longitude'] = $line['longitude'];
451 451
 				$this->all_flights[$id]['putinarchive'] = true;
452 452
 				$this->tmd = 0;
453 453
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
454
-				    if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
455
-				    $timeelapsed = microtime(true);
456
-				    $Spotter = new Spotter($this->db);
457
-				    $all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
458
-				    if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2'];
459
-				    $Spotter->db = null;
460
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
461
-				    if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
454
+					if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
455
+					$timeelapsed = microtime(true);
456
+					$Spotter = new Spotter($this->db);
457
+					$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
458
+					if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2'];
459
+					$Spotter->db = null;
460
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
461
+					if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
462
+				}
462 463
 				}
463
-			    }
464 464
 			}
465 465
 
466 466
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
467
-			    //if (!isset($this->all_flights[$id]['latitude']) || $this->all_flights[$id]['latitude'] == '' || abs($this->all_flights[$id]['latitude']-$line['latitude']) < 3 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
467
+				//if (!isset($this->all_flights[$id]['latitude']) || $this->all_flights[$id]['latitude'] == '' || abs($this->all_flights[$id]['latitude']-$line['latitude']) < 3 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
468 468
 				if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude'];
469 469
 				if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') {
470
-				    $this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
471
-				    $dataFound = true;
472
-				    $this->all_flights[$id]['time_last_coord'] = time();
470
+					$this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
471
+					$dataFound = true;
472
+					$this->all_flights[$id]['time_last_coord'] = time();
473 473
 				}
474 474
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
475 475
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude']));
@@ -480,20 +480,20 @@  discard block
 block discarded – undo
480 480
 				    //$putinarchive = true;
481 481
 				}
482 482
 				*/
483
-			    /*
483
+				/*
484 484
 			    } elseif (isset($this->all_flights[$id]['latitude'])) {
485 485
 				if ($globalDebug) echo '!!! Strange latitude value - diff : '.abs($this->all_flights[$id]['latitude']-$line['latitude']).'- previous lat : '.$this->all_flights[$id]['latitude'].'- new lat : '.$line['latitude']."\n";
486 486
 			    }
487 487
 			    */
488 488
 			}
489 489
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
490
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
491
-			    //if (!isset($this->all_flights[$id]['longitude']) || $this->all_flights[$id]['longitude'] == ''  || abs($this->all_flights[$id]['longitude']-$line['longitude']) < 2 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
490
+				if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
491
+				//if (!isset($this->all_flights[$id]['longitude']) || $this->all_flights[$id]['longitude'] == ''  || abs($this->all_flights[$id]['longitude']-$line['longitude']) < 2 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
492 492
 				if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude'];
493 493
 				if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') {
494
-				    $this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
495
-				    $dataFound = true;
496
-				    $this->all_flights[$id]['time_last_coord'] = time();
494
+					$this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
495
+					$dataFound = true;
496
+					$this->all_flights[$id]['time_last_coord'] = time();
497 497
 				}
498 498
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
499 499
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude']));
@@ -511,54 +511,54 @@  discard block
 block discarded – undo
511 511
 			    */
512 512
 			}
513 513
 
514
-		    } else if ($globalDebug && $timediff > 20) {
514
+			} else if ($globalDebug && $timediff > 20) {
515 515
 			$this->tmd = $this->tmd + 1;
516 516
 			echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n";
517 517
 			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -";
518 518
 			echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
519 519
 			echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n";
520
-		    }
520
+			}
521 521
 		}
522 522
 		if (isset($line['last_update']) && $line['last_update'] != '') {
523
-		    if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
524
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
523
+			if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
524
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
525 525
 		}
526 526
 		if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
527
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate']));
528
-		    //$dataFound = true;
527
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate']));
528
+			//$dataFound = true;
529 529
 		}
530 530
 		if (isset($line['format_source']) && $line['format_source'] != '') {
531
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source']));
531
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source']));
532 532
 		}
533 533
 		if (isset($line['source_name']) && $line['source_name'] != '') {
534
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name']));
534
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name']));
535 535
 		}
536 536
 		if (isset($line['emergency']) && $line['emergency'] != '') {
537
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency']));
538
-		    //$dataFound = true;
537
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency']));
538
+			//$dataFound = true;
539 539
 		}
540 540
 		if (isset($line['ground']) && $line['ground'] != '') {
541
-		    if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) {
541
+			if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) {
542 542
 			// Here we force archive of flight because after ground it's a new one (or should be)
543 543
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
544 544
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
545 545
 			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdGi')));
546
-		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
546
+				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
547 547
 			elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
548
-		    }
549
-		    if ($line['ground'] != 1) $line['ground'] = 0;
550
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
551
-		    //$dataFound = true;
548
+			}
549
+			if ($line['ground'] != 1) $line['ground'] = 0;
550
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
551
+			//$dataFound = true;
552 552
 		}
553 553
 		if (isset($line['squawk']) && $line['squawk'] != '') {
554
-		    if (isset($this->all_flights[$id]['squawk']) && $this->all_flights[$id]['squawk'] != '7500' && $this->all_flights[$id]['squawk'] != '7600' && $this->all_flights[$id]['squawk'] != '7700' && isset($this->all_flights[$id]['id'])) {
555
-			    if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
556
-			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
557
-			    $highlight = '';
558
-			    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
559
-			    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
560
-			    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
561
-			    if ($highlight != '') {
554
+			if (isset($this->all_flights[$id]['squawk']) && $this->all_flights[$id]['squawk'] != '7500' && $this->all_flights[$id]['squawk'] != '7600' && $this->all_flights[$id]['squawk'] != '7700' && isset($this->all_flights[$id]['id'])) {
555
+				if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
556
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
557
+				$highlight = '';
558
+				if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
559
+				if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
560
+				if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
561
+				if ($highlight != '') {
562 562
 				$timeelapsed = microtime(true);
563 563
 				$Spotter = new Spotter($this->db);
564 564
 				$Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
@@ -567,38 +567,38 @@  discard block
 block discarded – undo
567 567
 
568 568
 				//$putinarchive = true;
569 569
 				//$highlight = '';
570
-			    }
570
+				}
571 571
 			    
572
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
573
-		    //$dataFound = true;
572
+			} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
573
+			//$dataFound = true;
574 574
 		}
575 575
 
576 576
 		if (isset($line['altitude']) && $line['altitude'] != '') {
577
-		    //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
577
+			//if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
578 578
 			if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) $this->all_flights[$id]['putinarchive'] = true;
579 579
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100)));
580 580
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude']));
581 581
 			//$dataFound = true;
582
-		    //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
582
+			//} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
583 583
   		}
584 584
 
585 585
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
586
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true));
586
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true));
587 587
 		}
588 588
 		
589 589
 		if (isset($line['heading']) && $line['heading'] != '') {
590
-		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
591
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
592
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
593
-		    //$dataFound = true;
590
+			if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
591
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
592
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
593
+			//$dataFound = true;
594 594
   		} elseif (!isset($this->all_flights[$id]['heading_fromsrc']) && isset($this->all_flights[$id]['archive_latitude']) && $this->all_flights[$id]['archive_latitude'] != $this->all_flights[$id]['latitude'] && isset($this->all_flights[$id]['archive_longitude']) && $this->all_flights[$id]['archive_longitude'] != $this->all_flights[$id]['longitude']) {
595
-  		    $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
596
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
597
-		    if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
598
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
595
+  			$heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
596
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
597
+			if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
598
+  			if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
599 599
   		} elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') {
600
-  		    // If not enough messages and ACARS set heading to 0
601
-  		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
600
+  			// If not enough messages and ACARS set heading to 0
601
+  			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
602 602
   		}
603 603
 		if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
604 604
 		elseif (isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
@@ -609,121 +609,121 @@  discard block
 block discarded – undo
609 609
 		//if ($dataFound == true && isset($this->all_flights[$id]['hex']) && $this->all_flights[$id]['ident'] != '' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
610 610
 		//if ($dataFound === true && isset($this->all_flights[$id]['hex']) && $this->all_flights[$id]['heading'] != '' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
611 611
 		if ($dataFound === true && isset($this->all_flights[$id]['hex'])) {
612
-		    $this->all_flights[$id]['lastupdate'] = time();
613
-		    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) {
614
-		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == ''  || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
615
-			    //print_r($this->all_flights);
616
-			    //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n";
617
-			    //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
618
-			    if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) {
612
+			$this->all_flights[$id]['lastupdate'] = time();
613
+			if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) {
614
+				if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == ''  || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
615
+				//print_r($this->all_flights);
616
+				//echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n";
617
+				//$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
618
+				if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) {
619 619
 				if ($globalDebug) echo "Check if aircraft is already in DB...";
620 620
 				$timeelapsed = microtime(true);
621 621
 				$SpotterLive = new SpotterLive($this->db);
622 622
 				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson')) {
623
-				    $recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']);
624
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
623
+					$recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']);
624
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
625 625
 				} elseif (isset($line['id'])) {
626
-				    $recent_ident = $SpotterLive->checkIdRecent($line['id']);
627
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
626
+					$recent_ident = $SpotterLive->checkIdRecent($line['id']);
627
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
628 628
 				} elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
629
-				    $recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']);
630
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
629
+					$recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']);
630
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
631 631
 				} else $recent_ident = '';
632 632
 				$SpotterLive->db=null;
633 633
 
634 634
 				if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
635 635
 				elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
636
-			    } else {
636
+				} else {
637 637
 				$recent_ident = '';
638 638
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0));
639
-			    }
640
-			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
641
-			    if($recent_ident == "")
642
-			    {
639
+				}
640
+				//if there was no aircraft with the same callsign within the last hour and go post it into the archive
641
+				if($recent_ident == "")
642
+				{
643 643
 				if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : ";
644 644
 				if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
645 645
 				if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
646 646
 				//adds the spotter data for the archive
647 647
 				$ignoreImport = false;
648 648
 				foreach($globalAirportIgnore as $airportIgnore) {
649
-				    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
649
+					if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
650 650
 					$ignoreImport = true;
651
-				    }
651
+					}
652 652
 				}
653 653
 				if (count($globalAirportAccept) > 0) {
654
-				    $ignoreImport = true;
655
-				    foreach($globalAirportIgnore as $airportIgnore) {
654
+					$ignoreImport = true;
655
+					foreach($globalAirportIgnore as $airportIgnore) {
656 656
 					if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
657
-					    $ignoreImport = false;
657
+						$ignoreImport = false;
658
+					}
658 659
 					}
659
-				    }
660 660
 				}
661 661
 				if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
662
-				    foreach($globalAirlineIgnore as $airlineIgnore) {
662
+					foreach($globalAirlineIgnore as $airlineIgnore) {
663 663
 					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) {
664
-					    $ignoreImport = true;
664
+						$ignoreImport = true;
665
+					}
665 666
 					}
666
-				    }
667 667
 				}
668 668
 				if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
669
-				    $ignoreImport = true;
670
-				    foreach($globalAirlineAccept as $airlineAccept) {
669
+					$ignoreImport = true;
670
+					foreach($globalAirlineAccept as $airlineAccept) {
671 671
 					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) {
672
-					    $ignoreImport = false;
672
+						$ignoreImport = false;
673
+					}
673 674
 					}
674
-				    }
675 675
 				}
676 676
 				if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
677
-				    $ignoreImport = true;
678
-				    foreach($globalPilotIdAccept as $pilotIdAccept) {
677
+					$ignoreImport = true;
678
+					foreach($globalPilotIdAccept as $pilotIdAccept) {
679 679
 					if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
680
-					    $ignoreImport = false;
680
+						$ignoreImport = false;
681
+					}
681 682
 					}
682
-				    }
683 683
 				}
684 684
 				
685 685
 				if (!$ignoreImport) {
686
-				    $highlight = '';
687
-				    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
688
-				    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
689
-				    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
690
-				    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
691
-				    $timeelapsed = microtime(true);
692
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
686
+					$highlight = '';
687
+					if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
688
+					if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
689
+					if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
690
+					if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
691
+					$timeelapsed = microtime(true);
692
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
693 693
 					$Spotter = new Spotter($this->db);
694 694
 					$result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['source_type']);
695 695
 					$Spotter->db = null;
696 696
 					if ($globalDebug && isset($result)) echo $result."\n";
697
-				    }
698
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
697
+					}
698
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
699 699
 				    
700
-				    // Add source stat in DB
701
-				    $Stats = new Stats($this->db);
702
-				    if (!empty($this->stats)) {
700
+					// Add source stat in DB
701
+					$Stats = new Stats($this->db);
702
+					if (!empty($this->stats)) {
703 703
 					if ($globalDebug) echo 'Add source stats : ';
704
-				        foreach($this->stats as $date => $data) {
705
-					    foreach($data as $source => $sourced) {
706
-					        //print_r($sourced);
707
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
708
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
709
-				    		if (isset($sourced['msg'])) {
710
-				    		    if (time() - $sourced['msg']['date'] > 10) {
711
-				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
712
-				    		        echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
713
-			    			        unset($this->stats[$date][$source]['msg']);
714
-			    			    }
715
-			    			}
716
-			    		    }
717
-			    		    if ($date != date('Y-m-d')) {
718
-			    			unset($this->stats[$date]);
719
-			    		    }
720
-				    	}
721
-				    	if ($globalDebug) echo 'Done'."\n";
722
-
723
-				    }
724
-				    $Stats->db = null;
704
+						foreach($this->stats as $date => $data) {
705
+						foreach($data as $source => $sourced) {
706
+							//print_r($sourced);
707
+								if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
708
+								if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
709
+							if (isset($sourced['msg'])) {
710
+								if (time() - $sourced['msg']['date'] > 10) {
711
+									$nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
712
+									echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
713
+									unset($this->stats[$date][$source]['msg']);
714
+								}
715
+							}
716
+							}
717
+							if ($date != date('Y-m-d')) {
718
+							unset($this->stats[$date]);
719
+							}
720
+						}
721
+						if ($globalDebug) echo 'Done'."\n";
722
+
723
+					}
724
+					$Stats->db = null;
725 725
 				    
726
-				    $this->del();
726
+					$this->del();
727 727
 				} elseif ($globalDebug) echo 'Ignore data'."\n";
728 728
 				//$ignoreImport = false;
729 729
 				$this->all_flights[$id]['addedSpotter'] = 1;
@@ -741,37 +741,37 @@  discard block
 block discarded – undo
741 741
 			*/
742 742
 			//SpotterLive->deleteLiveSpotterDataByIdent($this->all_flights[$id]['ident']);
743 743
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
744
-				    if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours...";
745
-				    //SpotterLive->deleteLiveSpotterDataNotUpdated();
746
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
744
+					if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours...";
745
+					//SpotterLive->deleteLiveSpotterDataNotUpdated();
746
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
747 747
 					$SpotterLive = new SpotterLive($this->db);
748 748
 					$SpotterLive->deleteLiveSpotterData();
749 749
 					$SpotterLive->db=null;
750
-				    }
751
-				    if ($globalDebug) echo " Done\n";
752
-				    $this->last_delete = time();
750
+					}
751
+					if ($globalDebug) echo " Done\n";
752
+					$this->last_delete = time();
753 753
 				}
754
-			    } else {
754
+				} else {
755 755
 				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt'|| $line['format_source'] === 'planeupdatefaa'  || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson')) {
756
-				    $this->all_flights[$id]['id'] = $recent_ident;
757
-				    $this->all_flights[$id]['addedSpotter'] = 1;
756
+					$this->all_flights[$id]['id'] = $recent_ident;
757
+					$this->all_flights[$id]['addedSpotter'] = 1;
758 758
 				}
759 759
 				if (isset($globalDaemon) && !$globalDaemon) {
760
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
760
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
761 761
 					$Spotter = new Spotter($this->db);
762 762
 					$Spotter->updateLatestSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time']);
763 763
 					$Spotter->db = null;
764
-				    }
764
+					}
765 765
 				}
766 766
 				
767
-			    }
767
+				}
768 768
 			}
769
-		    }
770
-		    //adds the spotter LIVE data
771
-		    //SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed);
772
-		    //echo "\nAdd in Live !! \n";
773
-		    //echo "{$line[8]} {$line[7]} - MODES:{$line[4]}  CALLSIGN:{$line[10]}   ALT:{$line[11]}   VEL:{$line[12]}   HDG:{$line[13]}   LAT:{$line[14]}   LON:{$line[15]}   VR:{$line[16]}   SQUAWK:{$line[17]}\n";
774
-		    if ($globalDebug) {
769
+			}
770
+			//adds the spotter LIVE data
771
+			//SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed);
772
+			//echo "\nAdd in Live !! \n";
773
+			//echo "{$line[8]} {$line[7]} - MODES:{$line[4]}  CALLSIGN:{$line[10]}   ALT:{$line[11]}   VEL:{$line[12]}   HDG:{$line[13]}   LAT:{$line[14]}   LON:{$line[15]}   VR:{$line[16]}   SQUAWK:{$line[17]}\n";
774
+			if ($globalDebug) {
775 775
 			if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM)) {
776 776
 				if (isset($this->all_flights[$id]['source_name'])) echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name'].' - Source name : '.$this->all_flights[$id]['source_name']."\n";
777 777
 				else echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name']."\n";
@@ -779,49 +779,49 @@  discard block
 block discarded – undo
779 779
 				if (isset($this->all_flights[$id]['source_name'])) echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Source Name : '.$this->all_flights[$id]['source_name']."\n";
780 780
 				else echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time']."\n";
781 781
 			}
782
-		    }
783
-		    $ignoreImport = false;
784
-		    if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
785
-		    if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
782
+			}
783
+			$ignoreImport = false;
784
+			if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
785
+			if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
786 786
 
787
-		    foreach($globalAirportIgnore as $airportIgnore) {
788
-		        if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
789
-			    $ignoreImport = true;
787
+			foreach($globalAirportIgnore as $airportIgnore) {
788
+				if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
789
+				$ignoreImport = true;
790
+			}
790 791
 			}
791
-		    }
792
-		    if (count($globalAirportAccept) > 0) {
793
-		        $ignoreImport = true;
794
-		        foreach($globalAirportIgnore as $airportIgnore) {
795
-			    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
792
+			if (count($globalAirportAccept) > 0) {
793
+				$ignoreImport = true;
794
+				foreach($globalAirportIgnore as $airportIgnore) {
795
+				if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
796 796
 				$ignoreImport = false;
797
-			    }
797
+				}
798 798
 			}
799
-		    }
800
-		    if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
799
+			}
800
+			if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
801 801
 			foreach($globalAirlineIgnore as $airlineIgnore) {
802
-			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) {
802
+				if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) {
803 803
 				$ignoreImport = true;
804
-			    }
804
+				}
805 805
 			}
806
-		    }
807
-		    if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
806
+			}
807
+			if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
808 808
 			$ignoreImport = true;
809 809
 			foreach($globalAirlineAccept as $airlineAccept) {
810
-			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) {
810
+				if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) {
811 811
 				$ignoreImport = false;
812
-			    }
812
+				}
813
+			}
813 814
 			}
814
-		    }
815
-		    if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
815
+			if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
816 816
 			$ignoreImport = true;
817 817
 			foreach($globalPilotIdAccept as $pilotIdAccept) {
818
-			    if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
819
-			        $ignoreImport = false;
820
-			    }
818
+				if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
819
+					$ignoreImport = false;
820
+				}
821
+			}
821 822
 			}
822
-		    }
823 823
 
824
-		    if (!$ignoreImport) {
824
+			if (!$ignoreImport) {
825 825
 			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
826 826
 				if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
827 827
 				$timeelapsed = microtime(true);
@@ -867,7 +867,7 @@  discard block
 block discarded – undo
867 867
 					if ($stats_heading == 16) $stats_heading = 0;
868 868
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
869 869
 						for ($i=0;$i<=15;$i++) {
870
-						    $this->stats[$current_date][$source]['polar'][$i] = 0;
870
+							$this->stats[$current_date][$source]['polar'][$i] = 0;
871 871
 						}
872 872
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
873 873
 					} else {
@@ -880,11 +880,11 @@  discard block
 block discarded – undo
880 880
 					//var_dump($this->stats);
881 881
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
882 882
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
883
-						    end($this->stats[$current_date][$source]['hist']);
884
-						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
883
+							end($this->stats[$current_date][$source]['hist']);
884
+							$mini = key($this->stats[$current_date][$source]['hist'])+10;
885 885
 						} else $mini = 0;
886 886
 						for ($i=$mini;$i<=$distance;$i+=10) {
887
-						    $this->stats[$current_date][$source]['hist'][$i] = 0;
887
+							$this->stats[$current_date][$source]['hist'][$i] = 0;
888 888
 						}
889 889
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
890 890
 					} else {
@@ -899,7 +899,7 @@  discard block
 block discarded – undo
899 899
 			//$this->del();
900 900
 			
901 901
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
902
-			    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
902
+				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
903 903
 				if ($globalDebug) echo "---- Deleting Live Spotter data Not updated since 2 hour...";
904 904
 				$SpotterLive = new SpotterLive($this->db);
905 905
 				$SpotterLive->deleteLiveSpotterDataNotUpdated();
@@ -907,19 +907,19 @@  discard block
 block discarded – undo
907 907
 				//SpotterLive->deleteLiveSpotterData();
908 908
 				if ($globalDebug) echo " Done\n";
909 909
 				$this->last_delete_hourly = time();
910
-			    } else {
910
+				} else {
911 911
 				$this->del();
912 912
 				$this->last_delete_hourly = time();
913
-			    }
913
+				}
914 914
 			}
915 915
 			
916
-		    }
917
-		    //$ignoreImport = false;
916
+			}
917
+			//$ignoreImport = false;
918 918
 		}
919 919
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
920 920
 		if ($send) return $this->all_flights[$id];
921
-	    }
921
+		}
922
+	}
922 923
 	}
923
-    }
924 924
 }
925 925
 ?>
Please login to merge, or discard this patch.