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