Completed
Push — master ( 807a07...04cf69 )
by Yannick
19:02
created
scripts/daemon-spotter.php 2 patches
Indentation   +867 added lines, -867 removed lines patch added patch discarded remove patch
@@ -15,8 +15,8 @@  discard block
 block discarded – undo
15 15
 require_once(dirname(__FILE__).'/../require/class.Common.php');
16 16
 if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
17 17
 if (isset($globalMarine) && $globalMarine) {
18
-    require_once(dirname(__FILE__).'/../require/class.AIS.php');
19
-    require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
18
+	require_once(dirname(__FILE__).'/../require/class.AIS.php');
19
+	require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
20 20
 }
21 21
 
22 22
 if (!isset($globalDebug)) $globalDebug = FALSE;
@@ -24,42 +24,42 @@  discard block
 block discarded – undo
24 24
 // Check if schema is at latest version
25 25
 $Connection = new Connection();
26 26
 if ($Connection->latest() === false) {
27
-    echo "You MUST update to latest schema. Run install/index.php";
28
-    exit();
27
+	echo "You MUST update to latest schema. Run install/index.php";
28
+	exit();
29 29
 }
30 30
 if (PHP_SAPI != 'cli') {
31
-    echo "This script MUST be called from console, not a web browser.";
31
+	echo "This script MUST be called from console, not a web browser.";
32 32
 //    exit();
33 33
 }
34 34
 
35 35
 // This is to be compatible with old version of settings.php
36 36
 if (!isset($globalSources)) {
37
-    if (isset($globalSBS1Hosts)) {
38
-        //$hosts = $globalSBS1Hosts;
39
-        foreach ($globalSBS1Hosts as $host) {
40
-	    $globalSources[] = array('host' => $host);
41
-    	}
42
-    } else {
43
-        if (!isset($globalSBS1Host)) {
44
-	    echo '$globalSources MUST be defined !';
45
-	    die;
37
+	if (isset($globalSBS1Hosts)) {
38
+		//$hosts = $globalSBS1Hosts;
39
+		foreach ($globalSBS1Hosts as $host) {
40
+		$globalSources[] = array('host' => $host);
41
+		}
42
+	} else {
43
+		if (!isset($globalSBS1Host)) {
44
+		echo '$globalSources MUST be defined !';
45
+		die;
46 46
 	}
47 47
 	//$hosts = array($globalSBS1Host.':'.$globalSBS1Port);
48 48
 	$globalSources[] = array('host' => $globalSBS1Host,'port' => $globalSBS1Port);
49
-    }
49
+	}
50 50
 }
51 51
 
52 52
 $options = getopt('s::',array('source::','server','nodaemon','idsource::','aprsserverssid::','aprsserverpass::','aprsserverhost::','aprsserverport::','format::','noaprsserver'));
53 53
 //if (isset($options['s'])) $hosts = array($options['s']);
54 54
 //elseif (isset($options['source'])) $hosts = array($options['source']);
55 55
 if (isset($options['s'])) {
56
-    $globalSources = array();
57
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']);
58
-    else $globalSources[] = array('host' => $options['s']);
56
+	$globalSources = array();
57
+	if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']);
58
+	else $globalSources[] = array('host' => $options['s']);
59 59
 } elseif (isset($options['source'])) {
60
-    $globalSources = array();
61
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']);
62
-    else $globalSources[] = array('host' => $options['source']);
60
+	$globalSources = array();
61
+	if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']);
62
+	else $globalSources[] = array('host' => $options['source']);
63 63
 }
64 64
 if (isset($options['aprsserverhost'])) {
65 65
 	$globalServerAPRS = TRUE;
@@ -74,8 +74,8 @@  discard block
 block discarded – undo
74 74
 if (isset($options['idsource'])) $id_source = $options['idsource'];
75 75
 else $id_source = 1;
76 76
 if (isset($globalServer) && $globalServer) {
77
-    if ($globalDebug) echo "Using Server Mode\n";
78
-    $SI=new SpotterServer();
77
+	if ($globalDebug) echo "Using Server Mode\n";
78
+	$SI=new SpotterServer();
79 79
 /*
80 80
     require_once(dirname(__FILE__).'/../require/class.APRS.php');
81 81
     $SI = new adsb2aprs();
@@ -84,8 +84,8 @@  discard block
 block discarded – undo
84 84
 } else $SI=new SpotterImport($Connection->db);
85 85
 if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db);
86 86
 if (isset($globalMarine) && $globalMarine) {
87
-    $AIS = new AIS();
88
-    $MI = new MarineImport($Connection->db);
87
+	$AIS = new AIS();
88
+	$MI = new MarineImport($Connection->db);
89 89
 }
90 90
 //$APRS=new APRS($Connection->db);
91 91
 $SBS=new SBS();
@@ -95,12 +95,12 @@  discard block
 block discarded – undo
95 95
 //$servertz = system('date +%Z');
96 96
 // signal handler - playing nice with sockets and dump1090
97 97
 if (function_exists('pcntl_fork')) {
98
-    pcntl_signal(SIGINT,  function() {
99
-        global $sockets;
100
-        echo "\n\nctrl-c or kill signal received. Tidying up ... ";
101
-        die("Bye!\n");
102
-    });
103
-    pcntl_signal_dispatch();
98
+	pcntl_signal(SIGINT,  function() {
99
+		global $sockets;
100
+		echo "\n\nctrl-c or kill signal received. Tidying up ... ";
101
+		die("Bye!\n");
102
+	});
103
+	pcntl_signal_dispatch();
104 104
 }
105 105
 
106 106
 // let's try and connect
@@ -110,153 +110,153 @@  discard block
 block discarded – undo
110 110
 $reset = 0;
111 111
 
112 112
 function connect_all($hosts) {
113
-    //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
114
-    global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;
115
-    $reset++;
116
-    if ($globalDebug) echo 'Connect to all...'."\n";
117
-    foreach ($hosts as $id => $value) {
113
+	//global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
114
+	global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;
115
+	$reset++;
116
+	if ($globalDebug) echo 'Connect to all...'."\n";
117
+	foreach ($hosts as $id => $value) {
118 118
 	$host = $value['host'];
119 119
 	$globalSources[$id]['last_exec'] = 0;
120 120
 	// Here we check type of source(s)
121 121
 	if (filter_var($host,FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) {
122
-            if (preg_match('/deltadb.txt$/i',$host)) {
123
-        	//$formats[$id] = 'deltadbtxt';
124
-        	$globalSources[$id]['format'] = 'deltadbtxt';
125
-        	//$last_exec['deltadbtxt'] = 0;
126
-        	if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
127
-            } else if (preg_match('/vatsim-data.txt$/i',$host)) {
128
-        	//$formats[$id] = 'vatsimtxt';
129
-        	$globalSources[$id]['format'] = 'vatsimtxt';
130
-        	//$last_exec['vatsimtxt'] = 0;
131
-        	if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
132
-    	    } else if (preg_match('/aircraftlist.json$/i',$host)) {
133
-        	//$formats[$id] = 'aircraftlistjson';
134
-        	$globalSources[$id]['format'] = 'aircraftlistjson';
135
-        	//$last_exec['aircraftlistjson'] = 0;
136
-        	if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
137
-    	    } else if (preg_match('/opensky/i',$host)) {
138
-        	//$formats[$id] = 'aircraftlistjson';
139
-        	$globalSources[$id]['format'] = 'opensky';
140
-        	//$last_exec['aircraftlistjson'] = 0;
141
-        	if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
142
-    	    } else if (preg_match('/radarvirtuel.com\/file.json$/i',$host)) {
143
-        	//$formats[$id] = 'radarvirtueljson';
144
-        	$globalSources[$id]['format'] = 'radarvirtueljson';
145
-        	//$last_exec['radarvirtueljson'] = 0;
146
-        	if ($globalDebug) echo "Connect to radarvirtuel.com/file.json source (".$host.")...\n";
147
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
148
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
149
-        	    exit(0);
150
-        	}
151
-    	    } else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
152
-        	//$formats[$id] = 'planeupdatefaa';
153
-        	$globalSources[$id]['format'] = 'planeupdatefaa';
154
-        	//$last_exec['planeupdatefaa'] = 0;
155
-        	if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
156
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
157
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
158
-        	    exit(0);
159
-        	}
160
-            } else if (preg_match('/\/action.php\/acars\/data$/i',$host)) {
161
-        	//$formats[$id] = 'phpvmacars';
162
-        	$globalSources[$id]['format'] = 'phpvmacars';
163
-        	//$last_exec['phpvmacars'] = 0;
164
-        	if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
165
-            } else if (preg_match('/VAM-json.php$/i',$host)) {
166
-        	//$formats[$id] = 'phpvmacars';
167
-        	$globalSources[$id]['format'] = 'vam';
168
-        	if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
169
-            } else if (preg_match('/whazzup/i',$host)) {
170
-        	//$formats[$id] = 'whazzup';
171
-        	$globalSources[$id]['format'] = 'whazzup';
172
-        	//$last_exec['whazzup'] = 0;
173
-        	if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
174
-            } else if (preg_match('/recentpireps/i',$host)) {
175
-        	//$formats[$id] = 'pirepsjson';
176
-        	$globalSources[$id]['format'] = 'pirepsjson';
177
-        	//$last_exec['pirepsjson'] = 0;
178
-        	if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
179
-            } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
180
-        	//$formats[$id] = 'fr24json';
181
-        	$globalSources[$id]['format'] = 'fr24json';
182
-        	//$last_exec['fr24json'] = 0;
183
-        	if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n";
184
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
185
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
186
-        	    exit(0);
187
-        	}
188
-            } else if (preg_match(':myshiptracking.com/:i',$host)) {
189
-        	//$formats[$id] = 'fr24json';
190
-        	$globalSources[$id]['format'] = 'myshiptracking';
191
-        	//$last_exec['fr24json'] = 0;
192
-        	if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n";
193
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
194
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
195
-        	    exit(0);
196
-        	}
197
-            //} else if (preg_match('/10001/',$host)) {
198
-            } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
199
-        	//$formats[$id] = 'tsv';
200
-        	$globalSources[$id]['format'] = 'tsv';
201
-        	if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
202
-            }
203
-        } elseif (filter_var($host,FILTER_VALIDATE_URL)) {
204
-    		if ($globalSources[$id]['format'] == 'aisnmeahttp') {
205
-    		    $idf = fopen($globalSources[$id]['host'],'r',false,$context);
206
-    		    if ($idf !== false) {
207
-    			$httpfeeds[$id] = $idf;
208
-        		if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
209
-    		    }
210
-    		    elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
211
-    		} elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
212
-        } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
213
-	    $hostport = explode(':',$host);
214
-	    if (isset($hostport[1])) {
122
+			if (preg_match('/deltadb.txt$/i',$host)) {
123
+			//$formats[$id] = 'deltadbtxt';
124
+			$globalSources[$id]['format'] = 'deltadbtxt';
125
+			//$last_exec['deltadbtxt'] = 0;
126
+			if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
127
+			} else if (preg_match('/vatsim-data.txt$/i',$host)) {
128
+			//$formats[$id] = 'vatsimtxt';
129
+			$globalSources[$id]['format'] = 'vatsimtxt';
130
+			//$last_exec['vatsimtxt'] = 0;
131
+			if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
132
+			} else if (preg_match('/aircraftlist.json$/i',$host)) {
133
+			//$formats[$id] = 'aircraftlistjson';
134
+			$globalSources[$id]['format'] = 'aircraftlistjson';
135
+			//$last_exec['aircraftlistjson'] = 0;
136
+			if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
137
+			} else if (preg_match('/opensky/i',$host)) {
138
+			//$formats[$id] = 'aircraftlistjson';
139
+			$globalSources[$id]['format'] = 'opensky';
140
+			//$last_exec['aircraftlistjson'] = 0;
141
+			if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
142
+			} else if (preg_match('/radarvirtuel.com\/file.json$/i',$host)) {
143
+			//$formats[$id] = 'radarvirtueljson';
144
+			$globalSources[$id]['format'] = 'radarvirtueljson';
145
+			//$last_exec['radarvirtueljson'] = 0;
146
+			if ($globalDebug) echo "Connect to radarvirtuel.com/file.json source (".$host.")...\n";
147
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
148
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
149
+				exit(0);
150
+			}
151
+			} else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
152
+			//$formats[$id] = 'planeupdatefaa';
153
+			$globalSources[$id]['format'] = 'planeupdatefaa';
154
+			//$last_exec['planeupdatefaa'] = 0;
155
+			if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
156
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
157
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
158
+				exit(0);
159
+			}
160
+			} else if (preg_match('/\/action.php\/acars\/data$/i',$host)) {
161
+			//$formats[$id] = 'phpvmacars';
162
+			$globalSources[$id]['format'] = 'phpvmacars';
163
+			//$last_exec['phpvmacars'] = 0;
164
+			if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
165
+			} else if (preg_match('/VAM-json.php$/i',$host)) {
166
+			//$formats[$id] = 'phpvmacars';
167
+			$globalSources[$id]['format'] = 'vam';
168
+			if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
169
+			} else if (preg_match('/whazzup/i',$host)) {
170
+			//$formats[$id] = 'whazzup';
171
+			$globalSources[$id]['format'] = 'whazzup';
172
+			//$last_exec['whazzup'] = 0;
173
+			if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
174
+			} else if (preg_match('/recentpireps/i',$host)) {
175
+			//$formats[$id] = 'pirepsjson';
176
+			$globalSources[$id]['format'] = 'pirepsjson';
177
+			//$last_exec['pirepsjson'] = 0;
178
+			if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
179
+			} else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
180
+			//$formats[$id] = 'fr24json';
181
+			$globalSources[$id]['format'] = 'fr24json';
182
+			//$last_exec['fr24json'] = 0;
183
+			if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n";
184
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
185
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
186
+				exit(0);
187
+			}
188
+			} else if (preg_match(':myshiptracking.com/:i',$host)) {
189
+			//$formats[$id] = 'fr24json';
190
+			$globalSources[$id]['format'] = 'myshiptracking';
191
+			//$last_exec['fr24json'] = 0;
192
+			if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n";
193
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
194
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
195
+				exit(0);
196
+			}
197
+			//} else if (preg_match('/10001/',$host)) {
198
+			} else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
199
+			//$formats[$id] = 'tsv';
200
+			$globalSources[$id]['format'] = 'tsv';
201
+			if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
202
+			}
203
+		} elseif (filter_var($host,FILTER_VALIDATE_URL)) {
204
+			if ($globalSources[$id]['format'] == 'aisnmeahttp') {
205
+				$idf = fopen($globalSources[$id]['host'],'r',false,$context);
206
+				if ($idf !== false) {
207
+				$httpfeeds[$id] = $idf;
208
+				if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
209
+				}
210
+				elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
211
+			} elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
212
+		} elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
213
+		$hostport = explode(':',$host);
214
+		if (isset($hostport[1])) {
215 215
 		$port = $hostport[1];
216 216
 		$hostn = $hostport[0];
217
-	    } else {
217
+		} else {
218 218
 		$port = $globalSources[$id]['port'];
219 219
 		$hostn = $globalSources[$id]['host'];
220
-	    }
221
-	    $Common = new Common();
222
-	    if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
223
-        	$s = $Common->create_socket($hostn,$port, $errno, $errstr);
224
-    	    } else {
225
-        	$s = $Common->create_socket_udp($hostn,$port, $errno, $errstr);
226
-	    }
227
-	    if ($s) {
228
-    	        $sockets[$id] = $s;
229
-    	        if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
230
-		    if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') {
220
+		}
221
+		$Common = new Common();
222
+		if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
223
+			$s = $Common->create_socket($hostn,$port, $errno, $errstr);
224
+			} else {
225
+			$s = $Common->create_socket_udp($hostn,$port, $errno, $errstr);
226
+		}
227
+		if ($s) {
228
+				$sockets[$id] = $s;
229
+				if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
230
+			if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') {
231 231
 			//$formats[$id] = 'aprs';
232 232
 			$globalSources[$id]['format'] = 'aprs';
233 233
 			//$aprs_connect = 0;
234 234
 			//$use_aprs = true;
235
-		    } elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
235
+			} elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
236 236
 			$globalSources[$id]['format'] = 'vrstcp';
237
-    		    } elseif ($port == '10001') {
238
-        		//$formats[$id] = 'tsv';
239
-        		$globalSources[$id]['format'] = 'tsv';
240
-		    } elseif ($port == '30002') {
241
-        		//$formats[$id] = 'raw';
242
-        		$globalSources[$id]['format'] = 'raw';
243
-		    } elseif ($port == '5001') {
244
-        		//$formats[$id] = 'raw';
245
-        		$globalSources[$id]['format'] = 'flightgearmp';
246
-		    } elseif ($port == '30005') {
237
+				} elseif ($port == '10001') {
238
+				//$formats[$id] = 'tsv';
239
+				$globalSources[$id]['format'] = 'tsv';
240
+			} elseif ($port == '30002') {
241
+				//$formats[$id] = 'raw';
242
+				$globalSources[$id]['format'] = 'raw';
243
+			} elseif ($port == '5001') {
244
+				//$formats[$id] = 'raw';
245
+				$globalSources[$id]['format'] = 'flightgearmp';
246
+			} elseif ($port == '30005') {
247 247
 			// Not yet supported
248
-        		//$formats[$id] = 'beast';
249
-        		$globalSources[$id]['format'] = 'beast';
250
-		    //} else $formats[$id] = 'sbs';
251
-		    } else $globalSources[$id]['format'] = 'sbs';
252
-		    //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
248
+				//$formats[$id] = 'beast';
249
+				$globalSources[$id]['format'] = 'beast';
250
+			//} else $formats[$id] = 'sbs';
251
+			} else $globalSources[$id]['format'] = 'sbs';
252
+			//if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
253 253
 		}
254 254
 		if ($globalDebug) echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
255
-            } else {
255
+			} else {
256 256
 		if ($globalDebug) echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";
257
-    	    }
258
-        }
259
-    }
257
+			}
258
+		}
259
+	}
260 260
 }
261 261
 if (!isset($globalMinFetch)) $globalMinFetch = 15;
262 262
 
@@ -279,9 +279,9 @@  discard block
 block discarded – undo
279 279
 //connect_all($globalSources);
280 280
 
281 281
 if (isset($globalProxy) && $globalProxy) {
282
-    $context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true)));
282
+	$context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true)));
283 283
 } else {
284
-    $context = stream_context_create(array('http' => array('timeout' => $timeout)));
284
+	$context = stream_context_create(array('http' => array('timeout' => $timeout)));
285 285
 }
286 286
 
287 287
 // APRS Configuration
@@ -290,18 +290,18 @@  discard block
 block discarded – undo
290 290
 	die;
291 291
 }
292 292
 foreach ($globalSources as $key => $source) {
293
-    if (!isset($source['format'])) {
294
-        $globalSources[$key]['format'] = 'auto';
295
-    }
293
+	if (!isset($source['format'])) {
294
+		$globalSources[$key]['format'] = 'auto';
295
+	}
296 296
 }
297 297
 connect_all($globalSources);
298 298
 foreach ($globalSources as $key => $source) {
299
-    if (isset($source['format']) && $source['format'] == 'aprs') {
299
+	if (isset($source['format']) && $source['format'] == 'aprs') {
300 300
 	$aprs_connect = 0;
301 301
 	$use_aprs = true;
302 302
 	if (isset($source['port']) && $source['port'] == '10152') $aprs_full = true;
303 303
 	break;
304
-    }
304
+	}
305 305
 }
306 306
 
307 307
 if ($use_aprs) {
@@ -342,116 +342,116 @@  discard block
 block discarded – undo
342 342
 
343 343
 // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time.
344 344
 while ($i > 0) {
345
-    if (!$globalDaemon) $i = $endtime-time();
346
-    // Delete old ATC
347
-    if ($globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
345
+	if (!$globalDaemon) $i = $endtime-time();
346
+	// Delete old ATC
347
+	if ($globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
348 348
 	if ($globalDebug) echo 'Delete old ATC...'."\n";
349
-        $ATC->deleteOldATC();
350
-    }
349
+		$ATC->deleteOldATC();
350
+	}
351 351
     
352
-    //if (count($last_exec) > 0) {
353
-    if (count($last_exec) == count($globalSources)) {
352
+	//if (count($last_exec) > 0) {
353
+	if (count($last_exec) == count($globalSources)) {
354 354
 	$max = $globalMinFetch;
355 355
 	foreach ($last_exec as $last) {
356
-	    if ((time() - $last['last']) < $max) $max = time() - $last['last'];
356
+		if ((time() - $last['last']) < $max) $max = time() - $last['last'];
357 357
 	}
358 358
 	if ($max != $globalMinFetch) {
359
-	    if ($globalDebug) echo 'Sleeping...'."\n";
360
-	    sleep($globalMinFetch-$max+2);
359
+		if ($globalDebug) echo 'Sleeping...'."\n";
360
+		sleep($globalMinFetch-$max+2);
361
+	}
361 362
 	}
362
-    }
363 363
 
364 364
     
365
-    //foreach ($formats as $id => $value) {
366
-    foreach ($globalSources as $id => $value) {
365
+	//foreach ($formats as $id => $value) {
366
+	foreach ($globalSources as $id => $value) {
367 367
 	date_default_timezone_set('UTC');
368 368
 	if (!isset($last_exec[$id]['last'])) $last_exec[$id]['last'] = 0;
369 369
 	if ($value['format'] == 'deltadbtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
370
-	    //$buffer = $Common->getData($hosts[$id]);
371
-	    $buffer = $Common->getData($value['host']);
372
-	    if ($buffer != '') $reset = 0;
373
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
374
-	    $buffer = explode('\n',$buffer);
375
-	    foreach ($buffer as $line) {
376
-    		if ($line != '' && count($line) > 7) {
377
-    		    $line = explode(',', $line);
378
-	            $data = array();
379
-	            $data['hex'] = $line[1]; // hex
380
-	            $data['ident'] = $line[2]; // ident
381
-	            if (isset($line[3])) $data['altitude'] = $line[3]; // altitude
382
-	            if (isset($line[4])) $data['speed'] = $line[4]; // speed
383
-	            if (isset($line[5])) $data['heading'] = $line[5]; // heading
384
-	            if (isset($line[6])) $data['latitude'] = $line[6]; // lat
385
-	            if (isset($line[7])) $data['longitude'] = $line[7]; // long
386
-	            $data['verticalrate'] = ''; // vertical rate
387
-	            //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk
388
-	            $data['emergency'] = ''; // emergency
389
-		    $data['datetime'] = date('Y-m-d H:i:s');
390
-		    $data['format_source'] = 'deltadbtxt';
391
-    		    $data['id_source'] = $id_source;
392
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
393
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
394
-		    if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
395
-    		    $SI->add($data);
396
-		    unset($data);
397
-    		}
398
-    	    }
399
-    	    $last_exec[$id]['last'] = time();
370
+		//$buffer = $Common->getData($hosts[$id]);
371
+		$buffer = $Common->getData($value['host']);
372
+		if ($buffer != '') $reset = 0;
373
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
374
+		$buffer = explode('\n',$buffer);
375
+		foreach ($buffer as $line) {
376
+			if ($line != '' && count($line) > 7) {
377
+				$line = explode(',', $line);
378
+				$data = array();
379
+				$data['hex'] = $line[1]; // hex
380
+				$data['ident'] = $line[2]; // ident
381
+				if (isset($line[3])) $data['altitude'] = $line[3]; // altitude
382
+				if (isset($line[4])) $data['speed'] = $line[4]; // speed
383
+				if (isset($line[5])) $data['heading'] = $line[5]; // heading
384
+				if (isset($line[6])) $data['latitude'] = $line[6]; // lat
385
+				if (isset($line[7])) $data['longitude'] = $line[7]; // long
386
+				$data['verticalrate'] = ''; // vertical rate
387
+				//if (isset($line[9])) $data['squawk'] = $line[9]; // squawk
388
+				$data['emergency'] = ''; // emergency
389
+			$data['datetime'] = date('Y-m-d H:i:s');
390
+			$data['format_source'] = 'deltadbtxt';
391
+				$data['id_source'] = $id_source;
392
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
393
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
394
+			if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
395
+				$SI->add($data);
396
+			unset($data);
397
+			}
398
+			}
399
+			$last_exec[$id]['last'] = time();
400 400
 	} elseif ($value['format'] == 'aisnmeatxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
401
-	    date_default_timezone_set('CET');
402
-	    $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
403
-	    date_default_timezone_set('UTC');
404
-	    if ($buffer != '') $reset = 0;
405
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
406
-	    $buffer = explode('\n',$buffer);
407
-	    foreach ($buffer as $line) {
401
+		date_default_timezone_set('CET');
402
+		$buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
403
+		date_default_timezone_set('UTC');
404
+		if ($buffer != '') $reset = 0;
405
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
406
+		$buffer = explode('\n',$buffer);
407
+		foreach ($buffer as $line) {
408 408
 		if ($line != '') {
409
-		    echo "'".$line."'\n";
410
-		    $add = false;
411
-		    $ais_data = $AIS->parse_line(trim($line));
412
-		    $data = array();
413
-		    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
414
-		    if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
415
-		    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
416
-		    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
417
-		    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
418
-		    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
419
-		    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
420
-		    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
421
-		    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
422
-		    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
423
-		    if (isset($ais_data['timestamp'])) {
409
+			echo "'".$line."'\n";
410
+			$add = false;
411
+			$ais_data = $AIS->parse_line(trim($line));
412
+			$data = array();
413
+			if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
414
+			if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
415
+			if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
416
+			if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
417
+			if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
418
+			if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
419
+			if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
420
+			if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
421
+			if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
422
+			if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
423
+			if (isset($ais_data['timestamp'])) {
424 424
 			$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
425 425
 			if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) {
426
-			    $last_exec[$id]['timestamp'] = $ais_data['timestamp'];
427
-			    $add = true;
426
+				$last_exec[$id]['timestamp'] = $ais_data['timestamp'];
427
+				$add = true;
428 428
 			}
429
-		    } else {
429
+			} else {
430 430
 			$data['datetime'] = date('Y-m-d H:i:s');
431 431
 			$add = true;
432
-		    }
433
-		    $data['format_source'] = 'aisnmeatxt';
434
-    		    $data['id_source'] = $id_source;
435
-		    //print_r($data);
436
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
437
-		    if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
438
-		    unset($data);
432
+			}
433
+			$data['format_source'] = 'aisnmeatxt';
434
+				$data['id_source'] = $id_source;
435
+			//print_r($data);
436
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
437
+			if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
438
+			unset($data);
439 439
 		}
440
-    	    }
441
-    	    $last_exec[$id]['last'] = time();
440
+			}
441
+			$last_exec[$id]['last'] = time();
442 442
 	} elseif ($value['format'] == 'aisnmeahttp') {
443
-	    $arr = $httpfeeds;
444
-	    $w = $e = null;
443
+		$arr = $httpfeeds;
444
+		$w = $e = null;
445 445
 	    
446
-	    if (isset($arr[$id])) {
446
+		if (isset($arr[$id])) {
447 447
 		$nn = stream_select($arr,$w,$e,$timeout);
448 448
 		if ($nn > 0) {
449
-		    foreach ($httpfeeds as $feed) {
449
+			foreach ($httpfeeds as $feed) {
450 450
 			$buffer = stream_get_line($feed,2000,"\n");
451 451
 			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
452 452
 			$buffer = explode('\n',$buffer);
453 453
 			foreach ($buffer as $line) {
454
-			    if ($line != '') {
454
+				if ($line != '') {
455 455
 				$ais_data = $AIS->parse_line(trim($line));
456 456
 				$data = array();
457 457
 				if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
@@ -469,40 +469,40 @@  discard block
 block discarded – undo
469 469
 				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
470 470
 				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
471 471
 				if (isset($ais_data['timestamp'])) {
472
-				    $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
472
+					$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
473 473
 				} else {
474
-				    $data['datetime'] = date('Y-m-d H:i:s');
474
+					$data['datetime'] = date('Y-m-d H:i:s');
475 475
 				}
476 476
 				$data['format_source'] = 'aisnmeahttp';
477 477
 				$data['id_source'] = $id_source;
478 478
 				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
479 479
 				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
480 480
 				unset($data);
481
-			    }
481
+				}
482
+			}
482 483
 			}
483
-		    }
484 484
 		} else {
485
-		    $format = $value['format'];
486
-		    if (isset($tt[$format])) $tt[$format]++;
487
-		    else $tt[$format] = 0;
488
-		    if ($tt[$format] > 30) {
485
+			$format = $value['format'];
486
+			if (isset($tt[$format])) $tt[$format]++;
487
+			else $tt[$format] = 0;
488
+			if ($tt[$format] > 30) {
489 489
 			if ($globalDebug) echo 'Reconnect...'."\n";
490 490
 			sleep(2);
491 491
 			$sourceeen[] = $value;
492 492
 			connect_all($sourceeen);
493 493
 			$sourceeen = array();
494
-		    }
494
+			}
495
+		}
495 496
 		}
496
-	    }
497 497
 	} elseif ($value['format'] == 'myshiptracking' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
498
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
499
-	    if ($buffer != '') {
498
+		$buffer = $Common->getData($value['host'],'get','','','','','20');
499
+		if ($buffer != '') {
500 500
 		//echo $buffer;
501 501
 		$all_data = json_decode($buffer,true);
502 502
 		//print_r($all_data);
503 503
 		if (isset($all_data[0]['DATA'])) {
504 504
 		foreach ($all_data[0]['DATA'] as $line) {
505
-		    if ($line != '') {
505
+			if ($line != '') {
506 506
 			$data = array();
507 507
 			$data['ident'] = $line['NAME'];
508 508
 			$data['mmsi'] = $line['MMSI'];
@@ -519,89 +519,89 @@  discard block
 block discarded – undo
519 519
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
520 520
 			$MI->add($data);
521 521
 			unset($data);
522
-		    }
522
+			}
523 523
 		}
524 524
 		}
525 525
 		
526
-	    }
527
-    	    $last_exec[$id]['last'] = time();
526
+		}
527
+			$last_exec[$id]['last'] = time();
528 528
 	} elseif ($value['format'] == 'boatbeaconapp' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
529
-	    $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host']));
530
-	    if ($buffer != '') {
529
+		$buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host']));
530
+		if ($buffer != '') {
531 531
 		$all_data = json_decode($buffer,true);
532 532
 		if (isset($all_data[0]['mmsi'])) {
533
-		    foreach ($all_data as $line) {
533
+			foreach ($all_data as $line) {
534 534
 			if ($line != '') {
535
-			    $data = array();
536
-			    $data['ident'] = $line['shipname'];
537
-			    $data['callsign'] = $line['callsign'];
538
-			    $data['mmsi'] = $line['mmsi'];
539
-			    $data['speed'] = $line['sog'];
540
-			    if ($line['heading'] != '511') $data['heading'] = $line['heading'];
541
-			    $data['latitude'] = $line['latitude'];
542
-			    $data['longitude'] = $line['longitude'];
543
-			    $data['type_id'] = $line['shiptype'];
544
-			    $data['arrival_code'] = $line['destination'];
545
-			    $data['datetime'] = $line['time'];
546
-			    $data['format_source'] = 'boatbeaconapp';
547
-			    $data['id_source'] = $id_source;
548
-			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
549
-			    $MI->add($data);
550
-			    unset($data);
535
+				$data = array();
536
+				$data['ident'] = $line['shipname'];
537
+				$data['callsign'] = $line['callsign'];
538
+				$data['mmsi'] = $line['mmsi'];
539
+				$data['speed'] = $line['sog'];
540
+				if ($line['heading'] != '511') $data['heading'] = $line['heading'];
541
+				$data['latitude'] = $line['latitude'];
542
+				$data['longitude'] = $line['longitude'];
543
+				$data['type_id'] = $line['shiptype'];
544
+				$data['arrival_code'] = $line['destination'];
545
+				$data['datetime'] = $line['time'];
546
+				$data['format_source'] = 'boatbeaconapp';
547
+				$data['id_source'] = $id_source;
548
+				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
549
+				$MI->add($data);
550
+				unset($data);
551
+			}
551 552
 			}
552
-		    }
553 553
 		}
554 554
 		
555
-	    }
556
-    	    $last_exec[$id]['last'] = time();
555
+		}
556
+			$last_exec[$id]['last'] = time();
557 557
 	} elseif ($value['format'] == 'shipplotter' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
558
-	    echo 'download...';
559
-	    $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
560
-	    echo 'done !'."\n";
561
-	    if ($buffer != '') $reset = 0;
562
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
563
-	    $buffer = explode('\n',$buffer);
564
-	    foreach ($buffer as $line) {
558
+		echo 'download...';
559
+		$buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
560
+		echo 'done !'."\n";
561
+		if ($buffer != '') $reset = 0;
562
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
563
+		$buffer = explode('\n',$buffer);
564
+		foreach ($buffer as $line) {
565 565
 		if ($line != '') {
566
-		    $data = array();
567
-		    $data['mmsi'] = (int)substr($line,0,9);
568
-		    $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
569
-		    //$data['status'] = substr($line,21,2);
570
-		    //$data['type'] = substr($line,24,3);
571
-		    $data['latitude'] = substr($line,29,9);
572
-		    $data['longitude'] = substr($line,41,9);
573
-		    $data['speed'] = round(substr($line,51,5));
574
-		    //$data['course'] = substr($line,57,5);
575
-		    $data['heading'] = round(substr($line,63,3));
576
-		    //$data['draft'] = substr($line,67,4);
577
-		    //$data['length'] = substr($line,72,3);
578
-		    //$data['beam'] = substr($line,76,2);
579
-		    $data['ident'] = trim(utf8_encode(substr($line,79,20)));
580
-		    //$data['callsign'] = trim(substr($line,100,7);
581
-		    //$data['dest'] = substr($line,108,20);
582
-		    //$data['etaDate'] = substr($line,129,5);
583
-		    //$data['etaTime'] = substr($line,135,5);
584
-		    $data['format_source'] = 'shipplotter';
585
-    		    $data['id_source'] = $id_source;
586
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
587
-		    //print_r($data);
588
-		    echo 'Add...'."\n";
589
-		    $MI->add($data);
590
-		    unset($data);
566
+			$data = array();
567
+			$data['mmsi'] = (int)substr($line,0,9);
568
+			$data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
569
+			//$data['status'] = substr($line,21,2);
570
+			//$data['type'] = substr($line,24,3);
571
+			$data['latitude'] = substr($line,29,9);
572
+			$data['longitude'] = substr($line,41,9);
573
+			$data['speed'] = round(substr($line,51,5));
574
+			//$data['course'] = substr($line,57,5);
575
+			$data['heading'] = round(substr($line,63,3));
576
+			//$data['draft'] = substr($line,67,4);
577
+			//$data['length'] = substr($line,72,3);
578
+			//$data['beam'] = substr($line,76,2);
579
+			$data['ident'] = trim(utf8_encode(substr($line,79,20)));
580
+			//$data['callsign'] = trim(substr($line,100,7);
581
+			//$data['dest'] = substr($line,108,20);
582
+			//$data['etaDate'] = substr($line,129,5);
583
+			//$data['etaTime'] = substr($line,135,5);
584
+			$data['format_source'] = 'shipplotter';
585
+				$data['id_source'] = $id_source;
586
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
587
+			//print_r($data);
588
+			echo 'Add...'."\n";
589
+			$MI->add($data);
590
+			unset($data);
591 591
 		}
592
-    	    }
593
-    	    $last_exec[$id]['last'] = time();
592
+			}
593
+			$last_exec[$id]['last'] = time();
594 594
 	//} elseif (($value == 'whazzup' && (time() - $last_exec['whazzup'] > $globalMinFetch)) || ($value == 'vatsimtxt' && (time() - $last_exec['vatsimtxt'] > $globalMinFetch))) {
595 595
 	} elseif (($value['format'] == 'whazzup' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) || ($value['format'] == 'vatsimtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch))) {
596
-	    //$buffer = $Common->getData($hosts[$id]);
597
-	    $buffer = $Common->getData($value['host']);
598
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
599
-	    $buffer = explode('\n',$buffer);
600
-	    $reset = 0;
601
-	    foreach ($buffer as $line) {
602
-    		if ($line != '') {
603
-    		    $line = explode(':', $line);
604
-    		    if (count($line) > 30 && $line[0] != 'callsign') {
596
+		//$buffer = $Common->getData($hosts[$id]);
597
+		$buffer = $Common->getData($value['host']);
598
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
599
+		$buffer = explode('\n',$buffer);
600
+		$reset = 0;
601
+		foreach ($buffer as $line) {
602
+			if ($line != '') {
603
+				$line = explode(':', $line);
604
+				if (count($line) > 30 && $line[0] != 'callsign') {
605 605
 			$data = array();
606 606
 			if (isset($line[37]) && $line[37] != '') $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37];
607 607
 			else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
@@ -614,37 +614,37 @@  discard block
 block discarded – undo
614 614
 			if (isset($line[45])) $data['heading'] = $line[45]; // heading
615 615
 			elseif (isset($line[38])) $data['heading'] = $line[38]; // heading
616 616
 			$data['latitude'] = $line[5]; // lat
617
-	        	$data['longitude'] = $line[6]; // long
618
-	        	$data['verticalrate'] = ''; // vertical rate
619
-	        	$data['squawk'] = ''; // squawk
620
-	        	$data['emergency'] = ''; // emergency
621
-	        	$data['waypoints'] = $line[30];
617
+				$data['longitude'] = $line[6]; // long
618
+				$data['verticalrate'] = ''; // vertical rate
619
+				$data['squawk'] = ''; // squawk
620
+				$data['emergency'] = ''; // emergency
621
+				$data['waypoints'] = $line[30];
622 622
 			$data['datetime'] = date('Y-m-d H:i:s');
623 623
 			//$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37]));
624 624
 			//if (isset($line[37])) $data['last_update'] = $line[37];
625
-		        $data['departure_airport_icao'] = $line[11];
626
-		        $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
627
-		        $data['arrival_airport_icao'] = $line[13];
625
+				$data['departure_airport_icao'] = $line[11];
626
+				$data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
627
+				$data['arrival_airport_icao'] = $line[13];
628 628
 			$data['frequency'] = $line[4];
629 629
 			$data['type'] = $line[18];
630 630
 			$data['range'] = $line[19];
631 631
 			if (isset($line[35])) $data['info'] = $line[35];
632
-    			$data['id_source'] = $id_source;
633
-	    		//$data['arrival_airport_time'] = ;
634
-	    		if ($line[9] != '') {
635
-	    		    $aircraft_data = explode('/',$line[9]);
636
-	    		    if (isset($aircraft_data[1])) {
637
-	    			$data['aircraft_icao'] = $aircraft_data[1];
638
-	    		    }
639
-        		}
640
-	    		/*
632
+				$data['id_source'] = $id_source;
633
+				//$data['arrival_airport_time'] = ;
634
+				if ($line[9] != '') {
635
+					$aircraft_data = explode('/',$line[9]);
636
+					if (isset($aircraft_data[1])) {
637
+					$data['aircraft_icao'] = $aircraft_data[1];
638
+					}
639
+				}
640
+				/*
641 641
 	    		if ($value == 'whazzup') $data['format_source'] = 'whazzup';
642 642
 	    		elseif ($value == 'vatsimtxt') $data['format_source'] = 'vatsimtxt';
643 643
 	    		*/
644
-	    		$data['format_source'] = $value['format'];
644
+				$data['format_source'] = $value['format'];
645 645
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
646 646
 			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
647
-    			if ($line[3] == 'PILOT') $SI->add($data);
647
+				if ($line[3] == 'PILOT') $SI->add($data);
648 648
 			elseif ($line[3] == 'ATC') {
649 649
 				//print_r($data);
650 650
 				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
@@ -662,255 +662,255 @@  discard block
 block discarded – undo
662 662
 				if (!isset($data['source_name'])) $data['source_name'] = '';
663 663
 				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']);
664 664
 			}
665
-    			unset($data);
666
-    		    }
667
-    		}
668
-    	    }
669
-    	    //if ($value == 'whazzup') $last_exec['whazzup'] = time();
670
-    	    //elseif ($value == 'vatsimtxt') $last_exec['vatsimtxt'] = time();
671
-    	    $last_exec[$id]['last'] = time();
672
-    	//} elseif ($value == 'aircraftlistjson' && (time() - $last_exec['aircraftlistjson'] > $globalMinFetch)) {
673
-    	} elseif ($value['format'] == 'aircraftlistjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
674
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
675
-	    if ($buffer != '') {
676
-	    $all_data = json_decode($buffer,true);
677
-	    if (isset($all_data['acList'])) {
665
+				unset($data);
666
+				}
667
+			}
668
+			}
669
+			//if ($value == 'whazzup') $last_exec['whazzup'] = time();
670
+			//elseif ($value == 'vatsimtxt') $last_exec['vatsimtxt'] = time();
671
+			$last_exec[$id]['last'] = time();
672
+		//} elseif ($value == 'aircraftlistjson' && (time() - $last_exec['aircraftlistjson'] > $globalMinFetch)) {
673
+		} elseif ($value['format'] == 'aircraftlistjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
674
+		$buffer = $Common->getData($value['host'],'get','','','','','20');
675
+		if ($buffer != '') {
676
+		$all_data = json_decode($buffer,true);
677
+		if (isset($all_data['acList'])) {
678 678
 		$reset = 0;
679 679
 		foreach ($all_data['acList'] as $line) {
680
-		    $data = array();
681
-		    $data['hex'] = $line['Icao']; // hex
682
-		    if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
683
-		    if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
684
-		    if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
685
-		    if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
686
-		    if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
687
-		    if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
688
-		    //$data['verticalrate'] = $line['']; // verticale rate
689
-		    if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
690
-		    $data['emergency'] = ''; // emergency
691
-		    if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
680
+			$data = array();
681
+			$data['hex'] = $line['Icao']; // hex
682
+			if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
683
+			if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
684
+			if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
685
+			if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
686
+			if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
687
+			if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
688
+			//$data['verticalrate'] = $line['']; // verticale rate
689
+			if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
690
+			$data['emergency'] = ''; // emergency
691
+			if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
692 692
 		    
693
-		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
694
-		    else $data['datetime'] = date('Y-m-d H:i:s');
693
+			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
694
+			else $data['datetime'] = date('Y-m-d H:i:s');
695 695
 		    
696
-		    //$data['datetime'] = date('Y-m-d H:i:s');
697
-		    if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
698
-	    	    $data['format_source'] = 'aircraftlistjson';
699
-		    $data['id_source'] = $id_source;
700
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
701
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
702
-		    if (isset($data['latitude'])) $SI->add($data);
703
-		    unset($data);
696
+			//$data['datetime'] = date('Y-m-d H:i:s');
697
+			if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
698
+				$data['format_source'] = 'aircraftlistjson';
699
+			$data['id_source'] = $id_source;
700
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
701
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
702
+			if (isset($data['latitude'])) $SI->add($data);
703
+			unset($data);
704 704
 		}
705
-	    } elseif (is_array($all_data)) {
705
+		} elseif (is_array($all_data)) {
706 706
 		$reset = 0;
707 707
 		foreach ($all_data as $line) {
708
-		    $data = array();
709
-		    $data['hex'] = $line['hex']; // hex
710
-		    $data['ident'] = $line['flight']; // ident
711
-		    $data['altitude'] = $line['altitude']; // altitude
712
-		    $data['speed'] = $line['speed']; // speed
713
-		    $data['heading'] = $line['track']; // heading
714
-		    $data['latitude'] = $line['lat']; // lat
715
-		    $data['longitude'] = $line['lon']; // long
716
-		    $data['verticalrate'] = $line['vrt']; // verticale rate
717
-		    $data['squawk'] = $line['squawk']; // squawk
718
-		    $data['emergency'] = ''; // emergency
719
-		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
720
-		    else $data['datetime'] = date('Y-m-d H:i:s');
721
-	    	    $data['format_source'] = 'aircraftlistjson';
722
-    		    $data['id_source'] = $id_source;
723
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
724
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
725
-		    $SI->add($data);
726
-		    unset($data);
708
+			$data = array();
709
+			$data['hex'] = $line['hex']; // hex
710
+			$data['ident'] = $line['flight']; // ident
711
+			$data['altitude'] = $line['altitude']; // altitude
712
+			$data['speed'] = $line['speed']; // speed
713
+			$data['heading'] = $line['track']; // heading
714
+			$data['latitude'] = $line['lat']; // lat
715
+			$data['longitude'] = $line['lon']; // long
716
+			$data['verticalrate'] = $line['vrt']; // verticale rate
717
+			$data['squawk'] = $line['squawk']; // squawk
718
+			$data['emergency'] = ''; // emergency
719
+			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
720
+			else $data['datetime'] = date('Y-m-d H:i:s');
721
+				$data['format_source'] = 'aircraftlistjson';
722
+				$data['id_source'] = $id_source;
723
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
724
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
725
+			$SI->add($data);
726
+			unset($data);
727
+		}
727 728
 		}
728
-	    }
729
-	    }
730
-    	    //$last_exec['aircraftlistjson'] = time();
731
-    	    $last_exec[$id]['last'] = time();
732
-    	//} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
733
-    	} elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
734
-	    $buffer = $Common->getData($value['host']);
735
-	    $all_data = json_decode($buffer,true);
736
-	    if (isset($all_data['planes'])) {
729
+		}
730
+			//$last_exec['aircraftlistjson'] = time();
731
+			$last_exec[$id]['last'] = time();
732
+		//} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
733
+		} elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
734
+		$buffer = $Common->getData($value['host']);
735
+		$all_data = json_decode($buffer,true);
736
+		if (isset($all_data['planes'])) {
737 737
 		$reset = 0;
738 738
 		foreach ($all_data['planes'] as $key => $line) {
739
-		    $data = array();
740
-		    $data['hex'] = $key; // hex
741
-		    $data['ident'] = $line[3]; // ident
742
-		    $data['altitude'] = $line[6]; // altitude
743
-		    $data['speed'] = $line[8]; // speed
744
-		    $data['heading'] = $line[7]; // heading
745
-		    $data['latitude'] = $line[4]; // lat
746
-		    $data['longitude'] = $line[5]; // long
747
-		    //$data['verticalrate'] = $line[]; // verticale rate
748
-		    $data['squawk'] = $line[10]; // squawk
749
-		    $data['emergency'] = ''; // emergency
750
-		    $data['registration'] = $line[2];
751
-		    $data['aircraft_icao'] = $line[0];
752
-		    $deparr = explode('-',$line[1]);
753
-		    if (count($deparr) == 2) {
739
+			$data = array();
740
+			$data['hex'] = $key; // hex
741
+			$data['ident'] = $line[3]; // ident
742
+			$data['altitude'] = $line[6]; // altitude
743
+			$data['speed'] = $line[8]; // speed
744
+			$data['heading'] = $line[7]; // heading
745
+			$data['latitude'] = $line[4]; // lat
746
+			$data['longitude'] = $line[5]; // long
747
+			//$data['verticalrate'] = $line[]; // verticale rate
748
+			$data['squawk'] = $line[10]; // squawk
749
+			$data['emergency'] = ''; // emergency
750
+			$data['registration'] = $line[2];
751
+			$data['aircraft_icao'] = $line[0];
752
+			$deparr = explode('-',$line[1]);
753
+			if (count($deparr) == 2) {
754 754
 			$data['departure_airport_icao'] = $deparr[0];
755 755
 			$data['arrival_airport_icao'] = $deparr[1];
756
-		    }
757
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]);
758
-	    	    $data['format_source'] = 'planeupdatefaa';
759
-    		    $data['id_source'] = $id_source;
760
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
761
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
762
-		    $SI->add($data);
763
-		    unset($data);
756
+			}
757
+			$data['datetime'] = date('Y-m-d H:i:s',$line[9]);
758
+				$data['format_source'] = 'planeupdatefaa';
759
+				$data['id_source'] = $id_source;
760
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
761
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
762
+			$SI->add($data);
763
+			unset($data);
764
+		}
764 765
 		}
765
-	    }
766
-    	    //$last_exec['planeupdatefaa'] = time();
767
-    	    $last_exec[$id]['last'] = time();
768
-    	} elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
769
-	    $buffer = $Common->getData($value['host']);
770
-	    $all_data = json_decode($buffer,true);
771
-	    if (isset($all_data['states'])) {
766
+			//$last_exec['planeupdatefaa'] = time();
767
+			$last_exec[$id]['last'] = time();
768
+		} elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
769
+		$buffer = $Common->getData($value['host']);
770
+		$all_data = json_decode($buffer,true);
771
+		if (isset($all_data['states'])) {
772 772
 		$reset = 0;
773 773
 		foreach ($all_data['states'] as $key => $line) {
774
-		    $data = array();
775
-		    $data['hex'] = $line[0]; // hex
776
-		    $data['ident'] = trim($line[1]); // ident
777
-		    $data['altitude'] = round($line[7]*3.28084); // altitude
778
-		    $data['speed'] = round($line[9]*1.94384); // speed
779
-		    $data['heading'] = round($line[10]); // heading
780
-		    $data['latitude'] = $line[5]; // lat
781
-		    $data['longitude'] = $line[6]; // long
782
-		    $data['verticalrate'] = $line[11]; // verticale rate
783
-		    //$data['squawk'] = $line[10]; // squawk
784
-		    //$data['emergency'] = ''; // emergency
785
-		    //$data['registration'] = $line[2];
786
-		    //$data['aircraft_icao'] = $line[0];
787
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]);
788
-	    	    $data['format_source'] = 'opensky';
789
-    		    $data['id_source'] = $id_source;
790
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
791
-		    $SI->add($data);
792
-		    unset($data);
774
+			$data = array();
775
+			$data['hex'] = $line[0]; // hex
776
+			$data['ident'] = trim($line[1]); // ident
777
+			$data['altitude'] = round($line[7]*3.28084); // altitude
778
+			$data['speed'] = round($line[9]*1.94384); // speed
779
+			$data['heading'] = round($line[10]); // heading
780
+			$data['latitude'] = $line[5]; // lat
781
+			$data['longitude'] = $line[6]; // long
782
+			$data['verticalrate'] = $line[11]; // verticale rate
783
+			//$data['squawk'] = $line[10]; // squawk
784
+			//$data['emergency'] = ''; // emergency
785
+			//$data['registration'] = $line[2];
786
+			//$data['aircraft_icao'] = $line[0];
787
+			$data['datetime'] = date('Y-m-d H:i:s',$line[3]);
788
+				$data['format_source'] = 'opensky';
789
+				$data['id_source'] = $id_source;
790
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
791
+			$SI->add($data);
792
+			unset($data);
793
+		}
793 794
 		}
794
-	    }
795
-    	    //$last_exec['planeupdatefaa'] = time();
796
-    	    $last_exec[$id]['last'] = time();
797
-    	//} elseif ($value == 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) {
798
-    	} elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
799
-	    //$buffer = $Common->getData($hosts[$id]);
800
-	    $buffer = $Common->getData($value['host']);
801
-	    $all_data = json_decode($buffer,true);
802
-	    if (!empty($all_data)) $reset = 0;
803
-	    foreach ($all_data as $key => $line) {
795
+			//$last_exec['planeupdatefaa'] = time();
796
+			$last_exec[$id]['last'] = time();
797
+		//} elseif ($value == 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) {
798
+		} elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
799
+		//$buffer = $Common->getData($hosts[$id]);
800
+		$buffer = $Common->getData($value['host']);
801
+		$all_data = json_decode($buffer,true);
802
+		if (!empty($all_data)) $reset = 0;
803
+		foreach ($all_data as $key => $line) {
804 804
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
805
-		    $data = array();
806
-		    $data['hex'] = $line[0];
807
-		    $data['ident'] = $line[16]; //$line[13]
808
-	    	    $data['altitude'] = $line[4]; // altitude
809
-	    	    $data['speed'] = $line[5]; // speed
810
-	    	    $data['heading'] = $line[3]; // heading
811
-	    	    $data['latitude'] = $line[1]; // lat
812
-	    	    $data['longitude'] = $line[2]; // long
813
-	    	    $data['verticalrate'] = $line[15]; // verticale rate
814
-	    	    $data['squawk'] = $line[6]; // squawk
815
-	    	    $data['aircraft_icao'] = $line[8];
816
-	    	    $data['registration'] = $line[9];
817
-		    $data['departure_airport_iata'] = $line[11];
818
-		    $data['arrival_airport_iata'] = $line[12];
819
-	    	    $data['emergency'] = ''; // emergency
820
-		    $data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
821
-	    	    $data['format_source'] = 'fr24json';
822
-    		    $data['id_source'] = $id_source;
823
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
824
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
825
-		    $SI->add($data);
826
-		    unset($data);
805
+			$data = array();
806
+			$data['hex'] = $line[0];
807
+			$data['ident'] = $line[16]; //$line[13]
808
+				$data['altitude'] = $line[4]; // altitude
809
+				$data['speed'] = $line[5]; // speed
810
+				$data['heading'] = $line[3]; // heading
811
+				$data['latitude'] = $line[1]; // lat
812
+				$data['longitude'] = $line[2]; // long
813
+				$data['verticalrate'] = $line[15]; // verticale rate
814
+				$data['squawk'] = $line[6]; // squawk
815
+				$data['aircraft_icao'] = $line[8];
816
+				$data['registration'] = $line[9];
817
+			$data['departure_airport_iata'] = $line[11];
818
+			$data['arrival_airport_iata'] = $line[12];
819
+				$data['emergency'] = ''; // emergency
820
+			$data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
821
+				$data['format_source'] = 'fr24json';
822
+				$data['id_source'] = $id_source;
823
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
824
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
825
+			$SI->add($data);
826
+			unset($data);
827
+		}
827 828
 		}
828
-	    }
829
-    	    //$last_exec['fr24json'] = time();
830
-    	    $last_exec[$id]['last'] = time();
831
-    	//} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) {
832
-    	} elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
833
-	    //$buffer = $Common->getData($hosts[$id],'get','','','','','150');
834
-	    $buffer = $Common->getData($value['host'],'get','','','','','150');
835
-	    //echo $buffer;
836
-	    $buffer = str_replace(array("\n","\r"),"",$buffer);
837
-	    $buffer = preg_replace('/,"num":(.+)/','}',$buffer);
838
-	    $all_data = json_decode($buffer,true);
839
-	    if (json_last_error() != JSON_ERROR_NONE) {
829
+			//$last_exec['fr24json'] = time();
830
+			$last_exec[$id]['last'] = time();
831
+		//} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) {
832
+		} elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
833
+		//$buffer = $Common->getData($hosts[$id],'get','','','','','150');
834
+		$buffer = $Common->getData($value['host'],'get','','','','','150');
835
+		//echo $buffer;
836
+		$buffer = str_replace(array("\n","\r"),"",$buffer);
837
+		$buffer = preg_replace('/,"num":(.+)/','}',$buffer);
838
+		$all_data = json_decode($buffer,true);
839
+		if (json_last_error() != JSON_ERROR_NONE) {
840 840
 		die(json_last_error_msg());
841
-	    }
842
-	    if (isset($all_data['mrkrs'])) {
841
+		}
842
+		if (isset($all_data['mrkrs'])) {
843 843
 		$reset = 0;
844 844
 		foreach ($all_data['mrkrs'] as $key => $line) {
845
-		    if (isset($line['inf'])) {
845
+			if (isset($line['inf'])) {
846 846
 			$data = array();
847 847
 			$data['hex'] = $line['inf']['ia'];
848 848
 			if (isset($line['inf']['cs'])) $data['ident'] = $line['inf']['cs']; //$line[13]
849
-	    		$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
850
-	    		if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
851
-	    		if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
852
-	    		$data['latitude'] = $line['pt'][0]; // lat
853
-	    		$data['longitude'] = $line['pt'][1]; // long
854
-	    		//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
855
-	    		if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
856
-	    		//$data['aircraft_icao'] = $line[8];
857
-	    		if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
849
+				$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
850
+				if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
851
+				if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
852
+				$data['latitude'] = $line['pt'][0]; // lat
853
+				$data['longitude'] = $line['pt'][1]; // long
854
+				//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
855
+				if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
856
+				//$data['aircraft_icao'] = $line[8];
857
+				if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
858 858
 			//$data['departure_airport_iata'] = $line[11];
859 859
 			//$data['arrival_airport_iata'] = $line[12];
860
-	    		//$data['emergency'] = ''; // emergency
860
+				//$data['emergency'] = ''; // emergency
861 861
 			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10]
862
-	    		$data['format_source'] = 'radarvirtueljson';
863
-    			$data['id_source'] = $id_source;
862
+				$data['format_source'] = 'radarvirtueljson';
863
+				$data['id_source'] = $id_source;
864 864
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
865 865
 			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
866 866
 			$SI->add($data);
867 867
 			unset($data);
868
-		    }
868
+			}
869
+		}
869 870
 		}
870
-	    }
871
-    	    //$last_exec['radarvirtueljson'] = time();
872
-    	    $last_exec[$id]['last'] = time();
873
-    	//} elseif ($value == 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) {
874
-    	} elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
875
-	    //$buffer = $Common->getData($hosts[$id]);
876
-	    $buffer = $Common->getData($value['host'].'?'.time());
877
-	    $all_data = json_decode(utf8_encode($buffer),true);
871
+			//$last_exec['radarvirtueljson'] = time();
872
+			$last_exec[$id]['last'] = time();
873
+		//} elseif ($value == 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) {
874
+		} elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
875
+		//$buffer = $Common->getData($hosts[$id]);
876
+		$buffer = $Common->getData($value['host'].'?'.time());
877
+		$all_data = json_decode(utf8_encode($buffer),true);
878 878
 	    
879
-	    if (isset($all_data['pireps'])) {
879
+		if (isset($all_data['pireps'])) {
880 880
 		$reset = 0;
881
-	        foreach ($all_data['pireps'] as $line) {
882
-		    $data = array();
883
-		    $data['id'] = $line['id'];
884
-		    $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
885
-		    $data['ident'] = $line['callsign']; // ident
886
-		    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
887
-		    if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
888
-		    if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
889
-		    if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
890
-		    if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
891
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
892
-		    $data['latitude'] = $line['lat']; // lat
893
-		    $data['longitude'] = $line['lon']; // long
894
-		    //$data['verticalrate'] = $line['vrt']; // verticale rate
895
-		    //$data['squawk'] = $line['squawk']; // squawk
896
-		    //$data['emergency'] = ''; // emergency
897
-		    if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
898
-		    if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
899
-		    if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
900
-		    //$data['arrival_airport_time'] = $line['arrtime'];
901
-		    if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
902
-		    if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
903
-		    if (isset($line['atis'])) $data['info'] = $line['atis'];
904
-		    else $data['info'] = '';
905
-		    $data['format_source'] = 'pireps';
906
-    		    $data['id_source'] = $id_source;
907
-		    $data['datetime'] = date('Y-m-d H:i:s');
908
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
909
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
910
-		    if ($line['icon'] == 'plane') {
881
+			foreach ($all_data['pireps'] as $line) {
882
+			$data = array();
883
+			$data['id'] = $line['id'];
884
+			$data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
885
+			$data['ident'] = $line['callsign']; // ident
886
+			if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
887
+			if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
888
+			if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
889
+			if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
890
+			if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
891
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
892
+			$data['latitude'] = $line['lat']; // lat
893
+			$data['longitude'] = $line['lon']; // long
894
+			//$data['verticalrate'] = $line['vrt']; // verticale rate
895
+			//$data['squawk'] = $line['squawk']; // squawk
896
+			//$data['emergency'] = ''; // emergency
897
+			if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
898
+			if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
899
+			if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
900
+			//$data['arrival_airport_time'] = $line['arrtime'];
901
+			if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
902
+			if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
903
+			if (isset($line['atis'])) $data['info'] = $line['atis'];
904
+			else $data['info'] = '';
905
+			$data['format_source'] = 'pireps';
906
+				$data['id_source'] = $id_source;
907
+			$data['datetime'] = date('Y-m-d H:i:s');
908
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
909
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
910
+			if ($line['icon'] == 'plane') {
911 911
 			$SI->add($data);
912
-		    //    print_r($data);
913
-    		    } elseif ($line['icon'] == 'ct') {
912
+			//    print_r($data);
913
+				} elseif ($line['icon'] == 'ct') {
914 914
 			$data['info'] = str_replace('^&sect;','<br />',$data['info']);
915 915
 			$data['info'] = str_replace('&amp;sect;','',$data['info']);
916 916
 			$typec = substr($data['ident'],-3);
@@ -925,197 +925,197 @@  discard block
 block discarded – undo
925 925
 			elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
926 926
 			else $data['type'] = 'Observer';
927 927
 			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']);
928
-		    }
929
-		    unset($data);
928
+			}
929
+			unset($data);
930 930
 		}
931
-	    }
932
-    	    //$last_exec['pirepsjson'] = time();
933
-    	    $last_exec[$id]['last'] = time();
934
-    	//} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) {
935
-    	} elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
936
-	    //$buffer = $Common->getData($hosts[$id]);
937
-	    if ($globalDebug) echo 'Get Data...'."\n";
938
-	    $buffer = $Common->getData($value['host']);
939
-	    $all_data = json_decode($buffer,true);
940
-	    if ($buffer != '' && is_array($all_data)) {
931
+		}
932
+			//$last_exec['pirepsjson'] = time();
933
+			$last_exec[$id]['last'] = time();
934
+		//} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) {
935
+		} elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
936
+		//$buffer = $Common->getData($hosts[$id]);
937
+		if ($globalDebug) echo 'Get Data...'."\n";
938
+		$buffer = $Common->getData($value['host']);
939
+		$all_data = json_decode($buffer,true);
940
+		if ($buffer != '' && is_array($all_data)) {
941 941
 		$reset = 0;
942 942
 		foreach ($all_data as $line) {
943
-	    	    $data = array();
944
-	    	    //$data['id'] = $line['id']; // id not usable
945
-	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
946
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
947
-	    	    if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
948
-	    	    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
949
-	    	    $data['ident'] = $line['flightnum']; // ident
950
-	    	    $data['altitude'] = $line['alt']; // altitude
951
-	    	    $data['speed'] = $line['gs']; // speed
952
-	    	    $data['heading'] = $line['heading']; // heading
953
-	    	    $data['latitude'] = $line['lat']; // lat
954
-	    	    $data['longitude'] = $line['lng']; // long
955
-	    	    $data['verticalrate'] = ''; // verticale rate
956
-	    	    $data['squawk'] = ''; // squawk
957
-	    	    $data['emergency'] = ''; // emergency
958
-	    	    //$data['datetime'] = $line['lastupdate'];
959
-	    	    $data['last_update'] = $line['lastupdate'];
960
-		    $data['datetime'] = date('Y-m-d H:i:s');
961
-	    	    $data['departure_airport_icao'] = $line['depicao'];
962
-	    	    $data['departure_airport_time'] = $line['deptime'];
963
-	    	    $data['arrival_airport_icao'] = $line['arricao'];
964
-    		    $data['arrival_airport_time'] = $line['arrtime'];
965
-    		    $data['registration'] = $line['aircraft'];
966
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
967
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
968
-		    if (isset($line['aircraftname'])) {
943
+				$data = array();
944
+				//$data['id'] = $line['id']; // id not usable
945
+				if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
946
+				$data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
947
+				if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
948
+				if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
949
+				$data['ident'] = $line['flightnum']; // ident
950
+				$data['altitude'] = $line['alt']; // altitude
951
+				$data['speed'] = $line['gs']; // speed
952
+				$data['heading'] = $line['heading']; // heading
953
+				$data['latitude'] = $line['lat']; // lat
954
+				$data['longitude'] = $line['lng']; // long
955
+				$data['verticalrate'] = ''; // verticale rate
956
+				$data['squawk'] = ''; // squawk
957
+				$data['emergency'] = ''; // emergency
958
+				//$data['datetime'] = $line['lastupdate'];
959
+				$data['last_update'] = $line['lastupdate'];
960
+			$data['datetime'] = date('Y-m-d H:i:s');
961
+				$data['departure_airport_icao'] = $line['depicao'];
962
+				$data['departure_airport_time'] = $line['deptime'];
963
+				$data['arrival_airport_icao'] = $line['arricao'];
964
+				$data['arrival_airport_time'] = $line['arrtime'];
965
+				$data['registration'] = $line['aircraft'];
966
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
967
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
968
+			if (isset($line['aircraftname'])) {
969 969
 			$line['aircraftname'] = strtoupper($line['aircraftname']);
970 970
 			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']);
971
-	    		$aircraft_data = explode('-',$line['aircraftname']);
972
-	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
973
-	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
974
-	    		else {
975
-	    		    $aircraft_data = explode(' ',$line['aircraftname']);
976
-	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
977
-	    		    else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
978
-	    		}
979
-	    	    }
980
-    		    if (isset($line['route'])) $data['waypoints'] = $line['route'];
981
-    		    $data['id_source'] = $id_source;
982
-	    	    $data['format_source'] = 'phpvmacars';
983
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
984
-		    $SI->add($data);
985
-		    unset($data);
971
+				$aircraft_data = explode('-',$line['aircraftname']);
972
+				if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
973
+				elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
974
+				else {
975
+					$aircraft_data = explode(' ',$line['aircraftname']);
976
+					if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
977
+					else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
978
+				}
979
+				}
980
+				if (isset($line['route'])) $data['waypoints'] = $line['route'];
981
+				$data['id_source'] = $id_source;
982
+				$data['format_source'] = 'phpvmacars';
983
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
984
+			$SI->add($data);
985
+			unset($data);
986 986
 		}
987 987
 		if ($globalDebug) echo 'No more data...'."\n";
988 988
 		unset($buffer);
989 989
 		unset($all_data);
990
-	    }
991
-    	    //$last_exec['phpvmacars'] = time();
992
-    	    $last_exec[$id]['last'] = time();
993
-    	} elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
994
-	    //$buffer = $Common->getData($hosts[$id]);
995
-	    if ($globalDebug) echo 'Get Data...'."\n";
996
-	    $buffer = $Common->getData($value['host']);
997
-	    $all_data = json_decode($buffer,true);
998
-	    if ($buffer != '' && is_array($all_data)) {
990
+		}
991
+			//$last_exec['phpvmacars'] = time();
992
+			$last_exec[$id]['last'] = time();
993
+		} elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
994
+		//$buffer = $Common->getData($hosts[$id]);
995
+		if ($globalDebug) echo 'Get Data...'."\n";
996
+		$buffer = $Common->getData($value['host']);
997
+		$all_data = json_decode($buffer,true);
998
+		if ($buffer != '' && is_array($all_data)) {
999 999
 		$reset = 0;
1000 1000
 		foreach ($all_data as $line) {
1001
-	    	    $data = array();
1002
-	    	    //$data['id'] = $line['id']; // id not usable
1003
-	    	    $data['id'] = trim($line['flight_id']);
1004
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
1005
-	    	    $data['pilot_name'] = $line['pilot_name'];
1006
-	    	    $data['pilot_id'] = $line['pilot_id'];
1007
-	    	    $data['ident'] = trim($line['callsign']); // ident
1008
-	    	    $data['altitude'] = $line['altitude']; // altitude
1009
-	    	    $data['speed'] = $line['gs']; // speed
1010
-	    	    $data['heading'] = $line['heading']; // heading
1011
-	    	    $data['latitude'] = $line['latitude']; // lat
1012
-	    	    $data['longitude'] = $line['longitude']; // long
1013
-	    	    $data['verticalrate'] = ''; // verticale rate
1014
-	    	    $data['squawk'] = ''; // squawk
1015
-	    	    $data['emergency'] = ''; // emergency
1016
-	    	    //$data['datetime'] = $line['lastupdate'];
1017
-	    	    $data['last_update'] = $line['last_update'];
1018
-		    $data['datetime'] = date('Y-m-d H:i:s');
1019
-	    	    $data['departure_airport_icao'] = $line['departure'];
1020
-	    	    //$data['departure_airport_time'] = $line['departure_time'];
1021
-	    	    $data['arrival_airport_icao'] = $line['arrival'];
1022
-    		    //$data['arrival_airport_time'] = $line['arrival_time'];
1023
-    		    //$data['registration'] = $line['aircraft'];
1024
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1025
-	    	    $data['aircraft_icao'] = $line['plane_type'];
1026
-    		    $data['id_source'] = $id_source;
1027
-	    	    $data['format_source'] = 'vam';
1028
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1029
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1030
-		    $SI->add($data);
1031
-		    unset($data);
1001
+				$data = array();
1002
+				//$data['id'] = $line['id']; // id not usable
1003
+				$data['id'] = trim($line['flight_id']);
1004
+				$data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
1005
+				$data['pilot_name'] = $line['pilot_name'];
1006
+				$data['pilot_id'] = $line['pilot_id'];
1007
+				$data['ident'] = trim($line['callsign']); // ident
1008
+				$data['altitude'] = $line['altitude']; // altitude
1009
+				$data['speed'] = $line['gs']; // speed
1010
+				$data['heading'] = $line['heading']; // heading
1011
+				$data['latitude'] = $line['latitude']; // lat
1012
+				$data['longitude'] = $line['longitude']; // long
1013
+				$data['verticalrate'] = ''; // verticale rate
1014
+				$data['squawk'] = ''; // squawk
1015
+				$data['emergency'] = ''; // emergency
1016
+				//$data['datetime'] = $line['lastupdate'];
1017
+				$data['last_update'] = $line['last_update'];
1018
+			$data['datetime'] = date('Y-m-d H:i:s');
1019
+				$data['departure_airport_icao'] = $line['departure'];
1020
+				//$data['departure_airport_time'] = $line['departure_time'];
1021
+				$data['arrival_airport_icao'] = $line['arrival'];
1022
+				//$data['arrival_airport_time'] = $line['arrival_time'];
1023
+				//$data['registration'] = $line['aircraft'];
1024
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1025
+				$data['aircraft_icao'] = $line['plane_type'];
1026
+				$data['id_source'] = $id_source;
1027
+				$data['format_source'] = 'vam';
1028
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1029
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1030
+			$SI->add($data);
1031
+			unset($data);
1032 1032
 		}
1033 1033
 		if ($globalDebug) echo 'No more data...'."\n";
1034 1034
 		unset($buffer);
1035 1035
 		unset($all_data);
1036
-	    }
1037
-    	    //$last_exec['phpvmacars'] = time();
1038
-    	    $last_exec[$id]['last'] = time();
1036
+		}
1037
+			//$last_exec['phpvmacars'] = time();
1038
+			$last_exec[$id]['last'] = time();
1039 1039
 	//} elseif ($value == 'sbs' || $value == 'tsv' || $value == 'raw' || $value == 'aprs' || $value == 'beast') {
1040 1040
 	} elseif ($value['format'] == 'sbs' || $value['format'] == 'tsv' || $value['format'] == 'raw' || $value['format'] == 'aprs' || $value['format'] == 'famaprs' || $value['format'] == 'beast' || $value['format'] == 'flightgearmp' || $value['format'] == 'flightgearsp' || $value['format'] == 'acars' || $value['format'] == 'acarssbs3' || $value['format'] == 'ais' || $value['format'] == 'vrstcp') {
1041
-	    if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
1042
-    	    //$last_exec[$id]['last'] = time();
1041
+		if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
1042
+			//$last_exec[$id]['last'] = time();
1043 1043
 
1044
-	    //$read = array( $sockets[$id] );
1045
-	    $read = $sockets;
1046
-	    $write = NULL;
1047
-	    $e = NULL;
1048
-	    $n = socket_select($read, $write, $e, $timeout);
1049
-	    if ($e != NULL) var_dump($e);
1050
-	    if ($n > 0) {
1044
+		//$read = array( $sockets[$id] );
1045
+		$read = $sockets;
1046
+		$write = NULL;
1047
+		$e = NULL;
1048
+		$n = socket_select($read, $write, $e, $timeout);
1049
+		if ($e != NULL) var_dump($e);
1050
+		if ($n > 0) {
1051 1051
 		$reset = 0;
1052 1052
 		foreach ($read as $nb => $r) {
1053
-		    //$value = $formats[$nb];
1054
-		    $format = $globalSources[$nb]['format'];
1055
-		    if ($format == 'sbs' || $format == 'aprs' || $format == 'famaprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') {
1053
+			//$value = $formats[$nb];
1054
+			$format = $globalSources[$nb]['format'];
1055
+			if ($format == 'sbs' || $format == 'aprs' || $format == 'famaprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') {
1056 1056
 			$buffer = @socket_read($r, 6000,PHP_NORMAL_READ);
1057
-		    } elseif ($format == 'vrstcp') {
1057
+			} elseif ($format == 'vrstcp') {
1058 1058
 			$buffer = @socket_read($r, 6000);
1059
-		    } else {
1059
+			} else {
1060 1060
 			$az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port);
1061
-		    }
1062
-		    //$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
1063
-		    //echo $buffer."\n";
1064
-		    // lets play nice and handle signals such as ctrl-c/kill properly
1065
-		    //if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
1066
-		    $error = false;
1067
-		    //$SI::del();
1068
-		    if ($format == 'vrstcp') {
1061
+			}
1062
+			//$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
1063
+			//echo $buffer."\n";
1064
+			// lets play nice and handle signals such as ctrl-c/kill properly
1065
+			//if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
1066
+			$error = false;
1067
+			//$SI::del();
1068
+			if ($format == 'vrstcp') {
1069 1069
 			$buffer = explode('},{',$buffer);
1070
-		    } else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
1071
-		    // SBS format is CSV format
1072
-		    if ($buffer !== FALSE && $buffer != '') {
1070
+			} else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
1071
+			// SBS format is CSV format
1072
+			if ($buffer !== FALSE && $buffer != '') {
1073 1073
 			$tt[$format] = 0;
1074 1074
 			if ($format == 'acarssbs3') {
1075
-			    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1076
-			    $ACARS->add(trim($buffer));
1077
-			    $ACARS->deleteLiveAcarsData();
1075
+				if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1076
+				$ACARS->add(trim($buffer));
1077
+				$ACARS->deleteLiveAcarsData();
1078 1078
 			} elseif ($format == 'raw') {
1079
-			    // AVR format
1080
-			    $data = $SBS->parse($buffer);
1081
-			    if (is_array($data)) {
1079
+				// AVR format
1080
+				$data = $SBS->parse($buffer);
1081
+				if (is_array($data)) {
1082 1082
 				$data['datetime'] = date('Y-m-d H:i:s');
1083 1083
 				$data['format_source'] = 'raw';
1084 1084
 				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1085 1085
 				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1086 1086
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1087 1087
 				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1088
-			    }
1088
+				}
1089 1089
 			} elseif ($format == 'ais') {
1090
-			    $ais_data = $AIS->parse_line(trim($buffer));
1091
-			    $data = array();
1092
-			    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
1093
-			    if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
1094
-			    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
1095
-			    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
1096
-			    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
1097
-			    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
1098
-			    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
1099
-			    if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
1100
-			    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
1101
-			    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
1102
-			    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
1103
-			    if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
1104
-			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
1105
-			    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1090
+				$ais_data = $AIS->parse_line(trim($buffer));
1091
+				$data = array();
1092
+				if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
1093
+				if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
1094
+				if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
1095
+				if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
1096
+				if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
1097
+				if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
1098
+				if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
1099
+				if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
1100
+				if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
1101
+				if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
1102
+				if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
1103
+				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
1104
+				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
1105
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1106 1106
 
1107
-			    if (isset($ais_data['timestamp'])) {
1107
+				if (isset($ais_data['timestamp'])) {
1108 1108
 				$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
1109
-			    } else {
1109
+				} else {
1110 1110
 				$data['datetime'] = date('Y-m-d H:i:s');
1111
-			    }
1112
-			    $data['format_source'] = 'aisnmea';
1113
-    			    $data['id_source'] = $id_source;
1114
-			    if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
1115
-			    unset($data);
1116
-                        } elseif ($format == 'flightgearsp') {
1117
-                    	    //echo $buffer."\n";
1118
-                    	    if (strlen($buffer) > 5) {
1111
+				}
1112
+				$data['format_source'] = 'aisnmea';
1113
+					$data['id_source'] = $id_source;
1114
+				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
1115
+				unset($data);
1116
+						} elseif ($format == 'flightgearsp') {
1117
+							//echo $buffer."\n";
1118
+							if (strlen($buffer) > 5) {
1119 1119
 				$line = explode(',',$buffer);
1120 1120
 				$data = array();
1121 1121
 				//XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p
@@ -1132,38 +1132,38 @@  discard block
 block discarded – undo
1132 1132
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1133 1133
 				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1134 1134
 				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
1135
-			    }
1136
-                        } elseif ($format == 'acars') {
1137
-                    	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1138
-			    $ACARS->add(trim($buffer));
1139
-			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
1140
-			    $ACARS->deleteLiveAcarsData();
1135
+				}
1136
+						} elseif ($format == 'acars') {
1137
+							if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1138
+				$ACARS->add(trim($buffer));
1139
+				socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
1140
+				$ACARS->deleteLiveAcarsData();
1141 1141
 			} elseif ($format == 'flightgearmp') {
1142
-			    if (substr($buffer,0,1) != '#') {
1142
+				if (substr($buffer,0,1) != '#') {
1143 1143
 				$data = array();
1144 1144
 				//echo $buffer."\n";
1145 1145
 				$line = explode(' ',$buffer);
1146 1146
 				if (count($line) == 11) {
1147
-				    $userserver = explode('@',$line[0]);
1148
-				    $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
1149
-				    $data['ident'] = $userserver[0];
1150
-				    $data['registration'] = $userserver[0];
1151
-				    $data['latitude'] = $line[4];
1152
-				    $data['longitude'] = $line[5];
1153
-				    $data['altitude'] = $line[6];
1154
-				    $data['datetime'] = date('Y-m-d H:i:s');
1155
-				    $aircraft_type = $line[10];
1156
-				    $aircraft_type = preg_split(':/:',$aircraft_type);
1157
-				    $data['aircraft_name'] = substr(end($aircraft_type),0,-4);
1158
-				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1159
-				    if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1147
+					$userserver = explode('@',$line[0]);
1148
+					$data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
1149
+					$data['ident'] = $userserver[0];
1150
+					$data['registration'] = $userserver[0];
1151
+					$data['latitude'] = $line[4];
1152
+					$data['longitude'] = $line[5];
1153
+					$data['altitude'] = $line[6];
1154
+					$data['datetime'] = date('Y-m-d H:i:s');
1155
+					$aircraft_type = $line[10];
1156
+					$aircraft_type = preg_split(':/:',$aircraft_type);
1157
+					$data['aircraft_name'] = substr(end($aircraft_type),0,-4);
1158
+					if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1159
+					if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1160
+				}
1160 1161
 				}
1161
-			    }
1162 1162
 			} elseif ($format == 'beast') {
1163
-			    echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
1164
-			    die;
1163
+				echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
1164
+				die;
1165 1165
 			} elseif ($format == 'vrstcp') {
1166
-			    foreach($buffer as $all_data) {
1166
+				foreach($buffer as $all_data) {
1167 1167
 				$line = json_decode('{'.$all_data.'}',true);
1168 1168
 				$data = array();
1169 1169
 				if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex
@@ -1183,113 +1183,113 @@  discard block
 block discarded – undo
1183 1183
 				*/
1184 1184
 				$data['datetime'] = date('Y-m-d H:i:s');
1185 1185
 				if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
1186
-		    		$data['format_source'] = 'vrstcp';
1186
+					$data['format_source'] = 'vrstcp';
1187 1187
 				$data['id_source'] = $id_source;
1188 1188
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1189 1189
 				if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1190 1190
 				if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data);
1191 1191
 				unset($data);
1192
-			    }
1192
+				}
1193 1193
 			} elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') {
1194
-			    $line = explode("\t", $buffer);
1195
-			    for($k = 0; $k < count($line); $k=$k+2) {
1194
+				$line = explode("\t", $buffer);
1195
+				for($k = 0; $k < count($line); $k=$k+2) {
1196 1196
 				$key = $line[$k];
1197
-			        $lined[$key] = $line[$k+1];
1198
-			    }
1199
-    			    if (count($lined) > 3) {
1200
-    				$data['hex'] = $lined['hexid'];
1201
-    				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
1202
-    				$data['datetime'] = date('Y-m-d H:i:s');;
1203
-    				if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
1204
-    				if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
1205
-    				if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
1206
-    				if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
1207
-    				if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
1208
-    				if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
1209
-    				if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
1210
-    				$data['id_source'] = $id_source;
1211
-    				$data['format_source'] = 'tsv';
1212
-    				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1213
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1197
+					$lined[$key] = $line[$k+1];
1198
+				}
1199
+					if (count($lined) > 3) {
1200
+					$data['hex'] = $lined['hexid'];
1201
+					//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
1202
+					$data['datetime'] = date('Y-m-d H:i:s');;
1203
+					if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
1204
+					if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
1205
+					if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
1206
+					if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
1207
+					if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
1208
+					if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
1209
+					if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
1210
+					$data['id_source'] = $id_source;
1211
+					$data['format_source'] = 'tsv';
1212
+					if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1213
+					if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1214 1214
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1215
-    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1216
-    				unset($lined);
1217
-    				unset($data);
1218
-    			    } else $error = true;
1215
+					if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1216
+					unset($lined);
1217
+					unset($data);
1218
+					} else $error = true;
1219 1219
 			} elseif ($format == 'aprs' && $use_aprs) {
1220
-			    if ($aprs_connect == 0) {
1220
+				if ($aprs_connect == 0) {
1221 1221
 				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
1222 1222
 				$aprs_connect = 1;
1223
-			    }
1223
+				}
1224 1224
 			    
1225
-			    if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
1225
+				if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
1226 1226
 				$aprs_last_tx = time();
1227 1227
 				$data_aprs = "# Keep alive";
1228 1228
 				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
1229
-			    }
1229
+				}
1230 1230
 			    
1231
-			    //echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
1232
-			    //echo 'APRS data : '.$buffer."\n";
1233
-			    $buffer = str_replace('APRS <- ','',$buffer);
1234
-			    $buffer = str_replace('APRS -> ','',$buffer);
1235
-			    //echo $buffer."\n";
1236
-			    if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
1231
+				//echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
1232
+				//echo 'APRS data : '.$buffer."\n";
1233
+				$buffer = str_replace('APRS <- ','',$buffer);
1234
+				$buffer = str_replace('APRS -> ','',$buffer);
1235
+				//echo $buffer."\n";
1236
+				if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
1237 1237
 				$line = $APRS->parse($buffer);
1238 1238
 				//if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) {
1239 1239
 				if (is_array($line) && isset($line['latitude']) && isset($line['longitude']) && (isset($line['ident']) || isset($line['address']) || isset($line['mmsi']))) {
1240
-				    $aprs_last_tx = time();
1241
-				    $data = array();
1242
-				    //print_r($line);
1243
-				    if (isset($line['address'])) $data['hex'] = $line['address'];
1244
-				    if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi'];
1245
-				    if (isset($line['imo'])) $data['imo'] = $line['imo'];
1246
-				    if (isset($line['squawk'])) $data['squawk'] = $line['squawk'];
1247
-				    if (isset($line['arrival_code'])) $data['arrical_code'] = $line['arrival_code'];
1248
-				    if (isset($line['arrival_date'])) $data['arrical_date'] = $line['arrival_date'];
1249
-				    if (isset($line['type_id'])) $data['type_id'] = $line['typeid'];
1250
-				    if (isset($line['status_id'])) $data['status_id'] = $line['statusid'];
1251
-				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
1252
-				    else $data['datetime'] = date('Y-m-d H:i:s');
1253
-				    //$data['datetime'] = date('Y-m-d H:i:s');
1254
-				    if (isset($line['ident'])) $data['ident'] = $line['ident'];
1255
-				    $data['latitude'] = $line['latitude'];
1256
-				    $data['longitude'] = $line['longitude'];
1257
-				    //$data['verticalrate'] = $line[16];
1258
-				    if (isset($line['speed'])) $data['speed'] = $line['speed'];
1259
-				    else $data['speed'] = 0;
1260
-				    if (isset($line['altitude'])) $data['altitude'] = $line['altitude'];
1261
-				    if (isset($line['comment'])) $data['comment'] = $line['comment'];
1262
-				    if (isset($line['symbol'])) $data['type'] = $line['symbol'];
1263
-				    if (isset($line['heading'])) $data['heading'] = $line['heading'];
1264
-				    //else $data['heading'] = 0;
1265
-				    if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth'];
1266
-				    if (!isset($line['source_type']) && (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE))) $data['noarchive'] = true;
1267
-				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1268
-				    elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) $data['noarchive'] = false;
1269
-    				    $data['id_source'] = $id_source;
1270
-    				    if (isset($line['format_source'])) $data['format_source'] = $line['format_source'];
1271
-				    else $data['format_source'] = 'aprs';
1272
-				    $data['source_name'] = $line['source'];
1273
-				    if (isset($line['source_type'])) $data['source_type'] = $line['source_type'];
1274
-				    else $data['source_type'] = 'flarm';
1275
-    				    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1276
-				    $currentdate = date('Y-m-d H:i:s');
1277
-				    $aprsdate = strtotime($data['datetime']);
1278
-				    // Accept data if time <= system time + 20s
1279
-				    //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'])))) {
1280
-				    if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
1240
+					$aprs_last_tx = time();
1241
+					$data = array();
1242
+					//print_r($line);
1243
+					if (isset($line['address'])) $data['hex'] = $line['address'];
1244
+					if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi'];
1245
+					if (isset($line['imo'])) $data['imo'] = $line['imo'];
1246
+					if (isset($line['squawk'])) $data['squawk'] = $line['squawk'];
1247
+					if (isset($line['arrival_code'])) $data['arrical_code'] = $line['arrival_code'];
1248
+					if (isset($line['arrival_date'])) $data['arrical_date'] = $line['arrival_date'];
1249
+					if (isset($line['type_id'])) $data['type_id'] = $line['typeid'];
1250
+					if (isset($line['status_id'])) $data['status_id'] = $line['statusid'];
1251
+					if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
1252
+					else $data['datetime'] = date('Y-m-d H:i:s');
1253
+					//$data['datetime'] = date('Y-m-d H:i:s');
1254
+					if (isset($line['ident'])) $data['ident'] = $line['ident'];
1255
+					$data['latitude'] = $line['latitude'];
1256
+					$data['longitude'] = $line['longitude'];
1257
+					//$data['verticalrate'] = $line[16];
1258
+					if (isset($line['speed'])) $data['speed'] = $line['speed'];
1259
+					else $data['speed'] = 0;
1260
+					if (isset($line['altitude'])) $data['altitude'] = $line['altitude'];
1261
+					if (isset($line['comment'])) $data['comment'] = $line['comment'];
1262
+					if (isset($line['symbol'])) $data['type'] = $line['symbol'];
1263
+					if (isset($line['heading'])) $data['heading'] = $line['heading'];
1264
+					//else $data['heading'] = 0;
1265
+					if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth'];
1266
+					if (!isset($line['source_type']) && (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE))) $data['noarchive'] = true;
1267
+					if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1268
+					elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) $data['noarchive'] = false;
1269
+						$data['id_source'] = $id_source;
1270
+						if (isset($line['format_source'])) $data['format_source'] = $line['format_source'];
1271
+					else $data['format_source'] = 'aprs';
1272
+					$data['source_name'] = $line['source'];
1273
+					if (isset($line['source_type'])) $data['source_type'] = $line['source_type'];
1274
+					else $data['source_type'] = 'flarm';
1275
+						if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1276
+					$currentdate = date('Y-m-d H:i:s');
1277
+					$aprsdate = strtotime($data['datetime']);
1278
+					// Accept data if time <= system time + 20s
1279
+					//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'])))) {
1280
+					if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
1281 1281
 					$send = $SI->add($data);
1282
-				    } elseif ($data['source_type'] == 'ais') {
1282
+					} elseif ($data['source_type'] == 'ais') {
1283 1283
 					if (isset($globalMarine) && $globalMarine) $send = $MI->add($data);
1284
-				    } elseif (isset($line['stealth'])) {
1284
+					} elseif (isset($line['stealth'])) {
1285 1285
 					if ($line['stealth'] != 0) echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
1286 1286
 					else echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n";
1287
-				    //} 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')) {
1288
-				    } 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') {
1287
+					//} 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')) {
1288
+					} 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') {
1289 1289
 					//echo '!!!!!!!!!!!!!!!! SEND !!!!!!!!!!!!!!!!!!!!'."\n";
1290 1290
 					if (isset($globalTracker) && $globalTracker) $send = $TI->add($data);
1291
-				    }
1292
-				    unset($data);
1291
+					}
1292
+					unset($data);
1293 1293
 				} 
1294 1294
 				elseif (is_array($line) && $globalDebug && isset($line['symbol']) && $line['symbol'] == 'Weather Station') {
1295 1295
 					echo '!! Weather Station not yet supported'."\n";
@@ -1299,12 +1299,12 @@  discard block
 block discarded – undo
1299 1299
 				}
1300 1300
 				//elseif ($line == false && $globalDebug) echo 'Ignored ('.$buffer.")\n";
1301 1301
 				//elseif ($line == true && $globalDebug) echo '!! Failed : '.$buffer."!!\n";
1302
-			    }
1302
+				}
1303 1303
 			} else {
1304
-			    $line = explode(',', $buffer);
1305
-    			    if (count($line) > 20) {
1306
-    			    	$data['hex'] = $line[4];
1307
-    				/*
1304
+				$line = explode(',', $buffer);
1305
+					if (count($line) > 20) {
1306
+						$data['hex'] = $line[4];
1307
+					/*
1308 1308
     				$data['datetime'] = $line[6].' '.$line[7];
1309 1309
     					date_default_timezone_set($globalTimezone);
1310 1310
     					$datetime = new DateTime($data['datetime']);
@@ -1312,30 +1312,30 @@  discard block
 block discarded – undo
1312 1312
     					$data['datetime'] = $datetime->format('Y-m-d H:i:s');
1313 1313
     					date_default_timezone_set('UTC');
1314 1314
     				*/
1315
-    				// Force datetime to current UTC datetime
1316
-    				date_default_timezone_set('UTC');
1317
-    				$data['datetime'] = date('Y-m-d H:i:s');
1318
-    				$data['ident'] = trim($line[10]);
1319
-    				$data['latitude'] = $line[14];
1320
-    				$data['longitude'] = $line[15];
1321
-    				$data['verticalrate'] = $line[16];
1322
-    				$data['emergency'] = $line[20];
1323
-    				$data['speed'] = $line[12];
1324
-    				$data['squawk'] = $line[17];
1325
-    				$data['altitude'] = $line[11];
1326
-    				$data['heading'] = $line[13];
1327
-    				$data['ground'] = $line[21];
1328
-    				$data['emergency'] = $line[19];
1329
-    				$data['format_source'] = 'sbs';
1315
+					// Force datetime to current UTC datetime
1316
+					date_default_timezone_set('UTC');
1317
+					$data['datetime'] = date('Y-m-d H:i:s');
1318
+					$data['ident'] = trim($line[10]);
1319
+					$data['latitude'] = $line[14];
1320
+					$data['longitude'] = $line[15];
1321
+					$data['verticalrate'] = $line[16];
1322
+					$data['emergency'] = $line[20];
1323
+					$data['speed'] = $line[12];
1324
+					$data['squawk'] = $line[17];
1325
+					$data['altitude'] = $line[11];
1326
+					$data['heading'] = $line[13];
1327
+					$data['ground'] = $line[21];
1328
+					$data['emergency'] = $line[19];
1329
+					$data['format_source'] = 'sbs';
1330 1330
 				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1331
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1331
+					if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1332 1332
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1333
-    				$data['id_source'] = $id_source;
1334
-    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
1335
-    				else $error = true;
1336
-    				unset($data);
1337
-    			    } else $error = true;
1338
-			    if ($error) {
1333
+					$data['id_source'] = $id_source;
1334
+					if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
1335
+					else $error = true;
1336
+					unset($data);
1337
+					} else $error = true;
1338
+				if ($error) {
1339 1339
 				if (count($line) > 1 && ($line[0] == 'STA' || $line[0] == 'AIR' || $line[0] == 'SEL' || $line[0] == 'ID' || $line[0] == 'CLK')) { 
1340 1340
 					if ($globalDebug) echo "Not a message. Ignoring... \n";
1341 1341
 				} else {
@@ -1351,13 +1351,13 @@  discard block
 block discarded – undo
1351 1351
 					connect_all($sourceer);
1352 1352
 					$sourceer = array();
1353 1353
 				}
1354
-			    }
1354
+				}
1355 1355
 			}
1356 1356
 			// Sleep for xxx microseconds
1357 1357
 			if (isset($globalSBSSleep)) usleep($globalSBSSleep);
1358
-		    } else {
1358
+			} else {
1359 1359
 			if ($format == 'flightgearmp') {
1360
-			    	if ($globalDebug) echo "Reconnect FlightGear MP...";
1360
+					if ($globalDebug) echo "Reconnect FlightGear MP...";
1361 1361
 				//@socket_close($r);
1362 1362
 				sleep($globalMinFetch);
1363 1363
 				$sourcefg[$nb] = $globalSources[$nb];
@@ -1366,9 +1366,9 @@  discard block
 block discarded – undo
1366 1366
 				break;
1367 1367
 				
1368 1368
 			} elseif ($format != 'acars' && $format != 'flightgearsp') {
1369
-			    if (isset($tt[$format])) $tt[$format]++;
1370
-			    else $tt[$format] = 0;
1371
-			    if ($tt[$format] > 30) {
1369
+				if (isset($tt[$format])) $tt[$format]++;
1370
+				else $tt[$format] = 0;
1371
+				if ($tt[$format] > 30) {
1372 1372
 				if ($globalDebug) echo "ERROR : Reconnect ".$format."...";
1373 1373
 				//@socket_close($r);
1374 1374
 				sleep(2);
@@ -1379,23 +1379,23 @@  discard block
 block discarded – undo
1379 1379
 				//connect_all($globalSources);
1380 1380
 				$tt[$format]=0;
1381 1381
 				break;
1382
-			    }
1382
+				}
1383
+			}
1383 1384
 			}
1384
-		    }
1385 1385
 		}
1386
-	    } else {
1386
+		} else {
1387 1387
 		$error = socket_strerror(socket_last_error());
1388 1388
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) {
1389 1389
 			if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
1390 1390
 			if (isset($globalDebug)) echo "Restarting...\n";
1391 1391
 			// Restart the script if possible
1392 1392
 			if (is_array($sockets)) {
1393
-			    if ($globalDebug) echo "Shutdown all sockets...";
1393
+				if ($globalDebug) echo "Shutdown all sockets...";
1394 1394
 			    
1395
-			    foreach ($sockets as $sock) {
1395
+				foreach ($sockets as $sock) {
1396 1396
 				@socket_shutdown($sock,2);
1397 1397
 				@socket_close($sock);
1398
-			    }
1398
+				}
1399 1399
 			    
1400 1400
 			}
1401 1401
 			if ($globalDebug) echo "Waiting...";
@@ -1410,13 +1410,13 @@  discard block
 block discarded – undo
1410 1410
 			if ($globalDebug) echo "Restart all connections...";
1411 1411
 			connect_all($globalSources);
1412 1412
 		}
1413
-	    }
1413
+		}
1414 1414
 	}
1415 1415
 	if ($globalDaemon === false) {
1416
-	    if ($globalDebug) echo 'Check all...'."\n";
1417
-	    $SI->checkAll();
1416
+		if ($globalDebug) echo 'Check all...'."\n";
1417
+		$SI->checkAll();
1418
+	}
1418 1419
 	}
1419
-    }
1420 1420
 }
1421 1421
 
1422 1422
 ?>
Please login to merge, or discard this patch.
Spacing   +141 added lines, -141 removed lines patch added patch discarded remove patch
@@ -45,20 +45,20 @@  discard block
 block discarded – undo
45 45
 	    die;
46 46
 	}
47 47
 	//$hosts = array($globalSBS1Host.':'.$globalSBS1Port);
48
-	$globalSources[] = array('host' => $globalSBS1Host,'port' => $globalSBS1Port);
48
+	$globalSources[] = array('host' => $globalSBS1Host, 'port' => $globalSBS1Port);
49 49
     }
50 50
 }
51 51
 
52
-$options = getopt('s::',array('source::','server','nodaemon','idsource::','aprsserverssid::','aprsserverpass::','aprsserverhost::','aprsserverport::','format::','noaprsserver'));
52
+$options = getopt('s::', array('source::', 'server', 'nodaemon', 'idsource::', 'aprsserverssid::', 'aprsserverpass::', 'aprsserverhost::', 'aprsserverport::', 'format::', 'noaprsserver'));
53 53
 //if (isset($options['s'])) $hosts = array($options['s']);
54 54
 //elseif (isset($options['source'])) $hosts = array($options['source']);
55 55
 if (isset($options['s'])) {
56 56
     $globalSources = array();
57
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']);
57
+    if (isset($options['format'])) $globalSources[] = array('host' => $options['s'], 'format' => $options['format']);
58 58
     else $globalSources[] = array('host' => $options['s']);
59 59
 } elseif (isset($options['source'])) {
60 60
     $globalSources = array();
61
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']);
61
+    if (isset($options['format'])) $globalSources[] = array('host' => $options['source'], 'format' => $options['format']);
62 62
     else $globalSources[] = array('host' => $options['source']);
63 63
 }
64 64
 if (isset($options['aprsserverhost'])) {
@@ -75,27 +75,27 @@  discard block
 block discarded – undo
75 75
 else $id_source = 1;
76 76
 if (isset($globalServer) && $globalServer) {
77 77
     if ($globalDebug) echo "Using Server Mode\n";
78
-    $SI=new SpotterServer();
78
+    $SI = new SpotterServer();
79 79
 /*
80 80
     require_once(dirname(__FILE__).'/../require/class.APRS.php');
81 81
     $SI = new adsb2aprs();
82 82
     $SI->connect();
83 83
 */
84
-} else $SI=new SpotterImport($Connection->db);
84
+} else $SI = new SpotterImport($Connection->db);
85 85
 if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db);
86 86
 if (isset($globalMarine) && $globalMarine) {
87 87
     $AIS = new AIS();
88 88
     $MI = new MarineImport($Connection->db);
89 89
 }
90 90
 //$APRS=new APRS($Connection->db);
91
-$SBS=new SBS();
92
-$ACARS=new ACARS($Connection->db);
93
-$Common=new Common();
91
+$SBS = new SBS();
92
+$ACARS = new ACARS($Connection->db);
93
+$Common = new Common();
94 94
 date_default_timezone_set('UTC');
95 95
 //$servertz = system('date +%Z');
96 96
 // signal handler - playing nice with sockets and dump1090
97 97
 if (function_exists('pcntl_fork')) {
98
-    pcntl_signal(SIGINT,  function() {
98
+    pcntl_signal(SIGINT, function() {
99 99
         global $sockets;
100 100
         echo "\n\nctrl-c or kill signal received. Tidying up ... ";
101 101
         die("Bye!\n");
@@ -111,35 +111,35 @@  discard block
 block discarded – undo
111 111
 
112 112
 function connect_all($hosts) {
113 113
     //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
114
-    global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;
114
+    global $sockets, $httpfeeds, $globalSources, $globalDebug, $aprs_connect, $last_exec, $globalSourcesRights, $use_aprs, $reset, $context;
115 115
     $reset++;
116 116
     if ($globalDebug) echo 'Connect to all...'."\n";
117 117
     foreach ($hosts as $id => $value) {
118 118
 	$host = $value['host'];
119 119
 	$globalSources[$id]['last_exec'] = 0;
120 120
 	// Here we check type of source(s)
121
-	if (filter_var($host,FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) {
122
-            if (preg_match('/deltadb.txt$/i',$host)) {
121
+	if (filter_var($host, FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) {
122
+            if (preg_match('/deltadb.txt$/i', $host)) {
123 123
         	//$formats[$id] = 'deltadbtxt';
124 124
         	$globalSources[$id]['format'] = 'deltadbtxt';
125 125
         	//$last_exec['deltadbtxt'] = 0;
126 126
         	if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
127
-            } else if (preg_match('/vatsim-data.txt$/i',$host)) {
127
+            } else if (preg_match('/vatsim-data.txt$/i', $host)) {
128 128
         	//$formats[$id] = 'vatsimtxt';
129 129
         	$globalSources[$id]['format'] = 'vatsimtxt';
130 130
         	//$last_exec['vatsimtxt'] = 0;
131 131
         	if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
132
-    	    } else if (preg_match('/aircraftlist.json$/i',$host)) {
132
+    	    } else if (preg_match('/aircraftlist.json$/i', $host)) {
133 133
         	//$formats[$id] = 'aircraftlistjson';
134 134
         	$globalSources[$id]['format'] = 'aircraftlistjson';
135 135
         	//$last_exec['aircraftlistjson'] = 0;
136 136
         	if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
137
-    	    } else if (preg_match('/opensky/i',$host)) {
137
+    	    } else if (preg_match('/opensky/i', $host)) {
138 138
         	//$formats[$id] = 'aircraftlistjson';
139 139
         	$globalSources[$id]['format'] = 'opensky';
140 140
         	//$last_exec['aircraftlistjson'] = 0;
141 141
         	if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
142
-    	    } else if (preg_match('/radarvirtuel.com\/file.json$/i',$host)) {
142
+    	    } else if (preg_match('/radarvirtuel.com\/file.json$/i', $host)) {
143 143
         	//$formats[$id] = 'radarvirtueljson';
144 144
         	$globalSources[$id]['format'] = 'radarvirtueljson';
145 145
         	//$last_exec['radarvirtueljson'] = 0;
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
149 149
         	    exit(0);
150 150
         	}
151
-    	    } else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
151
+    	    } else if (preg_match('/planeUpdateFAA.php$/i', $host)) {
152 152
         	//$formats[$id] = 'planeupdatefaa';
153 153
         	$globalSources[$id]['format'] = 'planeupdatefaa';
154 154
         	//$last_exec['planeupdatefaa'] = 0;
@@ -157,26 +157,26 @@  discard block
 block discarded – undo
157 157
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
158 158
         	    exit(0);
159 159
         	}
160
-            } else if (preg_match('/\/action.php\/acars\/data$/i',$host)) {
160
+            } else if (preg_match('/\/action.php\/acars\/data$/i', $host)) {
161 161
         	//$formats[$id] = 'phpvmacars';
162 162
         	$globalSources[$id]['format'] = 'phpvmacars';
163 163
         	//$last_exec['phpvmacars'] = 0;
164 164
         	if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
165
-            } else if (preg_match('/VAM-json.php$/i',$host)) {
165
+            } else if (preg_match('/VAM-json.php$/i', $host)) {
166 166
         	//$formats[$id] = 'phpvmacars';
167 167
         	$globalSources[$id]['format'] = 'vam';
168 168
         	if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
169
-            } else if (preg_match('/whazzup/i',$host)) {
169
+            } else if (preg_match('/whazzup/i', $host)) {
170 170
         	//$formats[$id] = 'whazzup';
171 171
         	$globalSources[$id]['format'] = 'whazzup';
172 172
         	//$last_exec['whazzup'] = 0;
173 173
         	if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
174
-            } else if (preg_match('/recentpireps/i',$host)) {
174
+            } else if (preg_match('/recentpireps/i', $host)) {
175 175
         	//$formats[$id] = 'pirepsjson';
176 176
         	$globalSources[$id]['format'] = 'pirepsjson';
177 177
         	//$last_exec['pirepsjson'] = 0;
178 178
         	if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
179
-            } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
179
+            } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i', $host)) {
180 180
         	//$formats[$id] = 'fr24json';
181 181
         	$globalSources[$id]['format'] = 'fr24json';
182 182
         	//$last_exec['fr24json'] = 0;
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
186 186
         	    exit(0);
187 187
         	}
188
-            } else if (preg_match(':myshiptracking.com/:i',$host)) {
188
+            } else if (preg_match(':myshiptracking.com/:i', $host)) {
189 189
         	//$formats[$id] = 'fr24json';
190 190
         	$globalSources[$id]['format'] = 'myshiptracking';
191 191
         	//$last_exec['fr24json'] = 0;
@@ -195,22 +195,22 @@  discard block
 block discarded – undo
195 195
         	    exit(0);
196 196
         	}
197 197
             //} else if (preg_match('/10001/',$host)) {
198
-            } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
198
+            } else if (preg_match('/10001/', $host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
199 199
         	//$formats[$id] = 'tsv';
200 200
         	$globalSources[$id]['format'] = 'tsv';
201 201
         	if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
202 202
             }
203
-        } elseif (filter_var($host,FILTER_VALIDATE_URL)) {
203
+        } elseif (filter_var($host, FILTER_VALIDATE_URL)) {
204 204
     		if ($globalSources[$id]['format'] == 'aisnmeahttp') {
205
-    		    $idf = fopen($globalSources[$id]['host'],'r',false,$context);
205
+    		    $idf = fopen($globalSources[$id]['host'], 'r', false, $context);
206 206
     		    if ($idf !== false) {
207 207
     			$httpfeeds[$id] = $idf;
208 208
         		if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
209 209
     		    }
210 210
     		    elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
211 211
     		} elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
212
-        } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
213
-	    $hostport = explode(':',$host);
212
+        } elseif (!filter_var($host, FILTER_VALIDATE_URL)) {
213
+	    $hostport = explode(':', $host);
214 214
 	    if (isset($hostport[1])) {
215 215
 		$port = $hostport[1];
216 216
 		$hostn = $hostport[0];
@@ -220,19 +220,19 @@  discard block
 block discarded – undo
220 220
 	    }
221 221
 	    $Common = new Common();
222 222
 	    if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
223
-        	$s = $Common->create_socket($hostn,$port, $errno, $errstr);
223
+        	$s = $Common->create_socket($hostn, $port, $errno, $errstr);
224 224
     	    } else {
225
-        	$s = $Common->create_socket_udp($hostn,$port, $errno, $errstr);
225
+        	$s = $Common->create_socket_udp($hostn, $port, $errno, $errstr);
226 226
 	    }
227 227
 	    if ($s) {
228 228
     	        $sockets[$id] = $s;
229 229
     	        if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
230
-		    if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') {
230
+		    if (preg_match('/aprs/', $hostn) || $port == '10152' || $port == '14580') {
231 231
 			//$formats[$id] = 'aprs';
232 232
 			$globalSources[$id]['format'] = 'aprs';
233 233
 			//$aprs_connect = 0;
234 234
 			//$use_aprs = true;
235
-		    } elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
235
+		    } elseif (preg_match('/pub-vrs/', $hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
236 236
 			$globalSources[$id]['format'] = 'vrstcp';
237 237
     		    } elseif ($port == '10001') {
238 238
         		//$formats[$id] = 'tsv';
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
 else if (isset($globalSBS1TimeOut)) $timeout = $globalSBS1TimeOut;
272 272
 else $timeout = 20;
273 273
 $errno = '';
274
-$errstr='';
274
+$errstr = '';
275 275
 
276 276
 if (!isset($globalDaemon)) $globalDaemon = TRUE;
277 277
 /* Initiate connections to all the hosts simultaneously */
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
 //connect_all($globalSources);
280 280
 
281 281
 if (isset($globalProxy) && $globalProxy) {
282
-    $context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true)));
282
+    $context = stream_context_create(array('http' => array('timeout' => $timeout, 'proxy' => $globalProxy, 'request_fulluri' => true)));
283 283
 } else {
284 284
     $context = stream_context_create(array('http' => array('timeout' => $timeout)));
285 285
 }
@@ -306,16 +306,16 @@  discard block
 block discarded – undo
306 306
 
307 307
 if ($use_aprs) {
308 308
 	require_once(dirname(__FILE__).'/../require/class.APRS.php');
309
-	$APRS=new APRS();
309
+	$APRS = new APRS();
310 310
 	$aprs_connect = 0;
311 311
 	$aprs_keep = 120;
312 312
 	$aprs_last_tx = time();
313 313
 	if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
314
-	else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
314
+	else $aprs_version = 'FlightAirMap '.str_replace(' ', '_', $globalName);
315 315
 	if (isset($globalAPRSssid)) $aprs_ssid = $globalAPRSssid;
316
-	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
316
+	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ', '_', $globalName)), 0, 8);
317 317
 	if (isset($globalAPRSfilter)) $aprs_filter = $globalAPRSfilter;
318
-	else $aprs_filter =  'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
318
+	else $aprs_filter = 'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
319 319
 	if ($aprs_full) $aprs_filter = '';
320 320
 	if (isset($globalAPRSpass)) $aprs_pass = $globalAPRSpass;
321 321
 	else $aprs_pass = '-1';
@@ -329,12 +329,12 @@  discard block
 block discarded – undo
329 329
 sleep(1);
330 330
 if ($globalDebug) echo "SCAN MODE \n\n";
331 331
 if (!isset($globalCronEnd)) $globalCronEnd = 60;
332
-$endtime = time()+$globalCronEnd;
332
+$endtime = time() + $globalCronEnd;
333 333
 $i = 1;
334 334
 $tt = array();
335 335
 // Delete all ATC
336 336
 if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM)) {
337
-	$ATC=new ATC($Connection->db);
337
+	$ATC = new ATC($Connection->db);
338 338
 }
339 339
 if (!$globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
340 340
 	$ATC->deleteAll();
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
342 342
 
343 343
 // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time.
344 344
 while ($i > 0) {
345
-    if (!$globalDaemon) $i = $endtime-time();
345
+    if (!$globalDaemon) $i = $endtime - time();
346 346
     // Delete old ATC
347 347
     if ($globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
348 348
 	if ($globalDebug) echo 'Delete old ATC...'."\n";
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
357 357
 	}
358 358
 	if ($max != $globalMinFetch) {
359 359
 	    if ($globalDebug) echo 'Sleeping...'."\n";
360
-	    sleep($globalMinFetch-$max+2);
360
+	    sleep($globalMinFetch - $max + 2);
361 361
 	}
362 362
     }
363 363
 
@@ -370,8 +370,8 @@  discard block
 block discarded – undo
370 370
 	    //$buffer = $Common->getData($hosts[$id]);
371 371
 	    $buffer = $Common->getData($value['host']);
372 372
 	    if ($buffer != '') $reset = 0;
373
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
374
-	    $buffer = explode('\n',$buffer);
373
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
374
+	    $buffer = explode('\n', $buffer);
375 375
 	    foreach ($buffer as $line) {
376 376
     		if ($line != '' && count($line) > 7) {
377 377
     		    $line = explode(',', $line);
@@ -399,11 +399,11 @@  discard block
 block discarded – undo
399 399
     	    $last_exec[$id]['last'] = time();
400 400
 	} elseif ($value['format'] == 'aisnmeatxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
401 401
 	    date_default_timezone_set('CET');
402
-	    $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
402
+	    $buffer = $Common->getData(str_replace('{date}', date('Ymd'), $value['host']));
403 403
 	    date_default_timezone_set('UTC');
404 404
 	    if ($buffer != '') $reset = 0;
405
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
406
-	    $buffer = explode('\n',$buffer);
405
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
406
+	    $buffer = explode('\n', $buffer);
407 407
 	    foreach ($buffer as $line) {
408 408
 		if ($line != '') {
409 409
 		    echo "'".$line."'\n";
@@ -421,7 +421,7 @@  discard block
 block discarded – undo
421 421
 		    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
422 422
 		    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
423 423
 		    if (isset($ais_data['timestamp'])) {
424
-			$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
424
+			$data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']);
425 425
 			if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) {
426 426
 			    $last_exec[$id]['timestamp'] = $ais_data['timestamp'];
427 427
 			    $add = true;
@@ -444,12 +444,12 @@  discard block
 block discarded – undo
444 444
 	    $w = $e = null;
445 445
 	    
446 446
 	    if (isset($arr[$id])) {
447
-		$nn = stream_select($arr,$w,$e,$timeout);
447
+		$nn = stream_select($arr, $w, $e, $timeout);
448 448
 		if ($nn > 0) {
449 449
 		    foreach ($httpfeeds as $feed) {
450
-			$buffer = stream_get_line($feed,2000,"\n");
451
-			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
452
-			$buffer = explode('\n',$buffer);
450
+			$buffer = stream_get_line($feed, 2000, "\n");
451
+			$buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
452
+			$buffer = explode('\n', $buffer);
453 453
 			foreach ($buffer as $line) {
454 454
 			    if ($line != '') {
455 455
 				$ais_data = $AIS->parse_line(trim($line));
@@ -467,9 +467,9 @@  discard block
 block discarded – undo
467 467
 				if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
468 468
 				if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
469 469
 				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
470
-				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
470
+				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s', $ais_data['eta_ts']);
471 471
 				if (isset($ais_data['timestamp'])) {
472
-				    $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
472
+				    $data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']);
473 473
 				} else {
474 474
 				    $data['datetime'] = date('Y-m-d H:i:s');
475 475
 				}
@@ -495,10 +495,10 @@  discard block
 block discarded – undo
495 495
 		}
496 496
 	    }
497 497
 	} elseif ($value['format'] == 'myshiptracking' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
498
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
498
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20');
499 499
 	    if ($buffer != '') {
500 500
 		//echo $buffer;
501
-		$all_data = json_decode($buffer,true);
501
+		$all_data = json_decode($buffer, true);
502 502
 		//print_r($all_data);
503 503
 		if (isset($all_data[0]['DATA'])) {
504 504
 		foreach ($all_data[0]['DATA'] as $line) {
@@ -513,7 +513,7 @@  discard block
 block discarded – undo
513 513
 			//    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
514 514
 			$data['imo'] = $line['IMO'];
515 515
 			//$data['arrival_code'] = $ais_data['destination'];
516
-			$data['datetime'] = date('Y-m-d H:i:s',$line['T']);
516
+			$data['datetime'] = date('Y-m-d H:i:s', $line['T']);
517 517
 			$data['format_source'] = 'myshiptracking';
518 518
 			$data['id_source'] = $id_source;
519 519
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -526,9 +526,9 @@  discard block
 block discarded – undo
526 526
 	    }
527 527
     	    $last_exec[$id]['last'] = time();
528 528
 	} elseif ($value['format'] == 'boatbeaconapp' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
529
-	    $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host']));
529
+	    $buffer = $Common->getData(str_replace('{timestamp}', time(), $value['host']));
530 530
 	    if ($buffer != '') {
531
-		$all_data = json_decode($buffer,true);
531
+		$all_data = json_decode($buffer, true);
532 532
 		if (isset($all_data[0]['mmsi'])) {
533 533
 		    foreach ($all_data as $line) {
534 534
 			if ($line != '') {
@@ -556,27 +556,27 @@  discard block
 block discarded – undo
556 556
     	    $last_exec[$id]['last'] = time();
557 557
 	} elseif ($value['format'] == 'shipplotter' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
558 558
 	    echo 'download...';
559
-	    $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
559
+	    $buffer = $Common->getData($value['host'], 'post', $value['post'], '', '', '', '', 'ShipPlotter');
560 560
 	    echo 'done !'."\n";
561 561
 	    if ($buffer != '') $reset = 0;
562
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
563
-	    $buffer = explode('\n',$buffer);
562
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
563
+	    $buffer = explode('\n', $buffer);
564 564
 	    foreach ($buffer as $line) {
565 565
 		if ($line != '') {
566 566
 		    $data = array();
567
-		    $data['mmsi'] = (int)substr($line,0,9);
568
-		    $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
567
+		    $data['mmsi'] = (int) substr($line, 0, 9);
568
+		    $data['datetime'] = date('Y-m-d H:i:s', substr($line, 10, 10));
569 569
 		    //$data['status'] = substr($line,21,2);
570 570
 		    //$data['type'] = substr($line,24,3);
571
-		    $data['latitude'] = substr($line,29,9);
572
-		    $data['longitude'] = substr($line,41,9);
573
-		    $data['speed'] = round(substr($line,51,5));
571
+		    $data['latitude'] = substr($line, 29, 9);
572
+		    $data['longitude'] = substr($line, 41, 9);
573
+		    $data['speed'] = round(substr($line, 51, 5));
574 574
 		    //$data['course'] = substr($line,57,5);
575
-		    $data['heading'] = round(substr($line,63,3));
575
+		    $data['heading'] = round(substr($line, 63, 3));
576 576
 		    //$data['draft'] = substr($line,67,4);
577 577
 		    //$data['length'] = substr($line,72,3);
578 578
 		    //$data['beam'] = substr($line,76,2);
579
-		    $data['ident'] = trim(utf8_encode(substr($line,79,20)));
579
+		    $data['ident'] = trim(utf8_encode(substr($line, 79, 20)));
580 580
 		    //$data['callsign'] = trim(substr($line,100,7);
581 581
 		    //$data['dest'] = substr($line,108,20);
582 582
 		    //$data['etaDate'] = substr($line,129,5);
@@ -595,8 +595,8 @@  discard block
 block discarded – undo
595 595
 	} elseif (($value['format'] == 'whazzup' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) || ($value['format'] == 'vatsimtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch))) {
596 596
 	    //$buffer = $Common->getData($hosts[$id]);
597 597
 	    $buffer = $Common->getData($value['host']);
598
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
599
-	    $buffer = explode('\n',$buffer);
598
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
599
+	    $buffer = explode('\n', $buffer);
600 600
 	    $reset = 0;
601 601
 	    foreach ($buffer as $line) {
602 602
     		if ($line != '') {
@@ -607,7 +607,7 @@  discard block
 block discarded – undo
607 607
 			else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
608 608
 			$data['pilot_id'] = $line[1];
609 609
 			$data['pilot_name'] = $line[2];
610
-			$data['hex'] = str_pad(dechex($Common->str2int($line[1])),6,'000000',STR_PAD_LEFT);
610
+			$data['hex'] = str_pad(dechex($Common->str2int($line[1])), 6, '000000', STR_PAD_LEFT);
611 611
 			$data['ident'] = $line[0]; // ident
612 612
 			if ($line[7] != '' && $line[7] != 0) $data['altitude'] = $line[7]; // altitude
613 613
 			$data['speed'] = $line[8]; // speed
@@ -623,7 +623,7 @@  discard block
 block discarded – undo
623 623
 			//$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37]));
624 624
 			//if (isset($line[37])) $data['last_update'] = $line[37];
625 625
 		        $data['departure_airport_icao'] = $line[11];
626
-		        $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
626
+		        $data['departure_airport_time'] = rtrim(chunk_split($line[22], 2, ':'), ':');
627 627
 		        $data['arrival_airport_icao'] = $line[13];
628 628
 			$data['frequency'] = $line[4];
629 629
 			$data['type'] = $line[18];
@@ -632,7 +632,7 @@  discard block
 block discarded – undo
632 632
     			$data['id_source'] = $id_source;
633 633
 	    		//$data['arrival_airport_time'] = ;
634 634
 	    		if ($line[9] != '') {
635
-	    		    $aircraft_data = explode('/',$line[9]);
635
+	    		    $aircraft_data = explode('/', $line[9]);
636 636
 	    		    if (isset($aircraft_data[1])) {
637 637
 	    			$data['aircraft_icao'] = $aircraft_data[1];
638 638
 	    		    }
@@ -647,9 +647,9 @@  discard block
 block discarded – undo
647 647
     			if ($line[3] == 'PILOT') $SI->add($data);
648 648
 			elseif ($line[3] == 'ATC') {
649 649
 				//print_r($data);
650
-				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
651
-				$data['info'] = str_replace('&amp;sect;','',$data['info']);
652
-				$typec = substr($data['ident'],-3);
650
+				$data['info'] = str_replace('^&sect;', '<br />', $data['info']);
651
+				$data['info'] = str_replace('&amp;sect;', '', $data['info']);
652
+				$typec = substr($data['ident'], -3);
653 653
 				if ($typec == 'APP') $data['type'] = 'Approach';
654 654
 				elseif ($typec == 'TWR') $data['type'] = 'Tower';
655 655
 				elseif ($typec == 'OBS') $data['type'] = 'Observer';
@@ -660,7 +660,7 @@  discard block
 block discarded – undo
660 660
 				elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
661 661
 				elseif ($data['type'] == '') $data['type'] = 'Observer';
662 662
 				if (!isset($data['source_name'])) $data['source_name'] = '';
663
-				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']);
663
+				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']);
664 664
 			}
665 665
     			unset($data);
666 666
     		    }
@@ -671,9 +671,9 @@  discard block
 block discarded – undo
671 671
     	    $last_exec[$id]['last'] = time();
672 672
     	//} elseif ($value == 'aircraftlistjson' && (time() - $last_exec['aircraftlistjson'] > $globalMinFetch)) {
673 673
     	} elseif ($value['format'] == 'aircraftlistjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
674
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
674
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20');
675 675
 	    if ($buffer != '') {
676
-	    $all_data = json_decode($buffer,true);
676
+	    $all_data = json_decode($buffer, true);
677 677
 	    if (isset($all_data['acList'])) {
678 678
 		$reset = 0;
679 679
 		foreach ($all_data['acList'] as $line) {
@@ -690,7 +690,7 @@  discard block
 block discarded – undo
690 690
 		    $data['emergency'] = ''; // emergency
691 691
 		    if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
692 692
 		    
693
-		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
693
+		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s', round($line['PosTime']/1000));
694 694
 		    else $data['datetime'] = date('Y-m-d H:i:s');
695 695
 		    
696 696
 		    //$data['datetime'] = date('Y-m-d H:i:s');
@@ -716,7 +716,7 @@  discard block
 block discarded – undo
716 716
 		    $data['verticalrate'] = $line['vrt']; // verticale rate
717 717
 		    $data['squawk'] = $line['squawk']; // squawk
718 718
 		    $data['emergency'] = ''; // emergency
719
-		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
719
+		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s', round($line['PosTime']/1000));
720 720
 		    else $data['datetime'] = date('Y-m-d H:i:s');
721 721
 	    	    $data['format_source'] = 'aircraftlistjson';
722 722
     		    $data['id_source'] = $id_source;
@@ -732,7 +732,7 @@  discard block
 block discarded – undo
732 732
     	//} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
733 733
     	} elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
734 734
 	    $buffer = $Common->getData($value['host']);
735
-	    $all_data = json_decode($buffer,true);
735
+	    $all_data = json_decode($buffer, true);
736 736
 	    if (isset($all_data['planes'])) {
737 737
 		$reset = 0;
738 738
 		foreach ($all_data['planes'] as $key => $line) {
@@ -749,12 +749,12 @@  discard block
 block discarded – undo
749 749
 		    $data['emergency'] = ''; // emergency
750 750
 		    $data['registration'] = $line[2];
751 751
 		    $data['aircraft_icao'] = $line[0];
752
-		    $deparr = explode('-',$line[1]);
752
+		    $deparr = explode('-', $line[1]);
753 753
 		    if (count($deparr) == 2) {
754 754
 			$data['departure_airport_icao'] = $deparr[0];
755 755
 			$data['arrival_airport_icao'] = $deparr[1];
756 756
 		    }
757
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]);
757
+		    $data['datetime'] = date('Y-m-d H:i:s', $line[9]);
758 758
 	    	    $data['format_source'] = 'planeupdatefaa';
759 759
     		    $data['id_source'] = $id_source;
760 760
 		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -767,7 +767,7 @@  discard block
 block discarded – undo
767 767
     	    $last_exec[$id]['last'] = time();
768 768
     	} elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
769 769
 	    $buffer = $Common->getData($value['host']);
770
-	    $all_data = json_decode($buffer,true);
770
+	    $all_data = json_decode($buffer, true);
771 771
 	    if (isset($all_data['states'])) {
772 772
 		$reset = 0;
773 773
 		foreach ($all_data['states'] as $key => $line) {
@@ -784,7 +784,7 @@  discard block
 block discarded – undo
784 784
 		    //$data['emergency'] = ''; // emergency
785 785
 		    //$data['registration'] = $line[2];
786 786
 		    //$data['aircraft_icao'] = $line[0];
787
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]);
787
+		    $data['datetime'] = date('Y-m-d H:i:s', $line[3]);
788 788
 	    	    $data['format_source'] = 'opensky';
789 789
     		    $data['id_source'] = $id_source;
790 790
 		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -798,7 +798,7 @@  discard block
 block discarded – undo
798 798
     	} elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
799 799
 	    //$buffer = $Common->getData($hosts[$id]);
800 800
 	    $buffer = $Common->getData($value['host']);
801
-	    $all_data = json_decode($buffer,true);
801
+	    $all_data = json_decode($buffer, true);
802 802
 	    if (!empty($all_data)) $reset = 0;
803 803
 	    foreach ($all_data as $key => $line) {
804 804
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
@@ -831,11 +831,11 @@  discard block
 block discarded – undo
831 831
     	//} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) {
832 832
     	} elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
833 833
 	    //$buffer = $Common->getData($hosts[$id],'get','','','','','150');
834
-	    $buffer = $Common->getData($value['host'],'get','','','','','150');
834
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '150');
835 835
 	    //echo $buffer;
836
-	    $buffer = str_replace(array("\n","\r"),"",$buffer);
837
-	    $buffer = preg_replace('/,"num":(.+)/','}',$buffer);
838
-	    $all_data = json_decode($buffer,true);
836
+	    $buffer = str_replace(array("\n", "\r"), "", $buffer);
837
+	    $buffer = preg_replace('/,"num":(.+)/', '}', $buffer);
838
+	    $all_data = json_decode($buffer, true);
839 839
 	    if (json_last_error() != JSON_ERROR_NONE) {
840 840
 		die(json_last_error_msg());
841 841
 	    }
@@ -858,7 +858,7 @@  discard block
 block discarded – undo
858 858
 			//$data['departure_airport_iata'] = $line[11];
859 859
 			//$data['arrival_airport_iata'] = $line[12];
860 860
 	    		//$data['emergency'] = ''; // emergency
861
-			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10]
861
+			$data['datetime'] = date('Y-m-d H:i:s', $line['inf']['dt']); //$line[10]
862 862
 	    		$data['format_source'] = 'radarvirtueljson';
863 863
     			$data['id_source'] = $id_source;
864 864
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -874,14 +874,14 @@  discard block
 block discarded – undo
874 874
     	} elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
875 875
 	    //$buffer = $Common->getData($hosts[$id]);
876 876
 	    $buffer = $Common->getData($value['host'].'?'.time());
877
-	    $all_data = json_decode(utf8_encode($buffer),true);
877
+	    $all_data = json_decode(utf8_encode($buffer), true);
878 878
 	    
879 879
 	    if (isset($all_data['pireps'])) {
880 880
 		$reset = 0;
881 881
 	        foreach ($all_data['pireps'] as $line) {
882 882
 		    $data = array();
883 883
 		    $data['id'] = $line['id'];
884
-		    $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
884
+		    $data['hex'] = substr(str_pad(dechex($line['id']), 6, '000000', STR_PAD_LEFT), 0, 6);
885 885
 		    $data['ident'] = $line['callsign']; // ident
886 886
 		    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
887 887
 		    if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
@@ -911,9 +911,9 @@  discard block
 block discarded – undo
911 911
 			$SI->add($data);
912 912
 		    //    print_r($data);
913 913
     		    } elseif ($line['icon'] == 'ct') {
914
-			$data['info'] = str_replace('^&sect;','<br />',$data['info']);
915
-			$data['info'] = str_replace('&amp;sect;','',$data['info']);
916
-			$typec = substr($data['ident'],-3);
914
+			$data['info'] = str_replace('^&sect;', '<br />', $data['info']);
915
+			$data['info'] = str_replace('&amp;sect;', '', $data['info']);
916
+			$typec = substr($data['ident'], -3);
917 917
 			$data['type'] = '';
918 918
 			if ($typec == 'APP') $data['type'] = 'Approach';
919 919
 			elseif ($typec == 'TWR') $data['type'] = 'Tower';
@@ -924,7 +924,7 @@  discard block
 block discarded – undo
924 924
 			elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station';
925 925
 			elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
926 926
 			else $data['type'] = 'Observer';
927
-			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']);
927
+			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']);
928 928
 		    }
929 929
 		    unset($data);
930 930
 		}
@@ -936,14 +936,14 @@  discard block
 block discarded – undo
936 936
 	    //$buffer = $Common->getData($hosts[$id]);
937 937
 	    if ($globalDebug) echo 'Get Data...'."\n";
938 938
 	    $buffer = $Common->getData($value['host']);
939
-	    $all_data = json_decode($buffer,true);
939
+	    $all_data = json_decode($buffer, true);
940 940
 	    if ($buffer != '' && is_array($all_data)) {
941 941
 		$reset = 0;
942 942
 		foreach ($all_data as $line) {
943 943
 	    	    $data = array();
944 944
 	    	    //$data['id'] = $line['id']; // id not usable
945 945
 	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
946
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
946
+	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']), 6, '000000', STR_PAD_LEFT), -6); // hex
947 947
 	    	    if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
948 948
 	    	    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
949 949
 	    	    $data['ident'] = $line['flightnum']; // ident
@@ -967,14 +967,14 @@  discard block
 block discarded – undo
967 967
 		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
968 968
 		    if (isset($line['aircraftname'])) {
969 969
 			$line['aircraftname'] = strtoupper($line['aircraftname']);
970
-			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']);
971
-	    		$aircraft_data = explode('-',$line['aircraftname']);
970
+			$line['aircraftname'] = str_replace('BOEING ', 'B', $line['aircraftname']);
971
+	    		$aircraft_data = explode('-', $line['aircraftname']);
972 972
 	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
973 973
 	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
974 974
 	    		else {
975
-	    		    $aircraft_data = explode(' ',$line['aircraftname']);
976
-	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
977
-	    		    else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
975
+	    		    $aircraft_data = explode(' ', $line['aircraftname']);
976
+	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-', '', $aircraft_data[1]);
977
+	    		    else $data['aircraft_icao'] = str_replace('-', '', $line['aircraftname']);
978 978
 	    		}
979 979
 	    	    }
980 980
     		    if (isset($line['route'])) $data['waypoints'] = $line['route'];
@@ -994,14 +994,14 @@  discard block
 block discarded – undo
994 994
 	    //$buffer = $Common->getData($hosts[$id]);
995 995
 	    if ($globalDebug) echo 'Get Data...'."\n";
996 996
 	    $buffer = $Common->getData($value['host']);
997
-	    $all_data = json_decode($buffer,true);
997
+	    $all_data = json_decode($buffer, true);
998 998
 	    if ($buffer != '' && is_array($all_data)) {
999 999
 		$reset = 0;
1000 1000
 		foreach ($all_data as $line) {
1001 1001
 	    	    $data = array();
1002 1002
 	    	    //$data['id'] = $line['id']; // id not usable
1003 1003
 	    	    $data['id'] = trim($line['flight_id']);
1004
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
1004
+	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']), 6, '000000', STR_PAD_LEFT), -6); // hex
1005 1005
 	    	    $data['pilot_name'] = $line['pilot_name'];
1006 1006
 	    	    $data['pilot_id'] = $line['pilot_id'];
1007 1007
 	    	    $data['ident'] = trim($line['callsign']); // ident
@@ -1053,11 +1053,11 @@  discard block
 block discarded – undo
1053 1053
 		    //$value = $formats[$nb];
1054 1054
 		    $format = $globalSources[$nb]['format'];
1055 1055
 		    if ($format == 'sbs' || $format == 'aprs' || $format == 'famaprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') {
1056
-			$buffer = @socket_read($r, 6000,PHP_NORMAL_READ);
1056
+			$buffer = @socket_read($r, 6000, PHP_NORMAL_READ);
1057 1057
 		    } elseif ($format == 'vrstcp') {
1058 1058
 			$buffer = @socket_read($r, 6000);
1059 1059
 		    } else {
1060
-			$az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port);
1060
+			$az = socket_recvfrom($r, $buffer, 6000, 0, $remote_ip, $remote_port);
1061 1061
 		    }
1062 1062
 		    //$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
1063 1063
 		    //echo $buffer."\n";
@@ -1066,8 +1066,8 @@  discard block
 block discarded – undo
1066 1066
 		    $error = false;
1067 1067
 		    //$SI::del();
1068 1068
 		    if ($format == 'vrstcp') {
1069
-			$buffer = explode('},{',$buffer);
1070
-		    } else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
1069
+			$buffer = explode('},{', $buffer);
1070
+		    } else $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '', $buffer));
1071 1071
 		    // SBS format is CSV format
1072 1072
 		    if ($buffer !== FALSE && $buffer != '') {
1073 1073
 			$tt[$format] = 0;
@@ -1101,11 +1101,11 @@  discard block
 block discarded – undo
1101 1101
 			    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
1102 1102
 			    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
1103 1103
 			    if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
1104
-			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
1104
+			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s', $ais_data['eta_ts']);
1105 1105
 			    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1106 1106
 
1107 1107
 			    if (isset($ais_data['timestamp'])) {
1108
-				$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
1108
+				$data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']);
1109 1109
 			    } else {
1110 1110
 				$data['datetime'] = date('Y-m-d H:i:s');
1111 1111
 			    }
@@ -1116,10 +1116,10 @@  discard block
 block discarded – undo
1116 1116
                         } elseif ($format == 'flightgearsp') {
1117 1117
                     	    //echo $buffer."\n";
1118 1118
                     	    if (strlen($buffer) > 5) {
1119
-				$line = explode(',',$buffer);
1119
+				$line = explode(',', $buffer);
1120 1120
 				$data = array();
1121 1121
 				//XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p
1122
-				$data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]),6,'000000',STR_PAD_LEFT),0,6);
1122
+				$data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]), 6, '000000', STR_PAD_LEFT), 0, 6);
1123 1123
 				$data['ident'] = $line[6];
1124 1124
 				$data['aircraft_name'] = $line[7];
1125 1125
 				$data['longitude'] = $line[1];
@@ -1131,21 +1131,21 @@  discard block
 block discarded – undo
1131 1131
 				$data['format_source'] = 'flightgearsp';
1132 1132
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1133 1133
 				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1134
-				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
1134
+				$send = @ socket_send($r, $data_aprs, strlen($data_aprs), 0);
1135 1135
 			    }
1136 1136
                         } elseif ($format == 'acars') {
1137 1137
                     	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1138 1138
 			    $ACARS->add(trim($buffer));
1139
-			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
1139
+			    socket_sendto($r, "OK ".$buffer, 100, 0, $remote_ip, $remote_port);
1140 1140
 			    $ACARS->deleteLiveAcarsData();
1141 1141
 			} elseif ($format == 'flightgearmp') {
1142
-			    if (substr($buffer,0,1) != '#') {
1142
+			    if (substr($buffer, 0, 1) != '#') {
1143 1143
 				$data = array();
1144 1144
 				//echo $buffer."\n";
1145
-				$line = explode(' ',$buffer);
1145
+				$line = explode(' ', $buffer);
1146 1146
 				if (count($line) == 11) {
1147
-				    $userserver = explode('@',$line[0]);
1148
-				    $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
1147
+				    $userserver = explode('@', $line[0]);
1148
+				    $data['hex'] = substr(str_pad(bin2hex($line[0]), 6, '000000', STR_PAD_LEFT), 0, 6); // hex
1149 1149
 				    $data['ident'] = $userserver[0];
1150 1150
 				    $data['registration'] = $userserver[0];
1151 1151
 				    $data['latitude'] = $line[4];
@@ -1153,8 +1153,8 @@  discard block
 block discarded – undo
1153 1153
 				    $data['altitude'] = $line[6];
1154 1154
 				    $data['datetime'] = date('Y-m-d H:i:s');
1155 1155
 				    $aircraft_type = $line[10];
1156
-				    $aircraft_type = preg_split(':/:',$aircraft_type);
1157
-				    $data['aircraft_name'] = substr(end($aircraft_type),0,-4);
1156
+				    $aircraft_type = preg_split(':/:', $aircraft_type);
1157
+				    $data['aircraft_name'] = substr(end($aircraft_type), 0, -4);
1158 1158
 				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1159 1159
 				    if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1160 1160
 				}
@@ -1163,8 +1163,8 @@  discard block
 block discarded – undo
1163 1163
 			    echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
1164 1164
 			    die;
1165 1165
 			} elseif ($format == 'vrstcp') {
1166
-			    foreach($buffer as $all_data) {
1167
-				$line = json_decode('{'.$all_data.'}',true);
1166
+			    foreach ($buffer as $all_data) {
1167
+				$line = json_decode('{'.$all_data.'}', true);
1168 1168
 				$data = array();
1169 1169
 				if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex
1170 1170
 				if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
@@ -1190,16 +1190,16 @@  discard block
 block discarded – undo
1190 1190
 				if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data);
1191 1191
 				unset($data);
1192 1192
 			    }
1193
-			} elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') {
1193
+			} elseif ($format == 'tsv' || substr($buffer, 0, 4) == 'clock') {
1194 1194
 			    $line = explode("\t", $buffer);
1195
-			    for($k = 0; $k < count($line); $k=$k+2) {
1195
+			    for ($k = 0; $k < count($line); $k = $k + 2) {
1196 1196
 				$key = $line[$k];
1197
-			        $lined[$key] = $line[$k+1];
1197
+			        $lined[$key] = $line[$k + 1];
1198 1198
 			    }
1199 1199
     			    if (count($lined) > 3) {
1200 1200
     				$data['hex'] = $lined['hexid'];
1201 1201
     				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
1202
-    				$data['datetime'] = date('Y-m-d H:i:s');;
1202
+    				$data['datetime'] = date('Y-m-d H:i:s'); ;
1203 1203
     				if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
1204 1204
     				if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
1205 1205
     				if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
@@ -1218,22 +1218,22 @@  discard block
 block discarded – undo
1218 1218
     			    } else $error = true;
1219 1219
 			} elseif ($format == 'aprs' && $use_aprs) {
1220 1220
 			    if ($aprs_connect == 0) {
1221
-				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
1221
+				$send = @ socket_send($r, $aprs_login, strlen($aprs_login), 0);
1222 1222
 				$aprs_connect = 1;
1223 1223
 			    }
1224 1224
 			    
1225
-			    if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
1225
+			    if ($aprs_keep > 60 && time() - $aprs_last_tx > $aprs_keep) {
1226 1226
 				$aprs_last_tx = time();
1227 1227
 				$data_aprs = "# Keep alive";
1228
-				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
1228
+				$send = @ socket_send($r, $data_aprs, strlen($data_aprs), 0);
1229 1229
 			    }
1230 1230
 			    
1231 1231
 			    //echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
1232 1232
 			    //echo 'APRS data : '.$buffer."\n";
1233
-			    $buffer = str_replace('APRS <- ','',$buffer);
1234
-			    $buffer = str_replace('APRS -> ','',$buffer);
1233
+			    $buffer = str_replace('APRS <- ', '', $buffer);
1234
+			    $buffer = str_replace('APRS -> ', '', $buffer);
1235 1235
 			    //echo $buffer."\n";
1236
-			    if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
1236
+			    if (substr($buffer, 0, 1) != '#' && substr($buffer, 0, 1) != '@' && substr($buffer, 0, 5) != 'APRS ') {
1237 1237
 				$line = $APRS->parse($buffer);
1238 1238
 				//if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) {
1239 1239
 				if (is_array($line) && isset($line['latitude']) && isset($line['longitude']) && (isset($line['ident']) || isset($line['address']) || isset($line['mmsi']))) {
@@ -1248,7 +1248,7 @@  discard block
 block discarded – undo
1248 1248
 				    if (isset($line['arrival_date'])) $data['arrical_date'] = $line['arrival_date'];
1249 1249
 				    if (isset($line['type_id'])) $data['type_id'] = $line['typeid'];
1250 1250
 				    if (isset($line['status_id'])) $data['status_id'] = $line['statusid'];
1251
-				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
1251
+				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s', $line['timestamp']);
1252 1252
 				    else $data['datetime'] = date('Y-m-d H:i:s');
1253 1253
 				    //$data['datetime'] = date('Y-m-d H:i:s');
1254 1254
 				    if (isset($line['ident'])) $data['ident'] = $line['ident'];
@@ -1377,7 +1377,7 @@  discard block
 block discarded – undo
1377 1377
 				connect_all($sourceee);
1378 1378
 				$sourceee = array();
1379 1379
 				//connect_all($globalSources);
1380
-				$tt[$format]=0;
1380
+				$tt[$format] = 0;
1381 1381
 				break;
1382 1382
 			    }
1383 1383
 			}
@@ -1386,14 +1386,14 @@  discard block
 block discarded – undo
1386 1386
 	    } else {
1387 1387
 		$error = socket_strerror(socket_last_error());
1388 1388
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) {
1389
-			if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
1389
+			if ($globalDebug) echo "ERROR : socket_select give this error ".$error."\n";
1390 1390
 			if (isset($globalDebug)) echo "Restarting...\n";
1391 1391
 			// Restart the script if possible
1392 1392
 			if (is_array($sockets)) {
1393 1393
 			    if ($globalDebug) echo "Shutdown all sockets...";
1394 1394
 			    
1395 1395
 			    foreach ($sockets as $sock) {
1396
-				@socket_shutdown($sock,2);
1396
+				@socket_shutdown($sock, 2);
1397 1397
 				@socket_close($sock);
1398 1398
 			    }
1399 1399
 			    
Please login to merge, or discard this patch.
require/class.SpotterImport.php 3 patches
Indentation   +402 added lines, -402 removed lines patch added patch discarded remove patch
@@ -8,20 +8,20 @@  discard block
 block discarded – undo
8 8
 require_once(dirname(__FILE__).'/class.Stats.php');
9 9
 require_once(dirname(__FILE__).'/class.Source.php');
10 10
 if (isset($globalServerAPRS) && $globalServerAPRS) {
11
-    require_once(dirname(__FILE__).'/class.APRS.php');
11
+	require_once(dirname(__FILE__).'/class.APRS.php');
12 12
 }
13 13
 
14 14
 class SpotterImport {
15
-    private $all_flights = array();
16
-    private $last_delete_hourly = 0;
17
-    private $last_delete = 0;
18
-    private $stats = array();
19
-    private $tmd = 0;
20
-    private $source_location = array();
21
-    public $db = null;
22
-    public $nb = 0;
23
-
24
-    public function __construct($dbc = null) {
15
+	private $all_flights = array();
16
+	private $last_delete_hourly = 0;
17
+	private $last_delete = 0;
18
+	private $stats = array();
19
+	private $tmd = 0;
20
+	private $source_location = array();
21
+	public $db = null;
22
+	public $nb = 0;
23
+
24
+	public function __construct($dbc = null) {
25 25
 	global $globalBeta, $globalServerAPRS, $APRSSpotter, $globalNoDB;
26 26
 	if (!(isset($globalNoDB) && $globalNoDB)) {
27 27
 		$Connection = new Connection($dbc);
@@ -33,14 +33,14 @@  discard block
 block discarded – undo
33 33
 		$currentdate = date('Y-m-d');
34 34
 		$sourcestat = $Stats->getStatsSource($currentdate);
35 35
 		if (!empty($sourcestat)) {
36
-		    foreach($sourcestat as $srcst) {
37
-		    	$type = $srcst['stats_type'];
36
+			foreach($sourcestat as $srcst) {
37
+				$type = $srcst['stats_type'];
38 38
 			if ($type == 'polar' || $type == 'hist') {
39
-			    $source = $srcst['source_name'];
40
-			    $data = $srcst['source_data'];
41
-			    $this->stats[$currentdate][$source][$type] = json_decode($data,true);
42
-	    		}
43
-		    }
39
+				$source = $srcst['source_name'];
40
+				$data = $srcst['source_data'];
41
+				$this->stats[$currentdate][$source][$type] = json_decode($data,true);
42
+				}
43
+			}
44 44
 		}
45 45
 	}
46 46
 	if (isset($globalServerAPRS) && $globalServerAPRS) {
@@ -48,9 +48,9 @@  discard block
 block discarded – undo
48 48
 		//$APRSSpotter->connect();
49 49
 	}
50 50
 
51
-    }
51
+	}
52 52
 
53
-    public function get_Schedule($id,$ident) {
53
+	public function get_Schedule($id,$ident) {
54 54
 	global $globalDebug, $globalFork, $globalSchedulesFetch;
55 55
 	// Get schedule here, so it's done only one time
56 56
 	
@@ -70,42 +70,42 @@  discard block
 block discarded – undo
70 70
 	$operator = $Spotter->getOperator($ident);
71 71
 	$scheduleexist = false;
72 72
 	if ($Schedule->checkSchedule($operator) == 0) {
73
-	    $operator = $Translation->checkTranslation($ident);
74
-	    if ($Schedule->checkSchedule($operator) == 0) {
73
+		$operator = $Translation->checkTranslation($ident);
74
+		if ($Schedule->checkSchedule($operator) == 0) {
75 75
 		$schedule = $Schedule->fetchSchedule($operator);
76 76
 		if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) {
77
-		    if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
78
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
79
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
80
-		    // Should also check if route schedule = route from DB
81
-		    if ($schedule['DepartureAirportIATA'] != '') {
77
+			if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
78
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
79
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
80
+			// Should also check if route schedule = route from DB
81
+			if ($schedule['DepartureAirportIATA'] != '') {
82 82
 			if ($this->all_flights[$id]['departure_airport'] != $Spotter->getAirportIcao($schedule['DepartureAirportIATA'])) {
83
-			    $airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']);
84
-			    if (trim($airport_icao) != '') {
83
+				$airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']);
84
+				if (trim($airport_icao) != '') {
85 85
 				$this->all_flights[$id]['departure_airport'] = $airport_icao;
86 86
 				if ($globalDebug) echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n";
87
-			    }
87
+				}
88
+			}
88 89
 			}
89
-		    }
90
-		    if ($schedule['ArrivalAirportIATA'] != '') {
90
+			if ($schedule['ArrivalAirportIATA'] != '') {
91 91
 			if ($this->all_flights[$id]['arrival_airport'] != $Spotter->getAirportIcao($schedule['ArrivalAirportIATA'])) {
92
-			    $airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']);
93
-			    if (trim($airport_icao) != '') {
92
+				$airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']);
93
+				if (trim($airport_icao) != '') {
94 94
 				$this->all_flights[$id]['arrival_airport'] = $airport_icao;
95 95
 				if ($globalDebug) echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n";
96
-			    }
96
+				}
97 97
 			}
98
-		    }
99
-		    $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']);
98
+			}
99
+			$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']);
100 100
 		}
101
-	    } else $scheduleexist = true;
101
+		} else $scheduleexist = true;
102 102
 	} else $scheduleexist = true;
103 103
 	// close connection, at least one way will work ?
104
-       if ($scheduleexist) {
104
+	   if ($scheduleexist) {
105 105
 		if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n";
106
-    		$sch = $Schedule->getSchedule($operator);
106
+			$sch = $Schedule->getSchedule($operator);
107 107
 		$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']));
108
-       }
108
+	   }
109 109
 	$Spotter->db = null;
110 110
 	$Schedule->db = null;
111 111
 	$Translation->db = null;
@@ -120,96 +120,96 @@  discard block
 block discarded – undo
120 120
 	}
121 121
 	  */
122 122
 	}
123
-    }
123
+	}
124 124
 
125
-    public function checkAll() {
125
+	public function checkAll() {
126 126
 	global $globalDebug, $globalNoImport;
127 127
 	if ($globalDebug) echo "Update last seen flights data...\n";
128 128
 	if (!isset($globalNoImport) || $globalNoImport === FALSE) {
129
-	    foreach ($this->all_flights as $key => $flight) {
129
+		foreach ($this->all_flights as $key => $flight) {
130 130
 		if (isset($this->all_flights[$key]['id'])) {
131
-		    //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
132
-    		    $Spotter = new Spotter($this->db);
133
-        	    $real_arrival = $this->arrival($key);
134
-        	    if (isset($this->all_flights[$key]['altitude'])) $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']);
135
-        	}
136
-	    }
131
+			//echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
132
+				$Spotter = new Spotter($this->db);
133
+				$real_arrival = $this->arrival($key);
134
+				if (isset($this->all_flights[$key]['altitude'])) $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']);
135
+			}
136
+		}
137
+	}
137 138
 	}
138
-    }
139 139
 
140
-    public function arrival($key) {
140
+	public function arrival($key) {
141 141
 	global $globalClosestMinDist, $globalDebug;
142 142
 	if ($globalDebug) echo 'Update arrival...'."\n";
143 143
 	$Spotter = new Spotter($this->db);
144
-        $airport_icao = '';
145
-        $airport_time = '';
146
-        if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
144
+		$airport_icao = '';
145
+		$airport_time = '';
146
+		if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
147 147
 	if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
148
-	    $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
149
-    	    if (isset($closestAirports[0])) {
150
-        	if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
151
-        	    $airport_icao = $closestAirports[0]['icao'];
152
-        	    $airport_time = $this->all_flights[$key]['datetime'];
153
-        	    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
154
-        	} elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') {
155
-        	    foreach ($closestAirports as $airport) {
156
-        		if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) {
157
-        		    $airport_icao = $airport['icao'];
158
-        		    $airport_time = $this->all_flights[$key]['datetime'];
159
-        		    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
160
-        		    break;
161
-        		}
162
-        	    }
163
-        	} 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))) {
164
-        		$airport_icao = $closestAirports[0]['icao'];
165
-        		$airport_time = $this->all_flights[$key]['datetime'];
166
-        	} else {
167
-        		if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
168
-        	}
169
-    	    } else {
170
-    		    if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
171
-    	    }
172
-
173
-        } else {
174
-        	if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
175
-        }
176
-        return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
177
-    }
178
-
179
-
180
-
181
-    public function del() {
148
+		$closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
149
+			if (isset($closestAirports[0])) {
150
+			if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
151
+				$airport_icao = $closestAirports[0]['icao'];
152
+				$airport_time = $this->all_flights[$key]['datetime'];
153
+				if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
154
+			} elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') {
155
+				foreach ($closestAirports as $airport) {
156
+				if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) {
157
+					$airport_icao = $airport['icao'];
158
+					$airport_time = $this->all_flights[$key]['datetime'];
159
+					if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
160
+					break;
161
+				}
162
+				}
163
+			} 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))) {
164
+				$airport_icao = $closestAirports[0]['icao'];
165
+				$airport_time = $this->all_flights[$key]['datetime'];
166
+			} else {
167
+				if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
168
+			}
169
+			} else {
170
+				if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
171
+			}
172
+
173
+		} else {
174
+			if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
175
+		}
176
+		return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
177
+	}
178
+
179
+
180
+
181
+	public function del() {
182 182
 	global $globalDebug, $globalNoImport, $globalNoDB;
183 183
 	// Delete old infos
184 184
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
185 185
 	foreach ($this->all_flights as $key => $flight) {
186
-    	    if (isset($flight['lastupdate'])) {
187
-        	if ($flight['lastupdate'] < (time()-3000)) {
188
-            	    if (isset($this->all_flights[$key]['id'])) {
189
-            		if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n";
186
+			if (isset($flight['lastupdate'])) {
187
+			if ($flight['lastupdate'] < (time()-3000)) {
188
+					if (isset($this->all_flights[$key]['id'])) {
189
+					if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n";
190 190
 			/*
191 191
 			$SpotterLive = new SpotterLive();
192 192
             		$SpotterLive->deleteLiveSpotterDataById($this->all_flights[$key]['id']);
193 193
 			$SpotterLive->db = null;
194 194
 			*/
195 195
 			if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
196
-            		    $real_arrival = $this->arrival($key);
197
-            		    $Spotter = new Spotter($this->db);
198
-            	    	    if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
196
+						$real_arrival = $this->arrival($key);
197
+						$Spotter = new Spotter($this->db);
198
+							if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
199 199
 				$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']);
200 200
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
201
-			    }
201
+				}
202 202
 			// Put in archive
203 203
 //				$Spotter->db = null;
204 204
 			}
205
-            	    }
206
-            	    unset($this->all_flights[$key]);
207
-    	        }
208
-	    }
209
-        }
210
-    }
205
+					}
206
+					unset($this->all_flights[$key]);
207
+				}
208
+		}
209
+		}
210
+	}
211 211
 
212
-    public function add($line) {
212
+	public function add($line) {
213 213
 	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, $globalNoDB, $globalVA;
214 214
 	//if (!isset($globalDebugTimeElapsed) || $globalDebugTimeElapsed == '') $globalDebugTimeElapsed = FALSE;
215 215
 	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02';
@@ -234,18 +234,18 @@  discard block
 block discarded – undo
234 234
 	
235 235
 	// SBS format is CSV format
236 236
 	if(is_array($line) && (isset($line['hex']) || isset($line['id']))) {
237
-	    //print_r($line);
238
-  	    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)) {
237
+		//print_r($line);
238
+  		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)) {
239 239
 
240 240
 		// Increment message number
241 241
 		if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) {
242
-		    $current_date = date('Y-m-d');
243
-		    $source = $line['source_name'];
244
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
245
-		    if (!isset($this->stats[$current_date][$source]['msg'])) {
246
-		    	$this->stats[$current_date][$source]['msg']['date'] = time();
247
-		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
248
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
242
+			$current_date = date('Y-m-d');
243
+			$source = $line['source_name'];
244
+			if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
245
+			if (!isset($this->stats[$current_date][$source]['msg'])) {
246
+				$this->stats[$current_date][$source]['msg']['date'] = time();
247
+				$this->stats[$current_date][$source]['msg']['nb'] = 1;
248
+			} else $this->stats[$current_date][$source]['msg']['nb'] += 1;
249 249
 		}
250 250
 		
251 251
 		/*
@@ -261,49 +261,49 @@  discard block
 block discarded – undo
261 261
 		//$this->db = $dbc;
262 262
 
263 263
 		//$hex = trim($line['hex']);
264
-	        if (!isset($line['id'])) $id = trim($line['hex']);
265
-	        else $id = trim($line['id']);
264
+			if (!isset($line['id'])) $id = trim($line['hex']);
265
+			else $id = trim($line['id']);
266 266
 		
267 267
 		if (!isset($this->all_flights[$id])) {
268
-		    $this->all_flights[$id] = array();
269
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
270
-		    $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' => ''));
271
-		    if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
272
-		    if (!isset($line['id'])) {
268
+			$this->all_flights[$id] = array();
269
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
270
+			$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' => ''));
271
+			if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
272
+			if (!isset($line['id'])) {
273 273
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
274 274
 //			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')));
275 275
 //			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')));
276 276
 			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' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
277
-		        //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
278
-		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
279
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
277
+				//else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
278
+			 } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
279
+			if ($globalAllFlights !== FALSE) $dataFound = true;
280 280
 		}
281 281
 		if (isset($line['source_type']) && $line['source_type'] != '') {
282
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type']));
282
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type']));
283 283
 		}
284 284
 		
285 285
 		//print_r($this->all_flights);
286 286
 		if (isset($line['hex']) && !isset($this->all_flights[$id]['hex']) && ctype_xdigit($line['hex'])) {
287
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex'])));
288
-		    //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
287
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex'])));
288
+			//if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
289 289
 			//$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
290
-		    //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
291
-		    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') {
290
+			//} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
291
+			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') {
292 292
 			$timeelapsed = microtime(true);
293 293
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
294
-			    $Spotter = new Spotter($this->db);
295
-			    if (isset($this->all_flights[$id]['source_type'])) {
294
+				$Spotter = new Spotter($this->db);
295
+				if (isset($this->all_flights[$id]['source_type'])) {
296 296
 				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']),$this->all_flights[$id]['source_type']);
297
-			    } else {
297
+				} else {
298 298
 				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']));
299
-			    }
300
-			    $Spotter->db = null;
301
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
302
-			    if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
299
+				}
300
+				$Spotter->db = null;
301
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
302
+				if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
303 303
 			}
304
-		    }
305
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
306
-		    if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
304
+			}
305
+			if ($globalAllFlights !== FALSE) $dataFound = true;
306
+			if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
307 307
 		}
308 308
 		if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') {
309 309
 			$icao = $line['aircraft_icao'];
@@ -333,9 +333,9 @@  discard block
 block discarded – undo
333 333
 		}
334 334
 		//if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
335 335
 		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) {
336
-		    if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
336
+			if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
337 337
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
338
-		    } else {
338
+			} else {
339 339
 				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";
340 340
 				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";
341 341
 				/*
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
344 344
 				print_r($line);
345 345
 				*/
346 346
 				return '';
347
-		    }
347
+			}
348 348
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
349 349
 			if ($globalDebug) echo "!!! Date is too old ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!";
350 350
 			return '';
@@ -360,36 +360,36 @@  discard block
 block discarded – undo
360 360
 		}
361 361
 
362 362
 		if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG') {
363
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration']));
363
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration']));
364 364
 		}
365 365
 		if (isset($line['waypoints']) && $line['waypoints'] != '') {
366
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints']));
366
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints']));
367 367
 		}
368 368
 		if (isset($line['pilot_id']) && $line['pilot_id'] != '') {
369
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => $line['pilot_id']));
369
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => $line['pilot_id']));
370 370
 		}
371 371
 		if (isset($line['pilot_name']) && $line['pilot_name'] != '') {
372
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => $line['pilot_name']));
372
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => $line['pilot_name']));
373 373
 		}
374 374
  
375 375
 		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'])) {
376
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
377
-		    if ($this->all_flights[$id]['addedSpotter'] == 1) {
376
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
377
+			if ($this->all_flights[$id]['addedSpotter'] == 1) {
378 378
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
379
-			    $timeelapsed = microtime(true);
380
-            		    $Spotter = new Spotter($this->db);
381
-            		    $fromsource = NULL;
382
-            		    if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
383
-            		    elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
384
-			    elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao';
385
-			    elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
386
-			    elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
387
-            		    $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
388
-			    if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
389
-			    $Spotter->db = null;
390
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
391
-			}
392
-		    }
379
+				$timeelapsed = microtime(true);
380
+						$Spotter = new Spotter($this->db);
381
+						$fromsource = NULL;
382
+						if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
383
+						elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
384
+				elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao';
385
+				elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
386
+				elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
387
+						$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
388
+				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
389
+				$Spotter->db = null;
390
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
391
+			}
392
+			}
393 393
 
394 394
 /*
395 395
 		    if (!isset($line['id'])) {
@@ -399,104 +399,104 @@  discard block
 block discarded – undo
399 399
 		        else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
400 400
 		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
401 401
   */
402
-		    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']));
402
+			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']));
403 403
 
404
-		    //$putinarchive = true;
405
-		    if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
404
+			//$putinarchive = true;
405
+			if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
406 406
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time']));
407
-		    }
408
-		    if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) {
407
+			}
408
+			if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) {
409 409
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time']));
410
-		    }
411
-		    if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) {
412
-		    		$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' => ''));
413
-		    } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
410
+			}
411
+			if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) {
412
+					$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' => ''));
413
+			} elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
414 414
 			$timeelapsed = microtime(true);
415 415
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
416 416
 				$Spotter = new Spotter($this->db);
417 417
 				$line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']);
418 418
 				$line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']);
419
-		    		$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' => ''));
419
+					$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' => ''));
420 420
 				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
421
-                        }
422
-		    } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
421
+						}
422
+			} elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
423 423
 			$timeelapsed = microtime(true);
424 424
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
425
-			    $Spotter = new Spotter($this->db);
426
-			    $route = $Spotter->getRouteInfo(trim($line['ident']));
427
-			    if (!isset($route['fromairport_icao']) && !isset($route['toairport_icao'])) {
425
+				$Spotter = new Spotter($this->db);
426
+				$route = $Spotter->getRouteInfo(trim($line['ident']));
427
+				if (!isset($route['fromairport_icao']) && !isset($route['toairport_icao'])) {
428 428
 				$Translation = new Translation($this->db);
429 429
 				$ident = $Translation->checkTranslation(trim($line['ident']));
430 430
 				$route = $Spotter->getRouteInfo($ident);
431 431
 				$Translation->db = null;
432
-			    }
433
-			    $Spotter->db = null;
434
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
435
-                    	}
432
+				}
433
+				$Spotter->db = null;
434
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
435
+						}
436 436
 			if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) {
437
-			    //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
438
-			    if ($route['fromairport_icao'] != $route['toairport_icao']) {
437
+				//if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
438
+				if ($route['fromairport_icao'] != $route['toairport_icao']) {
439 439
 				//    $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']));
440
-		    		$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']));
441
-		    	    }
440
+					$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']));
441
+					}
442 442
 			}
443 443
 			if (!isset($globalFork)) $globalFork = TRUE;
444 444
 			if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) {
445 445
 				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident']));
446 446
 			}
447
-		    }
447
+			}
448 448
 		}
449 449
 
450 450
 		if (isset($line['speed']) && $line['speed'] != '') {
451 451
 		//    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12]));
452
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed'])));
453
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true));
454
-		    //$dataFound = true;
452
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed'])));
453
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true));
454
+			//$dataFound = true;
455 455
 		} 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'])) {
456
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m');
457
-		    if ($distance > 1000 && $distance < 10000) {
458
-		    // use datetime
456
+			$distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m');
457
+			if ($distance > 1000 && $distance < 10000) {
458
+			// use datetime
459 459
 			$speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']);
460 460
 			$speed = $speed*3.6;
461 461
 			if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed)));
462 462
   			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
463
-		    }
463
+			}
464 464
 		}
465 465
 
466 466
 
467 467
 
468
-	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude']) && !is_int($line['latitude']) && !is_int($line['longitude'])) {
469
-	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
470
-	    	    else unset($timediff);
471
-	    	    if ($this->tmd > 5 || (isset($globalVA) && $globalVA) || (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')))) {
468
+			if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude']) && !is_int($line['latitude']) && !is_int($line['longitude'])) {
469
+				if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
470
+				else unset($timediff);
471
+				if ($this->tmd > 5 || (isset($globalVA) && $globalVA) || (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')))) {
472 472
 			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'])) {
473
-			    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'])) {
473
+				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'])) {
474 474
 				$this->all_flights[$id]['archive_latitude'] = $line['latitude'];
475 475
 				$this->all_flights[$id]['archive_longitude'] = $line['longitude'];
476 476
 				$this->all_flights[$id]['putinarchive'] = true;
477 477
 				$this->tmd = 0;
478 478
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
479
-				    if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
480
-				    $timeelapsed = microtime(true);
481
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
479
+					if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
480
+					$timeelapsed = microtime(true);
481
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
482 482
 					$Spotter = new Spotter($this->db);
483 483
 					$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
484 484
 					if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2'];
485 485
 					$Spotter->db = null;
486 486
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
487 487
 					if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
488
-				    }
488
+					}
489
+				}
489 490
 				}
490
-			    }
491 491
 			}
492 492
 
493 493
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
494
-			    //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) {
494
+				//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) {
495 495
 				if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude'];
496 496
 				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') {
497
-				    $this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
498
-				    $dataFound = true;
499
-				    $this->all_flights[$id]['time_last_coord'] = time();
497
+					$this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
498
+					$dataFound = true;
499
+					$this->all_flights[$id]['time_last_coord'] = time();
500 500
 				}
501 501
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
502 502
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude']));
@@ -507,20 +507,20 @@  discard block
 block discarded – undo
507 507
 				    //$putinarchive = true;
508 508
 				}
509 509
 				*/
510
-			    /*
510
+				/*
511 511
 			    } elseif (isset($this->all_flights[$id]['latitude'])) {
512 512
 				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";
513 513
 			    }
514 514
 			    */
515 515
 			}
516 516
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
517
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
518
-			    //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) {
517
+				if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
518
+				//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) {
519 519
 				if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude'];
520 520
 				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') {
521
-				    $this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
522
-				    $dataFound = true;
523
-				    $this->all_flights[$id]['time_last_coord'] = time();
521
+					$this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
522
+					$dataFound = true;
523
+					$this->all_flights[$id]['time_last_coord'] = time();
524 524
 				}
525 525
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
526 526
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude']));
@@ -538,95 +538,95 @@  discard block
 block discarded – undo
538 538
 			    */
539 539
 			}
540 540
 
541
-		    } else if ($globalDebug && $timediff > 30) {
541
+			} else if ($globalDebug && $timediff > 30) {
542 542
 			$this->tmd = $this->tmd + 1;
543 543
 			echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n";
544 544
 			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -";
545 545
 			echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
546 546
 			echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n";
547
-		    }
547
+			}
548 548
 		}
549 549
 		if (isset($line['last_update']) && $line['last_update'] != '') {
550
-		    if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
551
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
550
+			if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
551
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
552 552
 		}
553 553
 		if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
554
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate']));
555
-		    //$dataFound = true;
554
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate']));
555
+			//$dataFound = true;
556 556
 		}
557 557
 		if (isset($line['format_source']) && $line['format_source'] != '') {
558
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source']));
558
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source']));
559 559
 		}
560 560
 		if (isset($line['source_name']) && $line['source_name'] != '') {
561
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name']));
561
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name']));
562 562
 		}
563 563
 		if (isset($line['emergency']) && $line['emergency'] != '') {
564
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency']));
565
-		    //$dataFound = true;
564
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency']));
565
+			//$dataFound = true;
566 566
 		}
567 567
 		if (isset($line['ground']) && $line['ground'] != '') {
568
-		    if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) {
568
+			if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) {
569 569
 			// Here we force archive of flight because after ground it's a new one (or should be)
570 570
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
571 571
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
572 572
 			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')));
573
-		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
573
+				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
574 574
 			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']));
575
-		    }
576
-		    if ($line['ground'] != 1) $line['ground'] = 0;
577
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
578
-		    //$dataFound = true;
575
+			}
576
+			if ($line['ground'] != 1) $line['ground'] = 0;
577
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
578
+			//$dataFound = true;
579 579
 		}
580 580
 		if (isset($line['squawk']) && $line['squawk'] != '') {
581
-		    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'])) {
582
-			    if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
583
-			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
584
-			    $highlight = '';
585
-			    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
586
-			    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
587
-			    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
588
-			    if ($highlight != '') {
581
+			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'])) {
582
+				if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
583
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
584
+				$highlight = '';
585
+				if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
586
+				if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
587
+				if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
588
+				if ($highlight != '') {
589 589
 				$timeelapsed = microtime(true);
590 590
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
591
-				    $Spotter = new Spotter($this->db);
592
-				    $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
593
-				    $Spotter->db = null;
594
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
591
+					$Spotter = new Spotter($this->db);
592
+					$Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
593
+					$Spotter->db = null;
594
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
595 595
 				}
596 596
 				//$putinarchive = true;
597 597
 				//$highlight = '';
598
-			    }
598
+				}
599 599
 			    
600
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
601
-		    //$dataFound = true;
600
+			} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
601
+			//$dataFound = true;
602 602
 		}
603 603
 
604 604
 		if (isset($line['altitude']) && $line['altitude'] != '') {
605
-		    //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
605
+			//if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
606 606
 			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;
607 607
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100)));
608 608
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude']));
609 609
 			//$dataFound = true;
610
-		    //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
610
+			//} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
611 611
   		}
612 612
 
613 613
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
614
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true));
614
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true));
615 615
 		}
616 616
 		
617 617
 		if (isset($line['heading']) && $line['heading'] != '') {
618
-		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
619
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
620
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
621
-		    //$dataFound = true;
618
+			if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
619
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
620
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
621
+			//$dataFound = true;
622 622
   		} 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']) {
623
-  		    $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']);
624
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
625
-		    if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
626
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
623
+  			$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']);
624
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
625
+			if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
626
+  			if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
627 627
   		} elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') {
628
-  		    // If not enough messages and ACARS set heading to 0
629
-  		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
628
+  			// If not enough messages and ACARS set heading to 0
629
+  			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
630 630
   		}
631 631
 		if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
632 632
 		elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
@@ -637,125 +637,125 @@  discard block
 block discarded – undo
637 637
 		//if ($dataFound == true && isset($this->all_flights[$id]['hex']) && $this->all_flights[$id]['ident'] != '' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
638 638
 		//if ($dataFound === true && isset($this->all_flights[$id]['hex']) && $this->all_flights[$id]['heading'] != '' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
639 639
 		if ($dataFound === true && isset($this->all_flights[$id]['hex'])) {
640
-		    $this->all_flights[$id]['lastupdate'] = time();
641
-		    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) {
642
-		        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'])) {
643
-			    //print_r($this->all_flights);
644
-			    //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n";
645
-			    //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
646
-			    if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) {
640
+			$this->all_flights[$id]['lastupdate'] = time();
641
+			if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) {
642
+				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'])) {
643
+				//print_r($this->all_flights);
644
+				//echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n";
645
+				//$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
646
+				if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) {
647 647
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
648
-				    if ($globalDebug) echo "Check if aircraft is already in DB...";
649
-				    $timeelapsed = microtime(true);
650
-				    $SpotterLive = new SpotterLive($this->db);
651
-				    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' || $line['format_source'] === 'famaprs')) {
648
+					if ($globalDebug) echo "Check if aircraft is already in DB...";
649
+					$timeelapsed = microtime(true);
650
+					$SpotterLive = new SpotterLive($this->db);
651
+					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' || $line['format_source'] === 'famaprs')) {
652 652
 					$recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']);
653 653
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
654
-				    } elseif (isset($line['id'])) {
654
+					} elseif (isset($line['id'])) {
655 655
 					$recent_ident = $SpotterLive->checkIdRecent($line['id']);
656 656
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
657
-				    } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
657
+					} elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
658 658
 					$recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']);
659 659
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
660
-				    } else $recent_ident = '';
661
-				    $SpotterLive->db=null;
662
-				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
663
-				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
660
+					} else $recent_ident = '';
661
+					$SpotterLive->db=null;
662
+					if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
663
+					elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
664 664
 				} else $recent_ident = '';
665
-			    } else {
665
+				} else {
666 666
 				$recent_ident = '';
667 667
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0));
668
-			    }
669
-			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
670
-			    if($recent_ident == "")
671
-			    {
668
+				}
669
+				//if there was no aircraft with the same callsign within the last hour and go post it into the archive
670
+				if($recent_ident == "")
671
+				{
672 672
 				if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : ";
673 673
 				if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
674 674
 				if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
675 675
 				//adds the spotter data for the archive
676 676
 				$ignoreImport = false;
677 677
 				foreach($globalAirportIgnore as $airportIgnore) {
678
-				    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
678
+					if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
679 679
 					$ignoreImport = true;
680
-				    }
680
+					}
681 681
 				}
682 682
 				if (count($globalAirportAccept) > 0) {
683
-				    $ignoreImport = true;
684
-				    foreach($globalAirportIgnore as $airportIgnore) {
683
+					$ignoreImport = true;
684
+					foreach($globalAirportIgnore as $airportIgnore) {
685 685
 					if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
686
-					    $ignoreImport = false;
686
+						$ignoreImport = false;
687
+					}
687 688
 					}
688
-				    }
689 689
 				}
690 690
 				if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
691
-				    foreach($globalAirlineIgnore as $airlineIgnore) {
691
+					foreach($globalAirlineIgnore as $airlineIgnore) {
692 692
 					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)) {
693
-					    $ignoreImport = true;
693
+						$ignoreImport = true;
694
+					}
694 695
 					}
695
-				    }
696 696
 				}
697 697
 				if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
698
-				    $ignoreImport = true;
699
-				    foreach($globalAirlineAccept as $airlineAccept) {
698
+					$ignoreImport = true;
699
+					foreach($globalAirlineAccept as $airlineAccept) {
700 700
 					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)) {
701
-					    $ignoreImport = false;
701
+						$ignoreImport = false;
702
+					}
702 703
 					}
703
-				    }
704 704
 				}
705 705
 				if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
706
-				    $ignoreImport = true;
707
-				    foreach($globalPilotIdAccept as $pilotIdAccept) {
706
+					$ignoreImport = true;
707
+					foreach($globalPilotIdAccept as $pilotIdAccept) {
708 708
 					if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
709
-					    $ignoreImport = false;
709
+						$ignoreImport = false;
710
+					}
710 711
 					}
711
-				    }
712 712
 				}
713 713
 				
714 714
 				if (!$ignoreImport) {
715
-				    $highlight = '';
716
-				    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
717
-				    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
718
-				    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
719
-				    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')));
720
-				    $timeelapsed = microtime(true);
721
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
715
+					$highlight = '';
716
+					if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
717
+					if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
718
+					if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
719
+					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')));
720
+					$timeelapsed = microtime(true);
721
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
722 722
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
723
-					    $Spotter = new Spotter($this->db);
724
-					    $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']);
725
-					    $Spotter->db = null;
726
-					    if ($globalDebug && isset($result)) echo $result."\n";
723
+						$Spotter = new Spotter($this->db);
724
+						$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']);
725
+						$Spotter->db = null;
726
+						if ($globalDebug && isset($result)) echo $result."\n";
727
+					}
727 728
 					}
728
-				    }
729
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
730
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
729
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
730
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
731 731
 
732
-				    // Add source stat in DB
733
-				    $Stats = new Stats($this->db);
734
-				    if (!empty($this->stats)) {
732
+					// Add source stat in DB
733
+					$Stats = new Stats($this->db);
734
+					if (!empty($this->stats)) {
735 735
 					if ($globalDebug) echo 'Add source stats : ';
736
-				        foreach($this->stats as $date => $data) {
737
-					    foreach($data as $source => $sourced) {
738
-					        //print_r($sourced);
739
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
740
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
741
-				    		if (isset($sourced['msg'])) {
742
-				    		    if (time() - $sourced['msg']['date'] > 10) {
743
-				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
744
-				    		        echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
745
-			    			        unset($this->stats[$date][$source]['msg']);
746
-			    			    }
747
-			    			}
748
-			    		    }
749
-			    		    if ($date != date('Y-m-d')) {
750
-			    			unset($this->stats[$date]);
751
-			    		    }
752
-				    	}
753
-				    	if ($globalDebug) echo 'Done'."\n";
754
-
755
-				    }
756
-				    $Stats->db = null;
757
-				    }
758
-				    $this->del();
736
+						foreach($this->stats as $date => $data) {
737
+						foreach($data as $source => $sourced) {
738
+							//print_r($sourced);
739
+								if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
740
+								if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
741
+							if (isset($sourced['msg'])) {
742
+								if (time() - $sourced['msg']['date'] > 10) {
743
+									$nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
744
+									echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
745
+									unset($this->stats[$date][$source]['msg']);
746
+								}
747
+							}
748
+							}
749
+							if ($date != date('Y-m-d')) {
750
+							unset($this->stats[$date]);
751
+							}
752
+						}
753
+						if ($globalDebug) echo 'Done'."\n";
754
+
755
+					}
756
+					$Stats->db = null;
757
+					}
758
+					$this->del();
759 759
 				} elseif ($globalDebug) echo 'Ignore data'."\n";
760 760
 				//$ignoreImport = false;
761 761
 				$this->all_flights[$id]['addedSpotter'] = 1;
@@ -773,41 +773,41 @@  discard block
 block discarded – undo
773 773
 			*/
774 774
 			//SpotterLive->deleteLiveSpotterDataByIdent($this->all_flights[$id]['ident']);
775 775
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
776
-				    if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours...";
777
-				    //SpotterLive->deleteLiveSpotterDataNotUpdated();
778
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
776
+					if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours...";
777
+					//SpotterLive->deleteLiveSpotterDataNotUpdated();
778
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
779 779
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
780
-					    $SpotterLive = new SpotterLive($this->db);
781
-					    $SpotterLive->deleteLiveSpotterData();
782
-					    $SpotterLive->db=null;
780
+						$SpotterLive = new SpotterLive($this->db);
781
+						$SpotterLive->deleteLiveSpotterData();
782
+						$SpotterLive->db=null;
783
+					}
783 784
 					}
784
-				    }
785
-				    if ($globalDebug) echo " Done\n";
786
-				    $this->last_delete = time();
785
+					if ($globalDebug) echo " Done\n";
786
+					$this->last_delete = time();
787 787
 				}
788
-			    } else {
788
+				} else {
789 789
 				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'] === 'famaprs')) {
790
-				    $this->all_flights[$id]['id'] = $recent_ident;
791
-				    $this->all_flights[$id]['addedSpotter'] = 1;
790
+					$this->all_flights[$id]['id'] = $recent_ident;
791
+					$this->all_flights[$id]['addedSpotter'] = 1;
792 792
 				}
793 793
 				if (isset($globalDaemon) && !$globalDaemon) {
794
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
794
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
795 795
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
796
-					    $Spotter = new Spotter($this->db);
797
-					    $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']);
798
-					    $Spotter->db = null;
796
+						$Spotter = new Spotter($this->db);
797
+						$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']);
798
+						$Spotter->db = null;
799
+					}
799 800
 					}
800
-				    }
801 801
 				}
802 802
 				
803
-			    }
803
+				}
804
+			}
804 805
 			}
805
-		    }
806
-		    //adds the spotter LIVE data
807
-		    //SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed);
808
-		    //echo "\nAdd in Live !! \n";
809
-		    //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";
810
-		    if ($globalDebug) {
806
+			//adds the spotter LIVE data
807
+			//SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed);
808
+			//echo "\nAdd in Live !! \n";
809
+			//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";
810
+			if ($globalDebug) {
811 811
 			if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM)) {
812 812
 				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";
813 813
 				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";
@@ -815,60 +815,60 @@  discard block
 block discarded – undo
815 815
 				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";
816 816
 				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";
817 817
 			}
818
-		    }
819
-		    $ignoreImport = false;
820
-		    if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
821
-		    if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
818
+			}
819
+			$ignoreImport = false;
820
+			if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
821
+			if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
822 822
 
823
-		    foreach($globalAirportIgnore as $airportIgnore) {
824
-		        if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
825
-			    $ignoreImport = true;
823
+			foreach($globalAirportIgnore as $airportIgnore) {
824
+				if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
825
+				$ignoreImport = true;
826 826
 			}
827
-		    }
828
-		    if (count($globalAirportAccept) > 0) {
829
-		        $ignoreImport = true;
830
-		        foreach($globalAirportIgnore as $airportIgnore) {
831
-			    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
827
+			}
828
+			if (count($globalAirportAccept) > 0) {
829
+				$ignoreImport = true;
830
+				foreach($globalAirportIgnore as $airportIgnore) {
831
+				if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
832 832
 				$ignoreImport = false;
833
-			    }
833
+				}
834
+			}
834 835
 			}
835
-		    }
836
-		    if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
836
+			if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
837 837
 			foreach($globalAirlineIgnore as $airlineIgnore) {
838
-			    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)) {
838
+				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)) {
839 839
 				$ignoreImport = true;
840
-			    }
840
+				}
841 841
 			}
842
-		    }
843
-		    if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
842
+			}
843
+			if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
844 844
 			$ignoreImport = true;
845 845
 			foreach($globalAirlineAccept as $airlineAccept) {
846
-			    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)) {
846
+				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)) {
847 847
 				$ignoreImport = false;
848
-			    }
848
+				}
849
+			}
849 850
 			}
850
-		    }
851
-		    if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
851
+			if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
852 852
 			$ignoreImport = true;
853 853
 			foreach($globalPilotIdAccept as $pilotIdAccept) {
854
-			    if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
855
-			        $ignoreImport = false;
856
-			    }
854
+				if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
855
+					$ignoreImport = false;
856
+				}
857
+			}
857 858
 			}
858
-		    }
859 859
 
860
-		    if (!$ignoreImport) {
860
+			if (!$ignoreImport) {
861 861
 			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'])) {
862 862
 				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')));
863 863
 				$timeelapsed = microtime(true);
864 864
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
865
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
865
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
866 866
 					if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : ";
867 867
 					$SpotterLive = new SpotterLive($this->db);
868 868
 					$result = $SpotterLive->addLiveSpotterData($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'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$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]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']);
869 869
 					$SpotterLive->db = null;
870 870
 					if ($globalDebug) echo $result."\n";
871
-				    }
871
+					}
872 872
 				}
873 873
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) {
874 874
 					$APRSSpotter->addLiveSpotterData($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'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$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]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']);
@@ -880,7 +880,7 @@  discard block
 block discarded – undo
880 880
 				//if ($line['format_source'] != 'aprs') {
881 881
 				//if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt')) {
882 882
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
883
-				    if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $line['format_source'] != 'aprs' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
883
+					if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $line['format_source'] != 'aprs' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
884 884
 					$source = $this->all_flights[$id]['source_name'];
885 885
 					if ($source == '') $source = $this->all_flights[$id]['format_source'];
886 886
 					if (!isset($this->source_location[$source])) {
@@ -906,7 +906,7 @@  discard block
 block discarded – undo
906 906
 					if ($stats_heading == 16) $stats_heading = 0;
907 907
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
908 908
 						for ($i=0;$i<=15;$i++) {
909
-						    $this->stats[$current_date][$source]['polar'][$i] = 0;
909
+							$this->stats[$current_date][$source]['polar'][$i] = 0;
910 910
 						}
911 911
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
912 912
 					} else {
@@ -919,17 +919,17 @@  discard block
 block discarded – undo
919 919
 					//var_dump($this->stats);
920 920
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
921 921
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
922
-						    end($this->stats[$current_date][$source]['hist']);
923
-						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
922
+							end($this->stats[$current_date][$source]['hist']);
923
+							$mini = key($this->stats[$current_date][$source]['hist'])+10;
924 924
 						} else $mini = 0;
925 925
 						for ($i=$mini;$i<=$distance;$i+=10) {
926
-						    $this->stats[$current_date][$source]['hist'][$i] = 0;
926
+							$this->stats[$current_date][$source]['hist'][$i] = 0;
927 927
 						}
928 928
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
929 929
 					} else {
930 930
 						$this->stats[$current_date][$source]['hist'][$distance] += 1;
931 931
 					}
932
-				    }
932
+					}
933 933
 				}
934 934
 
935 935
 				$this->all_flights[$id]['lastupdate'] = time();
@@ -939,7 +939,7 @@  discard block
 block discarded – undo
939 939
 			//$this->del();
940 940
 			
941 941
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
942
-			    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
942
+				if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
943 943
 				if ($globalDebug) echo "---- Deleting Live Spotter data Not updated since 2 hour...";
944 944
 				$SpotterLive = new SpotterLive($this->db);
945 945
 				$SpotterLive->deleteLiveSpotterDataNotUpdated();
@@ -947,19 +947,19 @@  discard block
 block discarded – undo
947 947
 				//SpotterLive->deleteLiveSpotterData();
948 948
 				if ($globalDebug) echo " Done\n";
949 949
 				$this->last_delete_hourly = time();
950
-			    } else {
950
+				} else {
951 951
 				$this->del();
952 952
 				$this->last_delete_hourly = time();
953
-			    }
953
+				}
954 954
 			}
955 955
 			
956
-		    }
957
-		    //$ignoreImport = false;
956
+			}
957
+			//$ignoreImport = false;
958 958
 		}
959 959
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
960 960
 		if ($send) return $this->all_flights[$id];
961
-	    }
961
+		}
962
+	}
962 963
 	}
963
-    }
964 964
 }
965 965
 ?>
Please login to merge, or discard this patch.
Spacing   +136 added lines, -136 removed lines patch added patch discarded remove patch
@@ -33,12 +33,12 @@  discard block
 block discarded – undo
33 33
 		$currentdate = date('Y-m-d');
34 34
 		$sourcestat = $Stats->getStatsSource($currentdate);
35 35
 		if (!empty($sourcestat)) {
36
-		    foreach($sourcestat as $srcst) {
36
+		    foreach ($sourcestat as $srcst) {
37 37
 		    	$type = $srcst['stats_type'];
38 38
 			if ($type == 'polar' || $type == 'hist') {
39 39
 			    $source = $srcst['source_name'];
40 40
 			    $data = $srcst['source_data'];
41
-			    $this->stats[$currentdate][$source][$type] = json_decode($data,true);
41
+			    $this->stats[$currentdate][$source][$type] = json_decode($data, true);
42 42
 	    		}
43 43
 		    }
44 44
 		}
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 
51 51
     }
52 52
 
53
-    public function get_Schedule($id,$ident) {
53
+    public function get_Schedule($id, $ident) {
54 54
 	global $globalDebug, $globalFork, $globalSchedulesFetch;
55 55
 	// Get schedule here, so it's done only one time
56 56
 	
@@ -75,8 +75,8 @@  discard block
 block discarded – undo
75 75
 		$schedule = $Schedule->fetchSchedule($operator);
76 76
 		if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) {
77 77
 		    if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
78
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
79
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
78
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $schedule['DepartureTime']));
79
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $schedule['ArrivalTime']));
80 80
 		    // Should also check if route schedule = route from DB
81 81
 		    if ($schedule['DepartureAirportIATA'] != '') {
82 82
 			if ($this->all_flights[$id]['departure_airport'] != $Spotter->getAirportIcao($schedule['DepartureAirportIATA'])) {
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 			    }
97 97
 			}
98 98
 		    }
99
-		    $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']);
99
+		    $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']);
100 100
 		}
101 101
 	    } else $scheduleexist = true;
102 102
 	} else $scheduleexist = true;
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
        if ($scheduleexist) {
105 105
 		if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n";
106 106
     		$sch = $Schedule->getSchedule($operator);
107
-		$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']));
107
+		$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']));
108 108
        }
109 109
 	$Spotter->db = null;
110 110
 	$Schedule->db = null;
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 		    //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
132 132
     		    $Spotter = new Spotter($this->db);
133 133
         	    $real_arrival = $this->arrival($key);
134
-        	    if (isset($this->all_flights[$key]['altitude'])) $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']);
134
+        	    if (isset($this->all_flights[$key]['altitude'])) $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']);
135 135
         	}
136 136
 	    }
137 137
 	}
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
         $airport_time = '';
146 146
         if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
147 147
 	if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
148
-	    $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
148
+	    $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $globalClosestMinDist);
149 149
     	    if (isset($closestAirports[0])) {
150 150
         	if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
151 151
         	    $airport_icao = $closestAirports[0]['icao'];
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
         		    break;
161 161
         		}
162 162
         	    }
163
-        	} 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))) {
163
+        	} 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))) {
164 164
         		$airport_icao = $closestAirports[0]['icao'];
165 165
         		$airport_time = $this->all_flights[$key]['datetime'];
166 166
         	} else {
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
         } else {
174 174
         	if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
175 175
         }
176
-        return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
176
+        return array('airport_icao' => $airport_icao, 'airport_time' => $airport_time);
177 177
     }
178 178
 
179 179
 
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
185 185
 	foreach ($this->all_flights as $key => $flight) {
186 186
     	    if (isset($flight['lastupdate'])) {
187
-        	if ($flight['lastupdate'] < (time()-3000)) {
187
+        	if ($flight['lastupdate'] < (time() - 3000)) {
188 188
             	    if (isset($this->all_flights[$key]['id'])) {
189 189
             		if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n";
190 190
 			/*
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
             		    $real_arrival = $this->arrival($key);
197 197
             		    $Spotter = new Spotter($this->db);
198 198
             	    	    if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
199
-				$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']);
199
+				$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']);
200 200
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
201 201
 			    }
202 202
 			// Put in archive
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
 	$send = false;
234 234
 	
235 235
 	// SBS format is CSV format
236
-	if(is_array($line) && (isset($line['hex']) || isset($line['id']))) {
236
+	if (is_array($line) && (isset($line['hex']) || isset($line['id']))) {
237 237
 	    //print_r($line);
238 238
   	    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)) {
239 239
 
@@ -266,25 +266,25 @@  discard block
 block discarded – undo
266 266
 		
267 267
 		if (!isset($this->all_flights[$id])) {
268 268
 		    $this->all_flights[$id] = array();
269
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
270
-		    $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' => ''));
271
-		    if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
269
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0));
270
+		    $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' => ''));
271
+		    if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('lastupdate' => time()));
272 272
 		    if (!isset($line['id'])) {
273 273
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
274 274
 //			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')));
275 275
 //			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')));
276
-			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' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
276
+			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' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $id.'-'.date('YmdHi')));
277 277
 		        //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
278
-		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
278
+		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id']));
279 279
 		    if ($globalAllFlights !== FALSE) $dataFound = true;
280 280
 		}
281 281
 		if (isset($line['source_type']) && $line['source_type'] != '') {
282
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type']));
282
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_type' => $line['source_type']));
283 283
 		}
284 284
 		
285 285
 		//print_r($this->all_flights);
286 286
 		if (isset($line['hex']) && !isset($this->all_flights[$id]['hex']) && ctype_xdigit($line['hex'])) {
287
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex'])));
287
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('hex' => trim($line['hex'])));
288 288
 		    //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
289 289
 			//$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
290 290
 		    //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
@@ -293,13 +293,13 @@  discard block
 block discarded – undo
293 293
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
294 294
 			    $Spotter = new Spotter($this->db);
295 295
 			    if (isset($this->all_flights[$id]['source_type'])) {
296
-				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']),$this->all_flights[$id]['source_type']);
296
+				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']), $this->all_flights[$id]['source_type']);
297 297
 			    } else {
298 298
 				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']));
299 299
 			    }
300 300
 			    $Spotter->db = null;
301
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
302
-			    if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
301
+			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
302
+			    if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao));
303 303
 			}
304 304
 		    }
305 305
 		    if ($globalAllFlights !== FALSE) $dataFound = true;
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
 			$Spotter = new Spotter($this->db);
311 311
 			if (isset($Spotter->aircraft_correct_icaotype[$icao])) $icao = $Spotter->aircraft_correct_icaotype[$icao];
312 312
 			$Spotter->db = null;
313
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $icao));
313
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $icao));
314 314
 		}
315 315
 		if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_name'])) {
316 316
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
 				$Spotter = new Spotter($this->db);
319 319
 				$aircraft_icao = $Spotter->getAircraftIcao($line['aircraft_name']);
320 320
 				$Spotter->db = null;
321
-				if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
321
+				if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao));
322 322
 			}
323 323
 		}
324 324
 		if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_type'])) {
@@ -326,15 +326,15 @@  discard block
 block discarded – undo
326 326
 			elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL';
327 327
 			elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE';
328 328
 			elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC';
329
-			if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
329
+			if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao));
330 330
 		}
331 331
 		if (!isset($this->all_flights[$id]['aircraft_icao'])) {
332
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => 'NA'));
332
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => 'NA'));
333 333
 		}
334 334
 		//if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
335
-		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) {
335
+		if (isset($line['datetime']) && strtotime($line['datetime']) > time() - 20*60 && strtotime($line['datetime']) < time() + 20*60) {
336 336
 		    if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
337
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
337
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => $line['datetime']));
338 338
 		    } else {
339 339
 				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";
340 340
 				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";
@@ -345,35 +345,35 @@  discard block
 block discarded – undo
345 345
 				*/
346 346
 				return '';
347 347
 		    }
348
-		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
348
+		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time() - 20*60) {
349 349
 			if ($globalDebug) echo "!!! Date is too old ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!";
350 350
 			return '';
351
-		} elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) {
351
+		} elseif (isset($line['datetime']) && strtotime($line['datetime']) > time() + 20*60) {
352 352
 			if ($globalDebug) echo "!!! Date is in the future ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!";
353 353
 			return '';
354 354
 		} elseif (!isset($line['datetime'])) {
355 355
 			date_default_timezone_set('UTC');
356
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
356
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => date('Y-m-d H:i:s')));
357 357
 		} else {
358 358
 			if ($globalDebug) echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!";
359 359
 			return '';
360 360
 		}
361 361
 
362 362
 		if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG') {
363
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration']));
363
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('registration' => $line['registration']));
364 364
 		}
365 365
 		if (isset($line['waypoints']) && $line['waypoints'] != '') {
366
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints']));
366
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('waypoints' => $line['waypoints']));
367 367
 		}
368 368
 		if (isset($line['pilot_id']) && $line['pilot_id'] != '') {
369
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => $line['pilot_id']));
369
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_id' => $line['pilot_id']));
370 370
 		}
371 371
 		if (isset($line['pilot_name']) && $line['pilot_name'] != '') {
372
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => $line['pilot_name']));
372
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_name' => $line['pilot_name']));
373 373
 		}
374 374
  
375 375
 		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'])) {
376
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
376
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => trim($line['ident'])));
377 377
 		    if ($this->all_flights[$id]['addedSpotter'] == 1) {
378 378
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
379 379
 			    $timeelapsed = microtime(true);
@@ -384,10 +384,10 @@  discard block
 block discarded – undo
384 384
 			    elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao';
385 385
 			    elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
386 386
 			    elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
387
-            		    $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
387
+            		    $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $fromsource);
388 388
 			    if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
389 389
 			    $Spotter->db = null;
390
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
390
+			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
391 391
 			}
392 392
 		    }
393 393
 
@@ -399,25 +399,25 @@  discard block
 block discarded – undo
399 399
 		        else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
400 400
 		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
401 401
   */
402
-		    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']));
402
+		    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']));
403 403
 
404 404
 		    //$putinarchive = true;
405 405
 		    if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
406
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time']));
406
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $line['departure_airport_time']));
407 407
 		    }
408 408
 		    if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) {
409
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time']));
409
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $line['arrival_airport_time']));
410 410
 		    }
411 411
 		    if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) {
412
-		    		$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' => ''));
412
+		    		$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' => ''));
413 413
 		    } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
414 414
 			$timeelapsed = microtime(true);
415 415
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
416 416
 				$Spotter = new Spotter($this->db);
417 417
 				$line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']);
418 418
 				$line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']);
419
-		    		$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' => ''));
420
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
419
+		    		$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' => ''));
420
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
421 421
                         }
422 422
 		    } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
423 423
 			$timeelapsed = microtime(true);
@@ -431,34 +431,34 @@  discard block
 block discarded – undo
431 431
 				$Translation->db = null;
432 432
 			    }
433 433
 			    $Spotter->db = null;
434
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
434
+			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
435 435
                     	}
436 436
 			if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) {
437 437
 			    //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
438 438
 			    if ($route['fromairport_icao'] != $route['toairport_icao']) {
439 439
 				//    $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']));
440
-		    		$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']));
440
+		    		$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']));
441 441
 		    	    }
442 442
 			}
443 443
 			if (!isset($globalFork)) $globalFork = TRUE;
444 444
 			if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) {
445
-				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident']));
445
+				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id, trim($line['ident']));
446 446
 			}
447 447
 		    }
448 448
 		}
449 449
 
450 450
 		if (isset($line['speed']) && $line['speed'] != '') {
451 451
 		//    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12]));
452
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed'])));
453
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true));
452
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($line['speed'])));
453
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed_fromsrc' => true));
454 454
 		    //$dataFound = true;
455 455
 		} 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'])) {
456
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m');
456
+		    $distance = $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm');
457 457
 		    if ($distance > 1000 && $distance < 10000) {
458 458
 		    // use datetime
459 459
 			$speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']);
460 460
 			$speed = $speed*3.6;
461
-			if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed)));
461
+			if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($speed)));
462 462
   			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
463 463
 		    }
464 464
 		}
@@ -466,11 +466,11 @@  discard block
 block discarded – undo
466 466
 
467 467
 
468 468
 	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude']) && !is_int($line['latitude']) && !is_int($line['longitude'])) {
469
-	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
469
+	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time() - $this->all_flights[$id]['time_last_coord']);
470 470
 	    	    else unset($timediff);
471
-	    	    if ($this->tmd > 5 || (isset($globalVA) && $globalVA) || (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')))) {
471
+	    	    if ($this->tmd > 5 || (isset($globalVA) && $globalVA) || (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')))) {
472 472
 			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'])) {
473
-			    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'])) {
473
+			    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'])) {
474 474
 				$this->all_flights[$id]['archive_latitude'] = $line['latitude'];
475 475
 				$this->all_flights[$id]['archive_longitude'] = $line['longitude'];
476 476
 				$this->all_flights[$id]['putinarchive'] = true;
@@ -480,10 +480,10 @@  discard block
 block discarded – undo
480 480
 				    $timeelapsed = microtime(true);
481 481
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
482 482
 					$Spotter = new Spotter($this->db);
483
-					$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
483
+					$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'], $line['longitude']);
484 484
 					if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2'];
485 485
 					$Spotter->db = null;
486
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
486
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
487 487
 					if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
488 488
 				    }
489 489
 				}
@@ -493,13 +493,13 @@  discard block
 block discarded – undo
493 493
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
494 494
 			    //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) {
495 495
 				if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude'];
496
-				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') {
496
+				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') {
497 497
 				    $this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
498 498
 				    $dataFound = true;
499 499
 				    $this->all_flights[$id]['time_last_coord'] = time();
500 500
 				}
501 501
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
502
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude']));
502
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('latitude' => $line['latitude']));
503 503
 				/*
504 504
 				if (abs($this->all_flights[$id]['archive_latitude']-$this->all_flights[$id]['latitude']) > 0.3) {
505 505
 				    $this->all_flights[$id]['archive_latitude'] = $line['latitude'];
@@ -517,13 +517,13 @@  discard block
 block discarded – undo
517 517
 			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
518 518
 			    //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) {
519 519
 				if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude'];
520
-				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') {
520
+				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') {
521 521
 				    $this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
522 522
 				    $dataFound = true;
523 523
 				    $this->all_flights[$id]['time_last_coord'] = time();
524 524
 				}
525 525
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
526
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude']));
526
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('longitude' => $line['longitude']));
527 527
 				/*
528 528
 				if (abs($this->all_flights[$id]['archive_longitude']-$this->all_flights[$id]['longitude']) > 0.3) {
529 529
 				    $this->all_flights[$id]['archive_longitude'] = $line['longitude'];
@@ -541,46 +541,46 @@  discard block
 block discarded – undo
541 541
 		    } else if ($globalDebug && $timediff > 30) {
542 542
 			$this->tmd = $this->tmd + 1;
543 543
 			echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n";
544
-			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -";
545
-			echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
544
+			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')."m -";
545
+			echo 'Speed : '.(($Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')/$timediff)*3.6)." km/h - ";
546 546
 			echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n";
547 547
 		    }
548 548
 		}
549 549
 		if (isset($line['last_update']) && $line['last_update'] != '') {
550 550
 		    if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
551
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
551
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('last_update' => $line['last_update']));
552 552
 		}
553 553
 		if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
554
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate']));
554
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('verticalrate' => $line['verticalrate']));
555 555
 		    //$dataFound = true;
556 556
 		}
557 557
 		if (isset($line['format_source']) && $line['format_source'] != '') {
558
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source']));
558
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('format_source' => $line['format_source']));
559 559
 		}
560 560
 		if (isset($line['source_name']) && $line['source_name'] != '') {
561
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name']));
561
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_name' => $line['source_name']));
562 562
 		}
563 563
 		if (isset($line['emergency']) && $line['emergency'] != '') {
564
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency']));
564
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('emergency' => $line['emergency']));
565 565
 		    //$dataFound = true;
566 566
 		}
567 567
 		if (isset($line['ground']) && $line['ground'] != '') {
568 568
 		    if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) {
569 569
 			// Here we force archive of flight because after ground it's a new one (or should be)
570
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
571
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
572
-			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')));
573
-		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
574
-			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']));
570
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0));
571
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1));
572
+			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')));
573
+		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id']));
574
+			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']));
575 575
 		    }
576 576
 		    if ($line['ground'] != 1) $line['ground'] = 0;
577
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
577
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ground' => $line['ground']));
578 578
 		    //$dataFound = true;
579 579
 		}
580 580
 		if (isset($line['squawk']) && $line['squawk'] != '') {
581 581
 		    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'])) {
582 582
 			    if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
583
-			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
583
+			    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk']));
584 584
 			    $highlight = '';
585 585
 			    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
586 586
 			    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
@@ -589,47 +589,47 @@  discard block
 block discarded – undo
589 589
 				$timeelapsed = microtime(true);
590 590
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
591 591
 				    $Spotter = new Spotter($this->db);
592
-				    $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
592
+				    $Spotter->setHighlightFlight($this->all_flights[$id]['id'], $highlight);
593 593
 				    $Spotter->db = null;
594
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
594
+				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
595 595
 				}
596 596
 				//$putinarchive = true;
597 597
 				//$highlight = '';
598 598
 			    }
599 599
 			    
600
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
600
+		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk']));
601 601
 		    //$dataFound = true;
602 602
 		}
603 603
 
604 604
 		if (isset($line['altitude']) && $line['altitude'] != '') {
605 605
 		    //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
606
-			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;
607
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100)));
608
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude']));
606
+			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;
607
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude' => round($line['altitude']/100)));
608
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude_real' => $line['altitude']));
609 609
 			//$dataFound = true;
610 610
 		    //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
611 611
   		}
612 612
 
613 613
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
614
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true));
614
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('noarchive' => true));
615 615
 		}
616 616
 		
617 617
 		if (isset($line['heading']) && $line['heading'] != '') {
618
-		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
619
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
620
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
618
+		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading'] - round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
619
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($line['heading'])));
620
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading_fromsrc' => true));
621 621
 		    //$dataFound = true;
622 622
   		} 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']) {
623
-  		    $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']);
624
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
625
-		    if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
623
+  		    $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']);
624
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($heading)));
625
+		    if (abs($this->all_flights[$id]['heading'] - round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
626 626
   		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
627 627
   		} elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') {
628 628
   		    // If not enough messages and ACARS set heading to 0
629
-  		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
629
+  		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => 0));
630 630
   		}
631
-		if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
632
-		elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
631
+		if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
632
+		elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
633 633
 
634 634
 //		print_r($this->all_flights[$id]);
635 635
 		//gets the callsign from the last hour
@@ -639,7 +639,7 @@  discard block
 block discarded – undo
639 639
 		if ($dataFound === true && isset($this->all_flights[$id]['hex'])) {
640 640
 		    $this->all_flights[$id]['lastupdate'] = time();
641 641
 		    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) {
642
-		        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'])) {
642
+		        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'])) {
643 643
 			    //print_r($this->all_flights);
644 644
 			    //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n";
645 645
 			    //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
@@ -650,61 +650,61 @@  discard block
 block discarded – undo
650 650
 				    $SpotterLive = new SpotterLive($this->db);
651 651
 				    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' || $line['format_source'] === 'famaprs')) {
652 652
 					$recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']);
653
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
653
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
654 654
 				    } elseif (isset($line['id'])) {
655 655
 					$recent_ident = $SpotterLive->checkIdRecent($line['id']);
656
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
656
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
657 657
 				    } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
658 658
 					$recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']);
659
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
659
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
660 660
 				    } else $recent_ident = '';
661
-				    $SpotterLive->db=null;
661
+				    $SpotterLive->db = null;
662 662
 				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
663 663
 				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
664 664
 				} else $recent_ident = '';
665 665
 			    } else {
666 666
 				$recent_ident = '';
667
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0));
667
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 0));
668 668
 			    }
669 669
 			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
670
-			    if($recent_ident == "")
670
+			    if ($recent_ident == "")
671 671
 			    {
672 672
 				if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : ";
673 673
 				if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
674 674
 				if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
675 675
 				//adds the spotter data for the archive
676 676
 				$ignoreImport = false;
677
-				foreach($globalAirportIgnore as $airportIgnore) {
677
+				foreach ($globalAirportIgnore as $airportIgnore) {
678 678
 				    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
679 679
 					$ignoreImport = true;
680 680
 				    }
681 681
 				}
682 682
 				if (count($globalAirportAccept) > 0) {
683 683
 				    $ignoreImport = true;
684
-				    foreach($globalAirportIgnore as $airportIgnore) {
684
+				    foreach ($globalAirportIgnore as $airportIgnore) {
685 685
 					if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
686 686
 					    $ignoreImport = false;
687 687
 					}
688 688
 				    }
689 689
 				}
690 690
 				if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
691
-				    foreach($globalAirlineIgnore as $airlineIgnore) {
692
-					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)) {
691
+				    foreach ($globalAirlineIgnore as $airlineIgnore) {
692
+					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)) {
693 693
 					    $ignoreImport = true;
694 694
 					}
695 695
 				    }
696 696
 				}
697 697
 				if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
698 698
 				    $ignoreImport = true;
699
-				    foreach($globalAirlineAccept as $airlineAccept) {
700
-					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)) {
699
+				    foreach ($globalAirlineAccept as $airlineAccept) {
700
+					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)) {
701 701
 					    $ignoreImport = false;
702 702
 					}
703 703
 				    }
704 704
 				}
705 705
 				if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
706 706
 				    $ignoreImport = true;
707
-				    foreach($globalPilotIdAccept as $pilotIdAccept) {
707
+				    foreach ($globalPilotIdAccept as $pilotIdAccept) {
708 708
 					if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
709 709
 					    $ignoreImport = false;
710 710
 					}
@@ -716,32 +716,32 @@  discard block
 block discarded – undo
716 716
 				    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
717 717
 				    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
718 718
 				    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
719
-				    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')));
719
+				    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')));
720 720
 				    $timeelapsed = microtime(true);
721 721
 				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
722 722
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
723 723
 					    $Spotter = new Spotter($this->db);
724
-					    $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']);
724
+					    $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']);
725 725
 					    $Spotter->db = null;
726 726
 					    if ($globalDebug && isset($result)) echo $result."\n";
727 727
 					}
728 728
 				    }
729
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
729
+				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
730 730
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
731 731
 
732 732
 				    // Add source stat in DB
733 733
 				    $Stats = new Stats($this->db);
734 734
 				    if (!empty($this->stats)) {
735 735
 					if ($globalDebug) echo 'Add source stats : ';
736
-				        foreach($this->stats as $date => $data) {
737
-					    foreach($data as $source => $sourced) {
736
+				        foreach ($this->stats as $date => $data) {
737
+					    foreach ($data as $source => $sourced) {
738 738
 					        //print_r($sourced);
739
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
740
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
739
+				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']), $source, 'polar', $date);
740
+				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']), $source, 'hist', $date);
741 741
 				    		if (isset($sourced['msg'])) {
742 742
 				    		    if (time() - $sourced['msg']['date'] > 10) {
743 743
 				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
744
-				    		        echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
744
+				    		        echo $Stats->addStatSource($nbmsg, $source, 'msg', $date);
745 745
 			    			        unset($this->stats[$date][$source]['msg']);
746 746
 			    			    }
747 747
 			    			}
@@ -779,14 +779,14 @@  discard block
 block discarded – undo
779 779
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
780 780
 					    $SpotterLive = new SpotterLive($this->db);
781 781
 					    $SpotterLive->deleteLiveSpotterData();
782
-					    $SpotterLive->db=null;
782
+					    $SpotterLive->db = null;
783 783
 					}
784 784
 				    }
785 785
 				    if ($globalDebug) echo " Done\n";
786 786
 				    $this->last_delete = time();
787 787
 				}
788 788
 			    } else {
789
-				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'] === 'famaprs')) {
789
+				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'] === 'famaprs')) {
790 790
 				    $this->all_flights[$id]['id'] = $recent_ident;
791 791
 				    $this->all_flights[$id]['addedSpotter'] = 1;
792 792
 				}
@@ -794,7 +794,7 @@  discard block
 block discarded – undo
794 794
 				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
795 795
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
796 796
 					    $Spotter = new Spotter($this->db);
797
-					    $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']);
797
+					    $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']);
798 798
 					    $Spotter->db = null;
799 799
 					}
800 800
 				    }
@@ -820,37 +820,37 @@  discard block
 block discarded – undo
820 820
 		    if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
821 821
 		    if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
822 822
 
823
-		    foreach($globalAirportIgnore as $airportIgnore) {
823
+		    foreach ($globalAirportIgnore as $airportIgnore) {
824 824
 		        if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
825 825
 			    $ignoreImport = true;
826 826
 			}
827 827
 		    }
828 828
 		    if (count($globalAirportAccept) > 0) {
829 829
 		        $ignoreImport = true;
830
-		        foreach($globalAirportIgnore as $airportIgnore) {
830
+		        foreach ($globalAirportIgnore as $airportIgnore) {
831 831
 			    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
832 832
 				$ignoreImport = false;
833 833
 			    }
834 834
 			}
835 835
 		    }
836 836
 		    if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
837
-			foreach($globalAirlineIgnore as $airlineIgnore) {
838
-			    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)) {
837
+			foreach ($globalAirlineIgnore as $airlineIgnore) {
838
+			    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)) {
839 839
 				$ignoreImport = true;
840 840
 			    }
841 841
 			}
842 842
 		    }
843 843
 		    if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
844 844
 			$ignoreImport = true;
845
-			foreach($globalAirlineAccept as $airlineAccept) {
846
-			    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)) {
845
+			foreach ($globalAirlineAccept as $airlineAccept) {
846
+			    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)) {
847 847
 				$ignoreImport = false;
848 848
 			    }
849 849
 			}
850 850
 		    }
851 851
 		    if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
852 852
 			$ignoreImport = true;
853
-			foreach($globalPilotIdAccept as $pilotIdAccept) {
853
+			foreach ($globalPilotIdAccept as $pilotIdAccept) {
854 854
 			    if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
855 855
 			        $ignoreImport = false;
856 856
 			    }
@@ -858,23 +858,23 @@  discard block
 block discarded – undo
858 858
 		    }
859 859
 
860 860
 		    if (!$ignoreImport) {
861
-			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'])) {
862
-				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')));
861
+			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'])) {
862
+				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')));
863 863
 				$timeelapsed = microtime(true);
864 864
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
865 865
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
866 866
 					if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : ";
867 867
 					$SpotterLive = new SpotterLive($this->db);
868
-					$result = $SpotterLive->addLiveSpotterData($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'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$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]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']);
868
+					$result = $SpotterLive->addLiveSpotterData($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'], $this->all_flights[$id]['hex'], $this->all_flights[$id]['putinarchive'], $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]['noarchive'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['format_source'], $this->all_flights[$id]['source_name'], $this->all_flights[$id]['over_country']);
869 869
 					$SpotterLive->db = null;
870 870
 					if ($globalDebug) echo $result."\n";
871 871
 				    }
872 872
 				}
873 873
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) {
874
-					$APRSSpotter->addLiveSpotterData($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'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$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]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']);
874
+					$APRSSpotter->addLiveSpotterData($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'], $this->all_flights[$id]['hex'], $this->all_flights[$id]['putinarchive'], $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]['noarchive'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['format_source'], $this->all_flights[$id]['source_name'], $this->all_flights[$id]['over_country']);
875 875
 				}
876 876
 				$this->all_flights[$id]['putinarchive'] = false;
877
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
877
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
878 878
 
879 879
 				// Put statistics in $this->stats variable
880 880
 				//if ($line['format_source'] != 'aprs') {
@@ -893,19 +893,19 @@  discard block
 block discarded – undo
893 893
 							$latitude = $globalCenterLatitude;
894 894
 							$longitude = $globalCenterLongitude;
895 895
 						}
896
-						$this->source_location[$source] = array('latitude' => $latitude,'longitude' => $longitude);
896
+						$this->source_location[$source] = array('latitude' => $latitude, 'longitude' => $longitude);
897 897
 					} else {
898 898
 						$latitude = $this->source_location[$source]['latitude'];
899 899
 						$longitude = $this->source_location[$source]['longitude'];
900 900
 					}
901
-					$stats_heading = $Common->getHeading($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
901
+					$stats_heading = $Common->getHeading($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']);
902 902
 					//$stats_heading = $stats_heading%22.5;
903 903
 					$stats_heading = round($stats_heading/22.5);
904
-					$stats_distance = $Common->distance($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
904
+					$stats_distance = $Common->distance($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']);
905 905
 					$current_date = date('Y-m-d');
906 906
 					if ($stats_heading == 16) $stats_heading = 0;
907 907
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
908
-						for ($i=0;$i<=15;$i++) {
908
+						for ($i = 0; $i <= 15; $i++) {
909 909
 						    $this->stats[$current_date][$source]['polar'][$i] = 0;
910 910
 						}
911 911
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
@@ -920,9 +920,9 @@  discard block
 block discarded – undo
920 920
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
921 921
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
922 922
 						    end($this->stats[$current_date][$source]['hist']);
923
-						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
923
+						    $mini = key($this->stats[$current_date][$source]['hist']) + 10;
924 924
 						} else $mini = 0;
925
-						for ($i=$mini;$i<=$distance;$i+=10) {
925
+						for ($i = $mini; $i <= $distance; $i += 10) {
926 926
 						    $this->stats[$current_date][$source]['hist'][$i] = 0;
927 927
 						}
928 928
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
@@ -935,7 +935,7 @@  discard block
 block discarded – undo
935 935
 				$this->all_flights[$id]['lastupdate'] = time();
936 936
 				if ($this->all_flights[$id]['putinarchive']) $send = true;
937 937
 				//if ($globalDebug) echo "Distance : ".Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
938
-			} elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
938
+			} elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude'])."\n";
939 939
 			//$this->del();
940 940
 			
941 941
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
Please login to merge, or discard this patch.
Braces   +355 added lines, -125 removed lines patch added patch discarded remove patch
@@ -63,7 +63,9 @@  discard block
 block discarded – undo
63 63
 	$dbc = $this->db;
64 64
 	$this->all_flights[$id]['schedule_check'] = true;
65 65
 	if ($globalSchedulesFetch) {
66
-	if ($globalDebug) echo 'Getting schedule info...'."\n";
66
+	if ($globalDebug) {
67
+		echo 'Getting schedule info...'."\n";
68
+	}
67 69
 	$Spotter = new Spotter($dbc);
68 70
 	$Schedule = new Schedule($dbc);
69 71
 	$Translation = new Translation($dbc);
@@ -74,7 +76,9 @@  discard block
 block discarded – undo
74 76
 	    if ($Schedule->checkSchedule($operator) == 0) {
75 77
 		$schedule = $Schedule->fetchSchedule($operator);
76 78
 		if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) {
77
-		    if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
79
+		    if ($globalDebug) {
80
+		    	echo "-> Schedule info for ".$operator." (".$ident.")\n";
81
+		    }
78 82
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
79 83
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
80 84
 		    // Should also check if route schedule = route from DB
@@ -83,7 +87,9 @@  discard block
 block discarded – undo
83 87
 			    $airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']);
84 88
 			    if (trim($airport_icao) != '') {
85 89
 				$this->all_flights[$id]['departure_airport'] = $airport_icao;
86
-				if ($globalDebug) echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n";
90
+				if ($globalDebug) {
91
+					echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n";
92
+				}
87 93
 			    }
88 94
 			}
89 95
 		    }
@@ -92,17 +98,25 @@  discard block
 block discarded – undo
92 98
 			    $airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']);
93 99
 			    if (trim($airport_icao) != '') {
94 100
 				$this->all_flights[$id]['arrival_airport'] = $airport_icao;
95
-				if ($globalDebug) echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n";
101
+				if ($globalDebug) {
102
+					echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n";
103
+				}
96 104
 			    }
97 105
 			}
98 106
 		    }
99 107
 		    $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']);
100 108
 		}
101
-	    } else $scheduleexist = true;
102
-	} else $scheduleexist = true;
109
+	    } else {
110
+	    	$scheduleexist = true;
111
+	    }
112
+	} else {
113
+		$scheduleexist = true;
114
+	}
103 115
 	// close connection, at least one way will work ?
104 116
        if ($scheduleexist) {
105
-		if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n";
117
+		if ($globalDebug) {
118
+			echo "-> get arrival/departure airport info for ".$ident."\n";
119
+		}
106 120
     		$sch = $Schedule->getSchedule($operator);
107 121
 		$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']));
108 122
        }
@@ -124,14 +138,18 @@  discard block
 block discarded – undo
124 138
 
125 139
     public function checkAll() {
126 140
 	global $globalDebug, $globalNoImport;
127
-	if ($globalDebug) echo "Update last seen flights data...\n";
141
+	if ($globalDebug) {
142
+		echo "Update last seen flights data...\n";
143
+	}
128 144
 	if (!isset($globalNoImport) || $globalNoImport === FALSE) {
129 145
 	    foreach ($this->all_flights as $key => $flight) {
130 146
 		if (isset($this->all_flights[$key]['id'])) {
131 147
 		    //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
132 148
     		    $Spotter = new Spotter($this->db);
133 149
         	    $real_arrival = $this->arrival($key);
134
-        	    if (isset($this->all_flights[$key]['altitude'])) $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']);
150
+        	    if (isset($this->all_flights[$key]['altitude'])) {
151
+        	    	$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']);
152
+        	    }
135 153
         	}
136 154
 	    }
137 155
 	}
@@ -139,24 +157,32 @@  discard block
 block discarded – undo
139 157
 
140 158
     public function arrival($key) {
141 159
 	global $globalClosestMinDist, $globalDebug;
142
-	if ($globalDebug) echo 'Update arrival...'."\n";
160
+	if ($globalDebug) {
161
+		echo 'Update arrival...'."\n";
162
+	}
143 163
 	$Spotter = new Spotter($this->db);
144 164
         $airport_icao = '';
145 165
         $airport_time = '';
146
-        if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
166
+        if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') {
167
+        	$globalClosestMinDist = 50;
168
+        }
147 169
 	if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
148 170
 	    $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
149 171
     	    if (isset($closestAirports[0])) {
150 172
         	if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
151 173
         	    $airport_icao = $closestAirports[0]['icao'];
152 174
         	    $airport_time = $this->all_flights[$key]['datetime'];
153
-        	    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
175
+        	    if ($globalDebug) {
176
+        	    	echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
177
+        	    }
154 178
         	} elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') {
155 179
         	    foreach ($closestAirports as $airport) {
156 180
         		if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) {
157 181
         		    $airport_icao = $airport['icao'];
158 182
         		    $airport_time = $this->all_flights[$key]['datetime'];
159
-        		    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
183
+        		    if ($globalDebug) {
184
+        		    	echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
185
+        		    }
160 186
         		    break;
161 187
         		}
162 188
         	    }
@@ -164,14 +190,20 @@  discard block
 block discarded – undo
164 190
         		$airport_icao = $closestAirports[0]['icao'];
165 191
         		$airport_time = $this->all_flights[$key]['datetime'];
166 192
         	} else {
167
-        		if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
193
+        		if ($globalDebug) {
194
+        			echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
195
+        		}
168 196
         	}
169 197
     	    } else {
170
-    		    if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
198
+    		    if ($globalDebug) {
199
+    		    	echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
200
+    		    }
171 201
     	    }
172 202
 
173 203
         } else {
174
-        	if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
204
+        	if ($globalDebug) {
205
+        		echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
206
+        	}
175 207
         }
176 208
         return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
177 209
     }
@@ -181,12 +213,16 @@  discard block
 block discarded – undo
181 213
     public function del() {
182 214
 	global $globalDebug, $globalNoImport, $globalNoDB;
183 215
 	// Delete old infos
184
-	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
216
+	if ($globalDebug) {
217
+		echo 'Delete old values and update latest data...'."\n";
218
+	}
185 219
 	foreach ($this->all_flights as $key => $flight) {
186 220
     	    if (isset($flight['lastupdate'])) {
187 221
         	if ($flight['lastupdate'] < (time()-3000)) {
188 222
             	    if (isset($this->all_flights[$key]['id'])) {
189
-            		if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n";
223
+            		if ($globalDebug) {
224
+            			echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n";
225
+            		}
190 226
 			/*
191 227
 			$SpotterLive = new SpotterLive();
192 228
             		$SpotterLive->deleteLiveSpotterDataById($this->all_flights[$key]['id']);
@@ -197,7 +233,9 @@  discard block
 block discarded – undo
197 233
             		    $Spotter = new Spotter($this->db);
198 234
             	    	    if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
199 235
 				$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']);
200
-				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
236
+				if ($globalDebug && $result != 'success') {
237
+					echo '!!! ERROR : '.$result."\n";
238
+				}
201 239
 			    }
202 240
 			// Put in archive
203 241
 //				$Spotter->db = null;
@@ -212,8 +250,10 @@  discard block
 block discarded – undo
212 250
     public function add($line) {
213 251
 	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, $globalNoDB, $globalVA;
214 252
 	//if (!isset($globalDebugTimeElapsed) || $globalDebugTimeElapsed == '') $globalDebugTimeElapsed = FALSE;
215
-	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02';
216
-/*
253
+	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') {
254
+		$globalCoordMinChange = '0.02';
255
+	}
256
+	/*
217 257
 	$Spotter = new Spotter();
218 258
 	$dbc = $Spotter->db;
219 259
 	$SpotterLive = new SpotterLive($dbc);
@@ -241,11 +281,15 @@  discard block
 block discarded – undo
241 281
 		if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) {
242 282
 		    $current_date = date('Y-m-d');
243 283
 		    $source = $line['source_name'];
244
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
284
+		    if ($source == '' || $line['format_source'] == 'aprs') {
285
+		    	$source = $line['format_source'];
286
+		    }
245 287
 		    if (!isset($this->stats[$current_date][$source]['msg'])) {
246 288
 		    	$this->stats[$current_date][$source]['msg']['date'] = time();
247 289
 		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
248
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
290
+		    } else {
291
+		    	$this->stats[$current_date][$source]['msg']['nb'] += 1;
292
+		    }
249 293
 		}
250 294
 		
251 295
 		/*
@@ -261,22 +305,35 @@  discard block
 block discarded – undo
261 305
 		//$this->db = $dbc;
262 306
 
263 307
 		//$hex = trim($line['hex']);
264
-	        if (!isset($line['id'])) $id = trim($line['hex']);
265
-	        else $id = trim($line['id']);
308
+	        if (!isset($line['id'])) {
309
+	        	$id = trim($line['hex']);
310
+	        } else {
311
+	        	$id = trim($line['id']);
312
+	        }
266 313
 		
267 314
 		if (!isset($this->all_flights[$id])) {
268 315
 		    $this->all_flights[$id] = array();
269 316
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
270 317
 		    $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' => ''));
271
-		    if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
318
+		    if (isset($globalDaemon) && $globalDaemon === FALSE) {
319
+		    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
320
+		    }
272 321
 		    if (!isset($line['id'])) {
273
-			if (!isset($globalDaemon)) $globalDaemon = TRUE;
274
-//			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')));
322
+			if (!isset($globalDaemon)) {
323
+				$globalDaemon = TRUE;
324
+			}
325
+			//			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')));
275 326
 //			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')));
276
-			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' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
327
+			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' || $line['format_source'] === 'famaprs')) {
328
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
329
+			}
277 330
 		        //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
278
-		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
279
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
331
+		     } else {
332
+		     	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
333
+		     }
334
+		    if ($globalAllFlights !== FALSE) {
335
+		    	$dataFound = true;
336
+		    }
280 337
 		}
281 338
 		if (isset($line['source_type']) && $line['source_type'] != '') {
282 339
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type']));
@@ -298,17 +355,27 @@  discard block
 block discarded – undo
298 355
 				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']));
299 356
 			    }
300 357
 			    $Spotter->db = null;
301
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
302
-			    if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
358
+			    if ($globalDebugTimeElapsed) {
359
+			    	echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
360
+			    }
361
+			    if ($aircraft_icao != '') {
362
+			    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
363
+			    }
303 364
 			}
304 365
 		    }
305
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
306
-		    if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
366
+		    if ($globalAllFlights !== FALSE) {
367
+		    	$dataFound = true;
368
+		    }
369
+		    if ($globalDebug) {
370
+		    	echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
371
+		    }
307 372
 		}
308 373
 		if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') {
309 374
 			$icao = $line['aircraft_icao'];
310 375
 			$Spotter = new Spotter($this->db);
311
-			if (isset($Spotter->aircraft_correct_icaotype[$icao])) $icao = $Spotter->aircraft_correct_icaotype[$icao];
376
+			if (isset($Spotter->aircraft_correct_icaotype[$icao])) {
377
+				$icao = $Spotter->aircraft_correct_icaotype[$icao];
378
+			}
312 379
 			$Spotter->db = null;
313 380
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $icao));
314 381
 		}
@@ -318,15 +385,24 @@  discard block
 block discarded – undo
318 385
 				$Spotter = new Spotter($this->db);
319 386
 				$aircraft_icao = $Spotter->getAircraftIcao($line['aircraft_name']);
320 387
 				$Spotter->db = null;
321
-				if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
388
+				if ($aircraft_icao != '') {
389
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
390
+				}
322 391
 			}
323 392
 		}
324 393
 		if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_type'])) {
325
-			if ($line['aircraft_type'] == 'PARA_GLIDER') $aircraft_icao = 'GLID';
326
-			elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL';
327
-			elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE';
328
-			elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC';
329
-			if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
394
+			if ($line['aircraft_type'] == 'PARA_GLIDER') {
395
+				$aircraft_icao = 'GLID';
396
+			} elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') {
397
+				$aircraft_icao = 'UHEL';
398
+			} elseif ($line['aircraft_type'] == 'TOW_PLANE') {
399
+				$aircraft_icao = 'TOWPLANE';
400
+			} elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') {
401
+				$aircraft_icao = 'POWAIRC';
402
+			}
403
+			if (isset($aircraft_icao)) {
404
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
405
+			}
330 406
 		}
331 407
 		if (!isset($this->all_flights[$id]['aircraft_icao'])) {
332 408
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => 'NA'));
@@ -336,8 +412,11 @@  discard block
 block discarded – undo
336 412
 		    if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
337 413
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
338 414
 		    } else {
339
-				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";
340
-				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";
415
+				if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) {
416
+					echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
417
+				} elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) {
418
+					echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
419
+				}
341 420
 				/*
342 421
 				echo strtotime($line['datetime']).' > '.strtotime($this->all_flights[$id]['datetime']);
343 422
 				print_r($this->all_flights[$id]);
@@ -346,16 +425,22 @@  discard block
 block discarded – undo
346 425
 				return '';
347 426
 		    }
348 427
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
349
-			if ($globalDebug) echo "!!! Date is too old ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!";
428
+			if ($globalDebug) {
429
+				echo "!!! Date is too old ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!";
430
+			}
350 431
 			return '';
351 432
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) {
352
-			if ($globalDebug) echo "!!! Date is in the future ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!";
433
+			if ($globalDebug) {
434
+				echo "!!! Date is in the future ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!";
435
+			}
353 436
 			return '';
354 437
 		} elseif (!isset($line['datetime'])) {
355 438
 			date_default_timezone_set('UTC');
356 439
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
357 440
 		} else {
358
-			if ($globalDebug) echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!";
441
+			if ($globalDebug) {
442
+				echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!";
443
+			}
359 444
 			return '';
360 445
 		}
361 446
 
@@ -379,15 +464,25 @@  discard block
 block discarded – undo
379 464
 			    $timeelapsed = microtime(true);
380 465
             		    $Spotter = new Spotter($this->db);
381 466
             		    $fromsource = NULL;
382
-            		    if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
383
-            		    elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
384
-			    elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao';
385
-			    elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
386
-			    elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
467
+            		    if (isset($globalAirlinesSource) && $globalAirlinesSource != '') {
468
+            		    	$fromsource = $globalAirlinesSource;
469
+            		    } elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') {
470
+            		    	$fromsource = 'vatsim';
471
+            		    } elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') {
472
+			    	$fromsource = 'ivao';
473
+			    } elseif (isset($globalVATSIM) && $globalVATSIM) {
474
+			    	$fromsource = 'vatsim';
475
+			    } elseif (isset($globalIVAO) && $globalIVAO) {
476
+			    	$fromsource = 'ivao';
477
+			    }
387 478
             		    $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
388
-			    if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
479
+			    if ($globalDebug && $result != 'success') {
480
+			    	echo '!!! ERROR : '.$result."\n";
481
+			    }
389 482
 			    $Spotter->db = null;
390
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
483
+			    if ($globalDebugTimeElapsed) {
484
+			    	echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
485
+			    }
391 486
 			}
392 487
 		    }
393 488
 
@@ -399,7 +494,9 @@  discard block
 block discarded – undo
399 494
 		        else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
400 495
 		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
401 496
   */
402
-		    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']));
497
+		    if (!isset($this->all_flights[$id]['id'])) {
498
+		    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
499
+		    }
403 500
 
404 501
 		    //$putinarchive = true;
405 502
 		    if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
@@ -417,7 +514,9 @@  discard block
 block discarded – undo
417 514
 				$line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']);
418 515
 				$line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']);
419 516
 		    		$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' => ''));
420
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
517
+				if ($globalDebugTimeElapsed) {
518
+					echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
519
+				}
421 520
                         }
422 521
 		    } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
423 522
 			$timeelapsed = microtime(true);
@@ -431,7 +530,9 @@  discard block
 block discarded – undo
431 530
 				$Translation->db = null;
432 531
 			    }
433 532
 			    $Spotter->db = null;
434
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
533
+			    if ($globalDebugTimeElapsed) {
534
+			    	echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
535
+			    }
435 536
                     	}
436 537
 			if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) {
437 538
 			    //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
@@ -440,9 +541,13 @@  discard block
 block discarded – undo
440 541
 		    		$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']));
441 542
 		    	    }
442 543
 			}
443
-			if (!isset($globalFork)) $globalFork = TRUE;
544
+			if (!isset($globalFork)) {
545
+				$globalFork = TRUE;
546
+			}
444 547
 			if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) {
445
-				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident']));
548
+				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) {
549
+					$this->get_Schedule($id,trim($line['ident']));
550
+				}
446 551
 			}
447 552
 		    }
448 553
 		}
@@ -458,16 +563,23 @@  discard block
 block discarded – undo
458 563
 		    // use datetime
459 564
 			$speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']);
460 565
 			$speed = $speed*3.6;
461
-			if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed)));
462
-  			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
566
+			if ($speed < 1000) {
567
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed)));
568
+			}
569
+  			if ($globalDebug) {
570
+  				echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
571
+  			}
463 572
 		    }
464 573
 		}
465 574
 
466 575
 
467 576
 
468 577
 	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude']) && !is_int($line['latitude']) && !is_int($line['longitude'])) {
469
-	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
470
-	    	    else unset($timediff);
578
+	    	    if (isset($this->all_flights[$id]['time_last_coord'])) {
579
+	    	    	$timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
580
+	    	    } else {
581
+	    	    	unset($timediff);
582
+	    	    }
471 583
 	    	    if ($this->tmd > 5 || (isset($globalVA) && $globalVA) || (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')))) {
472 584
 			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'])) {
473 585
 			    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'])) {
@@ -476,15 +588,23 @@  discard block
 block discarded – undo
476 588
 				$this->all_flights[$id]['putinarchive'] = true;
477 589
 				$this->tmd = 0;
478 590
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
479
-				    if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
591
+				    if ($globalDebug) {
592
+				    	echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
593
+				    }
480 594
 				    $timeelapsed = microtime(true);
481 595
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
482 596
 					$Spotter = new Spotter($this->db);
483 597
 					$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
484
-					if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2'];
598
+					if (!empty($all_country)) {
599
+						$this->all_flights[$id]['over_country'] = $all_country['iso2'];
600
+					}
485 601
 					$Spotter->db = null;
486
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
487
-					if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
602
+					if ($globalDebugTimeElapsed) {
603
+						echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
604
+					}
605
+					if ($globalDebug) {
606
+						echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
607
+					}
488 608
 				    }
489 609
 				}
490 610
 			    }
@@ -492,7 +612,9 @@  discard block
 block discarded – undo
492 612
 
493 613
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
494 614
 			    //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) {
495
-				if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude'];
615
+				if (!isset($this->all_flights[$id]['archive_latitude'])) {
616
+					$this->all_flights[$id]['archive_latitude'] = $line['latitude'];
617
+				}
496 618
 				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') {
497 619
 				    $this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
498 620
 				    $dataFound = true;
@@ -514,9 +636,13 @@  discard block
 block discarded – undo
514 636
 			    */
515 637
 			}
516 638
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
517
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
639
+			    if ($line['longitude'] > 180) {
640
+			    	$line['longitude'] = $line['longitude'] - 360;
641
+			    }
518 642
 			    //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) {
519
-				if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude'];
643
+				if (!isset($this->all_flights[$id]['archive_longitude'])) {
644
+					$this->all_flights[$id]['archive_longitude'] = $line['longitude'];
645
+				}
520 646
 				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') {
521 647
 				    $this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
522 648
 				    $dataFound = true;
@@ -547,7 +673,9 @@  discard block
 block discarded – undo
547 673
 		    }
548 674
 		}
549 675
 		if (isset($line['last_update']) && $line['last_update'] != '') {
550
-		    if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
676
+		    if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) {
677
+		    	$dataFound = true;
678
+		    }
551 679
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
552 680
 		}
553 681
 		if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
@@ -569,41 +697,61 @@  discard block
 block discarded – undo
569 697
 			// Here we force archive of flight because after ground it's a new one (or should be)
570 698
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
571 699
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
572
-			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')));
573
-		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
574
-			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']));
700
+			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw') && $globalDaemon) {
701
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdGi')));
702
+			} elseif (isset($line['id'])) {
703
+		        	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
704
+		        } elseif (isset($this->all_flights[$id]['ident'])) {
705
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
706
+			}
707
+		    }
708
+		    if ($line['ground'] != 1) {
709
+		    	$line['ground'] = 0;
575 710
 		    }
576
-		    if ($line['ground'] != 1) $line['ground'] = 0;
577 711
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
578 712
 		    //$dataFound = true;
579 713
 		}
580 714
 		if (isset($line['squawk']) && $line['squawk'] != '') {
581 715
 		    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'])) {
582
-			    if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
716
+			    if ($this->all_flights[$id]['squawk'] != $line['squawk']) {
717
+			    	$this->all_flights[$id]['putinarchive'] = true;
718
+			    }
583 719
 			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
584 720
 			    $highlight = '';
585
-			    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
586
-			    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
587
-			    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
721
+			    if ($this->all_flights[$id]['squawk'] == '7500') {
722
+			    	$highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
723
+			    }
724
+			    if ($this->all_flights[$id]['squawk'] == '7600') {
725
+			    	$highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
726
+			    }
727
+			    if ($this->all_flights[$id]['squawk'] == '7700') {
728
+			    	$highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
729
+			    }
588 730
 			    if ($highlight != '') {
589 731
 				$timeelapsed = microtime(true);
590 732
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
591 733
 				    $Spotter = new Spotter($this->db);
592 734
 				    $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
593 735
 				    $Spotter->db = null;
594
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
736
+				    if ($globalDebugTimeElapsed) {
737
+				    	echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
738
+				    }
595 739
 				}
596 740
 				//$putinarchive = true;
597 741
 				//$highlight = '';
598 742
 			    }
599 743
 			    
600
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
744
+		    } else {
745
+		    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
746
+		    }
601 747
 		    //$dataFound = true;
602 748
 		}
603 749
 
604 750
 		if (isset($line['altitude']) && $line['altitude'] != '') {
605 751
 		    //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
606
-			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;
752
+			if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) {
753
+				$this->all_flights[$id]['putinarchive'] = true;
754
+			}
607 755
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100)));
608 756
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude']));
609 757
 			//$dataFound = true;
@@ -615,21 +763,30 @@  discard block
 block discarded – undo
615 763
 		}
616 764
 		
617 765
 		if (isset($line['heading']) && $line['heading'] != '') {
618
-		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
766
+		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) {
767
+		    	$this->all_flights[$id]['putinarchive'] = true;
768
+		    }
619 769
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
620 770
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
621 771
 		    //$dataFound = true;
622 772
   		} 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']) {
623 773
   		    $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']);
624 774
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
625
-		    if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
626
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
775
+		    if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) {
776
+		    	$this->all_flights[$id]['putinarchive'] = true;
777
+		    }
778
+  		    if ($globalDebug) {
779
+  		    	echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
780
+  		    }
627 781
   		} elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') {
628 782
   		    // If not enough messages and ACARS set heading to 0
629 783
   		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
630 784
   		}
631
-		if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
632
-		elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
785
+		if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) {
786
+			$dataFound = false;
787
+		} elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) {
788
+			$dataFound = false;
789
+		}
633 790
 
634 791
 //		print_r($this->all_flights[$id]);
635 792
 		//gets the callsign from the last hour
@@ -645,23 +802,38 @@  discard block
 block discarded – undo
645 802
 			    //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
646 803
 			    if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) {
647 804
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
648
-				    if ($globalDebug) echo "Check if aircraft is already in DB...";
805
+				    if ($globalDebug) {
806
+				    	echo "Check if aircraft is already in DB...";
807
+				    }
649 808
 				    $timeelapsed = microtime(true);
650 809
 				    $SpotterLive = new SpotterLive($this->db);
651 810
 				    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' || $line['format_source'] === 'famaprs')) {
652 811
 					$recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']);
653
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
812
+					if ($globalDebugTimeElapsed) {
813
+						echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
814
+					}
654 815
 				    } elseif (isset($line['id'])) {
655 816
 					$recent_ident = $SpotterLive->checkIdRecent($line['id']);
656
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
817
+					if ($globalDebugTimeElapsed) {
818
+						echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
819
+					}
657 820
 				    } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
658 821
 					$recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']);
659
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
660
-				    } else $recent_ident = '';
822
+					if ($globalDebugTimeElapsed) {
823
+						echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
824
+					}
825
+				    } else {
826
+				    	$recent_ident = '';
827
+				    }
661 828
 				    $SpotterLive->db=null;
662
-				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
663
-				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
664
-				} else $recent_ident = '';
829
+				    if ($globalDebug && $recent_ident == '') {
830
+				    	echo " Not in DB.\n";
831
+				    } elseif ($globalDebug && $recent_ident != '') {
832
+				    	echo " Already in DB.\n";
833
+				    }
834
+				} else {
835
+					$recent_ident = '';
836
+				}
665 837
 			    } else {
666 838
 				$recent_ident = '';
667 839
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0));
@@ -669,7 +841,9 @@  discard block
 block discarded – undo
669 841
 			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
670 842
 			    if($recent_ident == "")
671 843
 			    {
672
-				if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : ";
844
+				if ($globalDebug) {
845
+					echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : ";
846
+				}
673 847
 				if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
674 848
 				if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
675 849
 				//adds the spotter data for the archive
@@ -713,31 +887,49 @@  discard block
 block discarded – undo
713 887
 				
714 888
 				if (!$ignoreImport) {
715 889
 				    $highlight = '';
716
-				    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
717
-				    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
718
-				    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
719
-				    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')));
890
+				    if ($this->all_flights[$id]['squawk'] == '7500') {
891
+				    	$highlight = 'Squawk 7500 : Hijack';
892
+				    }
893
+				    if ($this->all_flights[$id]['squawk'] == '7600') {
894
+				    	$highlight = 'Squawk 7600 : Lost Comm (radio failure)';
895
+				    }
896
+				    if ($this->all_flights[$id]['squawk'] == '7700') {
897
+				    	$highlight = 'Squawk 7700 : Emergency';
898
+				    }
899
+				    if (!isset($this->all_flights[$id]['id'])) {
900
+				    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
901
+				    }
720 902
 				    $timeelapsed = microtime(true);
721 903
 				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
722 904
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
723 905
 					    $Spotter = new Spotter($this->db);
724 906
 					    $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']);
725 907
 					    $Spotter->db = null;
726
-					    if ($globalDebug && isset($result)) echo $result."\n";
908
+					    if ($globalDebug && isset($result)) {
909
+					    	echo $result."\n";
910
+					    }
727 911
 					}
728 912
 				    }
729
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
913
+				    if ($globalDebugTimeElapsed) {
914
+				    	echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
915
+				    }
730 916
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
731 917
 
732 918
 				    // Add source stat in DB
733 919
 				    $Stats = new Stats($this->db);
734 920
 				    if (!empty($this->stats)) {
735
-					if ($globalDebug) echo 'Add source stats : ';
921
+					if ($globalDebug) {
922
+						echo 'Add source stats : ';
923
+					}
736 924
 				        foreach($this->stats as $date => $data) {
737 925
 					    foreach($data as $source => $sourced) {
738 926
 					        //print_r($sourced);
739
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
740
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
927
+				    	        if (isset($sourced['polar'])) {
928
+				    	        	echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
929
+				    	        }
930
+				    	        if (isset($sourced['hist'])) {
931
+				    	        	echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
932
+				    	        }
741 933
 				    		if (isset($sourced['msg'])) {
742 934
 				    		    if (time() - $sourced['msg']['date'] > 10) {
743 935
 				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
@@ -750,13 +942,17 @@  discard block
 block discarded – undo
750 942
 			    			unset($this->stats[$date]);
751 943
 			    		    }
752 944
 				    	}
753
-				    	if ($globalDebug) echo 'Done'."\n";
945
+				    	if ($globalDebug) {
946
+				    		echo 'Done'."\n";
947
+				    	}
754 948
 
755 949
 				    }
756 950
 				    $Stats->db = null;
757 951
 				    }
758 952
 				    $this->del();
759
-				} elseif ($globalDebug) echo 'Ignore data'."\n";
953
+				} elseif ($globalDebug) {
954
+					echo 'Ignore data'."\n";
955
+				}
760 956
 				//$ignoreImport = false;
761 957
 				$this->all_flights[$id]['addedSpotter'] = 1;
762 958
 				//print_r($this->all_flights[$id]);
@@ -773,7 +969,9 @@  discard block
 block discarded – undo
773 969
 			*/
774 970
 			//SpotterLive->deleteLiveSpotterDataByIdent($this->all_flights[$id]['ident']);
775 971
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
776
-				    if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours...";
972
+				    if ($globalDebug) {
973
+				    	echo "---- Deleting Live Spotter data older than 9 hours...";
974
+				    }
777 975
 				    //SpotterLive->deleteLiveSpotterDataNotUpdated();
778 976
 				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
779 977
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
@@ -782,7 +980,9 @@  discard block
 block discarded – undo
782 980
 					    $SpotterLive->db=null;
783 981
 					}
784 982
 				    }
785
-				    if ($globalDebug) echo " Done\n";
983
+				    if ($globalDebug) {
984
+				    	echo " Done\n";
985
+				    }
786 986
 				    $this->last_delete = time();
787 987
 				}
788 988
 			    } else {
@@ -809,11 +1009,17 @@  discard block
 block discarded – undo
809 1009
 		    //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";
810 1010
 		    if ($globalDebug) {
811 1011
 			if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM)) {
812
-				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";
813
-				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";
1012
+				if (isset($this->all_flights[$id]['source_name'])) {
1013
+					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";
1014
+				} else {
1015
+					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";
1016
+				}
814 1017
 			} else {
815
-				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";
816
-				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";
1018
+				if (isset($this->all_flights[$id]['source_name'])) {
1019
+					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";
1020
+				} else {
1021
+					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";
1022
+				}
817 1023
 			}
818 1024
 		    }
819 1025
 		    $ignoreImport = false;
@@ -859,22 +1065,30 @@  discard block
 block discarded – undo
859 1065
 
860 1066
 		    if (!$ignoreImport) {
861 1067
 			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'])) {
862
-				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')));
1068
+				if (!isset($this->all_flights[$id]['id'])) {
1069
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
1070
+				}
863 1071
 				$timeelapsed = microtime(true);
864 1072
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
865 1073
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
866
-					if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : ";
1074
+					if ($globalDebug) {
1075
+						echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : ";
1076
+					}
867 1077
 					$SpotterLive = new SpotterLive($this->db);
868 1078
 					$result = $SpotterLive->addLiveSpotterData($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'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$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]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']);
869 1079
 					$SpotterLive->db = null;
870
-					if ($globalDebug) echo $result."\n";
1080
+					if ($globalDebug) {
1081
+						echo $result."\n";
1082
+					}
871 1083
 				    }
872 1084
 				}
873 1085
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) {
874 1086
 					$APRSSpotter->addLiveSpotterData($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'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$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]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']);
875 1087
 				}
876 1088
 				$this->all_flights[$id]['putinarchive'] = false;
877
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
1089
+				if ($globalDebugTimeElapsed) {
1090
+					echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
1091
+				}
878 1092
 
879 1093
 				// Put statistics in $this->stats variable
880 1094
 				//if ($line['format_source'] != 'aprs') {
@@ -882,7 +1096,9 @@  discard block
 block discarded – undo
882 1096
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
883 1097
 				    if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $line['format_source'] != 'aprs' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
884 1098
 					$source = $this->all_flights[$id]['source_name'];
885
-					if ($source == '') $source = $this->all_flights[$id]['format_source'];
1099
+					if ($source == '') {
1100
+						$source = $this->all_flights[$id]['format_source'];
1101
+					}
886 1102
 					if (!isset($this->source_location[$source])) {
887 1103
 						$Location = new Source();
888 1104
 						$coord = $Location->getLocationInfobySourceName($source);
@@ -903,7 +1119,9 @@  discard block
 block discarded – undo
903 1119
 					$stats_heading = round($stats_heading/22.5);
904 1120
 					$stats_distance = $Common->distance($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
905 1121
 					$current_date = date('Y-m-d');
906
-					if ($stats_heading == 16) $stats_heading = 0;
1122
+					if ($stats_heading == 16) {
1123
+						$stats_heading = 0;
1124
+					}
907 1125
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
908 1126
 						for ($i=0;$i<=15;$i++) {
909 1127
 						    $this->stats[$current_date][$source]['polar'][$i] = 0;
@@ -921,7 +1139,9 @@  discard block
 block discarded – undo
921 1139
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
922 1140
 						    end($this->stats[$current_date][$source]['hist']);
923 1141
 						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
924
-						} else $mini = 0;
1142
+						} else {
1143
+							$mini = 0;
1144
+						}
925 1145
 						for ($i=$mini;$i<=$distance;$i+=10) {
926 1146
 						    $this->stats[$current_date][$source]['hist'][$i] = 0;
927 1147
 						}
@@ -933,19 +1153,27 @@  discard block
 block discarded – undo
933 1153
 				}
934 1154
 
935 1155
 				$this->all_flights[$id]['lastupdate'] = time();
936
-				if ($this->all_flights[$id]['putinarchive']) $send = true;
1156
+				if ($this->all_flights[$id]['putinarchive']) {
1157
+					$send = true;
1158
+				}
937 1159
 				//if ($globalDebug) echo "Distance : ".Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
938
-			} elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
1160
+			} elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) {
1161
+				echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
1162
+			}
939 1163
 			//$this->del();
940 1164
 			
941 1165
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
942 1166
 			    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
943
-				if ($globalDebug) echo "---- Deleting Live Spotter data Not updated since 2 hour...";
1167
+				if ($globalDebug) {
1168
+					echo "---- Deleting Live Spotter data Not updated since 2 hour...";
1169
+				}
944 1170
 				$SpotterLive = new SpotterLive($this->db);
945 1171
 				$SpotterLive->deleteLiveSpotterDataNotUpdated();
946 1172
 				$SpotterLive->db = null;
947 1173
 				//SpotterLive->deleteLiveSpotterData();
948
-				if ($globalDebug) echo " Done\n";
1174
+				if ($globalDebug) {
1175
+					echo " Done\n";
1176
+				}
949 1177
 				$this->last_delete_hourly = time();
950 1178
 			    } else {
951 1179
 				$this->del();
@@ -957,7 +1185,9 @@  discard block
 block discarded – undo
957 1185
 		    //$ignoreImport = false;
958 1186
 		}
959 1187
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
960
-		if ($send) return $this->all_flights[$id];
1188
+		if ($send) {
1189
+			return $this->all_flights[$id];
1190
+		}
961 1191
 	    }
962 1192
 	}
963 1193
     }
Please login to merge, or discard this patch.