Completed
Push — master ( 0ab128...e37ce2 )
by Yannick
07:35
created
scripts/daemon-spotter.php 1 patch
Indentation   +898 added lines, -898 removed lines patch added patch discarded remove patch
@@ -16,8 +16,8 @@  discard block
 block discarded – undo
16 16
 require_once(dirname(__FILE__).'/../require/class.Common.php');
17 17
 if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
18 18
 if (isset($globalMarine) && $globalMarine) {
19
-    require_once(dirname(__FILE__).'/../require/class.AIS.php');
20
-    require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
19
+	require_once(dirname(__FILE__).'/../require/class.AIS.php');
20
+	require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
21 21
 }
22 22
 
23 23
 if (!isset($globalDebug)) $globalDebug = FALSE;
@@ -25,42 +25,42 @@  discard block
 block discarded – undo
25 25
 // Check if schema is at latest version
26 26
 $Connection = new Connection();
27 27
 if ($Connection->latest() === false) {
28
-    echo "You MUST update to latest schema. Run install/index.php";
29
-    exit();
28
+	echo "You MUST update to latest schema. Run install/index.php";
29
+	exit();
30 30
 }
31 31
 if (PHP_SAPI != 'cli') {
32
-    echo "This script MUST be called from console, not a web browser.";
32
+	echo "This script MUST be called from console, not a web browser.";
33 33
 //    exit();
34 34
 }
35 35
 
36 36
 // This is to be compatible with old version of settings.php
37 37
 if (!isset($globalSources)) {
38
-    if (isset($globalSBS1Hosts)) {
39
-        //$hosts = $globalSBS1Hosts;
40
-        foreach ($globalSBS1Hosts as $host) {
41
-	    $globalSources[] = array('host' => $host);
42
-    	}
43
-    } else {
44
-        if (!isset($globalSBS1Host)) {
45
-	    echo '$globalSources MUST be defined !';
46
-	    die;
38
+	if (isset($globalSBS1Hosts)) {
39
+		//$hosts = $globalSBS1Hosts;
40
+		foreach ($globalSBS1Hosts as $host) {
41
+		$globalSources[] = array('host' => $host);
42
+		}
43
+	} else {
44
+		if (!isset($globalSBS1Host)) {
45
+		echo '$globalSources MUST be defined !';
46
+		die;
47 47
 	}
48 48
 	//$hosts = array($globalSBS1Host.':'.$globalSBS1Port);
49 49
 	$globalSources[] = array('host' => $globalSBS1Host,'port' => $globalSBS1Port);
50
-    }
50
+	}
51 51
 }
52 52
 
53 53
 $options = getopt('s::',array('source::','server','nodaemon','idsource::','aprsserverssid::','aprsserverpass::','aprsserverhost::','aprsserverport::','format::','noaprsserver'));
54 54
 //if (isset($options['s'])) $hosts = array($options['s']);
55 55
 //elseif (isset($options['source'])) $hosts = array($options['source']);
56 56
 if (isset($options['s'])) {
57
-    $globalSources = array();
58
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']);
59
-    else $globalSources[] = array('host' => $options['s']);
57
+	$globalSources = array();
58
+	if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']);
59
+	else $globalSources[] = array('host' => $options['s']);
60 60
 } elseif (isset($options['source'])) {
61
-    $globalSources = array();
62
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']);
63
-    else $globalSources[] = array('host' => $options['source']);
61
+	$globalSources = array();
62
+	if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']);
63
+	else $globalSources[] = array('host' => $options['source']);
64 64
 }
65 65
 if (isset($options['aprsserverhost'])) {
66 66
 	$globalServerAPRS = TRUE;
@@ -75,8 +75,8 @@  discard block
 block discarded – undo
75 75
 if (isset($options['idsource'])) $id_source = $options['idsource'];
76 76
 else $id_source = 1;
77 77
 if (isset($globalServer) && $globalServer) {
78
-    if ($globalDebug) echo "Using Server Mode\n";
79
-    $SI=new SpotterServer();
78
+	if ($globalDebug) echo "Using Server Mode\n";
79
+	$SI=new SpotterServer();
80 80
 /*
81 81
     require_once(dirname(__FILE__).'/../require/class.APRS.php');
82 82
     $SI = new adsb2aprs();
@@ -85,8 +85,8 @@  discard block
 block discarded – undo
85 85
 } else $SI=new SpotterImport($Connection->db);
86 86
 if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db);
87 87
 if (isset($globalMarine) && $globalMarine) {
88
-    $AIS = new AIS();
89
-    $MI = new MarineImport($Connection->db);
88
+	$AIS = new AIS();
89
+	$MI = new MarineImport($Connection->db);
90 90
 }
91 91
 //$APRS=new APRS($Connection->db);
92 92
 $SBS=new SBS();
@@ -97,12 +97,12 @@  discard block
 block discarded – undo
97 97
 //$servertz = system('date +%Z');
98 98
 // signal handler - playing nice with sockets and dump1090
99 99
 if (function_exists('pcntl_fork')) {
100
-    pcntl_signal(SIGINT,  function() {
101
-        global $sockets;
102
-        echo "\n\nctrl-c or kill signal received. Tidying up ... ";
103
-        die("Bye!\n");
104
-    });
105
-    pcntl_signal_dispatch();
100
+	pcntl_signal(SIGINT,  function() {
101
+		global $sockets;
102
+		echo "\n\nctrl-c or kill signal received. Tidying up ... ";
103
+		die("Bye!\n");
104
+	});
105
+	pcntl_signal_dispatch();
106 106
 }
107 107
 
108 108
 // let's try and connect
@@ -112,36 +112,36 @@  discard block
 block discarded – undo
112 112
 $reset = 0;
113 113
 
114 114
 function connect_all($hosts) {
115
-    //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
116
-    global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;
117
-    $reset++;
118
-    if ($globalDebug) echo 'Connect to all...'."\n";
119
-    foreach ($hosts as $id => $value) {
115
+	//global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
116
+	global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;
117
+	$reset++;
118
+	if ($globalDebug) echo 'Connect to all...'."\n";
119
+	foreach ($hosts as $id => $value) {
120 120
 	$host = $value['host'];
121 121
 	$globalSources[$id]['last_exec'] = 0;
122 122
 	// Here we check type of source(s)
123 123
 	if (filter_var($host,FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) {
124
-            if (preg_match('/deltadb.txt$/i',$host)) {
125
-        	//$formats[$id] = 'deltadbtxt';
126
-        	$globalSources[$id]['format'] = 'deltadbtxt';
127
-        	//$last_exec['deltadbtxt'] = 0;
128
-        	if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
129
-            } else if (preg_match('/vatsim-data.txt$/i',$host)) {
130
-        	//$formats[$id] = 'vatsimtxt';
131
-        	$globalSources[$id]['format'] = 'vatsimtxt';
132
-        	//$last_exec['vatsimtxt'] = 0;
133
-        	if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
134
-    	    } else if (preg_match('/aircraftlist.json$/i',$host)) {
135
-        	//$formats[$id] = 'aircraftlistjson';
136
-        	$globalSources[$id]['format'] = 'aircraftlistjson';
137
-        	//$last_exec['aircraftlistjson'] = 0;
138
-        	if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
139
-    	    } else if (preg_match('/opensky/i',$host)) {
140
-        	//$formats[$id] = 'aircraftlistjson';
141
-        	$globalSources[$id]['format'] = 'opensky';
142
-        	//$last_exec['aircraftlistjson'] = 0;
143
-        	if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
144
-    	    /*
124
+			if (preg_match('/deltadb.txt$/i',$host)) {
125
+			//$formats[$id] = 'deltadbtxt';
126
+			$globalSources[$id]['format'] = 'deltadbtxt';
127
+			//$last_exec['deltadbtxt'] = 0;
128
+			if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
129
+			} else if (preg_match('/vatsim-data.txt$/i',$host)) {
130
+			//$formats[$id] = 'vatsimtxt';
131
+			$globalSources[$id]['format'] = 'vatsimtxt';
132
+			//$last_exec['vatsimtxt'] = 0;
133
+			if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
134
+			} else if (preg_match('/aircraftlist.json$/i',$host)) {
135
+			//$formats[$id] = 'aircraftlistjson';
136
+			$globalSources[$id]['format'] = 'aircraftlistjson';
137
+			//$last_exec['aircraftlistjson'] = 0;
138
+			if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
139
+			} else if (preg_match('/opensky/i',$host)) {
140
+			//$formats[$id] = 'aircraftlistjson';
141
+			$globalSources[$id]['format'] = 'opensky';
142
+			//$last_exec['aircraftlistjson'] = 0;
143
+			if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
144
+			/*
145 145
     	    // Disabled for now, site change source format
146 146
     	    } else if (preg_match('/radarvirtuel.com\/list_aircrafts$/i',$host)) {
147 147
         	//$formats[$id] = 'radarvirtueljson';
@@ -153,118 +153,118 @@  discard block
 block discarded – undo
153 153
         	    exit(0);
154 154
         	}
155 155
     	    */
156
-    	    } else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
157
-        	//$formats[$id] = 'planeupdatefaa';
158
-        	$globalSources[$id]['format'] = 'planeupdatefaa';
159
-        	//$last_exec['planeupdatefaa'] = 0;
160
-        	if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
161
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
162
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
163
-        	    exit(0);
164
-        	}
165
-            } else if (preg_match('/\/action.php\/acars\/data$/i',$host)) {
166
-        	//$formats[$id] = 'phpvmacars';
167
-        	$globalSources[$id]['format'] = 'phpvmacars';
168
-        	//$last_exec['phpvmacars'] = 0;
169
-        	if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
170
-            } else if (preg_match('/VAM-json.php$/i',$host)) {
171
-        	//$formats[$id] = 'phpvmacars';
172
-        	$globalSources[$id]['format'] = 'vam';
173
-        	if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
174
-            } else if (preg_match('/whazzup/i',$host)) {
175
-        	//$formats[$id] = 'whazzup';
176
-        	$globalSources[$id]['format'] = 'whazzup';
177
-        	//$last_exec['whazzup'] = 0;
178
-        	if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
179
-            } else if (preg_match('/airwhere/i',$host)) {
180
-        	$globalSources[$id]['format'] = 'airwhere';
181
-        	if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n";
182
-            } else if (preg_match('/recentpireps/i',$host)) {
183
-        	//$formats[$id] = 'pirepsjson';
184
-        	$globalSources[$id]['format'] = 'pirepsjson';
185
-        	//$last_exec['pirepsjson'] = 0;
186
-        	if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
187
-            } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
188
-        	//$formats[$id] = 'fr24json';
189
-        	$globalSources[$id]['format'] = 'fr24json';
190
-        	//$last_exec['fr24json'] = 0;
191
-        	if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n";
192
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
193
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
194
-        	    exit(0);
195
-        	}
196
-            } else if (preg_match(':myshiptracking.com/:i',$host)) {
197
-        	//$formats[$id] = 'fr24json';
198
-        	$globalSources[$id]['format'] = 'myshiptracking';
199
-        	//$last_exec['fr24json'] = 0;
200
-        	if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n";
201
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
202
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
203
-        	    exit(0);
204
-        	}
205
-            //} else if (preg_match('/10001/',$host)) {
206
-            } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
207
-        	//$formats[$id] = 'tsv';
208
-        	$globalSources[$id]['format'] = 'tsv';
209
-        	if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
210
-            }
211
-        } elseif (filter_var($host,FILTER_VALIDATE_URL)) {
212
-    		if ($globalSources[$id]['format'] == 'aisnmeahttp') {
213
-    		    $idf = fopen($globalSources[$id]['host'],'r',false,$context);
214
-    		    if ($idf !== false) {
215
-    			$httpfeeds[$id] = $idf;
216
-        		if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
217
-    		    }
218
-    		    elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
219
-    		} elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
220
-        } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
221
-	    $hostport = explode(':',$host);
222
-	    if (isset($hostport[1])) {
156
+			} else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
157
+			//$formats[$id] = 'planeupdatefaa';
158
+			$globalSources[$id]['format'] = 'planeupdatefaa';
159
+			//$last_exec['planeupdatefaa'] = 0;
160
+			if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
161
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
162
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
163
+				exit(0);
164
+			}
165
+			} else if (preg_match('/\/action.php\/acars\/data$/i',$host)) {
166
+			//$formats[$id] = 'phpvmacars';
167
+			$globalSources[$id]['format'] = 'phpvmacars';
168
+			//$last_exec['phpvmacars'] = 0;
169
+			if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
170
+			} else if (preg_match('/VAM-json.php$/i',$host)) {
171
+			//$formats[$id] = 'phpvmacars';
172
+			$globalSources[$id]['format'] = 'vam';
173
+			if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
174
+			} else if (preg_match('/whazzup/i',$host)) {
175
+			//$formats[$id] = 'whazzup';
176
+			$globalSources[$id]['format'] = 'whazzup';
177
+			//$last_exec['whazzup'] = 0;
178
+			if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
179
+			} else if (preg_match('/airwhere/i',$host)) {
180
+			$globalSources[$id]['format'] = 'airwhere';
181
+			if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n";
182
+			} else if (preg_match('/recentpireps/i',$host)) {
183
+			//$formats[$id] = 'pirepsjson';
184
+			$globalSources[$id]['format'] = 'pirepsjson';
185
+			//$last_exec['pirepsjson'] = 0;
186
+			if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
187
+			} else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
188
+			//$formats[$id] = 'fr24json';
189
+			$globalSources[$id]['format'] = 'fr24json';
190
+			//$last_exec['fr24json'] = 0;
191
+			if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n";
192
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
193
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
194
+				exit(0);
195
+			}
196
+			} else if (preg_match(':myshiptracking.com/:i',$host)) {
197
+			//$formats[$id] = 'fr24json';
198
+			$globalSources[$id]['format'] = 'myshiptracking';
199
+			//$last_exec['fr24json'] = 0;
200
+			if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n";
201
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
202
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
203
+				exit(0);
204
+			}
205
+			//} else if (preg_match('/10001/',$host)) {
206
+			} else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
207
+			//$formats[$id] = 'tsv';
208
+			$globalSources[$id]['format'] = 'tsv';
209
+			if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
210
+			}
211
+		} elseif (filter_var($host,FILTER_VALIDATE_URL)) {
212
+			if ($globalSources[$id]['format'] == 'aisnmeahttp') {
213
+				$idf = fopen($globalSources[$id]['host'],'r',false,$context);
214
+				if ($idf !== false) {
215
+				$httpfeeds[$id] = $idf;
216
+				if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
217
+				}
218
+				elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
219
+			} elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
220
+		} elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
221
+		$hostport = explode(':',$host);
222
+		if (isset($hostport[1])) {
223 223
 		$port = $hostport[1];
224 224
 		$hostn = $hostport[0];
225
-	    } else {
225
+		} else {
226 226
 		$port = $globalSources[$id]['port'];
227 227
 		$hostn = $globalSources[$id]['host'];
228
-	    }
229
-	    $Common = new Common();
230
-	    if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
231
-        	$s = $Common->create_socket($hostn,$port, $errno, $errstr);
232
-    	    } else {
233
-        	$s = $Common->create_socket_udp($hostn,$port, $errno, $errstr);
234
-	    }
235
-	    if ($s) {
236
-    	        $sockets[$id] = $s;
237
-    	        if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
238
-		    if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') {
228
+		}
229
+		$Common = new Common();
230
+		if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
231
+			$s = $Common->create_socket($hostn,$port, $errno, $errstr);
232
+			} else {
233
+			$s = $Common->create_socket_udp($hostn,$port, $errno, $errstr);
234
+		}
235
+		if ($s) {
236
+				$sockets[$id] = $s;
237
+				if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
238
+			if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') {
239 239
 			//$formats[$id] = 'aprs';
240 240
 			$globalSources[$id]['format'] = 'aprs';
241 241
 			//$aprs_connect = 0;
242 242
 			//$use_aprs = true;
243
-		    } elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
243
+			} elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
244 244
 			$globalSources[$id]['format'] = 'vrstcp';
245
-    		    } elseif ($port == '10001') {
246
-        		//$formats[$id] = 'tsv';
247
-        		$globalSources[$id]['format'] = 'tsv';
248
-		    } elseif ($port == '30002') {
249
-        		//$formats[$id] = 'raw';
250
-        		$globalSources[$id]['format'] = 'raw';
251
-		    } elseif ($port == '5001') {
252
-        		//$formats[$id] = 'raw';
253
-        		$globalSources[$id]['format'] = 'flightgearmp';
254
-		    } elseif ($port == '30005') {
245
+				} elseif ($port == '10001') {
246
+				//$formats[$id] = 'tsv';
247
+				$globalSources[$id]['format'] = 'tsv';
248
+			} elseif ($port == '30002') {
249
+				//$formats[$id] = 'raw';
250
+				$globalSources[$id]['format'] = 'raw';
251
+			} elseif ($port == '5001') {
252
+				//$formats[$id] = 'raw';
253
+				$globalSources[$id]['format'] = 'flightgearmp';
254
+			} elseif ($port == '30005') {
255 255
 			// Not yet supported
256
-        		//$formats[$id] = 'beast';
257
-        		$globalSources[$id]['format'] = 'beast';
258
-		    //} else $formats[$id] = 'sbs';
259
-		    } else $globalSources[$id]['format'] = 'sbs';
260
-		    //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
256
+				//$formats[$id] = 'beast';
257
+				$globalSources[$id]['format'] = 'beast';
258
+			//} else $formats[$id] = 'sbs';
259
+			} else $globalSources[$id]['format'] = 'sbs';
260
+			//if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
261 261
 		}
262 262
 		if ($globalDebug) echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
263
-            } else {
263
+			} else {
264 264
 		if ($globalDebug) echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";
265
-    	    }
266
-        }
267
-    }
265
+			}
266
+		}
267
+	}
268 268
 }
269 269
 if (!isset($globalMinFetch)) $globalMinFetch = 15;
270 270
 
@@ -287,9 +287,9 @@  discard block
 block discarded – undo
287 287
 //connect_all($globalSources);
288 288
 
289 289
 if (isset($globalProxy) && $globalProxy) {
290
-    $context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true)));
290
+	$context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true)));
291 291
 } else {
292
-    $context = stream_context_create(array('http' => array('timeout' => $timeout)));
292
+	$context = stream_context_create(array('http' => array('timeout' => $timeout)));
293 293
 }
294 294
 
295 295
 // APRS Configuration
@@ -298,18 +298,18 @@  discard block
 block discarded – undo
298 298
 	die;
299 299
 }
300 300
 foreach ($globalSources as $key => $source) {
301
-    if (!isset($source['format'])) {
302
-        $globalSources[$key]['format'] = 'auto';
303
-    }
301
+	if (!isset($source['format'])) {
302
+		$globalSources[$key]['format'] = 'auto';
303
+	}
304 304
 }
305 305
 connect_all($globalSources);
306 306
 foreach ($globalSources as $key => $source) {
307
-    if (isset($source['format']) && $source['format'] == 'aprs') {
307
+	if (isset($source['format']) && $source['format'] == 'aprs') {
308 308
 	$aprs_connect = 0;
309 309
 	$use_aprs = true;
310 310
 	if (isset($source['port']) && $source['port'] == '10152') $aprs_full = true;
311 311
 	break;
312
-    }
312
+	}
313 313
 }
314 314
 
315 315
 if ($use_aprs) {
@@ -350,115 +350,115 @@  discard block
 block discarded – undo
350 350
 
351 351
 // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time.
352 352
 while ($i > 0) {
353
-    if (!$globalDaemon) $i = $endtime-time();
354
-    // Delete old ATC
355
-    if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
353
+	if (!$globalDaemon) $i = $endtime-time();
354
+	// Delete old ATC
355
+	if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
356 356
 	if ($globalDebug) echo 'Delete old ATC...'."\n";
357
-        $ATC->deleteOldATC();
358
-    }
357
+		$ATC->deleteOldATC();
358
+	}
359 359
     
360
-    if (count($last_exec) == count($globalSources)) {
360
+	if (count($last_exec) == count($globalSources)) {
361 361
 	$max = $globalMinFetch;
362 362
 	foreach ($last_exec as $last) {
363
-	    if ((time() - $last['last']) < $max) $max = time() - $last['last'];
363
+		if ((time() - $last['last']) < $max) $max = time() - $last['last'];
364 364
 	}
365 365
 	if ($max != $globalMinFetch) {
366
-	    if ($globalDebug) echo 'Sleeping...'."\n";
367
-	    sleep($globalMinFetch-$max+2);
366
+		if ($globalDebug) echo 'Sleeping...'."\n";
367
+		sleep($globalMinFetch-$max+2);
368
+	}
368 369
 	}
369
-    }
370 370
 
371 371
     
372
-    //foreach ($formats as $id => $value) {
373
-    foreach ($globalSources as $id => $value) {
372
+	//foreach ($formats as $id => $value) {
373
+	foreach ($globalSources as $id => $value) {
374 374
 	date_default_timezone_set('UTC');
375 375
 	if (!isset($last_exec[$id]['last'])) $last_exec[$id]['last'] = 0;
376 376
 	if ($value['format'] == 'deltadbtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
377
-	    //$buffer = $Common->getData($hosts[$id]);
378
-	    $buffer = $Common->getData($value['host']);
379
-	    if ($buffer != '') $reset = 0;
380
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
381
-	    $buffer = explode('\n',$buffer);
382
-	    foreach ($buffer as $line) {
383
-    		if ($line != '' && count($line) > 7) {
384
-    		    $line = explode(',', $line);
385
-	            $data = array();
386
-	            $data['hex'] = $line[1]; // hex
387
-	            $data['ident'] = $line[2]; // ident
388
-	            if (isset($line[3])) $data['altitude'] = $line[3]; // altitude
389
-	            if (isset($line[4])) $data['speed'] = $line[4]; // speed
390
-	            if (isset($line[5])) $data['heading'] = $line[5]; // heading
391
-	            if (isset($line[6])) $data['latitude'] = $line[6]; // lat
392
-	            if (isset($line[7])) $data['longitude'] = $line[7]; // long
393
-	            $data['verticalrate'] = ''; // vertical rate
394
-	            //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk
395
-	            $data['emergency'] = ''; // emergency
396
-		    $data['datetime'] = date('Y-m-d H:i:s');
397
-		    $data['format_source'] = 'deltadbtxt';
398
-    		    $data['id_source'] = $id_source;
399
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
400
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
401
-		    if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
402
-    		    $SI->add($data);
403
-		    unset($data);
404
-    		}
405
-    	    }
406
-    	    $last_exec[$id]['last'] = time();
377
+		//$buffer = $Common->getData($hosts[$id]);
378
+		$buffer = $Common->getData($value['host']);
379
+		if ($buffer != '') $reset = 0;
380
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
381
+		$buffer = explode('\n',$buffer);
382
+		foreach ($buffer as $line) {
383
+			if ($line != '' && count($line) > 7) {
384
+				$line = explode(',', $line);
385
+				$data = array();
386
+				$data['hex'] = $line[1]; // hex
387
+				$data['ident'] = $line[2]; // ident
388
+				if (isset($line[3])) $data['altitude'] = $line[3]; // altitude
389
+				if (isset($line[4])) $data['speed'] = $line[4]; // speed
390
+				if (isset($line[5])) $data['heading'] = $line[5]; // heading
391
+				if (isset($line[6])) $data['latitude'] = $line[6]; // lat
392
+				if (isset($line[7])) $data['longitude'] = $line[7]; // long
393
+				$data['verticalrate'] = ''; // vertical rate
394
+				//if (isset($line[9])) $data['squawk'] = $line[9]; // squawk
395
+				$data['emergency'] = ''; // emergency
396
+			$data['datetime'] = date('Y-m-d H:i:s');
397
+			$data['format_source'] = 'deltadbtxt';
398
+				$data['id_source'] = $id_source;
399
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
400
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
401
+			if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
402
+				$SI->add($data);
403
+			unset($data);
404
+			}
405
+			}
406
+			$last_exec[$id]['last'] = time();
407 407
 	} elseif ($value['format'] == 'aisnmeatxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
408
-	    date_default_timezone_set('CET');
409
-	    $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
410
-	    date_default_timezone_set('UTC');
411
-	    if ($buffer != '') $reset = 0;
412
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
413
-	    $buffer = explode('\n',$buffer);
414
-	    foreach ($buffer as $line) {
408
+		date_default_timezone_set('CET');
409
+		$buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
410
+		date_default_timezone_set('UTC');
411
+		if ($buffer != '') $reset = 0;
412
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
413
+		$buffer = explode('\n',$buffer);
414
+		foreach ($buffer as $line) {
415 415
 		if ($line != '') {
416
-		    echo "'".$line."'\n";
417
-		    $add = false;
418
-		    $ais_data = $AIS->parse_line(trim($line));
419
-		    $data = array();
420
-		    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
421
-		    if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
422
-		    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
423
-		    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
424
-		    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
425
-		    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
426
-		    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
427
-		    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
428
-		    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
429
-		    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
430
-		    if (isset($ais_data['timestamp'])) {
416
+			echo "'".$line."'\n";
417
+			$add = false;
418
+			$ais_data = $AIS->parse_line(trim($line));
419
+			$data = array();
420
+			if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
421
+			if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
422
+			if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
423
+			if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
424
+			if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
425
+			if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
426
+			if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
427
+			if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
428
+			if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
429
+			if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
430
+			if (isset($ais_data['timestamp'])) {
431 431
 			$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
432 432
 			if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) {
433
-			    $last_exec[$id]['timestamp'] = $ais_data['timestamp'];
434
-			    $add = true;
433
+				$last_exec[$id]['timestamp'] = $ais_data['timestamp'];
434
+				$add = true;
435 435
 			}
436
-		    } else {
436
+			} else {
437 437
 			$data['datetime'] = date('Y-m-d H:i:s');
438 438
 			$add = true;
439
-		    }
440
-		    $data['format_source'] = 'aisnmeatxt';
441
-    		    $data['id_source'] = $id_source;
442
-		    //print_r($data);
443
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
444
-		    if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
445
-		    unset($data);
439
+			}
440
+			$data['format_source'] = 'aisnmeatxt';
441
+				$data['id_source'] = $id_source;
442
+			//print_r($data);
443
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
444
+			if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
445
+			unset($data);
446 446
 		}
447
-    	    }
448
-    	    $last_exec[$id]['last'] = time();
447
+			}
448
+			$last_exec[$id]['last'] = time();
449 449
 	} elseif ($value['format'] == 'aisnmeahttp') {
450
-	    $arr = $httpfeeds;
451
-	    $w = $e = null;
450
+		$arr = $httpfeeds;
451
+		$w = $e = null;
452 452
 	    
453
-	    if (isset($arr[$id])) {
453
+		if (isset($arr[$id])) {
454 454
 		$nn = stream_select($arr,$w,$e,$timeout);
455 455
 		if ($nn > 0) {
456
-		    foreach ($httpfeeds as $feed) {
456
+			foreach ($httpfeeds as $feed) {
457 457
 			$buffer = stream_get_line($feed,2000,"\n");
458 458
 			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
459 459
 			$buffer = explode('\n',$buffer);
460 460
 			foreach ($buffer as $line) {
461
-			    if ($line != '') {
461
+				if ($line != '') {
462 462
 				$ais_data = $AIS->parse_line(trim($line));
463 463
 				$data = array();
464 464
 				if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
@@ -476,96 +476,96 @@  discard block
 block discarded – undo
476 476
 				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
477 477
 				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
478 478
 				if (isset($ais_data['timestamp'])) {
479
-				    $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
479
+					$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
480 480
 				} else {
481
-				    $data['datetime'] = date('Y-m-d H:i:s');
481
+					$data['datetime'] = date('Y-m-d H:i:s');
482 482
 				}
483 483
 				$data['format_source'] = 'aisnmeahttp';
484 484
 				$data['id_source'] = $id_source;
485 485
 				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
486 486
 				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
487 487
 				unset($data);
488
-			    }
488
+				}
489
+			}
489 490
 			}
490
-		    }
491 491
 		} else {
492
-		    $format = $value['format'];
493
-		    if (isset($tt[$format])) $tt[$format]++;
494
-		    else $tt[$format] = 0;
495
-		    if ($tt[$format] > 30) {
492
+			$format = $value['format'];
493
+			if (isset($tt[$format])) $tt[$format]++;
494
+			else $tt[$format] = 0;
495
+			if ($tt[$format] > 30) {
496 496
 			if ($globalDebug) echo 'Reconnect...'."\n";
497 497
 			sleep(2);
498 498
 			$sourceeen[] = $value;
499 499
 			connect_all($sourceeen);
500 500
 			$sourceeen = array();
501
-		    }
501
+			}
502
+		}
502 503
 		}
503
-	    }
504 504
 	} elseif ($value['format'] == 'myshiptracking' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
505
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
506
-	    if ($buffer != '') {
505
+		$buffer = $Common->getData($value['host'],'get','','','','','20');
506
+		if ($buffer != '') {
507 507
 		//echo $buffer;
508 508
 		$all_data = json_decode($buffer,true);
509 509
 		//print_r($all_data);
510 510
 		if (isset($all_data[0]['DATA'])) {
511
-		    foreach ($all_data[0]['DATA'] as $line) {
511
+			foreach ($all_data[0]['DATA'] as $line) {
512 512
 			if ($line != '') {
513
-			    $data = array();
514
-			    $data['ident'] = $line['NAME'];
515
-			    $data['mmsi'] = $line['MMSI'];
516
-			    $data['speed'] = $line['SOG'];
517
-			    $data['heading'] = $line['COG'];
518
-			    $data['latitude'] = $line['LAT'];
519
-			    $data['longitude'] = $line['LNG'];
520
-			    //    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
521
-			    $data['imo'] = $line['IMO'];
522
-			    //$data['arrival_code'] = $ais_data['destination'];
523
-			    $data['datetime'] = date('Y-m-d H:i:s',$line['T']);
524
-			    $data['format_source'] = 'myshiptracking';
525
-			    $data['id_source'] = $id_source;
526
-			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
527
-			    $MI->add($data);
528
-			    unset($data);
513
+				$data = array();
514
+				$data['ident'] = $line['NAME'];
515
+				$data['mmsi'] = $line['MMSI'];
516
+				$data['speed'] = $line['SOG'];
517
+				$data['heading'] = $line['COG'];
518
+				$data['latitude'] = $line['LAT'];
519
+				$data['longitude'] = $line['LNG'];
520
+				//    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
521
+				$data['imo'] = $line['IMO'];
522
+				//$data['arrival_code'] = $ais_data['destination'];
523
+				$data['datetime'] = date('Y-m-d H:i:s',$line['T']);
524
+				$data['format_source'] = 'myshiptracking';
525
+				$data['id_source'] = $id_source;
526
+				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
527
+				$MI->add($data);
528
+				unset($data);
529
+			}
529 530
 			}
530
-		    }
531 531
 		}
532
-	    }
533
-	    $last_exec[$id]['last'] = time();
532
+		}
533
+		$last_exec[$id]['last'] = time();
534 534
 	} elseif ($value['format'] == 'boatbeaconapp' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
535
-	    $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host']));
536
-	    if ($buffer != '') {
535
+		$buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host']));
536
+		if ($buffer != '') {
537 537
 		$all_data = json_decode($buffer,true);
538 538
 		if (isset($all_data[0]['mmsi'])) {
539
-		    foreach ($all_data as $line) {
539
+			foreach ($all_data as $line) {
540 540
 			if ($line != '') {
541
-			    $data = array();
542
-			    $data['ident'] = $line['shipname'];
543
-			    $data['callsign'] = $line['callsign'];
544
-			    $data['mmsi'] = $line['mmsi'];
545
-			    $data['speed'] = $line['sog'];
546
-			    if ($line['heading'] != '511') $data['heading'] = $line['heading'];
547
-			    $data['latitude'] = $line['latitude'];
548
-			    $data['longitude'] = $line['longitude'];
549
-			    $data['type_id'] = $line['shiptype'];
550
-			    $data['arrival_code'] = $line['destination'];
551
-			    $data['datetime'] = $line['time'];
552
-			    $data['format_source'] = 'boatbeaconapp';
553
-			    $data['id_source'] = $id_source;
554
-			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
555
-			    $MI->add($data);
556
-			    unset($data);
541
+				$data = array();
542
+				$data['ident'] = $line['shipname'];
543
+				$data['callsign'] = $line['callsign'];
544
+				$data['mmsi'] = $line['mmsi'];
545
+				$data['speed'] = $line['sog'];
546
+				if ($line['heading'] != '511') $data['heading'] = $line['heading'];
547
+				$data['latitude'] = $line['latitude'];
548
+				$data['longitude'] = $line['longitude'];
549
+				$data['type_id'] = $line['shiptype'];
550
+				$data['arrival_code'] = $line['destination'];
551
+				$data['datetime'] = $line['time'];
552
+				$data['format_source'] = 'boatbeaconapp';
553
+				$data['id_source'] = $id_source;
554
+				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
555
+				$MI->add($data);
556
+				unset($data);
557
+			}
557 558
 			}
558
-		    }
559 559
 		}
560 560
 		
561
-	    }
562
-    	    $last_exec[$id]['last'] = time();
561
+		}
562
+			$last_exec[$id]['last'] = time();
563 563
 	} elseif ($value['format'] == 'boatnerd' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
564
-	    $buffer = $Common->getData($value['host']);
565
-	    if ($buffer != '') {
564
+		$buffer = $Common->getData($value['host']);
565
+		if ($buffer != '') {
566 566
 		$all_data = json_decode($buffer,true);
567 567
 		if (isset($all_data['features'][0]['id'])) {
568
-		    foreach ($all_data['features'] as $line) {
568
+			foreach ($all_data['features'] as $line) {
569 569
 			$data = array();
570 570
 			if (isset($line['properties']['name'])) $data['ident'] = $line['properties']['name'];
571 571
 			if (isset($line['properties']['callsign'])) $data['callsign'] = $line['properties']['callsign'];
@@ -584,59 +584,59 @@  discard block
 block discarded – undo
584 584
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
585 585
 			if ($line['properties']['vesselType'] != 'Navigation Aid') $MI->add($data);
586 586
 			unset($data);
587
-		    }
587
+			}
588 588
 		}
589 589
 		
590
-	    }
591
-    	    $last_exec[$id]['last'] = time();
590
+		}
591
+			$last_exec[$id]['last'] = time();
592 592
 	} elseif ($value['format'] == 'shipplotter' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
593
-	    echo 'download...';
594
-	    $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
595
-	    echo 'done !'."\n";
596
-	    if ($buffer != '') $reset = 0;
597
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
598
-	    $buffer = explode('\n',$buffer);
599
-	    foreach ($buffer as $line) {
593
+		echo 'download...';
594
+		$buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
595
+		echo 'done !'."\n";
596
+		if ($buffer != '') $reset = 0;
597
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
598
+		$buffer = explode('\n',$buffer);
599
+		foreach ($buffer as $line) {
600 600
 		if ($line != '') {
601
-		    $data = array();
602
-		    $data['mmsi'] = (int)substr($line,0,9);
603
-		    $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
604
-		    //$data['status'] = substr($line,21,2);
605
-		    //$data['type'] = substr($line,24,3);
606
-		    $data['latitude'] = substr($line,29,9);
607
-		    $data['longitude'] = substr($line,41,9);
608
-		    $data['speed'] = round(substr($line,51,5));
609
-		    //$data['course'] = substr($line,57,5);
610
-		    $data['heading'] = round(substr($line,63,3));
611
-		    //$data['draft'] = substr($line,67,4);
612
-		    //$data['length'] = substr($line,72,3);
613
-		    //$data['beam'] = substr($line,76,2);
614
-		    $data['ident'] = trim(utf8_encode(substr($line,79,20)));
615
-		    //$data['callsign'] = trim(substr($line,100,7);
616
-		    //$data['dest'] = substr($line,108,20);
617
-		    //$data['etaDate'] = substr($line,129,5);
618
-		    //$data['etaTime'] = substr($line,135,5);
619
-		    $data['format_source'] = 'shipplotter';
620
-    		    $data['id_source'] = $id_source;
621
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
622
-		    //print_r($data);
623
-		    echo 'Add...'."\n";
624
-		    $MI->add($data);
625
-		    unset($data);
601
+			$data = array();
602
+			$data['mmsi'] = (int)substr($line,0,9);
603
+			$data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
604
+			//$data['status'] = substr($line,21,2);
605
+			//$data['type'] = substr($line,24,3);
606
+			$data['latitude'] = substr($line,29,9);
607
+			$data['longitude'] = substr($line,41,9);
608
+			$data['speed'] = round(substr($line,51,5));
609
+			//$data['course'] = substr($line,57,5);
610
+			$data['heading'] = round(substr($line,63,3));
611
+			//$data['draft'] = substr($line,67,4);
612
+			//$data['length'] = substr($line,72,3);
613
+			//$data['beam'] = substr($line,76,2);
614
+			$data['ident'] = trim(utf8_encode(substr($line,79,20)));
615
+			//$data['callsign'] = trim(substr($line,100,7);
616
+			//$data['dest'] = substr($line,108,20);
617
+			//$data['etaDate'] = substr($line,129,5);
618
+			//$data['etaTime'] = substr($line,135,5);
619
+			$data['format_source'] = 'shipplotter';
620
+				$data['id_source'] = $id_source;
621
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
622
+			//print_r($data);
623
+			echo 'Add...'."\n";
624
+			$MI->add($data);
625
+			unset($data);
626 626
 		}
627
-    	    }
628
-    	    $last_exec[$id]['last'] = time();
627
+			}
628
+			$last_exec[$id]['last'] = time();
629 629
 	//} elseif (($value == 'whazzup' && (time() - $last_exec['whazzup'] > $globalMinFetch)) || ($value == 'vatsimtxt' && (time() - $last_exec['vatsimtxt'] > $globalMinFetch))) {
630 630
 	} elseif (($value['format'] == 'whazzup' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) || ($value['format'] == 'vatsimtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch))) {
631
-	    //$buffer = $Common->getData($hosts[$id]);
632
-	    $buffer = $Common->getData($value['host']);
633
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
634
-	    $buffer = explode('\n',$buffer);
635
-	    $reset = 0;
636
-	    foreach ($buffer as $line) {
637
-    		if ($line != '') {
638
-    		    $line = explode(':', $line);
639
-    		    if (count($line) > 30 && $line[0] != 'callsign') {
631
+		//$buffer = $Common->getData($hosts[$id]);
632
+		$buffer = $Common->getData($value['host']);
633
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
634
+		$buffer = explode('\n',$buffer);
635
+		$reset = 0;
636
+		foreach ($buffer as $line) {
637
+			if ($line != '') {
638
+				$line = explode(':', $line);
639
+				if (count($line) > 30 && $line[0] != 'callsign') {
640 640
 			$data = array();
641 641
 			if (isset($line[37]) && $line[37] != '') $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37];
642 642
 			else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
@@ -649,37 +649,37 @@  discard block
 block discarded – undo
649 649
 			if (isset($line[45])) $data['heading'] = $line[45]; // heading
650 650
 			elseif (isset($line[38])) $data['heading'] = $line[38]; // heading
651 651
 			$data['latitude'] = $line[5]; // lat
652
-	        	$data['longitude'] = $line[6]; // long
653
-	        	$data['verticalrate'] = ''; // vertical rate
654
-	        	$data['squawk'] = ''; // squawk
655
-	        	$data['emergency'] = ''; // emergency
656
-	        	$data['waypoints'] = $line[30];
652
+				$data['longitude'] = $line[6]; // long
653
+				$data['verticalrate'] = ''; // vertical rate
654
+				$data['squawk'] = ''; // squawk
655
+				$data['emergency'] = ''; // emergency
656
+				$data['waypoints'] = $line[30];
657 657
 			$data['datetime'] = date('Y-m-d H:i:s');
658 658
 			//$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37]));
659 659
 			//if (isset($line[37])) $data['last_update'] = $line[37];
660
-		        $data['departure_airport_icao'] = $line[11];
661
-		        $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
662
-		        $data['arrival_airport_icao'] = $line[13];
660
+				$data['departure_airport_icao'] = $line[11];
661
+				$data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
662
+				$data['arrival_airport_icao'] = $line[13];
663 663
 			$data['frequency'] = $line[4];
664 664
 			$data['type'] = $line[18];
665 665
 			$data['range'] = $line[19];
666 666
 			if (isset($line[35])) $data['info'] = $line[35];
667
-    			$data['id_source'] = $id_source;
668
-	    		//$data['arrival_airport_time'] = ;
669
-	    		if ($line[9] != '') {
670
-	    		    $aircraft_data = explode('/',$line[9]);
671
-	    		    if (isset($aircraft_data[1])) {
672
-	    			$data['aircraft_icao'] = $aircraft_data[1];
673
-	    		    }
674
-        		}
675
-	    		/*
667
+				$data['id_source'] = $id_source;
668
+				//$data['arrival_airport_time'] = ;
669
+				if ($line[9] != '') {
670
+					$aircraft_data = explode('/',$line[9]);
671
+					if (isset($aircraft_data[1])) {
672
+					$data['aircraft_icao'] = $aircraft_data[1];
673
+					}
674
+				}
675
+				/*
676 676
 	    		if ($value == 'whazzup') $data['format_source'] = 'whazzup';
677 677
 	    		elseif ($value == 'vatsimtxt') $data['format_source'] = 'vatsimtxt';
678 678
 	    		*/
679
-	    		$data['format_source'] = $value['format'];
679
+				$data['format_source'] = $value['format'];
680 680
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
681 681
 			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
682
-    			if ($line[3] == 'PILOT') $SI->add($data);
682
+				if ($line[3] == 'PILOT') $SI->add($data);
683 683
 			elseif ($line[3] == 'ATC') {
684 684
 				//print_r($data);
685 685
 				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
@@ -700,16 +700,16 @@  discard block
 block discarded – undo
700 700
 					else echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
701 701
 				}
702 702
 			}
703
-    			unset($data);
704
-    		    }
705
-    		}
706
-    	    }
707
-    	    //if ($value == 'whazzup') $last_exec['whazzup'] = time();
708
-    	    //elseif ($value == 'vatsimtxt') $last_exec['vatsimtxt'] = time();
709
-    	    $last_exec[$id]['last'] = time();
710
-    	} elseif ($value['format'] == 'airwhere' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
711
-	    $buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php','get','','','','','20');
712
-	    if ($buffer != '') {
703
+				unset($data);
704
+				}
705
+			}
706
+			}
707
+			//if ($value == 'whazzup') $last_exec['whazzup'] = time();
708
+			//elseif ($value == 'vatsimtxt') $last_exec['vatsimtxt'] = time();
709
+			$last_exec[$id]['last'] = time();
710
+		} elseif ($value['format'] == 'airwhere' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
711
+		$buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php','get','','','','','20');
712
+		if ($buffer != '') {
713 713
 		$all_data = simplexml_load_string($buffer);
714 714
 		foreach($all_data->children() as $childdata) {
715 715
 			$data = array();
@@ -730,10 +730,10 @@  discard block
 block discarded – undo
730 730
 			$SI->add($data);
731 731
 			unset($data);
732 732
 		}
733
-	    }
734
-	    $Source->deleteOldLocationByType('gs');
735
-	    $buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php','get','','','','','20');
736
-	    if ($buffer != '') {
733
+		}
734
+		$Source->deleteOldLocationByType('gs');
735
+		$buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php','get','','','','','20');
736
+		if ($buffer != '') {
737 737
 		$all_data = simplexml_load_string($buffer);
738 738
 		foreach($all_data->children() as $childdata) {
739 739
 			$data = array();
@@ -750,249 +750,249 @@  discard block
 block discarded – undo
750 750
 			}
751 751
 			unset($data);
752 752
 		}
753
-	    }
754
-	    $last_exec[$id]['last'] = time();
753
+		}
754
+		$last_exec[$id]['last'] = time();
755 755
 	} elseif ($value['format'] == 'aircraftlistjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
756
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
757
-	    if ($buffer != '') {
758
-	    $all_data = json_decode($buffer,true);
759
-	    if (isset($all_data['acList'])) {
756
+		$buffer = $Common->getData($value['host'],'get','','','','','20');
757
+		if ($buffer != '') {
758
+		$all_data = json_decode($buffer,true);
759
+		if (isset($all_data['acList'])) {
760 760
 		$reset = 0;
761 761
 		foreach ($all_data['acList'] as $line) {
762
-		    $data = array();
763
-		    $data['hex'] = $line['Icao']; // hex
764
-		    if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
765
-		    if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
766
-		    if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
767
-		    if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
768
-		    if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
769
-		    if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
770
-		    //$data['verticalrate'] = $line['']; // verticale rate
771
-		    if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
772
-		    $data['emergency'] = ''; // emergency
773
-		    if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
762
+			$data = array();
763
+			$data['hex'] = $line['Icao']; // hex
764
+			if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
765
+			if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
766
+			if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
767
+			if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
768
+			if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
769
+			if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
770
+			//$data['verticalrate'] = $line['']; // verticale rate
771
+			if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
772
+			$data['emergency'] = ''; // emergency
773
+			if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
774 774
 		    
775
-		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
776
-		    else $data['datetime'] = date('Y-m-d H:i:s');
775
+			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
776
+			else $data['datetime'] = date('Y-m-d H:i:s');
777 777
 		    
778
-		    //$data['datetime'] = date('Y-m-d H:i:s');
779
-		    if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
780
-	    	    $data['format_source'] = 'aircraftlistjson';
781
-		    $data['id_source'] = $id_source;
782
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
783
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
784
-		    if (isset($data['latitude'])) $SI->add($data);
785
-		    unset($data);
778
+			//$data['datetime'] = date('Y-m-d H:i:s');
779
+			if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
780
+				$data['format_source'] = 'aircraftlistjson';
781
+			$data['id_source'] = $id_source;
782
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
783
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
784
+			if (isset($data['latitude'])) $SI->add($data);
785
+			unset($data);
786 786
 		}
787
-	    } elseif (is_array($all_data)) {
787
+		} elseif (is_array($all_data)) {
788 788
 		$reset = 0;
789 789
 		foreach ($all_data as $line) {
790
-		    $data = array();
791
-		    $data['hex'] = $line['hex']; // hex
792
-		    $data['ident'] = $line['flight']; // ident
793
-		    $data['altitude'] = $line['altitude']; // altitude
794
-		    $data['speed'] = $line['speed']; // speed
795
-		    $data['heading'] = $line['track']; // heading
796
-		    $data['latitude'] = $line['lat']; // lat
797
-		    $data['longitude'] = $line['lon']; // long
798
-		    $data['verticalrate'] = $line['vrt']; // verticale rate
799
-		    $data['squawk'] = $line['squawk']; // squawk
800
-		    $data['emergency'] = ''; // emergency
801
-		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
802
-		    else $data['datetime'] = date('Y-m-d H:i:s');
803
-	    	    $data['format_source'] = 'aircraftlistjson';
804
-    		    $data['id_source'] = $id_source;
805
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
806
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
807
-		    $SI->add($data);
808
-		    unset($data);
790
+			$data = array();
791
+			$data['hex'] = $line['hex']; // hex
792
+			$data['ident'] = $line['flight']; // ident
793
+			$data['altitude'] = $line['altitude']; // altitude
794
+			$data['speed'] = $line['speed']; // speed
795
+			$data['heading'] = $line['track']; // heading
796
+			$data['latitude'] = $line['lat']; // lat
797
+			$data['longitude'] = $line['lon']; // long
798
+			$data['verticalrate'] = $line['vrt']; // verticale rate
799
+			$data['squawk'] = $line['squawk']; // squawk
800
+			$data['emergency'] = ''; // emergency
801
+			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
802
+			else $data['datetime'] = date('Y-m-d H:i:s');
803
+				$data['format_source'] = 'aircraftlistjson';
804
+				$data['id_source'] = $id_source;
805
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
806
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
807
+			$SI->add($data);
808
+			unset($data);
809
+		}
810
+		}
809 811
 		}
810
-	    }
811
-	    }
812
-    	    //$last_exec['aircraftlistjson'] = time();
813
-    	    $last_exec[$id]['last'] = time();
814
-    	//} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
815
-    	} elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
816
-	    $buffer = $Common->getData($value['host']);
817
-	    $all_data = json_decode($buffer,true);
818
-	    if (isset($all_data['planes'])) {
812
+			//$last_exec['aircraftlistjson'] = time();
813
+			$last_exec[$id]['last'] = time();
814
+		//} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
815
+		} elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
816
+		$buffer = $Common->getData($value['host']);
817
+		$all_data = json_decode($buffer,true);
818
+		if (isset($all_data['planes'])) {
819 819
 		$reset = 0;
820 820
 		foreach ($all_data['planes'] as $key => $line) {
821
-		    $data = array();
822
-		    $data['hex'] = $key; // hex
823
-		    $data['ident'] = $line[3]; // ident
824
-		    $data['altitude'] = $line[6]; // altitude
825
-		    $data['speed'] = $line[8]; // speed
826
-		    $data['heading'] = $line[7]; // heading
827
-		    $data['latitude'] = $line[4]; // lat
828
-		    $data['longitude'] = $line[5]; // long
829
-		    //$data['verticalrate'] = $line[]; // verticale rate
830
-		    $data['squawk'] = $line[10]; // squawk
831
-		    $data['emergency'] = ''; // emergency
832
-		    $data['registration'] = $line[2];
833
-		    $data['aircraft_icao'] = $line[0];
834
-		    $deparr = explode('-',$line[1]);
835
-		    if (count($deparr) == 2) {
821
+			$data = array();
822
+			$data['hex'] = $key; // hex
823
+			$data['ident'] = $line[3]; // ident
824
+			$data['altitude'] = $line[6]; // altitude
825
+			$data['speed'] = $line[8]; // speed
826
+			$data['heading'] = $line[7]; // heading
827
+			$data['latitude'] = $line[4]; // lat
828
+			$data['longitude'] = $line[5]; // long
829
+			//$data['verticalrate'] = $line[]; // verticale rate
830
+			$data['squawk'] = $line[10]; // squawk
831
+			$data['emergency'] = ''; // emergency
832
+			$data['registration'] = $line[2];
833
+			$data['aircraft_icao'] = $line[0];
834
+			$deparr = explode('-',$line[1]);
835
+			if (count($deparr) == 2) {
836 836
 			$data['departure_airport_icao'] = $deparr[0];
837 837
 			$data['arrival_airport_icao'] = $deparr[1];
838
-		    }
839
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]);
840
-	    	    $data['format_source'] = 'planeupdatefaa';
841
-    		    $data['id_source'] = $id_source;
842
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
843
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
844
-		    $SI->add($data);
845
-		    unset($data);
838
+			}
839
+			$data['datetime'] = date('Y-m-d H:i:s',$line[9]);
840
+				$data['format_source'] = 'planeupdatefaa';
841
+				$data['id_source'] = $id_source;
842
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
843
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
844
+			$SI->add($data);
845
+			unset($data);
846
+		}
846 847
 		}
847
-	    }
848
-    	    //$last_exec['planeupdatefaa'] = time();
849
-    	    $last_exec[$id]['last'] = time();
850
-    	} elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
851
-	    $buffer = $Common->getData($value['host']);
852
-	    $all_data = json_decode($buffer,true);
853
-	    if (isset($all_data['states'])) {
848
+			//$last_exec['planeupdatefaa'] = time();
849
+			$last_exec[$id]['last'] = time();
850
+		} elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
851
+		$buffer = $Common->getData($value['host']);
852
+		$all_data = json_decode($buffer,true);
853
+		if (isset($all_data['states'])) {
854 854
 		$reset = 0;
855 855
 		foreach ($all_data['states'] as $key => $line) {
856
-		    $data = array();
857
-		    $data['hex'] = $line[0]; // hex
858
-		    $data['ident'] = trim($line[1]); // ident
859
-		    $data['altitude'] = round($line[7]*3.28084); // altitude
860
-		    $data['speed'] = round($line[9]*1.94384); // speed
861
-		    $data['heading'] = round($line[10]); // heading
862
-		    $data['latitude'] = $line[6]; // lat
863
-		    $data['longitude'] = $line[5]; // long
864
-		    $data['verticalrate'] = $line[11]; // verticale rate
865
-		    //$data['squawk'] = $line[10]; // squawk
866
-		    //$data['emergency'] = ''; // emergency
867
-		    //$data['registration'] = $line[2];
868
-		    //$data['aircraft_icao'] = $line[0];
869
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]);
870
-	    	    $data['format_source'] = 'opensky';
871
-    		    $data['id_source'] = $id_source;
872
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
873
-		    $SI->add($data);
874
-		    unset($data);
856
+			$data = array();
857
+			$data['hex'] = $line[0]; // hex
858
+			$data['ident'] = trim($line[1]); // ident
859
+			$data['altitude'] = round($line[7]*3.28084); // altitude
860
+			$data['speed'] = round($line[9]*1.94384); // speed
861
+			$data['heading'] = round($line[10]); // heading
862
+			$data['latitude'] = $line[6]; // lat
863
+			$data['longitude'] = $line[5]; // long
864
+			$data['verticalrate'] = $line[11]; // verticale rate
865
+			//$data['squawk'] = $line[10]; // squawk
866
+			//$data['emergency'] = ''; // emergency
867
+			//$data['registration'] = $line[2];
868
+			//$data['aircraft_icao'] = $line[0];
869
+			$data['datetime'] = date('Y-m-d H:i:s',$line[3]);
870
+				$data['format_source'] = 'opensky';
871
+				$data['id_source'] = $id_source;
872
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
873
+			$SI->add($data);
874
+			unset($data);
875 875
 		}
876
-	    }
877
-    	    //$last_exec['planeupdatefaa'] = time();
878
-    	    $last_exec[$id]['last'] = time();
879
-    	//} elseif ($value == 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) {
880
-    	} elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
881
-	    //$buffer = $Common->getData($hosts[$id]);
882
-	    $buffer = $Common->getData($value['host']);
883
-	    $all_data = json_decode($buffer,true);
884
-	    if (!empty($all_data)) $reset = 0;
885
-	    foreach ($all_data as $key => $line) {
876
+		}
877
+			//$last_exec['planeupdatefaa'] = time();
878
+			$last_exec[$id]['last'] = time();
879
+		//} elseif ($value == 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) {
880
+		} elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
881
+		//$buffer = $Common->getData($hosts[$id]);
882
+		$buffer = $Common->getData($value['host']);
883
+		$all_data = json_decode($buffer,true);
884
+		if (!empty($all_data)) $reset = 0;
885
+		foreach ($all_data as $key => $line) {
886 886
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
887
-		    $data = array();
888
-		    $data['hex'] = $line[0];
889
-		    $data['ident'] = $line[16]; //$line[13]
890
-	    	    $data['altitude'] = $line[4]; // altitude
891
-	    	    $data['speed'] = $line[5]; // speed
892
-	    	    $data['heading'] = $line[3]; // heading
893
-	    	    $data['latitude'] = $line[1]; // lat
894
-	    	    $data['longitude'] = $line[2]; // long
895
-	    	    $data['verticalrate'] = $line[15]; // verticale rate
896
-	    	    $data['squawk'] = $line[6]; // squawk
897
-	    	    $data['aircraft_icao'] = $line[8];
898
-	    	    $data['registration'] = $line[9];
899
-		    $data['departure_airport_iata'] = $line[11];
900
-		    $data['arrival_airport_iata'] = $line[12];
901
-	    	    $data['emergency'] = ''; // emergency
902
-		    $data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
903
-	    	    $data['format_source'] = 'fr24json';
904
-    		    $data['id_source'] = $id_source;
905
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
906
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
907
-		    $SI->add($data);
908
-		    unset($data);
887
+			$data = array();
888
+			$data['hex'] = $line[0];
889
+			$data['ident'] = $line[16]; //$line[13]
890
+				$data['altitude'] = $line[4]; // altitude
891
+				$data['speed'] = $line[5]; // speed
892
+				$data['heading'] = $line[3]; // heading
893
+				$data['latitude'] = $line[1]; // lat
894
+				$data['longitude'] = $line[2]; // long
895
+				$data['verticalrate'] = $line[15]; // verticale rate
896
+				$data['squawk'] = $line[6]; // squawk
897
+				$data['aircraft_icao'] = $line[8];
898
+				$data['registration'] = $line[9];
899
+			$data['departure_airport_iata'] = $line[11];
900
+			$data['arrival_airport_iata'] = $line[12];
901
+				$data['emergency'] = ''; // emergency
902
+			$data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
903
+				$data['format_source'] = 'fr24json';
904
+				$data['id_source'] = $id_source;
905
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
906
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
907
+			$SI->add($data);
908
+			unset($data);
909
+		}
909 910
 		}
910
-	    }
911
-    	    //$last_exec['fr24json'] = time();
912
-    	    $last_exec[$id]['last'] = time();
913
-    	//} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) {
914
-    	} elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
915
-	    //$buffer = $Common->getData($hosts[$id],'get','','','','','150');
916
-	    $buffer = $Common->getData($value['host'],'get','','','','','150');
917
-	    //echo $buffer;
918
-	    $buffer = str_replace(array("\n","\r"),"",$buffer);
919
-	    $buffer = preg_replace('/,"num":(.+)/','}',$buffer);
920
-	    $all_data = json_decode($buffer,true);
921
-	    if (json_last_error() != JSON_ERROR_NONE) {
911
+			//$last_exec['fr24json'] = time();
912
+			$last_exec[$id]['last'] = time();
913
+		//} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) {
914
+		} elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
915
+		//$buffer = $Common->getData($hosts[$id],'get','','','','','150');
916
+		$buffer = $Common->getData($value['host'],'get','','','','','150');
917
+		//echo $buffer;
918
+		$buffer = str_replace(array("\n","\r"),"",$buffer);
919
+		$buffer = preg_replace('/,"num":(.+)/','}',$buffer);
920
+		$all_data = json_decode($buffer,true);
921
+		if (json_last_error() != JSON_ERROR_NONE) {
922 922
 		die(json_last_error_msg());
923
-	    }
924
-	    if (isset($all_data['mrkrs'])) {
923
+		}
924
+		if (isset($all_data['mrkrs'])) {
925 925
 		$reset = 0;
926 926
 		foreach ($all_data['mrkrs'] as $key => $line) {
927
-		    if (isset($line['inf'])) {
927
+			if (isset($line['inf'])) {
928 928
 			$data = array();
929 929
 			$data['hex'] = $line['inf']['ia'];
930 930
 			if (isset($line['inf']['cs'])) $data['ident'] = $line['inf']['cs']; //$line[13]
931
-	    		$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
932
-	    		if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
933
-	    		if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
934
-	    		$data['latitude'] = $line['pt'][0]; // lat
935
-	    		$data['longitude'] = $line['pt'][1]; // long
936
-	    		//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
937
-	    		if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
938
-	    		//$data['aircraft_icao'] = $line[8];
939
-	    		if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
931
+				$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
932
+				if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
933
+				if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
934
+				$data['latitude'] = $line['pt'][0]; // lat
935
+				$data['longitude'] = $line['pt'][1]; // long
936
+				//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
937
+				if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
938
+				//$data['aircraft_icao'] = $line[8];
939
+				if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
940 940
 			//$data['departure_airport_iata'] = $line[11];
941 941
 			//$data['arrival_airport_iata'] = $line[12];
942
-	    		//$data['emergency'] = ''; // emergency
942
+				//$data['emergency'] = ''; // emergency
943 943
 			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10]
944
-	    		$data['format_source'] = 'radarvirtueljson';
945
-    			$data['id_source'] = $id_source;
944
+				$data['format_source'] = 'radarvirtueljson';
945
+				$data['id_source'] = $id_source;
946 946
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
947 947
 			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
948 948
 			$SI->add($data);
949 949
 			unset($data);
950
-		    }
950
+			}
951 951
 		}
952
-	    }
953
-    	    //$last_exec['radarvirtueljson'] = time();
954
-    	    $last_exec[$id]['last'] = time();
955
-    	//} elseif ($value == 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) {
956
-    	} elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
957
-	    //$buffer = $Common->getData($hosts[$id]);
958
-	    $buffer = $Common->getData($value['host'].'?'.time());
959
-	    $all_data = json_decode(utf8_encode($buffer),true);
952
+		}
953
+			//$last_exec['radarvirtueljson'] = time();
954
+			$last_exec[$id]['last'] = time();
955
+		//} elseif ($value == 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) {
956
+		} elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
957
+		//$buffer = $Common->getData($hosts[$id]);
958
+		$buffer = $Common->getData($value['host'].'?'.time());
959
+		$all_data = json_decode(utf8_encode($buffer),true);
960 960
 	    
961
-	    if (isset($all_data['pireps'])) {
961
+		if (isset($all_data['pireps'])) {
962 962
 		$reset = 0;
963
-	        foreach ($all_data['pireps'] as $line) {
964
-		    $data = array();
965
-		    $data['id'] = $line['id'];
966
-		    $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
967
-		    $data['ident'] = $line['callsign']; // ident
968
-		    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
969
-		    if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
970
-		    if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
971
-		    if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
972
-		    if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
973
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
974
-		    $data['latitude'] = $line['lat']; // lat
975
-		    $data['longitude'] = $line['lon']; // long
976
-		    //$data['verticalrate'] = $line['vrt']; // verticale rate
977
-		    //$data['squawk'] = $line['squawk']; // squawk
978
-		    //$data['emergency'] = ''; // emergency
979
-		    if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
980
-		    if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
981
-		    if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
982
-		    //$data['arrival_airport_time'] = $line['arrtime'];
983
-		    if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
984
-		    if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
985
-		    if (isset($line['atis'])) $data['info'] = $line['atis'];
986
-		    else $data['info'] = '';
987
-		    $data['format_source'] = 'pireps';
988
-    		    $data['id_source'] = $id_source;
989
-		    $data['datetime'] = date('Y-m-d H:i:s');
990
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
991
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
992
-		    if ($line['icon'] == 'plane') {
963
+			foreach ($all_data['pireps'] as $line) {
964
+			$data = array();
965
+			$data['id'] = $line['id'];
966
+			$data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
967
+			$data['ident'] = $line['callsign']; // ident
968
+			if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
969
+			if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
970
+			if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
971
+			if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
972
+			if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
973
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
974
+			$data['latitude'] = $line['lat']; // lat
975
+			$data['longitude'] = $line['lon']; // long
976
+			//$data['verticalrate'] = $line['vrt']; // verticale rate
977
+			//$data['squawk'] = $line['squawk']; // squawk
978
+			//$data['emergency'] = ''; // emergency
979
+			if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
980
+			if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
981
+			if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
982
+			//$data['arrival_airport_time'] = $line['arrtime'];
983
+			if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
984
+			if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
985
+			if (isset($line['atis'])) $data['info'] = $line['atis'];
986
+			else $data['info'] = '';
987
+			$data['format_source'] = 'pireps';
988
+				$data['id_source'] = $id_source;
989
+			$data['datetime'] = date('Y-m-d H:i:s');
990
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
991
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
992
+			if ($line['icon'] == 'plane') {
993 993
 			$SI->add($data);
994
-		    //    print_r($data);
995
-    		    } elseif ($line['icon'] == 'ct') {
994
+			//    print_r($data);
995
+				} elseif ($line['icon'] == 'ct') {
996 996
 			$data['info'] = str_replace('^&sect;','<br />',$data['info']);
997 997
 			$data['info'] = str_replace('&amp;sect;','',$data['info']);
998 998
 			$typec = substr($data['ident'],-3);
@@ -1007,199 +1007,199 @@  discard block
 block discarded – undo
1007 1007
 			elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
1008 1008
 			else $data['type'] = 'Observer';
1009 1009
 			if (isset($ATC)) echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']);
1010
-		    }
1011
-		    unset($data);
1010
+			}
1011
+			unset($data);
1012 1012
 		}
1013
-	    }
1014
-    	    //$last_exec['pirepsjson'] = time();
1015
-    	    $last_exec[$id]['last'] = time();
1016
-    	//} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) {
1017
-    	} elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
1018
-	    //$buffer = $Common->getData($hosts[$id]);
1019
-	    if ($globalDebug) echo 'Get Data...'."\n";
1020
-	    $buffer = $Common->getData($value['host']);
1021
-	    $all_data = json_decode($buffer,true);
1022
-	    if ($buffer != '' && is_array($all_data)) {
1013
+		}
1014
+			//$last_exec['pirepsjson'] = time();
1015
+			$last_exec[$id]['last'] = time();
1016
+		//} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) {
1017
+		} elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
1018
+		//$buffer = $Common->getData($hosts[$id]);
1019
+		if ($globalDebug) echo 'Get Data...'."\n";
1020
+		$buffer = $Common->getData($value['host']);
1021
+		$all_data = json_decode($buffer,true);
1022
+		if ($buffer != '' && is_array($all_data)) {
1023 1023
 		$reset = 0;
1024 1024
 		foreach ($all_data as $line) {
1025
-	    	    $data = array();
1026
-	    	    //$data['id'] = $line['id']; // id not usable
1027
-	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
1028
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
1029
-	    	    if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
1030
-	    	    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
1031
-	    	    $data['ident'] = $line['flightnum']; // ident
1032
-	    	    $data['altitude'] = $line['alt']; // altitude
1033
-	    	    $data['speed'] = $line['gs']; // speed
1034
-	    	    $data['heading'] = $line['heading']; // heading
1035
-	    	    $data['latitude'] = $line['lat']; // lat
1036
-	    	    $data['longitude'] = $line['lng']; // long
1037
-	    	    $data['verticalrate'] = ''; // verticale rate
1038
-	    	    $data['squawk'] = ''; // squawk
1039
-	    	    $data['emergency'] = ''; // emergency
1040
-	    	    //$data['datetime'] = $line['lastupdate'];
1041
-	    	    $data['last_update'] = $line['lastupdate'];
1042
-		    $data['datetime'] = date('Y-m-d H:i:s');
1043
-	    	    $data['departure_airport_icao'] = $line['depicao'];
1044
-	    	    $data['departure_airport_time'] = $line['deptime'];
1045
-	    	    $data['arrival_airport_icao'] = $line['arricao'];
1046
-    		    $data['arrival_airport_time'] = $line['arrtime'];
1047
-    		    $data['registration'] = $line['aircraft'];
1048
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1049
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1050
-		    if (isset($line['aircraftname'])) {
1025
+				$data = array();
1026
+				//$data['id'] = $line['id']; // id not usable
1027
+				if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
1028
+				$data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
1029
+				if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
1030
+				if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
1031
+				$data['ident'] = $line['flightnum']; // ident
1032
+				$data['altitude'] = $line['alt']; // altitude
1033
+				$data['speed'] = $line['gs']; // speed
1034
+				$data['heading'] = $line['heading']; // heading
1035
+				$data['latitude'] = $line['lat']; // lat
1036
+				$data['longitude'] = $line['lng']; // long
1037
+				$data['verticalrate'] = ''; // verticale rate
1038
+				$data['squawk'] = ''; // squawk
1039
+				$data['emergency'] = ''; // emergency
1040
+				//$data['datetime'] = $line['lastupdate'];
1041
+				$data['last_update'] = $line['lastupdate'];
1042
+			$data['datetime'] = date('Y-m-d H:i:s');
1043
+				$data['departure_airport_icao'] = $line['depicao'];
1044
+				$data['departure_airport_time'] = $line['deptime'];
1045
+				$data['arrival_airport_icao'] = $line['arricao'];
1046
+				$data['arrival_airport_time'] = $line['arrtime'];
1047
+				$data['registration'] = $line['aircraft'];
1048
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1049
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1050
+			if (isset($line['aircraftname'])) {
1051 1051
 			$line['aircraftname'] = strtoupper($line['aircraftname']);
1052 1052
 			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']);
1053
-	    		$aircraft_data = explode('-',$line['aircraftname']);
1054
-	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
1055
-	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
1056
-	    		else {
1057
-	    		    $aircraft_data = explode(' ',$line['aircraftname']);
1058
-	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
1059
-	    		    else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
1060
-	    		}
1061
-	    	    }
1062
-    		    if (isset($line['route'])) $data['waypoints'] = $line['route'];
1063
-    		    $data['id_source'] = $id_source;
1064
-	    	    $data['format_source'] = 'phpvmacars';
1065
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1066
-		    $SI->add($data);
1067
-		    unset($data);
1053
+				$aircraft_data = explode('-',$line['aircraftname']);
1054
+				if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
1055
+				elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
1056
+				else {
1057
+					$aircraft_data = explode(' ',$line['aircraftname']);
1058
+					if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
1059
+					else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
1060
+				}
1061
+				}
1062
+				if (isset($line['route'])) $data['waypoints'] = $line['route'];
1063
+				$data['id_source'] = $id_source;
1064
+				$data['format_source'] = 'phpvmacars';
1065
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1066
+			$SI->add($data);
1067
+			unset($data);
1068 1068
 		}
1069 1069
 		if ($globalDebug) echo 'No more data...'."\n";
1070 1070
 		unset($buffer);
1071 1071
 		unset($all_data);
1072
-	    }
1073
-    	    //$last_exec['phpvmacars'] = time();
1074
-    	    $last_exec[$id]['last'] = time();
1075
-    	} elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
1076
-	    //$buffer = $Common->getData($hosts[$id]);
1077
-	    if ($globalDebug) echo 'Get Data...'."\n";
1078
-	    $buffer = $Common->getData($value['host']);
1079
-	    $all_data = json_decode($buffer,true);
1080
-	    if ($buffer != '' && is_array($all_data)) {
1072
+		}
1073
+			//$last_exec['phpvmacars'] = time();
1074
+			$last_exec[$id]['last'] = time();
1075
+		} elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
1076
+		//$buffer = $Common->getData($hosts[$id]);
1077
+		if ($globalDebug) echo 'Get Data...'."\n";
1078
+		$buffer = $Common->getData($value['host']);
1079
+		$all_data = json_decode($buffer,true);
1080
+		if ($buffer != '' && is_array($all_data)) {
1081 1081
 		$reset = 0;
1082 1082
 		foreach ($all_data as $line) {
1083
-	    	    $data = array();
1084
-	    	    //$data['id'] = $line['id']; // id not usable
1085
-	    	    $data['id'] = trim($line['flight_id']);
1086
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
1087
-	    	    $data['pilot_name'] = $line['pilot_name'];
1088
-	    	    $data['pilot_id'] = $line['pilot_id'];
1089
-	    	    $data['ident'] = trim($line['callsign']); // ident
1090
-	    	    $data['altitude'] = $line['altitude']; // altitude
1091
-	    	    $data['speed'] = $line['gs']; // speed
1092
-	    	    $data['heading'] = $line['heading']; // heading
1093
-	    	    $data['latitude'] = $line['latitude']; // lat
1094
-	    	    $data['longitude'] = $line['longitude']; // long
1095
-	    	    $data['verticalrate'] = ''; // verticale rate
1096
-	    	    $data['squawk'] = ''; // squawk
1097
-	    	    $data['emergency'] = ''; // emergency
1098
-	    	    //$data['datetime'] = $line['lastupdate'];
1099
-	    	    $data['last_update'] = $line['last_update'];
1100
-		    $data['datetime'] = date('Y-m-d H:i:s');
1101
-	    	    $data['departure_airport_icao'] = $line['departure'];
1102
-	    	    //$data['departure_airport_time'] = $line['departure_time'];
1103
-	    	    $data['arrival_airport_icao'] = $line['arrival'];
1104
-    		    //$data['arrival_airport_time'] = $line['arrival_time'];
1105
-    		    //$data['registration'] = $line['aircraft'];
1106
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1107
-	    	    $data['aircraft_icao'] = $line['plane_type'];
1108
-    		    $data['id_source'] = $id_source;
1109
-	    	    $data['format_source'] = 'vam';
1110
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1111
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1112
-		    $SI->add($data);
1113
-		    unset($data);
1083
+				$data = array();
1084
+				//$data['id'] = $line['id']; // id not usable
1085
+				$data['id'] = trim($line['flight_id']);
1086
+				$data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
1087
+				$data['pilot_name'] = $line['pilot_name'];
1088
+				$data['pilot_id'] = $line['pilot_id'];
1089
+				$data['ident'] = trim($line['callsign']); // ident
1090
+				$data['altitude'] = $line['altitude']; // altitude
1091
+				$data['speed'] = $line['gs']; // speed
1092
+				$data['heading'] = $line['heading']; // heading
1093
+				$data['latitude'] = $line['latitude']; // lat
1094
+				$data['longitude'] = $line['longitude']; // long
1095
+				$data['verticalrate'] = ''; // verticale rate
1096
+				$data['squawk'] = ''; // squawk
1097
+				$data['emergency'] = ''; // emergency
1098
+				//$data['datetime'] = $line['lastupdate'];
1099
+				$data['last_update'] = $line['last_update'];
1100
+			$data['datetime'] = date('Y-m-d H:i:s');
1101
+				$data['departure_airport_icao'] = $line['departure'];
1102
+				//$data['departure_airport_time'] = $line['departure_time'];
1103
+				$data['arrival_airport_icao'] = $line['arrival'];
1104
+				//$data['arrival_airport_time'] = $line['arrival_time'];
1105
+				//$data['registration'] = $line['aircraft'];
1106
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1107
+				$data['aircraft_icao'] = $line['plane_type'];
1108
+				$data['id_source'] = $id_source;
1109
+				$data['format_source'] = 'vam';
1110
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1111
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1112
+			$SI->add($data);
1113
+			unset($data);
1114 1114
 		}
1115 1115
 		if ($globalDebug) echo 'No more data...'."\n";
1116 1116
 		unset($buffer);
1117 1117
 		unset($all_data);
1118
-	    }
1119
-    	    //$last_exec['phpvmacars'] = time();
1120
-    	    $last_exec[$id]['last'] = time();
1118
+		}
1119
+			//$last_exec['phpvmacars'] = time();
1120
+			$last_exec[$id]['last'] = time();
1121 1121
 	//} elseif ($value == 'sbs' || $value == 'tsv' || $value == 'raw' || $value == 'aprs' || $value == 'beast') {
1122 1122
 	} elseif ($value['format'] == 'sbs' || $value['format'] == 'tsv' || $value['format'] == 'raw' || $value['format'] == 'aprs' || $value['format'] == 'famaprs' || $value['format'] == 'beast' || $value['format'] == 'flightgearmp' || $value['format'] == 'flightgearsp' || $value['format'] == 'acars' || $value['format'] == 'acarssbs3' || $value['format'] == 'ais' || $value['format'] == 'vrstcp') {
1123
-	    if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
1124
-    	    //$last_exec[$id]['last'] = time();
1123
+		if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
1124
+			//$last_exec[$id]['last'] = time();
1125 1125
 
1126
-	    //$read = array( $sockets[$id] );
1127
-	    $read = $sockets;
1128
-	    $write = NULL;
1129
-	    $e = NULL;
1130
-	    $n = socket_select($read, $write, $e, $timeout);
1131
-	    if ($e != NULL) var_dump($e);
1132
-	    if ($n > 0) {
1126
+		//$read = array( $sockets[$id] );
1127
+		$read = $sockets;
1128
+		$write = NULL;
1129
+		$e = NULL;
1130
+		$n = socket_select($read, $write, $e, $timeout);
1131
+		if ($e != NULL) var_dump($e);
1132
+		if ($n > 0) {
1133 1133
 		$reset = 0;
1134 1134
 		foreach ($read as $nb => $r) {
1135
-		    //$value = $formats[$nb];
1136
-		    $format = $globalSources[$nb]['format'];
1137
-		    if ($format == 'sbs' || $format == 'aprs' || $format == 'famaprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') {
1135
+			//$value = $formats[$nb];
1136
+			$format = $globalSources[$nb]['format'];
1137
+			if ($format == 'sbs' || $format == 'aprs' || $format == 'famaprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') {
1138 1138
 			$buffer = @socket_read($r, 6000,PHP_NORMAL_READ);
1139
-		    } elseif ($format == 'vrstcp') {
1139
+			} elseif ($format == 'vrstcp') {
1140 1140
 			$buffer = @socket_read($r, 6000);
1141
-		    } else {
1141
+			} else {
1142 1142
 			$az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port);
1143
-		    }
1144
-		    //$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
1145
-		    //echo $buffer."\n";
1146
-		    // lets play nice and handle signals such as ctrl-c/kill properly
1147
-		    //if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
1148
-		    $error = false;
1149
-		    //$SI::del();
1150
-		    if ($format == 'vrstcp') {
1143
+			}
1144
+			//$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
1145
+			//echo $buffer."\n";
1146
+			// lets play nice and handle signals such as ctrl-c/kill properly
1147
+			//if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
1148
+			$error = false;
1149
+			//$SI::del();
1150
+			if ($format == 'vrstcp') {
1151 1151
 			$buffer = explode('},{',$buffer);
1152
-		    } else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
1153
-		    // SBS format is CSV format
1154
-		    if ($buffer !== FALSE && $buffer != '') {
1152
+			} else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
1153
+			// SBS format is CSV format
1154
+			if ($buffer !== FALSE && $buffer != '') {
1155 1155
 			$tt[$format] = 0;
1156 1156
 			if ($format == 'acarssbs3') {
1157
-			    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1158
-			    $ACARS->add(trim($buffer));
1159
-			    $ACARS->deleteLiveAcarsData();
1157
+				if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1158
+				$ACARS->add(trim($buffer));
1159
+				$ACARS->deleteLiveAcarsData();
1160 1160
 			} elseif ($format == 'raw') {
1161
-			    // AVR format
1162
-			    $data = $SBS->parse($buffer);
1163
-			    if (is_array($data)) {
1161
+				// AVR format
1162
+				$data = $SBS->parse($buffer);
1163
+				if (is_array($data)) {
1164 1164
 				$data['datetime'] = date('Y-m-d H:i:s');
1165 1165
 				$data['format_source'] = 'raw';
1166 1166
 				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1167 1167
 				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1168 1168
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1169 1169
 				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1170
-			    }
1170
+				}
1171 1171
 			} elseif ($format == 'ais') {
1172
-			    $ais_data = $AIS->parse_line(trim($buffer));
1173
-			    $data = array();
1174
-			    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
1175
-			    if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
1176
-			    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
1177
-			    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
1178
-			    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
1179
-			    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
1180
-			    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
1181
-			    if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
1182
-			    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
1183
-			    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
1184
-			    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
1185
-			    if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
1186
-			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
1187
-			    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1188
-			    if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1189
-			    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1172
+				$ais_data = $AIS->parse_line(trim($buffer));
1173
+				$data = array();
1174
+				if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
1175
+				if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi'];
1176
+				if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
1177
+				if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
1178
+				if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
1179
+				if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
1180
+				if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
1181
+				if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
1182
+				if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
1183
+				if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
1184
+				if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
1185
+				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
1186
+				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
1187
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1188
+				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1189
+				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1190 1190
 
1191
-			    if (isset($ais_data['timestamp'])) {
1191
+				if (isset($ais_data['timestamp'])) {
1192 1192
 				$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
1193
-			    } else {
1193
+				} else {
1194 1194
 				$data['datetime'] = date('Y-m-d H:i:s');
1195
-			    }
1196
-			    $data['format_source'] = 'aisnmea';
1197
-    			    $data['id_source'] = $id_source;
1198
-			    if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
1199
-			    unset($data);
1200
-                        } elseif ($format == 'flightgearsp') {
1201
-                    	    //echo $buffer."\n";
1202
-                    	    if (strlen($buffer) > 5) {
1195
+				}
1196
+				$data['format_source'] = 'aisnmea';
1197
+					$data['id_source'] = $id_source;
1198
+				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data);
1199
+				unset($data);
1200
+						} elseif ($format == 'flightgearsp') {
1201
+							//echo $buffer."\n";
1202
+							if (strlen($buffer) > 5) {
1203 1203
 				$line = explode(',',$buffer);
1204 1204
 				$data = array();
1205 1205
 				//XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p
@@ -1216,38 +1216,38 @@  discard block
 block discarded – undo
1216 1216
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1217 1217
 				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1218 1218
 				//$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
1219
-			    }
1220
-                        } elseif ($format == 'acars') {
1221
-                    	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1222
-			    $ACARS->add(trim($buffer));
1223
-			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
1224
-			    $ACARS->deleteLiveAcarsData();
1219
+				}
1220
+						} elseif ($format == 'acars') {
1221
+							if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1222
+				$ACARS->add(trim($buffer));
1223
+				socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
1224
+				$ACARS->deleteLiveAcarsData();
1225 1225
 			} elseif ($format == 'flightgearmp') {
1226
-			    if (substr($buffer,0,1) != '#') {
1226
+				if (substr($buffer,0,1) != '#') {
1227 1227
 				$data = array();
1228 1228
 				//echo $buffer."\n";
1229 1229
 				$line = explode(' ',$buffer);
1230 1230
 				if (count($line) == 11) {
1231
-				    $userserver = explode('@',$line[0]);
1232
-				    $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
1233
-				    $data['ident'] = $userserver[0];
1234
-				    $data['registration'] = $userserver[0];
1235
-				    $data['latitude'] = $line[4];
1236
-				    $data['longitude'] = $line[5];
1237
-				    $data['altitude'] = $line[6];
1238
-				    $data['datetime'] = date('Y-m-d H:i:s');
1239
-				    $aircraft_type = $line[10];
1240
-				    $aircraft_type = preg_split(':/:',$aircraft_type);
1241
-				    $data['aircraft_name'] = substr(end($aircraft_type),0,-4);
1242
-				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1243
-				    if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1231
+					$userserver = explode('@',$line[0]);
1232
+					$data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
1233
+					$data['ident'] = $userserver[0];
1234
+					$data['registration'] = $userserver[0];
1235
+					$data['latitude'] = $line[4];
1236
+					$data['longitude'] = $line[5];
1237
+					$data['altitude'] = $line[6];
1238
+					$data['datetime'] = date('Y-m-d H:i:s');
1239
+					$aircraft_type = $line[10];
1240
+					$aircraft_type = preg_split(':/:',$aircraft_type);
1241
+					$data['aircraft_name'] = substr(end($aircraft_type),0,-4);
1242
+					if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1243
+					if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1244
+				}
1244 1245
 				}
1245
-			    }
1246 1246
 			} elseif ($format == 'beast') {
1247
-			    echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
1248
-			    die;
1247
+				echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
1248
+				die;
1249 1249
 			} elseif ($format == 'vrstcp') {
1250
-			    foreach($buffer as $all_data) {
1250
+				foreach($buffer as $all_data) {
1251 1251
 				$line = json_decode('{'.$all_data.'}',true);
1252 1252
 				$data = array();
1253 1253
 				if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex
@@ -1267,125 +1267,125 @@  discard block
 block discarded – undo
1267 1267
 				*/
1268 1268
 				$data['datetime'] = date('Y-m-d H:i:s');
1269 1269
 				if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
1270
-		    		$data['format_source'] = 'vrstcp';
1270
+					$data['format_source'] = 'vrstcp';
1271 1271
 				$data['id_source'] = $id_source;
1272 1272
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1273 1273
 				if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1274 1274
 				if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data);
1275 1275
 				unset($data);
1276
-			    }
1276
+				}
1277 1277
 			} elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') {
1278
-			    $line = explode("\t", $buffer);
1279
-			    for($k = 0; $k < count($line); $k=$k+2) {
1278
+				$line = explode("\t", $buffer);
1279
+				for($k = 0; $k < count($line); $k=$k+2) {
1280 1280
 				$key = $line[$k];
1281
-			        $lined[$key] = $line[$k+1];
1282
-			    }
1283
-    			    if (count($lined) > 3) {
1284
-    				$data['hex'] = $lined['hexid'];
1285
-    				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
1286
-    				$data['datetime'] = date('Y-m-d H:i:s');;
1287
-    				if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
1288
-    				if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
1289
-    				if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
1290
-    				if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
1291
-    				if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
1292
-    				if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
1293
-    				if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
1294
-    				$data['id_source'] = $id_source;
1295
-    				$data['format_source'] = 'tsv';
1296
-    				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1297
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1281
+					$lined[$key] = $line[$k+1];
1282
+				}
1283
+					if (count($lined) > 3) {
1284
+					$data['hex'] = $lined['hexid'];
1285
+					//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
1286
+					$data['datetime'] = date('Y-m-d H:i:s');;
1287
+					if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
1288
+					if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
1289
+					if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
1290
+					if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
1291
+					if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
1292
+					if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
1293
+					if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
1294
+					$data['id_source'] = $id_source;
1295
+					$data['format_source'] = 'tsv';
1296
+					if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1297
+					if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1298 1298
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1299
-    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1300
-    				unset($lined);
1301
-    				unset($data);
1302
-    			    } else $error = true;
1299
+					if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1300
+					unset($lined);
1301
+					unset($data);
1302
+					} else $error = true;
1303 1303
 			} elseif ($format == 'aprs' && $use_aprs) {
1304
-			    if ($aprs_connect == 0) {
1304
+				if ($aprs_connect == 0) {
1305 1305
 				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
1306 1306
 				$aprs_connect = 1;
1307
-			    }
1307
+				}
1308 1308
 			    
1309
-			    if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
1309
+				if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
1310 1310
 				$aprs_last_tx = time();
1311 1311
 				$data_aprs = "# Keep alive";
1312 1312
 				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
1313
-			    }
1313
+				}
1314 1314
 			    
1315
-			    //echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
1316
-			    //echo 'APRS data : '.$buffer."\n";
1317
-			    $buffer = str_replace('APRS <- ','',$buffer);
1318
-			    $buffer = str_replace('APRS -> ','',$buffer);
1319
-			    //echo $buffer."\n";
1320
-			    if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
1315
+				//echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
1316
+				//echo 'APRS data : '.$buffer."\n";
1317
+				$buffer = str_replace('APRS <- ','',$buffer);
1318
+				$buffer = str_replace('APRS -> ','',$buffer);
1319
+				//echo $buffer."\n";
1320
+				if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
1321 1321
 				$line = $APRS->parse($buffer);
1322 1322
 				//if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) {
1323 1323
 				if (is_array($line) && isset($line['latitude']) && isset($line['longitude']) && (isset($line['ident']) || isset($line['address']) || isset($line['mmsi']))) {
1324
-				    $aprs_last_tx = time();
1325
-				    $data = array();
1326
-				    //print_r($line);
1327
-				    if (isset($line['address'])) $data['hex'] = $line['address'];
1328
-				    if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi'];
1329
-				    if (isset($line['imo'])) $data['imo'] = $line['imo'];
1330
-				    if (isset($line['squawk'])) $data['squawk'] = $line['squawk'];
1331
-				    if (isset($line['arrival_code'])) $data['arrical_code'] = $line['arrival_code'];
1332
-				    if (isset($line['arrival_date'])) $data['arrical_date'] = $line['arrival_date'];
1333
-				    if (isset($line['type_id'])) $data['type_id'] = $line['typeid'];
1334
-				    if (isset($line['status_id'])) $data['status_id'] = $line['statusid'];
1335
-				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
1336
-				    else $data['datetime'] = date('Y-m-d H:i:s');
1337
-				    //$data['datetime'] = date('Y-m-d H:i:s');
1338
-				    if (isset($line['ident'])) $data['ident'] = $line['ident'];
1339
-				    $data['latitude'] = $line['latitude'];
1340
-				    $data['longitude'] = $line['longitude'];
1341
-				    //$data['verticalrate'] = $line[16];
1342
-				    if (isset($line['speed'])) $data['speed'] = $line['speed'];
1343
-				    else $data['speed'] = 0;
1344
-				    if (isset($line['altitude'])) $data['altitude'] = $line['altitude'];
1345
-				    if (isset($line['comment'])) $data['comment'] = $line['comment'];
1346
-				    if (isset($line['symbol'])) $data['type'] = $line['symbol'];
1347
-				    if (isset($line['heading'])) $data['heading'] = $line['heading'];
1348
-				    //else $data['heading'] = 0;
1349
-				    if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth'];
1350
-				    //if (!isset($line['source_type']) && (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE))) $data['noarchive'] = true;
1351
-				    if (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE) $data['noarchive'] = true;
1352
-				    elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) $data['noarchive'] = false;
1353
-				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1354
-				    elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) $data['noarchive'] = false;
1355
-    				    $data['id_source'] = $id_source;
1356
-    				    if (isset($line['format_source'])) $data['format_source'] = $line['format_source'];
1357
-				    else $data['format_source'] = 'aprs';
1358
-				    $data['source_name'] = $line['source'];
1359
-				    if (isset($line['source_type'])) $data['source_type'] = $line['source_type'];
1360
-				    else $data['source_type'] = 'flarm';
1361
-    				    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1362
-				    $currentdate = date('Y-m-d H:i:s');
1363
-				    $aprsdate = strtotime($data['datetime']);
1364
-				    // Accept data if time <= system time + 20s
1365
-				    //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'])))) {
1366
-				    if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
1324
+					$aprs_last_tx = time();
1325
+					$data = array();
1326
+					//print_r($line);
1327
+					if (isset($line['address'])) $data['hex'] = $line['address'];
1328
+					if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi'];
1329
+					if (isset($line['imo'])) $data['imo'] = $line['imo'];
1330
+					if (isset($line['squawk'])) $data['squawk'] = $line['squawk'];
1331
+					if (isset($line['arrival_code'])) $data['arrical_code'] = $line['arrival_code'];
1332
+					if (isset($line['arrival_date'])) $data['arrical_date'] = $line['arrival_date'];
1333
+					if (isset($line['type_id'])) $data['type_id'] = $line['typeid'];
1334
+					if (isset($line['status_id'])) $data['status_id'] = $line['statusid'];
1335
+					if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
1336
+					else $data['datetime'] = date('Y-m-d H:i:s');
1337
+					//$data['datetime'] = date('Y-m-d H:i:s');
1338
+					if (isset($line['ident'])) $data['ident'] = $line['ident'];
1339
+					$data['latitude'] = $line['latitude'];
1340
+					$data['longitude'] = $line['longitude'];
1341
+					//$data['verticalrate'] = $line[16];
1342
+					if (isset($line['speed'])) $data['speed'] = $line['speed'];
1343
+					else $data['speed'] = 0;
1344
+					if (isset($line['altitude'])) $data['altitude'] = $line['altitude'];
1345
+					if (isset($line['comment'])) $data['comment'] = $line['comment'];
1346
+					if (isset($line['symbol'])) $data['type'] = $line['symbol'];
1347
+					if (isset($line['heading'])) $data['heading'] = $line['heading'];
1348
+					//else $data['heading'] = 0;
1349
+					if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth'];
1350
+					//if (!isset($line['source_type']) && (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE))) $data['noarchive'] = true;
1351
+					if (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE) $data['noarchive'] = true;
1352
+					elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) $data['noarchive'] = false;
1353
+					if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1354
+					elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) $data['noarchive'] = false;
1355
+						$data['id_source'] = $id_source;
1356
+						if (isset($line['format_source'])) $data['format_source'] = $line['format_source'];
1357
+					else $data['format_source'] = 'aprs';
1358
+					$data['source_name'] = $line['source'];
1359
+					if (isset($line['source_type'])) $data['source_type'] = $line['source_type'];
1360
+					else $data['source_type'] = 'flarm';
1361
+						if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1362
+					$currentdate = date('Y-m-d H:i:s');
1363
+					$aprsdate = strtotime($data['datetime']);
1364
+					// Accept data if time <= system time + 20s
1365
+					//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'])))) {
1366
+					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'])))) {
1367 1367
 					$send = $SI->add($data);
1368
-				    } elseif ($data['source_type'] == 'ais') {
1368
+					} elseif ($data['source_type'] == 'ais') {
1369 1369
 					if (isset($globalMarine) && $globalMarine) $send = $MI->add($data);
1370
-				    } elseif (isset($line['stealth'])) {
1370
+					} elseif (isset($line['stealth'])) {
1371 1371
 					if ($line['stealth'] != 0) echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
1372 1372
 					else echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n";
1373
-				    //} 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')) {
1374
-				    } elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && isset($line['speed']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') {
1373
+					//} 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')) {
1374
+					} 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') {
1375 1375
 					//echo '!!!!!!!!!!!!!!!! SEND !!!!!!!!!!!!!!!!!!!!'."\n";
1376 1376
 					if (isset($globalTracker) && $globalTracker) $send = $TI->add($data);
1377
-				    } elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident'])) {
1377
+					} elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident'])) {
1378 1378
 					$Source->deleteOldLocationByType('gs');
1379 1379
 					if (count($Source->getLocationInfoByName($data['ident'])) > 0) {
1380 1380
 						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']);
1381 1381
 					} else {
1382 1382
 						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']);
1383 1383
 					}
1384
-				    } else {
1385
-				    	echo '/!\ Not added'."\n";
1386
-				    	print_r($data);
1387
-				    }
1388
-				    unset($data);
1384
+					} else {
1385
+						echo '/!\ Not added'."\n";
1386
+						print_r($data);
1387
+					}
1388
+					unset($data);
1389 1389
 				} 
1390 1390
 				elseif (is_array($line) && $globalDebug && isset($line['symbol']) && $line['symbol'] == 'Weather Station') {
1391 1391
 					echo '!! Weather Station not yet supported'."\n";
@@ -1401,12 +1401,12 @@  discard block
 block discarded – undo
1401 1401
 				*/
1402 1402
 				elseif ($line == false && $globalDebug) echo 'Ignored ('.$buffer.")\n";
1403 1403
 				elseif ($line == true && $globalDebug) echo '!! Failed : '.$buffer."!!\n";
1404
-			    }
1404
+				}
1405 1405
 			} else {
1406
-			    $line = explode(',', $buffer);
1407
-    			    if (count($line) > 20) {
1408
-    			    	$data['hex'] = $line[4];
1409
-    				/*
1406
+				$line = explode(',', $buffer);
1407
+					if (count($line) > 20) {
1408
+						$data['hex'] = $line[4];
1409
+					/*
1410 1410
     				$data['datetime'] = $line[6].' '.$line[7];
1411 1411
     					date_default_timezone_set($globalTimezone);
1412 1412
     					$datetime = new DateTime($data['datetime']);
@@ -1414,30 +1414,30 @@  discard block
 block discarded – undo
1414 1414
     					$data['datetime'] = $datetime->format('Y-m-d H:i:s');
1415 1415
     					date_default_timezone_set('UTC');
1416 1416
     				*/
1417
-    				// Force datetime to current UTC datetime
1418
-    				date_default_timezone_set('UTC');
1419
-    				$data['datetime'] = date('Y-m-d H:i:s');
1420
-    				$data['ident'] = trim($line[10]);
1421
-    				$data['latitude'] = $line[14];
1422
-    				$data['longitude'] = $line[15];
1423
-    				$data['verticalrate'] = $line[16];
1424
-    				$data['emergency'] = $line[20];
1425
-    				$data['speed'] = $line[12];
1426
-    				$data['squawk'] = $line[17];
1427
-    				$data['altitude'] = $line[11];
1428
-    				$data['heading'] = $line[13];
1429
-    				$data['ground'] = $line[21];
1430
-    				$data['emergency'] = $line[19];
1431
-    				$data['format_source'] = 'sbs';
1417
+					// Force datetime to current UTC datetime
1418
+					date_default_timezone_set('UTC');
1419
+					$data['datetime'] = date('Y-m-d H:i:s');
1420
+					$data['ident'] = trim($line[10]);
1421
+					$data['latitude'] = $line[14];
1422
+					$data['longitude'] = $line[15];
1423
+					$data['verticalrate'] = $line[16];
1424
+					$data['emergency'] = $line[20];
1425
+					$data['speed'] = $line[12];
1426
+					$data['squawk'] = $line[17];
1427
+					$data['altitude'] = $line[11];
1428
+					$data['heading'] = $line[13];
1429
+					$data['ground'] = $line[21];
1430
+					$data['emergency'] = $line[19];
1431
+					$data['format_source'] = 'sbs';
1432 1432
 				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1433
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1433
+					if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1434 1434
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1435
-    				$data['id_source'] = $id_source;
1436
-    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
1437
-    				else $error = true;
1438
-    				unset($data);
1439
-    			    } else $error = true;
1440
-			    if ($error) {
1435
+					$data['id_source'] = $id_source;
1436
+					if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
1437
+					else $error = true;
1438
+					unset($data);
1439
+					} else $error = true;
1440
+				if ($error) {
1441 1441
 				if (count($line) > 1 && ($line[0] == 'STA' || $line[0] == 'AIR' || $line[0] == 'SEL' || $line[0] == 'ID' || $line[0] == 'CLK')) { 
1442 1442
 					if ($globalDebug) echo "Not a message. Ignoring... \n";
1443 1443
 				} else {
@@ -1453,13 +1453,13 @@  discard block
 block discarded – undo
1453 1453
 					connect_all($sourceer);
1454 1454
 					$sourceer = array();
1455 1455
 				}
1456
-			    }
1456
+				}
1457 1457
 			}
1458 1458
 			// Sleep for xxx microseconds
1459 1459
 			if (isset($globalSBSSleep)) usleep($globalSBSSleep);
1460
-		    } else {
1460
+			} else {
1461 1461
 			if ($format == 'flightgearmp') {
1462
-			    	if ($globalDebug) echo "Reconnect FlightGear MP...";
1462
+					if ($globalDebug) echo "Reconnect FlightGear MP...";
1463 1463
 				//@socket_close($r);
1464 1464
 				sleep($globalMinFetch);
1465 1465
 				$sourcefg[$nb] = $globalSources[$nb];
@@ -1468,9 +1468,9 @@  discard block
 block discarded – undo
1468 1468
 				break;
1469 1469
 				
1470 1470
 			} elseif ($format != 'acars' && $format != 'flightgearsp') {
1471
-			    if (isset($tt[$format])) $tt[$format]++;
1472
-			    else $tt[$format] = 0;
1473
-			    if ($tt[$format] > 30) {
1471
+				if (isset($tt[$format])) $tt[$format]++;
1472
+				else $tt[$format] = 0;
1473
+				if ($tt[$format] > 30) {
1474 1474
 				if ($globalDebug) echo "ERROR : Reconnect ".$format."...";
1475 1475
 				//@socket_close($r);
1476 1476
 				sleep(2);
@@ -1481,23 +1481,23 @@  discard block
 block discarded – undo
1481 1481
 				//connect_all($globalSources);
1482 1482
 				$tt[$format]=0;
1483 1483
 				break;
1484
-			    }
1484
+				}
1485
+			}
1485 1486
 			}
1486
-		    }
1487 1487
 		}
1488
-	    } else {
1488
+		} else {
1489 1489
 		$error = socket_strerror(socket_last_error());
1490 1490
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) {
1491 1491
 			if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
1492 1492
 			if (isset($globalDebug)) echo "Restarting...\n";
1493 1493
 			// Restart the script if possible
1494 1494
 			if (is_array($sockets)) {
1495
-			    if ($globalDebug) echo "Shutdown all sockets...";
1495
+				if ($globalDebug) echo "Shutdown all sockets...";
1496 1496
 			    
1497
-			    foreach ($sockets as $sock) {
1497
+				foreach ($sockets as $sock) {
1498 1498
 				@socket_shutdown($sock,2);
1499 1499
 				@socket_close($sock);
1500
-			    }
1500
+				}
1501 1501
 			    
1502 1502
 			}
1503 1503
 			if ($globalDebug) echo "Waiting...";
@@ -1512,13 +1512,13 @@  discard block
 block discarded – undo
1512 1512
 			if ($globalDebug) echo "Restart all connections...";
1513 1513
 			connect_all($globalSources);
1514 1514
 		}
1515
-	    }
1515
+		}
1516 1516
 	}
1517 1517
 	if ($globalDaemon === false) {
1518
-	    if ($globalDebug) echo 'Check all...'."\n";
1519
-	    $SI->checkAll();
1518
+		if ($globalDebug) echo 'Check all...'."\n";
1519
+		$SI->checkAll();
1520
+	}
1520 1521
 	}
1521
-    }
1522 1522
 }
1523 1523
 
1524 1524
 ?>
Please login to merge, or discard this patch.
require/class.SpotterImport.php 1 patch
Indentation   +423 added lines, -423 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,78 +120,78 @@  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'])) {
186
+		if (isset($flight['lastupdate'])) {
187 187
 		if ($flight['lastupdate'] < (time()-5900)) {
188
-		    $this->delKey($key);
188
+			$this->delKey($key);
189
+		}
189 190
 		}
190
-	    }
191 191
 	}
192
-    }
192
+	}
193 193
 
194
-    public function delKey($key) {
194
+	public function delKey($key) {
195 195
 	global $globalDebug, $globalNoImport, $globalNoDB;
196 196
 	// Delete old infos
197 197
 	if (isset($this->all_flights[$key]['id'])) {
@@ -206,9 +206,9 @@  discard block
 block discarded – undo
206 206
 		}
207 207
 	}
208 208
 	unset($this->all_flights[$key]);
209
-    }
209
+	}
210 210
 
211
-    public function add($line) {
211
+	public function add($line) {
212 212
 	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, $globalAircraftMaxUpdate, $globalAircraftMinUpdate;
213 213
 	//if (!isset($globalDebugTimeElapsed) || $globalDebugTimeElapsed == '') $globalDebugTimeElapsed = FALSE;
214 214
 	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02';
@@ -234,20 +234,20 @@  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['hex'])) $line['hex'] = strtoupper($line['hex']);
239
-  	    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['hex'])) $line['hex'] = strtoupper($line['hex']);
239
+  		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)) {
240 240
 
241 241
 		// Increment message number
242 242
 		if (isset($line['sourcestats']) && $line['sourcestats'] === TRUE) {
243
-		    $current_date = date('Y-m-d');
244
-		    if (isset($line['source_name'])) $source = $line['source_name'];
245
-		    else $source = '';
246
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
247
-		    if (!isset($this->stats[$current_date][$source]['msg'])) {
248
-		    	$this->stats[$current_date][$source]['msg']['date'] = time();
249
-		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
250
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
243
+			$current_date = date('Y-m-d');
244
+			if (isset($line['source_name'])) $source = $line['source_name'];
245
+			else $source = '';
246
+			if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
247
+			if (!isset($this->stats[$current_date][$source]['msg'])) {
248
+				$this->stats[$current_date][$source]['msg']['date'] = time();
249
+				$this->stats[$current_date][$source]['msg']['nb'] = 1;
250
+			} else $this->stats[$current_date][$source]['msg']['nb'] += 1;
251 251
 		}
252 252
 		
253 253
 		/*
@@ -263,53 +263,53 @@  discard block
 block discarded – undo
263 263
 		//$this->db = $dbc;
264 264
 
265 265
 		//$hex = trim($line['hex']);
266
-	        if (!isset($line['id'])) $id = trim($line['hex']);
267
-	        else $id = trim($line['id']);
266
+			if (!isset($line['id'])) $id = trim($line['hex']);
267
+			else $id = trim($line['id']);
268 268
 		
269 269
 		if (!isset($this->all_flights[$id])) {
270
-		    $this->all_flights[$id] = array();
271
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
272
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '','altitude_previous' => '', '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' => ''));
273
-		    if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
274
-		    if (!isset($line['id'])) {
270
+			$this->all_flights[$id] = array();
271
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
272
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '','altitude_previous' => '', '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' => ''));
273
+			if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
274
+			if (!isset($line['id'])) {
275 275
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
276 276
 //			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')));
277 277
 //			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')));
278 278
 			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')));
279
-		        //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
280
-		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
281
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
279
+				//else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
280
+			 } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
281
+			if ($globalAllFlights !== FALSE) $dataFound = true;
282 282
 		}
283 283
 		if (isset($line['source_type']) && $line['source_type'] != '') {
284
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type']));
284
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type']));
285 285
 		}
286 286
 		
287 287
 		//print_r($this->all_flights);
288 288
 		if (isset($line['hex']) && !isset($this->all_flights[$id]['hex']) && ctype_xdigit($line['hex'])) {
289
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex'])));
290
-		    //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
289
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex'])));
290
+			//if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
291 291
 			//$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
292
-		    //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
293
-		    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
+			//} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
293
+			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') {
294 294
 			$timeelapsed = microtime(true);
295 295
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
296
-			    $Spotter = new Spotter($this->db);
297
-			    if (isset($this->all_flights[$id]['source_type'])) {
296
+				$Spotter = new Spotter($this->db);
297
+				if (isset($this->all_flights[$id]['source_type'])) {
298 298
 				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']),$this->all_flights[$id]['source_type']);
299
-			    } else {
299
+				} else {
300 300
 				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']));
301
-			    }
302
-			    $Spotter->db = null;
303
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
304
-			    if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
301
+				}
302
+				$Spotter->db = null;
303
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
304
+				if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
305 305
 			}
306
-		    }
307
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
308
-		    if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
306
+			}
307
+			if ($globalAllFlights !== FALSE) $dataFound = true;
308
+			if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
309 309
 		}
310
-	        if (isset($line['id']) && !isset($line['hex'])) {
311
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => ''));
312
-	        }
310
+			if (isset($line['id']) && !isset($line['hex'])) {
311
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => ''));
312
+			}
313 313
 		if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') {
314 314
 			$icao = $line['aircraft_icao'];
315 315
 			$Spotter = new Spotter($this->db);
@@ -338,9 +338,9 @@  discard block
 block discarded – undo
338 338
 		}
339 339
 		//if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
340 340
 		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) {
341
-		    if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
341
+			if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
342 342
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
343
-		    } else {
343
+			} else {
344 344
 				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";
345 345
 				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";
346 346
 				/*
@@ -349,7 +349,7 @@  discard block
 block discarded – undo
349 349
 				print_r($line);
350 350
 				*/
351 351
 				return '';
352
-		    }
352
+			}
353 353
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
354 354
 			if ($globalDebug) echo "!!! Date is too old ".$line['datetime']." for ".$this->all_flights[$id]['id']." - format : ".$line['format_source']."!!!\n";
355 355
 			return '';
@@ -366,21 +366,21 @@  discard block
 block discarded – undo
366 366
 		}
367 367
 
368 368
 		if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG') {
369
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration']));
369
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration']));
370 370
 		}
371 371
 		if (isset($line['waypoints']) && $line['waypoints'] != '') {
372
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints']));
372
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints']));
373 373
 		}
374 374
 		if (isset($line['pilot_id']) && $line['pilot_id'] != '') {
375
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => trim($line['pilot_id'])));
375
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => trim($line['pilot_id'])));
376 376
 		}
377 377
 		if (isset($line['pilot_name']) && $line['pilot_name'] != '') {
378
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => trim($line['pilot_name'])));
378
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => trim($line['pilot_name'])));
379 379
 		}
380 380
  
381 381
 		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'])) {
382 382
 
383
-		    if ($this->all_flights[$id]['addedSpotter'] == 1) {
383
+			if ($this->all_flights[$id]['addedSpotter'] == 1) {
384 384
 			if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE && $this->all_flights[$id]['lastupdate'] < time() - 1600) {
385 385
 				if ($globalDebug) echo '---!!!! New ident, reset aircraft data...'."\n";
386 386
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
@@ -389,23 +389,23 @@  discard block
 block discarded – undo
389 389
 				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
390 390
 				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']));
391 391
 			} else {
392
-			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
393
-			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
392
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
393
+				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
394 394
 				$timeelapsed = microtime(true);
395
-            			$Spotter = new Spotter($this->db);
396
-            			$fromsource = NULL;
397
-            			if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
398
-            			elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
395
+						$Spotter = new Spotter($this->db);
396
+						$fromsource = NULL;
397
+						if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
398
+						elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
399 399
 				elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao';
400 400
 				elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
401 401
 				elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
402
-            			$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
402
+						$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
403 403
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
404 404
 				$Spotter->db = null;
405 405
 				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
406
-			    }
406
+				}
407 407
 			}
408
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
408
+			} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
409 409
 		    
410 410
 /*
411 411
 		    if (!isset($line['id'])) {
@@ -415,102 +415,102 @@  discard block
 block discarded – undo
415 415
 		        else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
416 416
 		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
417 417
   */
418
-		    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']));
418
+			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']));
419 419
 
420
-		    //$putinarchive = true;
421
-		    if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
420
+			//$putinarchive = true;
421
+			if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
422 422
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time']));
423
-		    }
424
-		    if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) {
423
+			}
424
+			if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) {
425 425
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time']));
426
-		    }
427
-		    if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) {
428
-		    		$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' => ''));
429
-		    } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
426
+			}
427
+			if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) {
428
+					$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' => ''));
429
+			} elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
430 430
 			$timeelapsed = microtime(true);
431 431
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
432 432
 				$Spotter = new Spotter($this->db);
433 433
 				$line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']);
434 434
 				$line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']);
435
-		    		$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' => ''));
435
+					$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' => ''));
436 436
 				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
437
-                        }
438
-		    } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
437
+						}
438
+			} elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
439 439
 			$timeelapsed = microtime(true);
440 440
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
441
-			    $Spotter = new Spotter($this->db);
442
-			    $route = $Spotter->getRouteInfo(trim($line['ident']));
443
-			    if (!isset($route['fromairport_icao']) && !isset($route['toairport_icao'])) {
441
+				$Spotter = new Spotter($this->db);
442
+				$route = $Spotter->getRouteInfo(trim($line['ident']));
443
+				if (!isset($route['fromairport_icao']) && !isset($route['toairport_icao'])) {
444 444
 				$Translation = new Translation($this->db);
445 445
 				$ident = $Translation->checkTranslation(trim($line['ident']));
446 446
 				$route = $Spotter->getRouteInfo($ident);
447 447
 				$Translation->db = null;
448
-			    }
449
-			    $Spotter->db = null;
450
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
451
-                    	}
448
+				}
449
+				$Spotter->db = null;
450
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
451
+						}
452 452
 			if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) {
453
-			    //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
454
-			    if ($route['fromairport_icao'] != $route['toairport_icao']) {
453
+				//if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
454
+				if ($route['fromairport_icao'] != $route['toairport_icao']) {
455 455
 				//    $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']));
456
-		    		$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']));
457
-		    	    }
456
+					$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']));
457
+					}
458 458
 			}
459 459
 			if (!isset($globalFork)) $globalFork = TRUE;
460 460
 			if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) {
461 461
 				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident']));
462 462
 			}
463
-		    }
463
+			}
464 464
 		}
465 465
 
466 466
 		if (isset($line['speed']) && $line['speed'] != '') {
467 467
 		//    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12]));
468
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed'])));
469
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true));
470
-		    //$dataFound = true;
468
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed'])));
469
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true));
470
+			//$dataFound = true;
471 471
 		} 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'])) {
472
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m');
473
-		    if ($distance > 1000 && $distance < 10000) {
474
-		    // use datetime
472
+			$distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m');
473
+			if ($distance > 1000 && $distance < 10000) {
474
+			// use datetime
475 475
 			$speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']);
476 476
 			$speed = $speed*3.6;
477 477
 			if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed)));
478 478
   			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
479
-		    }
480
-		}
481
-
482
-
483
-
484
-	        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'])) {
485
-	    	    if (ctype_digit(strval($line['latitude'])) || ctype_digit(strval($line['longitude']))) {
486
-	    	    	if ($globalDebug) echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n";
487
-	    	    	return false;
488
-	    	    }
489
-	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
490
-	    	    else unset($timediff);
491
-	    	    if ($this->tmd > 5
492
-	    	        || (isset($line['format_source']) 
493
-	    	    	    && $line['format_source'] == 'airwhere' 
494
-	    	    	    && ((!isset($this->all_flights[$id]['latitude']) 
495
-	    	    		|| !isset($this->all_flights[$id]['longitude'])) 
496
-	    	    		|| (isset($this->all_flights[$id]['latitude']) 
497
-	    	    		    && isset($this->all_flights[$id]['longitude']) 
498
-	    	    		    && $this->all_flights[$id]['latitude'] != $line['latitude'] 
499
-	    	    		    && $this->all_flights[$id]['longitude'] != $line['longitude'])))
500
-	    		|| (isset($globalVA) && $globalVA) 
501
-	    	    	|| (isset($globalIVAO) && $globalIVAO)
502
-	    	    	|| (isset($globalVATSIM) && $globalVATSIM)
503
-	    	    	|| (isset($globalphpVMS) && $globalphpVMS)
504
-	    	    	|| (isset($globalVAM) && $globalVAM)
505
-	    	    	|| !isset($timediff)
506
-	    	    	|| $timediff > 2000
507
-	    	    	|| ($timediff > 30 
508
-	    	    	    && isset($this->all_flights[$id]['latitude']) 
509
-	    	    	    && isset($this->all_flights[$id]['longitude']) 
510
-	    	    	    && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) {
479
+			}
480
+		}
481
+
482
+
483
+
484
+			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'])) {
485
+				if (ctype_digit(strval($line['latitude'])) || ctype_digit(strval($line['longitude']))) {
486
+					if ($globalDebug) echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n";
487
+					return false;
488
+				}
489
+				if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
490
+				else unset($timediff);
491
+				if ($this->tmd > 5
492
+					|| (isset($line['format_source']) 
493
+						&& $line['format_source'] == 'airwhere' 
494
+						&& ((!isset($this->all_flights[$id]['latitude']) 
495
+						|| !isset($this->all_flights[$id]['longitude'])) 
496
+						|| (isset($this->all_flights[$id]['latitude']) 
497
+							&& isset($this->all_flights[$id]['longitude']) 
498
+							&& $this->all_flights[$id]['latitude'] != $line['latitude'] 
499
+							&& $this->all_flights[$id]['longitude'] != $line['longitude'])))
500
+				|| (isset($globalVA) && $globalVA) 
501
+					|| (isset($globalIVAO) && $globalIVAO)
502
+					|| (isset($globalVATSIM) && $globalVATSIM)
503
+					|| (isset($globalphpVMS) && $globalphpVMS)
504
+					|| (isset($globalVAM) && $globalVAM)
505
+					|| !isset($timediff)
506
+					|| $timediff > 2000
507
+					|| ($timediff > 30 
508
+						&& isset($this->all_flights[$id]['latitude']) 
509
+						&& isset($this->all_flights[$id]['longitude']) 
510
+						&& $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) {
511 511
 
512 512
 			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'])) {
513
-			    if ((isset($timediff) && $timediff > $globalAircraftMaxUpdate)
513
+				if ((isset($timediff) && $timediff > $globalAircraftMaxUpdate)
514 514
 				|| (isset($line['format_source']) && $line['format_source'] == 'airwhere') 
515 515
 				|| !$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'])) {
516 516
 
@@ -519,9 +519,9 @@  discard block
 block discarded – undo
519 519
 				$this->all_flights[$id]['putinarchive'] = true;
520 520
 				$this->tmd = 0;
521 521
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
522
-				    if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
523
-				    $timeelapsed = microtime(true);
524
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
522
+					if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
523
+					$timeelapsed = microtime(true);
524
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
525 525
 					$Spotter = new Spotter($this->db);
526 526
 					$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
527 527
 					if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2'];
@@ -529,18 +529,18 @@  discard block
 block discarded – undo
529 529
 					$Spotter->db = null;
530 530
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
531 531
 					if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
532
-				    }
532
+					}
533
+				}
533 534
 				}
534
-			    }
535 535
 			}
536 536
 
537 537
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
538
-			    //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) {
538
+				//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) {
539 539
 				if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude'];
540 540
 				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' || $this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > 0.0001) {
541
-				    $this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
542
-				    $dataFound = true;
543
-				    $this->all_flights[$id]['time_last_coord'] = time();
541
+					$this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
542
+					$dataFound = true;
543
+					$this->all_flights[$id]['time_last_coord'] = time();
544 544
 				}
545 545
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
546 546
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude']));
@@ -551,20 +551,20 @@  discard block
 block discarded – undo
551 551
 				    //$putinarchive = true;
552 552
 				}
553 553
 				*/
554
-			    /*
554
+				/*
555 555
 			    } elseif (isset($this->all_flights[$id]['latitude'])) {
556 556
 				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";
557 557
 			    }
558 558
 			    */
559 559
 			}
560 560
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
561
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
562
-			    //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) {
561
+				if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
562
+				//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) {
563 563
 				if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude'];
564 564
 				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' || $this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > 0.0001) {
565
-				    $this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
566
-				    $dataFound = true;
567
-				    $this->all_flights[$id]['time_last_coord'] = time();
565
+					$this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
566
+					$dataFound = true;
567
+					$this->all_flights[$id]['time_last_coord'] = time();
568 568
 				}
569 569
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
570 570
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude']));
@@ -582,77 +582,77 @@  discard block
 block discarded – undo
582 582
 			    */
583 583
 			}
584 584
 
585
-		    } else if ($globalDebug && $timediff > 30) {
585
+			} else if ($globalDebug && $timediff > 30) {
586 586
 			$this->tmd = $this->tmd + 1;
587 587
 			echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n";
588 588
 			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -";
589 589
 			echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
590 590
 			echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n";
591
-		    }
591
+			}
592 592
 		}
593 593
 		if (isset($line['last_update']) && $line['last_update'] != '') {
594
-		    if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
595
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
594
+			if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
595
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
596 596
 		}
597 597
 		if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
598
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate']));
599
-		    //$dataFound = true;
598
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate']));
599
+			//$dataFound = true;
600 600
 		}
601 601
 		if (isset($line['format_source']) && $line['format_source'] != '') {
602
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source']));
602
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source']));
603 603
 		}
604 604
 		if (isset($line['source_name']) && $line['source_name'] != '') {
605
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name']));
605
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name']));
606 606
 		}
607 607
 		if (isset($line['emergency']) && $line['emergency'] != '') {
608
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency']));
609
-		    //$dataFound = true;
608
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency']));
609
+			//$dataFound = true;
610 610
 		}
611 611
 		if (isset($line['ground']) && $line['ground'] != '') {
612
-		    if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) {
612
+			if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) {
613 613
 			// Here we force archive of flight because after ground it's a new one (or should be)
614 614
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
615 615
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
616 616
 			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')));
617
-		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
617
+				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
618 618
 			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']));
619
-		    }
620
-		    if ($line['ground'] != 1) $line['ground'] = 0;
621
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
622
-		    //$dataFound = true;
619
+			}
620
+			if ($line['ground'] != 1) $line['ground'] = 0;
621
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
622
+			//$dataFound = true;
623 623
 		}
624 624
 		if (isset($line['squawk']) && $line['squawk'] != '') {
625
-		    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'])) {
626
-			    if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
627
-			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
628
-			    $highlight = '';
629
-			    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
630
-			    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
631
-			    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
632
-			    if ($highlight != '') {
625
+			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'])) {
626
+				if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
627
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
628
+				$highlight = '';
629
+				if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
630
+				if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
631
+				if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
632
+				if ($highlight != '') {
633 633
 				$timeelapsed = microtime(true);
634 634
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
635
-				    $Spotter = new Spotter($this->db);
636
-				    $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
637
-				    $Spotter->db = null;
638
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
635
+					$Spotter = new Spotter($this->db);
636
+					$Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
637
+					$Spotter->db = null;
638
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
639 639
 				}
640 640
 				//$putinarchive = true;
641 641
 				//$highlight = '';
642
-			    }
642
+				}
643 643
 			    
644
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
645
-		    //$dataFound = true;
644
+			} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
645
+			//$dataFound = true;
646 646
 		}
647 647
 
648 648
 		if (isset($line['altitude']) && $line['altitude'] != '') {
649
-		    //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
649
+			//if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
650 650
 			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;
651 651
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100)));
652 652
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude']));
653 653
 			//$dataFound = true;
654
-		    //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
655
-		    if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) {
654
+			//} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
655
+			if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) {
656 656
 			if (isset($this->all_flights[$id]['over_country']) && $this->all_flights[$id]['over_country'] != '' && isset($this->all_flights[$id]['altitude_previous']) && $this->all_flights[$id]['altitude_previous'] != '' && $this->all_flights[$id]['altitude_previous'] < $this->all_flights[$id]['altitude_real'] && isset($this->all_flights[$id]['lastupdate']) && $this->all_flights[$id]['lastupdate'] < time() - 1600) {
657 657
 				if ($globalDebug) echo '--- Reset because of altitude'."\n";
658 658
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
@@ -661,27 +661,27 @@  discard block
 block discarded – undo
661 661
 				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
662 662
 				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']));
663 663
 			}
664
-		    }
665
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude']));
664
+			}
665
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude']));
666 666
 		}
667 667
 
668 668
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
669
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true));
669
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true));
670 670
 		}
671 671
 		
672 672
 		if (isset($line['heading']) && $line['heading'] != '') {
673
-		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
674
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
675
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
676
-		    //$dataFound = true;
673
+			if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
674
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
675
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
676
+			//$dataFound = true;
677 677
   		} 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']) {
678
-  		    $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']);
679
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
680
-		    if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
681
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['id']." : ".$heading."\n";
678
+  			$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']);
679
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
680
+			if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
681
+  			if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['id']." : ".$heading."\n";
682 682
   		} elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') {
683
-  		    // If not enough messages and ACARS set heading to 0
684
-  		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
683
+  			// If not enough messages and ACARS set heading to 0
684
+  			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
685 685
   		}
686 686
 		if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
687 687
 		elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
@@ -694,125 +694,125 @@  discard block
 block discarded – undo
694 694
 		//if ($dataFound === true && isset($this->all_flights[$id]['hex']) && $this->all_flights[$id]['heading'] != '' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
695 695
 		//if ($dataFound === true && isset($this->all_flights[$id]['hex'])) {
696 696
 		if ($dataFound === true && isset($this->all_flights[$id]['id'])) {
697
-		    $this->all_flights[$id]['lastupdate'] = time();
698
-		    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) {
699
-		        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'])) {
700
-			    //print_r($this->all_flights);
701
-			    //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n";
702
-			    //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
703
-			    if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) {
697
+			$this->all_flights[$id]['lastupdate'] = time();
698
+			if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) {
699
+				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'])) {
700
+				//print_r($this->all_flights);
701
+				//echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n";
702
+				//$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
703
+				if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) {
704 704
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
705
-				    if ($globalDebug) echo "Check if aircraft is already in DB...";
706
-				    $timeelapsed = microtime(true);
707
-				    $SpotterLive = new SpotterLive($this->db);
708
-				    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')) {
705
+					if ($globalDebug) echo "Check if aircraft is already in DB...";
706
+					$timeelapsed = microtime(true);
707
+					$SpotterLive = new SpotterLive($this->db);
708
+					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')) {
709 709
 					$recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']);
710 710
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
711
-				    } elseif (isset($line['id'])) {
711
+					} elseif (isset($line['id'])) {
712 712
 					$recent_ident = $SpotterLive->checkIdRecent($line['id']);
713 713
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
714
-				    } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
714
+					} elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
715 715
 					$recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']);
716 716
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
717
-				    } else $recent_ident = '';
718
-				    $SpotterLive->db=null;
719
-				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
720
-				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
717
+					} else $recent_ident = '';
718
+					$SpotterLive->db=null;
719
+					if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
720
+					elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
721 721
 				} else $recent_ident = '';
722
-			    } else {
722
+				} else {
723 723
 				$recent_ident = '';
724 724
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0));
725
-			    }
726
-			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
727
-			    if($recent_ident == "")
728
-			    {
725
+				}
726
+				//if there was no aircraft with the same callsign within the last hour and go post it into the archive
727
+				if($recent_ident == "")
728
+				{
729 729
 				if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : ";
730 730
 				if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
731 731
 				if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
732 732
 				//adds the spotter data for the archive
733 733
 				$ignoreImport = false;
734 734
 				foreach($globalAirportIgnore as $airportIgnore) {
735
-				    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
735
+					if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
736 736
 					$ignoreImport = true;
737
-				    }
737
+					}
738 738
 				}
739 739
 				if (count($globalAirportAccept) > 0) {
740
-				    $ignoreImport = true;
741
-				    foreach($globalAirportIgnore as $airportIgnore) {
740
+					$ignoreImport = true;
741
+					foreach($globalAirportIgnore as $airportIgnore) {
742 742
 					if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
743
-					    $ignoreImport = false;
743
+						$ignoreImport = false;
744
+					}
744 745
 					}
745
-				    }
746 746
 				}
747 747
 				if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
748
-				    foreach($globalAirlineIgnore as $airlineIgnore) {
748
+					foreach($globalAirlineIgnore as $airlineIgnore) {
749 749
 					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)) {
750
-					    $ignoreImport = true;
750
+						$ignoreImport = true;
751
+					}
751 752
 					}
752
-				    }
753 753
 				}
754 754
 				if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
755
-				    $ignoreImport = true;
756
-				    foreach($globalAirlineAccept as $airlineAccept) {
755
+					$ignoreImport = true;
756
+					foreach($globalAirlineAccept as $airlineAccept) {
757 757
 					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)) {
758
-					    $ignoreImport = false;
758
+						$ignoreImport = false;
759
+					}
759 760
 					}
760
-				    }
761 761
 				}
762 762
 				if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
763
-				    $ignoreImport = true;
764
-				    foreach($globalPilotIdAccept as $pilotIdAccept) {
763
+					$ignoreImport = true;
764
+					foreach($globalPilotIdAccept as $pilotIdAccept) {
765 765
 					if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
766
-					    $ignoreImport = false;
766
+						$ignoreImport = false;
767
+					}
767 768
 					}
768
-				    }
769 769
 				}
770 770
 				
771 771
 				if (!$ignoreImport) {
772
-				    $highlight = '';
773
-				    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
774
-				    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
775
-				    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
776
-				    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')));
777
-				    $timeelapsed = microtime(true);
778
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
772
+					$highlight = '';
773
+					if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
774
+					if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
775
+					if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
776
+					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')));
777
+					$timeelapsed = microtime(true);
778
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
779 779
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
780
-					    $Spotter = new Spotter($this->db);
781
-					    $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']);
782
-					    $Spotter->db = null;
783
-					    if ($globalDebug && isset($result)) echo $result."\n";
780
+						$Spotter = new Spotter($this->db);
781
+						$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']);
782
+						$Spotter->db = null;
783
+						if ($globalDebug && isset($result)) echo $result."\n";
784 784
 					}
785
-				    }
786
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
787
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
785
+					}
786
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
787
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
788 788
 
789
-				    // Add source stat in DB
790
-				    $Stats = new Stats($this->db);
791
-				    if (!empty($this->stats)) {
789
+					// Add source stat in DB
790
+					$Stats = new Stats($this->db);
791
+					if (!empty($this->stats)) {
792 792
 					if ($globalDebug) echo 'Add source stats : ';
793
-				        foreach($this->stats as $date => $data) {
794
-					    foreach($data as $source => $sourced) {
795
-					        //print_r($sourced);
796
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
797
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
798
-				    		if (isset($sourced['msg'])) {
799
-				    		    if (time() - $sourced['msg']['date'] > 10) {
800
-				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
801
-				    		        echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
802
-			    			        unset($this->stats[$date][$source]['msg']);
803
-			    			    }
804
-			    			}
805
-			    		    }
806
-			    		    if ($date != date('Y-m-d')) {
807
-			    			unset($this->stats[$date]);
808
-			    		    }
809
-				    	}
810
-				    	if ($globalDebug) echo 'Done'."\n";
811
-
812
-				    }
813
-				    $Stats->db = null;
814
-				    }
815
-				    $this->del();
793
+						foreach($this->stats as $date => $data) {
794
+						foreach($data as $source => $sourced) {
795
+							//print_r($sourced);
796
+								if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
797
+								if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
798
+							if (isset($sourced['msg'])) {
799
+								if (time() - $sourced['msg']['date'] > 10) {
800
+									$nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
801
+									echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
802
+									unset($this->stats[$date][$source]['msg']);
803
+								}
804
+							}
805
+							}
806
+							if ($date != date('Y-m-d')) {
807
+							unset($this->stats[$date]);
808
+							}
809
+						}
810
+						if ($globalDebug) echo 'Done'."\n";
811
+
812
+					}
813
+					$Stats->db = null;
814
+					}
815
+					$this->del();
816 816
 				} elseif ($globalDebug) echo 'Ignore data'."\n";
817 817
 				//$ignoreImport = false;
818 818
 				$this->all_flights[$id]['addedSpotter'] = 1;
@@ -830,41 +830,41 @@  discard block
 block discarded – undo
830 830
 			*/
831 831
 			//SpotterLive->deleteLiveSpotterDataByIdent($this->all_flights[$id]['ident']);
832 832
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
833
-				    if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours...";
834
-				    //SpotterLive->deleteLiveSpotterDataNotUpdated();
835
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
833
+					if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours...";
834
+					//SpotterLive->deleteLiveSpotterDataNotUpdated();
835
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
836 836
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
837
-					    $SpotterLive = new SpotterLive($this->db);
838
-					    $SpotterLive->deleteLiveSpotterData();
839
-					    $SpotterLive->db=null;
837
+						$SpotterLive = new SpotterLive($this->db);
838
+						$SpotterLive->deleteLiveSpotterData();
839
+						$SpotterLive->db=null;
840 840
 					}
841
-				    }
842
-				    if ($globalDebug) echo " Done\n";
843
-				    $this->last_delete = time();
841
+					}
842
+					if ($globalDebug) echo " Done\n";
843
+					$this->last_delete = time();
844 844
 				}
845
-			    } else {
845
+				} else {
846 846
 				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' || $line['format_source'] === 'airwhere')) {
847
-				    $this->all_flights[$id]['id'] = $recent_ident;
848
-				    $this->all_flights[$id]['addedSpotter'] = 1;
847
+					$this->all_flights[$id]['id'] = $recent_ident;
848
+					$this->all_flights[$id]['addedSpotter'] = 1;
849 849
 				}
850 850
 				if (isset($globalDaemon) && !$globalDaemon) {
851
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
851
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
852 852
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
853
-					    $Spotter = new Spotter($this->db);
854
-					    $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']);
855
-					    $Spotter->db = null;
853
+						$Spotter = new Spotter($this->db);
854
+						$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']);
855
+						$Spotter->db = null;
856
+					}
856 857
 					}
857
-				    }
858 858
 				}
859 859
 				
860
-			    }
860
+				}
861 861
 			}
862
-		    }
863
-		    //adds the spotter LIVE data
864
-		    //SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed);
865
-		    //echo "\nAdd in Live !! \n";
866
-		    //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";
867
-		    if ($globalDebug) {
862
+			}
863
+			//adds the spotter LIVE data
864
+			//SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed);
865
+			//echo "\nAdd in Live !! \n";
866
+			//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";
867
+			if ($globalDebug) {
868 868
 			if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM)) {
869 869
 				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";
870 870
 				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";
@@ -872,60 +872,60 @@  discard block
 block discarded – undo
872 872
 				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";
873 873
 				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";
874 874
 			}
875
-		    }
876
-		    $ignoreImport = false;
877
-		    if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
878
-		    if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
875
+			}
876
+			$ignoreImport = false;
877
+			if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
878
+			if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
879 879
 
880
-		    foreach($globalAirportIgnore as $airportIgnore) {
881
-		        if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
882
-			    $ignoreImport = true;
880
+			foreach($globalAirportIgnore as $airportIgnore) {
881
+				if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
882
+				$ignoreImport = true;
883
+			}
883 884
 			}
884
-		    }
885
-		    if (count($globalAirportAccept) > 0) {
886
-		        $ignoreImport = true;
887
-		        foreach($globalAirportIgnore as $airportIgnore) {
888
-			    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
885
+			if (count($globalAirportAccept) > 0) {
886
+				$ignoreImport = true;
887
+				foreach($globalAirportIgnore as $airportIgnore) {
888
+				if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
889 889
 				$ignoreImport = false;
890
-			    }
890
+				}
891 891
 			}
892
-		    }
893
-		    if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
892
+			}
893
+			if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
894 894
 			foreach($globalAirlineIgnore as $airlineIgnore) {
895
-			    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)) {
895
+				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)) {
896 896
 				$ignoreImport = true;
897
-			    }
897
+				}
898
+			}
898 899
 			}
899
-		    }
900
-		    if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
900
+			if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
901 901
 			$ignoreImport = true;
902 902
 			foreach($globalAirlineAccept as $airlineAccept) {
903
-			    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)) {
903
+				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)) {
904 904
 				$ignoreImport = false;
905
-			    }
905
+				}
906 906
 			}
907
-		    }
908
-		    if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
907
+			}
908
+			if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
909 909
 			$ignoreImport = true;
910 910
 			foreach($globalPilotIdAccept as $pilotIdAccept) {
911
-			    if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
912
-			        $ignoreImport = false;
913
-			    }
911
+				if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
912
+					$ignoreImport = false;
913
+				}
914
+			}
914 915
 			}
915
-		    }
916 916
 
917
-		    if (!$ignoreImport) {
917
+			if (!$ignoreImport) {
918 918
 			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'])) {
919 919
 				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')));
920 920
 				$timeelapsed = microtime(true);
921 921
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
922
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
922
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
923 923
 					if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : ";
924 924
 					$SpotterLive = new SpotterLive($this->db);
925 925
 					$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']);
926 926
 					$SpotterLive->db = null;
927 927
 					if ($globalDebug) echo $result."\n";
928
-				    }
928
+					}
929 929
 				}
930 930
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) {
931 931
 					$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']);
@@ -937,7 +937,7 @@  discard block
 block discarded – undo
937 937
 				//if ($line['format_source'] != 'aprs') {
938 938
 				//if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt')) {
939 939
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
940
-				    if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
940
+					if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
941 941
 					$source = $this->all_flights[$id]['source_name'];
942 942
 					if ($source == '') $source = $this->all_flights[$id]['format_source'];
943 943
 					if (!isset($this->source_location[$source])) {
@@ -963,7 +963,7 @@  discard block
 block discarded – undo
963 963
 					if ($stats_heading == 16) $stats_heading = 0;
964 964
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
965 965
 						for ($i=0;$i<=15;$i++) {
966
-						    $this->stats[$current_date][$source]['polar'][$i] = 0;
966
+							$this->stats[$current_date][$source]['polar'][$i] = 0;
967 967
 						}
968 968
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
969 969
 					} else {
@@ -976,17 +976,17 @@  discard block
 block discarded – undo
976 976
 					//var_dump($this->stats);
977 977
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
978 978
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
979
-						    end($this->stats[$current_date][$source]['hist']);
980
-						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
979
+							end($this->stats[$current_date][$source]['hist']);
980
+							$mini = key($this->stats[$current_date][$source]['hist'])+10;
981 981
 						} else $mini = 0;
982 982
 						for ($i=$mini;$i<=$distance;$i+=10) {
983
-						    $this->stats[$current_date][$source]['hist'][$i] = 0;
983
+							$this->stats[$current_date][$source]['hist'][$i] = 0;
984 984
 						}
985 985
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
986 986
 					} else {
987 987
 						$this->stats[$current_date][$source]['hist'][$distance] += 1;
988 988
 					}
989
-				    }
989
+					}
990 990
 				}
991 991
 
992 992
 				$this->all_flights[$id]['lastupdate'] = time();
@@ -996,7 +996,7 @@  discard block
 block discarded – undo
996 996
 			//$this->del();
997 997
 			
998 998
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
999
-			    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
999
+				if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
1000 1000
 				if ($globalDebug) echo "---- Deleting Live Spotter data Not updated since 2 hour...";
1001 1001
 				$SpotterLive = new SpotterLive($this->db);
1002 1002
 				$SpotterLive->deleteLiveSpotterDataNotUpdated();
@@ -1004,19 +1004,19 @@  discard block
 block discarded – undo
1004 1004
 				//SpotterLive->deleteLiveSpotterData();
1005 1005
 				if ($globalDebug) echo " Done\n";
1006 1006
 				$this->last_delete_hourly = time();
1007
-			    } else {
1007
+				} else {
1008 1008
 				$this->del();
1009 1009
 				$this->last_delete_hourly = time();
1010
-			    }
1010
+				}
1011 1011
 			}
1012 1012
 			
1013
-		    }
1014
-		    //$ignoreImport = false;
1013
+			}
1014
+			//$ignoreImport = false;
1015 1015
 		}
1016 1016
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
1017 1017
 		if ($send) return $this->all_flights[$id];
1018
-	    }
1018
+		}
1019
+	}
1019 1020
 	}
1020
-    }
1021 1021
 }
1022 1022
 ?>
Please login to merge, or discard this patch.
require/class.SpotterLive.php 1 patch
Indentation   +204 added lines, -204 removed lines patch added patch discarded remove patch
@@ -12,10 +12,10 @@  discard block
 block discarded – undo
12 12
 
13 13
 
14 14
 	/**
15
-	* Get SQL query part for filter used
16
-	* @param Array $filter the filter
17
-	* @return Array the SQL part
18
-	*/
15
+	 * Get SQL query part for filter used
16
+	 * @param Array $filter the filter
17
+	 * @return Array the SQL part
18
+	 */
19 19
 	public function getFilter($filter = array(),$where = false,$and = false) {
20 20
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
21 21
 		$filters = array();
@@ -128,11 +128,11 @@  discard block
 block discarded – undo
128 128
 	}
129 129
 
130 130
 	/**
131
-	* Gets all the spotter information based on the latest data entry
132
-	*
133
-	* @return Array the spotter information
134
-	*
135
-	*/
131
+	 * Gets all the spotter information based on the latest data entry
132
+	 *
133
+	 * @return Array the spotter information
134
+	 *
135
+	 */
136 136
 	public function getLiveSpotterData($limit = '', $sort = '', $filter = array())
137 137
 	{
138 138
 		global $globalDBdriver, $globalLiveInterval;
@@ -175,11 +175,11 @@  discard block
 block discarded – undo
175 175
 	}
176 176
 
177 177
 	/**
178
-	* Gets Minimal Live Spotter data
179
-	*
180
-	* @return Array the spotter information
181
-	*
182
-	*/
178
+	 * Gets Minimal Live Spotter data
179
+	 *
180
+	 * @return Array the spotter information
181
+	 *
182
+	 */
183 183
 	public function getMinLiveSpotterData($filter = array())
184 184
 	{
185 185
 		global $globalDBdriver, $globalLiveInterval, $globalArchive;
@@ -216,11 +216,11 @@  discard block
 block discarded – undo
216 216
 	}
217 217
 
218 218
 	/**
219
-	* Gets Minimal Live Spotter data since xx seconds
220
-	*
221
-	* @return Array the spotter information
222
-	*
223
-	*/
219
+	 * Gets Minimal Live Spotter data since xx seconds
220
+	 *
221
+	 * @return Array the spotter information
222
+	 *
223
+	 */
224 224
 	public function getMinLastLiveSpotterData($filter = array())
225 225
 	{
226 226
 		global $globalDBdriver, $globalLiveInterval, $globalArchive;
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 				FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' 
240 240
 				ORDER BY spotter_live.flightaware_id, spotter_live.date";
241 241
 			}
242
-                } else {
242
+				} else {
243 243
 			if (isset($globalArchive) && $globalArchive === TRUE) {
244 244
 				$query  = "SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, spotter_archive.date, spotter_archive.format_source 
245 245
 				FROM spotter_archive INNER JOIN (SELECT flightaware_id FROM spotter_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date) l ON l.flightaware_id = spotter_archive.flightaware_id 
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
252 252
 				ORDER BY spotter_live.flightaware_id, spotter_live.date";
253 253
 			}
254 254
 		}
255
-    		try {
255
+			try {
256 256
 			$sth = $this->db->prepare($query);
257 257
 			$sth->execute();
258 258
 		} catch(PDOException $e) {
@@ -264,11 +264,11 @@  discard block
 block discarded – undo
264 264
 	}
265 265
 
266 266
 	/**
267
-	* Gets number of latest data entry
268
-	*
269
-	* @return String number of entry
270
-	*
271
-	*/
267
+	 * Gets number of latest data entry
268
+	 *
269
+	 * @return String number of entry
270
+	 *
271
+	 */
272 272
 	public function getLiveSpotterCount($filter = array())
273 273
 	{
274 274
 		global $globalDBdriver, $globalLiveInterval;
@@ -295,11 +295,11 @@  discard block
 block discarded – undo
295 295
 	}
296 296
 
297 297
 	/**
298
-	* Gets all the spotter information based on the latest data entry and coord
299
-	*
300
-	* @return Array the spotter information
301
-	*
302
-	*/
298
+	 * Gets all the spotter information based on the latest data entry and coord
299
+	 *
300
+	 * @return Array the spotter information
301
+	 *
302
+	 */
303 303
 	public function getLiveSpotterDatabyCoord($coord, $filter = array())
304 304
 	{
305 305
 		global $globalDBdriver, $globalLiveInterval;
@@ -324,11 +324,11 @@  discard block
 block discarded – undo
324 324
 	}
325 325
 
326 326
 	/**
327
-	* Gets all the spotter information based on the latest data entry and coord
328
-	*
329
-	* @return Array the spotter information
330
-	*
331
-	*/
327
+	 * Gets all the spotter information based on the latest data entry and coord
328
+	 *
329
+	 * @return Array the spotter information
330
+	 *
331
+	 */
332 332
 	public function getMinLiveSpotterDatabyCoord($coord, $filter = array())
333 333
 	{
334 334
 		global $globalDBdriver, $globalLiveInterval, $globalArchive;
@@ -393,11 +393,11 @@  discard block
 block discarded – undo
393 393
 	}
394 394
 
395 395
 	/**
396
-	* Gets all the spotter information based on a user's latitude and longitude
397
-	*
398
-	* @return Array the spotter information
399
-	*
400
-	*/
396
+	 * Gets all the spotter information based on a user's latitude and longitude
397
+	 *
398
+	 * @return Array the spotter information
399
+	 *
400
+	 */
401 401
 	public function getLatestSpotterForLayar($lat, $lng, $radius, $interval)
402 402
 	{
403 403
 		$Spotter = new Spotter($this->db);
@@ -407,117 +407,117 @@  discard block
 block discarded – undo
407 407
 				return false;
408 408
 			}
409 409
 		}
410
-        if ($lng != '')
411
-                {
412
-                        if (!is_numeric($lng))
413
-                        {
414
-                                return false;
415
-                        }
416
-                }
417
-
418
-                if ($radius != '')
419
-                {
420
-                        if (!is_numeric($radius))
421
-                        {
422
-                                return false;
423
-                        }
424
-                }
410
+		if ($lng != '')
411
+				{
412
+						if (!is_numeric($lng))
413
+						{
414
+								return false;
415
+						}
416
+				}
417
+
418
+				if ($radius != '')
419
+				{
420
+						if (!is_numeric($radius))
421
+						{
422
+								return false;
423
+						}
424
+				}
425 425
 		$additional_query = '';
426
-        if ($interval != '')
427
-                {
428
-                        if (!is_string($interval))
429
-                        {
430
-                                //$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
431
-			        return false;
432
-                        } else {
433
-                if ($interval == '1m')
434
-                {
435
-                    $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
436
-                } else if ($interval == '15m'){
437
-                    $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date ';
438
-                } 
439
-            }
440
-                } else {
441
-         $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';   
442
-        }
443
-
444
-                $query  = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live 
426
+		if ($interval != '')
427
+				{
428
+						if (!is_string($interval))
429
+						{
430
+								//$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
431
+					return false;
432
+						} else {
433
+				if ($interval == '1m')
434
+				{
435
+					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
436
+				} else if ($interval == '15m'){
437
+					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date ';
438
+				} 
439
+			}
440
+				} else {
441
+		 $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';   
442
+		}
443
+
444
+				$query  = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live 
445 445
                    WHERE spotter_live.latitude <> '' 
446 446
                                    AND spotter_live.longitude <> '' 
447 447
                    ".$additional_query."
448 448
                    HAVING distance < :radius  
449 449
                                    ORDER BY distance";
450 450
 
451
-                $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius));
451
+				$spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius));
452 452
 
453
-                return $spotter_array;
454
-        }
453
+				return $spotter_array;
454
+		}
455 455
 
456 456
     
457
-        /**
458
-	* Gets all the spotter information based on a particular callsign
459
-	*
460
-	* @return Array the spotter information
461
-	*
462
-	*/
457
+		/**
458
+		 * Gets all the spotter information based on a particular callsign
459
+		 *
460
+		 * @return Array the spotter information
461
+		 *
462
+		 */
463 463
 	public function getLastLiveSpotterDataByIdent($ident)
464 464
 	{
465 465
 		$Spotter = new Spotter($this->db);
466 466
 		date_default_timezone_set('UTC');
467 467
 
468 468
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
469
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
469
+				$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
470 470
 
471 471
 		$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident),'',true);
472 472
 
473 473
 		return $spotter_array;
474 474
 	}
475 475
 
476
-        /**
477
-	* Gets all the spotter information based on a particular callsign
478
-	*
479
-	* @return Array the spotter information
480
-	*
481
-	*/
476
+		/**
477
+		 * Gets all the spotter information based on a particular callsign
478
+		 *
479
+		 * @return Array the spotter information
480
+		 *
481
+		 */
482 482
 	public function getDateLiveSpotterDataByIdent($ident,$date)
483 483
 	{
484 484
 		$Spotter = new Spotter($this->db);
485 485
 		date_default_timezone_set('UTC');
486 486
 
487 487
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
488
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
488
+				$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
489 489
 
490
-                $date = date('c',$date);
490
+				$date = date('c',$date);
491 491
 		$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
492 492
 
493 493
 		return $spotter_array;
494 494
 	}
495 495
 
496
-        /**
497
-	* Gets last spotter information based on a particular callsign
498
-	*
499
-	* @return Array the spotter information
500
-	*
501
-	*/
496
+		/**
497
+		 * Gets last spotter information based on a particular callsign
498
+		 *
499
+		 * @return Array the spotter information
500
+		 *
501
+		 */
502 502
 	public function getLastLiveSpotterDataById($id)
503 503
 	{
504 504
 		$Spotter = new Spotter($this->db);
505 505
 		date_default_timezone_set('UTC');
506 506
 
507 507
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
508
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
508
+				$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
509 509
 
510 510
 		$spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id),'',true);
511 511
 
512 512
 		return $spotter_array;
513 513
 	}
514 514
 
515
-        /**
516
-	* Gets last spotter information based on a particular callsign
517
-	*
518
-	* @return Array the spotter information
519
-	*
520
-	*/
515
+		/**
516
+		 * Gets last spotter information based on a particular callsign
517
+		 *
518
+		 * @return Array the spotter information
519
+		 *
520
+		 */
521 521
 	public function getDateLiveSpotterDataById($id,$date)
522 522
 	{
523 523
 		$Spotter = new Spotter($this->db);
@@ -530,21 +530,21 @@  discard block
 block discarded – undo
530 530
 		return $spotter_array;
531 531
 	}
532 532
 
533
-        /**
534
-	* Gets altitude information based on a particular callsign
535
-	*
536
-	* @return Array the spotter information
537
-	*
538
-	*/
533
+		/**
534
+		 * Gets altitude information based on a particular callsign
535
+		 *
536
+		 * @return Array the spotter information
537
+		 *
538
+		 */
539 539
 	public function getAltitudeLiveSpotterDataByIdent($ident)
540 540
 	{
541 541
 
542 542
 		date_default_timezone_set('UTC');
543 543
 
544 544
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
545
-                $query  = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident';
545
+				$query  = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident';
546 546
 
547
-    		try {
547
+			try {
548 548
 			
549 549
 			$sth = $this->db->prepare($query);
550 550
 			$sth->execute(array(':ident' => $ident));
@@ -557,12 +557,12 @@  discard block
 block discarded – undo
557 557
 		return $spotter_array;
558 558
 	}
559 559
 
560
-        /**
561
-	* Gets all the spotter information based on a particular id
562
-	*
563
-	* @return Array the spotter information
564
-	*
565
-	*/
560
+		/**
561
+		 * Gets all the spotter information based on a particular id
562
+		 *
563
+		 * @return Array the spotter information
564
+		 *
565
+		 */
566 566
 	public function getAllLiveSpotterDataById($id,$liveinterval = false)
567 567
 	{
568 568
 		global $globalDBdriver, $globalLiveInterval;
@@ -590,18 +590,18 @@  discard block
 block discarded – undo
590 590
 		return $spotter_array;
591 591
 	}
592 592
 
593
-        /**
594
-	* Gets all the spotter information based on a particular ident
595
-	*
596
-	* @return Array the spotter information
597
-	*
598
-	*/
593
+		/**
594
+		 * Gets all the spotter information based on a particular ident
595
+		 *
596
+		 * @return Array the spotter information
597
+		 *
598
+		 */
599 599
 	public function getAllLiveSpotterDataByIdent($ident)
600 600
 	{
601 601
 		date_default_timezone_set('UTC');
602 602
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
603 603
 		$query  = self::$global_query.' WHERE spotter_live.ident = :ident';
604
-    		try {
604
+			try {
605 605
 			
606 606
 			$sth = $this->db->prepare($query);
607 607
 			$sth->execute(array(':ident' => $ident));
@@ -615,23 +615,23 @@  discard block
 block discarded – undo
615 615
 
616 616
 
617 617
 	/**
618
-	* Deletes all info in the table
619
-	*
620
-	* @return String success or false
621
-	*
622
-	*/
618
+	 * Deletes all info in the table
619
+	 *
620
+	 * @return String success or false
621
+	 *
622
+	 */
623 623
 	public function deleteLiveSpotterData()
624 624
 	{
625 625
 		global $globalDBdriver;
626 626
 		if ($globalDBdriver == 'mysql') {
627 627
 			//$query  = "DELETE FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE) >= spotter_live.date";
628 628
 			$query  = 'DELETE FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 9 HOUR) >= spotter_live.date';
629
-            		//$query  = "DELETE FROM spotter_live WHERE spotter_live.id IN (SELECT spotter_live.id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= spotter_live.date)";
629
+					//$query  = "DELETE FROM spotter_live WHERE spotter_live.id IN (SELECT spotter_live.id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= spotter_live.date)";
630 630
 		} else {
631 631
 			$query  = "DELETE FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= spotter_live.date";
632 632
 		}
633 633
         
634
-    		try {
634
+			try {
635 635
 			
636 636
 			$sth = $this->db->prepare($query);
637 637
 			$sth->execute();
@@ -643,18 +643,18 @@  discard block
 block discarded – undo
643 643
 	}
644 644
 
645 645
 	/**
646
-	* Deletes all info in the table for aircraft not seen since 2 HOUR
647
-	*
648
-	* @return String success or false
649
-	*
650
-	*/
646
+	 * Deletes all info in the table for aircraft not seen since 2 HOUR
647
+	 *
648
+	 * @return String success or false
649
+	 *
650
+	 */
651 651
 	public function deleteLiveSpotterDataNotUpdated()
652 652
 	{
653 653
 		global $globalDBdriver, $globalDebug;
654 654
 		if ($globalDBdriver == 'mysql') {
655 655
 			//$query = 'SELECT flightaware_id FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) >= spotter_live.date AND spotter_live.flightaware_id NOT IN (SELECT flightaware_id FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) < spotter_live.date) LIMIT 800 OFFSET 0';
656
-    			$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 2000 OFFSET 0";
657
-    			try {
656
+				$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 2000 OFFSET 0";
657
+				try {
658 658
 				
659 659
 				$sth = $this->db->prepare($query);
660 660
 				$sth->execute();
@@ -662,8 +662,8 @@  discard block
 block discarded – undo
662 662
 				return "error";
663 663
 			}
664 664
 			$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
665
-                        $i = 0;
666
-                        $j =0;
665
+						$i = 0;
666
+						$j =0;
667 667
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
668 668
 			foreach($all as $row)
669 669
 			{
@@ -671,20 +671,20 @@  discard block
 block discarded – undo
671 671
 				$j++;
672 672
 				if ($j == 30) {
673 673
 					if ($globalDebug) echo ".";
674
-				    	try {
674
+						try {
675 675
 						
676 676
 						$sth = $this->db->prepare(substr($query_delete,0,-1).")");
677 677
 						$sth->execute();
678 678
 					} catch(PDOException $e) {
679 679
 						return "error";
680 680
 					}
681
-                                	$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
682
-                                	$j = 0;
681
+									$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
682
+									$j = 0;
683 683
 				}
684 684
 				$query_delete .= "'".$row['flightaware_id']."',";
685 685
 			}
686 686
 			if ($i > 0) {
687
-    				try {
687
+					try {
688 688
 					
689 689
 					$sth = $this->db->prepare(substr($query_delete,0,-1).")");
690 690
 					$sth->execute();
@@ -695,9 +695,9 @@  discard block
 block discarded – undo
695 695
 			return "success";
696 696
 		} elseif ($globalDBdriver == 'pgsql') {
697 697
 			//$query = "SELECT flightaware_id FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= spotter_live.date AND spotter_live.flightaware_id NOT IN (SELECT flightaware_id FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' < spotter_live.date) LIMIT 800 OFFSET 0";
698
-    			//$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0";
699
-    			$query = "DELETE FROM spotter_live WHERE flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 2000 OFFSET 0)";
700
-    			try {
698
+				//$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0";
699
+				$query = "DELETE FROM spotter_live WHERE flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 2000 OFFSET 0)";
700
+				try {
701 701
 				
702 702
 				$sth = $this->db->prepare($query);
703 703
 				$sth->execute();
@@ -741,17 +741,17 @@  discard block
 block discarded – undo
741 741
 	}
742 742
 
743 743
 	/**
744
-	* Deletes all info in the table for an ident
745
-	*
746
-	* @return String success or false
747
-	*
748
-	*/
744
+	 * Deletes all info in the table for an ident
745
+	 *
746
+	 * @return String success or false
747
+	 *
748
+	 */
749 749
 	public function deleteLiveSpotterDataByIdent($ident)
750 750
 	{
751 751
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
752 752
 		$query  = 'DELETE FROM spotter_live WHERE ident = :ident';
753 753
         
754
-    		try {
754
+			try {
755 755
 			
756 756
 			$sth = $this->db->prepare($query);
757 757
 			$sth->execute(array(':ident' => $ident));
@@ -763,17 +763,17 @@  discard block
 block discarded – undo
763 763
 	}
764 764
 
765 765
 	/**
766
-	* Deletes all info in the table for an id
767
-	*
768
-	* @return String success or false
769
-	*
770
-	*/
766
+	 * Deletes all info in the table for an id
767
+	 *
768
+	 * @return String success or false
769
+	 *
770
+	 */
771 771
 	public function deleteLiveSpotterDataById($id)
772 772
 	{
773 773
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
774 774
 		$query  = 'DELETE FROM spotter_live WHERE flightaware_id = :id';
775 775
         
776
-    		try {
776
+			try {
777 777
 			
778 778
 			$sth = $this->db->prepare($query);
779 779
 			$sth->execute(array(':id' => $id));
@@ -786,11 +786,11 @@  discard block
 block discarded – undo
786 786
 
787 787
 
788 788
 	/**
789
-	* Gets the aircraft ident within the last hour
790
-	*
791
-	* @return String the ident
792
-	*
793
-	*/
789
+	 * Gets the aircraft ident within the last hour
790
+	 *
791
+	 * @return String the ident
792
+	 *
793
+	 */
794 794
 	public function getIdentFromLastHour($ident)
795 795
 	{
796 796
 		global $globalDBdriver, $globalTimezone;
@@ -816,14 +816,14 @@  discard block
 block discarded – undo
816 816
 			$ident_result = $row['ident'];
817 817
 		}
818 818
 		return $ident_result;
819
-        }
819
+		}
820 820
 
821 821
 	/**
822
-	* Check recent aircraft
823
-	*
824
-	* @return String the ident
825
-	*
826
-	*/
822
+	 * Check recent aircraft
823
+	 *
824
+	 * @return String the ident
825
+	 *
826
+	 */
827 827
 	public function checkIdentRecent($ident)
828 828
 	{
829 829
 		global $globalDBdriver, $globalTimezone;
@@ -849,14 +849,14 @@  discard block
 block discarded – undo
849 849
 			$ident_result = $row['flightaware_id'];
850 850
 		}
851 851
 		return $ident_result;
852
-        }
852
+		}
853 853
 
854 854
 	/**
855
-	* Check recent aircraft by id
856
-	*
857
-	* @return String the ident
858
-	*
859
-	*/
855
+	 * Check recent aircraft by id
856
+	 *
857
+	 * @return String the ident
858
+	 *
859
+	 */
860 860
 	public function checkIdRecent($id)
861 861
 	{
862 862
 		global $globalDBdriver, $globalTimezone;
@@ -882,14 +882,14 @@  discard block
 block discarded – undo
882 882
 			$ident_result = $row['flightaware_id'];
883 883
 		}
884 884
 		return $ident_result;
885
-        }
885
+		}
886 886
 
887 887
 	/**
888
-	* Check recent aircraft by ModeS
889
-	*
890
-	* @return String the ModeS
891
-	*
892
-	*/
888
+	 * Check recent aircraft by ModeS
889
+	 *
890
+	 * @return String the ModeS
891
+	 *
892
+	 */
893 893
 	public function checkModeSRecent($modes)
894 894
 	{
895 895
 		global $globalDBdriver, $globalTimezone;
@@ -916,19 +916,19 @@  discard block
 block discarded – undo
916 916
 			$ident_result = $row['flightaware_id'];
917 917
 		}
918 918
 		return $ident_result;
919
-        }
919
+		}
920 920
 
921 921
 	/**
922
-	* Adds a new spotter data
923
-	*
924
-	* @param String $flightaware_id the ID from flightaware
925
-	* @param String $ident the flight ident
926
-	* @param String $aircraft_icao the aircraft type
927
-	* @param String $departure_airport_icao the departure airport
928
-	* @param String $arrival_airport_icao the arrival airport
929
-	* @return String success or false
930
-	*
931
-	*/
922
+	 * Adds a new spotter data
923
+	 *
924
+	 * @param String $flightaware_id the ID from flightaware
925
+	 * @param String $ident the flight ident
926
+	 * @param String $aircraft_icao the aircraft type
927
+	 * @param String $departure_airport_icao the departure airport
928
+	 * @param String $arrival_airport_icao the arrival airport
929
+	 * @return String success or false
930
+	 *
931
+	 */
932 932
 	public function addLiveSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $altitude_real = '',$heading = '', $groundspeed = '', $date = '',$departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $ModeS = '', $putinarchive = false,$registration = '',$pilot_id = '', $pilot_name = '', $verticalrate = '', $noarchive = false, $ground = false,$format_source = '', $source_name = '', $over_country = '')
933 933
 	{
934 934
 		global $globalURL, $globalArchive, $globalDebug;
@@ -1071,10 +1071,10 @@  discard block
 block discarded – undo
1071 1071
 		$arrival_airport_country = '';
1072 1072
 		
1073 1073
             	
1074
-            	if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL;
1075
-            	if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL;
1076
-            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
1077
-            	if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
1074
+				if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL;
1075
+				if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL;
1076
+				if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
1077
+				if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
1078 1078
 		
1079 1079
 		$query = '';
1080 1080
 		if ($globalArchive) {
@@ -1095,10 +1095,10 @@  discard block
 block discarded – undo
1095 1095
 			return "error : ".$e->getMessage();
1096 1096
 		}
1097 1097
 		if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) {
1098
-		    if ($globalDebug) echo '(Add to SBS archive : ';
1099
-		    $SpotterArchive = new SpotterArchive($this->db);
1100
-		    $result =  $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $altitude_real,$heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country);
1101
-		    if ($globalDebug) echo $result.')';
1098
+			if ($globalDebug) echo '(Add to SBS archive : ';
1099
+			$SpotterArchive = new SpotterArchive($this->db);
1100
+			$result =  $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $altitude_real,$heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country);
1101
+			if ($globalDebug) echo $result.')';
1102 1102
 		} elseif ($globalDebug && $putinarchive !== true) {
1103 1103
 			echo '(Not adding to archive)';
1104 1104
 		} elseif ($globalDebug && $noarchive === true) {
Please login to merge, or discard this patch.